Skip to content

Commit ee11376

Browse files
committed
deps: update npm to 6.11.1
Full changelog: 6.11.1 (2019-08-20): Fix a regression for windows command shim syntax. * [`37db29647`](npm/cli@37db296) `[email protected]` ([@isaacs](https://github.com/isaacs)) v6.11.0 (2019-08-20): A few meaty bugfixes, and introducing `peerDependenciesMeta`. FEATURES * [`a12341088`](npm/cli@a123410) [nodejs#224](npm/cli#224) Implements peerDependenciesMeta ([@arcanis](https://github.com/arcanis)) * [`2f3b79bba`](npm/cli@2f3b79b) [nodejs#234](npm/cli#234) add new forbidden 403 error code ([@claudiahdz](https://github.com/claudiahdz)) BUGFIXES * [`24acc9fc8`](npm/cli@24acc9f) and [`45772af0d`](npm/cli@45772af) [nodejs#217](npm/cli#217) [npm.community#8863](https://npm.community/t/installing-the-same-module-under-multiple-relative-paths-fails-on-linux/8863) [npm.community#9327](https://npm.community/t/reinstall-breaks-after-npm-update-to-6-10-2/9327,) do not descend into directory deps' child modules, fix shrinkwrap files that inappropriately list child nodes of symlink packages ([@isaacs](https://github.com/isaacs) and [@salomvary](https://github.com/salomvary)) * [`50cfe113d`](npm/cli@50cfe11) [nodejs#229](npm/cli#229) fixed typo in semver doc ([@gall0ws](https://github.com/gall0ws)) * [`e8fb2a1bd`](npm/cli@e8fb2a1) [nodejs#231](npm/cli#231) Fix spelling mistakes in CHANGELOG-3.md ([@XhmikosR](https://github.com/XhmikosR)) * [`769d2e057`](npm/cli@769d2e0) [npm/uid-number#7](npm/uid-number#7) Better error on invalid `--user`/`--group` configs. This addresses the issue when people fail to install binary packages on Docker and other environments where there is no 'nobody' user. ([@isaacs](https://github.com/isaacs)) * [`8b43c9624`](npm/cli@8b43c96) [nodejs#28987](nodejs#28987) [npm.community#6032](https://npm.community/t/npm-ci-doesnt-respect-npmrc-variables/6032) [npm.community#6658](https://npm.community/t/npm-ci-doesnt-fill-anymore-the-process-env-npm-config-cache-variable-on-post-install-scripts/6658) [npm.community#6069](https://npm.community/t/npm-ci-does-not-compile-native-dependencies-according-to-npmrc-configuration/6069) [npm.community#9323](https://npm.community/t/npm-6-9-x-not-passing-environment-to-node-gyp-regression-from-6-4-x/9323/2) Fix the regression where random config values in a .npmrc file are not passed to lifecycle scripts, breaking build processes which rely on them. ([@isaacs](https://github.com/isaacs)) * [`8b85eaa47`](npm/cli@8b85eaa) save files with inferred ownership rather than relying on `SUDO_UID` and `SUDO_GID`. ([@isaacs](https://github.com/isaacs)) * [`b7f6e5f02`](npm/cli@b7f6e5f) Infer ownership of shrinkwrap files ([@isaacs](https://github.com/isaacs)) * [`54b095d77`](npm/cli@54b095d) [nodejs#235](npm/cli#235) Add spec to dist-tag remove function ([@theberbie](https://github.com/theberbie)) DEPENDENCIES * [`dc8f9e52f`](npm/cli@dc8f9e5) `[email protected]`: Infer the ownership of all unpacked files in `node_modules`, so that we never have user-owned files in root-owned folders, or root-owned files in user-owned folders. ([@isaacs](https://github.com/isaacs)) * [`bb33940c3`](npm/cli@bb33940) `[email protected]`: * [`9c93ac3`](npm/cmd-shim@9c93ac3) [#2](npm/cmd-shim#2) [npm#3380](npm/npm#3380) Handle environment variables properly ([@basbossink](https://github.com/basbossink)) * [`2d277f8`](npm/cmd-shim@2d277f8) [nodejs#25](npm/cmd-shim#25) [nodejs#36](npm/cmd-shim#36) [nodejs#35](npm/cmd-shim#35) Fix 'no shebang' case by always providing `$basedir` in shell script ([@igorklopov](https://github.com/igorklopov)) * [`adaf20b`](npm/cmd-shim@adaf20b) [nodejs#26](npm/cmd-shim#26) Fix `$*` causing an error when arguments contain parentheses ([@satazor](https://github.com/satazor)) * [`49f0c13`](npm/cmd-shim@49f0c13) [nodejs#30](npm/cmd-shim#30) Fix paths for MSYS/MINGW bash ([@dscho](https://github.com/dscho)) * [`51a8af3`](npm/cmd-shim@51a8af3) [nodejs#34](npm/cmd-shim#34) Add proper support for PowerShell ([@ExE-Boss](https://github.com/ExE-Boss)) * [`4c37e04`](npm/cmd-shim@4c37e04) [#10](npm/cmd-shim#10) Work around quoted batch file names ([@isaacs](https://github.com/isaacs)) * [`a4e279544`](npm/cli@a4e2795) `[email protected]` ([@isaacs](https://github.com/isaacs)): * fail properly if `uid-number` raises an error * [`7086a1809`](npm/cli@7086a18) `[email protected]` ([@isaacs](https://github.com/isaacs)) * [`8845141f9`](npm/cli@8845141) `[email protected]` ([@isaacs](https://github.com/isaacs)) * [`51c028215`](npm/cli@51c0282) `[email protected]` ([@isaacs](https://github.com/isaacs)) * [`534a5548c`](npm/cli@534a554) `[email protected]` ([@isaacs](https://github.com/isaacs)) * [`3038f2fd5`](npm/cli@3038f2f) `[email protected]` ([@isaacs](https://github.com/isaacs)) * [`a609a1648`](npm/cli@a609a16) `[email protected]` ([@isaacs](https://github.com/isaacs)) * [`f0346f754`](npm/cli@f0346f7) `[email protected]` ([@isaacs](https://github.com/isaacs)) * [`ca9c615c8`](npm/cli@ca9c615) `[email protected]` ([@isaacs](https://github.com/isaacs)) * [`b417affbf`](npm/cli@b417aff) `[email protected]` ([@isaacs](https://github.com/isaacs)) TESTS * [`b6df0913c`](npm/cli@b6df091) [nodejs#228](npm/cli#228) Proper handing of /usr/bin/node lifecycle-path test ([@olivr70](https://github.com/olivr70)) * [`aaf98e88c`](npm/cli@aaf98e8) `[email protected]` ([@isaacs](https://github.com/isaacs))
1 parent f769034 commit ee11376

File tree

505 files changed

+11415
-10445
lines changed

Some content is hidden

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

505 files changed

+11415
-10445
lines changed

deps/npm/.mailmap

+10-8
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ Alex K. Wolfe <[email protected]>
22
Andrew Bradley <[email protected]>
33
Andrew Lunny <[email protected]>
44
Arlo Breault <[email protected]>
5-
65
6+
77
Benjamin Coe <[email protected]>
88
99
1010
Cedric Nelson <[email protected]>
1111
Charlie Robbins <[email protected]>
12+
Claudia Hernández <[email protected]>
1213
Dalmais Maxence <[email protected]>
1314
Danila Gerasimov <[email protected]>
1415
Dave Galbraith <[email protected]>
@@ -22,22 +23,23 @@ Evan Lucas <[email protected]> <[email protected]>
2223
2324
Faiq Raza <[email protected]>
2425
Forbes Lindesay <[email protected]>
25-
26+
27+
2628
Gabriel Barros <[email protected]>
2729
Geoff Flarity <[email protected]> <gflarity@raptvm-x02.(none)>
2830
Gregers Gram Rygg <[email protected]>
2931
Ifeanyi Oraelosi <[email protected]>
30-
Isaac Z. Schlueter <[email protected]> <[email protected]>
31-
Isaac Z. Schlueter <[email protected]>
32-
32+
33+
34+
3335
Jake Verbaten <[email protected]>
3436
James Sanders <[email protected]>
3537
James Treworgy <[email protected]>
3638
Jason Smith <[email protected]>
3739
40+
Jonas Weber <[email protected]>
3841
Joshua Bennett <[email protected]>
3942
40-
Jonas Weber <[email protected]>
4143
Julien Meddah <[email protected]>
4244
4345
Kevin Lorenz <[email protected]>
@@ -51,12 +53,12 @@ Max Goodman <[email protected]>
5153
Maxim Bogushevich <[email protected]>
5254
5355
54-
Nicolas Morel <[email protected]>
5556
Misha Kaletsky <[email protected]>
57+
Nicolas Morel <[email protected]>
5658
Olivier Melcher <[email protected]>
5759
Ra'Shaun Stovall <[email protected]>
58-
5960
61+
6062
Ryan Emery <[email protected]>
6163
Sam Mikes <[email protected]>
6264
Sreenivas Alapati <[email protected]>

deps/npm/.travis.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,21 @@ matrix:
1414
script:
1515
# run the sudo tests, with coverage enabled
1616
- "sudo PATH=$PATH $(which node) . run tap -- \"test/tap/*.js\" --coverage"
17-
- "unset COVERALLS_REPO_TOKEN ; node . run tap -- \"test/broken-under-*/*.js\""
1817
# previous LTS is next most important
1918
- node_js: "10"
2019
env: DEPLOY_VERSION=testing
2120
script:
2221
- "npx standard"
2322
- "node . run licenses"
24-
- "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
23+
- "node . run tap -- \"test/tap/*.js\""
2524
- node_js: "8"
2625
env: DEPLOY_VERSION=testing
2726
- node_js: "6"
2827
env: DEPLOY_VERSION=testing
28+
cache: false
2929
notifications:
3030
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
31-
cache:
32-
directories:
33-
- node_modules/.cache
3431
install:
3532
- "node . install"
3633
script:
37-
- "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
34+
- "node . run tap -- \"test/tap/*.js\""

deps/npm/AUTHORS

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Authors sorted by whether or not they're me
2-
Isaac Z. Schlueter <[email protected]>
32
43
Steve Steiner <[email protected]>
54
Mikeal Rogers <[email protected]>
@@ -644,11 +643,15 @@ Florian Keller <[email protected]>
644643
Sreeram Jayan <[email protected]>
645644
646645
raywu0123 <[email protected]>
647-
648646
Iván Reinoso García <[email protected]>
649647
Roy Marples <[email protected]>
650648
Robert James Gabriel <[email protected]>
651649
John Firebaugh <[email protected]>
652650
Kitten King <[email protected]>
653-
claudiahdz <[email protected]>
651+
Claudia Hernández <[email protected]>
654652
Artem Sapegin <[email protected]>
653+
Márton Salomváry <[email protected]>
654+
655+
Olivier Chevet <[email protected]>
656+
Maël Nison <[email protected]>
657+
Sara Ahbabou <[email protected]>

deps/npm/CHANGELOG.md

+126
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,129 @@
1+
## 6.11.1 (2019-08-20):
2+
3+
Fix a regression for windows command shim syntax.
4+
5+
* [`37db29647`](https://github.com/npm/cli/commit/37db2964710c80003604b7e3c1527d17be7ed3d0)
6+
`[email protected]` ([@isaacs](https://github.com/isaacs))
7+
8+
## v6.11.0 (2019-08-20):
9+
10+
A few meaty bugfixes, and introducing `peerDependenciesMeta`.
11+
12+
### FEATURES
13+
14+
* [`a12341088`](https://github.com/npm/cli/commit/a12341088820c0e7ef6c1c0db3c657f0c2b3943e)
15+
[#224](https://github.com/npm/cli/pull/224) Implements
16+
peerDependenciesMeta ([@arcanis](https://github.com/arcanis))
17+
* [`2f3b79bba`](https://github.com/npm/cli/commit/2f3b79bbad820fd4a398aa494b19f79b7fd520a1)
18+
[#234](https://github.com/npm/cli/pull/234) add new forbidden 403 error
19+
code ([@claudiahdz](https://github.com/claudiahdz))
20+
21+
### BUGFIXES
22+
23+
* [`24acc9fc8`](https://github.com/npm/cli/commit/24acc9fc89d99d87cc66206c6c6f7cdc82fbf763)
24+
and
25+
[`45772af0d`](https://github.com/npm/cli/commit/45772af0ddca54b658cb2ba2182eec26d0a4729d)
26+
[#217](https://github.com/npm/cli/pull/217)
27+
[npm.community#8863](https://npm.community/t/installing-the-same-module-under-multiple-relative-paths-fails-on-linux/8863)
28+
[npm.community#9327](https://npm.community/t/reinstall-breaks-after-npm-update-to-6-10-2/9327,)
29+
do not descend into directory deps' child modules, fix shrinkwrap files
30+
that inappropriately list child nodes of symlink packages
31+
([@isaacs](https://github.com/isaacs) and
32+
[@salomvary](https://github.com/salomvary))
33+
* [`50cfe113d`](https://github.com/npm/cli/commit/50cfe113da5fcc59c1d99b0dcf1050ace45803c7)
34+
[#229](https://github.com/npm/cli/pull/229) fixed typo in semver doc
35+
([@gall0ws](https://github.com/gall0ws))
36+
* [`e8fb2a1bd`](https://github.com/npm/cli/commit/e8fb2a1bd9785e0092e9926f4fd65ad431e38452)
37+
[#231](https://github.com/npm/cli/pull/231) Fix spelling mistakes in
38+
CHANGELOG-3.md ([@XhmikosR](https://github.com/XhmikosR))
39+
* [`769d2e057`](https://github.com/npm/cli/commit/769d2e057daf5a2cbfe0ce86f02550e59825a691)
40+
[npm/uid-number#7](https://github.com/npm/uid-number/issues/7) Better
41+
error on invalid `--user`/`--group` configs. This addresses the issue
42+
when people fail to install binary packages on Docker and other
43+
environments where there is no 'nobody' user.
44+
([@isaacs](https://github.com/isaacs))
45+
* [`8b43c9624`](https://github.com/npm/cli/commit/8b43c962498c8e2707527e4fca442d7a4fa51595)
46+
[nodejs/node#28987](https://github.com/nodejs/node/issues/28987)
47+
[npm.community#6032](https://npm.community/t/npm-ci-doesnt-respect-npmrc-variables/6032)
48+
[npm.community#6658](https://npm.community/t/npm-ci-doesnt-fill-anymore-the-process-env-npm-config-cache-variable-on-post-install-scripts/6658)
49+
[npm.community#6069](https://npm.community/t/npm-ci-does-not-compile-native-dependencies-according-to-npmrc-configuration/6069)
50+
[npm.community#9323](https://npm.community/t/npm-6-9-x-not-passing-environment-to-node-gyp-regression-from-6-4-x/9323/2)
51+
Fix the regression where random config values in a .npmrc file are not
52+
passed to lifecycle scripts, breaking build processes which rely on them.
53+
([@isaacs](https://github.com/isaacs))
54+
* [`8b85eaa47`](https://github.com/npm/cli/commit/8b85eaa47da3abaacc90fe23162a68cc6e1f0404)
55+
save files with inferred ownership rather than relying on `SUDO_UID` and
56+
`SUDO_GID`. ([@isaacs](https://github.com/isaacs))
57+
* [`b7f6e5f02`](https://github.com/npm/cli/commit/b7f6e5f0285515087b4614d81db17206524c0fdb)
58+
Infer ownership of shrinkwrap files
59+
([@isaacs](https://github.com/isaacs))
60+
* [`54b095d77`](https://github.com/npm/cli/commit/54b095d77b3b131622b3cf4cb5c689aa2dd10b6b)
61+
[#235](https://github.com/npm/cli/pull/235) Add spec to dist-tag remove
62+
function ([@theberbie](https://github.com/theberbie))
63+
64+
### DEPENDENCIES
65+
66+
* [`dc8f9e52f`](https://github.com/npm/cli/commit/dc8f9e52f0bb107c0a6b20cc0c97cbc3b056c1b3)
67+
`[email protected]`: Infer the ownership of all unpacked files in
68+
`node_modules`, so that we never have user-owned files in root-owned
69+
folders, or root-owned files in user-owned folders.
70+
([@isaacs](https://github.com/isaacs))
71+
* [`bb33940c3`](https://github.com/npm/cli/commit/bb33940c32aad61704084e61ebd1bd8e7cacccc8)
72+
73+
* [`9c93ac3`](https://github.com/npm/cmd-shim/commit/9c93ac39e95b0d6ae852e842e4c5dba5e19687c2)
74+
[#2](https://github.com/npm/cmd-shim/pull/2)
75+
[npm#3380](https://github.com/npm/npm/issues/3380) Handle environment
76+
variables properly ([@basbossink](https://github.com/basbossink))
77+
* [`2d277f8`](https://github.com/npm/cmd-shim/commit/2d277f8e84d45401747b0b9470058f168b974ad5)
78+
[#25](https://github.com/npm/cmd-shim/pull/25)
79+
[#36](https://github.com/npm/cmd-shim/pull/36)
80+
[#35](https://github.com/npm/cmd-shim/pull/35) Fix 'no shebang' case by
81+
always providing `$basedir` in shell script
82+
([@igorklopov](https://github.com/igorklopov))
83+
* [`adaf20b`](https://github.com/npm/cmd-shim/commit/adaf20b7fa2c09c2111a2506c6a3e53ed0831f88)
84+
[#26](https://github.com/npm/cmd-shim/pull/26) Fix `$*` causing an
85+
error when arguments contain parentheses
86+
([@satazor](https://github.com/satazor))
87+
* [`49f0c13`](https://github.com/npm/cmd-shim/commit/49f0c1318fd384e0031c3fd43801f0e22e1e555f)
88+
[#30](https://github.com/npm/cmd-shim/pull/30) Fix paths for MSYS/MINGW
89+
bash ([@dscho](https://github.com/dscho))
90+
* [`51a8af3`](https://github.com/npm/cmd-shim/commit/51a8af30990cb072cb30d67fc1b564b14746bba9)
91+
[#34](https://github.com/npm/cmd-shim/pull/34) Add proper support for
92+
PowerShell ([@ExE-Boss](https://github.com/ExE-Boss))
93+
* [`4c37e04`](https://github.com/npm/cmd-shim/commit/4c37e048dee672237e8962fdffca28e20e9f976d)
94+
[#10](https://github.com/npm/cmd-shim/issues/10) Work around quoted
95+
batch file names ([@isaacs](https://github.com/isaacs))
96+
* [`a4e279544`](https://github.com/npm/cli/commit/a4e279544f7983e0adff1e475e3760f1ea85825a)
97+
`[email protected]` ([@isaacs](https://github.com/isaacs)):
98+
* fail properly if `uid-number` raises an error
99+
* [`7086a1809`](https://github.com/npm/cli/commit/7086a1809bbfda9be81344b3949c7d3ac687ffc4)
100+
`[email protected]` ([@isaacs](https://github.com/isaacs))
101+
* [`8845141f9`](https://github.com/npm/cli/commit/8845141f9d7827dae572c8cf26f2c775db905bd3)
102+
`[email protected]` ([@isaacs](https://github.com/isaacs))
103+
* [`51c028215`](https://github.com/npm/cli/commit/51c02821575d80035ebe853492d110db11a7d1b9)
104+
`[email protected]` ([@isaacs](https://github.com/isaacs))
105+
* [`534a5548c`](https://github.com/npm/cli/commit/534a5548c9ebd59f0dd90e9ccca148ed8946efa6)
106+
`[email protected]` ([@isaacs](https://github.com/isaacs))
107+
* [`3038f2fd5`](https://github.com/npm/cli/commit/3038f2fd5b1d7dd886ee72798241d8943690f508)
108+
`[email protected]` ([@isaacs](https://github.com/isaacs))
109+
* [`a609a1648`](https://github.com/npm/cli/commit/a609a16489f76791697d270b499fd4949ab1f8c3)
110+
`[email protected]` ([@isaacs](https://github.com/isaacs))
111+
* [`f0346f754`](https://github.com/npm/cli/commit/f0346f75490619a81b310bfc18646ae5ae2e0ea4)
112+
`[email protected]` ([@isaacs](https://github.com/isaacs))
113+
* [`ca9c615c8`](https://github.com/npm/cli/commit/ca9c615c8cff5c7db125735eb09f84d912d18694)
114+
`[email protected]` ([@isaacs](https://github.com/isaacs))
115+
* [`b417affbf`](https://github.com/npm/cli/commit/b417affbf7133dc7687fd809e4956a43eae3438a)
116+
`[email protected]` ([@isaacs](https://github.com/isaacs))
117+
118+
### TESTS
119+
120+
* [`b6df0913c`](https://github.com/npm/cli/commit/b6df0913ca73246f1fa6cfa0e81e34ba5f2b6204)
121+
[#228](https://github.com/npm/cli/pull/228) Proper handing of
122+
/usr/bin/node lifecycle-path test
123+
([@olivr70](https://github.com/olivr70))
124+
* [`aaf98e88c`](https://github.com/npm/cli/commit/aaf98e88c78fd6c850d0a3d3ee2f61c02f63bc8c)
125+
`[email protected]` ([@isaacs](https://github.com/isaacs))
126+
1127
## v6.10.3 (2019-08-06):
2128

3129
### BUGFIXES
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
if not defined npm_config_node_gyp (
2-
node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
3-
) else (
1+
if not defined npm_config_node_gyp (
2+
node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
3+
) else (
44
node "%npm_config_node_gyp%" %*
5-
)
5+
)

deps/npm/bin/npm.cmd

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
:: Created by npm, please don't edit manually.
2-
@ECHO OFF
3-
4-
SETLOCAL
5-
6-
SET "NODE_EXE=%~dp0\node.exe"
7-
IF NOT EXIST "%NODE_EXE%" (
8-
SET "NODE_EXE=node"
9-
)
10-
11-
SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
12-
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
13-
SET "NPM_PREFIX_NPM_CLI_JS=%%F\node_modules\npm\bin\npm-cli.js"
14-
)
15-
IF EXIST "%NPM_PREFIX_NPM_CLI_JS%" (
16-
SET "NPM_CLI_JS=%NPM_PREFIX_NPM_CLI_JS%"
17-
)
18-
19-
"%NODE_EXE%" "%NPM_CLI_JS%" %*
1+
:: Created by npm, please don't edit manually.
2+
@ECHO OFF
3+
4+
SETLOCAL
5+
6+
SET "NODE_EXE=%~dp0\node.exe"
7+
IF NOT EXIST "%NODE_EXE%" (
8+
SET "NODE_EXE=node"
9+
)
10+
11+
SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
12+
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
13+
SET "NPM_PREFIX_NPM_CLI_JS=%%F\node_modules\npm\bin\npm-cli.js"
14+
)
15+
IF EXIST "%NPM_PREFIX_NPM_CLI_JS%" (
16+
SET "NPM_CLI_JS=%NPM_PREFIX_NPM_CLI_JS%"
17+
)
18+
19+
"%NODE_EXE%" "%NPM_CLI_JS%" %*

deps/npm/bin/npx.cmd

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
:: Created by npm, please don't edit manually.
2-
@ECHO OFF
3-
4-
SETLOCAL
5-
6-
SET "NODE_EXE=%~dp0\node.exe"
7-
IF NOT EXIST "%NODE_EXE%" (
8-
SET "NODE_EXE=node"
9-
)
10-
11-
SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
12-
SET "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
13-
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
14-
SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
15-
)
16-
IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
17-
SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
18-
)
19-
20-
"%NODE_EXE%" "%NPX_CLI_JS%" %*
1+
:: Created by npm, please don't edit manually.
2+
@ECHO OFF
3+
4+
SETLOCAL
5+
6+
SET "NODE_EXE=%~dp0\node.exe"
7+
IF NOT EXIST "%NODE_EXE%" (
8+
SET "NODE_EXE=node"
9+
)
10+
11+
SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
12+
SET "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
13+
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
14+
SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
15+
)
16+
IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
17+
SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
18+
)
19+
20+
"%NODE_EXE%" "%NPX_CLI_JS%" %*

deps/npm/changelogs/CHANGELOG-3.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This is gonna be a much, MUCH smaller major version than 3.x was. Maybe even
4747
smaller than 2.x was. I can't tell you everything that'll be in there just
4848
yet, but at the very least it's going to have what's in our
4949
[4.x milestone](https://github.com/npm/npm/pulls?q=is%3Aopen+is%3Apr+milestone%3A4.x),
50-
PLUS, the first steps in
50+
PLUS, the first steps in
5151
[making `prepublish` work](https://github.com/npm/npm/issues/10074) the way
5252
people expect it to.
5353

@@ -2864,7 +2864,7 @@ Historically, if you used a pre-release version of Node.js, you would get
28642864
dozens and dozens of warnings when EVERY engine check failed across all of
28652865
your modules, because `>= 0.10.0` doesn't match prereleases.
28662866

2867-
You might find this stream of redundent warnings undesirable. I do.
2867+
You might find this stream of redundant warnings undesirable. I do.
28682868

28692869
We've moved this into a SINGLE warning you'll get about using a pre-release
28702870
version of Node.js and now suppress those other warnings.
@@ -3524,7 +3524,7 @@ it would just refuse to install anything. (We fixed that in
35243524
[#10338](https://github.com/npm/npm/pull/10338)
35253525
Updating a module could result in the module stealing some of its
35263526
dependencies from the top level, potentially breaking other modules or
3527-
resulting in many redundent installations. This bug was first introduced
3527+
resulting in many redundant installations. This bug was first introduced
35283528
by [`971fd47a`](https://github.com/npm/npm/commit/971fd47a).
35293529
([@iarna](https://github.com/iarna))
35303530
* [`5653366`](https://github.com/npm/npm/commit/5653366)

deps/npm/changelogs/CHANGELOG-5.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ as `https://` URLs instead of versions.
225225
zeros deleted resulted in authentication failures.
226226
([@iarna](https://github.com/iarna))
227227
* [`6eaa860ea`](https://github.com/npm/npm/commit/6eaa860ead3222a6dbd6d370b4271e7bf242b30b)
228-
Eliminate direct use of `new Buffer` in `npm`. While the use of it in `npm` was safe, there
228+
Eliminate direct use of `new Buffer` in `npm`. While the use of it in `npm` was safe, there
229229
are two other reasons for this change:
230230

231231
1. Node 10 emits warnings about its use.
@@ -341,7 +341,7 @@ and a handful of bug fixes! Let's get right in!
341341

342342
### NEW PACKAGE VIEW
343343

344-
There's a new `npm view` in town. You might it as `npm info` or `npm show`.
344+
There's a new `npm view` in town. You might it as `npm info` or `npm show`.
345345
The new output gives you a nicely summarized view that for most packages
346346
fits on one screen. If you ask it for `--json` you'll still get the same
347347
results, so your scripts should still work fine.
@@ -377,7 +377,7 @@ you can double check your `.npmignore` settings before doing a publish.
377377
### MERGE CONFLICT, SMERGE CONFLICT
378378

379379
If you resolve a `package-lock.json` merge conflict with `npm install` we
380-
now suggest you setup a merge driver to handle these automatically for you.
380+
now suggest you setup a merge driver to handle these automatically for you.
381381
If you're reading this and you'd like to set it up now, run:
382382

383383
```console
@@ -1935,7 +1935,7 @@ helpful when community members go over our code and help clean it up, too!
19351935
* [`9e5b76140`](https://github.com/npm/npm/commit/9e5b76140ffdb7dcd12aa402793644213fb8c5d7)
19361936
[#17411](https://github.com/npm/npm/pull/17411)
19371937
Convert all callback-style `move` usage to use Promises.
1938-
([@vramana](https://github.com/vramana))
1938+
([@vramana](https://github.com/vramana))
19391939
* [`0711c08f7`](https://github.com/npm/npm/commit/0711c08f779ac641ec42ecc96f604c8861008b28)
19401940
[#17394](https://github.com/npm/npm/pull/17394)
19411941
Remove unused argument in `deepSortObject`.

0 commit comments

Comments
 (0)