Skip to content

Commit 7422453

Browse files
ruyadornodanielleadams
ruyadorno
authored and
danielleadams
committed
deps: upgrade npm to 7.6.1
PR-URL: #37606 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
1 parent 440c944 commit 7422453

File tree

191 files changed

+10075
-7710
lines changed

Some content is hidden

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

191 files changed

+10075
-7710
lines changed

‎deps/npm/AUTHORS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,3 +755,5 @@ Ikko Ashimine <[email protected]>
755755
MrBrain295 <[email protected]>
756756
kumavis <[email protected]>
757757
Christof Lemke <[email protected]>
758+
Nathan Shively-Sanders <[email protected]>
759+
Bjørn Johansen <[email protected]>

‎deps/npm/CHANGELOG.md‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,52 @@
1+
## v7.6.1 (2021-03-04)
2+
3+
### BUG FIXES
4+
5+
* [`3c9a589b0`](https://github.com/npm/cli/commit/3c9a589b004fa828a304abaf52d1d781710e1143)
6+
[#2807](https://github.com/npm/cli/issues/2807)
7+
`npm explain` show when an edge is a bundled edge
8+
([@kumavis](https://github.com/kumavis))
9+
* [`b33c760ce`](https://github.com/npm/cli/commit/b33c760cea7fe2696d35b5530abc1b455980fef1)
10+
[#2766](https://github.com/npm/cli/issues/2766)
11+
unused arguments cleanup
12+
([@sandersn](https://github.com/sandersn))
13+
* [`4a5dd3a5a`](https://github.com/npm/cli/commit/4a5dd3a5a200b3f4f7b47168497d8e03dca3a2ca)
14+
[#2772](https://github.com/npm/cli/issues/2772)
15+
fix(npm) pass npm context everywhere
16+
([@wraithgar](https://github.com/wraithgar))
17+
* [`e69be2ac5`](https://github.com/npm/cli/commit/e69be2ac5c35e985732e2baa00b70d39332e4b9f)
18+
[#2789](https://github.com/npm/cli/issues/2789)
19+
fix npm prefix on all Windows unix shells
20+
([@isaacs](https://github.com/isaacs))
21+
* [`2d682e4ca`](https://github.com/npm/cli/commit/2d682e4cab0cf109a16332f3222f1e9a4027db69)
22+
[#2803](https://github.com/npm/cli/issues/2803)
23+
fix(search): don't pass unused args
24+
([@wraithgar](https://github.com/wraithgar))
25+
* [`b3e7dd19b`](https://github.com/npm/cli/commit/b3e7dd19bb4888dad2bfb6702aed6560a7f91bf8)
26+
[#2822](https://github.com/npm/cli/issues/2822)
27+
fix(diff): set option "where" for pacote
28+
([@ruyadorno](https://github.com/ruyadorno))
29+
* [`96006640b`](https://github.com/npm/cli/commit/96006640b902d31415260df5ce3ad8d066a64623)
30+
[#2824](https://github.com/npm/cli/issues/2824)
31+
fix(repo, auth.sso): don't promisify open-url
32+
([@wraithgar](https://github.com/wraithgar))
33+
34+
### DOCUMENTATION
35+
36+
* [`c8b73db82`](https://github.com/npm/cli/commit/c8b73db82f0f2445c20a0a64110586253accd66b)
37+
[#2690](https://github.com/npm/cli/issues/2690)
38+
fix(docs): update scripts docs
39+
([@wraithgar](https://github.com/wraithgar))
40+
* [`5d922394b`](https://github.com/npm/cli/commit/5d922394b7874b2b38d34f03f2decbe0eb3e8583)
41+
[#2809](https://github.com/npm/cli/issues/2809)
42+
update republish timeout after unpublish
43+
([@BAJ-](https://github.com/BAJ-))
44+
45+
### DEPENDENCIES
46+
47+
* [`2d4ae598f`](https://github.com/npm/cli/commit/2d4ae598f30049680797685f76154b16a7e15a66)
48+
`@npmcli/[email protected]`
49+
150
## v7.6.0 (2021-02-25)
251

352
### FEATURES

‎deps/npm/bin/npm‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#!/bin/sh
1+
#!/usr/bin/env bash
22
(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
33

44
basedir=`dirname "$0"`
55

66
case `uname` in
7-
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
7+
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
88
esac
99

1010
NODE_EXE="$basedir/node.exe"
@@ -15,23 +15,30 @@ if ! [ -x "$NODE_EXE" ]; then
1515
NODE_EXE=node
1616
fi
1717

18-
NPM_CLI_JS="$basedir/node_modules/npm/bin/npm-cli.js"
18+
# this path is passed to node.exe, so it needs to match whatever
19+
# kind of paths Node.js thinks it's using, typically win32 paths.
20+
CLI_BASEDIR="$("$NODE_EXE" -p 'require("path").dirname(process.execPath)')"
21+
NPM_CLI_JS="$CLI_BASEDIR/node_modules/npm/bin/npm-cli.js"
1922

20-
case `uname` in
21-
*MINGW*)
22-
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
23-
NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"
24-
if [ -f "$NPM_PREFIX_NPM_CLI_JS" ]; then
25-
NPM_CLI_JS="$NPM_PREFIX_NPM_CLI_JS"
26-
fi
27-
;;
28-
*CYGWIN*)
29-
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
30-
NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"
31-
if [ -f "$NPM_PREFIX_NPM_CLI_JS" ]; then
32-
NPM_CLI_JS="$NPM_PREFIX_NPM_CLI_JS"
33-
fi
34-
;;
35-
esac
23+
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
24+
if [ $? -ne 0 ]; then
25+
# if this didn't work, then everything else below will fail
26+
echo "Could not determine Node.js install directory" >&2
27+
exit 1
28+
fi
29+
NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"
30+
31+
# a path that will fail -f test on any posix bash
32+
NPM_WSL_PATH="/.."
33+
34+
# WSL can run Windows binaries, so we have to give it the win32 path
35+
# however, WSL bash tests against posix paths, so we need to construct that
36+
# to know if npm is installed globally.
37+
if [ `uname` = 'Linux' ] && type wslpath &>/dev/null ; then
38+
NPM_WSL_PATH=`wslpath "$NPM_PREFIX_NPM_CLI_JS"`
39+
fi
40+
if [ -f "$NPM_PREFIX_NPM_CLI_JS" ] || [ -f "$NPM_WSL_PATH" ]; then
41+
NPM_CLI_JS="$NPM_PREFIX_NPM_CLI_JS"
42+
fi
3643

3744
"$NODE_EXE" "$NPM_CLI_JS" "$@"

‎deps/npm/bin/npx‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/usr/bin/env bash
22

33
# This is used by the Node.js installer, which expects the cygwin/mingw
44
# shell script to already be present in the npm dependency folder.
@@ -8,32 +8,38 @@
88
basedir=`dirname "$0"`
99

1010
case `uname` in
11-
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
11+
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
1212
esac
1313

1414
NODE_EXE="$basedir/node.exe"
1515
if ! [ -x "$NODE_EXE" ]; then
1616
NODE_EXE=node
1717
fi
1818

19-
NPM_CLI_JS="$basedir/node_modules/npm/bin/npm-cli.js"
20-
NPX_CLI_JS="$basedir/node_modules/npm/bin/npx-cli.js"
21-
22-
case `uname` in
23-
*MINGW*)
24-
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
25-
NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
26-
if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
27-
NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
28-
fi
29-
;;
30-
*CYGWIN*)
31-
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
32-
NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
33-
if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
34-
NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
35-
fi
36-
;;
37-
esac
19+
# these paths are passed to node.exe, so they need to match whatever
20+
# kind of paths Node.js thinks it's using, typically win32 paths.
21+
CLI_BASEDIR="$("$NODE_EXE" -p 'require("path").dirname(process.execPath)')"
22+
if [ $? -ne 0 ]; then
23+
# if this didn't work, then everything else below will fail
24+
echo "Could not determine Node.js install directory" >&2
25+
exit 1
26+
fi
27+
NPM_CLI_JS="$CLI_BASEDIR/node_modules/npm/bin/npm-cli.js"
28+
NPX_CLI_JS="$CLI_BASEDIR/node_modules/npm/bin/npx-cli.js"
29+
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
30+
NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
31+
32+
# a path that will fail -f test on any posix bash
33+
NPX_WSL_PATH="/.."
34+
35+
# WSL can run Windows binaries, so we have to give it the win32 path
36+
# however, WSL bash tests against posix paths, so we need to construct that
37+
# to know if npm is installed globally.
38+
if [ `uname` = 'Linux' ] && type wslpath &>/dev/null ; then
39+
NPX_WSL_PATH=`wslpath "$NPM_PREFIX_NPX_CLI_JS"`
40+
fi
41+
if [ -f "$NPM_PREFIX_NPX_CLI_JS" ] || [ -f "$NPX_WSL_PATH" ]; then
42+
NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
43+
fi
3844

3945
"$NODE_EXE" "$NPX_CLI_JS" "$@"

‎deps/npm/docs/content/commands/npm-unpublish.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ versions then the registry will remove the root package entry entirely.
4242
Even if you unpublish a package version, that specific name and version
4343
combination can never be reused. In order to publish the package again,
4444
you must use a new version number. If you unpublish the entire package,
45-
you may not publish any new versions of that package until 28 days have
45+
you may not publish any new versions of that package until 24 hours have
4646
passed.
4747

4848
### See Also

0 commit comments

Comments
 (0)