Skip to content

Commit 0928584

Browse files
othiym23Myles Borins
authored and
Myles Borins
committed
deps: upgrade npm to 3.8.3
PR-URL: npm#6 Reviewed-By: Evan Lucas <[email protected]>
1 parent 39de601 commit 0928584

File tree

701 files changed

+19551
-17311
lines changed

Some content is hidden

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

701 files changed

+19551
-17311
lines changed

deps/npm/.mailmap

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Forbes Lindesay <[email protected]>
2323
2424
Gabriel Barros <[email protected]>
2525
Geoff Flarity <[email protected]> <gflarity@raptvm-x02.(none)>
26+
Ifeanyi Oraelosi <[email protected]>
2627
Isaac Z. Schlueter <[email protected]> <[email protected]>
2728
Isaac Z. Schlueter <[email protected]> isaacs <[email protected]>
2829
Jake Verbaten <[email protected]>
@@ -59,3 +60,4 @@ Will Elwood <[email protected]>
5960
Wout Mertens <[email protected]>
6061
Yeonghoon Park <[email protected]>
6162
Zeke Sikelianos <[email protected]>
63+
Zoujie Wzj <[email protected]>

deps/npm/.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ npm-debug.log
77
/test/packages/npm-test-depends-on-spark/which-spark.log
88
/test/packages/test-package/random-data.txt
99
/test/root
10+
/test/npm_cache
1011
node_modules/marked
1112
node_modules/ronn
1213
node_modules/tap

deps/npm/.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ before_install:
1313
- "node . install -g ."
1414
- "mkdir -p /var/run/couchdb"
1515
sudo: false
16-
script: "npm run-script test-all"
16+
script: "npm test"
1717
notifications:
1818
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8

deps/npm/AUTHORS

+18
Original file line numberDiff line numberDiff line change
@@ -364,3 +364,21 @@ Jan Schär <[email protected]>
364364
365365
366366
Prayag Verma <[email protected]>
367+
Neil Kistner <[email protected]>
368+
Zoujie Wzj <[email protected]>
369+
Ryan Hendrickson <[email protected]>
370+
Arturo Coronel <[email protected]>
371+
Hutson Betts <[email protected]>
372+
Lewis Cowper <[email protected]>
373+
Adam Byrne <[email protected]>
374+
Ifeanyi Oraelosi <[email protected]>
375+
Robert Ludwig <[email protected]>
376+
Chris Warren <[email protected]>
377+
Scott Plumlee <[email protected]>
378+
Daniel Pedersen <[email protected]>
379+
380+
doug.wade <[email protected]>
381+
382+
GriffinSchneider <[email protected]>
383+
Andres Kalle <[email protected]>
384+
thefourtheye <[email protected]>

deps/npm/CHANGELOG.md

+469-7
Large diffs are not rendered by default.

deps/npm/Makefile

+9-4
Original file line numberDiff line numberDiff line change
@@ -160,18 +160,23 @@ test: doc
160160
tag:
161161
npm tag npm@$(PUBLISHTAG) latest
162162

163-
publish: link doc
163+
ls-ok:
164+
node . ls >/dev/null
165+
166+
gitclean:
167+
git clean -fd
168+
169+
publish: gitclean ls-ok link doc
164170
@git push origin :v$(shell npm -v) 2>&1 || true
165-
git clean -fd &&\
166171
git push origin $(BRANCH) &&\
167172
git push origin --tags &&\
168173
npm publish --tag=$(PUBLISHTAG)
169174

170-
release: markedclean marked-manclean doc-clean doc
175+
release: gitclean ls-ok markedclean marked-manclean doc-clean doc
171176
node cli.js prune --production
172177
@bash scripts/release.sh
173178

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

177-
.PHONY: all latest install dev link doc clean uninstall test man doc-clean docclean release
182+
.PHONY: all latest install dev link doc clean uninstall test man doc-clean docclean release ls-ok realclean

deps/npm/bin/npm

+7
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ fi
1515
NPM_CLI_JS="$basedir/node_modules/npm/bin/npm-cli.js"
1616

1717
case `uname` in
18+
*MINGW*)
19+
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
20+
NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"
21+
if [ -f "$NPM_PREFIX_NPM_CLI_JS" ]; then
22+
NPM_CLI_JS="$NPM_PREFIX_NPM_CLI_JS"
23+
fi
24+
;;
1825
*CYGWIN*)
1926
NPM_PREFIX=`"$NODE_EXE" "$NPM_CLI_JS" prefix -g`
2027
NPM_PREFIX_NPM_CLI_JS="$NPM_PREFIX/node_modules/npm/bin/npm-cli.js"

deps/npm/doc/cli/npm-adduser.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ npm-adduser(1) -- Add a registry user account
55

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

8+
aliases: login, add-user
9+
810
## DESCRIPTION
911

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

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

6468
## SEE ALSO
6569

deps/npm/doc/cli/npm-bugs.md

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ npm-bugs(1) -- Bugs for a package in a web browser maybe
55

66
npm bugs [<pkgname>]
77

8+
aliases: issues
9+
810
## DESCRIPTION
911

1012
This command tries to guess at the likely location of a package's

deps/npm/doc/cli/npm-config.md

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ npm-config(1) -- Manage the npm configuration files
1111
npm get <key>
1212
npm set <key> <value> [-g|--global]
1313

14+
aliases: c
15+
1416
## DESCRIPTION
1517

1618
npm gets its config settings from the command line, environment

deps/npm/doc/cli/npm-dedupe.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ npm-dedupe(1) -- Reduce duplication
66
npm dedupe
77
npm ddp
88

9+
aliases: find-dupes, ddp
10+
911
## DESCRIPTION
1012

1113
Searches the local package tree and attempts to simplify the overall

deps/npm/doc/cli/npm-dist-tag.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ npm-dist-tag(1) -- Modify package distribution tags
77
npm dist-tag rm <pkg> <tag>
88
npm dist-tag ls [<pkg>]
99

10+
aliases: dist-tags
11+
1012
## DESCRIPTION
1113

1214
Add, remove, and enumerate distribution tags on a package:

deps/npm/doc/cli/npm-help-search.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ command directly.
2121
### long
2222

2323
* Type: Boolean
24-
* Default false
24+
* Default: false
2525

2626
If true, the "long" flag will cause help-search to output context around
2727
where the terms were found in the documentation.

deps/npm/doc/cli/npm-install.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ npm-install(1) -- Install a package
1313
npm install <folder>
1414

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

1818
## DESCRIPTION
1919

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

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

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

106+
* `-B, --save-bundle`: Saved dependencies will also be added to your `bundleDependencies` list.
107+
106108
Further, if you have an `npm-shrinkwrap.json` then it will be updated as
107109
well.
108110

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

126129

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

271274
The `--legacy-bundling` argument will cause npm to install the package such
272275
that versions of npm prior to 1.4, such as the one included with node 0.8,

deps/npm/doc/cli/npm-link.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ npm-link(1) -- Symlink a package folder
1212

1313
Package linking is a two-step process.
1414

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

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

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

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

4546
You may also shortcut the two steps in one. For example, to do the
4647
above use-case in a shorter way:

deps/npm/doc/cli/npm-logout.md

+2-7
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,9 @@ it takes precedence.
3131

3232
Default: none
3333

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

38-
npm adduser --registry=http://myregistry.example.com --scope=@myco
39-
40-
This will set a registry for the given scope and login or create a user for
41-
that registry at the same time.
36+
npm logout --scope=@myco
4237

4338
## SEE ALSO
4439

deps/npm/doc/cli/npm-owner.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ npm-owner(1) -- Manage package owners
77
npm owner rm <user> [<@scope>/]<pkg>
88
npm owner ls [<@scope>/]<pkg>
99

10+
aliases: author
11+
1012
## DESCRIPTION
1113

1214
Manage ownership of published packages.

deps/npm/doc/cli/npm-search.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ npm-search(1) -- Search for packages
55

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

8-
aliases: s, se
8+
aliases: s, se, find
99

1010
## DESCRIPTION
1111

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

30+
### registry
31+
32+
* Default: https://registry.npmjs.org/
33+
* Type : url
34+
35+
Search the specified registry for modules. If you have configured npm to point to a different default registry,
36+
such as your internal private module repository, `npm search` will default to that registry when searching.
37+
Pass a different registry url such as the default above in order to override this setting.
38+
3039
## SEE ALSO
3140

3241
* npm-registry(7)

deps/npm/doc/cli/npm-test.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ npm-test(1) -- Test a package
44
## SYNOPSIS
55

66
npm test [-- <args>]
7-
npm tst [-- <args>]
7+
8+
aliases: t, tst
89

910
## DESCRIPTION
1011

deps/npm/doc/cli/npm-update.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ npm-update(1) -- Update a package
55

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

8+
aliases: up, upgrade
9+
810
## DESCRIPTION
911

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

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

2729
## EXAMPLES
2830

@@ -36,7 +38,7 @@ on dependencies, `dep1` (`dep2`, .. etc.). The published versions of `dep1` are
3638
```
3739
{
3840
"dist-tags": { "latest": "1.2.2" },
39-
"versions": {
41+
"versions": [
4042
"1.2.2",
4143
"1.2.1",
4244
"1.2.0",
@@ -46,7 +48,7 @@ on dependencies, `dep1` (`dep2`, .. etc.). The published versions of `dep1` are
4648
"0.4.1",
4749
"0.4.0",
4850
"0.2.0"
49-
}
51+
]
5052
}
5153
```
5254

deps/npm/doc/cli/npm.md

+3-5
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,18 @@ Patches welcome!
127127
Contributors are listed in npm's `package.json` file. You can view them
128128
easily by doing `npm view npm contributors`.
129129

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

133+
* https://github.com/npm/npm/wiki/Contributing-Guidelines
133134
* <https://github.com/npm/npm/issues>
134-
135135

136136
## BUGS
137137

138138
When you find issues, please report them:
139139

140140
* web:
141141
<https://github.com/npm/npm/issues>
142-
* email:
143-
144142

145143
Be sure to include *all* of the output from the npm command that didn't work
146144
as expected. The `npm-debug.log` file is also helpful to provide.

deps/npm/doc/files/package.json.md

+30-1
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,11 @@ maybe, someday.
329329

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

332+
### directories.test
333+
334+
Put your tests in here. It is currently not exposed, but it might be in the
335+
future.
336+
332337
## repository
333338

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

574579
## bundledDependencies
575580

576-
Array of package names that will be bundled when publishing the package.
581+
This defines an array of package names that will be bundled when publishing
582+
the package.
583+
584+
In cases where you need to preserve npm packages locally or have them
585+
available through a single file download, you can bundle the packages in a
586+
tarball file by specifying the package names in the `bundledDependencies`
587+
array and executing `npm pack`.
588+
589+
For example:
590+
591+
If we define a package.json like this:
592+
593+
```
594+
{
595+
"name": "awesome-web-framework",
596+
"version": "1.0.0",
597+
"bundledDependencies": [
598+
'renderized', 'super-streams'
599+
]
600+
}
601+
```
602+
we can obtain `awesome-web-framework-1.0.0.tgz` file by running `npm pack`.
603+
This file contains the dependencies `renderized` and `super-streams` which
604+
can be installed in a new project by executing `npm install
605+
awesome-web-framework-1.0.0.tgz`.
577606

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

0 commit comments

Comments
 (0)