From d1289d6b9aaddcf03f0bae1a563846bc85c25cc9 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 2 Aug 2021 12:23:07 +0200 Subject: [PATCH] @uppy/angular: fix uppy dependencies --- examples/react-native-expo/package.json | 2 +- package-lock.json | 98 +++---------------------- packages/@uppy/angular/package.json | 8 +- 3 files changed, 17 insertions(+), 91 deletions(-) diff --git a/examples/react-native-expo/package.json b/examples/react-native-expo/package.json index 057e59a80..7d2877edf 100644 --- a/examples/react-native-expo/package.json +++ b/examples/react-native-expo/package.json @@ -5,7 +5,7 @@ "@uppy/dashboard": "file:../../packages/@uppy/dashboard", "@uppy/instagram": "file:../../packages/@uppy/instagram", "@uppy/react-native": "file:../../packages/@uppy/react-native", - "@uppy/tus": "1.6.0", + "@uppy/tus": "file:../../packages/@uppy/tus", "@uppy/url": "file:../../packages/@uppy/url", "@uppy/xhr-upload": "file:../../packages/@uppy/xhr-upload", "babel-preset-expo": "^5.0.0", diff --git a/package-lock.json b/package-lock.json index 02a857794..4cf429729 100644 --- a/package-lock.json +++ b/package-lock.json @@ -106,6 +106,7 @@ "whatwg-fetch": "^3.6.2" }, "engines": { + "node": "^v14.17.0 || >=v16.0.0", "npm": "7.x" } }, @@ -629,7 +630,7 @@ "@uppy/dashboard": "file:../../packages/@uppy/dashboard", "@uppy/instagram": "file:../../packages/@uppy/instagram", "@uppy/react-native": "file:../../packages/@uppy/react-native", - "@uppy/tus": "1.6.0", + "@uppy/tus": "file:../../packages/@uppy/tus", "@uppy/url": "file:../../packages/@uppy/url", "@uppy/xhr-upload": "file:../../packages/@uppy/xhr-upload", "babel-preset-expo": "^5.0.0", @@ -641,39 +642,6 @@ "react-native-svg-uri": "gaboelnuevo/react-native-svg-uri#473e4f958e8846cbd5c69ce5cf59753cd5cea748" } }, - "examples/react-native-expo/node_modules/@uppy/tus": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@uppy/tus/-/tus-1.6.0.tgz", - "integrity": "sha512-cRQ5Qw87SNS4b2v+UfjUW5uAVx4nv6pj9I0cu6ys8x+t7NjVo3cOjaT4Bns1/xxy6xzWv/4WT0LbG5h+NNGNMA==", - "dependencies": { - "@types/tus-js-client": "^1.8.0", - "@uppy/companion-client": "^1.5.0", - "@uppy/utils": "^3.1.0", - "tus-js-client": "^1.8.0" - }, - "peerDependencies": { - "@uppy/core": "^1.0.0" - } - }, - "examples/react-native-expo/node_modules/buffer-from": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz", - "integrity": "sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg==" - }, - "examples/react-native-expo/node_modules/tus-js-client": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/tus-js-client/-/tus-js-client-1.8.0.tgz", - "integrity": "sha512-qPX3TywqzxocTxUZtcS8X7Aik72SVMa0jKi4hWyfvRV+s9raVzzYGaP4MoJGaF0yOgm2+b6jXaVEHogxcJ8LGw==", - "dependencies": { - "buffer-from": "^0.1.1", - "combine-errors": "^3.0.3", - "extend": "^3.0.2", - "js-base64": "^2.4.9", - "lodash.throttle": "^4.1.1", - "proper-lockfile": "^2.0.1", - "url-parse": "^1.4.3" - } - }, "examples/redux": { "name": "@uppy-example/redux", "dependencies": { @@ -14684,11 +14652,6 @@ "integrity": "sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg==", "dev": true }, - "node_modules/@types/tus-js-client": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@types/tus-js-client/-/tus-js-client-1.8.0.tgz", - "integrity": "sha512-lWxu5+6qfyfwsW99GzUeJ9y9JeOSSLduKxgYMvaYM7sGTDKZsrIIHTUbHI2P016xhXtu9NxmUM3GrB4i14ie4A==" - }, "node_modules/@types/uglify-js": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz", @@ -75411,10 +75374,10 @@ "@angular/platform-browser": "~12.1.0", "@angular/platform-browser-dynamic": "~12.1.0", "@angular/router": "~12.1.0", - "@uppy/dashboard": "1.20.2", - "@uppy/drag-drop": "1.4.30", - "@uppy/progress-bar": "1.3.30", - "@uppy/status-bar": "1.9.6", + "@uppy/dashboard": "file:../dashboard", + "@uppy/drag-drop": "file:../drag-drop", + "@uppy/progress-bar": "file:../progress-bar", + "@uppy/status-bar": "file:../status-bar", "prop-types": "^15.7.2", "rxjs": "^6.5.3", "tslib": "^2.0.0", @@ -88015,11 +87978,6 @@ "integrity": "sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg==", "dev": true }, - "@types/tus-js-client": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@types/tus-js-client/-/tus-js-client-1.8.0.tgz", - "integrity": "sha512-lWxu5+6qfyfwsW99GzUeJ9y9JeOSSLduKxgYMvaYM7sGTDKZsrIIHTUbHI2P016xhXtu9NxmUM3GrB4i14ie4A==" - }, "@types/uglify-js": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz", @@ -88993,7 +88951,7 @@ "@uppy/dashboard": "file:../../packages/@uppy/dashboard", "@uppy/instagram": "file:../../packages/@uppy/instagram", "@uppy/react-native": "file:../../packages/@uppy/react-native", - "@uppy/tus": "1.6.0", + "@uppy/tus": "file:../../packages/@uppy/tus", "@uppy/url": "file:../../packages/@uppy/url", "@uppy/xhr-upload": "file:../../packages/@uppy/xhr-upload", "babel-preset-expo": "^5.0.0", @@ -89003,38 +88961,6 @@ "react": "^16.8.6", "react-native": "https://github.com/expo/react-native/archive/sdk-32.0.0.tar.gz", "react-native-svg-uri": "gaboelnuevo/react-native-svg-uri#473e4f958e8846cbd5c69ce5cf59753cd5cea748" - }, - "dependencies": { - "@uppy/tus": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@uppy/tus/-/tus-1.6.0.tgz", - "integrity": "sha512-cRQ5Qw87SNS4b2v+UfjUW5uAVx4nv6pj9I0cu6ys8x+t7NjVo3cOjaT4Bns1/xxy6xzWv/4WT0LbG5h+NNGNMA==", - "requires": { - "@types/tus-js-client": "^1.8.0", - "@uppy/companion-client": "^1.5.0", - "@uppy/utils": "^3.1.0", - "tus-js-client": "^1.8.0" - } - }, - "buffer-from": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz", - "integrity": "sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg==" - }, - "tus-js-client": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/tus-js-client/-/tus-js-client-1.8.0.tgz", - "integrity": "sha512-qPX3TywqzxocTxUZtcS8X7Aik72SVMa0jKi4hWyfvRV+s9raVzzYGaP4MoJGaF0yOgm2+b6jXaVEHogxcJ8LGw==", - "requires": { - "buffer-from": "^0.1.1", - "combine-errors": "^3.0.3", - "extend": "^3.0.2", - "js-base64": "^2.4.9", - "lodash.throttle": "^4.1.1", - "proper-lockfile": "^2.0.1", - "url-parse": "^1.4.3" - } - } } }, "@uppy-example/redux": { @@ -89361,10 +89287,10 @@ "@types/node": "^12.11.1", "@typescript-eslint/eslint-plugin": "^4.28.2", "@typescript-eslint/parser": "^4.28.2", - "@uppy/dashboard": "1.20.2", - "@uppy/drag-drop": "1.4.30", - "@uppy/progress-bar": "1.3.30", - "@uppy/status-bar": "1.9.6", + "@uppy/dashboard": "file:../dashboard", + "@uppy/drag-drop": "file:../drag-drop", + "@uppy/progress-bar": "file:../progress-bar", + "@uppy/status-bar": "file:../status-bar", "babel-loader": "^8.1.0", "eslint": "^7.22.0", "eslint-plugin-import": "^2.22.1", @@ -89718,7 +89644,7 @@ "@uppy/google-drive": "*", "@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", diff --git a/packages/@uppy/angular/package.json b/packages/@uppy/angular/package.json index 6b40e5850..542c51629 100644 --- a/packages/@uppy/angular/package.json +++ b/packages/@uppy/angular/package.json @@ -23,10 +23,10 @@ "@angular/platform-browser": "~12.1.0", "@angular/platform-browser-dynamic": "~12.1.0", "@angular/router": "~12.1.0", - "@uppy/dashboard": "1.20.2", - "@uppy/drag-drop": "1.4.30", - "@uppy/progress-bar": "1.3.30", - "@uppy/status-bar": "1.9.6", + "@uppy/dashboard": "file:../dashboard", + "@uppy/drag-drop": "file:../drag-drop", + "@uppy/progress-bar": "file:../progress-bar", + "@uppy/status-bar": "file:../status-bar", "prop-types": "^15.7.2", "rxjs": "^6.5.3", "tslib": "^2.0.0",