Skip to content

Commit

Permalink
example: upgrade React example to use React 18
Browse files Browse the repository at this point in the history
  • Loading branch information
aduh95 committed Aug 22, 2022
1 parent ff2eed4 commit 9b079b0
Show file tree
Hide file tree
Showing 11 changed files with 133 additions and 57 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Expand Up @@ -199,6 +199,7 @@ module.exports = {
'examples/node-xhr/*.js',
'examples/php-xhr/*.js',
'examples/python-xhr/*.js',
'examples/react-example/*.js',
'examples/transloadit-markdown-bin/*.js',
'examples/xhr-bundle/*.js',
'private/dev/*.js',
Expand Down
5 changes: 0 additions & 5 deletions examples/react-example/.babelrc.js

This file was deleted.

3 changes: 0 additions & 3 deletions examples/react-example/.gitignore

This file was deleted.

18 changes: 12 additions & 6 deletions examples/react-example/App.js → examples/react-example/App.jsx
@@ -1,11 +1,17 @@
/* eslint-disable */
const React = require('react')
const Uppy = require('@uppy/core')
const Tus = require('@uppy/tus')
const GoogleDrive = require('@uppy/google-drive')
const { Dashboard, DashboardModal, DragDrop, ProgressBar, FileInput } = require('@uppy/react')
import React from'react'
import Uppy from'@uppy/core'
import Tus from'@uppy/tus'
import GoogleDrive from'@uppy/google-drive'
import { Dashboard, DashboardModal, DragDrop, ProgressBar, FileInput } from'@uppy/react'

module.exports = class App extends React.Component {
import '@uppy/core/dist/style.css'
import '@uppy/dashboard/dist/style.css'
import '@uppy/drag-drop/dist/style.css'
import '@uppy/file-input/dist/style.css'
import '@uppy/progress-bar/dist/style.css'

export default class App extends React.Component {
constructor (props) {
super(props)

Expand Down
30 changes: 30 additions & 0 deletions examples/react-example/README.md
@@ -0,0 +1,30 @@
# React example

This is minimal example created to demonstrate how to integrate Uppy in your
React app.

To spawn the demo, use the following commands:

```sh
corepack yarn install
corepack yarn build
corepack yarn workspace @uppy-example/react dev
```

If you'd like to use a different package manager than Yarn (e.g. npm) to work
with this example, you can extract it from the workspace like this:

```sh
corepack yarn workspace @uppy-example/react pack

# The above command should have create a .tgz file, we're going to extract it to
# a new directory outside of the Uppy workspace.
mkdir ../react-example
tar -xzf examples/react-example/package.tgz -C ../react-example --strip-components 1
rm -f examples/react-example/package.tgz

# Now you can leave the Uppy workspace and use the example as a standalone JS project:
cd ../react-example
npm i
npm run dev
```
2 changes: 1 addition & 1 deletion examples/react-example/index.html
Expand Up @@ -8,6 +8,6 @@
</head>
<body>
<div id="app"></div>
<script src="bundle.js"></script>
<script src="./main.jsx" type="module"></script>
</body>
</html>
8 changes: 0 additions & 8 deletions examples/react-example/main.js

This file was deleted.

8 changes: 8 additions & 0 deletions examples/react-example/main.jsx
@@ -0,0 +1,8 @@
/* eslint-disable */
import React from 'react'
import { createRoot } from 'react-dom/client';
import App from './App.jsx'

createRoot(document.querySelector('#app')).render(
<App />
)
28 changes: 19 additions & 9 deletions examples/react-example/package.json
@@ -1,17 +1,27 @@
{
"name": "@uppy-example/react-example",
"name": "@uppy-example/react",
"version": "0.0.0",
"type": "module",
"dependencies": {
"@babel/core": "^7.4.5",
"@babel/preset-react": "^7.0.0",
"babelify": "^10.0.0",
"budo": "^11.6.2",
"react": "^16.8.6",
"react-dom": "^16.8.6"
"@uppy/core": "workspace:*",
"@uppy/dashboard": "workspace:*",
"@uppy/drag-drop": "workspace:*",
"@uppy/file-input": "workspace:*",
"@uppy/google-drive": "workspace:*",
"@uppy/progress-bar": "workspace:*",
"@uppy/react": "workspace:*",
"@uppy/tus": "workspace:*",
"react": "^18.0.0",
"react-dom": "^18.0.0"
},
"private": true,
"scripts": {
"css": "cp ../../packages/uppy/dist/uppy.min.css .",
"start": "yarn run css && budo main.js:bundle.js -- -r react:react -r react-dom:react-dom -t babelify"
"dev": "vite",
"build": "vite build",
"preview": "vite preview --port 5050"
},
"devDependencies": {
"@vitejs/plugin-react": "^2.0.0",
"vite": "^3.0.0"
}
}
7 changes: 7 additions & 0 deletions examples/react-example/vite.config.js
@@ -0,0 +1,7 @@
import { defineConfig } from 'vite'
import react from '@vitejs/plugin-react'

// https://vitejs.dev/config/
export default defineConfig({
plugins: [react()],
})
80 changes: 55 additions & 25 deletions yarn.lock
Expand Up @@ -596,7 +596,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/core@npm:>=7.2.2, @babel/core@npm:^7.0.0, @babel/core@npm:^7.1.0, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.14.3, @babel/core@npm:^7.14.6, @babel/core@npm:^7.17.2, @babel/core@npm:^7.17.5, @babel/core@npm:^7.17.9, @babel/core@npm:^7.2.2, @babel/core@npm:^7.4.4, @babel/core@npm:^7.4.5":
"@babel/core@npm:>=7.2.2, @babel/core@npm:^7.0.0, @babel/core@npm:^7.1.0, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.14.3, @babel/core@npm:^7.14.6, @babel/core@npm:^7.17.2, @babel/core@npm:^7.17.5, @babel/core@npm:^7.17.9, @babel/core@npm:^7.18.10, @babel/core@npm:^7.2.2, @babel/core@npm:^7.4.4":
version: 7.18.10
resolution: "@babel/core@npm:7.18.10"
dependencies:
Expand Down Expand Up @@ -1839,7 +1839,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-transform-react-jsx-self@npm:^7.0.0":
"@babel/plugin-transform-react-jsx-self@npm:^7.0.0, @babel/plugin-transform-react-jsx-self@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/plugin-transform-react-jsx-self@npm:7.18.6"
dependencies:
Expand All @@ -1850,7 +1850,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-transform-react-jsx-source@npm:^7.0.0":
"@babel/plugin-transform-react-jsx-source@npm:^7.0.0, @babel/plugin-transform-react-jsx-source@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/plugin-transform-react-jsx-source@npm:7.18.6"
dependencies:
Expand All @@ -1861,7 +1861,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-transform-react-jsx@npm:^7.0.0, @babel/plugin-transform-react-jsx@npm:^7.10.4, @babel/plugin-transform-react-jsx@npm:^7.12.12, @babel/plugin-transform-react-jsx@npm:^7.18.6":
"@babel/plugin-transform-react-jsx@npm:^7.0.0, @babel/plugin-transform-react-jsx@npm:^7.10.4, @babel/plugin-transform-react-jsx@npm:^7.12.12, @babel/plugin-transform-react-jsx@npm:^7.18.10, @babel/plugin-transform-react-jsx@npm:^7.18.6":
version: 7.18.10
resolution: "@babel/plugin-transform-react-jsx@npm:7.18.10"
dependencies:
Expand Down Expand Up @@ -2296,7 +2296,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/preset-react@npm:^7.0.0, @babel/preset-react@npm:^7.12.10":
"@babel/preset-react@npm:^7.12.10":
version: 7.18.6
resolution: "@babel/preset-react@npm:7.18.6"
dependencies:
Expand Down Expand Up @@ -8184,19 +8184,6 @@ __metadata:
languageName: unknown
linkType: soft

"@uppy-example/react-example@workspace:examples/react-example":
version: 0.0.0-use.local
resolution: "@uppy-example/react-example@workspace:examples/react-example"
dependencies:
"@babel/core": ^7.4.5
"@babel/preset-react": ^7.0.0
babelify: ^10.0.0
budo: ^11.6.2
react: ^16.8.6
react-dom: ^16.8.6
languageName: unknown
linkType: soft

"@uppy-example/react-native-expo@workspace:examples/react-native-expo":
version: 0.0.0-use.local
resolution: "@uppy-example/react-native-expo@workspace:examples/react-native-expo"
Expand All @@ -8217,6 +8204,25 @@ __metadata:
languageName: unknown
linkType: soft

"@uppy-example/react@workspace:examples/react-example":
version: 0.0.0-use.local
resolution: "@uppy-example/react@workspace:examples/react-example"
dependencies:
"@uppy/core": "workspace:*"
"@uppy/dashboard": "workspace:*"
"@uppy/drag-drop": "workspace:*"
"@uppy/file-input": "workspace:*"
"@uppy/google-drive": "workspace:*"
"@uppy/progress-bar": "workspace:*"
"@uppy/react": "workspace:*"
"@uppy/tus": "workspace:*"
"@vitejs/plugin-react": ^2.0.0
react: ^18.0.0
react-dom: ^18.0.0
vite: ^3.0.0
languageName: unknown
linkType: soft

"@uppy-example/redux@workspace:examples/redux":
version: 0.0.0-use.local
resolution: "@uppy-example/redux@workspace:examples/redux"
Expand Down Expand Up @@ -8602,7 +8608,7 @@ __metadata:
languageName: unknown
linkType: soft

"@uppy/file-input@workspace:^, @uppy/file-input@workspace:packages/@uppy/file-input":
"@uppy/file-input@workspace:*, @uppy/file-input@workspace:^, @uppy/file-input@workspace:packages/@uppy/file-input":
version: 0.0.0-use.local
resolution: "@uppy/file-input@workspace:packages/@uppy/file-input"
dependencies:
Expand Down Expand Up @@ -8744,7 +8750,7 @@ __metadata:
languageName: unknown
linkType: soft

"@uppy/react@workspace:packages/@uppy/react":
"@uppy/react@workspace:*, @uppy/react@workspace:packages/@uppy/react":
version: 0.0.0-use.local
resolution: "@uppy/react@workspace:packages/@uppy/react"
dependencies:
Expand Down Expand Up @@ -9030,6 +9036,23 @@ __metadata:
languageName: unknown
linkType: soft

"@vitejs/plugin-react@npm:^2.0.0":
version: 2.0.1
resolution: "@vitejs/plugin-react@npm:2.0.1"
dependencies:
"@babel/core": ^7.18.10
"@babel/plugin-transform-react-jsx": ^7.18.10
"@babel/plugin-transform-react-jsx-development": ^7.18.6
"@babel/plugin-transform-react-jsx-self": ^7.18.6
"@babel/plugin-transform-react-jsx-source": ^7.18.6
magic-string: ^0.26.2
react-refresh: ^0.14.0
peerDependencies:
vite: ^3.0.0
checksum: 90702768ee34bd7e5021398ab827c682cfe1ebfce0988a532a678b664d80b9ad991d1c24f81045626b811c9aa2aae7d9d0fd563db5c6b7b8fd36c8eecdfc04b9
languageName: node
linkType: hard

"@vitejs/plugin-vue@npm:^3.0.0":
version: 3.0.3
resolution: "@vitejs/plugin-vue@npm:3.0.3"
Expand Down Expand Up @@ -12031,7 +12054,7 @@ __metadata:
languageName: node
linkType: hard

"budo@npm:^11.3.2, budo@npm:^11.6.1, budo@npm:^11.6.2":
"budo@npm:^11.3.2, budo@npm:^11.6.1":
version: 11.7.0
resolution: "budo@npm:11.7.0"
dependencies:
Expand Down Expand Up @@ -24163,7 +24186,7 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
languageName: node
linkType: hard

"magic-string@npm:0.26.2, magic-string@npm:^0.26.0, magic-string@npm:^0.26.1":
"magic-string@npm:0.26.2, magic-string@npm:^0.26.0, magic-string@npm:^0.26.1, magic-string@npm:^0.26.2":
version: 0.26.2
resolution: "magic-string@npm:0.26.2"
dependencies:
Expand Down Expand Up @@ -30146,7 +30169,7 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
languageName: node
linkType: hard

"react-dom@npm:^16.14.0, react-dom@npm:^16.8.6":
"react-dom@npm:^16.14.0":
version: 16.14.0
resolution: "react-dom@npm:16.14.0"
dependencies:
Expand All @@ -30160,7 +30183,7 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
languageName: node
linkType: hard

"react-dom@npm:^18.1.0":
"react-dom@npm:^18.0.0, react-dom@npm:^18.1.0":
version: 18.2.0
resolution: "react-dom@npm:18.2.0"
dependencies:
Expand Down Expand Up @@ -30279,6 +30302,13 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
languageName: node
linkType: hard

"react-refresh@npm:^0.14.0":
version: 0.14.0
resolution: "react-refresh@npm:0.14.0"
checksum: dc69fa8c993df512f42dd0f1b604978ae89bd747c0ed5ec595c0cc50d535fb2696619ccd98ae28775cc01d0a7c146a532f0f7fb81dc22e1977c242a4912312f4
languageName: node
linkType: hard

"react-refresh@npm:^0.4.0":
version: 0.4.3
resolution: "react-refresh@npm:0.4.3"
Expand Down Expand Up @@ -30314,7 +30344,7 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
languageName: node
linkType: hard

"react@npm:^18.1.0":
"react@npm:^18.0.0, react@npm:^18.1.0":
version: 18.2.0
resolution: "react@npm:18.2.0"
dependencies:
Expand Down

0 comments on commit 9b079b0

Please sign in to comment.