From 8f7e60d461bcbb35d8388f9795fa7cadb5d382fe Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 18 Aug 2022 15:03:12 +0200 Subject: [PATCH 1/2] example: migrante `multiple-instances` to ESM --- .eslintrc.js | 1 + examples/multiple-instances/.gitignore | 1 - examples/multiple-instances/{readme.md => README.md} | 6 +++--- examples/multiple-instances/index.html | 8 ++++---- examples/multiple-instances/main.js | 8 +++++--- examples/multiple-instances/package.json | 12 ++++++------ yarn.lock | 4 +--- 7 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 examples/multiple-instances/.gitignore rename examples/multiple-instances/{readme.md => README.md} (81%) diff --git a/.eslintrc.js b/.eslintrc.js index 916604aa0f..b6cd98c3c3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -195,6 +195,7 @@ module.exports = { 'examples/aws-presigned-url/*.js', 'examples/bundled/*.js', 'examples/custom-provider/client/*.js', + 'examples/multiple-instances/*.js', 'private/dev/*.js', 'private/release/*.js', 'private/remark-lint-uppy/*.js', diff --git a/examples/multiple-instances/.gitignore b/examples/multiple-instances/.gitignore deleted file mode 100644 index 70a19130fe..0000000000 --- a/examples/multiple-instances/.gitignore +++ /dev/null @@ -1 +0,0 @@ -uppy.min.css diff --git a/examples/multiple-instances/readme.md b/examples/multiple-instances/README.md similarity index 81% rename from examples/multiple-instances/readme.md rename to examples/multiple-instances/README.md index 54614c5ccd..7a6c9a1fe9 100644 --- a/examples/multiple-instances/readme.md +++ b/examples/multiple-instances/README.md @@ -8,8 +8,8 @@ It has two instances on the same page, side-by-side, but with different `id`s so To run this example, make sure you've correctly installed the **repository root**: ```bash -npm install -npm run build +corepack yarn install +corepack yarn build ``` That will also install the dependencies for this example. @@ -17,5 +17,5 @@ That will also install the dependencies for this example. Then, again in the **repository root**, start this example by doing: ```bash -npm run example multiple-instances +corepack yarn workspace @uppy-example/multiple-instances start ``` diff --git a/examples/multiple-instances/index.html b/examples/multiple-instances/index.html index a29319352c..5eee75358a 100644 --- a/examples/multiple-instances/index.html +++ b/examples/multiple-instances/index.html @@ -4,8 +4,6 @@ Uppy example: Multiple instances - - + +

Instance A

@@ -24,8 +24,8 @@

Instance B

+ - - + diff --git a/examples/multiple-instances/main.js b/examples/multiple-instances/main.js index d325b8b34c..8665487126 100644 --- a/examples/multiple-instances/main.js +++ b/examples/multiple-instances/main.js @@ -1,6 +1,8 @@ -const Uppy = require('@uppy/core') -const Dashboard = require('@uppy/dashboard') -const GoldenRetriever = require('@uppy/golden-retriever') +import Uppy from '@uppy/core' +import Dashboard from '@uppy/dashboard' +import GoldenRetriever from '@uppy/golden-retriever' + +import '@uppy/dashboard/dist/style.css' // Initialise two Uppy instances with the GoldenRetriever plugin, // but with different `id`s. diff --git a/examples/multiple-instances/package.json b/examples/multiple-instances/package.json index 2a6b87feb5..33fe65a280 100644 --- a/examples/multiple-instances/package.json +++ b/examples/multiple-instances/package.json @@ -1,17 +1,17 @@ { "name": "@uppy-example/multiple-instances", "version": "0.0.0", + "type": "module", "dependencies": { - "@babel/core": "^7.4.4", "@uppy/core": "workspace:*", "@uppy/dashboard": "workspace:*", - "@uppy/golden-retriever": "workspace:*", - "babelify": "^10.0.0", - "budo": "^11.6.1" + "@uppy/golden-retriever": "workspace:*" + }, + "devDependencies": { + "vite": "^3.0.0" }, "private": true, "scripts": { - "css": "cp ../../packages/uppy/dist/uppy.min.css .", - "start": "yarn run css && budo main.js:bundle.js -- -t babelify" + "start": "vite" } } diff --git a/yarn.lock b/yarn.lock index b888dc531a..b9bb23cf2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8392,12 +8392,10 @@ __metadata: version: 0.0.0-use.local resolution: "@uppy-example/multiple-instances@workspace:examples/multiple-instances" dependencies: - "@babel/core": ^7.4.4 "@uppy/core": "workspace:*" "@uppy/dashboard": "workspace:*" "@uppy/golden-retriever": "workspace:*" - babelify: ^10.0.0 - budo: ^11.6.1 + vite: ^3.0.0 languageName: unknown linkType: soft From 355f1de841aed3424a20812cf5389eff72a40a77 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 18 Aug 2022 16:40:42 +0200 Subject: [PATCH 2/2] Add missing styles --- examples/multiple-instances/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/multiple-instances/main.js b/examples/multiple-instances/main.js index 8665487126..973432237b 100644 --- a/examples/multiple-instances/main.js +++ b/examples/multiple-instances/main.js @@ -2,6 +2,7 @@ import Uppy from '@uppy/core' import Dashboard from '@uppy/dashboard' import GoldenRetriever from '@uppy/golden-retriever' +import '@uppy/core/dist/style.css' import '@uppy/dashboard/dist/style.css' // Initialise two Uppy instances with the GoldenRetriever plugin,