diff --git a/.babelrc b/.babelrc index 2aaf3cd1..de03c857 100644 --- a/.babelrc +++ b/.babelrc @@ -5,7 +5,6 @@ { "modules": false, "corejs": false, - "forceAllTransforms": true } ] ] diff --git a/.browserslistrc b/.browserslistrc new file mode 100644 index 00000000..2c90ae7e --- /dev/null +++ b/.browserslistrc @@ -0,0 +1,2 @@ +> 0.25% +not dead diff --git a/lib/upload.js b/lib/upload.js index e564de34..7c640f38 100644 --- a/lib/upload.js +++ b/lib/upload.js @@ -1,5 +1,3 @@ -import { Base64 } from 'js-base64' -import URL from 'url-parse' import DetailedError from './error.js' import { log } from './logger.js' import uuid from './uuid.js' @@ -938,7 +936,7 @@ class BaseUpload { function encodeMetadata(metadata) { return Object.entries(metadata) - .map(([key, value]) => `${key} ${Base64.encode(String(value))}`) + .map(([key, value]) => `${key} ${btoa(String(value))}`) .join(',') } diff --git a/package.json b/package.json index dae89fa0..b4afe1cf 100644 --- a/package.json +++ b/package.json @@ -83,10 +83,8 @@ "buffer-from": "^1.1.2", "combine-errors": "^3.0.3", "is-stream": "^2.0.0", - "js-base64": "^3.7.2", "lodash.throttle": "^4.1.1", - "proper-lockfile": "^4.1.2", - "url-parse": "^1.5.7" + "proper-lockfile": "^4.1.2" }, "scripts": { "build-test-bundle": "mkdir -p dist && browserify test/spec/browser-index.js -t [ babelify --plugins [ @babel/transform-modules-commonjs ] ] -d -o dist/browser-test-bundle.js", @@ -108,5 +106,9 @@ "fix:formatting": "prettier --write .", "lint:formatting": "prettier --check .", "fix": "yarn fix:formatting" + }, + "volta": { + "node": "20.12.2", + "yarn": "1.22.19" } } diff --git a/yarn.lock b/yarn.lock index aba0ee76..daf8f6d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4288,11 +4288,6 @@ jest-get-type@^29.4.3: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5" integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg== -js-base64@^3.7.2: - version "3.7.7" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.7.tgz#e51b84bf78fbf5702b9541e2cb7bfcb893b43e79" - integrity sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw== - "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -5421,11 +5416,6 @@ querystring@0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= -querystringify@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" - integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== - queue-microtask@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3" @@ -6703,14 +6693,6 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -url-parse@^1.5.7: - version "1.5.10" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" - integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - url@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"