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: upgrade npm to 6.10.1 #28647

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
  •  
  •  
  •  
9 changes: 7 additions & 2 deletions deps/npm/.licensee.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"license": "(MIT OR BSD-2-Clause OR BSD-3-Clause OR Apache-2.0 OR ISC OR Unlicense OR CC-BY-3.0 OR CC0-1.0 OR Artistic-2.0)",
"licenses": {
"spdx": [
"CC-BY-3.0"
],
"blueOak": "bronze"
},
"corrections": true,
"whitelist": {
"packages": {
"config-chain": "1.1.12",
"cyclist": "0.2.2",
"json-schema": "0.2.3",
Expand Down
3 changes: 2 additions & 1 deletion deps/npm/.mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ Geoff Flarity <[email protected]> <gflarity@raptvm-x02.(none)>
Gregers Gram Rygg <[email protected]>
Ifeanyi Oraelosi <[email protected]>
Isaac Z. Schlueter <[email protected]> <[email protected]>
Isaac Z. Schlueter <[email protected]> isaacs <[email protected]>
Isaac Z. Schlueter <[email protected]>
isaacs <[email protected]>
Jake Verbaten <[email protected]>
James Sanders <[email protected]>
James Treworgy <[email protected]>
Expand Down
14 changes: 6 additions & 8 deletions deps/npm/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,24 @@ language: node_js
matrix:
include:
# LTS is our most important target
- node_js: "10"
- node_js: "12"
# DEPLOY_VERSION is used to set the couchapp setup mode for test/tap/registry.js
# only gather coverage info for LTS
env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN"
script:
- "node . run tap-cover -- \"test/tap/*.js\""
- "unset COVERALLS_REPO_TOKEN ; node . run tap -- \"test/broken-under-*/*.js\""
# previous LTS is next most important
- node_js: "6"
env: DEPLOY_VERSION=testing
- node_js: "8"
env: DEPLOY_VERSION=testing
- node_js: "9"
env: DEPLOY_VERSION=testing
- node_js: "11"
- 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_js: "8"
env: DEPLOY_VERSION=testing
- node_js: "6"
env: DEPLOY_VERSION=testing
notifications:
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
cache:
Expand Down
18 changes: 18 additions & 0 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# 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]>
Aaron Blohowiak <[email protected]>
Expand Down Expand Up @@ -630,3 +631,20 @@ Amadou Sall <[email protected]>
Chris Manson <[email protected]>
vlasy <[email protected]>
Emilis Dambauskas (Tokenmill) <[email protected]>
George Czabania <[email protected]>
Jonathan Underwood <[email protected]>
Nick Graef <[email protected]>
James George <[email protected]>
John O'Sullivan <[email protected]>
ossdev <[email protected]>
Raphael Goulais <[email protected]>
COURIER, CALEB [AG/1000] <[email protected]>
CalebCourier <[email protected]>
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]>
253 changes: 252 additions & 1 deletion deps/npm/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,255 @@
## v6.9.0 (2018-02-20):
## v6.10.1 (2019-07-11):

### BUGFIXES

* [`3cbd57712`](https://github.com/npm/cli/commit/3cbd577120a9da6e51bb8b13534d1bf71ea5712c)
fix(git): strip GIT environs when running git
([@isaacs](https://github.com/isaacs))
* [`a81a8c4c4`](https://github.com/npm/cli/commit/a81a8c4c466f510215a51cef1bb08544d11844fe)
[#206](https://github.com/npm/cli/pull/206) improve isOnly(Dev,Optional)
([@larsgw](https://github.com/larsgw))
* [`172f9aca6`](https://github.com/npm/cli/commit/172f9aca67a66ee303c17f90a994cd52fc66552a)
[#179](https://github.com/npm/cli/pull/179) fix-xmas-underline
([@raywu0123](https://github.com/raywu0123))
* [`f52673fc7`](https://github.com/npm/cli/commit/f52673fc7284e58af8c04533e82b76bf7add72cf)
[#212](https://github.com/npm/cli/pull/212) build: use `/usr/bin/env` to
load bash ([@rsmarples](https://github.com/rsmarples))

### DEPENDENCIES

* [`ef4445ad3`](https://github.com/npm/cli/commit/ef4445ad34a53b5639499c8e3c9752f62ee6f37c)
[#208](https://github.com/npm/cli/pull/208) `[email protected]`
([@irega](https://github.com/irega))
* [`c0d611356`](https://github.com/npm/cli/commit/c0d611356f7b23077e97574b01c8886e544db425)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`7716ba972`](https://github.com/npm/cli/commit/7716ba9720270d5b780755a5bb1ce79702067f1f)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`42d22e837`](https://github.com/npm/cli/commit/42d22e8374c7d303d94e405d7385d94dd2558814)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`a2ea7f9ff`](https://github.com/npm/cli/commit/a2ea7f9ff64ae743d05fdbf7d46fb9afafa8aa6f)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`429226a5e`](https://github.com/npm/cli/commit/429226a5e992cd907d4f19bd738037007cf78c1f)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`175670ea6`](https://github.com/npm/cli/commit/175670ea65cca03f8b2e957df3dd4b8b0efd0e1f)
`[email protected]`: ([@isaacs](https://github.com/isaacs))
* [`0d0517f7f`](https://github.com/npm/cli/commit/0d0517f7f8c902b5064ac18fb4015b31750ad2b2)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`741400429`](https://github.com/npm/cli/commit/74140042917ea241062a812ceb65c5423c2bafa9)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`bddd60e30`](https://github.com/npm/cli/commit/bddd60e302283a4a70d35f8f742e42bd13f4dabf)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`4acf03fd1`](https://github.com/npm/cli/commit/4acf03fd140ed3ddb2dcf3fdc9756bc3f5a8bcbb)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`c2bd17291`](https://github.com/npm/cli/commit/c2bd17291a86bea7ced2fbd07d66d013bd7a7560)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`7f0221bb1`](https://github.com/npm/cli/commit/7f0221bb1bb41ffc933c785940e227feae38c80c)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`f458fe7dd`](https://github.com/npm/cli/commit/f458fe7dd3bebddf603aaae183a424ea8aaa018f)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`009752978`](https://github.com/npm/cli/commit/0097529780269c28444f1efa0d7c131d47a933eb)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`0fa2bb438`](https://github.com/npm/cli/commit/0fa2bb4386379d6e9d8c95db08662ec0529964f9)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`b86450929`](https://github.com/npm/cli/commit/b86450929796950a1fe4b1f9b02b1634c812f3bb)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`25db00fe9`](https://github.com/npm/cli/commit/25db00fe953453198adb9e1bd71d1bc2a9f04aaa)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`8dfbe8610`](https://github.com/npm/cli/commit/8dfbe861085dfa8fa56bb504b4a00fba04c34f9d)
`[email protected]` ([@isaacs](https://github.com/isaacs))
* [`f6164d5dd`](https://github.com/npm/cli/commit/f6164d5ddd072eabdf2237f1694a31efd746eb1d)
[isaacs/chownr#21](https://github.com/isaacs/chownr/pull/21)
[isaacs/chownr#20](https://github.com/isaacs/chownr/issues/20)
[npm.community#7901](https://npm.community/t/7901/)
[npm.community#8203](https://npm.community/t/8203) `[email protected]` This
fixes an EISDIR error from cacache on Darwin in Node versions prior to
10.6. ([@isaacs](https://github.com/isaacs))

## v6.10.0 (2019-07-03):

### FEATURES

* [`87fef4e35`](https://github.com/npm/cli/commit/87fef4e35)
[#176](https://github.com/npm/cli/pull/176) fix: Always return JSON for
outdated --json ([@sreeramjayan](https://github.com/sreeramjayan))
* [`f101d44fc`](https://github.com/npm/cli/commit/f101d44fc)
[#203](https://github.com/npm/cli/pull/203) fix(unpublish): add space
after hyphen ([@ffflorian](https://github.com/ffflorian))
* [`a4475de4c`](https://github.com/npm/cli/commit/a4475de4c)
[#202](https://github.com/npm/cli/pull/202) enable production flag for
npm audit ([@CalebCourier](https://github.com/CalebCourier))
* [`d192904d0`](https://github.com/npm/cli/commit/d192904d0)
[#178](https://github.com/npm/cli/pull/178) fix: Return a value for
`view` when in silent mode
([@stayradiated](https://github.com/stayradiated))
* [`39d473adf`](https://github.com/npm/cli/commit/39d473adf)
[#185](https://github.com/npm/cli/pull/185) Allow git to follow global
tagsign config ([@junderw](https://github.com/junderw))

### BUGFIXES

* [`d9238af0b`](https://github.com/npm/cli/commit/d9238af0b)
[#201](https://github.com/npm/cli/pull/163)
[npm/npm#17858](https://github.com/npm/npm/issues/17858)
[npm/npm#18042](https://github.com/npm/npm/issues/18042)
[npm.community#644](https://npm.community/t/644) do not crash when
removing nameless packages
([@SteveVanOpstal](https://github.com/SteveVanOpstal) and
[@isaacs](https://github.com/isaacs))
* [`4bec4f111`](https://github.com/npm/cli/commit/4bec4f111)
[#200](https://github.com/npm/cli/pull/200) Check for `node` (as well as
`node.exe`) in npm's local dir on Windows
([@rgoulais](https://github.com/rgoulais))
* [`ce93dab2d`](https://github.com/npm/cli/commit/ce93dab2db423ef23b3e08a0612dafbeb2d25789)
[#180](https://github.com/npm/cli/pull/180)
[npm.community#6187](https://npm.community/t/6187) Fix handling of
`remote` deps in `npm outdated` ([@larsgw](https://github.com/larsgw))

### TESTING

* [`a823f3084`](https://github.com/npm/cli/commit/a823f3084) travis: Update
to include new v12 LTS ([@isaacs](https://github.com/isaacs))
* [`33e2d1dac`](https://github.com/npm/cli/commit/33e2d1dac) fix flaky
debug-logs test ([@isaacs](https://github.com/isaacs))
* [`e9411c6cd`](https://github.com/npm/cli/commit/e9411c6cd) Don't time out
waiting for gpg user input ([@isaacs](https://github.com/isaacs))
* [`d2d301704`](https://github.com/npm/cli/commit/d2d301704)
[#195](https://github.com/npm/cli/pull/195) Add the arm64 check for
legacy-platform-all.js test case.
([@ossdev07](https://github.com/ossdev07))
* [`a4dc34243`](https://github.com/npm/cli/commit/a4dc34243) parallel tests
([@isaacs](https://github.com/isaacs))

### DOCUMENTATION

* [`f5857e263`](https://github.com/npm/cli/commit/f5857e263)
[#192](https://github.com/npm/cli/pull/192) Clarify usage of
bundledDependencies
([@john-osullivan](https://github.com/john-osullivan))
* [`747fdaf66`](https://github.com/npm/cli/commit/747fdaf66)
[#159](https://github.com/npm/cli/pull/159) doc: add --audit-level param
([@ngraef](https://github.com/ngraef))

### DEPENDENCIES

* [`e36b3c320`](https://github.com/npm/cli/commit/e36b3c320)
[email protected] ([@isaacs](https://github.com/isaacs))
* [`6bb935c09`](https://github.com/npm/cli/commit/6bb935c09)
[email protected] ([@isaacs](https://github.com/isaacs))
* [`e9cd536`](https://github.com/npm/read-package-tree/commit/e9cd536)
Use custom caching `realpath` implementation, dramatically reducing
`lstat` calls when reading the package tree
([@isaacs](https://github.com/isaacs))
* [`39538b460`](https://github.com/npm/cli/commit/39538b460)
[email protected] ([@isaacs](https://github.com/isaacs))
* [`f8b1552`](https://github.com/npm/write-file-atomic/commit/f8b1552)
[#38](https://github.com/npm/write-file-atomic/pull/38) Ignore errors
raised by `fs.closeSync` ([@lukeapage](https://github.com/lukeapage))
* [`042193069`](https://github.com/npm/cli/commit/042193069) [email protected]
([@isaacs](https://github.com/isaacs))
* [`8bbd051`](https://github.com/npm/pacote/commit/8bbd051)
[#172](https://github.com/zkat/pacote/pull/172) limit git retry
times, avoid unlimited retries ([小秦](https://github.com/xqin))
* [`92f5e4c`](https://github.com/npm/pacote/commit/92f5e4c)
[#170](https://github.com/zkat/pacote/pull/170) fix(errors): Fix
"TypeError: err.code.match is not a function" error
([@jviotti](https://github.com/jviotti))
* [`8bd8e909f`](https://github.com/npm/cli/commit/8bd8e909f) [email protected]
([@isaacs](https://github.com/isaacs))
* [`47de8f5`](https://github.com/npm/cacache/commit/47de8f5)
[#146](https://github.com/zkat/cacache/pull/146)
[npm.community#2395](https://npm.community/t/2395) fix(config): Add
ssri config 'error' option ([@larsgw](https://github.com/larsgw))
* [`5156561`](https://github.com/npm/cacache/commit/5156561)
fix(write): avoid a `cb never called` situation
([@zkat](https://github.com/zkat))
* [`90f40f0`](https://github.com/npm/cacache/commit/90f40f0)
[#166](https://github.com/zkat/cacache/pull/166)
[#165](https://github.com/zkat/cacache/issues/165) docs: Fix docs for
`path` property in get.info
([@hdgarrood](https://github.com/hdgarrood))
* [`bf61c45c6`](https://github.com/npm/cli/commit/bf61c45c6) [email protected]
([@isaacs](https://github.com/isaacs))
* [`f75d46a9d`](https://github.com/npm/cli/commit/f75d46a9d) [email protected]
([@isaacs](https://github.com/isaacs))
* [`c80341a`](https://github.com/npm/node-tar/commit/c80341a)
[#215](https://github.com/npm/node-tar/pull/215) Fix
encoding/decoding of base-256 numbers
([@justfalter](https://github.com/justfalter))
* [`77522f0`](https://github.com/npm/node-tar/commit/77522f0)
[#204](https://github.com/npm/node-tar/issues/204)
[#214](https://github.com/npm/node-tar/issues/214) Use `stat` instead
of `lstat` when checking CWD ([@stkb](https://github.com/stkb))
* [`ec6236210`](https://github.com/npm/cli/commit/ec6236210)
[email protected] ([@isaacs](https://github.com/isaacs))
* [`63d1e3e`](https://github.com/npm/npm-packlist/commit/63d1e3e)
[#30](https://github.com/npm/npm-packlist/issues/30) Sort package
tarball entries by file type for compression benefits
([@isaacs](https://github.com/isaacs))
* [`7fcd045`](https://github.com/npm/npm-packlist/commit/7fcd045)
Ignore `.DS_Store` files as well as folders
([@isaacs](https://github.com/isaacs))
* [`68b7c96`](https://github.com/npm/npm-packlist/commit/68b7c96) Never
include .git folders in package root. (Note: this prevents the issue
that broke the v6.9.1 release.)
([@isaacs](https://github.com/isaacs))
* [`57bef61bc`](https://github.com/npm/cli/commit/57bef61bc) update fstream
in node-gyp ([@isaacs](https://github.com/isaacs))
* Addresses [security advisory
#886](https://www.npmjs.com/advisories/886)
* [`acbbf7eee`](https://github.com/npm/cli/commit/acbbf7eee)
[#183](https://github.com/npm/cli/pull/183) [email protected]
([@kemitchell](https://github.com/kemitchell))
* [`011ae67f0`](https://github.com/npm/cli/commit/011ae67f0)
[email protected] ([@isaacs](https://github.com/isaacs))
* [`f5e884909`](https://github.com/npm/cli/commit/f5e884909)
[email protected] ([@isaacs](https://github.com/isaacs))
* [`b57d07e35`](https://github.com/npm/cli/commit/b57d07e35)
[email protected] ([@isaacs](https://github.com/isaacs))

## v6.9.2 (2019-06-27):

This release is identical to v6.9.1, but we had to publish a new version
due to [a .git directory in the release](https://npm.community/t/8454).

## v6.9.1 (2019-06-26):

### BUGFIXES

* [`6b1a9da0e`](https://github.com/npm/cli/commit/6b1a9da0e0f5c295cdaf4dea4b73bd221d778611)
[#165](https://github.com/npm/cli/pull/165)
Update `knownBroken` version.
([@ljharb](https://github.com/ljharb))
* [`d07547154`](https://github.com/npm/cli/commit/d07547154eb8a88aa4fde8a37e128e1e3272adc1)
[npm.community#5929](https://npm.community/t/npm-outdated-throw-an-error-cannot-read-property-length-of-undefined/5929)
Fix `outdated` rendering for global dependencies.
([@zkat](https://github.com/zkat))
* [`e4a1f1745`](https://github.com/npm/cli/commit/e4a1f174514a57580fd5e0fa33eee0f42bba77fc)
[npm.community#6259](https://npm.community/t/npm-token-create-doesnt-work-in-6-6-0-6-9-0/6259)
Fix OTP for token create and remove.
([@zkat](https://github.com/zkat))

### DEPENDENCIES

* [`a163a9c35`](https://github.com/npm/cli/commit/a163a9c35f6f341de343562368056258bba5d7dc)
`[email protected]`
([@aeschright](https://github.com/aeschright))
* [`47b08b3b9`](https://github.com/npm/cli/commit/47b08b3b9860438b416efb438e975a628ec2eed5)
`[email protected]`
([@aeschright](https://github.com/aeschright))
* [`d6a956cff`](https://github.com/npm/cli/commit/d6a956cff6357e6de431848e578c391768685a64)
`[email protected]`
([@aeschright](https://github.com/aeschright))
* [`10b8bed2b`](https://github.com/npm/cli/commit/10b8bed2bb0afac5451164e87f25924cc1ac6f2e)
`[email protected]`
([@aeschright](https://github.com/aeschright))
* [`e7483704d`](https://github.com/npm/cli/commit/e7483704dda1acffc8c6b8c165c14c8a7512f3c8)
`[email protected]`
([@aeschright](https://github.com/aeschright))
* [`3242fe698`](https://github.com/npm/cli/commit/3242fe698ead46a9cda94e1a4d489cd84a85d7e3)
`[email protected]`
([@aeschright](https://github.com/aeschright))

## v6.9.0 (2019-02-20):

### FEATURES

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%" %*
)
)
3 changes: 3 additions & 0 deletions deps/npm/bin/npm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ case `uname` in
esac

NODE_EXE="$basedir/node.exe"
if ! [ -x "$NODE_EXE" ]; then
NODE_EXE="$basedir/node"
fi
if ! [ -x "$NODE_EXE" ]; then
NODE_EXE=node
fi
Expand Down
Loading