Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: update npm to 6.12.0 #29885

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion deps/npm/.travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
sudo: true
# need to declare the language as well as the matrix below
language: node_js

Expand Down
6 changes: 6 additions & 0 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -656,3 +656,9 @@ Olivier Chevet <[email protected]>
Maël Nison <[email protected]>
Sara Ahbabou <[email protected]>
Gareth Jones <[email protected]>
Ruy Adorno <[email protected]>
Michael Perrotte <[email protected]>
Ben Blank <[email protected]>
Christian Clauss <[email protected]>
Nikita Lebedev <[email protected]>
Henrik Gemal <[email protected]>
65 changes: 65 additions & 0 deletions deps/npm/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,68 @@
## 6.12.0 (2019-10-08):

Now `npm ci` runs prepare scripts for git dependencies, and respects the
`--no-optional` argument. Warnings for `engine` mismatches are printed
again. Various other fixes and cleanups.

### BUG FIXES

* [`890b245dc`](https://github.com/npm/cli/commit/890b245dc1f609590d8ab993fac7cf5a37ed46a5)
[#252](https://github.com/npm/cli/pull/252) ci: add dirPacker to options
([@claudiahdz](https://github.com/claudiahdz))
* [`f3299acd0`](https://github.com/npm/cli/commit/f3299acd0b4249500e940776aca77cc6c0977263)
[#257](https://github.com/npm/cli/pull/257)
[npm.community#4792](https://npm.community/t/engines-and-engines-strict-ignored/4792)
warn message on engine mismatch
([@ruyadorno](https://github.com/ruyadorno))
* [`bbc92fb8f`](https://github.com/npm/cli/commit/bbc92fb8f3478ff67071ebaff551f01c1ea42ced)
[#259](https://github.com/npm/cli/pull/259)
[npm.community#10288](https://npm.community/t/npm-token-err-figgypudding-options-cannot-be-modified-use-concat-instead/10288)
Fix figgyPudding error in `npm token`
([@benblank](https://github.com/benblank))
* [`70f54dcb5`](https://github.com/npm/cli/commit/70f54dcb5693b301c6b357922b7e8d16b57d8b00)
[#241](https://github.com/npm/cli/pull/241) doctor: Make OK more
consistent ([@gemal](https://github.com/gemal))

### FEATURES

* [`ed993a29c`](https://github.com/npm/cli/commit/ed993a29ccf923425317c433844d55dbea2f23ee)
[#249](https://github.com/npm/cli/pull/249) Add CI environment variables
to user-agent ([@isaacs](https://github.com/isaacs))
* [`f6b0459a4`](https://github.com/npm/cli/commit/f6b0459a466a2c663dbd549cdc331e7732552dca)
[#248](https://github.com/npm/cli/pull/248) Add option to save
package-lock without formatting Adds a new config
`--format-package-lock`, which defaults to true.
([@bl00mber](https://github.com/bl00mber))

### DEPENDENCIES

* [`0ca063c5d`](https://github.com/npm/cli/commit/0ca063c5dc961c4aa17373f4b33fb54c51c8c8d6)
`[email protected]`:
- fix: filter functions and undefined out of makeEnv
([@isaacs](https://github.com/isaacs))
* [`5df6b0ea2`](https://github.com/npm/cli/commit/5df6b0ea2e3106ba65bba649cc8d7f02f4738236)
`[email protected]`:
- fix: pack git directories properly
([@claudiahdz](https://github.com/claudiahdz))
- respect no-optional argument
([@cruzdanilo](https://github.com/cruzdanilo))
* [`7e04f728c`](https://github.com/npm/cli/commit/7e04f728cc4cd4853a8fc99e2df0a12988897589)
`[email protected]`
* [`5c380e5a3`](https://github.com/npm/cli/commit/5c380e5a33d760bb66a4285b032ae5f50af27199)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`62f2ca692`](https://github.com/npm/cli/commit/62f2ca692ac0c0467ef4cf74f91777a5175258c4)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`0ff0ea47a`](https://github.com/npm/cli/commit/0ff0ea47a8840dd7d952bde7f7983a5016cda8ea)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`f46edae94`](https://github.com/npm/cli/commit/f46edae9450b707650a0efab09aa1e9295a18070)
`[email protected]` ([@isaacs](https://github.com/isaacs))

### TESTING

* [`44a2b036b`](https://github.com/npm/cli/commit/44a2b036b34324ec85943908264b2e36de5a9435)
[#262](https://github.com/npm/cli/pull/262) fix root-ownership race
conditions in meta-test ([@isaacs](https://github.com/isaacs))

## 6.11.3 (2019-09-03):

Fix npm ci regressions and npm outdated depth.
Expand Down
8 changes: 4 additions & 4 deletions deps/npm/bin/node-gyp-bin/node-gyp.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if not defined npm_config_node_gyp (
node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
) else (
if not defined npm_config_node_gyp (
node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
) else (
node "%npm_config_node_gyp%" %*
)
)
38 changes: 19 additions & 19 deletions deps/npm/bin/npm.cmd
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
:: Created by npm, please don't edit manually.
@ECHO OFF

SETLOCAL

SET "NODE_EXE=%~dp0\node.exe"
IF NOT EXIST "%NODE_EXE%" (
SET "NODE_EXE=node"
)

SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
SET "NPM_PREFIX_NPM_CLI_JS=%%F\node_modules\npm\bin\npm-cli.js"
)
IF EXIST "%NPM_PREFIX_NPM_CLI_JS%" (
SET "NPM_CLI_JS=%NPM_PREFIX_NPM_CLI_JS%"
)

"%NODE_EXE%" "%NPM_CLI_JS%" %*
:: Created by npm, please don't edit manually.
@ECHO OFF
SETLOCAL
SET "NODE_EXE=%~dp0\node.exe"
IF NOT EXIST "%NODE_EXE%" (
SET "NODE_EXE=node"
)
SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
SET "NPM_PREFIX_NPM_CLI_JS=%%F\node_modules\npm\bin\npm-cli.js"
)
IF EXIST "%NPM_PREFIX_NPM_CLI_JS%" (
SET "NPM_CLI_JS=%NPM_PREFIX_NPM_CLI_JS%"
)
"%NODE_EXE%" "%NPM_CLI_JS%" %*
40 changes: 20 additions & 20 deletions deps/npm/bin/npx.cmd
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
:: Created by npm, please don't edit manually.
@ECHO OFF

SETLOCAL

SET "NODE_EXE=%~dp0\node.exe"
IF NOT EXIST "%NODE_EXE%" (
SET "NODE_EXE=node"
)

SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
SET "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
)
IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
)

"%NODE_EXE%" "%NPX_CLI_JS%" %*
:: Created by npm, please don't edit manually.
@ECHO OFF
SETLOCAL
SET "NODE_EXE=%~dp0\node.exe"
IF NOT EXIST "%NODE_EXE%" (
SET "NODE_EXE=node"
)
SET "NPM_CLI_JS=%~dp0\node_modules\npm\bin\npm-cli.js"
SET "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPM_CLI_JS%" prefix -g') DO (
SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
)
IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
)
"%NODE_EXE%" "%NPX_CLI_JS%" %*
2 changes: 1 addition & 1 deletion deps/npm/changelogs/CHANGELOG-3.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ This is gonna be a much, MUCH smaller major version than 3.x was. Maybe even
smaller than 2.x was. I can't tell you everything that'll be in there just
yet, but at the very least it's going to have what's in our
[4.x milestone](https://github.com/npm/npm/pulls?q=is%3Aopen+is%3Apr+milestone%3A4.x),
PLUS, the first steps in
PLUS, the first steps in
[making `prepublish` work](https://github.com/npm/npm/issues/10074) the way
people expect it to.

Expand Down
8 changes: 4 additions & 4 deletions deps/npm/changelogs/CHANGELOG-5.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ as `https://` URLs instead of versions.
zeros deleted resulted in authentication failures.
([@iarna](https://github.com/iarna))
* [`6eaa860ea`](https://github.com/npm/npm/commit/6eaa860ead3222a6dbd6d370b4271e7bf242b30b)
Eliminate direct use of `new Buffer` in `npm`. While the use of it in `npm` was safe, there
Eliminate direct use of `new Buffer` in `npm`. While the use of it in `npm` was safe, there
are two other reasons for this change:

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

### NEW PACKAGE VIEW

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

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

```console
Expand Down Expand Up @@ -1935,7 +1935,7 @@ helpful when community members go over our code and help clean it up, too!
* [`9e5b76140`](https://github.com/npm/npm/commit/9e5b76140ffdb7dcd12aa402793644213fb8c5d7)
[#17411](https://github.com/npm/npm/pull/17411)
Convert all callback-style `move` usage to use Promises.
([@vramana](https://github.com/vramana))
([@vramana](https://github.com/vramana))
* [`0711c08f7`](https://github.com/npm/npm/commit/0711c08f779ac641ec42ecc96f604c8861008b28)
[#17394](https://github.com/npm/npm/pull/17394)
Remove unused argument in `deepSortObject`.
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/cli/npm-audit.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ npm-audit(1) -- Run a security audit

npm audit [--json|--parseable|--audit-level=(low|moderate|high|critical)]
npm audit fix [--force|--package-lock-only|--dry-run]

common options: [--production] [--only=(dev|prod)]

## EXAMPLES
Expand Down
4 changes: 2 additions & 2 deletions deps/npm/doc/cli/npm-completion.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ everywhere:
npm completion >> ~/.zshrc

You may of course also pipe the output of `npm completion` to a file
such as `/usr/local/etc/bash_completion.d/npm` or
`/etc/bash_completion.d/npm` if you have a system that will read
such as `/usr/local/etc/bash_completion.d/npm` or
`/etc/bash_completion.d/npm` if you have a system that will read
that file for you.

When `COMP_CWORD`, `COMP_LINE`, and `COMP_POINT` are defined in the
Expand Down
6 changes: 3 additions & 3 deletions deps/npm/doc/cli/npm-deprecate.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ npm-deprecate(1) -- Deprecate a version of a package
This command will update the npm registry entry for a package, providing
a deprecation warning to all who attempt to install it.

It works on [version ranges](https://semver.npmjs.com/) as well as specific
It works on [version ranges](https://semver.npmjs.com/) as well as specific
versions, so you can do something like this:

npm deprecate my-thing@"< 0.2.3" "critical bug fixed in v0.2.3"

Note that you must be the package owner to deprecate something. See the
`owner` and `adduser` help topics.

To un-deprecate a package, specify an empty string (`""`) for the `message`
argument. Note that you must use double quotes with no space between them to
To un-deprecate a package, specify an empty string (`""`) for the `message`
argument. Note that you must use double quotes with no space between them to
format an empty string.

## SEE ALSO
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/cli/npm-profile.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ you're using a non-npmjs registry.
| updated | 2017-10-02T21:29:45.922Z |
+-----------------+---------------------------+
```

* `npm profile set <property> <value>`:
Set the value of a profile property. You can set the following properties this way:
email, fullname, homepage, freenode, twitter, github
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/cli/npm-run-script.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ you should write:

instead of

"scripts": {"test": "node_modules/.bin/tap test/\*.js"}
"scripts": {"test": "node_modules/.bin/tap test/\*.js"}

to run your tests.

Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/cli/npm-token.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ This lets you list, create and revoke authentication tokens.
* `npm token revoke <token|id>`:
This removes an authentication token, making it immediately unusable. This can accept
both complete tokens (as you get back from `npm token create` and will
find in your `.npmrc`) and ids as seen in the `npm token list` output.
find in your `.npmrc`) and ids as seen in the `npm token list` output.
This will NOT accept the truncated token found in `npm token list` output.
4 changes: 2 additions & 2 deletions deps/npm/doc/cli/npm-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ As of `[email protected]`, the `npm update` will only inspect top-level packages.
Prior versions of `npm` would also recursively inspect all dependencies.
To get the old behavior, use `npm --depth 9999 update`.

As of `[email protected]`, the `npm update` will change `package.json` to save the
new version as the minimum required dependency. To get the old behavior,
As of `[email protected]`, the `npm update` will change `package.json` to save the
new version as the minimum required dependency. To get the old behavior,
use `npm update --no-save`.

## EXAMPLES
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/cli/npm-version.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ and tag up to the server, and deletes the `build/temp` directory.
* Default: false
* Type: Boolean

Prevents throwing an error when `npm version` is used to set the new version
Prevents throwing an error when `npm version` is used to set the new version
to the same value as the current version.

### git-tag-version
Expand Down
7 changes: 7 additions & 0 deletions deps/npm/doc/misc/npm-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,13 @@ Makes various commands more forceful.
* skips cache when requesting from the registry.
* prevents checks against clobbering non-npm files.

### format-package-lock

* Default: true
* Type: Boolean

Format `package-lock.json` or `npm-shrinkwrap.json` as a human readable file.

### fetch-retries

* Default: 2
Expand Down
6 changes: 3 additions & 3 deletions deps/npm/doc/misc/npm-scripts.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ following scripts:
Additionally, arbitrary scripts can be executed by running `npm
run-script <stage>`. *Pre* and *post* commands with matching
names will be run for those as well (e.g. `premyscript`, `myscript`,
`postmyscript`). Scripts from dependencies can be run with
`postmyscript`). Scripts from dependencies can be run with
`npm explore <pkg> -- npm run <stage>`.

## PREPUBLISH AND PREPARE
Expand Down Expand Up @@ -143,8 +143,8 @@ The package.json fields are tacked onto the `npm_package_` prefix. So,
for instance, if you had `{"name":"foo", "version":"1.2.5"}` in your
package.json file, then your package scripts would have the
`npm_package_name` environment variable set to "foo", and the
`npm_package_version` set to "1.2.5". You can access these variables
in your code with `process.env.npm_package_name` and
`npm_package_version` set to "1.2.5". You can access these variables
in your code with `process.env.npm_package_name` and
`process.env.npm_package_version`, and so on for other fields.

### configuration
Expand Down
18 changes: 18 additions & 0 deletions deps/npm/doc/spec/package-lock.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,24 @@ this resource.
URL. If the tarball URL isn't on the same server as the registry URL then
this is a complete URL.

eg, Given a `package-lock.json` file containing:

```
"resolved": "https://registry.npmjs.org/example/-/example-1.0.0.tgz"
```

and a registry source configuring a custom value:

```
npm install --registry https://registry.example.com
```

the package will be fetched from the custom-defined registry:

```
https://registry.example.com/example/-/example-1.0.0.tgz
```

#### link *(new)*

If this module was symlinked in development but had semver in the
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/doc/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,5 @@ <h2 id="see-also">SEE ALSO</h2>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<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>
</table>
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@6.11.3</p>
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@6.12.0</p>

2 changes: 1 addition & 1 deletion deps/npm/html/doc/cli/npm-access.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@ <h2 id="see-also">SEE ALSO</h2>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<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>
</table>
<p id="footer">npm-access &mdash; npm@6.11.3</p>
<p id="footer">npm-access &mdash; npm@6.12.0</p>

2 changes: 1 addition & 1 deletion deps/npm/html/doc/cli/npm-adduser.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ <h2 id="see-also">SEE ALSO</h2>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<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>
</table>
<p id="footer">npm-adduser &mdash; npm@6.11.3</p>
<p id="footer">npm-adduser &mdash; npm@6.12.0</p>

3 changes: 2 additions & 1 deletion deps/npm/html/doc/cli/npm-audit.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,5 @@ <h2 id="see-also">SEE ALSO</h2>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<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>
</table>
<p id="footer">npm-audit &mdash; [email protected]</p>
<p id="footer">npm-audit &mdash; [email protected]</p>

2 changes: 1 addition & 1 deletion deps/npm/html/doc/cli/npm-bin.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ <h2 id="see-also">SEE ALSO</h2>
<tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
<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>
</table>
<p id="footer">npm-bin &mdash; npm@6.11.3</p>
<p id="footer">npm-bin &mdash; npm@6.12.0</p>

Loading