Skip to content

Commit ec82feb

Browse files
committed
deps: upgrade npm to 7.7.5
PR-URL: #37919 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Beth Griggs <[email protected]>
1 parent 1c04327 commit ec82feb

File tree

16 files changed

+752
-13
lines changed

16 files changed

+752
-13
lines changed

deps/npm/.npmignore

+4
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,7 @@ docs/template.html
3939
Session.vim
4040
.nyc_output
4141
/.editorconfig
42+
43+
# don't ship smoke tests
44+
smoke-tests/
45+
tap-snapshots/smoke-tests-index.js-TAP.test.js

deps/npm/AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -767,3 +767,4 @@ Eric Chow <[email protected]>
767767
kbayrhammer <[email protected]>
768768
James Chen-Smith <[email protected]>
769769
Yash Singh <[email protected]>
770+
Danielle Church <[email protected]>

deps/npm/CHANGELOG.md

+28
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
## v7.7.5 (2021-03-25)
2+
3+
### BUG FIXES
4+
5+
* [`95ba87622`](https://github.com/npm/cli/commit/95ba87622e00d68270eda9e071b19737718fca16)
6+
[#2949](https://github.com/npm/cli/issues/2949)
7+
fix handling manual indexes in `npm help`
8+
([@dmchurch](https://github.com/dmchurch))
9+
* [`59cf37962`](https://github.com/npm/cli/commit/59cf37962a2286e0f7d3bd37fa9c8bc3bac94218)
10+
[#2958](https://github.com/npm/cli/issues/2958)
11+
always set `npm.command` to canonical command name
12+
([@isaacs](https://github.com/isaacs))
13+
* [`1415b4bde`](https://github.com/npm/cli/commit/1415b4bdeeaabb6e0ba12b6b1b0cc56502bd64ab)
14+
[#2964](https://github.com/npm/cli/issues/2964)
15+
fix(config): properly translate user-agent
16+
([@wraithgar](https://github.com/wraithgar))
17+
* [`59271936d`](https://github.com/npm/cli/commit/59271936d90fbd6956a41967119f578c0ba63db9)
18+
[#2965](https://github.com/npm/cli/issues/2965)
19+
fix(config): tie save-exact/save-prefix together
20+
([@wraithgar](https://github.com/wraithgar))
21+
22+
### TESTS
23+
24+
* [`97b415287`](https://github.com/npm/cli/commit/97b41528739460b2e9e72e09000aded412418cb2)
25+
[#2959](https://github.com/npm/cli/issues/2959)
26+
add smoke tests
27+
([@ruyadorno](https://github.com/ruyadorno))
28+
129
## v7.7.4 (2021-03-24)
230

331
### BUG FIXES

deps/npm/docs/output/commands/npm-ls.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ <h3 id="description">Description</h3>
159159
the results to only the paths to the packages named. Note that nested
160160
packages will <em>also</em> show the paths to the specified packages. For
161161
example, running <code>npm ls promzard</code> in npm’s source tree will show:</p>
162-
<pre lang="bash"><code>[email protected].4 /path/to/npm
162+
<pre lang="bash"><code>[email protected].5 /path/to/npm
163163
164164
165165
</code></pre>

deps/npm/docs/output/commands/npm.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ <h2 id="table-of-contents">Table of contents</h2>
148148
<pre lang="bash"><code>npm &lt;command&gt; [args]
149149
</code></pre>
150150
<h3 id="version">Version</h3>
151-
<p>7.7.4</p>
151+
<p>7.7.5</p>
152152
<h3 id="description">Description</h3>
153153
<p>npm is the package manager for the Node JavaScript platform. It puts
154154
modules in place so that node can find them, and manages dependency

deps/npm/lib/help.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const BaseCommand = require('./base-command.js')
99
// Strips out the number from foo.7 or foo.7. or foo.7.tgz
1010
// We don't currently compress our man pages but if we ever did this would
1111
// seemlessly continue supporting it
12-
const manNumberRegex = /\.(\d+)(\..*)?$/
12+
const manNumberRegex = /\.(\d+)(\.[^/\\]*)?$/
1313

1414
class Help extends BaseCommand {
1515
/* istanbul ignore next - see test/lib/load-all-commands.js */

deps/npm/lib/npm.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const proxyCmds = new Proxy({}, {
2525
// old way of doing things, until we can make breaking changes to the
2626
// npm.commands[x] api
2727
target[actual] = new Proxy(
28-
(args, cb) => npm[_runCmd](cmd, impl, args, cb),
28+
(args, cb) => npm[_runCmd](actual, impl, args, cb),
2929
{
3030
get: (target, attr, receiver) => {
3131
return Reflect.get(impl, attr, receiver)

deps/npm/lib/utils/config/definitions.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,10 @@ define('save-exact', {
15261526
Dependencies saved to package.json will be configured with an exact
15271527
version rather than using npm's default semver range operator.
15281528
`,
1529-
flatten,
1529+
flatten (key, obj, flatOptions) {
1530+
// just call the save-prefix flattener, it reads from obj['save-exact']
1531+
definitions['save-prefix'].flatten('save-prefix', obj, flatOptions)
1532+
},
15301533
})
15311534

15321535
define('save-optional', {
@@ -1595,6 +1598,7 @@ define('save-prefix', {
15951598
`,
15961599
flatten (key, obj, flatOptions) {
15971600
flatOptions.savePrefix = obj['save-exact'] ? '' : obj['save-prefix']
1601+
obj['save-prefix'] = flatOptions.savePrefix
15981602
},
15991603
})
16001604

@@ -1970,6 +1974,11 @@ define('user-agent', {
19701974
.replace(/\{arch\}/gi, process.arch)
19711975
.replace(/\{ci\}/gi, ciName ? `ci/${ciName}` : '')
19721976
.trim()
1977+
// user-agent is a unique kind of config item that gets set from a template
1978+
// and ends up translated. Because of this, the normal "should we set this
1979+
// to process.env also doesn't work
1980+
obj[key] = flatOptions.userAgent
1981+
process.env.npm_config_user_agent = flatOptions.userAgent
19731982
},
19741983
})
19751984

deps/npm/man/man1/npm-ls.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ example, running \fBnpm ls promzard\fP in npm's source tree will show:
2626
.P
2727
.RS 2
2828
.nf
29-
npm@7\.7\.4 /path/to/npm
29+
npm@7\.7\.5 /path/to/npm
3030
└─┬ init\-package\-json@0\.0\.4
3131
└── promzard@0\.1\.5
3232
.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-
7\.7\.4
13+
7\.7\.5
1414
.SS Description
1515
.P
1616
npm is the package manager for the Node JavaScript platform\. It puts

deps/npm/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "7.7.4",
2+
"version": "7.7.5",
33
"name": "npm",
44
"description": "a package manager for JavaScript",
55
"keywords": [
@@ -207,7 +207,8 @@
207207
"lint": "npm run eslint -- test/lib test/bin \"lib/**/*.js\"",
208208
"lintfix": "npm run lint -- --fix",
209209
"prelint": "rimraf test/npm_cache*",
210-
"resetdeps": "bash scripts/resetdeps.sh"
210+
"resetdeps": "bash scripts/resetdeps.sh",
211+
"smoke-tests": "tap smoke-tests/index.js"
211212
},
212213
"//": [
213214
"XXX temporarily only run unit tests while v7 beta is in progress",

0 commit comments

Comments
 (0)