Skip to content

Commit 9e81a50

Browse files
committed
deps: re land npm 5.6.0
When the original backport was landed there were some missing commits on v8.x. This commit completely re lands npm 5.6.0 to make sure the version on 8.x has the correct file tree Refs: nodejs#16509 (comment)
1 parent 51999d0 commit 9e81a50

File tree

384 files changed

+10214
-10064
lines changed

Some content is hidden

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

384 files changed

+10214
-10064
lines changed

deps/npm/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Lines changed: 4 additions & 4 deletions
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

Lines changed: 19 additions & 19 deletions
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

Lines changed: 19 additions & 19 deletions
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 "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
12-
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPX_CLI_JS%" prefix -g') DO (
13-
SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
14-
)
15-
IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
16-
SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
17-
)
18-
19-
"%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 "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
12+
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPX_CLI_JS%" prefix -g') DO (
13+
SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
14+
)
15+
IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
16+
SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
17+
)
18+
19+
"%NODE_EXE%" "%NPX_CLI_JS%" %*

deps/npm/changelogs/CHANGELOG-3.md

Lines changed: 1 addition & 1 deletion

deps/npm/doc/cli/npm-profile.md

Lines changed: 1 addition & 1 deletion

deps/npm/doc/cli/npm-run-script.md

Lines changed: 1 addition & 1 deletion

deps/npm/doc/cli/npm-token.md

Lines changed: 1 addition & 1 deletion

deps/npm/doc/cli/npm-version.md

Lines changed: 1 addition & 1 deletion

deps/npm/html/doc/cli/npm-doctor.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,4 @@ <h2 id="see-also">SEE ALSO</h2>
104104
<tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
105105
</table>
106106
<p id="footer">npm-doctor &mdash; npm@5.6.0</p>
107+

0 commit comments

Comments
 (0)