Skip to content

Commit db54b57

Browse files
claudiahdzTrott
authored andcommitted
deps: upgrade npm to 6.14.7
PR-URL: #34468 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Ruy Adorno <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Shelley Vohr <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent b2c08f2 commit db54b57

File tree

316 files changed

+5218
-5507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

316 files changed

+5218
-5507
lines changed

β€Ždeps/npm/AUTHORS

+3
Original file line numberDiff line numberDiff line change
@@ -699,3 +699,6 @@ Peter Fich <[email protected]>
699699
Maxwell Gerber <[email protected]>
700700
Sean Poulter <[email protected]>
701701
vanishcode <[email protected]>
702+
Jean-Charles Sisk <[email protected]>
703+
Martin Packman <[email protected]>
704+
Danielle Adams <[email protected]>

β€Ždeps/npm/CHANGELOG.md

+20

β€Ždeps/npm/CONTRIBUTING.md

+2-3

β€Ždeps/npm/docs/public/cli-commands/npm-access/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-adduser/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-audit/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-bin/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-bugs/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-build/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-bundle/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-cache/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-ci/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-completion/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-config/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-dedupe/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-deprecate/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-dist-tag/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-docs/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-doctor/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-edit/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-explore/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-fund/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-help-search/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-help/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-hook/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-init/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-install-ci-test/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-install-test/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-install/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-link/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-logout/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-ls/index.html

+4-4
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-org/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-outdated/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-owner/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-pack/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-ping/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-prefix/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-profile/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-prune/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-publish/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-rebuild/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-repo/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-restart/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-root/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-run-script/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-search/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-shrinkwrap/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-star/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-stars/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-start/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-stop/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-team/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-test/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-token/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-uninstall/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-unpublish/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-update/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-version/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-view/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm-whoami/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/cli-commands/npm/index.html

+4-4
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/configuring-npm/folders/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/configuring-npm/install/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/configuring-npm/npmrc/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/configuring-npm/package-json/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/configuring-npm/package-lock-json/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/configuring-npm/package-locks/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/configuring-npm/shrinkwrap-json/index.html

+3-3
Large diffs are not rendered by default.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

β€Ždeps/npm/docs/public/index.html

+2-2
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/using-npm/config/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/using-npm/developers/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/using-npm/disputes/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/using-npm/orgs/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/using-npm/registry/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/using-npm/removal/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/using-npm/scope/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/using-npm/scripts/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/docs/public/using-npm/semver/index.html

+3-3
Large diffs are not rendered by default.

β€Ždeps/npm/lib/explore.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@ function explore (args, cb) {
2323
var opts = {cwd: cwd, stdio: 'inherit'}
2424

2525
var shellArgs = []
26-
if (args) {
26+
if (args.length) {
2727
if (isWindows) {
2828
var execCmd = escapeExecPath(args.shift())
2929
var execArgs = [execCmd].concat(args.map(escapeArg))
3030
opts.windowsVerbatimArguments = true
3131
shellArgs = ['/d', '/s', '/c'].concat(execArgs)
3232
} else {
33-
shellArgs.unshift('-c')
3433
shellArgs = ['-c', args.map(escapeArg).join(' ').trim()]
3534
}
3635
}

β€Ždeps/npm/lib/install.js

+3
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,9 @@ Installer.prototype.saveToDependencies = function (cb) {
650650
validate('F', arguments)
651651
if (this.failing) return cb()
652652
log.silly('install', 'saveToDependencies')
653+
// Note idealTree will be mutated during the save operations below as the
654+
// package is reloaded from disk to preserve additional details. This means
655+
// steps after postInstall will see a slightly different package object.
653656
if (this.saveOnlyLock) {
654657
saveShrinkwrap(this.idealTree, cb)
655658
} else {

β€Ždeps/npm/lib/install/deps.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function doesChildVersionMatch (child, requested, requestor) {
7676
if (childReq.rawSpec === requested.rawSpec) return true
7777
if (childReq.type === requested.type) {
7878
if (childReq.saveSpec === requested.saveSpec) return true
79-
if (childReq.fetchSpec === requested.fetchSpec) return true
79+
if ((childReq.fetchSpec === requested.fetchSpec) && requested.type !== 'git') return true
8080
}
8181
}
8282
// If _requested didn't exist OR if it didn't match then we'll try using

β€Ždeps/npm/lib/install/inflate-shrinkwrap.js

+8
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ function inflateShrinkwrap (topPath, tree, swdeps, opts) {
5252
const sw = swdeps[name]
5353
const dependencies = sw.dependencies || {}
5454
const requested = realizeShrinkwrapSpecifier(name, sw, topPath)
55+
56+
if (Object.keys(sw).length === 0) {
57+
let message = `Object for dependency "${name}" is empty.\n`
58+
message += 'Something went wrong. Regenerate the package-lock.json with "npm install".\n'
59+
message += 'If using a shrinkwrap, regenerate with "npm shrinkwrap".'
60+
return Promise.reject(new Error(message))
61+
}
62+
5563
return inflatableChild(
5664
onDisk[name], name, topPath, tree, sw, requested, opts
5765
).then((child) => {

β€Ždeps/npm/lib/install/save.js

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const iferr = require('iferr')
88
const log = require('npmlog')
99
const moduleName = require('../utils/module-name.js')
1010
const npm = require('../npm.js')
11+
const packageId = require('../utils/package-id.js')
1112
const parseJSON = require('../utils/parse-json.js')
1213
const path = require('path')
1314
const stringifyPackage = require('stringify-package')
@@ -131,6 +132,9 @@ function savePackageJson (tree, next) {
131132
} else {
132133
writeFileAtomic(saveTarget, json, next)
133134
}
135+
136+
// Restore derived id as it was removed when reloading from disk
137+
tree.package._id = packageId(tree.package)
134138
}))
135139
}
136140

β€Ždeps/npm/lib/ls.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ function makeParseable_ (data, long, dir, depth, parent, d) {
545545

546546
return data.path +
547547
':' + (data._id || '') +
548-
':' + (data.realPath !== data.path ? data.realPath : '') +
548+
(data.link && data.link !== data.path ? ':' + data.link : '') +
549549
(data.extraneous ? ':EXTRANEOUS' : '') +
550550
(data.error && data.path !== path.resolve(npm.globalDir, '..') ? ':ERROR' : '') +
551551
(data.invalid ? ':INVALID' : '') +

β€Ždeps/npm/man/man1/npm-adduser.1

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
.P
33
section: cli\-commands
44
title: npm\-adduser
5-
.SH description: Set access level on published packages
5+
description: Set access level on published packages
6+
.HR
67
.TH "NPM\-ADDUSER" "1" "July 2020" "" ""
78
.SH "NAME"
89
\fBnpm-adduser\fR \- Add a registry user account

β€Ždeps/npm/man/man1/npm-dist-tag.1

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
.P
33
section: cli\-commands
44
title: npm\-dist\-tag
5-
.SH description: Modify package distribution tags
5+
description: Modify package distribution tags
6+
.HR
67
.TH "NPM\-DIST\-TAG" "1" "July 2020" "" ""
78
.SH "NAME"
89
\fBnpm-dist-tag\fR \- Modify package distribution tags

β€Ždeps/npm/man/man1/npm-explore.1

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
.P
33
section: cli\-commands
44
title: npm\-explore
5-
.SH description: Browse an installed package
5+
description: Browse an installed package
6+
.HR
67
.TH "NPM\-EXPLORE" "1" "July 2020" "" ""
78
.SH "NAME"
89
\fBnpm-explore\fR \- Browse an installed package

β€Ždeps/npm/man/man1/npm-ls.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ For example, running \fBnpm ls promzard\fP in npm's source tree will show:
2222
.P
2323
.RS 2
2424
.nf
25-
npm@6\.14\.6 /path/to/npm
25+
npm@6\.14\.7 /path/to/npm
2626
└─┬ init\-package\-json@0\.0\.4
2727
└── promzard@0\.1\.5
2828
.fi

β€Ždeps/npm/man/man1/npm.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ npm <command> [args]
1010
.RE
1111
.SS Version
1212
.P
13-
6\.14\.6
13+
6\.14\.7
1414
.SS Description
1515
.P
1616
npm is the package manager for the Node JavaScript platform\. It puts

β€Ždeps/npm/man/man1/npx.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH "NPX" "1" "January 2020" "[email protected].1" "User Commands"
1+
.TH "NPX" "1" "July 2020" "[email protected].3" "User Commands"
22
.SH "NAME"
33
\fBnpx\fR \- execute npm package binaries
44
.SH SYNOPSIS

β€Ždeps/npm/node_modules/bin-links/CHANGELOG.md

+5

β€Ždeps/npm/node_modules/bin-links/package.json

+16-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Ždeps/npm/node_modules/cliui/CHANGELOG.md

+14

β€Ždeps/npm/node_modules/cliui/README.md

+1-1

β€Ždeps/npm/node_modules/cliui/node_modules/ansi-regex/index.js

+8-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Ždeps/npm/node_modules/cliui/node_modules/ansi-regex/package.json

+14-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)