Skip to content
This repository has been archived by the owner on Aug 31, 2018. It is now read-only.

Commit

Permalink
deps: update npm to 5.5.1
Browse files Browse the repository at this point in the history
Closes: nodejs/node#16280

PR-URL: nodejs/node#16509
Fixes: nodejs/node#14161
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
  • Loading branch information
MylesBorins authored and Qard committed Nov 2, 2017
1 parent 5e09651 commit 803e41e
Show file tree
Hide file tree
Showing 1,870 changed files with 109,118 additions and 34,836 deletions.
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>
399 changes: 399 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.

3 changes: 3 additions & 0 deletions deps/npm/doc/cli/npm-access.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ You must have privileges to set the access of a package:
* You have been given read-write privileges for a package, either as a member
of a team or directly as an owner.

If you have two-factor authentication enabled then you'll have to pass in an
otp with `--otp` when making access changes.

If your account is not paid, then attempts to publish scoped packages will fail
with an HTTP 402 status code (logically enough), unless you use
`--access=public`.
Expand Down
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
4 changes: 3 additions & 1 deletion deps/npm/doc/cli/npm-dist-tag.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ Add, remove, and enumerate distribution tags on a package:

* add:
Tags the specified version of the package with the specified tag, or the
`--tag` config if not specified.
`--tag` config if not specified. The tag you're adding is `latest` and you
have two-factor authentication on auth-and-writes then you'll need to include
an otp on the command line with `--otp`.

* rm:
Clear a tag that is no longer in use from the package.
Expand Down
4 changes: 4 additions & 0 deletions deps/npm/doc/cli/npm-owner.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ Note that there is only one level of access. Either you can modify a package,
or you can't. Future versions may contain more fine-grained access levels, but
that is not implemented at this time.

If you have two-factor authentication enabled with `auth-and-writes` then
you'll need to include an otp on the command line when changing ownership
with `--otp`.

## SEE ALSO

* npm-publish(1)
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
74 changes: 74 additions & 0 deletions deps/npm/doc/cli/npm-profile.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
npm-profile(1) -- Change settings on your registry profile
==========================================================

## SYNOPSIS

npm profile get [--json|--parseable] [<property>]
npm profile set [--json|--parseable] <property> <value>
npm profile set password
npm profile enable-2fa [auth-and-writes|auth-only]
npm profile disable-2fa

## DESCRIPTION

Change your profile information on the registry. This not be available if
you're using a non-npmjs registry.

* `npm profile get [<property>]`:
Display all of the properties of your profile, or one or more specific
properties. It looks like:

```
+-----------------+---------------------------+
| name | example |
+-----------------+---------------------------+
| email | me@example.com (verified) |
+-----------------+---------------------------+
| two factor auth | auth-and-writes |
+-----------------+---------------------------+
| fullname | Example User |
+-----------------+---------------------------+
| homepage | |
+-----------------+---------------------------+
| freenode | |
+-----------------+---------------------------+
| twitter | |
+-----------------+---------------------------+
| github | |
+-----------------+---------------------------+
| created | 2015-02-26T01:38:35.892Z |
+-----------------+---------------------------+
| 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

* `npm profile set password`:
Change your password. This is interactive, you'll be prompted for your
current password and a new password. You'll also be prompted for an OTP
if you have two-factor authentication enabled.

* `npm profile enable-2fa [auth-and-writes|auth-only]`:
Enables two-factor authentication. Defaults to `auth-and-writes` mode. Modes are:
* `auth-only`: Require an OTP when logging in or making changes to your
account's authentication. The OTP will be required on both the website
and the command line.
* `auth-and-writes`: Requires an OTP at all the times `auth-only` does, and also requires one when
publishing a module, setting the `latest` dist-tag, or changing access
via `npm access` and `npm owner`.

* `npm profile disable-2fa`:
Disables two-factor authentication.

## DETAILS

All of the `npm profile` subcommands accept `--json` and `--parseable` and
will tailor their output based on those. Some of these commands may not be
available on non npmjs.com registries.

## SEE ALSO

* npm-config(7)
8 changes: 7 additions & 1 deletion deps/npm/doc/cli/npm-publish.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ npm-publish(1) -- Publish a package

## SYNOPSIS

npm publish [<tarball>|<folder>] [--tag <tag>] [--access <public|restricted>]
npm publish [<tarball>|<folder>] [--tag <tag>] [--access <public|restricted>] [--otp otpcode]

Publishes '.' if no argument supplied
Sets tag 'latest' if no --tag specified
Expand Down Expand Up @@ -41,6 +41,11 @@ specifying a different default registry or using a `npm-scope(7)` in the name
If you don't have a paid account, you must publish with `--access public`
to publish scoped packages.

* `[--otp <otpcode>]`
If you have two-factor authentication enabled in `auth-and-writes` mode
then you can provide a code from your authenticator with this. If you
don't include this and you're running from a TTY then you'll be prompted.

Fails if the package name and version combination already exists in
the specified registry.

Expand All @@ -65,3 +70,4 @@ packs them into a tarball to be uploaded to the registry.
* npm-deprecate(1)
* npm-dist-tag(1)
* npm-pack(1)
* npm-profile(1)
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
Loading

0 comments on commit 803e41e

Please sign in to comment.