From 9b14ed069f03633dc1e11d1ca4a7118c7f5f9b1c Mon Sep 17 00:00:00 2001
From: Ruy Adorno
Date: Fri, 12 Feb 2021 13:33:14 -0500
Subject: [PATCH] deps: upgrade npm to 7.5.4
---
deps/npm/CHANGELOG.md | 68 +
deps/npm/docs/content/commands/npm-diff.md | 12 +-
deps/npm/docs/output/commands/npm-diff.html | 12 +-
deps/npm/docs/output/commands/npm-ls.html | 2 +-
deps/npm/docs/output/commands/npm.html | 2 +-
deps/npm/lib/run-script.js | 2 +-
deps/npm/lib/shrinkwrap.js | 4 +-
deps/npm/lib/utils/reify-finish.js | 4 +-
deps/npm/man/man1/npm-diff.1 | 12 +-
deps/npm/man/man1/npm-ls.1 | 2 +-
deps/npm/man/man1/npm.1 | 2 +-
.../@npmcli/arborist/bin/ideal.js | 56 +-
.../@npmcli/arborist/bin/lib/logging.js | 2 +-
.../arborist/lib/arborist/build-ideal-tree.js | 67 +-
.../arborist/lib/arborist/load-virtual.js | 42 +-
.../@npmcli/arborist/lib/arborist/reify.js | 12 +-
.../@npmcli/arborist/lib/calc-dep-flags.js | 2 +-
.../@npmcli/arborist/package.json | 2 +-
.../npm/node_modules/@npmcli/git/package.json | 4 +-
.../@npmcli/map-workspaces/README.md | 30 +-
.../@npmcli/map-workspaces/package.json | 2 +-
.../node_modules/@npmcli/move-file/index.js | 4 +-
.../@npmcli/move-file/package.json | 2 +-
.../node_modules/@npmcli/node-gyp/README.md | 16 +
.../@npmcli/node-gyp/lib/index.js | 3 +-
.../@npmcli/node-gyp/package.json | 3 +-
.../run-script/lib/is-server-package.js | 4 +-
.../@npmcli/run-script/package.json | 4 +-
.../node_modules/agentkeepalive/History.md | 6 +
.../node_modules/agentkeepalive/index.d.ts | 2 +-
.../node_modules/agentkeepalive/package.json | 2 +-
.../node_modules/bcrypt-pbkdf/CONTRIBUTING.md | 13 +
deps/npm/node_modules/cmd-shim/index.js | 87 +-
deps/npm/node_modules/cmd-shim/package.json | 3 +-
.../node_modules => }/diff/CONTRIBUTING.md | 0
.../node_modules => }/diff/LICENSE | 0
.../node_modules => }/diff/README.md | 0
.../node_modules => }/diff/dist/diff.js | 0
.../node_modules => }/diff/lib/convert/dmp.js | 0
.../node_modules => }/diff/lib/convert/xml.js | 0
.../node_modules => }/diff/lib/diff/array.js | 0
.../node_modules => }/diff/lib/diff/base.js | 0
.../diff/lib/diff/character.js | 0
.../node_modules => }/diff/lib/diff/css.js | 0
.../node_modules => }/diff/lib/diff/json.js | 0
.../node_modules => }/diff/lib/diff/line.js | 0
.../diff/lib/diff/sentence.js | 0
.../node_modules => }/diff/lib/diff/word.js | 0
.../node_modules => }/diff/lib/index.es6.js | 0
.../node_modules => }/diff/lib/index.js | 0
.../node_modules => }/diff/lib/index.mjs | 0
.../node_modules => }/diff/lib/patch/apply.js | 0
.../diff/lib/patch/create.js | 0
.../node_modules => }/diff/lib/patch/merge.js | 0
.../node_modules => }/diff/lib/patch/parse.js | 0
.../node_modules => }/diff/lib/util/array.js | 0
.../diff/lib/util/distance-iterator.js | 0
.../node_modules => }/diff/lib/util/params.js | 0
.../node_modules => }/diff/package.json | 0
.../node_modules => }/diff/release-notes.md | 0
.../node_modules => }/diff/runtime.js | 0
deps/npm/node_modules/err-code/.eslintrc.json | 2 +-
deps/npm/node_modules/err-code/.npmignore | 2 -
deps/npm/node_modules/err-code/.travis.yml | 3 +-
deps/npm/node_modules/err-code/README.md | 26 +-
deps/npm/node_modules/err-code/index.js | 45 +-
deps/npm/node_modules/err-code/index.umd.js | 49 +-
deps/npm/node_modules/err-code/package.json | 8 +-
deps/npm/node_modules/err-code/test/test.js | 167 +-
.../node_modules/graceful-fs/graceful-fs.js | 10 +-
.../npm/node_modules/graceful-fs/package.json | 7 +-
.../npm/node_modules/graceful-fs/polyfills.js | 13 +-
deps/npm/node_modules/ip-regex/index.js | 20 +-
deps/npm/node_modules/ip-regex/package.json | 2 +-
deps/npm/node_modules/ip-regex/readme.md | 2 +-
.../json-stringify-nice/package-lock.json | 3447 ++++++++++++++++
deps/npm/node_modules/jsprim/CONTRIBUTING.md | 19 +
.../node_modules/libnpmversion/package.json | 4 +-
.../make-fetch-happen/package.json | 4 +-
deps/npm/node_modules/mime-db/HISTORY.md | 12 +
deps/npm/node_modules/mime-db/README.md | 6 +-
deps/npm/node_modules/mime-db/db.json | 80 +-
deps/npm/node_modules/mime-db/package.json | 12 +-
deps/npm/node_modules/mime-types/HISTORY.md | 13 +
deps/npm/node_modules/mime-types/README.md | 6 +-
deps/npm/node_modules/mime-types/package.json | 18 +-
.../minipass-sized/package-lock.json | 3464 ++++++++++++++++
.../package-lock.json | 3529 +++++++++++++++++
.../node_modules/err-code/.editorconfig | 12 -
.../node_modules/err-code/.eslintrc.json | 7 -
.../pacote/node_modules/err-code/.travis.yml | 4 -
.../pacote/node_modules/err-code/README.md | 70 -
.../pacote/node_modules/err-code/bower.json | 30 -
.../pacote/node_modules/err-code/index.js | 47 -
.../pacote/node_modules/err-code/index.umd.js | 51 -
.../pacote/node_modules/err-code/package.json | 34 -
.../node_modules/err-code/test/.eslintrc.json | 5 -
.../pacote/node_modules/err-code/test/test.js | 159 -
.../node_modules/promise-retry/.editorconfig | 15 -
.../node_modules/promise-retry/.travis.yml | 4 -
.../pacote/node_modules/promise-retry/LICENSE | 19 -
.../node_modules/promise-retry/README.md | 94 -
.../node_modules/promise-retry/index.js | 52 -
.../node_modules/promise-retry/package.json | 37 -
.../node_modules/promise-retry/test/test.js | 263 --
.../pacote/node_modules/retry/.npmignore | 3 -
.../pacote/node_modules/retry/License | 21 -
.../pacote/node_modules/retry/Makefile | 18 -
.../pacote/node_modules/retry/README.md | 227 --
.../pacote/node_modules/retry/equation.gif | Bin 1209 -> 0 bytes
.../pacote/node_modules/retry/example/dns.js | 31 -
.../pacote/node_modules/retry/example/stop.js | 40 -
.../pacote/node_modules/retry/index.js | 1 -
.../pacote/node_modules/retry/lib/retry.js | 100 -
.../node_modules/retry/lib/retry_operation.js | 158 -
.../pacote/node_modules/retry/package.json | 32 -
.../pacote/node_modules/retry/test/common.js | 10 -
.../retry/test/integration/test-forever.js | 24 -
.../test/integration/test-retry-operation.js | 258 --
.../retry/test/integration/test-retry-wrap.js | 101 -
.../retry/test/integration/test-timeouts.js | 69 -
.../promise-all-reject-late/package-lock.json | 3447 ++++++++++++++++
.../npm/node_modules/promise-retry/.npmignore | 2 -
.../node_modules/promise-retry/.travis.yml | 5 +-
deps/npm/node_modules/promise-retry/README.md | 10 +-
deps/npm/node_modules/promise-retry/index.js | 2 +-
.../node_modules/promise-retry/package.json | 12 +-
.../readable-stream/CONTRIBUTING.md | 38 +
.../request/node_modules/uuid/CHANGELOG.md | 119 -
.../request/node_modules/uuid/LICENSE.md | 21 -
.../request/node_modules/uuid/README.md | 276 --
.../request/node_modules/uuid/package.json | 49 -
deps/npm/node_modules/resolve/.editorconfig | 3 +
deps/npm/node_modules/resolve/SECURITY.md | 3 +
deps/npm/node_modules/resolve/lib/async.js | 33 +-
deps/npm/node_modules/resolve/lib/core.json | 159 +-
deps/npm/node_modules/resolve/lib/sync.js | 21 +-
deps/npm/node_modules/resolve/package.json | 16 +-
deps/npm/node_modules/resolve/readme.markdown | 31 +-
deps/npm/node_modules/resolve/test/mock.js | 76 +
.../node_modules/resolve/test/mock_sync.js | 74 +
deps/npm/node_modules/retry/.npmignore | 1 +
.../node_modules => }/retry/.travis.yml | 0
deps/npm/node_modules/retry/Makefile | 6 +-
deps/npm/node_modules/retry/Readme.md | 20 +-
deps/npm/node_modules/retry/lib/retry.js | 9 +-
.../node_modules/retry/lib/retry_operation.js | 17 +-
deps/npm/node_modules/retry/package.json | 14 +-
.../test/integration/test-retry-operation.js | 86 +-
.../retry/test/integration/test-retry-wrap.js | 48 +-
deps/npm/node_modules/retry/test/runner.js | 5 -
deps/npm/node_modules/uri-js/README.md | 4 +-
.../node_modules/uri-js/dist/es5/uri.all.js | 2 +-
.../uri-js/dist/es5/uri.all.min.js | 2 +-
deps/npm/node_modules/uri-js/package.json | 4 +-
deps/npm/node_modules/uri-js/yarn.lock | 1891 ++++++---
.../{request/node_modules => }/uuid/AUTHORS | 0
deps/npm/node_modules/uuid/CHANGELOG.md | 198 +-
deps/npm/node_modules/uuid/CONTRIBUTING.md | 18 -
deps/npm/node_modules/uuid/LICENSE.md | 20 +-
deps/npm/node_modules/uuid/README.md | 539 +--
.../{request/node_modules => }/uuid/bin/uuid | 0
deps/npm/node_modules/uuid/dist/bin/uuid | 2 -
.../uuid/dist/esm-browser/index.js | 9 -
.../node_modules/uuid/dist/esm-browser/md5.js | 215 -
.../node_modules/uuid/dist/esm-browser/nil.js | 1 -
.../uuid/dist/esm-browser/parse.js | 35 -
.../uuid/dist/esm-browser/regex.js | 1 -
.../node_modules/uuid/dist/esm-browser/rng.js | 19 -
.../uuid/dist/esm-browser/sha1.js | 96 -
.../uuid/dist/esm-browser/stringify.js | 30 -
.../node_modules/uuid/dist/esm-browser/v1.js | 95 -
.../node_modules/uuid/dist/esm-browser/v3.js | 4 -
.../node_modules/uuid/dist/esm-browser/v35.js | 64 -
.../node_modules/uuid/dist/esm-browser/v4.js | 24 -
.../node_modules/uuid/dist/esm-browser/v5.js | 4 -
.../uuid/dist/esm-browser/validate.js | 7 -
.../uuid/dist/esm-browser/version.js | 11 -
.../node_modules/uuid/dist/esm-node/index.js | 9 -
.../node_modules/uuid/dist/esm-node/md5.js | 13 -
.../node_modules/uuid/dist/esm-node/nil.js | 1 -
.../node_modules/uuid/dist/esm-node/parse.js | 35 -
.../node_modules/uuid/dist/esm-node/regex.js | 1 -
.../node_modules/uuid/dist/esm-node/rng.js | 12 -
.../node_modules/uuid/dist/esm-node/sha1.js | 13 -
.../uuid/dist/esm-node/stringify.js | 29 -
.../npm/node_modules/uuid/dist/esm-node/v1.js | 95 -
.../npm/node_modules/uuid/dist/esm-node/v3.js | 4 -
.../node_modules/uuid/dist/esm-node/v35.js | 64 -
.../npm/node_modules/uuid/dist/esm-node/v4.js | 24 -
.../npm/node_modules/uuid/dist/esm-node/v5.js | 4 -
.../uuid/dist/esm-node/validate.js | 7 -
.../uuid/dist/esm-node/version.js | 11 -
deps/npm/node_modules/uuid/dist/index.js | 79 -
.../npm/node_modules/uuid/dist/md5-browser.js | 223 --
deps/npm/node_modules/uuid/dist/md5.js | 23 -
deps/npm/node_modules/uuid/dist/nil.js | 8 -
deps/npm/node_modules/uuid/dist/parse.js | 45 -
deps/npm/node_modules/uuid/dist/regex.js | 8 -
.../npm/node_modules/uuid/dist/rng-browser.js | 26 -
deps/npm/node_modules/uuid/dist/rng.js | 24 -
.../node_modules/uuid/dist/sha1-browser.js | 104 -
deps/npm/node_modules/uuid/dist/sha1.js | 23 -
deps/npm/node_modules/uuid/dist/stringify.js | 39 -
.../node_modules/uuid/dist/umd/uuid.min.js | 1 -
.../node_modules/uuid/dist/umd/uuidNIL.min.js | 1 -
.../uuid/dist/umd/uuidParse.min.js | 1 -
.../uuid/dist/umd/uuidStringify.min.js | 1 -
.../uuid/dist/umd/uuidValidate.min.js | 1 -
.../uuid/dist/umd/uuidVersion.min.js | 1 -
.../node_modules/uuid/dist/umd/uuidv1.min.js | 1 -
.../node_modules/uuid/dist/umd/uuidv3.min.js | 1 -
.../node_modules/uuid/dist/umd/uuidv4.min.js | 1 -
.../node_modules/uuid/dist/umd/uuidv5.min.js | 1 -
deps/npm/node_modules/uuid/dist/uuid-bin.js | 85 -
deps/npm/node_modules/uuid/dist/v1.js | 107 -
deps/npm/node_modules/uuid/dist/v3.js | 16 -
deps/npm/node_modules/uuid/dist/v35.js | 78 -
deps/npm/node_modules/uuid/dist/v4.js | 37 -
deps/npm/node_modules/uuid/dist/v5.js | 16 -
deps/npm/node_modules/uuid/dist/validate.js | 17 -
deps/npm/node_modules/uuid/dist/version.js | 21 -
.../{request/node_modules => }/uuid/index.js | 0
.../node_modules => }/uuid/lib/bytesToUuid.js | 0
.../node_modules => }/uuid/lib/md5-browser.js | 0
.../node_modules => }/uuid/lib/md5.js | 0
.../node_modules => }/uuid/lib/rng-browser.js | 0
.../node_modules => }/uuid/lib/rng.js | 0
.../uuid/lib/sha1-browser.js | 0
.../node_modules => }/uuid/lib/sha1.js | 0
.../node_modules => }/uuid/lib/v35.js | 0
deps/npm/node_modules/uuid/package.json | 124 +-
.../{request/node_modules => }/uuid/v1.js | 0
.../{request/node_modules => }/uuid/v3.js | 0
.../{request/node_modules => }/uuid/v4.js | 0
.../{request/node_modules => }/uuid/v5.js | 0
deps/npm/node_modules/uuid/wrapper.mjs | 10 -
deps/npm/node_modules/verror/CONTRIBUTING.md | 19 +
deps/npm/package.json | 18 +-
deps/npm/test/lib/doctor.js | 1640 ++++----
deps/npm/test/lib/run-script.js | 67 +-
deps/npm/test/lib/shrinkwrap.js | 8 +
deps/npm/test/lib/utils/reify-finish.js | 10 +-
243 files changed, 17562 insertions(+), 6999 deletions(-)
create mode 100644 deps/npm/node_modules/@npmcli/node-gyp/README.md
create mode 100644 deps/npm/node_modules/bcrypt-pbkdf/CONTRIBUTING.md
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/CONTRIBUTING.md (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/LICENSE (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/README.md (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/dist/diff.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/convert/dmp.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/convert/xml.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/diff/array.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/diff/base.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/diff/character.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/diff/css.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/diff/json.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/diff/line.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/diff/sentence.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/diff/word.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/index.es6.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/index.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/index.mjs (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/patch/apply.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/patch/create.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/patch/merge.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/patch/parse.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/util/array.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/util/distance-iterator.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/lib/util/params.js (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/package.json (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/release-notes.md (100%)
rename deps/npm/node_modules/{libnpmdiff/node_modules => }/diff/runtime.js (100%)
delete mode 100644 deps/npm/node_modules/err-code/.npmignore
create mode 100644 deps/npm/node_modules/json-stringify-nice/package-lock.json
create mode 100644 deps/npm/node_modules/jsprim/CONTRIBUTING.md
create mode 100644 deps/npm/node_modules/minipass-sized/package-lock.json
create mode 100644 deps/npm/node_modules/npm-normalize-package-bin/package-lock.json
delete mode 100644 deps/npm/node_modules/pacote/node_modules/err-code/.editorconfig
delete mode 100644 deps/npm/node_modules/pacote/node_modules/err-code/.eslintrc.json
delete mode 100644 deps/npm/node_modules/pacote/node_modules/err-code/.travis.yml
delete mode 100644 deps/npm/node_modules/pacote/node_modules/err-code/README.md
delete mode 100644 deps/npm/node_modules/pacote/node_modules/err-code/bower.json
delete mode 100644 deps/npm/node_modules/pacote/node_modules/err-code/index.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/err-code/index.umd.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/err-code/package.json
delete mode 100644 deps/npm/node_modules/pacote/node_modules/err-code/test/.eslintrc.json
delete mode 100644 deps/npm/node_modules/pacote/node_modules/err-code/test/test.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/promise-retry/.editorconfig
delete mode 100644 deps/npm/node_modules/pacote/node_modules/promise-retry/.travis.yml
delete mode 100644 deps/npm/node_modules/pacote/node_modules/promise-retry/LICENSE
delete mode 100644 deps/npm/node_modules/pacote/node_modules/promise-retry/README.md
delete mode 100644 deps/npm/node_modules/pacote/node_modules/promise-retry/index.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/promise-retry/package.json
delete mode 100644 deps/npm/node_modules/pacote/node_modules/promise-retry/test/test.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/.npmignore
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/License
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/Makefile
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/README.md
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/equation.gif
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/example/dns.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/example/stop.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/index.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/lib/retry.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/lib/retry_operation.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/package.json
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/test/common.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/test/integration/test-forever.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/test/integration/test-retry-operation.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/test/integration/test-retry-wrap.js
delete mode 100644 deps/npm/node_modules/pacote/node_modules/retry/test/integration/test-timeouts.js
create mode 100644 deps/npm/node_modules/promise-all-reject-late/package-lock.json
delete mode 100644 deps/npm/node_modules/promise-retry/.npmignore
create mode 100644 deps/npm/node_modules/readable-stream/CONTRIBUTING.md
delete mode 100644 deps/npm/node_modules/request/node_modules/uuid/CHANGELOG.md
delete mode 100644 deps/npm/node_modules/request/node_modules/uuid/LICENSE.md
delete mode 100644 deps/npm/node_modules/request/node_modules/uuid/README.md
delete mode 100644 deps/npm/node_modules/request/node_modules/uuid/package.json
create mode 100644 deps/npm/node_modules/resolve/SECURITY.md
rename deps/npm/node_modules/{pacote/node_modules => }/retry/.travis.yml (100%)
delete mode 100644 deps/npm/node_modules/retry/test/runner.js
rename deps/npm/node_modules/{request/node_modules => }/uuid/AUTHORS (100%)
delete mode 100644 deps/npm/node_modules/uuid/CONTRIBUTING.md
rename deps/npm/node_modules/{request/node_modules => }/uuid/bin/uuid (100%)
delete mode 100755 deps/npm/node_modules/uuid/dist/bin/uuid
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/index.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/md5.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/nil.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/parse.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/regex.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/rng.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/sha1.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/stringify.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/v1.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/v3.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/v35.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/v4.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/v5.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/validate.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-browser/version.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/index.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/md5.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/nil.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/parse.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/regex.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/rng.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/sha1.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/stringify.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/v1.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/v3.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/v35.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/v4.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/v5.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/validate.js
delete mode 100644 deps/npm/node_modules/uuid/dist/esm-node/version.js
delete mode 100644 deps/npm/node_modules/uuid/dist/index.js
delete mode 100644 deps/npm/node_modules/uuid/dist/md5-browser.js
delete mode 100644 deps/npm/node_modules/uuid/dist/md5.js
delete mode 100644 deps/npm/node_modules/uuid/dist/nil.js
delete mode 100644 deps/npm/node_modules/uuid/dist/parse.js
delete mode 100644 deps/npm/node_modules/uuid/dist/regex.js
delete mode 100644 deps/npm/node_modules/uuid/dist/rng-browser.js
delete mode 100644 deps/npm/node_modules/uuid/dist/rng.js
delete mode 100644 deps/npm/node_modules/uuid/dist/sha1-browser.js
delete mode 100644 deps/npm/node_modules/uuid/dist/sha1.js
delete mode 100644 deps/npm/node_modules/uuid/dist/stringify.js
delete mode 100644 deps/npm/node_modules/uuid/dist/umd/uuid.min.js
delete mode 100644 deps/npm/node_modules/uuid/dist/umd/uuidNIL.min.js
delete mode 100644 deps/npm/node_modules/uuid/dist/umd/uuidParse.min.js
delete mode 100644 deps/npm/node_modules/uuid/dist/umd/uuidStringify.min.js
delete mode 100644 deps/npm/node_modules/uuid/dist/umd/uuidValidate.min.js
delete mode 100644 deps/npm/node_modules/uuid/dist/umd/uuidVersion.min.js
delete mode 100644 deps/npm/node_modules/uuid/dist/umd/uuidv1.min.js
delete mode 100644 deps/npm/node_modules/uuid/dist/umd/uuidv3.min.js
delete mode 100644 deps/npm/node_modules/uuid/dist/umd/uuidv4.min.js
delete mode 100644 deps/npm/node_modules/uuid/dist/umd/uuidv5.min.js
delete mode 100644 deps/npm/node_modules/uuid/dist/uuid-bin.js
delete mode 100644 deps/npm/node_modules/uuid/dist/v1.js
delete mode 100644 deps/npm/node_modules/uuid/dist/v3.js
delete mode 100644 deps/npm/node_modules/uuid/dist/v35.js
delete mode 100644 deps/npm/node_modules/uuid/dist/v4.js
delete mode 100644 deps/npm/node_modules/uuid/dist/v5.js
delete mode 100644 deps/npm/node_modules/uuid/dist/validate.js
delete mode 100644 deps/npm/node_modules/uuid/dist/version.js
rename deps/npm/node_modules/{request/node_modules => }/uuid/index.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/lib/bytesToUuid.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/lib/md5-browser.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/lib/md5.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/lib/rng-browser.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/lib/rng.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/lib/sha1-browser.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/lib/sha1.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/lib/v35.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/v1.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/v3.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/v4.js (100%)
rename deps/npm/node_modules/{request/node_modules => }/uuid/v5.js (100%)
delete mode 100644 deps/npm/node_modules/uuid/wrapper.mjs
create mode 100644 deps/npm/node_modules/verror/CONTRIBUTING.md
diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md
index 77322b9f587baf..8d2b3b5db333fb 100644
--- a/deps/npm/CHANGELOG.md
+++ b/deps/npm/CHANGELOG.md
@@ -1,3 +1,71 @@
+## v7.5.4 (2021-02-12)
+
+### BUG FIXES
+
+* [`ef687f545`](https://github.com/npm/cli/commit/ef687f545b177d0496ce74faacf1bf738978355a)
+ [#2655](https://github.com/npm/cli/issues/2655)
+ fix(env): Do not clobber defined 'env' script
+ ([@isaacs](https://github.com/isaacs))
+* [`868954a72`](https://github.com/npm/cli/commit/868954a72c06ff2210b35e1e75571f4ec3357c43)
+ [#2654](https://github.com/npm/cli/issues/2654)
+ [fix] node v10.0 lacks `fs.promises`
+ ([@ljharb](https://github.com/ljharb))
+
+
+### DEPENDENCIES
+
+* [`14dd93853`](https://github.com/npm/cli/commit/14dd9385358b3815c2285526f7c2e53ed3c5e8da)
+ fix(package.json): resetdeps
+ ([@wraithgar](https://github.com/wraithgar))
+* [`39e4a6401`](https://github.com/npm/cli/commit/39e4a640130b85d62199a33cc2026b04390520ee)
+ `graceful-fs@4.2.6`
+* [`96dffab98`](https://github.com/npm/cli/commit/96dffab988048164516d8cf73c1fbf66781f86df)
+ `eslint-plugin-promise@4.3.1`
+* [`9a6e9d38a`](https://github.com/npm/cli/commit/9a6e9d38abccec793b6ac14871c2b639d62a6c41)
+ `@npmcli/run-script@1.8.3`
+ * fix fs.promises reference to run in node v10.0
+* [`584b746a2`](https://github.com/npm/cli/commit/584b746a2c8cdc697629298be27dd23d19de1231)
+ `@npmcli/git@2.0.5`
+* [`6305ebde4`](https://github.com/npm/cli/commit/6305ebde43796737014aedbe019db8cd81dcbbec)
+ `make-fetch-happen@8.0.14`
+* [`e99881117`](https://github.com/npm/cli/commit/e998811170ce5df00a725b2d683b4bff124c6792)
+ `libnpmversion@1.0.10`
+* [`554d91cdf`](https://github.com/npm/cli/commit/554d91cdf82e9c92c2ac3752ed91e7081c2271e5)
+ chore(package-lock): rebuild package-lock
+ ([@wraithgar](https://github.com/wraithgar))
+* [`37e8cc507`](https://github.com/npm/cli/commit/37e8cc507b2ce0b89f92e7e77b1d909d1bf5513f)
+ `@npmcli/arborist@2.2.2`
+ * [#2505](https://github.com/npm/cli/issues/2505) properly install
+ dependenciess of linked dependencies
+ ([@ruyadorno](https://github.com/ruyadorno))
+ * [#2504](https://github.com/npm/cli/issues/2504) Allow `--force` to
+ override conflicted optional peerDependencies
+ ([@isaacs](https://github.com/isaacs))
+ * Ensure correct flags on shrinkwrapped module deps
+ ([@isaacs](https://github.com/isaacs))
+ * Correct relative paths for global packages installed from tarball files
+ ([nlf](https://github.com/nlf))
+* [`7788ce47b`](https://github.com/npm/cli/commit/7788ce47bc264d9d951055da85f2b695eb8b3f15)
+ `@npmcli/map-workspaces@1.0.3`
+
+### TESTS
+
+* [`3a159d27e`](https://github.com/npm/cli/commit/3a159d27e976933098ec18fa9c3e474c85b5b332)
+ [#2681](https://github.com/npm/cli/issues/2681)
+ fix(tests): rewrite doctor tests
+ ([@ljharb](https://github.com/ljharb))
+* [`abcc96a20`](https://github.com/npm/cli/commit/abcc96a204ed581fc7cd603f47cdca0afe299530)
+ [#2682](https://github.com/npm/cli/issues/2682)
+ [tests] separate tests from linting and license validation
+ ([@ljharb](https://github.com/ljharb))
+
+### DOCUMENTATION
+
+* [`7e1e84181`](https://github.com/npm/cli/commit/7e1e84181ccaca8a8b499a21b1aa7d731a14d5b7)
+ [#2662](https://github.com/npm/cli/issues/2662)
+ fix(docs): fix angle brackets in npm diff docs
+ ([@ethomson](https://github.com/ethomson))
+
## v7.5.3 (2021-02-08)
### BUG FIXES
diff --git a/deps/npm/docs/content/commands/npm-diff.md b/deps/npm/docs/content/commands/npm-diff.md
index 0ce5e8dc8baee6..0fe6a68fa2f0fe 100644
--- a/deps/npm/docs/content/commands/npm-diff.md
+++ b/deps/npm/docs/content/commands/npm-diff.md
@@ -82,11 +82,11 @@ of files for packages published to the npm registry.
When using a single package name (with no version or tag specifier) as an
argument, `npm diff` will work in a similar way to
[`npm-outdated`](npm-outdated) and reach for the registry to figure out
- what current published version of the package named will satisfy
- its dependent declared semver-range. Once that specific version is known
- `npm diff` will print diff patches comparing the current version of
- found in the local file system with that specific version
- returned by the registry.
+ what current published version of the package named ``
+ will satisfy its dependent declared semver-range. Once that specific
+ version is known `npm diff` will print diff patches comparing the
+ current version of `` found in the local file system with
+ that specific version returned by the registry.
Given a package named `abbrev` that is currently installed:
@@ -155,7 +155,7 @@ located within the folder `./lib/` and changed lines of code within the
#### diff
-* Type: Array
+* Type: Array
* Default: null
Defines npm package specifiers to compare using the `npm diff` command.
diff --git a/deps/npm/docs/output/commands/npm-diff.html b/deps/npm/docs/output/commands/npm-diff.html
index 43840ea9a2984a..bc526a3e47e0ee 100644
--- a/deps/npm/docs/output/commands/npm-diff.html
+++ b/deps/npm/docs/output/commands/npm-diff.html
@@ -206,11 +206,11 @@ Description
When using a single package name (with no version or tag specifier) as an
argument, npm diff
will work in a similar way to
npm-outdated
and reach for the registry to figure out
-what current published version of the package named will satisfy
-its dependent declared semver-range. Once that specific version is known
-npm diff
will print diff patches comparing the current version of
- found in the local file system with that specific version
-returned by the registry.
+what current published version of the package named <pkg-name>
+will satisfy its dependent declared semver-range. Once that specific
+version is known npm diff
will print diff patches comparing the
+current version of <pkg-name>
found in the local file system with
+that specific version returned by the registry.
Given a package named abbrev
that is currently installed:
npm diff --diff=abbrev
@@ -260,7 +260,7 @@ Filtering files
Configuration
diff
-- Type: Array
+- Type: Array
- Default: null
Defines npm package specifiers to compare using the npm diff
command.
diff --git a/deps/npm/docs/output/commands/npm-ls.html b/deps/npm/docs/output/commands/npm-ls.html
index 3496d20dcf16a2..508562b5b7892b 100644
--- a/deps/npm/docs/output/commands/npm-ls.html
+++ b/deps/npm/docs/output/commands/npm-ls.html
@@ -159,7 +159,7 @@ Description
the results to only the paths to the packages named. Note that nested
packages will also show the paths to the specified packages. For
example, running npm ls promzard
in npm’s source tree will show:
-npm@7.5.3 /path/to/npm
+npm@7.5.4 /path/to/npm
└─┬ init-package-json@0.0.4
└── promzard@0.1.5
diff --git a/deps/npm/docs/output/commands/npm.html b/deps/npm/docs/output/commands/npm.html
index 3eda5376a36313..266c6d86dc78be 100644
--- a/deps/npm/docs/output/commands/npm.html
+++ b/deps/npm/docs/output/commands/npm.html
@@ -148,7 +148,7 @@ Table of contents
npm <command> [args]
Version
-7.5.3
+7.5.4
Description
npm is the package manager for the Node JavaScript platform. It puts
modules in place so that node can find them, and manages dependency
diff --git a/deps/npm/lib/run-script.js b/deps/npm/lib/run-script.js
index c095e6decd4032..7aab07f5daebde 100644
--- a/deps/npm/lib/run-script.js
+++ b/deps/npm/lib/run-script.js
@@ -41,7 +41,7 @@ const runScript = async (args) => {
if (event === 'restart' && !scripts.restart)
scripts.restart = 'npm stop --if-present && npm start'
- else if (event === 'env')
+ else if (event === 'env' && !scripts.env)
scripts.env = isWindowsShell ? 'SET' : 'env'
pkg.scripts = scripts
diff --git a/deps/npm/lib/shrinkwrap.js b/deps/npm/lib/shrinkwrap.js
index 74e129297b6cf8..60e49f3c82e9b6 100644
--- a/deps/npm/lib/shrinkwrap.js
+++ b/deps/npm/lib/shrinkwrap.js
@@ -1,5 +1,7 @@
const { resolve, basename } = require('path')
-const { promises: { unlink } } = require('fs')
+const util = require('util')
+const fs = require('fs')
+const { unlink } = fs.promises || util.promisify(fs.unlink)
const Arborist = require('@npmcli/arborist')
const log = require('npmlog')
diff --git a/deps/npm/lib/utils/reify-finish.js b/deps/npm/lib/utils/reify-finish.js
index 76dba06cb570c8..9c95e9fcff24ed 100644
--- a/deps/npm/lib/utils/reify-finish.js
+++ b/deps/npm/lib/utils/reify-finish.js
@@ -1,7 +1,9 @@
const reifyOutput = require('./reify-output.js')
const npm = require('../npm.js')
const ini = require('ini')
-const {writeFile} = require('fs').promises
+const util = require('util')
+const fs = require('fs')
+const { writeFile } = fs.promises || { writeFile: util.promisify(fs.writeFile) }
const {resolve} = require('path')
const reifyFinish = async arb => {
diff --git a/deps/npm/man/man1/npm-diff.1 b/deps/npm/man/man1/npm-diff.1
index 16c5c82863bfce..3249611b135b7e 100644
--- a/deps/npm/man/man1/npm-diff.1
+++ b/deps/npm/man/man1/npm-diff.1
@@ -78,11 +78,11 @@ of files for packages published to the npm registry\.
When using a single package name (with no version or tag specifier) as an
argument, \fBnpm diff\fP will work in a similar way to
\fBnpm\-outdated\fP \fInpm\-outdated\fR and reach for the registry to figure out
- what current published version of the package named will satisfy
- its dependent declared semver\-range\. Once that specific version is known
- \fBnpm diff\fP will print diff patches comparing the current version of
- found in the local file system with that specific version
- returned by the registry\.
+ what current published version of the package named \fB\fP
+ will satisfy its dependent declared semver\-range\. Once that specific
+ version is known \fBnpm diff\fP will print diff patches comparing the
+ current version of \fB\fP found in the local file system with
+ that specific version returned by the registry\.
Given a package named \fBabbrev\fP that is currently installed:
.P
.RS 2
@@ -150,7 +150,7 @@ located within the folder \fB\|\./lib/\fP and changed lines of code within the
.SS diff
.RS 0
.IP \(bu 2
-Type: Array
+Type: Array
.IP \(bu 2
Default: null
diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
index 09a0729591f1ce..627379037edc76 100644
--- a/deps/npm/man/man1/npm-ls.1
+++ b/deps/npm/man/man1/npm-ls.1
@@ -26,7 +26,7 @@ example, running \fBnpm ls promzard\fP in npm's source tree will show:
.P
.RS 2
.nf
-npm@7\.5\.3 /path/to/npm
+npm@7\.5\.4 /path/to/npm
└─┬ init\-package\-json@0\.0\.4
└── promzard@0\.1\.5
.fi
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index 041838e698b496..670ebb6512af31 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -10,7 +10,7 @@ npm [args]
.RE
.SS Version
.P
-7\.5\.3
+7\.5\.4
.SS Description
.P
npm is the package manager for the Node JavaScript platform\. It puts
diff --git a/deps/npm/node_modules/@npmcli/arborist/bin/ideal.js b/deps/npm/node_modules/@npmcli/arborist/bin/ideal.js
index 18a5b9eb310869..74d79ce0a51e96 100644
--- a/deps/npm/node_modules/@npmcli/arborist/bin/ideal.js
+++ b/deps/npm/node_modules/@npmcli/arborist/bin/ideal.js
@@ -1,59 +1,11 @@
const Arborist = require('../')
+const { inspect } = require('util')
const options = require('./lib/options.js')
const print = require('./lib/print-tree.js')
require('./lib/logging.js')
require('./lib/timers.js')
-const c = require('chalk')
-
-const whichIsA = (name, dependents, indent = ' ') => {
- if (!dependents || dependents.length === 0)
- return ''
- const str = `\nfor: ` +
- dependents.map(dep => {
- return dep.more ? `${dep.more} more (${dep.names.join(', ')})`
- : `${dep.type} dependency ` +
- `${c.bold(name)}@"${c.bold(dep.spec)}"` + `\nfrom:` +
- (dep.from.location ? (dep.from.name
- ? ` ${c.bold(dep.from.name)}@${c.bold(dep.from.version)} ` +
- c.dim(`at ${dep.from.location}`)
- : ' the root project')
- : ` ${c.bold(dep.from.name)}@${c.bold(dep.from.version)}`) +
- whichIsA(dep.from.name, dep.from.dependents, ' ')
- }).join('\nand: ')
-
- return str.split(/\n/).join(`\n${indent}`)
-}
-
-const explainEresolve = ({ dep, current, peerConflict, fixWithForce }) => {
- return (!dep.whileInstalling ? '' : `While resolving: ` +
- `${c.bold(dep.whileInstalling.name)}@${c.bold(dep.whileInstalling.version)}\n`) +
-
- `Found: ` +
- `${c.bold(current.name)}@${c.bold(current.version)} ` +
- c.dim(`at ${current.location}`) +
- `${whichIsA(current.name, current.dependents)}` +
-
- `\n\nCould not add conflicting dependency: ` +
- `${c.bold(dep.name)}@${c.bold(dep.version)} ` +
- c.dim(`at ${dep.location}`) +
- `${whichIsA(dep.name, dep.dependents)}\n` +
-
- (!peerConflict ? '' :
- `\nConflicting peer dependency: ` +
- `${c.bold(peerConflict.name)}@${c.bold(peerConflict.version)} ` +
- c.dim(`at ${peerConflict.location}`) +
- `${whichIsA(peerConflict.name, peerConflict.dependents)}\n`
- ) +
-
- `\nFix the upstream dependency conflict, or
-run this command with --legacy-peer-deps${
- fixWithForce ? ' or --force' : ''}
-to accept an incorrect (and potentially broken) dependency resolution.
-`
-}
-
const start = process.hrtime()
new Arborist(options).buildIdealTree(options).then(tree => {
const end = process.hrtime(start)
@@ -62,7 +14,7 @@ new Arborist(options).buildIdealTree(options).then(tree => {
if (tree.meta && options.save)
tree.meta.save()
}).catch(er => {
- console.error(er)
- if (er.code === 'ERESOLVE')
- console.error(explainEresolve(er))
+ const opt = { depth: Infinity, color: true }
+ console.error(er.code === 'ERESOLVE' ? inspect(er, opt) : er)
+ process.exitCode = 1
})
diff --git a/deps/npm/node_modules/@npmcli/arborist/bin/lib/logging.js b/deps/npm/node_modules/@npmcli/arborist/bin/lib/logging.js
index 57597b2e509e44..a7d20a1f536470 100644
--- a/deps/npm/node_modules/@npmcli/arborist/bin/lib/logging.js
+++ b/deps/npm/node_modules/@npmcli/arborist/bin/lib/logging.js
@@ -26,7 +26,7 @@ if (loglevel !== 'silent') {
return
const pref = `${process.pid} ${level} `
if (level === 'warn' && args[0] === 'ERESOLVE')
- args[2] = inspect(args[2], { depth: Infinity })
+ args[2] = inspect(args[2], { depth: 10 })
const msg = pref + format(...args).trim().split('\n').join(`\n${pref}`)
console.error(msg)
})
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js
index 4c266502101a4c..0de10044bd77de 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js
@@ -397,7 +397,7 @@ module.exports = cls => class IdealTreeBuilder extends cls {
// that they're there, and not reinstall the world unnecessarily.
if (this[_global] && (this[_updateAll] || this[_updateNames].length)) {
const nm = resolve(this.path, 'node_modules')
- for (const name of await readdir(nm)) {
+ for (const name of await readdir(nm).catch(() => [])) {
tree.package.dependencies = tree.package.dependencies || {}
if (this[_updateAll] || this[_updateNames].includes(name))
tree.package.dependencies[name] = '*'
@@ -491,7 +491,8 @@ module.exports = cls => class IdealTreeBuilder extends cls {
/* istanbul ignore else - should also be covered by realpath failure */
if (filepath) {
const { name } = spec
- spec = npa(`file:${relpath(this.path, filepath)}`, this.path)
+ const tree = this.idealTree.target || this.idealTree
+ spec = npa(`file:${relpath(tree.path, filepath)}`, tree.path)
spec.name = name
}
return spec
@@ -663,6 +664,11 @@ This is a one-time fix-up, please be patient...
})
}
await promiseCallLimit(queue)
+
+ // have to re-calc dep flags, because the nodes don't have edges
+ // until their packages get assigned, so everything looks extraneous
+ calcDepFlags(this.idealTree)
+
// yes, yes, this isn't the "original" version, but now that it's been
// upgraded, we need to make sure we don't do the work to upgrade it
// again, since it's now as new as can be.
@@ -800,6 +806,7 @@ This is a one-time fix-up, please be patient...
// a virtual root of whatever brought in THIS node.
// so we VR the node itself if the edge is not a peer
const source = edge.peer ? peerSource : node
+
const virtualRoot = this[_virtualRoot](source, true)
// reuse virtual root if we already have one, but don't
// try to do the override ahead of time, since we MAY be able
@@ -821,13 +828,17 @@ This is a one-time fix-up, please be patient...
// +-- z@1
// But if x and y are loaded in the same virtual root, then they will
// be forced to agree on a version of z.
+ const required = new Set([edge.from])
+ const parent = edge.peer ? virtualRoot : null
const dep = vrDep && vrDep.satisfies(edge) ? vrDep
- : await this[_nodeFromEdge](edge, edge.peer ? virtualRoot : null)
+ : await this[_nodeFromEdge](edge, parent, null, required)
+
/* istanbul ignore next */
debug(() => {
if (!dep)
throw new Error('no dep??')
})
+
tasks.push({edge, dep})
}
@@ -864,7 +875,7 @@ This is a one-time fix-up, please be patient...
// loads a node from an edge, and then loads its peer deps (and their
// peer deps, on down the line) into a virtual root parent.
- async [_nodeFromEdge] (edge, parent_, secondEdge = null) {
+ async [_nodeFromEdge] (edge, parent_, secondEdge, required) {
// create a virtual root node with the same deps as the node that
// is requesting this one, so that we can get all the peer deps in
// a context where they're likely to be resolvable.
@@ -895,6 +906,11 @@ This is a one-time fix-up, please be patient...
// ensure the one we want is the one that's placed
node.parent = parent
+ if (required.has(edge.from) && edge.type !== 'peerOptional' ||
+ secondEdge && (
+ required.has(secondEdge.from) && secondEdge.type !== 'peerOptional'))
+ required.add(node)
+
// handle otherwise unresolvable dependency nesting loops by
// creating a symbolic link
// a1 -> b1 -> a2 -> b2 -> a1 -> ...
@@ -908,7 +924,7 @@ This is a one-time fix-up, please be patient...
// keep track of the thing that caused this node to be included.
const src = parent.sourceReference
this[_peerSetSource].set(node, src)
- return this[_loadPeerSet](node)
+ return this[_loadPeerSet](node, required)
}
[_virtualRoot] (node, reuse = false) {
@@ -1053,7 +1069,7 @@ This is a one-time fix-up, please be patient...
// gets placed first. In non-strict mode, we behave strictly if the
// virtual root is based on the root project, and allow non-peer parent
// deps to override, but throw if no preference can be determined.
- async [_loadPeerSet] (node) {
+ async [_loadPeerSet] (node, required) {
const peerEdges = [...node.edgesOut.values()]
// we typically only install non-optional peers, but we have to
// factor them into the peerSet so that we can avoid conflicts
@@ -1068,10 +1084,12 @@ This is a one-time fix-up, please be patient...
const parentEdge = node.parent.edgesOut.get(edge.name)
const {isProjectRoot, isWorkspace} = node.parent.sourceReference
const isMine = isProjectRoot || isWorkspace
+ const conflictOK = this[_force] || !isMine && !this[_strictPeerDeps]
+
if (!edge.to) {
if (!parentEdge) {
// easy, just put the thing there
- await this[_nodeFromEdge](edge, node.parent)
+ await this[_nodeFromEdge](edge, node.parent, null, required)
continue
} else {
// if the parent's edge is very broad like >=1, and the edge in
@@ -1082,14 +1100,16 @@ This is a one-time fix-up, please be patient...
// a conflict. this is always a problem in strict mode, never
// in force mode, and a problem in non-strict mode if this isn't
// on behalf of our project. in all such cases, we warn at least.
- await this[_nodeFromEdge](parentEdge, node.parent, edge)
+ const dep = await this[_nodeFromEdge](parentEdge, node.parent, edge, required)
// hooray! that worked!
if (edge.valid)
continue
- // allow it
- if (this[_force] || !isMine && !this[_strictPeerDeps])
+ // allow it. either we're overriding, or it's not something
+ // that will be installed by default anyway, and we'll fail when
+ // we get to the point where we need to, if we need to.
+ if (conflictOK || !required.has(dep))
continue
// problem
@@ -1102,7 +1122,7 @@ This is a one-time fix-up, please be patient...
// in non-strict mode if it's not our fault. don't warn here, because
// we are going to warn again when we place the deps, if we end up
// overriding for something else.
- if (this[_force] || !isMine && !this[_strictPeerDeps])
+ if (conflictOK)
continue
// ok, it's the root, or we're in unforced strict mode, so this is bad
@@ -1198,8 +1218,25 @@ This is a one-time fix-up, please be patient...
break
}
- if (!target)
- this[_failPeerConflict](edge)
+ // if we can't find a target, that means that the last placed checked
+ // (and all the places before it) had a copy already. if we're in
+ // --force mode, then the user has explicitly said that they're ok
+ // with conflicts. This can only occur in --force mode in the case
+ // when a node was added to the tree with a peerOptional dep that we
+ // ignored, and then later, that edge became invalid, and we fail to
+ // resolve it. We will warn about it in a moment.
+ if (!target) {
+ if (this[_force]) {
+ // we know that there is a dep (not the root) which is the target
+ // of this edge, or else it wouldn't have been a conflict.
+ target = edge.to.resolveParent
+ canPlace = KEEP
+ } else
+ this[_failPeerConflict](edge)
+ } else {
+ // it worked, so we clearly have no peer conflicts at this point.
+ this[_peerConflict] = null
+ }
this.log.silly(
'placeDep',
@@ -1210,9 +1247,6 @@ This is a one-time fix-up, please be patient...
`want: ${edge.spec || '*'}`
)
- // it worked, so we clearly have no peer conflicts at this point.
- this[_peerConflict] = null
-
// Can only get KEEP here if the original edge was valid,
// and we're checking for an update but it's already up to date.
if (canPlace === KEEP) {
@@ -1398,6 +1432,7 @@ This is a one-time fix-up, please be patient...
})
const entryEdge = peerEntryEdge || edge
const source = this[_peerSetSource].get(dep)
+
isSource = isSource || target === source
// if we're overriding the source, then we care if the *target* is
// ours, even if it wasn't actually the original source, since we
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-virtual.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-virtual.js
index f03bd80c460dec..3a38905b77433d 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-virtual.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-virtual.js
@@ -24,6 +24,7 @@ const loadWorkspacesVirtual = Symbol.for('loadWorkspacesVirtual')
const flagsSuspect = Symbol.for('flagsSuspect')
const reCalcDepFlags = Symbol('reCalcDepFlags')
const checkRootEdges = Symbol('checkRootEdges')
+const rootOptionProvided = Symbol('rootOptionProvided')
const depsToEdges = (type, deps) =>
Object.entries(deps).map(d => [type, ...d])
@@ -63,6 +64,8 @@ module.exports = cls => class VirtualLoader extends cls {
root = await this[loadRoot](s),
} = options
+ this[rootOptionProvided] = options.root
+
await this[loadFromShrinkwrap](s, root)
return treeCheck(this.virtualTree)
}
@@ -74,13 +77,17 @@ module.exports = cls => class VirtualLoader extends cls {
}
async [loadFromShrinkwrap] (s, root) {
- // root is never any of these things, but might be a brand new
- // baby Node object that never had its dep flags calculated.
- root.extraneous = false
- root.dev = false
- root.optional = false
- root.devOptional = false
- root.peer = false
+ if (!this[rootOptionProvided]) {
+ // root is never any of these things, but might be a brand new
+ // baby Node object that never had its dep flags calculated.
+ root.extraneous = false
+ root.dev = false
+ root.optional = false
+ root.devOptional = false
+ root.peer = false
+ } else
+ this[flagsSuspect] = true
+
this[checkRootEdges](s, root)
root.meta = s
this.virtualTree = root
@@ -88,20 +95,23 @@ module.exports = cls => class VirtualLoader extends cls {
await this[resolveLinks](links, nodes)
this[assignBundles](nodes)
if (this[flagsSuspect])
- this[reCalcDepFlags]()
+ this[reCalcDepFlags](nodes.values())
return root
}
- [reCalcDepFlags] () {
+ [reCalcDepFlags] (nodes) {
// reset all dep flags
- for (const node of this.virtualTree.inventory.values()) {
+ // can't use inventory here, because virtualTree might not be root
+ for (const node of nodes) {
+ if (node.isRoot || node === this[rootOptionProvided])
+ continue
node.extraneous = true
node.dev = true
node.optional = true
node.devOptional = true
node.peer = true
}
- calcDepFlags(this.virtualTree, true)
+ calcDepFlags(this.virtualTree, !this[rootOptionProvided])
}
// check the lockfile deps, and see if they match. if they do not
@@ -237,6 +247,12 @@ module.exports = cls => class VirtualLoader extends cls {
// shrinkwrap doesn't include package name unless necessary
if (!sw.name)
sw.name = nameFromFolder(path)
+
+ const dev = sw.dev
+ const optional = sw.optional
+ const devOptional = dev || optional || sw.devOptional
+ const peer = sw.peer
+
const node = new Node({
legacyPeerDeps: this.legacyPeerDeps,
root: this.virtualTree,
@@ -246,6 +262,10 @@ module.exports = cls => class VirtualLoader extends cls {
resolved: consistentResolve(sw.resolved, this.path, path),
pkg: sw,
hasShrinkwrap: sw.hasShrinkwrap,
+ dev,
+ optional,
+ devOptional,
+ peer,
})
// cast to boolean because they're undefined in the lock file when false
node.extraneous = !!sw.extraneous
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/reify.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/reify.js
index 1dd4b4b0f19317..b33823e4612230 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/reify.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/reify.js
@@ -442,7 +442,8 @@ module.exports = cls => class Reifier extends cls {
if (this[_trashList].has(node.path))
return node
- process.emit('time', `reifyNode:${node.location}`)
+ const timer = `reifyNode:${node.location}`
+ process.emit('time', timer)
this.addTracker('reify', node.name, node.location)
const p = Promise.resolve()
@@ -454,7 +455,7 @@ module.exports = cls => class Reifier extends cls {
return this[_handleOptionalFailure](node, p)
.then(() => {
this.finishTracker('reify', node.name, node.location)
- process.emit('timeEnd', `reifyNode:${node.location}`)
+ process.emit('timeEnd', timer)
return node
})
}
@@ -474,9 +475,14 @@ module.exports = cls => class Reifier extends cls {
// no idea what this thing is. remove it from the tree.
if (!res) {
- node.parent = null
+ const warning = 'invalid or damaged lockfile detected\n' +
+ 'please re-try this operation once it completes\n' +
+ 'so that the damage can be corrected, or perform\n' +
+ 'a fresh install with no lockfile if the problem persists.'
+ this.log.warn('reify', warning)
this.log.verbose('reify', 'unrecognized node in tree', node.path)
node.parent = null
+ node.fsParent = null
this[_addNodeToTrashList](node)
return
}
diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/calc-dep-flags.js b/deps/npm/node_modules/@npmcli/arborist/lib/calc-dep-flags.js
index 73f1e60d7ce97b..d6ae266db3bb05 100644
--- a/deps/npm/node_modules/@npmcli/arborist/lib/calc-dep-flags.js
+++ b/deps/npm/node_modules/@npmcli/arborist/lib/calc-dep-flags.js
@@ -11,7 +11,7 @@ const calcDepFlags = (tree, resetRoot = true) => {
tree,
visit: node => calcDepFlagsStep(node),
filter: node => node,
- getChildren: node => [...node.edgesOut.values()].map(edge => edge.to),
+ getChildren: (node, tree) => [...tree.edgesOut.values()].map(edge => edge.to),
})
return ret
}
diff --git a/deps/npm/node_modules/@npmcli/arborist/package.json b/deps/npm/node_modules/@npmcli/arborist/package.json
index 6e88b9cbb57a10..b57922dd6c6d2b 100644
--- a/deps/npm/node_modules/@npmcli/arborist/package.json
+++ b/deps/npm/node_modules/@npmcli/arborist/package.json
@@ -1,6 +1,6 @@
{
"name": "@npmcli/arborist",
- "version": "2.2.1",
+ "version": "2.2.2",
"description": "Manage node_modules trees",
"dependencies": {
"@npmcli/installed-package-contents": "^1.0.6",
diff --git a/deps/npm/node_modules/@npmcli/git/package.json b/deps/npm/node_modules/@npmcli/git/package.json
index bb07188560b4c7..0e01efaf2fbce9 100644
--- a/deps/npm/node_modules/@npmcli/git/package.json
+++ b/deps/npm/node_modules/@npmcli/git/package.json
@@ -1,6 +1,6 @@
{
"name": "@npmcli/git",
- "version": "2.0.4",
+ "version": "2.0.6",
"main": "lib/index.js",
"files": [
"lib/*.js"
@@ -33,7 +33,7 @@
"mkdirp": "^1.0.3",
"npm-pick-manifest": "^6.0.0",
"promise-inflight": "^1.0.1",
- "promise-retry": "^1.1.1",
+ "promise-retry": "^2.0.1",
"semver": "^7.3.2",
"unique-filename": "^1.1.1",
"which": "^2.0.2"
diff --git a/deps/npm/node_modules/@npmcli/map-workspaces/README.md b/deps/npm/node_modules/@npmcli/map-workspaces/README.md
index f8e114c2a14ca3..52e4a42d37abe6 100644
--- a/deps/npm/node_modules/@npmcli/map-workspaces/README.md
+++ b/deps/npm/node_modules/@npmcli/map-workspaces/README.md
@@ -17,13 +17,16 @@ Long version: Reads the `workspaces` property from a valid **workspaces configur
```js
const mapWorkspaces = require('@npmcli/map-workspaces')
await mapWorkspaces({
- workspaces: {
- packages: [
- "a",
- "b"
- ]
+ cwd,
+ pkg: {
+ workspaces: {
+ packages: [
+ "a",
+ "b"
+ ]
+ }
}
-}, { cwd })
+})
// ->
// Map {
// 'a': '/a'
@@ -51,10 +54,13 @@ Given a folder structure such as:
```js
const mapWorkspaces = require('@npmcli/map-workspaces')
await mapWorkspaces({
- workspaces: [
- "apps/*"
- ]
-}, { cwd })
+ cwd,
+ pkg: {
+ workspaces: [
+ "apps/*"
+ ]
+ }
+})
// ->
// Map {
// 'a': '/apps/a'
@@ -65,10 +71,10 @@ await mapWorkspaces({
## API:
-### `mapWorkspaces(pkg, opts = {}) -> Promise