package.json in the current folder and use the name
v.
name property.
"notepad" on Windows.
npm install.
npm ls promzard in npm's source tree will show:
-npm@3.10.9 /path/to/npm
+npm@3.10.10 /path/to/npm
└─┬ init-package-json@0.0.4
└── promzard@0.1.5
It will print out extraneous, missing, and invalid packages.
@@ -104,5 +104,5 @@ project.
-g is also specified.
NODE_ENV being set to production.
package.json in the current folder and use the name
npm install, just in case you
v.
npm access command to grant or revoke the appropriate permi
build/temp directory.
SYNOPSIS
npm <command> [args]
VERSION
-3.10.9
+3.10.10
DESCRIPTION
npm is the package manager for the Node JavaScript platform. It puts
modules in place so that node can find them, and manages dependency
@@ -126,7 +126,7 @@ will no doubt tell you to put the output in a gist or email.
Isaac Z. Schlueter ::
isaacs ::
@izs ::
-i@izs.me
+i@izs.me
SEE ALSO
- npm-help(1)
@@ -150,5 +150,5 @@ will no doubt tell you to put the output in a gist or email.
packa
packa
SYNOPSIS
- Get the author email with
npm owner ls <pkgname>
-- Email the author, CC support@npmjs.com
+- Email the author, CC support@npmjs.com
- After a few weeks, if there's no resolution, we'll sort it out.
Don't squat on package names. Publish code or move out of the way.
@@ -51,12 +51,12 @@ Joe's appropriate course of action in each case is the same.
owner (Bob).
- Joe emails Bob, explaining the situation as respectfully as
possible, and what he would like to do with the module name. He
-adds the npm support staff support@npmjs.com to the CC list of
+adds the npm support staff support@npmjs.com to the CC list of
the email. Mention in the email that Bob can run
npm owner add
joe foo to add Joe as an owner of the foo package.
- After a reasonable amount of time, if Bob has not responded, or if
Bob and Joe can't come to any sort of resolution, email support
-support@npmjs.com and we'll sort it out. ("Reasonable" is
+support@npmjs.com and we'll sort it out. ("Reasonable" is
usually at least 4 weeks, but extra time is allowed around common
holidays.)
@@ -112,5 +112,5 @@ things into it.
satisfies(version, range) function.
[args]
.RE
.SH VERSION
.P
-3.10.9
+3.10.10
.SH DESCRIPTION
.P
npm is the package manager for the Node JavaScript platform\. It puts
diff --git a/deps/npm/man/man5/npm-folders.5 b/deps/npm/man/man5/npm-folders.5
index 28ce304c0e5..e30e11c5a66 100644
--- a/deps/npm/man/man5/npm-folders.5
+++ b/deps/npm/man/man5/npm-folders.5
@@ -1,4 +1,4 @@
-.TH "NPM\-FOLDERS" "5" "October 2016" "" ""
+.TH "NPM\-FOLDERS" "5" "November 2016" "" ""
.SH "NAME"
\fBnpm-folders\fR \- Folder Structures Used by npm
.SH DESCRIPTION
diff --git a/deps/npm/man/man5/npm-global.5 b/deps/npm/man/man5/npm-global.5
index 28ce304c0e5..e30e11c5a66 100644
--- a/deps/npm/man/man5/npm-global.5
+++ b/deps/npm/man/man5/npm-global.5
@@ -1,4 +1,4 @@
-.TH "NPM\-FOLDERS" "5" "October 2016" "" ""
+.TH "NPM\-FOLDERS" "5" "November 2016" "" ""
.SH "NAME"
\fBnpm-folders\fR \- Folder Structures Used by npm
.SH DESCRIPTION
diff --git a/deps/npm/man/man5/npm-json.5 b/deps/npm/man/man5/npm-json.5
index 2f552b73ccd..fafa100f77f 100644
--- a/deps/npm/man/man5/npm-json.5
+++ b/deps/npm/man/man5/npm-json.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\.JSON" "5" "October 2016" "" ""
+.TH "PACKAGE\.JSON" "5" "November 2016" "" ""
.SH "NAME"
\fBpackage.json\fR \- Specifics of npm's package\.json handling
.SH DESCRIPTION
diff --git a/deps/npm/man/man5/npmrc.5 b/deps/npm/man/man5/npmrc.5
index 8d745e32a8d..b40918d84f9 100644
--- a/deps/npm/man/man5/npmrc.5
+++ b/deps/npm/man/man5/npmrc.5
@@ -1,4 +1,4 @@
-.TH "NPMRC" "5" "October 2016" "" ""
+.TH "NPMRC" "5" "November 2016" "" ""
.SH "NAME"
\fBnpmrc\fR \- The npm config files
.SH DESCRIPTION
diff --git a/deps/npm/man/man5/package.json.5 b/deps/npm/man/man5/package.json.5
index 2f552b73ccd..fafa100f77f 100644
--- a/deps/npm/man/man5/package.json.5
+++ b/deps/npm/man/man5/package.json.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\.JSON" "5" "October 2016" "" ""
+.TH "PACKAGE\.JSON" "5" "November 2016" "" ""
.SH "NAME"
\fBpackage.json\fR \- Specifics of npm's package\.json handling
.SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-coding-style.7 b/deps/npm/man/man7/npm-coding-style.7
index 7ecbdcc568c..e5d71c1ac6c 100644
--- a/deps/npm/man/man7/npm-coding-style.7
+++ b/deps/npm/man/man7/npm-coding-style.7
@@ -1,4 +1,4 @@
-.TH "NPM\-CODING\-STYLE" "7" "October 2016" "" ""
+.TH "NPM\-CODING\-STYLE" "7" "November 2016" "" ""
.SH "NAME"
\fBnpm-coding-style\fR \- npm's "funny" coding style
.SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-config.7 b/deps/npm/man/man7/npm-config.7
index a6ad79af3de..b35e9d1ce0a 100644
--- a/deps/npm/man/man7/npm-config.7
+++ b/deps/npm/man/man7/npm-config.7
@@ -1,4 +1,4 @@
-.TH "NPM\-CONFIG" "7" "October 2016" "" ""
+.TH "NPM\-CONFIG" "7" "November 2016" "" ""
.SH "NAME"
\fBnpm-config\fR \- More than you probably want to know about npm configuration
.SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-developers.7 b/deps/npm/man/man7/npm-developers.7
index 6c23dd383f8..fa849ecfdac 100644
--- a/deps/npm/man/man7/npm-developers.7
+++ b/deps/npm/man/man7/npm-developers.7
@@ -1,4 +1,4 @@
-.TH "NPM\-DEVELOPERS" "7" "October 2016" "" ""
+.TH "NPM\-DEVELOPERS" "7" "November 2016" "" ""
.SH "NAME"
\fBnpm-developers\fR \- Developer Guide
.SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-disputes.7 b/deps/npm/man/man7/npm-disputes.7
index 2a091216c22..04ce52b2d93 100644
--- a/deps/npm/man/man7/npm-disputes.7
+++ b/deps/npm/man/man7/npm-disputes.7
@@ -1,4 +1,4 @@
-.TH "NPM\-DISPUTES" "7" "October 2016" "" ""
+.TH "NPM\-DISPUTES" "7" "November 2016" "" ""
.SH "NAME"
\fBnpm-disputes\fR \- Handling Module Name Disputes
.SH SYNOPSIS
diff --git a/deps/npm/man/man7/npm-index.7 b/deps/npm/man/man7/npm-index.7
index 0de2ed24939..f2857df9e56 100644
--- a/deps/npm/man/man7/npm-index.7
+++ b/deps/npm/man/man7/npm-index.7
@@ -1,4 +1,4 @@
-.TH "NPM\-INDEX" "7" "October 2016" "" ""
+.TH "NPM\-INDEX" "7" "November 2016" "" ""
.SH "NAME"
\fBnpm-index\fR \- Index of all npm documentation
.SS npm help README
diff --git a/deps/npm/man/man7/npm-orgs.7 b/deps/npm/man/man7/npm-orgs.7
index 6dffbfc5f23..95f966e0c1d 100644
--- a/deps/npm/man/man7/npm-orgs.7
+++ b/deps/npm/man/man7/npm-orgs.7
@@ -1,4 +1,4 @@
-.TH "NPM\-ORGS" "7" "October 2016" "" ""
+.TH "NPM\-ORGS" "7" "November 2016" "" ""
.SH "NAME"
\fBnpm-orgs\fR \- Working with Teams & Orgs
.SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-registry.7 b/deps/npm/man/man7/npm-registry.7
index ac367e4b846..2710b1d8352 100644
--- a/deps/npm/man/man7/npm-registry.7
+++ b/deps/npm/man/man7/npm-registry.7
@@ -1,4 +1,4 @@
-.TH "NPM\-REGISTRY" "7" "October 2016" "" ""
+.TH "NPM\-REGISTRY" "7" "November 2016" "" ""
.SH "NAME"
\fBnpm-registry\fR \- The JavaScript Package Registry
.SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-scope.7 b/deps/npm/man/man7/npm-scope.7
index a066ab9a96f..af4ffc675a4 100644
--- a/deps/npm/man/man7/npm-scope.7
+++ b/deps/npm/man/man7/npm-scope.7
@@ -1,4 +1,4 @@
-.TH "NPM\-SCOPE" "7" "October 2016" "" ""
+.TH "NPM\-SCOPE" "7" "November 2016" "" ""
.SH "NAME"
\fBnpm-scope\fR \- Scoped packages
.SH DESCRIPTION
diff --git a/deps/npm/man/man7/npm-scripts.7 b/deps/npm/man/man7/npm-scripts.7
index 1b98cb34cb2..60acb3195ee 100644
--- a/deps/npm/man/man7/npm-scripts.7
+++ b/deps/npm/man/man7/npm-scripts.7
@@ -1,4 +1,4 @@
-.TH "NPM\-SCRIPTS" "7" "October 2016" "" ""
+.TH "NPM\-SCRIPTS" "7" "November 2016" "" ""
.SH "NAME"
\fBnpm-scripts\fR \- How npm handles the "scripts" field
.SH DESCRIPTION
diff --git a/deps/npm/man/man7/removing-npm.7 b/deps/npm/man/man7/removing-npm.7
index 2565ce29e09..b16fcf7d2e0 100644
--- a/deps/npm/man/man7/removing-npm.7
+++ b/deps/npm/man/man7/removing-npm.7
@@ -1,4 +1,4 @@
-.TH "NPM\-REMOVAL" "1" "October 2016" "" ""
+.TH "NPM\-REMOVAL" "1" "November 2016" "" ""
.SH "NAME"
\fBnpm-removal\fR \- Cleaning the Slate
.SH SYNOPSIS
diff --git a/deps/npm/man/man7/semver.7 b/deps/npm/man/man7/semver.7
index b9336120367..bff76838f53 100644
--- a/deps/npm/man/man7/semver.7
+++ b/deps/npm/man/man7/semver.7
@@ -1,4 +1,4 @@
-.TH "SEMVER" "7" "October 2016" "" ""
+.TH "SEMVER" "7" "November 2016" "" ""
.SH "NAME"
\fBsemver\fR \- The semantic versioner for npm
.SH Usage
diff --git a/deps/npm/package.json b/deps/npm/package.json
index c1df08e43d4..8716d59c3ad 100644
--- a/deps/npm/package.json
+++ b/deps/npm/package.json
@@ -1,5 +1,5 @@
{
- "version": "3.10.9",
+ "version": "3.10.10",
"name": "npm",
"description": "a package manager for JavaScript",
"keywords": [
@@ -202,12 +202,12 @@
"dumpconf": "env | grep npm | sort | uniq",
"prepublish": "node bin/npm-cli.js prune --prefix=. --no-global && rimraf test/*/*/node_modules && make doc-clean && make -j4 doc",
"preversion": "bash scripts/update-authors.sh && git add AUTHORS && git commit -m \"update AUTHORS\" || true",
- "tap": "tap --reporter=classic --timeout 300",
- "tap-cover": "tap --coverage --reporter=classic --timeout 600",
+ "tap": "tap --timeout 300",
+ "tap-cover": "tap --coverage --timeout 600",
"test": "standard && npm run test-tap",
- "test-coverage": "npm run tap-cover -- \"test/tap/*.js\" \"test/network/*.js\"",
- "test-tap": "npm run tap -- \"test/tap/*.js\"",
- "test-node": "\"$NODE\" \"node_modules/.bin/tap\" --timeout 240 \"test/tap/*.js\" \"test/network/*.js\""
+ "test-coverage": "npm run tap-cover -- \"test/tap/*.js\" \"test/network/*.js\" \"test/slow/*.js\" \"test/broken-under-*/*.js\"",
+ "test-tap": "npm run tap -- \"test/tap/*.js\" \"test/network/*.js\" \"test/slow/*.js\" \"test/broken-under-*/*.js\"",
+ "test-node": "\"$NODE\" \"node_modules/.bin/tap\" --timeout 240 \"test/tap/*.js\" \"test/network/*.js\" \"test/slow/*.js\" \"test/broken-under-nyc*/*.js\""
},
"license": "Artistic-2.0"
}
diff --git a/deps/npm/scripts/changelog.js b/deps/npm/scripts/changelog.js
index abbec4b4e9e..158a79cc463 100644
--- a/deps/npm/scripts/changelog.js
+++ b/deps/npm/scripts/changelog.js
@@ -5,14 +5,14 @@ Usage:
node scripts/changelog.js [comittish]
Generates changelog entries in our format as best as its able based on
-commits starting at comittish, or if that's not passed, master.
+commits starting at comittish, or if that's not passed, latest.
Ordinarily this is run via the gen-changelog shell script, which appends
the result to the changelog.
*/
const execSync = require('child_process').execSync
-const branch = process.argv[2] || 'master'
+const branch = process.argv[2] || 'origin/latest'
const log = execSync(`git log --reverse --pretty='format:%h %H%d %s (%aN)%n%b%n---%n' ${branch}...`).toString().split(/\n/)
main()
diff --git a/deps/npm/scripts/maketest b/deps/npm/scripts/maketest
index b4f674393ba..a71cadbc8c3 100755
--- a/deps/npm/scripts/maketest
+++ b/deps/npm/scripts/maketest
@@ -40,13 +40,13 @@ var tmpdir = path.join(basedir, 'tmp')
var conf = {
cwd: testdir,
- env: extend({
+ env: extend(extend({}, process.env), {
npm_config_cache: cachedir,
npm_config_tmp: tmpdir,
npm_config_prefix: globaldir,
npm_config_registry: common.registry,
npm_config_loglevel: 'warn'
- }, process.env)
+ })
}
var server
diff --git a/deps/npm/test/tap/lifecycle-path.js b/deps/npm/test/broken-under-nyc-and-travis/lifecycle-path.js
similarity index 93%
rename from deps/npm/test/tap/lifecycle-path.js
rename to deps/npm/test/broken-under-nyc-and-travis/lifecycle-path.js
index 684fd4d3b58..a9d32d15b05 100644
--- a/deps/npm/test/tap/lifecycle-path.js
+++ b/deps/npm/test/broken-under-nyc-and-travis/lifecycle-path.js
@@ -83,9 +83,9 @@ function checkPath (withDirOfCurrentNode, t) {
// get the ones we tacked on, then the system-specific requirements
var expectedPaths = ['{{ROOT}}/bin/node-gyp-bin',
- '{{ROOT}}/test/tap/lifecycle-path/node_modules/.bin']
+ '{{ROOT}}/test/broken-under-nyc-and-travis/lifecycle-path/node_modules/.bin']
if (withDirOfCurrentNode) {
- expectedPaths.push('{{ROOT}}/test/tap/lifecycle-path/node-bin')
+ expectedPaths.push('{{ROOT}}/test/broken-under-nyc-and-travis/lifecycle-path/node-bin')
}
var expect = expectedPaths.concat(newPATH.split(pathSplit)).map(function (p) {
return p.replace(/\\/g, '/')
diff --git a/deps/npm/test/tap/whoami.js b/deps/npm/test/broken-under-nyc-and-travis/whoami.js
similarity index 100%
rename from deps/npm/test/tap/whoami.js
rename to deps/npm/test/broken-under-nyc-and-travis/whoami.js
diff --git a/deps/npm/test/tap/legacy-npm-self-install.js b/deps/npm/test/slow/legacy-npm-self-install.js
similarity index 100%
rename from deps/npm/test/tap/legacy-npm-self-install.js
rename to deps/npm/test/slow/legacy-npm-self-install.js
diff --git a/deps/npm/test/tap/invalid-cmd-exit-code.js b/deps/npm/test/tap/invalid-cmd-exit-code.js
index f4bb444a179..b9a42f1be42 100644
--- a/deps/npm/test/tap/invalid-cmd-exit-code.js
+++ b/deps/npm/test/tap/invalid-cmd-exit-code.js
@@ -4,25 +4,31 @@ var common = require('../common-tap.js')
var opts = { cwd: process.cwd() }
test('npm asdf should return exit code 1', function (t) {
- common.npm(['asdf'], opts, function (er, c) {
- if (er) throw er
- t.ok(c, 'exit code should not be zero')
+ common.npm(['asdf'], opts, function (err, code, stdout, stderr) {
+ if (err) throw err
+ t.ok(code, 'exit code should not be zero')
+ if (stdout.trim()) t.comment(stdout.trim())
+ if (stderr.trim()) t.comment(stderr.trim())
t.end()
})
})
test('npm help should return exit code 0', function (t) {
- common.npm(['help'], opts, function (er, c) {
- if (er) throw er
- t.equal(c, 0, 'exit code should be 0')
+ common.npm(['help'], opts, function (err, code, stdout, stderr) {
+ if (err) throw err
+ t.equal(code, 0, 'exit code should be 0')
+ if (stdout.trim()) t.comment(stdout.trim())
+ if (stderr.trim()) t.comment(stderr.trim())
t.end()
})
})
test('npm help fadf should return exit code 0', function (t) {
- common.npm(['help', 'fadf'], opts, function (er, c) {
- if (er) throw er
- t.equal(c, 0, 'exit code should be 0')
+ common.npm(['help', 'fadf'], opts, function (err, code, stdout, stderr) {
+ if (err) throw err
+ t.equal(code, 0, 'exit code should be 0')
+ if (stdout.trim()) t.comment(stdout.trim())
+ if (stderr.trim()) t.comment(stderr.trim())
t.end()
})
})
diff --git a/deps/npm/test/tap/shrinkwrap-optional-platform.js b/deps/npm/test/tap/shrinkwrap-optional-platform.js
index 09d26f778be..4dced0253fc 100644
--- a/deps/npm/test/tap/shrinkwrap-optional-platform.js
+++ b/deps/npm/test/tap/shrinkwrap-optional-platform.js
@@ -33,12 +33,21 @@ var fixture = new Tacks(Dir({
'package.json': File({
name: 'mod1',
version: '1.0.0',
- scripts: {
-
+ scripts: {},
+ 'optionalDependencies': {
+ 'mod2': 'file:../mod2'
},
os: ['nosuchos']
})
}),
+ mod2: Dir({
+ 'package.json': File({
+ name: 'mod2',
+ version: '1.0.0',
+ scripts: {},
+ os: ['nosuchos']
+ })
+ }),
'npm-shrinkwrap.json': File({
name: 'shrinkwrap-optional-platform',
version: '1.0.0',
@@ -48,6 +57,12 @@ var fixture = new Tacks(Dir({
from: 'mod1',
resolved: 'file:mod1',
optional: true
+ },
+ mod2: {
+ version: '1.0.0',
+ from: 'mod2',
+ resolved: 'file:mod2',
+ optional: true
}
}
}),
@@ -93,4 +108,3 @@ test('cleanup', function (t) {
cleanup()
t.done()
})
-