Skip to content

Commit 3f2ea53

Browse files
targosMylesBorins
authored andcommitted
deps: update npm to 5.4.2
This includes three npm releases, one of which is pretty big (5.4.0). Changes of Note * Significant performance boost for installations from cache (~10%+) * A number of bugfixes for important and severe bugs affecting installation on all supported platforms, but particularly noticeable on Windows. * More Windows-related fixes for `npx`. * [#17844](npm/npm#17844) Make package-lock.json sorting locale-agnostic. This will cause some users to see seemingly spurious diffs on their pkglocks if they were using previous versions of npm5, because, for example, `JSONStream` is sorted into a different location. This is fine and will go away as people upgrade. Changelogs * [`v5.4.0`](https://github.com/npm/npm/releases/tag/v5.4.0) * [`v5.4.1`](https://github.com/npm/npm/releases/tag/v5.4.1) * [`v5.4.2`](https://github.com/npm/npm/releases/tag/v5.4.2)
1 parent 9c247c5 commit 3f2ea53

File tree

635 files changed

+16067
-14343
lines changed

Some content is hidden

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

635 files changed

+16067
-14343
lines changed

deps/npm/.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Jake Verbaten <[email protected]>
3232
James Sanders <[email protected]>
3333
James Treworgy <[email protected]>
3434
Jason Smith <[email protected]>
35+
Joshua Bennett <[email protected]>
3536
Jonas Weber <[email protected]>
3637
Julien Meddah <[email protected]>
3738
Kevin Lorenz <[email protected]>

deps/npm/.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ matrix:
2525
script:
2626
- "standard"
2727
- "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
28-
before_install:
29-
# required by test/tap/registry.js
30-
- "mkdir -p /var/run/couchdb"
3128
notifications:
3229
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
3330
cache:

deps/npm/AUTHORS

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ Daniel Paz-Soldan <[email protected]>
424424
Sakthipriyan Vairamani <[email protected]>
425425
Zach Renner <[email protected]>
426426
Christopher Hiller <[email protected]>
427-
legodude17 <[email protected]>
427+
Joshua Bennett <[email protected]>
428428
Andrew Meyer <[email protected]>
429429
Michael Jasper <[email protected]>
430430
@@ -503,3 +503,26 @@ Sanketh Katta <[email protected]>
503503
Tim Needham <[email protected]>
504504
leonardo rojas <[email protected]>
505505
Mark Peter Fejes <[email protected]>
506+
Ryan Florence <[email protected]>
507+
MichaelQQ <[email protected]>
508+
Anders D. Johnson <[email protected]>
509+
Benjamin Fernandes <[email protected]>
510+
Simon Kurtz <[email protected]>
511+
David Goss <[email protected]>
512+
Luis Gustavo Pereira <[email protected]>
513+
Amos Wenger <[email protected]>
514+
Samuel Marks <[email protected]>
515+
Victor Travieso <[email protected]>
516+
legodude17 <[email protected]>
517+
Joshua Chaitin-Pollak <[email protected]>
518+
Brendan Warkentin <[email protected]>
519+
Scott Santucci <[email protected]>
520+
Xavier Cambar <[email protected]>
521+
522+
Igor Nadj <[email protected]>
523+
524+
525+
Carsten Brandt <[email protected]>
526+
Marcin Szczepanski <[email protected]>
527+
Josh Clow <[email protected]>
528+
Jakub Holy <[email protected]>

deps/npm/CHANGELOG.md

Lines changed: 284 additions & 0 deletions
Large diffs are not rendered by default.

deps/npm/Makefile

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,16 @@ doc-clean:
8888
html/doc \
8989
man
9090

91+
## build-time tools for the documentation
92+
build-doc-tools := node_modules/.bin/marked \
93+
node_modules/.bin/marked-man
94+
9195
# use `npm install marked-man` for this to work.
92-
man/man1/npm-README.1: README.md scripts/doc-build.sh package.json
96+
man/man1/npm-README.1: README.md scripts/doc-build.sh package.json $(build-doc-tools)
9397
@[ -d man/man1 ] || mkdir -p man/man1
9498
scripts/doc-build.sh $< $@
9599

96-
man/man1/%.1: doc/cli/%.md scripts/doc-build.sh package.json
100+
man/man1/%.1: doc/cli/%.md scripts/doc-build.sh package.json $(build-doc-tools)
97101
@[ -d man/man1 ] || mkdir -p man/man1
98102
scripts/doc-build.sh $< $@
99103

@@ -106,26 +110,26 @@ man/man5/npm-json.5: man/man5/package.json.5
106110
man/man5/npm-global.5: man/man5/npm-folders.5
107111
cp $< $@
108112

109-
man/man5/%.5: doc/files/%.md scripts/doc-build.sh package.json
113+
man/man5/%.5: doc/files/%.md scripts/doc-build.sh package.json $(build-doc-tools)
110114
@[ -d man/man5 ] || mkdir -p man/man5
111115
scripts/doc-build.sh $< $@
112116

113-
doc/misc/npm-index.md: scripts/index-build.js package.json
117+
doc/misc/npm-index.md: scripts/index-build.js package.json $(build-doc-tools)
114118
node scripts/index-build.js > $@
115119

116-
html/doc/index.html: doc/misc/npm-index.md $(html_docdeps)
120+
html/doc/index.html: doc/misc/npm-index.md $(html_docdeps) $(build-doc-tools)
117121
@[ -d html/doc ] || mkdir -p html/doc
118122
scripts/doc-build.sh $< $@
119123

120-
man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json
124+
man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json $(build-doc-tools)
121125
@[ -d man/man7 ] || mkdir -p man/man7
122126
scripts/doc-build.sh $< $@
123127

124-
html/doc/README.html: README.md $(html_docdeps)
128+
html/doc/README.html: README.md $(html_docdeps) $(build-doc-tools)
125129
@[ -d html/doc ] || mkdir -p html/doc
126130
scripts/doc-build.sh $< $@
127131

128-
html/doc/cli/%.html: doc/cli/%.md $(html_docdeps)
132+
html/doc/cli/%.html: doc/cli/%.md $(html_docdeps) $(build-doc-tools)
129133
@[ -d html/doc/cli ] || mkdir -p html/doc/cli
130134
scripts/doc-build.sh $< $@
131135

@@ -135,11 +139,11 @@ html/doc/files/npm-json.html: html/doc/files/package.json.html
135139
html/doc/files/npm-global.html: html/doc/files/npm-folders.html
136140
cp $< $@
137141

138-
html/doc/files/%.html: doc/files/%.md $(html_docdeps)
142+
html/doc/files/%.html: doc/files/%.md $(html_docdeps) $(build-doc-tools)
139143
@[ -d html/doc/files ] || mkdir -p html/doc/files
140144
scripts/doc-build.sh $< $@
141145

142-
html/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
146+
html/doc/misc/%.html: doc/misc/%.md $(html_docdeps) $(build-doc-tools)
143147
@[ -d html/doc/misc ] || mkdir -p html/doc/misc
144148
scripts/doc-build.sh $< $@
145149

deps/npm/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ you have chosen.
141141

142142
## More Docs
143143

144-
Check out the [docs](https://docs.npmjs.com/),
144+
Check out the [docs](https://docs.npmjs.com/).
145145

146146
You can use the `npm help` command to read any of them.
147147

148148
If you're a developer, and you want to use npm to publish your program,
149-
you should [read this](https://docs.npmjs.com/misc/developers)
149+
you should [read this](https://docs.npmjs.com/misc/developers).
150150

151151
## BUGS
152152

deps/npm/bin/read-package-json.js

Lines changed: 0 additions & 24 deletions
This file was deleted.

deps/npm/doc/cli/npm-config.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ npm-config(1) -- Manage the npm configuration files
66
npm config set <key> <value> [-g|--global]
77
npm config get <key>
88
npm config delete <key>
9-
npm config list [-l]
9+
npm config list [-l] [--json]
1010
npm config edit
1111
npm get <key>
1212
npm set <key> <value> [-g|--global]
@@ -48,7 +48,8 @@ Echo the config value to stdout.
4848

4949
npm config list
5050

51-
Show all the config settings. Use `-l` to also show defaults.
51+
Show all the config settings. Use `-l` to also show defaults. Use `--json`
52+
to show the settings in json format.
5253

5354
### delete
5455

deps/npm/doc/cli/npm-ping.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ npm-ping(1) -- Ping npm registry
88
## DESCRIPTION
99

1010
Ping the configured or given npm registry and verify authentication.
11+
If it works it will output something like:
12+
```
13+
Ping success: {*Details about registry*}
14+
```
15+
otherwise you will get:
16+
```
17+
Ping error: {*Detail about error}
18+
```
1119

1220
## SEE ALSO
1321

deps/npm/doc/cli/npm-run-script.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ and not to any pre or post script.
2727

2828
The `env` script is a special built-in command that can be used to list
2929
environment variables that will be available to the script at runtime. If an
30-
"env" command is defined in your package it will take precedence over the
30+
"env" command is defined in your package, it will take precedence over the
3131
built-in.
3232

3333
In addition to the shell's pre-existing `PATH`, `npm run` adds
@@ -38,7 +38,17 @@ you should write:
3838

3939
"scripts": {"test": "tap test/\*.js"}
4040

41-
instead of `"scripts": {"test": "node_modules/.bin/tap test/\*.js"}` to run your tests.
41+
instead of
42+
43+
"scripts": {"test": "node_modules/.bin/tap test/\*.js"}
44+
45+
to run your tests.
46+
47+
Scripts are run from the root of the module, regardless of what your current
48+
working directory is when you call `npm run`. If you want your script to
49+
use different behavior based on what subdirectory you're in, you can use the
50+
`INIT_CWD` environment variable, which holds the full path you were in when
51+
you ran `npm run`.
4252

4353
`npm run` sets the `NODE` environment variable to the `node` executable with
4454
which `npm` is executed. Also, if the `--scripts-prepend-node-path` is passed,

deps/npm/doc/cli/npm-version.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,13 @@ to the same value as the current version.
9393

9494
Commit and tag the version change.
9595

96+
### commit-hooks
97+
98+
* Default: true
99+
* Type: Boolean
100+
101+
Run git commit hooks when committing the version change.
102+
96103
### sign-git-tag
97104

98105
* Default: false

deps/npm/doc/files/npm-package-locks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ which will look something like this:
9292
}
9393

9494
This file describes an *exact*, and more importantly *reproducible*
95-
`node_modules` tree. Once it's present, and future installation will base its
95+
`node_modules` tree. Once it's present, any future installation will base its
9696
work off this file, instead of recalculating dependency versions off
9797
package.json(5).
9898

deps/npm/doc/files/package.json.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,23 @@ npm also sets a top-level "maintainers" field with your npm user info.
168168

169169
## files
170170

171-
The "files" field is an array of files to include in your project. If
172-
you name a folder in the array, then it will also include the files
173-
inside that folder. (Unless they would be ignored by another rule.)
174-
175-
You can also provide a ".npmignore" file in the root of your package or
176-
in subdirectories, which will keep files from being included, even
177-
if they would be picked up by the files array. The `.npmignore` file
178-
works just like a `.gitignore`.
171+
The optional "files" field is an array of file patterns that describes
172+
the entries to be included when your package is installed as a
173+
dependency. If the files array is omitted, everything except
174+
automatically-excluded files will be included in your publish. If you
175+
name a folder in the array, then it will also include the files inside
176+
that folder (unless they would be ignored by another rule in this
177+
section.).
178+
179+
You can also provide a `.npmignore` file in the root of your package or
180+
in subdirectories, which will keep files from being included. At the
181+
root of your package it will not override the "files" field, but in
182+
subdirectories it will. The `.npmignore` file works just like a
183+
`.gitignore`. If there is a `.gitignore` file, and `.npmignore` is
184+
missing, `.gitignore`'s contents will be used instead.
185+
186+
Files included with the "package.json#files" field _cannot_ be excluded
187+
through `.npmignore` or `.gitignore`.
179188

180189
Certain files are always included, regardless of settings:
181190

deps/npm/doc/misc/npm-config.md

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ npm will set its own environment variables and Node will prefer
3131
those lowercase versions over any uppercase ones that you might set.
3232
For details see [this issue](https://github.com/npm/npm/issues/14528).
3333

34+
Notice that you need to use underscores instead of dashes, so `--allow-same-version`
35+
would become `npm_config_allow_same_version=true`.
36+
3437
### npmrc Files
3538

3639
The four relevant files are:
@@ -184,7 +187,7 @@ The browser that is called by the `npm docs` command to open websites.
184187
* Type: String, Array or null
185188

186189
The Certificate Authority signing certificate that is trusted for SSL
187-
connections to the registry. Values should be in PEM format with newlines
190+
connections to the registry. Values should be in PEM format (Windows calls it "Base-64 encoded X.509 (.CER)") with newlines
188191
replaced by the string "\n". For example:
189192

190193
ca="-----BEGIN CERTIFICATE-----\nXXXX\nXXXX\n-----END CERTIFICATE-----"
@@ -260,7 +263,7 @@ Number of ms to wait for cache lock files to expire.
260263
* Type: String
261264

262265
A client certificate to pass when accessing the registry. Values should be in
263-
PEM format with newlines replaced by the string "\n". For example:
266+
PEM format (Windows calls it "Base-64 encoded X.509 (.CER)") with newlines replaced by the string "\n". For example:
264267

265268
cert="-----BEGIN CERTIFICATE-----\nXXXX\nXXXX\n-----END CERTIFICATE-----"
266269

@@ -389,6 +392,13 @@ the git binary.
389392

390393
Tag the commit when using the `npm version` command.
391394

395+
### commit-hooks
396+
397+
* Default: `true`
398+
* Type: Boolean
399+
400+
Run git commit hooks when using the `npm version` command.
401+
392402
### global
393403

394404
* Default: false
@@ -576,15 +586,15 @@ to the npm registry. Must be IPv4 in versions of Node prior to 0.12.
576586

577587
### loglevel
578588

579-
* Default: "warn"
589+
* Default: "notice"
580590
* Type: String
581-
* Values: "silent", "error", "warn", "http", "info", "verbose", "silly"
591+
* Values: "silent", "error", "warn", "notice", "http", "timing", "info",
592+
"verbose", "silly"
582593

583594
What level of logs to report. On failure, *all* logs are written to
584595
`npm-debug.log` in the current working directory.
585596

586-
Any logs of a higher level than the setting are shown.
587-
The default is "warn", which shows warn and error output.
597+
Any logs of a higher level than the setting are shown. The default is "notice".
588598

589599
### logstream
590600

@@ -754,18 +764,6 @@ operations, if `process.stderr` is a TTY.
754764

755765
Set to `false` to suppress the progress bar.
756766

757-
### proprietary-attribs
758-
759-
* Default: true
760-
* Type: Boolean
761-
762-
Whether or not to include proprietary extended attributes in the
763-
tarballs created by npm.
764-
765-
Unless you are expecting to unpack package tarballs with something other
766-
than npm -- particularly a very outdated tar implementation -- leave
767-
this as true.
768-
769767
### proxy
770768

771769
* Default: null

deps/npm/doc/misc/npm-developers.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,19 @@ The following paths and files are never ignored, so adding them to
140140
* `CHANGELOG` (and its variants)
141141
* `LICENSE` / `LICENCE`
142142

143+
If, given the structure of your project, you find `.npmignore` to be a
144+
maintenance headache, you might instead try populating the `files`
145+
property of `package.json`, which is an array of file or directory names
146+
that should be included in your package. Sometimes a whitelist is easier
147+
to manage than a blacklist.
148+
149+
### Testing whether your `.npmignore` or `files` config works
150+
151+
If you want to double check that your package will include only the files
152+
you intend it to when published, you can run the `npm pack` command locally
153+
which will generate a tarball in the working directory, the same way it
154+
does for publishing.
155+
143156
## Link Packages
144157

145158
`npm link` is designed to install a development package and see the

deps/npm/doc/misc/npm-scripts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ npm-scripts(7) -- How npm handles the "scripts" field
33

44
## DESCRIPTION
55

6-
npm supports the "scripts" property of the package.json script, for the
6+
npm supports the "scripts" property of the package.json file, for the
77
following scripts:
88

99
* prepublish:

0 commit comments

Comments
 (0)