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 5.3.0 #14235

Closed
wants to merge 3 commits 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/.github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @npm/cli-team
22 changes: 4 additions & 18 deletions deps/npm/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,18 @@ matrix:
# then master
- node_js: "8"
env: DEPLOY_VERSION=testing
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:
directories:
- $HOME/.npm
- html/doc
- man
- node_modules/.bin
- node_modules/.cache
- node_modules/deep-equal
- node_modules/marked
- node_modules/marked-man
- node_modules/npm-registry-couchapp
- node_modules/npm-registry-mock
- node_modules/require-inject
- node_modules/sprintf-js
- node_modules/standard
- node_modules/tacks
- node_modules/tap
install:
- "node . rebuild --depth=0"
- "node . install --ignore-scripts"
- "node . prune"
- "make -j4 doc"
- "node . install"
script:
- "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\""
28 changes: 28 additions & 0 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -475,3 +475,31 @@ Jason Wohlgemuth <[email protected]>
Ryan Graham <[email protected]>
Hirse <[email protected]>
Colin Rotherham <[email protected]>
Aki <[email protected]>
Emily Marigold Klassen <[email protected]>
Ramana Venkata <[email protected]>
kierendixon <[email protected]>
Rácz Tibor Zoltán <[email protected]>
Guangcong Luo <[email protected]>
Steven <[email protected]>
Jan Pilzer <[email protected]>
Leonard Martin <[email protected]>
Teddy Katz <[email protected]>
Simon Legg <[email protected]>
Kin Lum <[email protected]>
dax <[email protected]>
Jože Mlakar <[email protected]>
happylynx <[email protected]>
Dominic Watson <[email protected]>
Enrico Weigelt, metux IT consult <[email protected]>
Brian Beck <[email protected]>
Ramana Venkata <[email protected]>
mmkal <[email protected]>
Andrew Schmadel <[email protected]>
AJ Jordan <[email protected]>
Mark Banner <[email protected]>
Richard Simko <[email protected]>
Sanketh Katta <[email protected]>
Tim Needham <[email protected]>
leonardo rojas <[email protected]>
Mark Peter Fejes <[email protected]>
37 changes: 0 additions & 37 deletions deps/npm/BROKEN.org

This file was deleted.

494 changes: 494 additions & 0 deletions deps/npm/CHANGELOG.md

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions deps/npm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ html_docdeps = html/dochead.html \
cli_mandocs = $(shell find doc/cli -name '*.md' \
|sed 's|.md|.1|g' \
|sed 's|doc/cli/|man/man1/|g' ) \
man/man1/npm-README.1
man/man1/npm-README.1 \
man/man1/npx.1

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

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

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

man/man1/npx.1: node_modules/libnpx/libnpx.1
cat $< | sed s/libnpx/npx/ > $@

man/man5/npm-json.5: man/man5/package.json.5
cp $< $@

Expand Down
5 changes: 3 additions & 2 deletions deps/npm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,9 @@ When you find issues, please report them:
Be sure to include *all* of the output from the npm command that didn't work
as expected. The `npm-debug.log` file is also helpful to provide.

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

## SEE ALSO

Expand Down
86 changes: 0 additions & 86 deletions deps/npm/TODO.org

This file was deleted.

34 changes: 34 additions & 0 deletions deps/npm/bin/npx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/bin/sh
(set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix

basedir=`dirname "$0"`

case `uname` in
*CYGWIN*) basedir=`cygpath -w "$basedir"`;;
esac

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

NPX_CLI_JS="$basedir/node_modules/npm/bin/npx-cli.js"

case `uname` in
*MINGW*)
NPM_PREFIX=`"$NODE_EXE" "$NPX_CLI_JS" prefix -g`
NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
fi
;;
*CYGWIN*)
NPM_PREFIX=`"$NODE_EXE" "$NPX_CLI_JS" prefix -g`
NPM_PREFIX_NPX_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npx-cli.js"
if [ -f "$NPM_PREFIX_NPX_CLI_JS" ]; then
NPX_CLI_JS="$NPM_PREFIX_NPX_CLI_JS"
fi
;;
esac

"$NODE_EXE" "$NPX_CLI_JS" "$@"
8 changes: 8 additions & 0 deletions deps/npm/bin/npx-cli.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env node

const npx = require('libnpx')
const path = require('path')

const NPM_PATH = path.join(__dirname, 'npm-cli.js')

npx(npx.parseArgs(process.argv, NPM_PATH))
19 changes: 19 additions & 0 deletions deps/npm/bin/npx.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
:: Created by npm, please don't edit manually.
@ECHO OFF

SETLOCAL

SET "NODE_EXE=%~dp0\node.exe"
IF NOT EXIST "%NODE_EXE%" (
SET "NODE_EXE=node"
)

SET "NPX_CLI_JS=%~dp0\node_modules\npm\bin\npx-cli.js"
FOR /F "delims=" %%F IN ('CALL "%NODE_EXE%" "%NPX_CLI_JS%" prefix -g') DO (
SET "NPM_PREFIX_NPX_CLI_JS=%%F\node_modules\npm\bin\npx-cli.js"
)
IF EXIST "%NPM_PREFIX_NPX_CLI_JS%" (
SET "NPX_CLI_JS=%NPM_PREFIX_NPX_CLI_JS%"
)

"%NODE_EXE%" "%NPX_CLI_JS%" %*
4 changes: 2 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
npm config list [-l]
npm config edit
npm get <key>
npm set <key> <value> [-g|--global]
Expand Down Expand Up @@ -48,7 +48,7 @@ Echo the config value to stdout.

npm config list

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

### delete

Expand Down
3 changes: 3 additions & 0 deletions deps/npm/doc/cli/npm-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,9 @@ being installed.
The `--no-shrinkwrap` argument, which will ignore an available
package lock or shrinkwrap file and use the package.json instead.

The `--no-package-lock` argument will prevent npm from creating a
`package-lock.json` file.

The `--nodedir=/path/to/node/source` argument will allow npm to find the
node source code so that npm can compile native modules.

Expand Down
7 changes: 7 additions & 0 deletions deps/npm/doc/cli/npm-ls.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,13 @@ When "dev" or "development", is an alias to `dev`.

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

### link

* Type: Boolean
* Default: false

Display only dependencies which are linked

## SEE ALSO

* npm-config(1)
Expand Down
4 changes: 3 additions & 1 deletion deps/npm/doc/cli/npm-run-script.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ npm-run-script(1) -- Run arbitrary package scripts

## SYNOPSIS

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

alias: npm run

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

You can use the `--silent` flag to prevent showing `npm ERR!` output on error.

## SEE ALSO

* npm-scripts(7)
Expand Down
5 changes: 4 additions & 1 deletion deps/npm/doc/cli/npm-uninstall.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ npm-uninstall(1) -- Remove a package

## SYNOPSIS

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

aliases: remove, rm, r, un, unlink

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

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

* `--no-save`: Package will not be removed from your `package.json` file.

Further, if you have an `npm-shrinkwrap.json` then it will be updated as
well.

Expand All @@ -39,6 +41,7 @@ Examples:
npm uninstall @myorg/privatepackage --save
npm uninstall node-tap --save-dev
npm uninstall dtrace-provider --save-optional
npm uninstall lodash --no-save

## SEE ALSO

Expand Down
Loading