Skip to content

Commit

Permalink
deps: upgrade npm to 3.8.3
Browse files Browse the repository at this point in the history
PR-URL: npm#6
Reviewed-By: Evan Lucas <[email protected]>
  • Loading branch information
othiym23 authored and Myles Borins committed Apr 1, 2016
1 parent 39de601 commit 0928584
Show file tree
Hide file tree
Showing 701 changed files with 19,551 additions and 17,311 deletions.
2 changes: 2 additions & 0 deletions deps/npm/.mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Forbes Lindesay <[email protected]>
Forrest L Norvell <[email protected]> <[email protected]>
Gabriel Barros <[email protected]>
Geoff Flarity <[email protected]> <gflarity@raptvm-x02.(none)>
Ifeanyi Oraelosi <[email protected]>
Isaac Z. Schlueter <[email protected]> <[email protected]>
Isaac Z. Schlueter <[email protected]> isaacs <[email protected]>
Jake Verbaten <[email protected]>
Expand Down Expand Up @@ -59,3 +60,4 @@ Will Elwood <[email protected]>
Wout Mertens <[email protected]>
Yeonghoon Park <[email protected]>
Zeke Sikelianos <[email protected]>
Zoujie Wzj <[email protected]>
1 change: 1 addition & 0 deletions deps/npm/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ npm-debug.log
/test/packages/npm-test-depends-on-spark/which-spark.log
/test/packages/test-package/random-data.txt
/test/root
/test/npm_cache
node_modules/marked
node_modules/ronn
node_modules/tap
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ before_install:
- "node . install -g ."
- "mkdir -p /var/run/couchdb"
sudo: false
script: "npm run-script test-all"
script: "npm test"
notifications:
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
18 changes: 18 additions & 0 deletions deps/npm/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -364,3 +364,21 @@ Jan Schär <[email protected]>
Xcat Liu <[email protected]>
harryh <[email protected]>
Prayag Verma <[email protected]>
Neil Kistner <[email protected]>
Zoujie Wzj <[email protected]>
Ryan Hendrickson <[email protected]>
Arturo Coronel <[email protected]>
Hutson Betts <[email protected]>
Lewis Cowper <[email protected]>
Adam Byrne <[email protected]>
Ifeanyi Oraelosi <[email protected]>
Robert Ludwig <[email protected]>
Chris Warren <[email protected]>
Scott Plumlee <[email protected]>
Daniel Pedersen <[email protected]>
rhgb <[email protected]>
doug.wade <[email protected]>
Zac <[email protected]>
GriffinSchneider <[email protected]>
Andres Kalle <[email protected]>
thefourtheye <[email protected]>
476 changes: 469 additions & 7 deletions deps/npm/CHANGELOG.md

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions deps/npm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -160,18 +160,23 @@ test: doc
tag:
npm tag npm@$(PUBLISHTAG) latest

publish: link doc
ls-ok:
node . ls >/dev/null

gitclean:
git clean -fd

publish: gitclean ls-ok link doc
@git push origin :v$(shell npm -v) 2>&1 || true
git clean -fd &&\
git push origin $(BRANCH) &&\
git push origin --tags &&\
npm publish --tag=$(PUBLISHTAG)

release: markedclean marked-manclean doc-clean doc
release: gitclean ls-ok markedclean marked-manclean doc-clean doc
node cli.js prune --production
@bash scripts/release.sh

sandwich:
@[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || (echo "make it yourself" && exit 13)

.PHONY: all latest install dev link doc clean uninstall test man doc-clean docclean release
.PHONY: all latest install dev link doc clean uninstall test man doc-clean docclean release ls-ok realclean
7 changes: 7 additions & 0 deletions deps/npm/bin/npm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ fi
NPM_CLI_JS="$basedir/node_modules/npm/bin/npm-cli.js"

case `uname` in
*MINGW*)
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"
if [ -f "$NPM_PREFIX_NPM_CLI_JS" ]; then
NPM_CLI_JS="$NPM_PREFIX_NPM_CLI_JS"
fi
;;
*CYGWIN*)
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"
Expand Down
10 changes: 7 additions & 3 deletions deps/npm/doc/cli/npm-adduser.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ npm-adduser(1) -- Add a registry user account

npm adduser [--registry=url] [--scope=@orgname] [--always-auth]

aliases: login, add-user

## DESCRIPTION

Create or verify a user named `<username>` in the specified registry, and
Expand Down Expand Up @@ -57,9 +59,11 @@ registries. Can be used with `--registry` and / or `--scope`, e.g.
npm adduser --registry=http://private-registry.example.com --always-auth

This will ensure that all requests to that registry (including for tarballs)
include an authorization header. See `always-auth` in `npm-config(7)` for more
details on always-auth. Registry-specific configuration of `always-auth` takes
precedence over any global configuration.
include an authorization header. This setting may be necessary for use with
private registries where metadata and package tarballs are stored on hosts with
different hostnames. See `always-auth` in `npm-config(7)` for more details on
always-auth. Registry-specific configuration of `always-auth` takes precedence
over any global configuration.

## SEE ALSO

Expand Down
2 changes: 2 additions & 0 deletions deps/npm/doc/cli/npm-bugs.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ npm-bugs(1) -- Bugs for a package in a web browser maybe

npm bugs [<pkgname>]

aliases: issues

## DESCRIPTION

This command tries to guess at the likely location of a package's
Expand Down
2 changes: 2 additions & 0 deletions deps/npm/doc/cli/npm-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ npm-config(1) -- Manage the npm configuration files
npm get <key>
npm set <key> <value> [-g|--global]

aliases: c

## DESCRIPTION

npm gets its config settings from the command line, environment
Expand Down
2 changes: 2 additions & 0 deletions deps/npm/doc/cli/npm-dedupe.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ npm-dedupe(1) -- Reduce duplication
npm dedupe
npm ddp

aliases: find-dupes, ddp

## DESCRIPTION

Searches the local package tree and attempts to simplify the overall
Expand Down
2 changes: 2 additions & 0 deletions deps/npm/doc/cli/npm-dist-tag.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ npm-dist-tag(1) -- Modify package distribution tags
npm dist-tag rm <pkg> <tag>
npm dist-tag ls [<pkg>]

aliases: dist-tags

## DESCRIPTION

Add, remove, and enumerate distribution tags on a package:
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/doc/cli/npm-help-search.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ command directly.
### long

* Type: Boolean
* Default false
* Default: false

If true, the "long" flag will cause help-search to output context around
where the terms were found in the documentation.
Expand Down
9 changes: 6 additions & 3 deletions deps/npm/doc/cli/npm-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ npm-install(1) -- Install a package
npm install <folder>

alias: npm i
common options: [-S|--save|-D|--save-dev|-O|--save-optional] [-E|--save-exact] [--dry-run]
common options: [-S|--save|-D|--save-dev|-O|--save-optional] [-E|--save-exact] [-B|--save-bundle] [--dry-run]

## DESCRIPTION

Expand Down Expand Up @@ -97,12 +97,14 @@ after packing it up into a tarball (b).
* `-O, --save-optional`: Package will appear in your `optionalDependencies`.

When using any of the above options to save dependencies to your
package.json, there is an additional, optional flag:
package.json, there are two additional, optional flags:

* `-E, --save-exact`: Saved dependencies will be configured with an
exact version rather than using npm's default semver range
operator.

* `-B, --save-bundle`: Saved dependencies will also be added to your `bundleDependencies` list.

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

Expand All @@ -122,6 +124,7 @@ after packing it up into a tarball (b).
npm install node-tap --save-dev
npm install dtrace-provider --save-optional
npm install readable-stream --save --save-exact
npm install ansi-regex --save --save-bundle


**Note**: If there is a file or folder named `<name>` in the current
Expand Down Expand Up @@ -266,7 +269,7 @@ The `--global-style` argument will cause npm to install the package into
your local `node_modules` folder with the same layout it uses with the
global `node_modules` folder. Only your direct dependencies will show in
`node_modules` and everything they depend on will be flattened in their
`node_modules` folders. This obviously will elminate some deduping.
`node_modules` folders. This obviously will eliminate some deduping.

The `--legacy-bundling` argument will cause npm to install the package such
that versions of npm prior to 1.4, such as the one included with node 0.8,
Expand Down
11 changes: 6 additions & 5 deletions deps/npm/doc/cli/npm-link.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ npm-link(1) -- Symlink a package folder

Package linking is a two-step process.

First, `npm link` in a package folder will create a globally-installed
symbolic link from `prefix/package-name` to the current folder (see
`npm-config(7)` for the value of `prefix`).
First, `npm link` in a package folder will create a symlink in the global folder
`{prefix}/lib/node_modules/<package>` that links to the package where the `npm
link` command was executed. (see `npm-config(7)` for the value of `prefix`).

Next, in some other location, `npm link package-name` will create a
symlink from the local `node_modules` folder to the global symlink.
symbolic link from globally-installed `package-name` to `node_modules/`
of the current folder.

Note that `package-name` is taken from `package.json`,
not from directory name.
Expand All @@ -40,7 +41,7 @@ For example:

Now, any changes to ~/projects/node-redis will be reflected in
~/projects/node-bloggy/node_modules/node-redis/. Note that the link should
be to the package name, not the directory name for that package.
be to the package name, not the directory name for that package.

You may also shortcut the two steps in one. For example, to do the
above use-case in a shorter way:
Expand Down
9 changes: 2 additions & 7 deletions deps/npm/doc/cli/npm-logout.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,9 @@ it takes precedence.

Default: none

If specified, the user and login credentials given will be associated
with the specified scope. See `npm-scope(7)`. You can use both at the same time,
e.g.
If specified, you will be logged out of the specified scope. See `npm-scope(7)`.

npm adduser --registry=http://myregistry.example.com --scope=@myco

This will set a registry for the given scope and login or create a user for
that registry at the same time.
npm logout --scope=@myco

## SEE ALSO

Expand Down
2 changes: 2 additions & 0 deletions deps/npm/doc/cli/npm-owner.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ npm-owner(1) -- Manage package owners
npm owner rm <user> [<@scope>/]<pkg>
npm owner ls [<@scope>/]<pkg>

aliases: author

## DESCRIPTION

Manage ownership of published packages.
Expand Down
11 changes: 10 additions & 1 deletion deps/npm/doc/cli/npm-search.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ npm-search(1) -- Search for packages

npm search [-l|--long] [search terms ...]

aliases: s, se
aliases: s, se, find

## DESCRIPTION

Expand All @@ -27,6 +27,15 @@ lines. When disabled (default) search results are truncated to fit
neatly on a single line. Modules with extremely long names will
fall on multiple lines.

### registry

* Default: https://registry.npmjs.org/
* Type : url

Search the specified registry for modules. If you have configured npm to point to a different default registry,
such as your internal private module repository, `npm search` will default to that registry when searching.
Pass a different registry url such as the default above in order to override this setting.

## SEE ALSO

* npm-registry(7)
Expand Down
3 changes: 2 additions & 1 deletion deps/npm/doc/cli/npm-test.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ npm-test(1) -- Test a package
## SYNOPSIS

npm test [-- <args>]
npm tst [-- <args>]

aliases: t, tst

## DESCRIPTION

Expand Down
8 changes: 5 additions & 3 deletions deps/npm/doc/cli/npm-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ npm-update(1) -- Update a package

npm update [-g] [<pkg>...]

aliases: up, upgrade

## DESCRIPTION

This command will update all the packages listed to the latest version
Expand All @@ -22,7 +24,7 @@ or local) will be updated.

As of `[email protected]`, the `npm update` will only inspect top-level packages.
Prior versions of `npm` would also recursively inspect all dependencies.
To get the old behavior, use `npm --depth Infinity update`.
To get the old behavior, use `npm --depth 9999 update`.

## EXAMPLES

Expand All @@ -36,7 +38,7 @@ on dependencies, `dep1` (`dep2`, .. etc.). The published versions of `dep1` are
```
{
"dist-tags": { "latest": "1.2.2" },
"versions": {
"versions": [
"1.2.2",
"1.2.1",
"1.2.0",
Expand All @@ -46,7 +48,7 @@ on dependencies, `dep1` (`dep2`, .. etc.). The published versions of `dep1` are
"0.4.1",
"0.4.0",
"0.2.0"
}
]
}
```

Expand Down
8 changes: 3 additions & 5 deletions deps/npm/doc/cli/npm.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,18 @@ Patches welcome!
Contributors are listed in npm's `package.json` file. You can view them
easily by doing `npm view npm contributors`.

If you would like to contribute, but don't know what to work on, check
the issues list or ask on the mailing list.
If you would like to contribute, but don't know what to work on, read
the contributing guidelines and check the issues list.

* https://github.com/npm/npm/wiki/Contributing-Guidelines
* <https://github.com/npm/npm/issues>
* <[email protected]>

## BUGS

When you find issues, please report them:

* web:
<https://github.com/npm/npm/issues>
* email:
<[email protected]>

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.
Expand Down
31 changes: 30 additions & 1 deletion deps/npm/doc/files/package.json.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,11 @@ maybe, someday.

Put example scripts in here. Someday, it might be exposed in some clever way.

### directories.test

Put your tests in here. It is currently not exposed, but it might be in the
future.

## repository

Specify the place where your code lives. This is helpful for people who
Expand Down Expand Up @@ -573,7 +578,31 @@ this. If you depend on features introduced in 1.5.2, use `">= 1.5.2 < 2"`.

## bundledDependencies

Array of package names that will be bundled when publishing the package.
This defines an array of package names that will be bundled when publishing
the package.

In cases where you need to preserve npm packages locally or have them
available through a single file download, you can bundle the packages in a
tarball file by specifying the package names in the `bundledDependencies`
array and executing `npm pack`.

For example:

If we define a package.json like this:

```
{
"name": "awesome-web-framework",
"version": "1.0.0",
"bundledDependencies": [
'renderized', 'super-streams'
]
}
```
we can obtain `awesome-web-framework-1.0.0.tgz` file by running `npm pack`.
This file contains the dependencies `renderized` and `super-streams` which
can be installed in a new project by executing `npm install
awesome-web-framework-1.0.0.tgz`.

If this is spelled `"bundleDependencies"`, then that is also honored.

Expand Down
Loading

0 comments on commit 0928584

Please sign in to comment.