From 5b45684ed2f424cf5993f03d6003edbc16027e11 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 17 Aug 2021 20:14:05 +0200 Subject: [PATCH] build: fix legacy bundle (#3112) The legacy bundle was missing `regenerator-runtime` dependency and was not defining `Uppy` global. --- package-lock.json | 48 +++++++++++++++++++++++------ package.json | 6 +--- packages/@uppy/robodog/package.json | 5 ++- packages/uppy/bundle.js | 5 ++- packages/uppy/package.json | 8 +++++ 5 files changed, 56 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index b045eae18..1a94bc1cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,6 @@ "@types/jasminewd2": "file:./private/@types/jasmine", "@typescript-eslint/eslint-plugin": "^4.28.2", "@typescript-eslint/parser": "^4.28.2", - "abortcontroller-polyfill": "^1.7.3", "adm-zip": "^0.5.5", "aliasify": "^2.1.0", "autoprefixer": "^10.2.6", @@ -72,7 +71,6 @@ "last-commit-message": "^1.0.0", "lerna": "^4.0.0", "lint-staged": "^11.0.0", - "md-gum-polyfill": "^1.0.0", "mime-types": "^2.1.26", "minify-stream": "^2.0.1", "multi-glob": "^1.0.2", @@ -90,7 +88,6 @@ "remark-cli": "^9.0.0", "remark-lint-uppy": "file:private/remark-lint-uppy", "replacestream": "^4.0.3", - "resize-observer-polyfill": "^1.5.1", "resolve": "^1.17.0", "sass": "^1.29.0", "size-limit": "4.5.6", @@ -103,8 +100,7 @@ "tsify": "^5.0.1", "typescript": "~4.3", "verdaccio": "^5.1.1", - "watchify": "^4.0.0", - "whatwg-fetch": "^3.6.2" + "watchify": "^4.0.0" }, "engines": { "node": "^v14.17.0 || >=v16.0.0", @@ -76335,7 +76331,10 @@ "@uppy/webcam": "file:../webcam" }, "devDependencies": { - "core-js": "^3.15.2", + "abortcontroller-polyfill": "^1.7.3", + "core-js": "~3.15.2", + "md-gum-polyfill": "^1.0.0", + "resize-observer-polyfill": "^1.5.1", "whatwg-fetch": "^3.6.2" } }, @@ -76629,8 +76628,22 @@ "@uppy/url": "file:../@uppy/url", "@uppy/webcam": "file:../@uppy/webcam", "@uppy/xhr-upload": "file:../@uppy/xhr-upload" + }, + "devDependencies": { + "abortcontroller-polyfill": "^1.7.3", + "core-js": "~3.15.2", + "md-gum-polyfill": "^1.0.0", + "regenerator-runtime": "0.13.9", + "resize-observer-polyfill": "^1.5.1", + "whatwg-fetch": "^3.6.2" } }, + "packages/uppy/node_modules/regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", + "dev": true + }, "private/@types/jasmine": { "version": "0.0.0", "dev": true @@ -90055,7 +90068,7 @@ "@uppy/google-drive": "2.0.0-alpha.0", "@uppy/informer": "file:../informer", "@uppy/provider-views": "file:../provider-views", - "@uppy/status-bar": "file:../status-bar", + "@uppy/status-bar": "*", "@uppy/thumbnail-generator": "file:../thumbnail-generator", "@uppy/utils": "file:../utils", "classnames": "^2.2.6", @@ -90247,7 +90260,10 @@ "@uppy/url": "file:../url", "@uppy/utils": "file:../utils", "@uppy/webcam": "file:../webcam", - "core-js": "^3.15.2", + "abortcontroller-polyfill": "^1.7.3", + "core-js": "~3.15.2", + "md-gum-polyfill": "^1.0.0", + "resize-observer-polyfill": "^1.5.1", "whatwg-fetch": "^3.6.2" } }, @@ -135417,7 +135433,21 @@ "@uppy/unsplash": "file:../@uppy/unsplash", "@uppy/url": "file:../@uppy/url", "@uppy/webcam": "file:../@uppy/webcam", - "@uppy/xhr-upload": "file:../@uppy/xhr-upload" + "@uppy/xhr-upload": "file:../@uppy/xhr-upload", + "abortcontroller-polyfill": "^1.7.3", + "core-js": "~3.15.2", + "md-gum-polyfill": "^1.0.0", + "regenerator-runtime": "0.13.9", + "resize-observer-polyfill": "^1.5.1", + "whatwg-fetch": "^3.6.2" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", + "dev": true + } } }, "uppy.io": { diff --git a/package.json b/package.json index 6cf401ecf..ca5d6636e 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,6 @@ "@types/jasminewd2": "file:./private/@types/jasmine", "@typescript-eslint/eslint-plugin": "^4.28.2", "@typescript-eslint/parser": "^4.28.2", - "abortcontroller-polyfill": "^1.7.3", "adm-zip": "^0.5.5", "aliasify": "^2.1.0", "autoprefixer": "^10.2.6", @@ -91,7 +90,6 @@ "last-commit-message": "^1.0.0", "lerna": "^4.0.0", "lint-staged": "^11.0.0", - "md-gum-polyfill": "^1.0.0", "mime-types": "^2.1.26", "minify-stream": "^2.0.1", "multi-glob": "^1.0.2", @@ -109,7 +107,6 @@ "remark-cli": "^9.0.0", "remark-lint-uppy": "file:private/remark-lint-uppy", "replacestream": "^4.0.3", - "resize-observer-polyfill": "^1.5.1", "resolve": "^1.17.0", "sass": "^1.29.0", "size-limit": "4.5.6", @@ -122,8 +119,7 @@ "tsify": "^5.0.1", "typescript": "~4.3", "verdaccio": "^5.1.1", - "watchify": "^4.0.0", - "whatwg-fetch": "^3.6.2" + "watchify": "^4.0.0" }, "scripts": { "bootstrap": "lerna bootstrap", diff --git a/packages/@uppy/robodog/package.json b/packages/@uppy/robodog/package.json index 57f9a8c31..0ba59c11d 100644 --- a/packages/@uppy/robodog/package.json +++ b/packages/@uppy/robodog/package.json @@ -43,7 +43,10 @@ "@uppy/webcam": "file:../webcam" }, "devDependencies": { - "core-js": "^3.15.2", + "abortcontroller-polyfill": "^1.7.3", + "core-js": "~3.15.2", + "md-gum-polyfill": "^1.0.0", + "resize-observer-polyfill": "^1.5.1", "whatwg-fetch": "^3.6.2" } } diff --git a/packages/uppy/bundle.js b/packages/uppy/bundle.js index 0cef911f3..0ec3afd22 100644 --- a/packages/uppy/bundle.js +++ b/packages/uppy/bundle.js @@ -8,4 +8,7 @@ const ResizeObserver = require('resize-observer-polyfill') if (typeof window.ResizeObserver !== 'function') window.ResizeObserver = ResizeObserver -module.exports = require('.') +// Needed for Babel +require("regenerator-runtime/runtime"); + +globalThis.Uppy = module.exports = require('.') diff --git a/packages/uppy/package.json b/packages/uppy/package.json index 18253446f..abc620969 100644 --- a/packages/uppy/package.json +++ b/packages/uppy/package.json @@ -63,5 +63,13 @@ "@uppy/url": "file:../@uppy/url", "@uppy/webcam": "file:../@uppy/webcam", "@uppy/xhr-upload": "file:../@uppy/xhr-upload" + }, + "devDependencies": { + "abortcontroller-polyfill": "^1.7.3", + "core-js": "~3.15.2", + "md-gum-polyfill": "^1.0.0", + "regenerator-runtime": "0.13.9", + "resize-observer-polyfill": "^1.5.1", + "whatwg-fetch": "^3.6.2" } }