Workspaces (#2835)

.eslintrc.js

@@ -2,28 +2,6 @@
 
 'use strict'
 
-const glob = require('glob')
-
-// Configure import/no-extraneous-dependencies for test files in
-// each package, which are allowed to import dependencies from their
-// own package.json as well as the root package.json.
-const importRules = []
-for (const dir of glob.sync('packages/@uppy/*')) {
-  importRules.push({
-    files: [
-      `${dir}/**/*.test.js`,
-      `${dir}/test/**/*.js`,
-      `${dir}/rollup.config.js`,
-    ],
-    rules: {
-      'import/no-extraneous-dependencies': ['error', {
-        devDependencies: true,
-        packageDir: [dir, '.'],
-      }],
-    },
-  })
-}
-
 module.exports = {
   extends: ['transloadit'],
   env: {
@@ -170,6 +148,7 @@ module.exports = {
     {
       files: [
         'bin/**.js',
+        'postcss.config.js',
         '.eslintrc.js',
       ],
       rules: {
@@ -215,7 +194,5 @@ module.exports = {
         }],
       },
     },
-
-    ...importRules,
   ],
 }

.github/workflows/cdn.yml

@@ -15,6 +15,8 @@ jobs:
         uses: actions/setup-node@v2-beta
         with:
           node-version: 14.x
+      - name: Install npm 7
+        run: npm install --global npm@7
       - name: Install dependencies
         run: npm ci
       - name: Build bundles

.github/workflows/ci.yml

@@ -15,6 +15,8 @@ jobs:
         uses: actions/setup-node@v2-beta
         with:
           node-version: ${{matrix.node-version}}
+      - name: Install npm 7
+        run: npm install --global npm@7
       - name: Install dependencies
         run: npm ci
       - name: Run tests
@@ -30,6 +32,8 @@ jobs:
         uses: actions/setup-node@v2-beta
         with:
           node-version: 14.x
+      - name: Install npm 7
+        run: npm install --global npm@7
       - name: Install dependencies
         run: npm ci
       - name: Run linter
@@ -45,6 +49,8 @@ jobs:
         uses: actions/setup-node@v2-beta
         with:
           node-version: 14.x
+      - name: Install npm 7
+        run: npm install --global npm@7
       - name: Install dependencies
         run: npm ci
       - name: Run linter
@@ -60,9 +66,11 @@ jobs:
         uses: actions/setup-node@v2-beta
         with:
           node-version: 14.x
+      - name: Install npm 7
+        run: npm install --global npm@7
       - name: Install dependencies
         run: npm ci
-      - name: Run linter
+      - name: Run type tests
         run: npm run lint:markdown
         # Need to do a bunch of work to generate the locale typings 🙃
       - name: Prepare type declarations

.github/workflows/companion.yml

@@ -15,6 +15,8 @@ jobs:
         uses: actions/setup-node@v2-beta
         with:
           node-version: ${{matrix.node-version}}
+      - name: Install npm 7
+        run: npm install --global npm@7
       - name: Install dependencies
         run: npm ci
       - name: Run tests

.github/workflows/end-to-end.yml

@@ -18,6 +18,8 @@ jobs:
         uses: actions/setup-node@v2-beta
         with:
           node-version: 14.x
+      - name: Install npm 7
+        run: npm install --global npm@7
       - name: Install dependencies
         run: npm ci
       - name: Start Sauce Connect

.github/workflows/website.yml

@@ -17,6 +17,8 @@ jobs:
           node-version: 14.x
       - name: Install dependencies
         run: npm ci
+      - name: Install npm 7
+        run: npm install --global npm@7
       - name: Build Uppy
         run: npm run build
       - name: Build website

examples/svelte-example/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@uppy-example/svelte-app",
+  "version": "0.0.0",
   "scripts": {
     "build": "rollup -c",
     "dev": "rollup -c -w",
@@ -27,10 +28,10 @@
     "typescript": "^3.9.3"
   },
   "dependencies": {
-    "@uppy/core": "^1.14.1",
-    "@uppy/svelte": "../../packages/@uppy/svelte",
-    "@uppy/webcam": "^1.8.1",
-    "@uppy/xhr-upload": "^1.6.7",
+    "@uppy/core": "file:../../packages/@uppy/core",
+    "@uppy/svelte": "file:../../packages/@uppy/svelte",
+    "@uppy/webcam": "file:../../packages/@uppy/webcam",
+    "@uppy/xhr-upload": "file:../../packages/@uppy/xhr-upload",
     "sirv-cli": "^1.0.0"
   },
   "private": true

examples/vue3/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "vue3",
+  "name": "@uppy-example/vue3",
   "version": "0.0.0",
   "scripts": {
     "dev": "vite",

netlify.toml

@@ -5,6 +5,6 @@ ID = "uppy"
 # (no main build settings, we use Github Pages)
 
 [context.deploy-preview]
-command = "npx lerna bootstrap && npm run build && npm run web:inject-disc && npm run web:build"
-environment = { NODE_VERSION = "14" }
+command = "npm run build && npm run web:inject-disc && npm run web:build"
+environment = { NODE_VERSION = "15" }
 publish = "website/public"

package.json

@@ -19,70 +19,13 @@
   ],
   "pre-commit": "lint:staged",
   "license": "MIT",
-  "dependencies": {
-    "@uppy-example/aws-companion": "file:examples/aws-companion",
-    "@uppy-example/aws-presigned-url": "file:examples/aws-presigned-url",
-    "@uppy-example/bundled": "file:examples/bundled",
-    "@uppy-example/cdn-example": "file:examples/cdn-example",
-    "@uppy-example/custom-provider": "file:examples/custom-provider",
-    "@uppy-example/dev": "file:examples/dev",
-    "@uppy-example/digitalocean-spaces": "file:examples/digitalocean-spaces",
-    "@uppy-example/multiple-instances": "file:examples/multiple-instances",
-    "@uppy-example/node-xhr": "file:examples/node-xhr",
-    "@uppy-example/php-xhr": "file:examples/php-xhr",
-    "@uppy-example/python-xhr": "file:examples/python-xhr",
-    "@uppy-example/react-example": "file:examples/react-example",
-    "@uppy-example/react-native-expo": "file:examples/react-native-expo",
-    "@uppy-example/redux": "file:examples/redux",
-    "@uppy-example/svelte-example": "file:examples/svelte-example",
-    "@uppy-example/transloadit": "file:examples/transloadit",
-    "@uppy-example/transloadit-textarea": "file:examples/transloadit-textarea",
-    "@uppy-example/uppy-with-companion": "file:examples/uppy-with-companion",
-    "@uppy-example/xhr-bundle": "file:examples/xhr-bundle",
-    "@uppy/aws-s3": "file:packages/@uppy/aws-s3",
-    "@uppy/aws-s3-multipart": "file:packages/@uppy/aws-s3-multipart",
-    "@uppy/box": "file:packages/@uppy/box",
-    "@uppy/companion": "file:packages/@uppy/companion",
-    "@uppy/companion-client": "file:packages/@uppy/companion-client",
-    "@uppy/core": "file:packages/@uppy/core",
-    "@uppy/dashboard": "file:packages/@uppy/dashboard",
-    "@uppy/drag-drop": "file:packages/@uppy/drag-drop",
-    "@uppy/dropbox": "file:packages/@uppy/dropbox",
-    "@uppy/facebook": "file:packages/@uppy/facebook",
-    "@uppy/file-input": "file:packages/@uppy/file-input",
-    "@uppy/form": "file:packages/@uppy/form",
-    "@uppy/golden-retriever": "file:packages/@uppy/golden-retriever",
-    "@uppy/google-drive": "file:packages/@uppy/google-drive",
-    "@uppy/image-editor": "file:packages/@uppy/image-editor",
-    "@uppy/informer": "file:packages/@uppy/informer",
-    "@uppy/instagram": "file:packages/@uppy/instagram",
-    "@uppy/locales": "file:packages/@uppy/locales",
-    "@uppy/onedrive": "file:packages/@uppy/onedrive",
-    "@uppy/progress-bar": "file:packages/@uppy/progress-bar",
-    "@uppy/provider-views": "file:packages/@uppy/provider-views",
-    "@uppy/react": "file:packages/@uppy/react",
-    "@uppy/react-native": "file:packages/@uppy/react-native",
-    "@uppy/redux-dev-tools": "file:packages/@uppy/redux-dev-tools",
-    "@uppy/robodog": "file:packages/@uppy/robodog",
-    "@uppy/screen-capture": "file:packages/@uppy/screen-capture",
-    "@uppy/status-bar": "file:packages/@uppy/status-bar",
-    "@uppy/store-default": "file:packages/@uppy/store-default",
-    "@uppy/store-redux": "file:packages/@uppy/store-redux",
-    "@uppy/svelte": "file:packages/@uppy/svelte",
-    "@uppy/thumbnail-generator": "file:packages/@uppy/thumbnail-generator",
-    "@uppy/transloadit": "file:packages/@uppy/transloadit",
-    "@uppy/tus": "file:packages/@uppy/tus",
-    "@uppy/unsplash": "file:packages/@uppy/unsplash",
-    "@uppy/url": "file:packages/@uppy/url",
-    "@uppy/utils": "file:packages/@uppy/utils",
-    "@uppy/webcam": "file:packages/@uppy/webcam",
-    "@uppy/xhr-upload": "file:packages/@uppy/xhr-upload",
-    "@uppy/zoom": "file:packages/@uppy/zoom",
-    "deep-freeze": "0.0.1",
-    "remark-lint-uppy": "file:private/remark-lint-uppy",
-    "uppy": "file:packages/uppy",
-    "uppy.io": "file:website"
-  },
+  "workspaces": [
+    "examples/*",
+    "packages/@uppy/*",
+    "packages/uppy",
+    "private/*",
+    "website"
+  ],
   "devDependencies": {
     "@babel/cli": "7.10.5",
     "@babel/core": "7.11.1",
@@ -96,26 +39,7 @@
     "@babel/register": "7.10.5",
     "@goto-bus-stop/envify": "5.0.0",
     "@jamen/lorem": "0.2.0",
-    "@lerna/run": "^3.21.0",
-    "@rollup/plugin-node-resolve": "^11.0.1",
     "@size-limit/preset-big-lib": "4.5.6",
-    "@tsconfig/svelte": "^1.0.10",
-    "@types/aws-serverless-express": "3.3.3",
-    "@types/compression": "1.7.0",
-    "@types/connect-redis": "0.0.7",
-    "@types/cookie-parser": "1.4.2",
-    "@types/cors": "2.8.6",
-    "@types/express-session": "1.15.16",
-    "@types/helmet": "0.0.37",
-    "@types/jsonwebtoken": "8.3.7",
-    "@types/lodash.merge": "4.6.6",
-    "@types/morgan": "1.7.37",
-    "@types/ms": "0.7.31",
-    "@types/node": "12.12.27",
-    "@types/react": "16.9.19",
-    "@types/request": "2.48.4",
-    "@types/uuid": "3.4.7",
-    "@types/ws": "6.0.4",
     "@wdio/cli": "5.18.6",
     "@wdio/local-runner": "5.18.6",
     "@wdio/mocha-framework": "5.18.6",
@@ -134,9 +58,8 @@
     "chalk": "2.4.2",
     "concat-stream": "^2.0.0",
     "cssnano": "4.1.10",
+    "deep-freeze": "^0.0.1",
     "disc": "1.3.3",
-    "enzyme": "3.11.0",
-    "enzyme-adapter-react-16": "1.15.2",
     "es6-promise": "4.2.8",
     "eslint": "7.22.0",
     "eslint-config-transloadit": "^1.2.0",
@@ -151,7 +74,7 @@
     "events.once": "2.0.2",
     "execa": "4.0.0",
     "exorcist": "1.0.1",
-    "express": "4.17.1",
+    "express": "^4.17.1",
     "fakefile": "0.0.9",
     "github-contributors-list": "1.2.4",
     "glob": "7.1.6",
@@ -168,7 +91,6 @@
     "minimist": "^1.2.5",
     "mkdirp": "0.5.1",
     "multi-glob": "1.0.2",
-    "namespace-emitter": "2.0.1",
     "nock": "9.6.1",
     "nodemon": "1.19.4",
     "npm-auth-to-token": "1.0.0",
@@ -183,21 +105,15 @@
     "pre-commit": "1.2.2",
     "react": "16.13.1",
     "react-dom": "16.13.1",
-    "redux": "4.0.5",
     "remark-cli": "^8.0.1",
+    "remark-lint-uppy": "file:private/remark-lint-uppy",
     "replace-x": "1.7.2",
     "replacestream": "^4.0.3",
     "resolve": "^1.17.0",
     "rimraf": "2.7.1",
-    "rollup": "^2.35.1",
-    "rollup-plugin-svelte": "^7.0.0",
     "sass": "1.29.0",
     "size-limit": "4.5.6",
     "stringify-object": "3.3.0",
-    "supertest": "3.4.2",
-    "svelte": "^3.31.0",
-    "svelte-check": "^1.1.23",
-    "svelte-preprocess": "^4.6.1",
     "tar": "4.4.13",
     "temp-write": "3.4.0",
     "tinyify": "3.0.0",
@@ -206,27 +122,25 @@
     "tus-node-server": "0.3.2",
     "typescript": "3.9.3",
     "verdaccio": "^4.8.0",
-    "vue": "^2.6.12",
-    "vue-template-compiler": "^2.6.11",
     "watchify": "3.11.1",
     "webdriverio": "5.18.6",
     "webpack": "4.44.1",
-    "whatwg-fetch": "3.0.0"
+    "whatwg-fetch": "3.6.2"
   },
   "scripts": {
     "bootstrap": "lerna bootstrap",
     "build:bundle": "node ./bin/build-bundle.js",
     "build:clean": "rm -rf packages/*/lib packages/@uppy/*/lib packages/*/dist packages/@uppy/*/dist",
-    "build:companion": "cd ./packages/@uppy/companion && npm run build",
+    "build:companion": "npm run --prefix ./packages/@uppy/companion build",
     "build:css": "node ./bin/build-css.js",
-    "build:svelte": "cd ./packages/@uppy/svelte && npm run build",
+    "build:svelte": "npm run --prefix ./packages/@uppy/svelte build",
     "build:js": "npm-run-all build:lib build:svelte build:companion build:locale-pack build:bundle",
     "build:lib": "node ./bin/build-lib.js",
     "build:locale-pack": "node ./bin/locale-packs.js build",
     "build": "npm-run-all --parallel build:js build:css --serial size",
     "contributors:save": "node ./bin/update-contributors.js",
     "dev:browsersync": "browser-sync start --no-open --no-ghost-mode false --server examples/dev --index Dashboard.html --port 3452 --serveStatic packages/uppy/dist --files \"examples/dev/output/*.js, packages/uppy/dist/uppy.min.css, packages/uppy/lib/**/*\"",
-    "dev:watch-sandbox": "cd examples/dev && npm run watch:sandbox",
+    "dev:watch-sandbox": "npm run --prefix examples/dev watch:sandbox",
     "dev:with-companion": "npm-run-all --parallel start:companion dev:watch-sandbox watch:js:lib watch:css dev:browsersync",
     "dev": "npm-run-all --parallel dev:watch-sandbox watch:js:lib watch:css dev:browsersync",
     "example": "node bin/run-example",
@@ -238,7 +152,7 @@
     "size": "echo 'JS Bundle mingz:' && cat ./packages/uppy/dist/uppy.min.js | gzip | wc -c && echo 'CSS Bundle mingz:' && cat ./packages/uppy/dist/uppy.min.css | gzip | wc -c",
     "start:companion": "bash ./bin/companion",
     "start": "npm-run-all --parallel watch start:companion web:start",
-    "test:companion": "cd ./packages/@uppy/companion && npm run test",
+    "test:companion": "npm run --prefix ./packages/@uppy/companion test",
     "test:endtoend:build-ci": "bash ./bin/endtoend-build-ci",
     "test:endtoend:build": "bash ./bin/endtoend-build",
     "test:endtoend:local": "npm run test:endtoend:build && wdio test/endtoend/wdio.local.conf.js",

packages/@uppy/aws-s3/package.json

@@ -29,6 +29,9 @@
     "qs-stringify": "^1.1.0",
     "url-parse": "^1.4.7"
   },
+  "devDependencies": {
+    "whatwg-fetch": "3.6.2"
+  },
   "peerDependencies": {
     "@uppy/core": "^1.0.0"
   }

packages/@uppy/companion/package.json

@@ -69,7 +69,22 @@
     "ws": "6.2.1"
   },
   "devDependencies": {
+    "@types/compression": "1.7.0",
+    "@types/connect-redis": "0.0.7",
+    "@types/cookie-parser": "1.4.2",
+    "@types/cors": "2.8.6",
+    "@types/express-session": "1.17.3",
+    "@types/helmet": "0.0.37",
+    "@types/jsonwebtoken": "8.3.7",
+    "@types/lodash.merge": "4.6.6",
+    "@types/morgan": "1.7.37",
+    "@types/ms": "0.7.31",
     "@types/node": "12.12.27",
+    "@types/react": "16.9.19",
+    "@types/request": "2.48.4",
+    "@types/uuid": "3.4.7",
+    "@types/ws": "6.0.4",
+    "supertest": "3.4.2",
     "typescript": "3.7.5"
   },
   "files": [

packages/@uppy/react/package.json

@@ -30,6 +30,10 @@
     "@uppy/utils": "file:../utils",
     "prop-types": "^15.6.1"
   },
+  "devDependencies": {
+    "enzyme": "3.11.0",
+    "enzyme-adapter-react-16": "1.15.2"
+  },
   "peerDependencies": {
     "@uppy/core": "^1.0.0",
     "react": "^16.0.0 || ^17.0.0"

packages/@uppy/robodog/package.json

@@ -42,6 +42,6 @@
     "@uppy/utils": "file:../utils",
     "@uppy/webcam": "file:../webcam",
     "es6-promise": "4.2.5",
-    "whatwg-fetch": "3.0.0"
+    "whatwg-fetch": "3.6.2"
   }
 }

packages/@uppy/store-redux/package.json

@@ -21,5 +21,8 @@
   },
   "dependencies": {
     "cuid": "^2.1.1"
+  },
+  "devDependencies": {
+    "redux": "4.0.5"
   }
 }

packages/@uppy/svelte/package.json

@@ -15,6 +15,15 @@
     "@uppy/progress-bar": "file:../progress-bar",
     "@uppy/status-bar": "file:../status-bar"
   },
+  "devDependencies": {
+    "@rollup/plugin-node-resolve": "^11.0.1",
+    "@tsconfig/svelte": "^1.0.10",
+    "rollup": "^2.35.1",
+    "rollup-plugin-svelte": "^7.0.0",
+    "svelte": "^3.31.0",
+    "svelte-check": "^1.1.23",
+    "svelte-preprocess": "^4.6.1"
+  },
   "peerDependencies": {
     "@uppy/core": "^1.0.0",
     "svelte": "^3.0.0"

packages/@uppy/thumbnail-generator/package.json

@@ -26,6 +26,9 @@
     "exifr": "^6.0.0",
     "math-log2": "^1.0.1"
   },
+  "devDependencies": {
+    "namespace-emitter": "2.0.1"
+  },
   "peerDependencies": {
     "@uppy/core": "^1.0.0"
   }

packages/@uppy/vue/package.json

@@ -4,10 +4,6 @@
   "private": false,
   "main": "lib/index.js",
   "types": "types/index.d.ts",
-  "peerDependencies": {
-    "@uppy/core": "^1.0.0",
-    "vue": ">=2.6.11"
-  },
   "dependencies": {
     "@uppy/dashboard": "file:../dashboard",
     "@uppy/drag-drop": "file:../drag-drop",
@@ -15,6 +11,13 @@
     "@uppy/status-bar": "file:../status-bar",
     "shallow-equal": "^1.2.1"
   },
+  "devDependencies": {
+    "vue": "^2.6.12"
+  },
+  "peerDependencies": {
+    "@uppy/core": "^1.0.0",
+    "vue": ">=2.6.11"
+  },
   "publishConfig": {
     "access": "public"
   }

packages/@uppy/xhr-upload/package.json

@@ -28,6 +28,9 @@
     "@uppy/utils": "file:../utils",
     "cuid": "^2.1.1"
   },
+  "devDependencies": {
+    "nock": "9.6.1"
+  },
   "peerDependencies": {
     "@uppy/core": "^1.0.0"
   }