Skip to content

Commit dc3f6b9

Browse files
zkataddaleax
authored andcommitted
deps: upgrade npm to 5.3.0
PR-URL: #14235 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent d23c49f commit dc3f6b9

File tree

1,042 files changed

+45758
-19643
lines changed

Some content is hidden

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

1,042 files changed

+45758
-19643
lines changed

Diff for: deps/npm/.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @npm/cli-team

Diff for: deps/npm/.travis.yml

+4-18
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,18 @@ matrix:
2222
# then master
2323
- node_js: "8"
2424
env: DEPLOY_VERSION=testing
25+
script:
26+
- "standard"
27+
- "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
2528
before_install:
2629
# required by test/tap/registry.js
2730
- "mkdir -p /var/run/couchdb"
2831
notifications:
2932
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
3033
cache:
3134
directories:
32-
- $HOME/.npm
33-
- html/doc
34-
- man
35-
- node_modules/.bin
3635
- node_modules/.cache
37-
- node_modules/deep-equal
38-
- node_modules/marked
39-
- node_modules/marked-man
40-
- node_modules/npm-registry-couchapp
41-
- node_modules/npm-registry-mock
42-
- node_modules/require-inject
43-
- node_modules/sprintf-js
44-
- node_modules/standard
45-
- node_modules/tacks
46-
- node_modules/tap
4736
install:
48-
- "node . rebuild --depth=0"
49-
- "node . install --ignore-scripts"
50-
- "node . prune"
51-
- "make -j4 doc"
37+
- "node . install"
5238
script:
5339
- "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""

Diff for: deps/npm/AUTHORS

+28
Original file line numberDiff line numberDiff line change
@@ -475,3 +475,31 @@ Jason Wohlgemuth <jhwohlgemuth@users.noreply.github.com>
475475
Ryan Graham <r.m.graham@gmail.com>
476476
Hirse <jan.pilzer@gmx.de>
477477
Colin Rotherham <work@colinr.com>
478+
Aki <hi@akiro.se>
479+
Emily Marigold Klassen <forivall@gmail.com>
480+
Ramana Venkata <idlike2dream@gmail.com>
481+
kierendixon <knitesoulja@hotmail.com>
482+
Rácz Tibor Zoltán <racztiborzoltan@gmail.com>
483+
Guangcong Luo <guangcongluo@gmail.com>
484+
Steven <steven@ceriously.com>
485+
Jan Pilzer <jan.pilzer@gmx.de>
486+
Leonard Martin <leonard.martin@gmail.com>
487+
Teddy Katz <teddy.katz@gmail.com>
488+
Simon Legg <leggsimon@gmail.com>
489+
Kin Lum <kenneth.kin.lum@gmail.com>
490+
dax <guido.dassori@gmail.com>
491+
Jože Mlakar <JozeM@ixtlan-team.si>
492+
happylynx <happylynx@users.noreply.github.com>
493+
Dominic Watson <intellix@users.noreply.github.com>
494+
Enrico Weigelt, metux IT consult <enrico.weigelt@gr13.net>
495+
Brian Beck <exogen@gmail.com>
496+
Ramana Venkata <vramana@users.noreply.github.com>
497+
mmkal <misha.kaletsky@gmail.com>
498+
Andrew Schmadel <schmod@users.noreply.github.com>
499+
AJ Jordan <alex@strugee.net>
500+
Mark Banner <standard8@mozilla.com>
501+
Richard Simko <richardsimko@users.noreply.github.com>
502+
Sanketh Katta <sankethkatta@gmail.com>
503+
Tim Needham <tim.needham@wmfs.net>
504+
leonardo rojas <leonardo.rojas@shopify.com>
505+
Mark Peter Fejes <fejes.mark@gmail.com>

Diff for: deps/npm/BROKEN.org

-37
This file was deleted.

Diff for: deps/npm/CHANGELOG.md

+494
Large diffs are not rendered by default.

Diff for: deps/npm/Makefile

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ html_docdeps = html/dochead.html \
1414
cli_mandocs = $(shell find doc/cli -name '*.md' \
1515
|sed 's|.md|.1|g' \
1616
|sed 's|doc/cli/|man/man1/|g' ) \
17-
man/man1/npm-README.1
17+
man/man1/npm-README.1 \
18+
man/man1/npx.1
1819

1920
files_mandocs = $(shell find doc/files -name '*.md' \
2021
|sed 's|.md|.5|g' \
@@ -56,7 +57,7 @@ latest:
5657
node bin/npm-cli.js install -g -f npm ${NPMOPTS}
5758

5859
install: all
59-
node bin/npm-cli.js install -g -f ${NPMOPTS}
60+
node bin/npm-cli.js install -g -f ${NPMOPTS} $(shell node bin/npm-cli.js pack | tail -1)
6061

6162
# backwards compat
6263
dev: install
@@ -96,6 +97,9 @@ man/man1/%.1: doc/cli/%.md scripts/doc-build.sh package.json
9697
@[ -d man/man1 ] || mkdir -p man/man1
9798
scripts/doc-build.sh $< $@
9899

100+
man/man1/npx.1: node_modules/libnpx/libnpx.1
101+
cat $< | sed s/libnpx/npx/ > $@
102+
99103
man/man5/npm-json.5: man/man5/package.json.5
100104
cp $< $@
101105

Diff for: deps/npm/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,9 @@ When you find issues, please report them:
158158
Be sure to include *all* of the output from the npm command that didn't work
159159
as expected. The `npm-debug.log` file is also helpful to provide.
160160

161-
You can also look for isaacs in #node.js on irc://irc.freenode.net. She
162-
will no doubt tell you to put the output in a gist or email.
161+
You can also find npm people in `#npm` on https://package.community/ or
162+
[on Twitter](https://twitter.com/npm_support). Whoever responds will no
163+
doubt tell you to put the output in a gist or email.
163164

164165
## SEE ALSO
165166

Diff for: deps/npm/TODO.org

-86
This file was deleted.

Diff for: deps/npm/bin/npx

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/sh
2+
(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix
3+
4+
basedir=`dirname "$0"`
5+
6+
case `uname` in
7+
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
8+
esac
9+
10+
NODE_EXE="$basedir/node.exe"
11+
if ! [ -x "$NODE_EXE" ]; then
12+
NODE_EXE=node
13+
fi
14+
15+
NPX_CLI_JS="$basedir/node_modules/npm/bin/npx-cli.js"
16+
17+
case `uname` in
18+
*MINGW*)
19+
NPM_PREFIX=`"$NODE_EXE" "$NPX_CLI_JS" prefix -g`
20+
NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
21+
if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
22+
NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
23+
fi
24+
;;
25+
*CYGWIN*)
26+
NPM_PREFIX=`"$NODE_EXE" "$NPX_CLI_JS" prefix -g`
27+
NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
28+
if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
29+
NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
30+
fi
31+
;;
32+
esac
33+
34+
"$NODE_EXE" "$NPX_CLI_JS" "$@"

Diff for: deps/npm/bin/npx-cli.js

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env node
2+
3+
const npx = require('libnpx')
4+
const path = require('path')
5+
6+
const NPM_PATH = path.join(__dirname, 'npm-cli.js')
7+
8+
npx(npx.parseArgs(process.argv, NPM_PATH))

Diff for: deps/npm/bin/npx.cmd

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
:: Created by npm, please don't edit manually.
2+
@ECHO OFF
3+
4+
SETLOCAL
5+
6+
SET "NODE_EXE=%~dp0\node.exe"
7+
IF NOT EXIST "%NODE_EXE%" (
8+
SET "NODE_EXE=node"
9+
)
10+
11+
SET "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
12+
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPX_CLI_JS%" prefix -g') DO (
13+
SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
14+
)
15+
IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
16+
SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
17+
)
18+
19+
"%NODE_EXE%" "%NPX_CLI_JS%" %*

Diff for: deps/npm/doc/cli/npm-config.md

+2-2
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
9+
npm config list [-l]
1010
npm config edit
1111
npm get <key>
1212
npm set <key> <value> [-g|--global]
@@ -48,7 +48,7 @@ Echo the config value to stdout.
4848

4949
npm config list
5050

51-
Show all the config settings.
51+
Show all the config settings. Use `-l` to also show defaults.
5252

5353
### delete
5454

Diff for: deps/npm/doc/cli/npm-install.md

+3
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,9 @@ being installed.
343343
The `--no-shrinkwrap` argument, which will ignore an available
344344
package lock or shrinkwrap file and use the package.json instead.
345345

346+
The `--no-package-lock` argument will prevent npm from creating a
347+
`package-lock.json` file.
348+
346349
The `--nodedir=/path/to/node/source` argument will allow npm to find the
347350
node source code so that npm can compile native modules.
348351

Diff for: deps/npm/doc/cli/npm-ls.md

+7
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,13 @@ When "dev" or "development", is an alias to `dev`.
9191

9292
When "prod" or "production", is an alias to `production`.
9393

94+
### link
95+
96+
* Type: Boolean
97+
* Default: false
98+
99+
Display only dependencies which are linked
100+
94101
## SEE ALSO
95102

96103
* npm-config(1)

Diff for: deps/npm/doc/cli/npm-run-script.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ npm-run-script(1) -- Run arbitrary package scripts
33

44
## SYNOPSIS
55

6-
npm run-script <command> [-- <args>...]
6+
npm run-script <command> [--silent] [-- <args>...]
77

88
alias: npm run
99

@@ -50,6 +50,8 @@ not found in the `PATH`.
5050
If you try to run a script without having a `node_modules` directory and it fails,
5151
you will be given a warning to run `npm install`, just in case you've forgotten.
5252

53+
You can use the `--silent` flag to prevent showing `npm ERR!` output on error.
54+
5355
## SEE ALSO
5456

5557
* npm-scripts(7)

Diff for: deps/npm/doc/cli/npm-uninstall.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ npm-uninstall(1) -- Remove a package
33

44
## SYNOPSIS
55

6-
npm uninstall [<@scope>/]<pkg>[@<version>]... [-S|--save|-D|--save-dev|-O|--save-optional]
6+
npm uninstall [<@scope>/]<pkg>[@<version>]... [-S|--save|-D|--save-dev|-O|--save-optional|--no-save]
77

88
aliases: remove, rm, r, un, unlink
99

@@ -28,6 +28,8 @@ the package version in your main package.json:
2828

2929
* `-O, --save-optional`: Package will be removed from your `optionalDependencies`.
3030

31+
* `--no-save`: Package will not be removed from your `package.json` file.
32+
3133
Further, if you have an `npm-shrinkwrap.json` then it will be updated as
3234
well.
3335

@@ -39,6 +41,7 @@ Examples:
3941
npm uninstall @myorg/privatepackage --save
4042
npm uninstall node-tap --save-dev
4143
npm uninstall dtrace-provider --save-optional
44+
npm uninstall lodash --no-save
4245

4346
## SEE ALSO
4447

0 commit comments

Comments
 (0)