From 490a5d5522a46ce07e2ce58999a289f5d46b4787 Mon Sep 17 00:00:00 2001 From: npm CLI robot Date: Wed, 26 Jul 2023 23:01:44 +0000 Subject: [PATCH] deps: upgrade npm to 10.0.0-pre.0 --- deps/npm/docs/content/commands/npm-ls.md | 2 +- deps/npm/docs/content/commands/npm-pkg.md | 1 - deps/npm/docs/content/commands/npm.md | 2 +- deps/npm/docs/content/using-npm/config.md | 28 ------ deps/npm/docs/output/commands/npm-ls.html | 2 +- deps/npm/docs/output/commands/npm-pkg.html | 1 - deps/npm/docs/output/commands/npm.html | 2 +- deps/npm/docs/output/using-npm/config.html | 24 +---- deps/npm/lib/commands/run-script.js | 16 +--- deps/npm/man/man1/npm-ls.1 | 2 +- deps/npm/man/man1/npm-pkg.1 | 2 - deps/npm/man/man1/npm.1 | 2 +- deps/npm/man/man7/config.7 | 24 ----- .../config/lib/definitions/definitions.js | 40 +-------- .../@npmcli/config/lib/definitions/index.js | 3 - .../node_modules/@npmcli/config/lib/index.js | 4 - .../node_modules/@npmcli/config/package.json | 2 +- .../node_modules/libnpmpublish/lib/publish.js | 89 ++----------------- .../node_modules/libnpmpublish/package.json | 3 +- deps/npm/package.json | 8 +- .../test/lib/commands/config.js.test.cjs | 8 +- .../tap-snapshots/test/lib/docs.js.test.cjs | 34 ------- deps/npm/test/fixtures/sandbox.js | 11 --- deps/npm/test/lib/commands/run-script.js | 7 +- 24 files changed, 27 insertions(+), 290 deletions(-) diff --git a/deps/npm/docs/content/commands/npm-ls.md b/deps/npm/docs/content/commands/npm-ls.md index 5a8056f18a8589..413e57c722c926 100644 --- a/deps/npm/docs/content/commands/npm-ls.md +++ b/deps/npm/docs/content/commands/npm-ls.md @@ -27,7 +27,7 @@ packages will *also* show the paths to the specified packages. For example, running `npm ls promzard` in npm's source tree will show: ```bash -npm@9.8.1 /path/to/npm +npm@10.0.0-pre.0 /path/to/npm └─┬ init-package-json@0.0.4 └── promzard@0.1.5 ``` diff --git a/deps/npm/docs/content/commands/npm-pkg.md b/deps/npm/docs/content/commands/npm-pkg.md index 79f2e9647eecd2..f668c562affd31 100644 --- a/deps/npm/docs/content/commands/npm-pkg.md +++ b/deps/npm/docs/content/commands/npm-pkg.md @@ -269,5 +269,4 @@ This value is not exported to the environment for child processes. * [npm install](/commands/npm-install) * [npm init](/commands/npm-init) * [npm config](/commands/npm-config) -* [npm set-script](/commands/npm-set-script) * [workspaces](/using-npm/workspaces) diff --git a/deps/npm/docs/content/commands/npm.md b/deps/npm/docs/content/commands/npm.md index 05d229bd3f6dcb..77163879ac47fa 100644 --- a/deps/npm/docs/content/commands/npm.md +++ b/deps/npm/docs/content/commands/npm.md @@ -14,7 +14,7 @@ Note: This command is unaware of workspaces. ### Version -9.8.1 +10.0.0-pre.0 ### Description diff --git a/deps/npm/docs/content/using-npm/config.md b/deps/npm/docs/content/using-npm/config.md index 9d1f02c42639e1..96b35edced7b3f 100644 --- a/deps/npm/docs/content/using-npm/config.md +++ b/deps/npm/docs/content/using-npm/config.md @@ -1775,20 +1775,6 @@ registry-scoped "certfile" path like -#### `ci-name` - -* Default: The name of the current CI system, or `null` when not on a known CI - platform. -* Type: null or String -* DEPRECATED: This config is deprecated and will not be changeable in future - version of npm. - -The name of a continuous integration system. If not set explicitly, npm will -detect the current CI environment using the -[`ci-info`](http://npm.im/ci-info) module. - - - #### `dev` * Default: false @@ -1949,20 +1935,6 @@ Alias for --package-lock -#### `tmp` - -* Default: The value returned by the Node.js `os.tmpdir()` method - -* Type: Path -* DEPRECATED: This setting is no longer used. npm stores temporary files in a - special location in the cache, and they are managed by - [`cacache`](http://npm.im/cacache). - -Historically, the location where temporary files were stored. No longer -relevant. - - - ### See also * [npm config](/commands/npm-config) diff --git a/deps/npm/docs/output/commands/npm-ls.html b/deps/npm/docs/output/commands/npm-ls.html index 9be585ffa291ee..ff071c2fbcf56a 100644 --- a/deps/npm/docs/output/commands/npm-ls.html +++ b/deps/npm/docs/output/commands/npm-ls.html @@ -160,7 +160,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@9.8.1 /path/to/npm
+
npm@10.0.0-pre.0 /path/to/npm
 └─┬ init-package-json@0.0.4
   └── promzard@0.1.5
 

diff --git a/deps/npm/docs/output/commands/npm-pkg.html b/deps/npm/docs/output/commands/npm-pkg.html
index 0a0b84107b7587..d60ca0b0f4aac7 100644
--- a/deps/npm/docs/output/commands/npm-pkg.html
+++ b/deps/npm/docs/output/commands/npm-pkg.html
@@ -346,7 +346,6 @@ 
See Also

 
  • npm install
    • 
 
  • npm init
    • 
 
  • npm config
    • 
-
  • npm set-script
    • 
 
  • workspaces
    • 
 
 
diff --git a/deps/npm/docs/output/commands/npm.html b/deps/npm/docs/output/commands/npm.html
index 41932731f72d39..6047cebc94bb2d 100644
--- a/deps/npm/docs/output/commands/npm.html
+++ b/deps/npm/docs/output/commands/npm.html
@@ -150,7 +150,7 @@ 
    Table of contents

    Note: This command is unaware of workspaces.

    Version

    -

    9.8.1

    +

    10.0.0-pre.0

    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/docs/output/using-npm/config.html b/deps/npm/docs/output/using-npm/config.html index 440c4f29e97f10..0bb1634d1e5418 100644 --- a/deps/npm/docs/output/using-npm/config.html +++ b/deps/npm/docs/output/using-npm/config.html @@ -142,7 +142,7 @@

    config

    Table of contents

    -
    +

    Description

    @@ -1418,17 +1418,6 @@

    cert

    It is not the path to a certificate file, though you can set a registry-scoped "certfile" path like "//other-registry.tld/:certfile=/path/to/cert.pem".

    -

    ci-name

    -
      -
    • Default: The name of the current CI system, or null when not on a known CI -platform.
      • -
    • Type: null or String
      • -
    • DEPRECATED: This config is deprecated and will not be changeable in future -version of npm.
      • -
    -

    The name of a continuous integration system. If not set explicitly, npm will -detect the current CI environment using the -ci-info module.

    dev

    • Default: false
      • @@ -1543,17 +1532,6 @@

      shrinkwrap

    • DEPRECATED: Use the --package-lock setting instead.

    Alias for --package-lock

    -

    tmp

    -
      -
    • Default: The value returned by the Node.js os.tmpdir() method -https://nodejs.org/api/os.html#os_os_tmpdir
      • -
    • Type: Path
      • -
    • DEPRECATED: This setting is no longer used. npm stores temporary files in a -special location in the cache, and they are managed by -cacache.
      • -
    -

    Historically, the location where temporary files were stored. No longer -relevant.

    See also

    • npm config
      • diff --git a/deps/npm/lib/commands/run-script.js b/deps/npm/lib/commands/run-script.js index 13efdde750a825..75f00a46b84e9f 100644 --- a/deps/npm/lib/commands/run-script.js +++ b/deps/npm/lib/commands/run-script.js @@ -207,24 +207,10 @@ class RunScript extends BaseCommand { log.error(err) log.error(` in workspace: ${pkg._id || pkg.name}`) log.error(` at location: ${workspacePath}`) - - const scriptMissing = err.message.startsWith('Missing script') - - // avoids exiting with error code in case there's scripts missing - // in some workspaces since other scripts might have succeeded - if (!scriptMissing) { - process.exitCode = 1 - } - - return scriptMissing + process.exitCode = 1 }) res.push(runResult) } - - // in case **all** tests are missing, then it should exit with error code - if (res.every(Boolean)) { - throw new Error(`Missing script: ${args[0]}`) - } } async listWorkspaces (args, filters) { diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1 index af399edb102b6f..acce5c17953164 100644 --- a/deps/npm/man/man1/npm-ls.1 +++ b/deps/npm/man/man1/npm-ls.1 @@ -20,7 +20,7 @@ Positional arguments are \fBname@version-range\fR identifiers, which will limit .P .RS 2 .nf -npm@9.8.1 /path/to/npm +npm@10.0.0-pre.0 /path/to/npm └─┬ init-package-json@0.0.4 └── promzard@0.1.5 .fi diff --git a/deps/npm/man/man1/npm-pkg.1 b/deps/npm/man/man1/npm-pkg.1 index 806a5ae62bac31..2d76650205b4c8 100644 --- a/deps/npm/man/man1/npm-pkg.1 +++ b/deps/npm/man/man1/npm-pkg.1 @@ -282,7 +282,5 @@ npm help init .IP \(bu 4 npm help config .IP \(bu 4 -npm help set-script -.IP \(bu 4 npm help workspaces .RE 0 diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1 index cbb25b2aa1a32d..d223fbe76075ed 100644 --- a/deps/npm/man/man1/npm.1 +++ b/deps/npm/man/man1/npm.1 @@ -12,7 +12,7 @@ npm Note: This command is unaware of workspaces. .SS "Version" .P -9.8.1 +10.0.0-pre.0 .SS "Description" .P npm is the package manager for the Node JavaScript platform. It puts modules in place so that node can find them, and manages dependency conflicts intelligently. diff --git a/deps/npm/man/man7/config.7 b/deps/npm/man/man7/config.7 index 3bcd6075cc2235..be16a7bdc3a0ce 100644 --- a/deps/npm/man/man7/config.7 +++ b/deps/npm/man/man7/config.7 @@ -1769,18 +1769,6 @@ cert="-----BEGIN CERTIFICATE-----\[rs]nXXXX\[rs]nXXXX\[rs]n-----END CERTIFICATE- .RE .P It is \fInot\fR the path to a certificate file, though you can set a registry-scoped "certfile" path like "//other-registry.tld/:certfile=/path/to/cert.pem". -.SS "\fBci-name\fR" -.RS 0 -.IP \(bu 4 -Default: The name of the current CI system, or \fBnull\fR when not on a known CI platform. -.IP \(bu 4 -Type: null or String -.IP \(bu 4 -DEPRECATED: This config is deprecated and will not be changeable in future version of npm. -.RE 0 - -.P -The name of a continuous integration system. If not set explicitly, npm will detect the current CI environment using the \fB\fBci-info\fR\fR \fI\(lahttp://npm.im/ci-info\(ra\fR module. .SS "\fBdev\fR" .RS 0 .IP \(bu 4 @@ -1959,18 +1947,6 @@ DEPRECATED: Use the --package-lock setting instead. .P Alias for --package-lock -.SS "\fBtmp\fR" -.RS 0 -.IP \(bu 4 -Default: The value returned by the Node.js \fBos.tmpdir()\fR method \fI\(lahttps://nodejs.org/api/os.html#os_os_tmpdir\(ra\fR -.IP \(bu 4 -Type: Path -.IP \(bu 4 -DEPRECATED: This setting is no longer used. npm stores temporary files in a special location in the cache, and they are managed by \fB\fBcacache\fR\fR \fI\(lahttp://npm.im/cacache\(ra\fR. -.RE 0 - -.P -Historically, the location where temporary files were stored. No longer relevant. .SS "See also" .RS 0 .IP \(bu 4 diff --git a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js index fe5cafa1922d9b..7f0edc7167a42c 100644 --- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js +++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js @@ -64,7 +64,7 @@ const editor = process.env.EDITOR || const shell = isWindows ? process.env.ComSpec || 'cmd' : process.env.SHELL || 'sh' -const { tmpdir, networkInterfaces } = require('os') +const { networkInterfaces } = require('os') const getLocalAddresses = () => { try { return Object.values(networkInterfaces()).map( @@ -429,24 +429,6 @@ define('cert', { flatten, }) -define('ci-name', { - default: ciInfo.name ? ciInfo.name.toLowerCase().split(' ').join('-') : null, - defaultDescription: ` - The name of the current CI system, or \`null\` when not on a known CI - platform. - `, - type: [null, String], - deprecated: ` - This config is deprecated and will not be changeable in future version of npm. - `, - description: ` - The name of a continuous integration system. If not set explicitly, npm - will detect the current CI environment using the - [\`ci-info\`](http://npm.im/ci-info) module. - `, - flatten, -}) - define('cidr', { default: null, type: [null, String, Array], @@ -2127,24 +2109,6 @@ define('timing', { `, }) -define('tmp', { - default: tmpdir(), - defaultDescription: ` - The value returned by the Node.js \`os.tmpdir()\` method - - `, - type: path, - deprecated: ` - This setting is no longer used. npm stores temporary files in a special - location in the cache, and they are managed by - [\`cacache\`](http://npm.im/cacache). - `, - description: ` - Historically, the location where temporary files were stored. No longer - relevant. - `, -}) - define('umask', { default: 0, type: Umask, @@ -2222,7 +2186,7 @@ define('user-agent', { `, flatten (key, obj, flatOptions) { const value = obj[key] - const ciName = obj['ci-name'] + const ciName = ciInfo.name?.toLowerCase().split(' ').join('-') || null let inWorkspaces = false if (obj.workspaces || obj.workspace && obj.workspace.length) { inWorkspaces = true diff --git a/deps/npm/node_modules/@npmcli/config/lib/definitions/index.js b/deps/npm/node_modules/@npmcli/config/lib/definitions/index.js index 748f306bd2ce34..51c7aa7c352cfc 100644 --- a/deps/npm/node_modules/@npmcli/config/lib/definitions/index.js +++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/index.js @@ -25,9 +25,6 @@ const flatten = (obj, flat = {}) => { : /* istanbul ignore next - not configurable property */ undefined flat.nodeBin = process.env.NODE || process.execPath - // XXX should this be sha512? is it even relevant? - flat.hashAlgorithm = 'sha1' - return flat } diff --git a/deps/npm/node_modules/@npmcli/config/lib/index.js b/deps/npm/node_modules/@npmcli/config/lib/index.js index 0e19d32e3f8b45..fda049fe085354 100644 --- a/deps/npm/node_modules/@npmcli/config/lib/index.js +++ b/deps/npm/node_modules/@npmcli/config/lib/index.js @@ -322,10 +322,6 @@ class Config { const { data } = this.data.get('default') - // the metrics-registry defaults to the current resolved value of - // the registry, unless overridden somewhere else. - settableGetter(data, 'metrics-registry', () => this.#get('registry')) - // if the prefix is set on cli, env, or userconfig, then we need to // default the globalconfig file to that location, instead of the default // global prefix. It's weird that `npm get globalconfig --prefix=/foo` diff --git a/deps/npm/node_modules/@npmcli/config/package.json b/deps/npm/node_modules/@npmcli/config/package.json index 76d193ba23ec4c..cadac2e88aa47e 100644 --- a/deps/npm/node_modules/@npmcli/config/package.json +++ b/deps/npm/node_modules/@npmcli/config/package.json @@ -1,6 +1,6 @@ { "name": "@npmcli/config", - "version": "6.2.1", + "version": "7.0.0", "files": [ "bin/", "lib/" diff --git a/deps/npm/node_modules/libnpmpublish/lib/publish.js b/deps/npm/node_modules/libnpmpublish/lib/publish.js index 554eb9bec46f8c..b0ef782a166c66 100644 --- a/deps/npm/node_modules/libnpmpublish/lib/publish.js +++ b/deps/npm/node_modules/libnpmpublish/lib/publish.js @@ -50,42 +50,16 @@ Remove the 'private' field from the package.json to publish it.`), opts ) - try { - const res = await npmFetch(spec.escapedName, { - ...opts, - method: 'PUT', - body: metadata, - ignoreBody: true, - }) - if (transparencyLogUrl) { - res.transparencyLogUrl = transparencyLogUrl - } - return res - } catch (err) { - if (err.code !== 'E409') { - throw err - } - // if E409, we attempt exactly ONE retry, to protect us - // against malicious activity like trying to publish - // a bunch of new versions of a package at the same time - // and/or spamming the registry - const current = await npmFetch.json(spec.escapedName, { - ...opts, - query: { write: true }, - }) - const newMetadata = patchMetadata(current, metadata) - const res = await npmFetch(spec.escapedName, { - ...opts, - method: 'PUT', - body: newMetadata, - ignoreBody: true, - }) - /* istanbul ignore next */ - if (transparencyLogUrl) { - res.transparencyLogUrl = transparencyLogUrl - } - return res + const res = await npmFetch(spec.escapedName, { + ...opts, + method: 'PUT', + body: metadata, + ignoreBody: true, + }) + if (transparencyLogUrl) { + res.transparencyLogUrl = transparencyLogUrl } + return res } const patchManifest = (_manifest, opts) => { @@ -195,51 +169,6 @@ const buildMetadata = async (registry, manifest, tarballData, spec, opts) => { } } -const patchMetadata = (current, newData) => { - const curVers = Object.keys(current.versions || {}) - .map(v => semver.clean(v, true)) - .concat(Object.keys(current.time || {}) - .map(v => semver.valid(v, true) && semver.clean(v, true)) - .filter(v => v)) - - const newVersion = Object.keys(newData.versions)[0] - - if (curVers.indexOf(newVersion) !== -1) { - const { name: pkgid, version } = newData - throw Object.assign( - new Error( - `Cannot publish ${pkgid}@${version} over existing version.` - ), { - code: 'EPUBLISHCONFLICT', - pkgid, - version, - }) - } - - current.versions = current.versions || {} - current.versions[newVersion] = newData.versions[newVersion] - for (const i in newData) { - switch (i) { - // objects that copy over the new stuffs - case 'dist-tags': - case 'versions': - case '_attachments': - for (const j in newData[i]) { - current[i] = current[i] || {} - current[i][j] = newData[i][j] - } - break - - // copy - default: - current[i] = newData[i] - break - } - } - - return current -} - // Check that all the prereqs are met for provenance generation const ensureProvenanceGeneration = async (registry, spec, opts) => { if (ciInfo.GITHUB_ACTIONS) { diff --git a/deps/npm/node_modules/libnpmpublish/package.json b/deps/npm/node_modules/libnpmpublish/package.json index 7c7533a82c735f..8c95f9e9aba7db 100644 --- a/deps/npm/node_modules/libnpmpublish/package.json +++ b/deps/npm/node_modules/libnpmpublish/package.json @@ -1,6 +1,6 @@ { "name": "libnpmpublish", - "version": "7.5.0", + "version": "8.0.0", "description": "Programmatic API for the bits behind npm publish and unpublish", "author": "GitHub Inc.", "main": "lib/index.js", @@ -27,7 +27,6 @@ "@npmcli/mock-globals": "^1.0.0", "@npmcli/mock-registry": "^1.0.0", "@npmcli/template-oss": "4.18.0", - "lodash.clonedeep": "^4.5.0", "nock": "^13.3.0", "tap": "^16.3.4" }, diff --git a/deps/npm/package.json b/deps/npm/package.json index 6e719a073893b0..94b4e337585604 100644 --- a/deps/npm/package.json +++ b/deps/npm/package.json @@ -1,5 +1,5 @@ { - "version": "9.8.1", + "version": "10.0.0-pre.0", "name": "npm", "description": "a package manager for JavaScript", "workspaces": [ @@ -53,7 +53,7 @@ "dependencies": { "@isaacs/string-locale-compare": "^1.1.0", "@npmcli/arborist": "^6.3.0", - "@npmcli/config": "^6.2.1", + "@npmcli/config": "^7.0.0", "@npmcli/fs": "^3.1.0", "@npmcli/map-workspaces": "^3.0.4", "@npmcli/package-json": "^4.0.1", @@ -83,7 +83,7 @@ "libnpmhook": "^9.0.3", "libnpmorg": "^5.0.4", "libnpmpack": "^5.0.19", - "libnpmpublish": "^7.5.0", + "libnpmpublish": "^8.0.0", "libnpmsearch": "^6.0.2", "libnpmteam": "^5.0.3", "libnpmversion": "^4.0.2", @@ -254,6 +254,6 @@ }, "license": "Artistic-2.0", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } } diff --git a/deps/npm/tap-snapshots/test/lib/commands/config.js.test.cjs b/deps/npm/tap-snapshots/test/lib/commands/config.js.test.cjs index af600062c980e7..8346e8d9131fd7 100644 --- a/deps/npm/tap-snapshots/test/lib/commands/config.js.test.cjs +++ b/deps/npm/tap-snapshots/test/lib/commands/config.js.test.cjs @@ -30,7 +30,6 @@ exports[`test/lib/commands/config.js TAP config list --json > output matches sna "cafile": null, "call": "", "cert": null, - "ci-name": null, "cidr": null, "color": true, "commit-hooks": true, @@ -147,7 +146,6 @@ exports[`test/lib/commands/config.js TAP config list --json > output matches sna "tag": "latest", "tag-version-prefix": "v", "timing": false, - "tmp": "{TMP}", "umask": 0, "unicode": false, "update-notifier": true, @@ -161,8 +159,7 @@ exports[`test/lib/commands/config.js TAP config list --json > output matches sna "workspaces": null, "workspaces-update": true, "yes": null, - "npm-version": "{NPM-VERSION}", - "metrics-registry": "https://registry.npmjs.org/" + "npm-version": "{NPM-VERSION}" } ` @@ -187,7 +184,6 @@ cache-min = 0 cafile = null call = "" cert = null -ci-name = null cidr = null color = true commit-hooks = true @@ -254,7 +250,6 @@ logs-max = 10 ; long = false ; overridden by cli maxsockets = 15 message = "%s" -metrics-registry = "https://registry.npmjs.org/" node-options = null noproxy = [""] npm-version = "{NPM-VERSION}" @@ -306,7 +301,6 @@ strict-ssl = true tag = "latest" tag-version-prefix = "v" timing = false -tmp = "{TMP}" umask = 0 unicode = false update-notifier = true diff --git a/deps/npm/tap-snapshots/test/lib/docs.js.test.cjs b/deps/npm/tap-snapshots/test/lib/docs.js.test.cjs index 4875ebae6952b2..463b0862d2be8d 100644 --- a/deps/npm/tap-snapshots/test/lib/docs.js.test.cjs +++ b/deps/npm/tap-snapshots/test/lib/docs.js.test.cjs @@ -1822,20 +1822,6 @@ registry-scoped "certfile" path like -#### \`ci-name\` - -* Default: The name of the current CI system, or \`null\` when not on a known CI - platform. -* Type: null or String -* DEPRECATED: This config is deprecated and will not be changeable in future - version of npm. - -The name of a continuous integration system. If not set explicitly, npm will -detect the current CI environment using the -[\`ci-info\`](http://npm.im/ci-info) module. - - - #### \`dev\` * Default: false @@ -1995,20 +1981,6 @@ Alias for \`--omit=dev\` Alias for --package-lock - -#### \`tmp\` - -* Default: The value returned by the Node.js \`os.tmpdir()\` method - -* Type: Path -* DEPRECATED: This setting is no longer used. npm stores temporary files in a - special location in the cache, and they are managed by - [\`cacache\`](http://npm.im/cacache). - -Historically, the location where temporary files were stored. No longer -relevant. - - ` exports[`test/lib/docs.js TAP config > all keys 1`] = ` @@ -2031,7 +2003,6 @@ Array [ "cafile", "call", "cert", - "ci-name", "cidr", "color", "commit-hooks", @@ -2148,7 +2119,6 @@ Array [ "tag", "tag-version-prefix", "timing", - "tmp", "umask", "unicode", "update-notifier", @@ -2186,7 +2156,6 @@ Array [ "cafile", "call", "cert", - "ci-name", "cidr", "color", "commit-hooks", @@ -2314,7 +2283,6 @@ Array [ "node-options", "prefix", "timing", - "tmp", "update-notifier", "usage", "userconfig", @@ -2343,7 +2311,6 @@ Object { "call": "", "cert": null, "cidr": null, - "ciName": "{ci}", "color": false, "commitHooks": true, "defaultTag": "latest", @@ -2367,7 +2334,6 @@ Object { "gitTagVersion": true, "global": false, "globalconfig": "{CWD}/global/etc/npmrc", - "hashAlgorithm": "sha1", "heading": "npm", "httpsProxy": null, "ifPresent": false, diff --git a/deps/npm/test/fixtures/sandbox.js b/deps/npm/test/fixtures/sandbox.js index 2c4e5c2968a38c..5be02fcf80c1eb 100644 --- a/deps/npm/test/fixtures/sandbox.js +++ b/deps/npm/test/fixtures/sandbox.js @@ -42,11 +42,6 @@ const _get = Symbol('sandbox.proxy.get') const _set = Symbol('sandbox.proxy.set') const _logs = Symbol('sandbox.logs') -// these config keys can be redacted widely -const redactedDefaults = [ - 'tmp', -] - // we can't just replace these values everywhere because they're known to be // very short strings that could be present all over the place, so we only // replace them if they're located within quotes for now @@ -161,12 +156,6 @@ class Sandbox extends EventEmitter { // and we replaced the node version first, the real execPath we're trying // to replace would no longer be represented, and be missed. if (this[_npm]) { - // replace default config values with placeholders - for (const name of redactedDefaults) { - const value = this[_npm].config.defaults[name] - clean = clean.split(normalize(value)).join(`{${name.toUpperCase()}}`) - } - // replace vague default config values that are present within quotes // with placeholders for (const name of vagueRedactedDefaults) { diff --git a/deps/npm/test/lib/commands/run-script.js b/deps/npm/test/lib/commands/run-script.js index cb54a7f51e9002..24f51400e8dfc3 100644 --- a/deps/npm/test/lib/commands/run-script.js +++ b/deps/npm/test/lib/commands/run-script.js @@ -781,12 +781,7 @@ t.test('workspaces', async t => { t.test('missing scripts in all workspaces', async t => { const { runScript, RUN_SCRIPTS, cleanLogs } = await mockWorkspaces(t, { exec: null }) - await t.rejects( - runScript.exec(['missing-script']), - /Missing script: missing-script/, - 'should throw missing script error' - ) - + await runScript.exec(['missing-script']) t.match(RUN_SCRIPTS(), []) t.strictSame( cleanLogs(),