Skip to content

Commit

Permalink
deps: update npm to 6.11.0
Browse files Browse the repository at this point in the history
Full release notes:

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))
  • Loading branch information
isaacs authored and Trott committed Aug 20, 2019
1 parent f769034 commit 5fb908e
Show file tree
Hide file tree
Showing 503 changed files with 11,394 additions and 10,438 deletions.
9 changes: 3 additions & 6 deletions deps/npm/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,21 @@ matrix:
script:
# run the sudo tests, with coverage enabled
- "sudo PATH=$PATH $(which node) . run tap -- \"test/tap/*.js\" --coverage"
- "unset COVERALLS_REPO_TOKEN ; node . run tap -- \"test/broken-under-*/*.js\""
# previous LTS is next most important
- node_js: "10"
env: DEPLOY_VERSION=testing
script:
- "npx standard"
- "node . run licenses"
- "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
- "node . run tap -- \"test/tap/*.js\""
- node_js: "8"
env: DEPLOY_VERSION=testing
- node_js: "6"
env: DEPLOY_VERSION=testing
cache: false
notifications:
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
cache:
directories:
- node_modules/.cache
install:
- "node . install"
script:
- "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
- "node . run tap -- \"test/tap/*.js\""
9 changes: 6 additions & 3 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Authors sorted by whether or not they're me
Isaac Z. Schlueter <[email protected]>
isaacs <[email protected]>
Steve Steiner <[email protected]>
Mikeal Rogers <[email protected]>
Expand Down Expand Up @@ -644,11 +643,15 @@ Florian Keller <[email protected]>
Sreeram Jayan <[email protected]>
--get <[email protected]>
raywu0123 <[email protected]>
isaacs <[email protected]>
Iván Reinoso García <[email protected]>
Roy Marples <[email protected]>
Robert James Gabriel <[email protected]>
John Firebaugh <[email protected]>
Kitten King <[email protected]>
claudiahdz <[email protected]>
Claudia Hernández <[email protected]>
Artem Sapegin <[email protected]>
Márton Salomváry <[email protected]>
gall0ws <[email protected]>
Olivier Chevet <[email protected]>
Maël Nison <[email protected]>
Sara Ahbabou <[email protected]>
119 changes: 119 additions & 0 deletions deps/npm/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,122 @@
## v6.11.0 (2019-08-20):

A few meaty bugfixes, and introducing `peerDependenciesMeta`.

### FEATURES

* [`a12341088`](https://github.com/npm/cli/commit/a12341088820c0e7ef6c1c0db3c657f0c2b3943e)
[#224](https://github.com/npm/cli/pull/224) Implements
peerDependenciesMeta ([@arcanis](https://github.com/arcanis))
* [`2f3b79bba`](https://github.com/npm/cli/commit/2f3b79bbad820fd4a398aa494b19f79b7fd520a1)
[#234](https://github.com/npm/cli/pull/234) add new forbidden 403 error
code ([@claudiahdz](https://github.com/claudiahdz))

### BUGFIXES

* [`24acc9fc8`](https://github.com/npm/cli/commit/24acc9fc89d99d87cc66206c6c6f7cdc82fbf763)
and
[`45772af0d`](https://github.com/npm/cli/commit/45772af0ddca54b658cb2ba2182eec26d0a4729d)
[#217](https://github.com/npm/cli/pull/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`](https://github.com/npm/cli/commit/50cfe113da5fcc59c1d99b0dcf1050ace45803c7)
[#229](https://github.com/npm/cli/pull/229) fixed typo in semver doc
([@gall0ws](https://github.com/gall0ws))
* [`e8fb2a1bd`](https://github.com/npm/cli/commit/e8fb2a1bd9785e0092e9926f4fd65ad431e38452)
[#231](https://github.com/npm/cli/pull/231) Fix spelling mistakes in
CHANGELOG-3.md ([@XhmikosR](https://github.com/XhmikosR))
* [`769d2e057`](https://github.com/npm/cli/commit/769d2e057daf5a2cbfe0ce86f02550e59825a691)
[npm/uid-number#7](https://github.com/npm/uid-number/issues/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`](https://github.com/npm/cli/commit/8b43c962498c8e2707527e4fca442d7a4fa51595)
[nodejs/node#28987](https://github.com/nodejs/node/issues/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`](https://github.com/npm/cli/commit/8b85eaa47da3abaacc90fe23162a68cc6e1f0404)
save files with inferred ownership rather than relying on `SUDO_UID` and
`SUDO_GID`. ([@isaacs](https://github.com/isaacs))
* [`b7f6e5f02`](https://github.com/npm/cli/commit/b7f6e5f0285515087b4614d81db17206524c0fdb)
Infer ownership of shrinkwrap files
([@isaacs](https://github.com/isaacs))
* [`54b095d77`](https://github.com/npm/cli/commit/54b095d77b3b131622b3cf4cb5c689aa2dd10b6b)
[#235](https://github.com/npm/cli/pull/235) Add spec to dist-tag remove
function ([@theberbie](https://github.com/theberbie))

### DEPENDENCIES

* [`dc8f9e52f`](https://github.com/npm/cli/commit/dc8f9e52f0bb107c0a6b20cc0c97cbc3b056c1b3)
`[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`](https://github.com/npm/cli/commit/bb33940c32aad61704084e61ebd1bd8e7cacccc8)
`[email protected]`:
* [`9c93ac3`](https://github.com/npm/cmd-shim/commit/9c93ac39e95b0d6ae852e842e4c5dba5e19687c2)
[#2](https://github.com/npm/cmd-shim/pull/2)
[npm#3380](https://github.com/npm/npm/issues/3380) Handle environment
variables properly ([@basbossink](https://github.com/basbossink))
* [`2d277f8`](https://github.com/npm/cmd-shim/commit/2d277f8e84d45401747b0b9470058f168b974ad5)
[#25](https://github.com/npm/cmd-shim/pull/25)
[#36](https://github.com/npm/cmd-shim/pull/36)
[#35](https://github.com/npm/cmd-shim/pull/35) Fix 'no shebang' case by
always providing `$basedir` in shell script
([@igorklopov](https://github.com/igorklopov))
* [`adaf20b`](https://github.com/npm/cmd-shim/commit/adaf20b7fa2c09c2111a2506c6a3e53ed0831f88)
[#26](https://github.com/npm/cmd-shim/pull/26) Fix `$*` causing an
error when arguments contain parentheses
([@satazor](https://github.com/satazor))
* [`49f0c13`](https://github.com/npm/cmd-shim/commit/49f0c1318fd384e0031c3fd43801f0e22e1e555f)
[#30](https://github.com/npm/cmd-shim/pull/30) Fix paths for MSYS/MINGW
bash ([@dscho](https://github.com/dscho))
* [`51a8af3`](https://github.com/npm/cmd-shim/commit/51a8af30990cb072cb30d67fc1b564b14746bba9)
[#34](https://github.com/npm/cmd-shim/pull/34) Add proper support for
PowerShell ([@ExE-Boss](https://github.com/ExE-Boss))
* [`4c37e04`](https://github.com/npm/cmd-shim/commit/4c37e048dee672237e8962fdffca28e20e9f976d)
[#10](https://github.com/npm/cmd-shim/issues/10) Work around quoted
batch file names ([@isaacs](https://github.com/isaacs))
* [`a4e279544`](https://github.com/npm/cli/commit/a4e279544f7983e0adff1e475e3760f1ea85825a)
`[email protected]` ([@isaacs](https://github.com/isaacs)):
* fail properly if `uid-number` raises an error
* [`7086a1809`](https://github.com/npm/cli/commit/7086a1809bbfda9be81344b3949c7d3ac687ffc4)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`8845141f9`](https://github.com/npm/cli/commit/8845141f9d7827dae572c8cf26f2c775db905bd3)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`51c028215`](https://github.com/npm/cli/commit/51c02821575d80035ebe853492d110db11a7d1b9)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`534a5548c`](https://github.com/npm/cli/commit/534a5548c9ebd59f0dd90e9ccca148ed8946efa6)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`3038f2fd5`](https://github.com/npm/cli/commit/3038f2fd5b1d7dd886ee72798241d8943690f508)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`a609a1648`](https://github.com/npm/cli/commit/a609a16489f76791697d270b499fd4949ab1f8c3)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`f0346f754`](https://github.com/npm/cli/commit/f0346f75490619a81b310bfc18646ae5ae2e0ea4)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`ca9c615c8`](https://github.com/npm/cli/commit/ca9c615c8cff5c7db125735eb09f84d912d18694)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`b417affbf`](https://github.com/npm/cli/commit/b417affbf7133dc7687fd809e4956a43eae3438a)
`[email protected]` ([@isaacs](https://github.com/isaacs))

### TESTS

* [`b6df0913c`](https://github.com/npm/cli/commit/b6df0913ca73246f1fa6cfa0e81e34ba5f2b6204)
[#228](https://github.com/npm/cli/pull/228) Proper handing of
/usr/bin/node lifecycle-path test
([@olivr70](https://github.com/olivr70))
* [`aaf98e88c`](https://github.com/npm/cli/commit/aaf98e88c78fd6c850d0a3d3ee2f61c02f63bc8c)
`[email protected]` ([@isaacs](https://github.com/isaacs))

## v6.10.3 (2019-08-06):

### BUGFIXES
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%" %*
6 changes: 3 additions & 3 deletions 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 Expand Up @@ -2864,7 +2864,7 @@ Historically, if you used a pre-release version of Node.js, you would get
dozens and dozens of warnings when EVERY engine check failed across all of
your modules, because `>= 0.10.0` doesn't match prereleases.

You might find this stream of redundent warnings undesirable. I do.
You might find this stream of redundant warnings undesirable. I do.

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

0 comments on commit 5fb908e

Please sign in to comment.