Skip to content

Commit

Permalink
deps: upgrade npm to 7.0.8
Browse files Browse the repository at this point in the history
PR-URL: nodejs#35953
Reviewed-By: Ruy Adorno <[email protected]>
Reviewed-By: Jiawen Geng <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
  • Loading branch information
MylesBorins committed Nov 4, 2020
1 parent dbcadf0 commit 58280ff
Show file tree
Hide file tree
Showing 147 changed files with 5,653 additions and 7,124 deletions.
3 changes: 3 additions & 0 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -727,3 +727,6 @@ Jake Champion <[email protected]>
takenspc <[email protected]>
iraj <[email protected]>
Michele Azzolari <[email protected]>
foxxyz <[email protected]>
Dr <[email protected]>
Jan Tojnar <[email protected]>
78 changes: 67 additions & 11 deletions deps/npm/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,59 @@
## 7.0.8 (2020-11-03)

### DOCUMENTATION

* [`052e977b9`](https://github.com/npm/cli/commit/052e977b9d071e1b3654976881d10cd3ddcba788)
[#1822](https://github.com/npm/cli/issues/1822)
[#1247](https://github.com/npm/cli/issues/1247)
add section on peerDependenciesMeta field in package.json
([@foxxyz](https://github.com/foxxyz))
* [`52d32d175`](https://github.com/npm/cli/commit/52d32d1758c5ebc58944a1e8d98d57e30048e527)
[#1970](https://github.com/npm/cli/issues/1970)
match npm-exec.md -p usage with lib/exec.js
([@dr-js](https://github.com/dr-js))
* [`48ee8d01e`](https://github.com/npm/cli/commit/48ee8d01edd11ed6186c483e1169ff4d2070b963)
[#2096](https://github.com/npm/cli/issues/2096)
Fix RFC links in changelog
([@jtojnar](https://github.com/jtojnar))


### BUG FIXES

* [`6cd3cd08a`](https://github.com/npm/cli/commit/6cd3cd08af56445e13757cac3af87f3e7d54ed27)
Support *all* conf keys in publishConfig
* [`a1f9be8a7`](https://github.com/npm/cli/commit/a1f9be8a7f9b7a3a813fc3e5e705bc982470b0e2)
[#2074](https://github.com/npm/cli/issues/2074)
Support publishing any kind of spec, not just directories

### DEPENDENCIES

* [`545382df6`](https://github.com/npm/cli/commit/545382df62e3014f3e51d7034e52498fb2b01a37)
`[email protected]`:
* Support publishing things other than folders
* [`7d88f1719`](https://github.com/npm/cli/commit/7d88f17197e3c8cca9b277378d6f9b054b1b7886)
`[email protected]`
* [`823b40a4e`](https://github.com/npm/cli/commit/823b40a4e9c6ef76388af6fe01a3624f6f7675be)
`[email protected]`
* [`90bf57826`](https://github.com/npm/cli/commit/90bf57826edf2f78ddf8deb0793115ead8a8b556)
`[email protected]`
* [`e5a413577`](https://github.com/npm/cli/commit/e5a4135770d13cf114fac439167637181f87d824)
`[email protected]`
* [`fc5aa7b4a`](https://github.com/npm/cli/commit/fc5aa7b4ad45cb65893f734e1229a6720f7966e5)
`[email protected]`
* [`9fc1dee13`](https://github.com/npm/cli/commit/9fc1dee138ca33ecdbd57e63142b27c60cf88f9b)
`[email protected]`
* [`0ea870ec5`](https://github.com/npm/cli/commit/0ea870ec5d2be1d44f050ad8bc24ed936cc45fde)
`[email protected]`
* [`32fd744ea`](https://github.com/npm/cli/commit/32fd744ea745f297f0be79a80955f077a57c4ac7)
`[email protected]`
* [`fc76f3d9f`](https://github.com/npm/cli/commit/fc76f3d9fcf19e65a9373ab3d9068c4326d2f782)
`@npmcli/[email protected]`
* Fix `cannot read property 'description' of undefined` in `npm ls`
when `package-lock.json` is corrupted
* Do not allow peerDependencies to be nested under dependents in any
circumstances
* Always resolve peerDependencies in `--prefer-dedupe` mode

## 7.0.7 (2020-10-30)

### BUG FIXES
Expand Down Expand Up @@ -602,7 +658,7 @@
sources ([@ruyadorno](https://github.com/ruyadorno))
* [`3a63ecb6f`](https://github.com/npm/cli/commit/3a63ecb6f6a0b235660f73a3ffa329b1f131b0c3)
[#1718](https://github.com/npm/cli/pull/1718)
[RFC-0029](https://github.com/npm/rfcs/blob/latest/accepted/0029-add-ability-to-skip-hooks.md)
[RFC-0029](https://github.com/npm/rfcs/blob/latest/implemented/0029-add-ability-to-skip-hooks.md)
add ability to skip pre/post hooks to `npm run-script` by using
`--ignore-scripts` ([@ruyadorno](https://github.com/ruyadorno))

Expand Down Expand Up @@ -829,7 +885,7 @@ Now on to the list of **BREAKING CHANGES**!
### Programmatic Usage

- [RFC
20](https://github.com/npm/rfcs/blob/latest/accepted/0020-npm-option-handling.md)
20](https://github.com/npm/rfcs/blob/latest/implemented/0020-npm-option-handling.md)
The CLI and its dependencies no longer use the `figgy-pudding` library
for configs. Configuration is done using a flat plain old JavaScript
object.
Expand Down Expand Up @@ -859,7 +915,7 @@ The environment for lifecycle scripts (eg, build scripts, `npm test`, etc.)
has changed.

- [RFC
21](https://github.com/npm/rfcs/blob/latest/accepted/0021-reduce-lifecycle-script-environment.md)
21](https://github.com/npm/rfcs/blob/latest/implemented/0021-reduce-lifecycle-script-environment.md)
Environment no longer includes `npm_package_*` fields, or `npm_config_*`
fields for default configs. `npm_package_json`, `npm_package_integrity`,
`npm_package_resolved`, and `npm_command` environment variables added.
Expand All @@ -868,13 +924,13 @@ has changed.
release](https://github.com/npm/rfcs/pull/183))

- [RFC
22](https://github.com/npm/rfcs/blob/latest/accepted/0022-quieter-install-scripts.md)
22](https://github.com/npm/rfcs/blob/latest/implemented/0022-quieter-install-scripts.md)
Scripts run during the normal course of installation are silenced unless
they exit in error (ie, with a signal or non-zero exit status code), and
are for a non-optional dependency.

- [RFC
24](https://github.com/npm/rfcs/blob/latest/accepted/0024-npm-run-traverse-directory-tree.md)
24](https://github.com/npm/rfcs/blob/latest/implemented/0024-npm-run-traverse-directory-tree.md)
`PATH` environment variable includes all `node_modules/.bin` folders,
even if found outside of an existing `node_modules` folder hierarchy.

Expand Down Expand Up @@ -924,7 +980,7 @@ We do intend to continue supporting the `npx` that npm ships; just not the
### Files On Disk

- [RFC
13](https://github.com/npm/rfcs/blob/latest/accepted/0013-no-package-json-_fields.md)
13](https://github.com/npm/rfcs/blob/latest/implemented/0013-no-package-json-_fields.md)
Installed `package.json` files no longer are mutated to include extra
metadata. (This extra metadata is stored in the lockfile.)
- `package-lock.json` is updated to a newer format, using
Expand All @@ -940,7 +996,7 @@ These changes affect `install`, `ci`, `install-test`, `install-ci-test`,
`update`, `prune`, `dedupe`, `uninstall`, `link`, and `audit fix`.

- [RFC
25](https://github.com/npm/rfcs/blob/latest/accepted/0025-install-peer-deps.md)
25](https://github.com/npm/rfcs/blob/latest/implemented/0025-install-peer-deps.md)
`peerDependencies` are installed by default. This behavior can be
disabled by setting the `legacy-peer-deps` configuration flag.

Expand All @@ -951,7 +1007,7 @@ These changes affect `install`, `ci`, `install-test`, `install-ci-test`,
of correctness. Use the `--legacy-peer-deps` config flag if impacted.

- [RFC
23](https://github.com/npm/rfcs/blob/latest/accepted/0023-acceptDependencies.md)
23](https://github.com/npm/rfcs/blob/latest/implemented/0023-acceptDependencies.md)
Support for `acceptDependencies` is added. This can result in dependency
resolutions that previous versions of npm will incorrectly flag as invalid.

Expand All @@ -973,23 +1029,23 @@ These changes affect `install`, `ci`, `install-test`, `install-ci-test`,
### Workspaces

- [RFC
26](https://github.com/npm/rfcs/blob/latest/accepted/0026-workspaces.md)
26](https://github.com/npm/rfcs/blob/latest/implemented/0026-workspaces.md)
First phase of `workspaces` support is added. This changes npm's
behavior when a root project's `package.json` file contains a
`workspaces` field.

### `npm update`

- [RFC
19](https://github.com/npm/rfcs/blob/latest/accepted/0019-remove-update-depth-option.md)
19](https://github.com/npm/rfcs/blob/latest/implemented/0019-remove-update-depth-option.md)
Update all dependencies when `npm update` is run without any arguments.
As it is no longer relevant, `--depth` config flag removed from `npm
update`.

### `npm outdated`

- [RFC
27](https://github.com/npm/rfcs/blob/latest/accepted/0027-remove-depth-outdated.md)
27](https://github.com/npm/rfcs/blob/latest/implemented/0027-remove-depth-outdated.md)
Remove `--depth` config from `npm outdated`. Only top-level dependencies
are shown, unless `--all` config option is set.

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-5.md
Original file line number Diff line number Diff line change
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
4 changes: 2 additions & 2 deletions deps/npm/docs/content/commands/npm-completion.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ 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
4 changes: 2 additions & 2 deletions deps/npm/docs/content/commands/npm-deprecate.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ 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
6 changes: 3 additions & 3 deletions deps/npm/docs/content/commands/npm-exec.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ This command allows you to run an arbitrary command from an npm package
(either one installed locally, or fetched remotely), in a similar context
as running it via `npm run`.

Whatever packages are specified by the `--package` or `-p` option will be
Whatever packages are specified by the `--package` option will be
provided in the `PATH` of the executed command, along with any locally
installed package executables. The `--package` or `-p` option may be
installed package executables. The `--package` option may be
specified multiple times, to execute the supplied command in an environment
where all specified packages are available.

Expand All @@ -48,7 +48,7 @@ only be considered a match if they have the exact same name and version as
the local dependency.

If no `-c` or `--call` option is provided, then the positional arguments
are used to generate the command string. If no `-p` or `--package` options
are used to generate the command string. If no `--package` options
are provided, then npm will attempt to determine the executable name from
the package specifier provided as the first positional argument according
to the following heuristic:
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/docs/content/commands/npm-profile.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,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/docs/content/commands/npm-token.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,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.
2 changes: 1 addition & 1 deletion deps/npm/docs/content/commands/npm-unpublish.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Even if a package version is unpublished, that specific name and
version combination can never be reused. In order to publish the
package again, a new version number must be used. If you unpublish the entire package, you may not publish any new versions of that package until 24 hours have passed.

To learn more about how unpublish is treated on the npm registry, see our <a href="https://www.npmjs.com/policies/unpublish" target="_blank" rel="noopener noreferrer"> unpublish policies</a>.
To learn more about how unpublish is treated on the npm registry, see our <a href="https://www.npmjs.com/policies/unpublish" target="_blank" rel="noopener noreferrer"> unpublish policies</a>.


### See Also
Expand Down
4 changes: 2 additions & 2 deletions deps/npm/docs/content/commands/npm-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,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`.

### Example
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/docs/content/commands/npm-version.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,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
2 changes: 1 addition & 1 deletion deps/npm/docs/content/commands/npm-view.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ was required by each matching version of yui3:

```bash
npm view yui3@'>0.5.4' dependencies.jsdom
```
```

To show the `connect` package version history, you can do
this:
Expand Down
24 changes: 24 additions & 0 deletions deps/npm/docs/content/configuring-npm/package-json.md
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,30 @@ the host package's major version will break your plugin. Thus, if you've worked
with every 1.x version of the host package, use `"^1.0"` or `"1.x"` to express
this. If you depend on features introduced in 1.5.2, use `">= 1.5.2 < 2"`.

### peerDependenciesMeta

When a user installs your package, npm will emit warnings if packages specified in `peerDependencies` are not already installed. The `peerDependenciesMeta` field serves to provide npm more information on how your peer dependencies are to be used. Specifically, it allows peer dependencies to be marked as optional.

For example:

```json
{
"name": "tea-latte",
"version": "1.3.5",
"peerDependencies": {
"tea": "2.x",
"soy-milk": "1.2"
},
"peerDependenciesMeta": {
"soy-milk": {
"optional": true
}
}
}
```

Marking a peer dependency as optional ensures npm will not emit a warning if the `soy-milk` package is not installed on the host. This allows you to integrate and interact with a variety of host packages without requiring all of them to be installed.

### bundledDependencies

This defines an array of package names that will be bundled when publishing
Expand Down
Loading

0 comments on commit 58280ff

Please sign in to comment.