diff --git a/bin/endtoend-build-tests b/bin/endtoend-build-tests index 257243101..4bd1757cf 100755 --- a/bin/endtoend-build-tests +++ b/bin/endtoend-build-tests @@ -20,7 +20,7 @@ for t in $tests; do cp "${__root}/test/endtoend/$t/index.html" "${__root}/test/endtoend/$t/dist" browserify "${__root}/test/endtoend/$t/main.js" \ -o "${__root}/test/endtoend/$t/dist/bundle.js" \ - -t envify \ + -t @goto-bus-stop/envify \ -t babelify done @@ -33,5 +33,5 @@ pushd "${__root}/test/endtoend/typescript" mkdir -p dist cp "${__root}/packages/uppy/dist/uppy.min.css" dist/ cp index.html dist/ - browserify main.ts -t envify -p [ tsify --target ES3 ] -o dist/bundle.js + browserify main.ts -t @goto-bus-stop/envify -p [ tsify --target ES3 ] -o dist/bundle.js popd diff --git a/examples/aws-presigned-url/package.json b/examples/aws-presigned-url/package.json index e5703278d..1e2d46b90 100644 --- a/examples/aws-presigned-url/package.json +++ b/examples/aws-presigned-url/package.json @@ -4,7 +4,7 @@ "@babel/core": "^7.4.4", "aliasify": "^2.1.0", "babelify": "^10.0.0", - "browserify": "^16.2.3", + "browserify": "^16.5.2", "fs-write-stream-atomic": "^1.0.10" }, "private": true, diff --git a/examples/transloadit-textarea/package.json b/examples/transloadit-textarea/package.json index fd36be920..37b1eecee 100644 --- a/examples/transloadit-textarea/package.json +++ b/examples/transloadit-textarea/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "aliasify": "^2.1.0", - "browserify": "^16.2.3", + "browserify": "^16.5.2", "drag-drop": "^4.2.0", "ecstatic": "^3.0.0", "marked": "^0.6.0" diff --git a/package-lock.json b/package-lock.json index 634ec78ad..e0dd02e4a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1702,6 +1702,37 @@ } } }, + "@goto-bus-stop/envify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@goto-bus-stop/envify/-/envify-5.0.0.tgz", + "integrity": "sha512-xAnxuDWmwQxO8CgVuPTxKuNsKDfwyXXTyAabG4sNoK59H/ZMC7BHxTA/4ehtinsxbcH7/9L65F5VhyNdQfUyqA==", + "dev": true, + "requires": { + "acorn-node": "^2.0.1", + "dash-ast": "^2.0.1", + "multisplice": "^1.0.0", + "through2": "^2.0.5" + }, + "dependencies": { + "acorn-node": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-2.0.1.tgz", + "integrity": "sha512-VLR5sHqjk+8c5hrKeP2fWaIHb8eewsoxnZ8r2qpwRHXMHuC7KyOPflnOx9dLssVQUurzJ7rO0OzIFjHcndafWw==", + "dev": true, + "requires": { + "acorn": "^7.0.0", + "acorn-walk": "^7.0.0", + "xtend": "^4.0.2" + } + }, + "dash-ast": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-2.0.1.tgz", + "integrity": "sha512-5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ==", + "dev": true + } + } + }, "@goto-bus-stop/hexo-renderer-postcss": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@goto-bus-stop/hexo-renderer-postcss/-/hexo-renderer-postcss-2.0.0.tgz", @@ -7357,6 +7388,16 @@ "@types/node": "*" } }, + "@types/browserify": { + "version": "12.0.36", + "resolved": "https://registry.npmjs.org/@types/browserify/-/browserify-12.0.36.tgz", + "integrity": "sha512-hYXvPod5upkYTC7auziOATFsu/0MGxozbzNI80sZV044JTF7UtstHeNOM52b+bg7/taZ3fheK7oeb+jpm4C0/w==", + "dev": true, + "requires": { + "@types/insert-module-globals": "*", + "@types/node": "*" + } + }, "@types/caseless": { "version": "0.12.2", "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz", @@ -7482,6 +7523,15 @@ "@types/express": "*" } }, + "@types/insert-module-globals": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@types/insert-module-globals/-/insert-module-globals-7.0.1.tgz", + "integrity": "sha512-qtSfo/jdYHO4jNO6QCp4CwR/TPrvR39Yan5K4nPU1iCmxcnTWiERKDXcvFGuXEmfpjrHeOCvrZPa0UrUsy+mvA==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/invariant": { "version": "2.2.33", "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.33.tgz", @@ -7854,7 +7904,7 @@ "@babel/core": "^7.4.4", "aliasify": "^2.1.0", "babelify": "^10.0.0", - "browserify": "^16.2.3", + "browserify": "^16.5.2", "fs-write-stream-atomic": "^1.0.10" }, "dependencies": { @@ -8395,7 +8445,7 @@ "version": "file:examples/transloadit-textarea", "requires": { "aliasify": "^2.1.0", - "browserify": "^16.2.3", + "browserify": "^16.5.2", "drag-drop": "^4.2.0", "ecstatic": "^3.0.0", "marked": "^0.6.0" @@ -12323,18 +12373,12 @@ "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==" }, "browser-resolve": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz", - "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz", + "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==", + "dev": true, "requires": { - "resolve": "1.1.7" - }, - "dependencies": { - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=" - } + "resolve": "^1.17.0" } }, "browser-stdout": { @@ -12774,14 +12818,14 @@ } }, "browserify": { - "version": "16.5.1", - "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.5.1.tgz", - "integrity": "sha512-EQX0h59Pp+0GtSRb5rL6OTfrttlzv+uyaUVlK6GX3w11SQ0jKPKyjC/54RhPR2ib2KmfcELM06e8FxcI5XNU2A==", + "version": "16.5.2", + "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.5.2.tgz", + "integrity": "sha512-TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g==", "requires": { "JSONStream": "^1.0.3", "assert": "^1.4.0", "browser-pack": "^6.0.1", - "browser-resolve": "^1.11.0", + "browser-resolve": "^2.0.0", "browserify-zlib": "~0.2.0", "buffer": "~5.2.1", "cached-path-relative": "^1.0.0", @@ -12802,7 +12846,7 @@ "insert-module-globals": "^7.0.0", "labeled-stream-splicer": "^2.0.0", "mkdirp-classic": "^0.5.2", - "module-deps": "^6.0.0", + "module-deps": "^6.2.3", "os-browserify": "~0.3.0", "parents": "^1.0.1", "path-browserify": "~0.0.0", @@ -12828,6 +12872,14 @@ "xtend": "^4.0.0" }, "dependencies": { + "browser-resolve": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz", + "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==", + "requires": { + "resolve": "^1.17.0" + } + }, "concat-stream": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", @@ -17216,24 +17268,6 @@ "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==", "dev": true }, - "envify": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/envify/-/envify-4.1.0.tgz", - "integrity": "sha512-IKRVVoAYr4pIx4yIWNsz9mOsboxlNXiu7TNBnem/K/uTHdkyzXWDzHCK7UTolqBbgaBz0tQHsD3YNls0uIIjiw==", - "dev": true, - "requires": { - "esprima": "^4.0.0", - "through": "~2.3.4" - }, - "dependencies": { - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - } - } - }, "envinfo": { "version": "7.5.1", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.5.1.tgz", @@ -25048,6 +25082,23 @@ "color-convert": "^2.0.1" } }, + "browser-resolve": { + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz", + "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==", + "dev": true, + "requires": { + "resolve": "1.1.7" + }, + "dependencies": { + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + } + } + }, "chalk": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", @@ -29461,25 +29512,19 @@ "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==" }, "minify-stream": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/minify-stream/-/minify-stream-1.2.1.tgz", - "integrity": "sha512-C6CESrYf8sncwbvS5rAb2kjKmWDswoZxoTN2agmAGKygdC/VqB1kDwpv19ZRMFvd7assj9lNgZcBGhh6PVByrg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/minify-stream/-/minify-stream-2.0.1.tgz", + "integrity": "sha512-DAaWEQKgVHG7SbOmQxwzJZuErKCGdaPFehKyM/Dezo8FrNKsXMmUtsUMa1n7cjftAGp/CH/mzh8kjWTW7MTzMg==", "dev": true, "requires": { "concat-stream": "^2.0.0", "convert-source-map": "^1.5.0", "duplexify": "^4.1.1", "from2-string": "^1.1.0", - "terser": "3.16.1", + "terser": "^4.7.0", "xtend": "^4.0.1" }, "dependencies": { - "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", - "dev": true - }, "duplexify": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz", @@ -29510,14 +29555,14 @@ "dev": true }, "terser": { - "version": "3.16.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz", - "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", + "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", "dev": true, "requires": { - "commander": "~2.17.1", + "commander": "^2.20.0", "source-map": "~0.6.1", - "source-map-support": "~0.5.9" + "source-map-support": "~0.5.12" } } } @@ -29817,12 +29862,12 @@ "dev": true }, "module-deps": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.2.tgz", - "integrity": "sha512-a9y6yDv5u5I4A+IPHTnqFxcaKr4p50/zxTjcQJaX2ws9tN/W6J6YXnEKhqRyPhl494dkcxx951onSKVezmI+3w==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz", + "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==", "requires": { "JSONStream": "^1.0.3", - "browser-resolve": "^1.7.0", + "browser-resolve": "^2.0.0", "cached-path-relative": "^1.0.2", "concat-stream": "~1.6.0", "defined": "^1.0.0", @@ -29838,6 +29883,14 @@ "xtend": "^4.0.0" }, "dependencies": { + "browser-resolve": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz", + "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==", + "requires": { + "resolve": "^1.17.0" + } + }, "concat-stream": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", @@ -39255,23 +39308,65 @@ "integrity": "sha1-JaZ/LG4lOyypQZd7XvdELvl6YEY=" }, "tinyify": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/tinyify/-/tinyify-2.5.2.tgz", - "integrity": "sha512-vFQ3nClAXbIw1nlJ9G9GNcS8CCS9Fb73MIj9JrsIvCZoQ0axfB7Hp3BcHsSnjPmazsZmt7GC6tPuMbvm+KHSYw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tinyify/-/tinyify-3.0.0.tgz", + "integrity": "sha512-RtjVjC1xwwxt8AMVfxEmo+FzRJB6p5sAOtFaJj8vMrkWShtArsM4dLVRWhx2Vc07Me3NWgmP7pi9UPm/a2XNNA==", "dev": true, "requires": { + "@goto-bus-stop/envify": "^5.0.0", "acorn-node": "^1.8.2", "browser-pack-flat": "^3.0.9", "bundle-collapser": "^1.3.0", "common-shakeify": "^0.6.0", "dash-ast": "^1.0.0", - "minify-stream": "^1.2.1", + "minify-stream": "^2.0.1", "multisplice": "^1.0.0", "through2": "^3.0.1", "uglifyify": "^5.0.0", "unassertify": "^2.1.1" }, "dependencies": { + "@goto-bus-stop/envify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@goto-bus-stop/envify/-/envify-5.0.0.tgz", + "integrity": "sha512-xAnxuDWmwQxO8CgVuPTxKuNsKDfwyXXTyAabG4sNoK59H/ZMC7BHxTA/4ehtinsxbcH7/9L65F5VhyNdQfUyqA==", + "dev": true, + "requires": { + "acorn-node": "^2.0.1", + "dash-ast": "^2.0.1", + "multisplice": "^1.0.0", + "through2": "^2.0.5" + }, + "dependencies": { + "acorn-node": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-2.0.1.tgz", + "integrity": "sha512-VLR5sHqjk+8c5hrKeP2fWaIHb8eewsoxnZ8r2qpwRHXMHuC7KyOPflnOx9dLssVQUurzJ7rO0OzIFjHcndafWw==", + "dev": true, + "requires": { + "acorn": "^7.0.0", + "acorn-walk": "^7.0.0", + "xtend": "^4.0.2" + } + }, + "dash-ast": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-2.0.1.tgz", + "integrity": "sha512-5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ==", + "dev": true + }, + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "dev": true, + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + } + } + }, "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -39970,17 +40065,26 @@ } }, "tsify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/tsify/-/tsify-4.0.1.tgz", - "integrity": "sha512-ClznEI+pmwY5wmD0J7HCSVERwkD+l71ch3Dqyod2JuQLEsFaiNDI+vPjaGadsuVFVvmzgoI7HghrBtWsSmCDHQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/tsify/-/tsify-5.0.1.tgz", + "integrity": "sha512-yqrGk0+XcS8HZK9oF9gix+mHBmefRRFbhtypnqus5TXjGulAo5LkQ8DAF6gptF7EAnM8nRdMJw0nyoS1Zpl3xA==", "dev": true, "requires": { + "@types/browserify": "^12.0.36", "convert-source-map": "^1.1.0", "fs.realpath": "^1.0.0", "object-assign": "^4.1.0", - "semver": "^5.6.0", + "semver": "^6.1.0", "through2": "^2.0.0", "tsconfig": "^5.0.3" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, "tslib": { @@ -40967,7 +41071,7 @@ "aliasify": "^2.1.0", "autoprefixer": "^9.5.1", "babelify": "^10.0.0", - "browserify": "^16.2.2", + "browserify": "^16.5.2", "chalk": "2.4.2", "cssnano": "^4.1.10", "drag-drop": "^4.2.0", diff --git a/package.json b/package.json index 8c05d43c4..4e3a06aa6 100644 --- a/package.json +++ b/package.json @@ -89,6 +89,7 @@ "@babel/polyfill": "7.10.4", "@babel/preset-env": "7.11.0", "@babel/register": "7.10.5", + "@goto-bus-stop/envify": "5.0.0", "@jamen/lorem": "0.2.0", "@lerna/run": "^3.21.0", "@octokit/rest": "16.43.1", @@ -122,15 +123,14 @@ "babel-plugin-inline-package-json": "2.0.0", "babelify": "10.0.0", "brake": "1.0.1", - "browser-resolve": "1.11.3", + "browser-resolve": "2.0.0", "browser-sync": "2.26.7", - "browserify": "16.5.1", + "browserify": "16.5.2", "chai": "4.2.0", "chalk": "2.4.2", "concat-stream": "^2.0.0", "cssnano": "4.1.10", "disc": "1.3.3", - "envify": "4.1.0", "enzyme": "3.11.0", "enzyme-adapter-react-16": "1.15.2", "es6-promise": "4.2.8", @@ -162,7 +162,7 @@ "lerna": "^3.22.1", "lint-staged": "9.5.0", "mime-types": "2.1.26", - "minify-stream": "1.2.1", + "minify-stream": "2.0.1", "minimist": "^1.2.5", "mkdirp": "0.5.1", "multi-glob": "1.0.2", @@ -191,10 +191,10 @@ "supertest": "3.4.2", "tar": "4.4.13", "temp-write": "3.4.0", - "tinyify": "2.5.2", + "tinyify": "3.0.0", "touch": "3.1.0", "tsd": "^0.11.0", - "tsify": "4.0.1", + "tsify": "5.0.1", "tus-node-server": "0.3.2", "typescript": "3.7.5", "verdaccio": "^4.8.0", diff --git a/website/package.json b/website/package.json index ca39a79b0..5dda97cda 100644 --- a/website/package.json +++ b/website/package.json @@ -10,7 +10,7 @@ "aliasify": "^2.1.0", "autoprefixer": "^9.5.1", "babelify": "^10.0.0", - "browserify": "^16.2.2", + "browserify": "^16.5.2", "chalk": "2.4.2", "cssnano": "^4.1.10", "drag-drop": "^4.2.0",