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 5.4.2 #15486

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: 1 addition & 0 deletions deps/npm/.mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Jake Verbaten <raynos2@gmail.com>
James Sanders <jimmyjazz14@gmail.com>
James Treworgy <jamietre@gmail.com>
Jason Smith <jhs@iriscouch.com>
Joshua Bennett <legodudejb@gmail.com>
Jonas Weber <github@jonasw.de>
Julien Meddah <julien.meddah@deveryware.com>
Kevin Lorenz <mail@kevinlorenz.com>
Expand Down
3 changes: 0 additions & 3 deletions deps/npm/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ matrix:
script:
- "standard"
- "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
before_install:
# required by test/tap/registry.js
- "mkdir -p /var/run/couchdb"
notifications:
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
cache:
Expand Down
25 changes: 24 additions & 1 deletion deps/npm/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ Daniel Paz-Soldan <daniel.pazsoldan@gmail.com>
Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Zach Renner <zarenner@microsoft.com>
Christopher Hiller <boneskull@boneskull.com>
legodude17 <legodudejb@gmail.com>
Joshua Bennett <legodudejb@gmail.com>
Andrew Meyer <andrewm.bpi@gmail.com>
Michael Jasper <mdjasper@gmail.com>
Max <contact@mstoiber.com>
Expand Down Expand Up @@ -503,3 +503,26 @@ Sanketh Katta <sankethkatta@gmail.com>
Tim Needham <tim.needham@wmfs.net>
leonardo rojas <leonardo.rojas@shopify.com>
Mark Peter Fejes <fejes.mark@gmail.com>
Ryan Florence <rpflorence@gmail.com>
MichaelQQ <mingsian.tu@vpon.com>
Anders D. Johnson <anders.d.johnson.developer@gmail.com>
Benjamin Fernandes <lotharsee@gmail.com>
Simon Kurtz <simonkurtz@gmail.com>
David Goss <david@davidgoss.co.uk>
Luis Gustavo Pereira <lgp1985@yahoo.com.br>
Amos Wenger <fasterthanlime@users.noreply.github.com>
Samuel Marks <samuelmarks@gmail.com>
Victor Travieso <victor@grabcad.com>
legodude17 <legodude17@users.noreply.github.com>
Joshua Chaitin-Pollak <jbcpollak@users.noreply.github.com>
Brendan Warkentin <faazshift@gmail.com>
Scott Santucci <ScottFreeCode@users.noreply.github.com>
Xavier Cambar <xcambar@gmail.com>
Vikram <nrvikram19@gmail.com>
Igor Nadj <igor.nadj@shinesolutions.com>
Tong Li <supertong@users.noreply.github.com>
tripu <t@tripu.info>
Carsten Brandt <mail@cebe.cc>
Marcin Szczepanski <marcin@imagichine.com.au>
Josh Clow <josh@textio.com>
Jakub Holy <jakubholy@jakubholy.net>
284 changes: 284 additions & 0 deletions deps/npm/CHANGELOG.md

Large diffs are not rendered by default.

24 changes: 14 additions & 10 deletions deps/npm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,16 @@ doc-clean:
html/doc \
man

## build-time tools for the documentation
build-doc-tools := node_modules/.bin/marked \
node_modules/.bin/marked-man

# use `npm install marked-man` for this to work.
man/man1/npm-README.1: README.md scripts/doc-build.sh package.json
man/man1/npm-README.1: README.md scripts/doc-build.sh package.json $(build-doc-tools)
@[ -d man/man1 ] || mkdir -p man/man1
scripts/doc-build.sh $< $@

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

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

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

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

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

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

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

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

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions deps/npm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ you have chosen.

## More Docs

Check out the [docs](https://docs.npmjs.com/),
Check out the [docs](https://docs.npmjs.com/).

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

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

## BUGS

Expand Down
24 changes: 0 additions & 24 deletions deps/npm/bin/read-package-json.js

This file was deleted.

5 changes: 3 additions & 2 deletions deps/npm/doc/cli/npm-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ npm-config(1) -- Manage the npm configuration files
npm config set <key> <value> [-g|--global]
npm config get <key>
npm config delete <key>
npm config list [-l]
npm config list [-l] [--json]
npm config edit
npm get <key>
npm set <key> <value> [-g|--global]
Expand Down Expand Up @@ -48,7 +48,8 @@ Echo the config value to stdout.

npm config list

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

### delete

Expand Down
8 changes: 8 additions & 0 deletions deps/npm/doc/cli/npm-ping.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ npm-ping(1) -- Ping npm registry
## DESCRIPTION

Ping the configured or given npm registry and verify authentication.
If it works it will output something like:
```
Ping success: {*Details about registry*}
```
otherwise you will get:
```
Ping error: {*Detail about error}
```

## SEE ALSO

Expand Down
14 changes: 12 additions & 2 deletions deps/npm/doc/cli/npm-run-script.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ and not to any pre or post script.

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

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

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

instead of `"scripts": {"test": "node_modules/.bin/tap test/\*.js"}` to run your tests.
instead of

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

to run your tests.

Scripts are run from the root of the module, regardless of what your current
working directory is when you call `npm run`. If you want your script to
use different behavior based on what subdirectory you're in, you can use the
`INIT_CWD` environment variable, which holds the full path you were in when
you ran `npm run`.

`npm run` sets the `NODE` environment variable to the `node` executable with
which `npm` is executed. Also, if the `--scripts-prepend-node-path` is passed,
Expand Down
7 changes: 7 additions & 0 deletions deps/npm/doc/cli/npm-version.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ to the same value as the current version.

Commit and tag the version change.

### commit-hooks

* Default: true
* Type: Boolean

Run git commit hooks when committing the version change.

### sign-git-tag

* Default: false
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/files/npm-package-locks.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ which will look something like this:
}

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

Expand Down
25 changes: 17 additions & 8 deletions deps/npm/doc/files/package.json.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,23 @@ npm also sets a top-level "maintainers" field with your npm user info.

## files

The "files" field is an array of files to include in your project. If
you name a folder in the array, then it will also include the files
inside that folder. (Unless they would be ignored by another rule.)

You can also provide a ".npmignore" file in the root of your package or
in subdirectories, which will keep files from being included, even
if they would be picked up by the files array. The `.npmignore` file
works just like a `.gitignore`.
The optional "files" field is an array of file patterns that describes
the entries to be included when your package is installed as a
dependency. If the files array is omitted, everything except
automatically-excluded files will be included in your publish. If you
name a folder in the array, then it will also include the files inside
that folder (unless they would be ignored by another rule in this
section.).

You can also provide a `.npmignore` file in the root of your package or
in subdirectories, which will keep files from being included. At the
root of your package it will not override the "files" field, but in
subdirectories it will. The `.npmignore` file works just like a
`.gitignore`. If there is a `.gitignore` file, and `.npmignore` is
missing, `.gitignore`'s contents will be used instead.

Files included with the "package.json#files" field _cannot_ be excluded
through `.npmignore` or `.gitignore`.

Certain files are always included, regardless of settings:

Expand Down
34 changes: 16 additions & 18 deletions deps/npm/doc/misc/npm-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ npm will set its own environment variables and Node will prefer
those lowercase versions over any uppercase ones that you might set.
For details see [this issue](https://github.com/npm/npm/issues/14528).

Notice that you need to use underscores instead of dashes, so `--allow-same-version`
would become `npm_config_allow_same_version=true`.

### npmrc Files

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

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

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

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

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

Expand Down Expand Up @@ -389,6 +392,13 @@ the git binary.

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

### commit-hooks

* Default: `true`
* Type: Boolean

Run git commit hooks when using the `npm version` command.

### global

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

### loglevel

* Default: "warn"
* Default: "notice"
* Type: String
* Values: "silent", "error", "warn", "http", "info", "verbose", "silly"
* Values: "silent", "error", "warn", "notice", "http", "timing", "info",
"verbose", "silly"

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

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

### logstream

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

Set to `false` to suppress the progress bar.

### proprietary-attribs

* Default: true
* Type: Boolean

Whether or not to include proprietary extended attributes in the
tarballs created by npm.

Unless you are expecting to unpack package tarballs with something other
than npm -- particularly a very outdated tar implementation -- leave
this as true.

### proxy

* Default: null
Expand Down
13 changes: 13 additions & 0 deletions deps/npm/doc/misc/npm-developers.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,19 @@ The following paths and files are never ignored, so adding them to
* `CHANGELOG` (and its variants)
* `LICENSE` / `LICENCE`

If, given the structure of your project, you find `.npmignore` to be a
maintenance headache, you might instead try populating the `files`
property of `package.json`, which is an array of file or directory names
that should be included in your package. Sometimes a whitelist is easier
to manage than a blacklist.

### Testing whether your `.npmignore` or `files` config works

If you want to double check that your package will include only the files
you intend it to when published, you can run the `npm pack` command locally
which will generate a tarball in the working directory, the same way it
does for publishing.

## Link Packages

`npm link` is designed to install a development package and see the
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/misc/npm-scripts.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ npm-scripts(7) -- How npm handles the "scripts" field

## DESCRIPTION

npm supports the "scripts" property of the package.json script, for the
npm supports the "scripts" property of the package.json file, for the
following scripts:

* prepublish:
Expand Down
Loading