From 8b50ede90b0165f8d037e7f69e45b5385ccbece7 Mon Sep 17 00:00:00 2001
From: Forrest L Norvell If you have a complaint about a package in the public npm registry,
and cannot resolve it with the package
owner, please email
-support@npmjs.com and explain the situation.Legal Stuff
Any data published to The npm Registry (including user account information) may be removed or modified at the sole discretion of the npm server administrators.
@@ -183,5 +183,5 @@Add a package as a git submodule
+npm.commands.submodule(packages, callback)
+
For each package specified, npm will check if it has a git repository url
+in its package.json description then add it as a git submodule at
+node_modules/<pkg name>
.
This is a convenience only. From then on, it's up to you to manage
+updates by using the appropriate git commands. npm will stubbornly
+refuse to update, modify, or remove anything with a .git
subfolder
+in it.
This command also does not install missing dependencies, if the package
+does not include them in its git repository. If npm ls
reports that
+things are missing, you can either install, link, or submodule them yourself,
+or you can do npm explore <pkgname> -- npm install
to install the
+dependencies into the submodule folder.
2.11.2
+2.11.3
This is the API documentation for npm. To find documentation of the command line @@ -109,5 +109,5 @@
npm ls promzard
in npm's source tree will show:
-npm@2.11.2 /path/to/npm
+npm@2.11.3 /path/to/npm
└─┬ init-package-json@0.0.4
└── promzard@0.1.5
It will print out extraneous, missing, and invalid packages.
@@ -97,5 +97,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-outdated.html b/deps/npm/html/doc/cli/npm-outdated.html
index f4d4affb1c8bdc..e0ecfd26c2d746 100644
--- a/deps/npm/html/doc/cli/npm-outdated.html
+++ b/deps/npm/html/doc/cli/npm-outdated.html
@@ -67,5 +67,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-owner.html b/deps/npm/html/doc/cli/npm-owner.html
index 7977700de1065f..9b83f7e6735eba 100644
--- a/deps/npm/html/doc/cli/npm-owner.html
+++ b/deps/npm/html/doc/cli/npm-owner.html
@@ -49,5 +49,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-pack.html b/deps/npm/html/doc/cli/npm-pack.html
index 07f91e6b0ceca8..ccebbe323da364 100644
--- a/deps/npm/html/doc/cli/npm-pack.html
+++ b/deps/npm/html/doc/cli/npm-pack.html
@@ -41,5 +41,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-prefix.html b/deps/npm/html/doc/cli/npm-prefix.html
index 46187fdb54f400..f9af61318d4c46 100644
--- a/deps/npm/html/doc/cli/npm-prefix.html
+++ b/deps/npm/html/doc/cli/npm-prefix.html
@@ -38,5 +38,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-prune.html b/deps/npm/html/doc/cli/npm-prune.html
index f4b851c2edc622..58125c416497b8 100644
--- a/deps/npm/html/doc/cli/npm-prune.html
+++ b/deps/npm/html/doc/cli/npm-prune.html
@@ -41,5 +41,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-publish.html b/deps/npm/html/doc/cli/npm-publish.html
index f2b14926f8ed09..ba1bad9e26c8a4 100644
--- a/deps/npm/html/doc/cli/npm-publish.html
+++ b/deps/npm/html/doc/cli/npm-publish.html
@@ -66,5 +66,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-rebuild.html b/deps/npm/html/doc/cli/npm-rebuild.html
index 77b5684dbaba93..38bc945329aa9c 100644
--- a/deps/npm/html/doc/cli/npm-rebuild.html
+++ b/deps/npm/html/doc/cli/npm-rebuild.html
@@ -38,5 +38,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-repo.html b/deps/npm/html/doc/cli/npm-repo.html
index 59dbb3c832e2cf..63b850a61edfd1 100644
--- a/deps/npm/html/doc/cli/npm-repo.html
+++ b/deps/npm/html/doc/cli/npm-repo.html
@@ -42,5 +42,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-restart.html b/deps/npm/html/doc/cli/npm-restart.html
index 3fbd1a3cb35073..faafb1d00e45c8 100644
--- a/deps/npm/html/doc/cli/npm-restart.html
+++ b/deps/npm/html/doc/cli/npm-restart.html
@@ -53,5 +53,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-rm.html b/deps/npm/html/doc/cli/npm-rm.html
index 94f0ba525beacb..09ece656aa2f55 100644
--- a/deps/npm/html/doc/cli/npm-rm.html
+++ b/deps/npm/html/doc/cli/npm-rm.html
@@ -39,5 +39,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-root.html b/deps/npm/html/doc/cli/npm-root.html
index 259315bd2e39f0..c3092e686fd899 100644
--- a/deps/npm/html/doc/cli/npm-root.html
+++ b/deps/npm/html/doc/cli/npm-root.html
@@ -35,5 +35,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-run-script.html b/deps/npm/html/doc/cli/npm-run-script.html
index 553542da9a3b25..03f1aa201a2a69 100644
--- a/deps/npm/html/doc/cli/npm-run-script.html
+++ b/deps/npm/html/doc/cli/npm-run-script.html
@@ -56,5 +56,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-search.html b/deps/npm/html/doc/cli/npm-search.html
index ceb867fbf00fb9..fc065f99915d96 100644
--- a/deps/npm/html/doc/cli/npm-search.html
+++ b/deps/npm/html/doc/cli/npm-search.html
@@ -49,5 +49,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-shrinkwrap.html b/deps/npm/html/doc/cli/npm-shrinkwrap.html
index 5fd6d9c9b17401..b6f8ddc6d0489a 100644
--- a/deps/npm/html/doc/cli/npm-shrinkwrap.html
+++ b/deps/npm/html/doc/cli/npm-shrinkwrap.html
@@ -164,5 +164,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-star.html b/deps/npm/html/doc/cli/npm-star.html
index 4943fe78068e37..273ba24060f395 100644
--- a/deps/npm/html/doc/cli/npm-star.html
+++ b/deps/npm/html/doc/cli/npm-star.html
@@ -36,5 +36,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-stars.html b/deps/npm/html/doc/cli/npm-stars.html
index 4e14f5b2994ce5..1899557adf5ab3 100644
--- a/deps/npm/html/doc/cli/npm-stars.html
+++ b/deps/npm/html/doc/cli/npm-stars.html
@@ -37,5 +37,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-start.html b/deps/npm/html/doc/cli/npm-start.html
index bdc38e83cb2959..eb36bd5b29f623 100644
--- a/deps/npm/html/doc/cli/npm-start.html
+++ b/deps/npm/html/doc/cli/npm-start.html
@@ -34,5 +34,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-stop.html b/deps/npm/html/doc/cli/npm-stop.html
index 9a1c84adfd0d15..c772f894616830 100644
--- a/deps/npm/html/doc/cli/npm-stop.html
+++ b/deps/npm/html/doc/cli/npm-stop.html
@@ -34,5 +34,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-submodule.html b/deps/npm/html/doc/cli/npm-submodule.html
new file mode 100644
index 00000000000000..30bde01b318f47
--- /dev/null
+++ b/deps/npm/html/doc/cli/npm-submodule.html
@@ -0,0 +1,45 @@
+
+
+ npm-submodule
+
+
+
+
+
+
+
+
+npm-submodule
Add a package as a git submodule
+SYNOPSIS
+npm submodule <pkg>
+
DESCRIPTION
+If the specified package has a git repository url in its package.json
+description, then this command will add it as a git submodule at
+node_modules/<pkg name>
.
+This is a convenience only. From then on, it's up to you to manage
+updates by using the appropriate git commands. npm will stubbornly
+refuse to update, modify, or remove anything with a .git
subfolder
+in it.
+This command also does not install missing dependencies, if the package
+does not include them in its git repository. If npm ls
reports that
+things are missing, you can either install, link, or submodule them yourself,
+or you can do npm explore <pkgname> -- npm install
to install the
+dependencies into the submodule folder.
+SEE ALSO
+
+- package.json(5)
+- git help submodule
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/deps/npm/html/doc/cli/npm-tag.html b/deps/npm/html/doc/cli/npm-tag.html
index a1cd6a34722584..414e84a0dd165a 100644
--- a/deps/npm/html/doc/cli/npm-tag.html
+++ b/deps/npm/html/doc/cli/npm-tag.html
@@ -62,5 +62,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-test.html b/deps/npm/html/doc/cli/npm-test.html
index f1297a218d781b..1adc889770378d 100644
--- a/deps/npm/html/doc/cli/npm-test.html
+++ b/deps/npm/html/doc/cli/npm-test.html
@@ -37,5 +37,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-uninstall.html b/deps/npm/html/doc/cli/npm-uninstall.html
index ffa3f9fed67463..aae5ca9b4d8571 100644
--- a/deps/npm/html/doc/cli/npm-uninstall.html
+++ b/deps/npm/html/doc/cli/npm-uninstall.html
@@ -57,5 +57,5 @@ SYNOPSIS
-
+
diff --git a/deps/npm/html/doc/cli/npm-unpublish.html b/deps/npm/html/doc/cli/npm-unpublish.html
index 2c688d6c7e5b37..1f042fc55e3292 100644
--- a/deps/npm/html/doc/cli/npm-unpublish.html
+++ b/deps/npm/html/doc/cli/npm-unpublish.html
@@ -47,5 +47,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-update.html b/deps/npm/html/doc/cli/npm-update.html
index 90665678babc42..ae6685d449547a 100644
--- a/deps/npm/html/doc/cli/npm-update.html
+++ b/deps/npm/html/doc/cli/npm-update.html
@@ -119,5 +119,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-version.html b/deps/npm/html/doc/cli/npm-version.html
index 741b08519683aa..941df172003f9f 100644
--- a/deps/npm/html/doc/cli/npm-version.html
+++ b/deps/npm/html/doc/cli/npm-version.html
@@ -73,5 +73,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-view.html b/deps/npm/html/doc/cli/npm-view.html
index a08ed9c2a46f16..e0f48b675e967a 100644
--- a/deps/npm/html/doc/cli/npm-view.html
+++ b/deps/npm/html/doc/cli/npm-view.html
@@ -82,5 +82,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm-whoami.html b/deps/npm/html/doc/cli/npm-whoami.html
index 5bee748a3a5edc..9b451f148cc5b7 100644
--- a/deps/npm/html/doc/cli/npm-whoami.html
+++ b/deps/npm/html/doc/cli/npm-whoami.html
@@ -33,5 +33,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/cli/npm.html b/deps/npm/html/doc/cli/npm.html
index f5e08486c793b7..83fe67d5759669 100644
--- a/deps/npm/html/doc/cli/npm.html
+++ b/deps/npm/html/doc/cli/npm.html
@@ -13,7 +13,7 @@ npm
javascript package manager
SYNOPSIS
npm <command> [args]
VERSION
-2.11.2
+2.11.3
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
@@ -110,7 +110,7 @@
CONTRIBUTIONS
the issues list or ask on the mailing list.
BUGS
When you find issues, please report them:
@@ -118,7 +118,7 @@ BUGS
web:
http://github.com/npm/npm/issues
email:
-npm-@googlegroups.com
+npm-@googlegroups.com
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.
@@ -128,7 +128,7 @@ AUTHOR
Isaac Z. Schlueter ::
isaacs ::
@izs ::
-i@izs.me
+i@izs.me
SEE ALSO
- npm-help(1)
@@ -154,5 +154,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/files/npm-folders.html b/deps/npm/html/doc/files/npm-folders.html
index ea06ea2dc70ccf..db8b092111a6ff 100644
--- a/deps/npm/html/doc/files/npm-folders.html
+++ b/deps/npm/html/doc/files/npm-folders.html
@@ -184,5 +184,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/files/npm-global.html b/deps/npm/html/doc/files/npm-global.html
index 463c8aa3517941..ddc76520145e5d 100644
--- a/deps/npm/html/doc/files/npm-global.html
+++ b/deps/npm/html/doc/files/npm-global.html
@@ -184,5 +184,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/files/npm-json.html b/deps/npm/html/doc/files/npm-json.html
index 85a7fa10e99f03..faf036a9816797 100644
--- a/deps/npm/html/doc/files/npm-json.html
+++ b/deps/npm/html/doc/files/npm-json.html
@@ -538,5 +538,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/files/npmrc.html b/deps/npm/html/doc/files/npmrc.html
index 80166c343ed569..38f5c86e3e9cf3 100644
--- a/deps/npm/html/doc/files/npmrc.html
+++ b/deps/npm/html/doc/files/npmrc.html
@@ -81,5 +81,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html
index a50f9d6a8abaf8..66651bd4e5045f 100644
--- a/deps/npm/html/doc/files/package.json.html
+++ b/deps/npm/html/doc/files/package.json.html
@@ -538,5 +538,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/index.html b/deps/npm/html/doc/index.html
index c1c84c4a710df3..e45b852b5f911b 100644
--- a/deps/npm/html/doc/index.html
+++ b/deps/npm/html/doc/index.html
@@ -236,5 +236,5 @@ semver(
-
+
diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html
index 506d293e762a98..c336977c58d29e 100644
--- a/deps/npm/html/doc/misc/npm-coding-style.html
+++ b/deps/npm/html/doc/misc/npm-coding-style.html
@@ -147,5 +147,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html
index 773c928f5d9961..baa0762f1bb49f 100644
--- a/deps/npm/html/doc/misc/npm-config.html
+++ b/deps/npm/html/doc/misc/npm-config.html
@@ -799,5 +799,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/misc/npm-developers.html b/deps/npm/html/doc/misc/npm-developers.html
index 23c378fb865295..c3b26357b238b4 100644
--- a/deps/npm/html/doc/misc/npm-developers.html
+++ b/deps/npm/html/doc/misc/npm-developers.html
@@ -189,5 +189,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/misc/npm-disputes.html b/deps/npm/html/doc/misc/npm-disputes.html
index 2e2d14193f8051..797d3e6bce9409 100644
--- a/deps/npm/html/doc/misc/npm-disputes.html
+++ b/deps/npm/html/doc/misc/npm-disputes.html
@@ -13,7 +13,7 @@ npm-disputes
Handling Module
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 @@ DESCRIPTION
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 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/misc/npm-faq.html b/deps/npm/html/doc/misc/npm-faq.html
index e07eebe7a76238..01ef2c2d42f64a 100644
--- a/deps/npm/html/doc/misc/npm-faq.html
+++ b/deps/npm/html/doc/misc/npm-faq.html
@@ -236,7 +236,7 @@ I get ECONNREFUSED a lot. What'
To check if the registry is down, open up
https://registry.npmjs.org/ in a web browser. This will also tell
you if you are just unable to access the internet for some reason.
-If the registry IS down, let us know by emailing support@npmjs.com
+
If the registry IS down, let us know by emailing support@npmjs.com
or posting an issue at https://github.com/npm/npm/issues. If it's
down for the world (and not just on your local network) then we're
probably already being pinged about it.
@@ -307,5 +307,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/misc/npm-index.html b/deps/npm/html/doc/misc/npm-index.html
index 759d5283136bee..18d73b0abbb391 100644
--- a/deps/npm/html/doc/misc/npm-index.html
+++ b/deps/npm/html/doc/misc/npm-index.html
@@ -236,5 +236,5 @@ s
-
+
diff --git a/deps/npm/html/doc/misc/npm-registry.html b/deps/npm/html/doc/misc/npm-registry.html
index e2a28a6f2db4e0..23c36db63c6770 100644
--- a/deps/npm/html/doc/misc/npm-registry.html
+++ b/deps/npm/html/doc/misc/npm-registry.html
@@ -70,5 +70,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/misc/npm-scope.html b/deps/npm/html/doc/misc/npm-scope.html
index 1c901316f6eb7e..027e64ed948d1f 100644
--- a/deps/npm/html/doc/misc/npm-scope.html
+++ b/deps/npm/html/doc/misc/npm-scope.html
@@ -91,5 +91,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/misc/npm-scripts.html b/deps/npm/html/doc/misc/npm-scripts.html
index 297e195d636d7f..982c219fea69a3 100644
--- a/deps/npm/html/doc/misc/npm-scripts.html
+++ b/deps/npm/html/doc/misc/npm-scripts.html
@@ -207,5 +207,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/misc/removing-npm.html b/deps/npm/html/doc/misc/removing-npm.html
index c4f0110aba1888..37253651bb5d81 100644
--- a/deps/npm/html/doc/misc/removing-npm.html
+++ b/deps/npm/html/doc/misc/removing-npm.html
@@ -57,5 +57,5 @@ SEE ALSO
-
+
diff --git a/deps/npm/html/doc/misc/semver.html b/deps/npm/html/doc/misc/semver.html
index 05ba284de751df..bf227e4834a006 100644
--- a/deps/npm/html/doc/misc/semver.html
+++ b/deps/npm/html/doc/misc/semver.html
@@ -282,5 +282,5 @@ Ranges
-
+
diff --git a/deps/npm/html/partial/doc/README.html b/deps/npm/html/partial/doc/README.html
index ed1e7e1864b321..7db20d8965a693 100644
--- a/deps/npm/html/partial/doc/README.html
+++ b/deps/npm/html/partial/doc/README.html
@@ -129,7 +129,7 @@ Legal Stuff
If you have a complaint about a package in the public npm registry,
and cannot resolve it with the package
owner, please email
-support@npmjs.com and explain the situation.
+support@npmjs.com and explain the situation.
Any data published to The npm Registry (including user account
information) may be removed or modified at the sole discretion of the
npm server administrators.
diff --git a/deps/npm/html/partial/doc/api/npm-submodule.html b/deps/npm/html/partial/doc/api/npm-submodule.html
new file mode 100644
index 00000000000000..cc7dd822ada426
--- /dev/null
+++ b/deps/npm/html/partial/doc/api/npm-submodule.html
@@ -0,0 +1,21 @@
+npm-submodule
Add a package as a git submodule
+SYNOPSIS
+npm.commands.submodule(packages, callback)
+
DESCRIPTION
+For each package specified, npm will check if it has a git repository url
+in its package.json description then add it as a git submodule at
+node_modules/<pkg name>
.
+This is a convenience only. From then on, it's up to you to manage
+updates by using the appropriate git commands. npm will stubbornly
+refuse to update, modify, or remove anything with a .git
subfolder
+in it.
+This command also does not install missing dependencies, if the package
+does not include them in its git repository. If npm ls
reports that
+things are missing, you can either install, link, or submodule them yourself,
+or you can do npm explore <pkgname> -- npm install
to install the
+dependencies into the submodule folder.
+SEE ALSO
+
+- npm help json
+- git help submodule
+
diff --git a/deps/npm/html/partial/doc/api/npm.html b/deps/npm/html/partial/doc/api/npm.html
index 5f094ed0e9604e..8e9de746a143cc 100644
--- a/deps/npm/html/partial/doc/api/npm.html
+++ b/deps/npm/html/partial/doc/api/npm.html
@@ -12,7 +12,7 @@ SYNOPSIS
npm.commands.install(["package"], cb)
})
2.11.2
+2.11.3
This is the API documentation for npm. To find documentation of the command line diff --git a/deps/npm/html/partial/doc/cli/npm-ls.html b/deps/npm/html/partial/doc/cli/npm-ls.html index cb1810bf555ca4..f240024f22fe2a 100644 --- a/deps/npm/html/partial/doc/cli/npm-ls.html +++ b/deps/npm/html/partial/doc/cli/npm-ls.html @@ -11,7 +11,7 @@
npm ls promzard
in npm's source tree will show:
-npm@2.11.2 /path/to/npm
+npm@2.11.3 /path/to/npm
└─┬ init-package-json@0.0.4
└── promzard@0.1.5
It will print out extraneous, missing, and invalid packages.
diff --git a/deps/npm/html/partial/doc/cli/npm-submodule.html b/deps/npm/html/partial/doc/cli/npm-submodule.html
new file mode 100644
index 00000000000000..dd7c7e8878e734
--- /dev/null
+++ b/deps/npm/html/partial/doc/cli/npm-submodule.html
@@ -0,0 +1,21 @@
+npm-submodule
Add a package as a git submodule
+SYNOPSIS
+npm submodule <pkg>
+
DESCRIPTION
+If the specified package has a git repository url in its package.json
+description, then this command will add it as a git submodule at
+node_modules/<pkg name>
.
+This is a convenience only. From then on, it's up to you to manage
+updates by using the appropriate git commands. npm will stubbornly
+refuse to update, modify, or remove anything with a .git
subfolder
+in it.
+This command also does not install missing dependencies, if the package
+does not include them in its git repository. If npm ls
reports that
+things are missing, you can either install, link, or submodule them yourself,
+or you can do npm explore <pkgname> -- npm install
to install the
+dependencies into the submodule folder.
+SEE ALSO
+
+- package.json(5)
+- git help submodule
+
diff --git a/deps/npm/html/partial/doc/cli/npm.html b/deps/npm/html/partial/doc/cli/npm.html
index 3778f1aa9b4e06..b09a9846790e26 100644
--- a/deps/npm/html/partial/doc/cli/npm.html
+++ b/deps/npm/html/partial/doc/cli/npm.html
@@ -2,7 +2,7 @@ npm
javascript package manager
SYNOPSIS
npm <command> [args]
VERSION
-2.11.2
+2.11.3
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
@@ -99,7 +99,7 @@
CONTRIBUTIONS
the issues list or ask on the mailing list.
BUGS
When you find issues, please report them:
@@ -107,7 +107,7 @@ BUGS
web:
http://github.com/npm/npm/issues
email:
-npm-@googlegroups.com
+npm-@googlegroups.com
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.
@@ -117,7 +117,7 @@ AUTHOR
Isaac Z. Schlueter ::
isaacs ::
@izs ::
-i@izs.me
+i@izs.me
SEE ALSO
- npm-help(1)
diff --git a/deps/npm/html/partial/doc/misc/npm-disputes.html b/deps/npm/html/partial/doc/misc/npm-disputes.html
index 9824c29482dda2..ee9992f7702d10 100644
--- a/deps/npm/html/partial/doc/misc/npm-disputes.html
+++ b/deps/npm/html/partial/doc/misc/npm-disputes.html
@@ -2,7 +2,7 @@ npm-disputes
Handling Module
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.
@@ -40,12 +40,12 @@ DESCRIPTION
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.)
diff --git a/deps/npm/html/partial/doc/misc/npm-faq.html b/deps/npm/html/partial/doc/misc/npm-faq.html
index 556037740e21ca..448ef469483720 100644
--- a/deps/npm/html/partial/doc/misc/npm-faq.html
+++ b/deps/npm/html/partial/doc/misc/npm-faq.html
@@ -225,7 +225,7 @@ I get ECONNREFUSED a lot. What'
To check if the registry is down, open up
https://registry.npmjs.org/ in a web browser. This will also tell
you if you are just unable to access the internet for some reason.
-If the registry IS down, let us know by emailing support@npmjs.com
+
If the registry IS down, let us know by emailing support@npmjs.com
or posting an issue at https://github.com/npm/npm/issues. If it's
down for the world (and not just on your local network) then we're
probably already being pinged about it.
diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
index c7b2c14fa0e271..31d93d17b4a77b 100644
--- a/deps/npm/man/man1/npm-ls.1
+++ b/deps/npm/man/man1/npm-ls.1
@@ -23,7 +23,7 @@ For example, running \fBnpm ls promzard\fR in npm's source tree will show:
.P
.RS 2
.nf
-npm@2.11.2 /path/to/npm
+npm@2.11.3 /path/to/npm
└─┬ init\-package\-json@0\.0\.4
└── promzard@0\.1\.5
.fi
diff --git a/deps/npm/man/man1/npm-submodule.1 b/deps/npm/man/man1/npm-submodule.1
new file mode 100644
index 00000000000000..771f0c0a2286a2
--- /dev/null
+++ b/deps/npm/man/man1/npm-submodule.1
@@ -0,0 +1,41 @@
+.\" Generated with Ronnjs 0.3.8
+.\" http://github.com/kapouer/ronnjs/
+.
+.TH "NPM\-SUBMODULE" "1" "September 2014" "" ""
+.
+.SH "NAME"
+\fBnpm-submodule\fR \-\- Add a package as a git submodule
+.
+.SH "SYNOPSIS"
+.
+.nf
+npm submodule
+.
+.fi
+.
+.SH "DESCRIPTION"
+If the specified package has a git repository url in its package\.json
+description, then this command will add it as a git submodule at \fBnode_modules/\fR\|\.
+.
+.P
+This is a convenience only\. From then on, it\'s up to you to manage
+updates by using the appropriate git commands\. npm will stubbornly
+refuse to update, modify, or remove anything with a \fB\|\.git\fR subfolder
+in it\.
+.
+.P
+This command also does not install missing dependencies, if the package
+does not include them in its git repository\. If \fBnpm ls\fR reports that
+things are missing, you can either install, link, or submodule them yourself,
+or you can do \fBnpm explore \-\- npm install\fR to install the
+dependencies into the submodule folder\.
+.
+.SH "SEE ALSO"
+.
+.IP "\(bu" 4
+npm help 5 package\.json
+.
+.IP "\(bu" 4
+git help submodule
+.
+.IP "" 0
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index 45636f9093d2ec..b38102a3f9bb0c 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -10,7 +10,7 @@ npm [args]
.RE
.SH VERSION
.P
-2.11.2
+2.11.3
.SH DESCRIPTION
.P
npm is the package manager for the Node JavaScript platform\. It puts
diff --git a/deps/npm/man/man3/npm-submodule.3 b/deps/npm/man/man3/npm-submodule.3
new file mode 100644
index 00000000000000..d2e23d7e8fc245
--- /dev/null
+++ b/deps/npm/man/man3/npm-submodule.3
@@ -0,0 +1,41 @@
+.\" Generated with Ronnjs 0.3.8
+.\" http://github.com/kapouer/ronnjs/
+.
+.TH "NPM\-SUBMODULE" "3" "September 2014" "" ""
+.
+.SH "NAME"
+\fBnpm-submodule\fR \-\- Add a package as a git submodule
+.
+.SH "SYNOPSIS"
+.
+.nf
+npm\.commands\.submodule(packages, callback)
+.
+.fi
+.
+.SH "DESCRIPTION"
+For each package specified, npm will check if it has a git repository url
+in its package\.json description then add it as a git submodule at \fBnode_modules/\fR\|\.
+.
+.P
+This is a convenience only\. From then on, it\'s up to you to manage
+updates by using the appropriate git commands\. npm will stubbornly
+refuse to update, modify, or remove anything with a \fB\|\.git\fR subfolder
+in it\.
+.
+.P
+This command also does not install missing dependencies, if the package
+does not include them in its git repository\. If \fBnpm ls\fR reports that
+things are missing, you can either install, link, or submodule them yourself,
+or you can do \fBnpm explore \-\- npm install\fR to install the
+dependencies into the submodule folder\.
+.
+.SH "SEE ALSO"
+.
+.IP "\(bu" 4
+npm help json
+.
+.IP "\(bu" 4
+git help submodule
+.
+.IP "" 0
diff --git a/deps/npm/man/man3/npm.3 b/deps/npm/man/man3/npm.3
index e7364762d46469..a27078deb1cacc 100644
--- a/deps/npm/man/man3/npm.3
+++ b/deps/npm/man/man3/npm.3
@@ -20,7 +20,7 @@ npm\.load([configObject, ]function (er, npm) {
.RE
.SH VERSION
.P
-2.11.2
+2.11.3
.SH DESCRIPTION
.P
This is the API documentation for npm\.
diff --git a/deps/npm/node_modules/ini/.npmignore b/deps/npm/node_modules/ini/.npmignore
deleted file mode 100644
index 3c3629e647f5dd..00000000000000
--- a/deps/npm/node_modules/ini/.npmignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/deps/npm/node_modules/ini/package.json b/deps/npm/node_modules/ini/package.json
index 5a1e10b81c9aa2..e9b9d5396c0e09 100644
--- a/deps/npm/node_modules/ini/package.json
+++ b/deps/npm/node_modules/ini/package.json
@@ -6,7 +6,7 @@
},
"name": "ini",
"description": "An ini encoder/decoder for node",
- "version": "1.3.3",
+ "version": "1.3.4",
"repository": {
"type": "git",
"url": "git://github.com/isaacs/ini.git"
@@ -20,22 +20,29 @@
},
"dependencies": {},
"devDependencies": {
- "tap": "~0.4.0"
+ "tap": "^1.2.0"
},
"license": "ISC",
- "gitHead": "566268f1fb8dd3c0f7d968091de7b7fb2b97b483",
+ "files": [
+ "ini.js"
+ ],
+ "gitHead": "4a3001abc4c608e51add9f1d2b2cadf02b8e6dea",
"bugs": {
"url": "https://github.com/isaacs/ini/issues"
},
- "homepage": "https://github.com/isaacs/ini",
- "_id": "ini@1.3.3",
- "_shasum": "c07e34aef1de06aff21d413b458e52b21533a11e",
- "_from": "ini@>=1.3.1 <1.4.0",
- "_npmVersion": "2.5.1",
- "_nodeVersion": "1.1.0",
+ "homepage": "https://github.com/isaacs/ini#readme",
+ "_id": "ini@1.3.4",
+ "_shasum": "0537cb79daf59b59a1a517dff706c86ec039162e",
+ "_from": "ini@latest",
+ "_npmVersion": "2.10.1",
+ "_nodeVersion": "2.0.1",
"_npmUser": {
"name": "isaacs",
- "email": "i@izs.me"
+ "email": "isaacs@npmjs.com"
+ },
+ "dist": {
+ "shasum": "0537cb79daf59b59a1a517dff706c86ec039162e",
+ "tarball": "http://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
},
"maintainers": [
{
@@ -43,10 +50,7 @@
"email": "i@izs.me"
}
],
- "dist": {
- "shasum": "c07e34aef1de06aff21d413b458e52b21533a11e",
- "tarball": "http://registry.npmjs.org/ini/-/ini-1.3.3.tgz"
- },
"directories": {},
- "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.3.tgz"
+ "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+ "readme": "ERROR: No README data found!"
}
diff --git a/deps/npm/node_modules/ini/test/bar.js b/deps/npm/node_modules/ini/test/bar.js
deleted file mode 100644
index cb16176efa1d65..00000000000000
--- a/deps/npm/node_modules/ini/test/bar.js
+++ /dev/null
@@ -1,23 +0,0 @@
-//test that parse(stringify(obj) deepEqu
-
-var ini = require('../')
-var test = require('tap').test
-
-var data = {
- 'number': {count: 10},
- 'string': {drink: 'white russian'},
- 'boolean': {isTrue: true},
- 'nested boolean': {theDude: {abides: true, rugCount: 1}}
-}
-
-
-test('parse(stringify(x)) deepEqual x', function (t) {
-
- for (var k in data) {
- var s = ini.stringify(data[k])
- console.log(s, data[k])
- t.deepEqual(ini.parse(s), data[k])
- }
-
- t.end()
-})
diff --git a/deps/npm/node_modules/ini/test/fixtures/foo.ini b/deps/npm/node_modules/ini/test/fixtures/foo.ini
deleted file mode 100644
index fc2080f161167f..00000000000000
--- a/deps/npm/node_modules/ini/test/fixtures/foo.ini
+++ /dev/null
@@ -1,65 +0,0 @@
-o = p
-
- a with spaces = b c
-
-; wrap in quotes to JSON-decode and preserve spaces
-" xa n p " = "\"\r\nyoyoyo\r\r\n"
-
-; wrap in quotes to get a key with a bracket, not a section.
-"[disturbing]" = hey you never know
-
-; Test single quotes
-s = 'something'
-
-; Test mixing quotes
-
-s1 = "something'
-
-; Test double quotes
-s2 = "something else"
-
-; Test arrays
-zr[] = deedee
-ar[] = one
-ar[] = three
-; This should be included in the array
-ar = this is included
-
-; Test resetting of a value (and not turn it into an array)
-br = cold
-br = warm
-
-eq = "eq=eq"
-
-; a section
-[a]
-av = a val
-e = { o: p, a: { av: a val, b: { c: { e: "this [value]" } } } }
-j = "{ o: "p", a: { av: "a val", b: { c: { e: "this [value]" } } } }"
-"[]" = a square?
-
-; Nested array
-cr[] = four
-cr[] = eight
-
-; nested child without middle parent
-; should create otherwise-empty a.b
-[a.b.c]
-e = 1
-j = 2
-
-; dots in the section name should be literally interpreted
-[x\.y\.z]
-x.y.z = xyz
-
-[x\.y\.z.a\.b\.c]
-a.b.c = abc
-
-; this next one is not a comment! it's escaped!
-nocomment = this\; this is not a comment
-
-# Support the use of the number sign (#) as an alternative to the semicolon for indicating comments.
-# http://en.wikipedia.org/wiki/INI_file#Comments
-
-# this next one is not a comment! it's escaped!
-noHashComment = this\# this is not a comment
diff --git a/deps/npm/node_modules/ini/test/foo.js b/deps/npm/node_modules/ini/test/foo.js
deleted file mode 100644
index 58102d1e7254c2..00000000000000
--- a/deps/npm/node_modules/ini/test/foo.js
+++ /dev/null
@@ -1,107 +0,0 @@
-var i = require("../")
- , tap = require("tap")
- , test = tap.test
- , fs = require("fs")
- , path = require("path")
- , fixture = path.resolve(__dirname, "./fixtures/foo.ini")
- , data = fs.readFileSync(fixture, "utf8")
- , d
- , expectE = 'o=p\n'
- + 'a with spaces=b c\n'
- + '" xa n p "="\\"\\r\\nyoyoyo\\r\\r\\n"\n'
- + '"[disturbing]"=hey you never know\n'
- + 's=something\n'
- + 's1=\"something\'\n'
- + 's2=something else\n'
- + 'zr[]=deedee\n'
- + 'ar[]=one\n'
- + 'ar[]=three\n'
- + 'ar[]=this is included\n'
- + 'br=warm\n'
- + 'eq=\"eq=eq\"\n'
- + '\n'
- + '[a]\n'
- + 'av=a val\n'
- + 'e={ o: p, a: '
- + '{ av: a val, b: { c: { e: "this [value]" '
- + '} } } }\nj="\\"{ o: \\"p\\", a: { av:'
- + ' \\"a val\\", b: { c: { e: \\"this [value]'
- + '\\" } } } }\\""\n"[]"=a square?\n'
- + 'cr[]=four\ncr[]=eight\n\n'
- +'[a.b.c]\ne=1\n'
- + 'j=2\n\n[x\\.y\\.z]\nx.y.z=xyz\n\n'
- + '[x\\.y\\.z.a\\.b\\.c]\na.b.c=abc\n'
- + 'nocomment=this\\; this is not a comment\n'
- + 'noHashComment=this\\# this is not a comment\n'
- , expectD =
- { o: 'p',
- 'a with spaces': 'b c',
- " xa n p ":'"\r\nyoyoyo\r\r\n',
- '[disturbing]': 'hey you never know',
- 's': 'something',
- 's1' : '\"something\'',
- 's2': 'something else',
- 'zr': ['deedee'],
- 'ar': ['one', 'three', 'this is included'],
- 'br': 'warm',
- 'eq': 'eq=eq',
- a:
- { av: 'a val',
- e: '{ o: p, a: { av: a val, b: { c: { e: "this [value]" } } } }',
- j: '"{ o: "p", a: { av: "a val", b: { c: { e: "this [value]" } } } }"',
- "[]": "a square?",
- cr: ['four', 'eight'],
- b: { c: { e: '1', j: '2' } } },
- 'x.y.z': {
- 'x.y.z': 'xyz',
- 'a.b.c': {
- 'a.b.c': 'abc',
- 'nocomment': 'this\; this is not a comment',
- noHashComment: 'this\# this is not a comment'
- }
- }
- }
- , expectF = '[prefix.log]\n'
- + 'type=file\n\n'
- + '[prefix.log.level]\n'
- + 'label=debug\n'
- + 'value=10\n'
- , expectG = '[log]\n'
- + 'type = file\n\n'
- + '[log.level]\n'
- + 'label = debug\n'
- + 'value = 10\n'
-
-test("decode from file", function (t) {
- var d = i.decode(data)
- t.deepEqual(d, expectD)
- t.end()
-})
-
-test("encode from data", function (t) {
- var e = i.encode(expectD)
- t.deepEqual(e, expectE)
-
- var obj = {log: { type:'file', level: {label:'debug', value:10} } }
- e = i.encode(obj)
- t.notEqual(e.slice(0, 1), '\n', 'Never a blank first line')
- t.notEqual(e.slice(-2), '\n\n', 'Never a blank final line')
-
- t.end()
-})
-
-test("encode with option", function (t) {
- var obj = {log: { type:'file', level: {label:'debug', value:10} } }
- e = i.encode(obj, {section: 'prefix'})
-
- t.equal(e, expectF)
- t.end()
-})
-
-test("encode with whitespace", function (t) {
- var obj = {log: { type:'file', level: {label:'debug', value:10} } }
- e = i.encode(obj, {whitespace: true})
-
- t.equal(e, expectG)
- t.end()
-})
diff --git a/deps/npm/node_modules/node-gyp/addon.gypi b/deps/npm/node_modules/node-gyp/addon.gypi
index 09ee70d9c22a64..7f6264ac611c65 100644
--- a/deps/npm/node_modules/node-gyp/addon.gypi
+++ b/deps/npm/node_modules/node-gyp/addon.gypi
@@ -1,7 +1,7 @@
{
'target_defaults': {
'type': 'loadable_module',
- 'win_delay_load_hook': 'true',
+ 'win_delay_load_hook': 'false',
'product_prefix': '',
'include_dirs': [
@@ -78,7 +78,7 @@
'-luuid.lib',
'-lodbc32.lib',
'-lDelayImp.lib',
- '-l"<(node_root_dir)/$(ConfigurationName)/iojs.lib"'
+ '-l"<(node_root_dir)/$(ConfigurationName)/node.lib"'
],
'msvs_disabled_warnings': [
# warning C4251: 'node::ObjectWrap::handle_' : class 'v8::Persistent'
diff --git a/deps/npm/node_modules/node-gyp/lib/build.js b/deps/npm/node_modules/node-gyp/lib/build.js
index b35ca01624b979..eeeb60266e04fb 100644
--- a/deps/npm/node_modules/node-gyp/lib/build.js
+++ b/deps/npm/node_modules/node-gyp/lib/build.js
@@ -173,7 +173,7 @@ function build (gyp, argv, callback) {
}
/**
- * Copies the iojs.lib file for the current target architecture into the
+ * Copies the node.lib file for the current target architecture into the
* current proper dev dir location.
*/
@@ -181,15 +181,15 @@ function build (gyp, argv, callback) {
if (!win || !copyDevLib) return doBuild()
var buildDir = path.resolve(nodeDir, buildType)
- , archNodeLibPath = path.resolve(nodeDir, arch, 'iojs.lib')
- , buildNodeLibPath = path.resolve(buildDir, 'iojs.lib')
+ , archNodeLibPath = path.resolve(nodeDir, arch, 'node.lib')
+ , buildNodeLibPath = path.resolve(buildDir, 'node.lib')
mkdirp(buildDir, function (err, isNew) {
if (err) return callback(err)
log.verbose('"' + buildType + '" dir needed to be created?', isNew)
var rs = fs.createReadStream(archNodeLibPath)
, ws = fs.createWriteStream(buildNodeLibPath)
- log.verbose('copying "iojs.lib" for ' + arch, buildNodeLibPath)
+ log.verbose('copying "node.lib" for ' + arch, buildNodeLibPath)
rs.pipe(ws)
rs.on('error', callback)
ws.on('error', callback)
diff --git a/deps/npm/node_modules/node-gyp/lib/install.js b/deps/npm/node_modules/node-gyp/lib/install.js
index 0407feba0e8bdb..89e4956a8caed7 100644
--- a/deps/npm/node_modules/node-gyp/lib/install.js
+++ b/deps/npm/node_modules/node-gyp/lib/install.js
@@ -39,7 +39,7 @@ function install (gyp, argv, callback) {
}
}
- var distUrl = gyp.opts['dist-url'] || gyp.opts.disturl || 'https://iojs.org/dist'
+ var distUrl = gyp.opts['dist-url'] || gyp.opts.disturl || 'http://nodejs.org/dist'
// Determine which node dev files version we are installing
@@ -185,7 +185,7 @@ function install (gyp, argv, callback) {
// now download the node tarball
var tarPath = gyp.opts['tarball']
- var tarballUrl = tarPath ? tarPath : distUrl + '/v' + version + '/iojs-v' + version + '.tar.gz'
+ var tarballUrl = tarPath ? tarPath : distUrl + '/v' + version + '/node-v' + version + '.tar.gz'
, badDownload = false
, extractCount = 0
, gunzip = zlib.createGunzip()
@@ -272,7 +272,7 @@ function install (gyp, argv, callback) {
var async = 0
if (win) {
- // need to download iojs.lib
+ // need to download node.lib
async++
downloadNodeLib(deref)
}
@@ -351,36 +351,36 @@ function install (gyp, argv, callback) {
}
function downloadNodeLib (done) {
- log.verbose('on Windows; need to download `iojs.lib`...')
+ log.verbose('on Windows; need to download `node.lib`...')
var dir32 = path.resolve(devDir, 'ia32')
, dir64 = path.resolve(devDir, 'x64')
- , nodeLibPath32 = path.resolve(dir32, 'iojs.lib')
- , nodeLibPath64 = path.resolve(dir64, 'iojs.lib')
- , nodeLibUrl32 = distUrl + '/v' + version + '/win-x86/iojs.lib'
- , nodeLibUrl64 = distUrl + '/v' + version + '/win-x64/iojs.lib'
+ , nodeLibPath32 = path.resolve(dir32, 'node.lib')
+ , nodeLibPath64 = path.resolve(dir64, 'node.lib')
+ , nodeLibUrl32 = distUrl + '/v' + version + '/node.lib'
+ , nodeLibUrl64 = distUrl + '/v' + version + '/x64/node.lib'
- log.verbose('32-bit iojs.lib dir', dir32)
- log.verbose('64-bit iojs.lib dir', dir64)
- log.verbose('`iojs.lib` 32-bit url', nodeLibUrl32)
- log.verbose('`iojs.lib` 64-bit url', nodeLibUrl64)
+ log.verbose('32-bit node.lib dir', dir32)
+ log.verbose('64-bit node.lib dir', dir64)
+ log.verbose('`node.lib` 32-bit url', nodeLibUrl32)
+ log.verbose('`node.lib` 64-bit url', nodeLibUrl64)
var async = 2
mkdir(dir32, function (err) {
if (err) return done(err)
- log.verbose('streaming 32-bit iojs.lib to:', nodeLibPath32)
+ log.verbose('streaming 32-bit node.lib to:', nodeLibPath32)
var req = download(nodeLibUrl32)
if (!req) return
req.on('error', done)
req.on('response', function (res) {
if (res.statusCode !== 200) {
- done(new Error(res.statusCode + ' status code downloading 32-bit iojs.lib'))
+ done(new Error(res.statusCode + ' status code downloading 32-bit node.lib'))
return
}
getContentSha(res, function (_, checksum) {
- contentShasums['win-x86/iojs.lib'] = checksum
- log.verbose('content checksum', 'win-x86/iojs.lib', checksum)
+ contentShasums['node.lib'] = checksum
+ log.verbose('content checksum', 'node.lib', checksum)
})
var ws = fs.createWriteStream(nodeLibPath32)
@@ -393,20 +393,20 @@ function install (gyp, argv, callback) {
})
mkdir(dir64, function (err) {
if (err) return done(err)
- log.verbose('streaming 64-bit iojs.lib to:', nodeLibPath64)
+ log.verbose('streaming 64-bit node.lib to:', nodeLibPath64)
var req = download(nodeLibUrl64)
if (!req) return
req.on('error', done)
req.on('response', function (res) {
if (res.statusCode !== 200) {
- done(new Error(res.statusCode + ' status code downloading 64-bit iojs.lib'))
+ done(new Error(res.statusCode + ' status code downloading 64-bit node.lib'))
return
}
getContentSha(res, function (_, checksum) {
- contentShasums['win-x64/iojs.lib'] = checksum
- log.verbose('content checksum', 'win-x64/iojs.lib', checksum)
+ contentShasums['x64/node.lib'] = checksum
+ log.verbose('content checksum', 'x64/node.lib', checksum)
})
var ws = fs.createWriteStream(nodeLibPath64)
diff --git a/deps/npm/node_modules/normalize-git-url/.eslintrc b/deps/npm/node_modules/normalize-git-url/.eslintrc
new file mode 100644
index 00000000000000..b54e30fd2aa2a9
--- /dev/null
+++ b/deps/npm/node_modules/normalize-git-url/.eslintrc
@@ -0,0 +1,19 @@
+{
+ "env" : {
+ "node" : true
+ },
+ "rules" : {
+ "semi": [2, "never"],
+ "strict": 0,
+ "quotes": [1, "double", "avoid-escape"],
+ "no-use-before-define": 0,
+ "curly": 0,
+ "no-underscore-dangle": 0,
+ "no-lonely-if": 1,
+ "no-unused-vars": [2, {"vars" : "all", "args" : "after-used"}],
+ "no-mixed-requires": 0,
+ "space-infix-ops": 0,
+ "key-spacing": 0,
+ "no-multi-spaces": 0
+ }
+}
diff --git a/deps/npm/node_modules/normalize-package-data/lib/fixer.js b/deps/npm/node_modules/normalize-package-data/lib/fixer.js
index d1b39831e4f719..3d9380b6e43d80 100644
--- a/deps/npm/node_modules/normalize-package-data/lib/fixer.js
+++ b/deps/npm/node_modules/normalize-package-data/lib/fixer.js
@@ -50,6 +50,7 @@ var fixer = module.exports = {
if (typeof data.scripts !== "object") {
this.warn("nonObjectScripts")
delete data.scripts
+ return
}
Object.keys(data.scripts).forEach(function (k) {
if (typeof data.scripts[k] !== "string") {
diff --git a/deps/npm/node_modules/normalize-package-data/package.json b/deps/npm/node_modules/normalize-package-data/package.json
index e8ff579766f340..44ca4d58675ffc 100644
--- a/deps/npm/node_modules/normalize-package-data/package.json
+++ b/deps/npm/node_modules/normalize-package-data/package.json
@@ -1,6 +1,6 @@
{
"name": "normalize-package-data",
- "version": "2.2.0",
+ "version": "2.2.1",
"author": {
"name": "Meryn Stol",
"email": "merynstol@gmail.com"
@@ -21,9 +21,9 @@
"spdx": "^0.4.0"
},
"devDependencies": {
- "tap": "~0.2.5",
- "underscore": "~1.4.4",
- "async": "~0.9.0"
+ "async": "~0.9.0",
+ "tap": "^1.1.0",
+ "underscore": "~1.4.4"
},
"contributors": [
{
@@ -41,12 +41,12 @@
],
"readme": "# normalize-package-data [![Build Status](https://travis-ci.org/npm/normalize-package-data.png?branch=master)](https://travis-ci.org/npm/normalize-package-data)\n\nnormalize-package data exports a function that normalizes package metadata. This data is typically found in a package.json file, but in principle could come from any source - for example the npm registry.\n\nnormalize-package-data is used by [read-package-json](https://npmjs.org/package/read-package-json) to normalize the data it reads from a package.json file. In turn, read-package-json is used by [npm](https://npmjs.org/package/npm) and various npm-related tools.\n\n## Installation\n\n```\nnpm install normalize-package-data\n```\n\n## Usage\n\nBasic usage is really simple. You call the function that normalize-package-data exports. Let's call it `normalizeData`.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readFileSync(\"package.json\")\nnormalizeData(packageData)\n// packageData is now normalized\n```\n\n#### Strict mode\n\nYou may activate strict validation by passing true as the second argument.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readFileSync(\"package.json\")\nwarnFn = function(msg) { console.error(msg) }\nnormalizeData(packageData, true)\n// packageData is now normalized\n```\n\nIf strict mode is activated, only Semver 2.0 version strings are accepted. Otherwise, Semver 1.0 strings are accepted as well. Packages must have a name, and the name field must not have contain leading or trailing whitespace.\n\n#### Warnings\n\nOptionally, you may pass a \"warning\" function. It gets called whenever the `normalizeData` function encounters something that doesn't look right. It indicates less than perfect input data.\n\n```javascript\nnormalizeData = require('normalize-package-data')\npackageData = fs.readFileSync(\"package.json\")\nwarnFn = function(msg) { console.error(msg) }\nnormalizeData(packageData, warnFn)\n// packageData is now normalized. Any number of warnings may have been logged.\n```\n\nYou may combine strict validation with warnings by passing `true` as the second argument, and `warnFn` as third.\n\nWhen `private` field is set to `true`, warnings will be suppressed.\n\n### Potential exceptions\n\nIf the supplied data has an invalid name or version vield, `normalizeData` will throw an error. Depending on where you call `normalizeData`, you may want to catch these errors so can pass them to a callback.\n\n## What normalization (currently) entails\n\n* The value of `name` field gets trimmed (unless in strict mode).\n* The value of the `version` field gets cleaned by `semver.clean`. See [documentation for the semver module](https://github.com/isaacs/node-semver).\n* If `name` and/or `version` fields are missing, they are set to empty strings.\n* If `files` field is not an array, it will be removed.\n* If `bin` field is a string, then `bin` field will become an object with `name` set to the value of the `name` field, and `bin` set to the original string value.\n* If `man` field is a string, it will become an array with the original string as its sole member.\n* If `keywords` field is string, it is considered to be a list of keywords separated by one or more white-space characters. It gets converted to an array by splitting on `\\s+`.\n* All people fields (`author`, `maintainers`, `contributors`) get converted into objects with name, email and url properties.\n* If `bundledDependencies` field (a typo) exists and `bundleDependencies` field does not, `bundledDependencies` will get renamed to `bundleDependencies`.\n* If the value of any of the dependencies fields (`dependencies`, `devDependencies`, `optionalDependencies`) is a string, it gets converted into an object with familiar `name=>value` pairs.\n* The values in `optionalDependencies` get added to `dependencies`. The `optionalDependencies` array is left untouched.\n* As of v2: Dependencies that point at known hosted git providers (currently: github, bitbucket, gitlab) will have their URLs canonicalized, but protocols will be preserved.\n* As of v2: Dependencies that use shortcuts for hosted git providers (`org/proj`, `github:org/proj`, `bitbucket:org/proj`, `gitlab:org/proj`, `gist:docid`) will have the shortcut left in place. (In the case of github, the `org/proj` form will be expanded to `github:org/proj`.) THIS MARKS A BREAKING CHANGE FROM V1, where the shorcut was previously expanded to a URL.\n* If `description` field does not exist, but `readme` field does, then (more or less) the first paragraph of text that's found in the readme is taken as value for `description`.\n* If `repository` field is a string, it will become an object with `url` set to the original string value, and `type` set to `\"git\"`.\n* If `repository.url` is not a valid url, but in the style of \"[owner-name]/[repo-name]\", `repository.url` will be set to https://github.com/[owner-name]/[repo-name]\n* If `bugs` field is a string, the value of `bugs` field is changed into an object with `url` set to the original string value.\n* If `bugs` field does not exist, but `repository` field points to a repository hosted on GitHub, the value of the `bugs` field gets set to an url in the form of https://github.com/[owner-name]/[repo-name]/issues . If the repository field points to a GitHub Gist repo url, the associated http url is chosen.\n* If `bugs` field is an object, the resulting value only has email and url properties. If email and url properties are not strings, they are ignored. If no valid values for either email or url is found, bugs field will be removed.\n* If `homepage` field is not a string, it will be removed.\n* If the url in the `homepage` field does not specify a protocol, then http is assumed. For example, `myproject.org` will be changed to `http://myproject.org`.\n* If `homepage` field does not exist, but `repository` field points to a repository hosted on GitHub, the value of the `homepage` field gets set to an url in the form of https://github.com/[owner-name]/[repo-name]/ . If the repository field points to a GitHub Gist repo url, the associated http url is chosen.\n\n### Rules for name field\n\nIf `name` field is given, the value of the name field must be a string. The string may not:\n\n* start with a period.\n* contain the following characters: `/@\\s+%`\n* contain and characters that would need to be encoded for use in urls.\n* resemble the word `node_modules` or `favicon.ico` (case doesn't matter).\n\n### Rules for version field\n\nIf `version` field is given, the value of the version field must be a valid *semver* string, as determined by the `semver.valid` method. See [documentation for the semver module](https://github.com/isaacs/node-semver).\n\n### Rules for license field\n\nThe `license` field should be a valid *SDPDX license expression* string, as determined by the `spdx.valid` method. See [documentation for the spdx module](https://github.com/kemitchell/spdx.js).\n\n## Credits\n\nThis package contains code based on read-package-json written by Isaac Z. Schlueter. Used with permisson.\n\n## License\n\nnormalize-package-data is released under the [BSD 2-Clause License](http://opensource.org/licenses/MIT). \nCopyright (c) 2013 Meryn Stol \n",
"readmeFilename": "README.md",
- "gitHead": "5b7630cb2a9c475bc93cc8a05854587f2dc9a26c",
+ "gitHead": "e319259b7ebac34c470ae0dc55610befa711dbb6",
"bugs": {
"url": "https://github.com/npm/normalize-package-data/issues"
},
- "homepage": "https://github.com/npm/normalize-package-data",
- "_id": "normalize-package-data@2.2.0",
- "_shasum": "b4f65b40df659b04820f30a2688db5dabc9dfad9",
- "_from": "normalize-package-data@2.2.0"
+ "homepage": "https://github.com/npm/normalize-package-data#readme",
+ "_id": "normalize-package-data@2.2.1",
+ "_shasum": "0e00ebd73ac065eb19092fd313531dd291a0e045",
+ "_from": "normalize-package-data@latest"
}
diff --git a/deps/npm/node_modules/normalize-package-data/test/fixtures/badscripts.json b/deps/npm/node_modules/normalize-package-data/test/fixtures/badscripts.json
new file mode 100644
index 00000000000000..25feb4c8f4e694
--- /dev/null
+++ b/deps/npm/node_modules/normalize-package-data/test/fixtures/badscripts.json
@@ -0,0 +1,5 @@
+{
+ "name": "bad-scripts-package",
+ "version": "0.0.1",
+ "scripts": "foo"
+}
diff --git a/deps/npm/node_modules/normalize-package-data/test/scripts.js b/deps/npm/node_modules/normalize-package-data/test/scripts.js
new file mode 100644
index 00000000000000..473596eef2c65f
--- /dev/null
+++ b/deps/npm/node_modules/normalize-package-data/test/scripts.js
@@ -0,0 +1,24 @@
+var tap = require("tap")
+var normalize = require("../lib/normalize")
+var path = require("path")
+var fs = require("fs")
+
+tap.test("bad scripts", function (t) {
+ var p = path.resolve(__dirname, "./fixtures/badscripts.json")
+ fs.readFile (p, function (err, contents) {
+ if (err) throw err
+ var originalData = JSON.parse(contents.toString())
+ var data = JSON.parse(contents.toString())
+ normalize(data)
+ t.ok(data)
+ verifyFields(t, data, originalData)
+ t.end()
+ })
+})
+
+function verifyFields (t, normalized, original) {
+ t.equal(normalized.version, original.version, "Version field stays same")
+ t.equal(normalized.name, original.name, "Name stays the same.")
+ // scripts is not an object, so it should be deleted
+ t.notOk(normalized.scripts)
+}
diff --git a/deps/npm/node_modules/osenv/.travis.yml b/deps/npm/node_modules/osenv/.travis.yml
new file mode 100644
index 00000000000000..99f2bbf5068a8c
--- /dev/null
+++ b/deps/npm/node_modules/osenv/.travis.yml
@@ -0,0 +1,9 @@
+language: node_js
+language: node_js
+node_js:
+ - '0.8'
+ - '0.10'
+ - '0.12'
+ - 'iojs'
+before_install:
+ - npm install -g npm@latest
diff --git a/deps/npm/node_modules/osenv/node_modules/os-tmpdir/index.js b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/index.js
new file mode 100644
index 00000000000000..52d90bf2698008
--- /dev/null
+++ b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/index.js
@@ -0,0 +1,25 @@
+'use strict';
+var isWindows = process.platform === 'win32';
+var trailingSlashRe = isWindows ? /[^:]\\$/ : /.\/$/;
+
+// https://github.com/nodejs/io.js/blob/3e7a14381497a3b73dda68d05b5130563cdab420/lib/os.js#L25-L43
+module.exports = function () {
+ var path;
+
+ if (isWindows) {
+ path = process.env.TEMP ||
+ process.env.TMP ||
+ (process.env.SystemRoot || process.env.windir) + '\\temp';
+ } else {
+ path = process.env.TMPDIR ||
+ process.env.TMP ||
+ process.env.TEMP ||
+ '/tmp';
+ }
+
+ if (trailingSlashRe.test(path)) {
+ path = path.slice(0, -1);
+ }
+
+ return path;
+};
diff --git a/deps/npm/node_modules/osenv/node_modules/os-tmpdir/license b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/license
new file mode 100644
index 00000000000000..654d0bfe943437
--- /dev/null
+++ b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/license
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/deps/npm/node_modules/osenv/node_modules/os-tmpdir/package.json b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/package.json
new file mode 100644
index 00000000000000..1857f8f5fa2cd9
--- /dev/null
+++ b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/package.json
@@ -0,0 +1,70 @@
+{
+ "name": "os-tmpdir",
+ "version": "1.0.1",
+ "description": "Node.js os.tmpdir() ponyfill",
+ "license": "MIT",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/sindresorhus/os-tmpdir.git"
+ },
+ "author": {
+ "name": "Sindre Sorhus",
+ "email": "sindresorhus@gmail.com",
+ "url": "sindresorhus.com"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ },
+ "scripts": {
+ "test": "node test.js"
+ },
+ "files": [
+ "index.js"
+ ],
+ "keywords": [
+ "built-in",
+ "core",
+ "ponyfill",
+ "polyfill",
+ "shim",
+ "os",
+ "tmpdir",
+ "tempdir",
+ "tmp",
+ "temp",
+ "dir",
+ "directory",
+ "env",
+ "environment"
+ ],
+ "devDependencies": {
+ "ava": "0.0.4"
+ },
+ "gitHead": "5c5d355f81378980db629d60128ad03e02b1c1e5",
+ "bugs": {
+ "url": "https://github.com/sindresorhus/os-tmpdir/issues"
+ },
+ "homepage": "https://github.com/sindresorhus/os-tmpdir",
+ "_id": "os-tmpdir@1.0.1",
+ "_shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e",
+ "_from": "os-tmpdir@>=1.0.0 <2.0.0",
+ "_npmVersion": "2.9.1",
+ "_nodeVersion": "0.12.3",
+ "_npmUser": {
+ "name": "sindresorhus",
+ "email": "sindresorhus@gmail.com"
+ },
+ "dist": {
+ "shasum": "e9b423a1edaf479882562e92ed71d7743a071b6e",
+ "tarball": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"
+ },
+ "maintainers": [
+ {
+ "name": "sindresorhus",
+ "email": "sindresorhus@gmail.com"
+ }
+ ],
+ "directories": {},
+ "_resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz",
+ "readme": "ERROR: No README data found!"
+}
diff --git a/deps/npm/node_modules/osenv/node_modules/os-tmpdir/readme.md b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/readme.md
new file mode 100644
index 00000000000000..54d4c6ec8e5056
--- /dev/null
+++ b/deps/npm/node_modules/osenv/node_modules/os-tmpdir/readme.md
@@ -0,0 +1,36 @@
+# os-tmpdir [![Build Status](https://travis-ci.org/sindresorhus/os-tmpdir.svg?branch=master)](https://travis-ci.org/sindresorhus/os-tmpdir)
+
+> Node.js [`os.tmpdir()`](https://nodejs.org/api/os.html#os_os_tmpdir) ponyfill
+
+> Ponyfill: A polyfill that doesn't overwrite the native method
+
+Use this instead of `require('os').tmpdir()` to get a consistent behaviour on different Node.js versions (even 0.8).
+
+*This is actually taken from io.js 2.0.2 as it contains some fixes that haven't bubbled up to Node.js yet.*
+
+
+## Install
+
+```
+$ npm install --save os-tmpdir
+```
+
+
+## Usage
+
+```js
+var osTmpdir = require('os-tmpdir');
+
+osTmpdir();
+//=> /var/folders/m3/5574nnhn0yj488ccryqr7tc80000gn/T
+```
+
+
+## API
+
+See the [`os.tmpdir()` docs](https://nodejs.org/api/os.html#os_os_tmpdir).
+
+
+## License
+
+MIT © [Sindre Sorhus](http://sindresorhus.com)
diff --git a/deps/npm/node_modules/osenv/osenv.js b/deps/npm/node_modules/osenv/osenv.js
index 7836fafcc1a661..0cabcba66ec3f5 100644
--- a/deps/npm/node_modules/osenv/osenv.js
+++ b/deps/npm/node_modules/osenv/osenv.js
@@ -1,7 +1,7 @@
var isWindows = process.platform === 'win32'
var path = require('path')
var exec = require('child_process').exec
-var os = require('os')
+var osTmpdir = require('os-tmpdir')
// looking up envs is a bit costly.
// Also, sometimes we want to have a fallback
@@ -46,7 +46,7 @@ memo('hostname', function () {
}, 'hostname')
memo('tmpdir', function () {
- return os.tmpDir()
+ return osTmpdir()
})
memo('home', function () {
diff --git a/deps/npm/node_modules/osenv/package.json b/deps/npm/node_modules/osenv/package.json
index 7f83dc0c0cbf47..851f19b51ef44b 100644
--- a/deps/npm/node_modules/osenv/package.json
+++ b/deps/npm/node_modules/osenv/package.json
@@ -1,13 +1,15 @@
{
"name": "osenv",
- "version": "0.1.1",
+ "version": "0.1.2",
"main": "osenv.js",
"directories": {
"test": "test"
},
- "dependencies": {},
+ "dependencies": {
+ "os-tmpdir": "^1.0.0"
+ },
"devDependencies": {
- "tap": "~0.4.9"
+ "tap": "^1.2.0"
},
"scripts": {
"test": "tap test/*.js"
@@ -32,41 +34,14 @@
},
"license": "ISC",
"description": "Look up environment settings specific to different operating systems",
- "gitHead": "769ada6737026254372e3013b702c450a9b781e9",
+ "readme": "# osenv\n\nLook up environment settings specific to different operating systems.\n\n## Usage\n\n```javascript\nvar osenv = require('osenv')\nvar path = osenv.path()\nvar user = osenv.user()\n// etc.\n\n// Some things are not reliably in the env, and have a fallback command:\nvar h = osenv.hostname(function (er, hostname) {\n h = hostname\n})\n// This will still cause it to be memoized, so calling osenv.hostname()\n// is now an immediate operation.\n\n// You can always send a cb, which will get called in the nextTick\n// if it's been memoized, or wait for the fallback data if it wasn't\n// found in the environment.\nosenv.hostname(function (er, hostname) {\n if (er) console.error('error looking up hostname')\n else console.log('this machine calls itself %s', hostname)\n})\n```\n\n## osenv.hostname()\n\nThe machine name. Calls `hostname` if not found.\n\n## osenv.user()\n\nThe currently logged-in user. Calls `whoami` if not found.\n\n## osenv.prompt()\n\nEither PS1 on unix, or PROMPT on Windows.\n\n## osenv.tmpdir()\n\nThe place where temporary files should be created.\n\n## osenv.home()\n\nNo place like it.\n\n## osenv.path()\n\nAn array of the places that the operating system will search for\nexecutables.\n\n## osenv.editor() \n\nReturn the executable name of the editor program. This uses the EDITOR\nand VISUAL environment variables, and falls back to `vi` on Unix, or\n`notepad.exe` on Windows.\n\n## osenv.shell()\n\nThe SHELL on Unix, which Windows calls the ComSpec. Defaults to 'bash'\nor 'cmd'.\n",
+ "readmeFilename": "README.md",
+ "gitHead": "88a154d6d8ad39fefb9af2fe1b306cd12fb6d6d0",
"bugs": {
"url": "https://github.com/npm/osenv/issues"
},
"homepage": "https://github.com/npm/osenv#readme",
- "_id": "osenv@0.1.1",
- "_shasum": "ddc7c4bb86c64a3022e95f030ee028e9a5996c07",
- "_from": "osenv@0.1.1",
- "_npmVersion": "2.10.0",
- "_nodeVersion": "2.0.1",
- "_npmUser": {
- "name": "isaacs",
- "email": "isaacs@npmjs.com"
- },
- "dist": {
- "shasum": "ddc7c4bb86c64a3022e95f030ee028e9a5996c07",
- "tarball": "http://registry.npmjs.org/osenv/-/osenv-0.1.1.tgz"
- },
- "maintainers": [
- {
- "name": "isaacs",
- "email": "i@izs.me"
- },
- {
- "name": "robertkowalski",
- "email": "rok@kowalski.gd"
- },
- {
- "name": "othiym23",
- "email": "ogd@aoaioxxysz.net"
- },
- {
- "name": "iarna",
- "email": "me@re-becca.org"
- }
- ],
- "_resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.1.tgz"
+ "_id": "osenv@0.1.2",
+ "_shasum": "f4d23ebeceaef078600fb78c0ea58fac5996a02d",
+ "_from": "osenv@latest"
}
diff --git a/deps/npm/node_modules/osenv/test/windows.js b/deps/npm/node_modules/osenv/test/windows.js
index 63ca453212ad35..c9d837a32d4c68 100644
--- a/deps/npm/node_modules/osenv/test/windows.js
+++ b/deps/npm/node_modules/osenv/test/windows.js
@@ -3,9 +3,8 @@
// how the underlying system looks up module paths and runs
// child processes, and all that stuff is cached.
if (process.platform !== 'win32') {
- console.log('TAP Version 13\n' +
- '1..0\n' +
- '# Skip windows tests, this is not windows\n')
+ console.log('TAP version 13\n' +
+ '1..0 # Skip windows tests, this is not windows\n')
return
}
diff --git a/deps/npm/node_modules/request/.eslintrc b/deps/npm/node_modules/request/.eslintrc
new file mode 100644
index 00000000000000..e79f481f0cedcc
--- /dev/null
+++ b/deps/npm/node_modules/request/.eslintrc
@@ -0,0 +1,45 @@
+{
+ "env": {
+ "node": true
+ },
+ "rules": {
+ // 2-space indentation
+ "indent": [2, 2],
+ // Disallow semi-colons, unless needed to disambiguate statement
+ "semi": [2, "never"],
+ // Require strings to use single quotes
+ "quotes": [2, "single"],
+ // Require curly braces for all control statements
+ "curly": 2,
+ // Disallow using variables and functions before they've been defined
+ "no-use-before-define": 2,
+ // Allow any case for variable naming
+ "camelcase": 0,
+ // Disallow unused variables, except as function arguments
+ "no-unused-vars": [2, {"args":"none"}],
+ // Allow leading underscores for method names
+ // REASON: we use underscores to denote private methods
+ "no-underscore-dangle": 0,
+ // Allow multi spaces around operators since they are
+ // used for alignment. This is not consistent in the
+ // code.
+ "no-multi-spaces": 0,
+ // Style rule is: most objects use { beforeColon: false, afterColon: true }, unless aligning which uses:
+ //
+ // {
+ // beforeColon : true,
+ // afterColon : true
+ // }
+ //
+ // eslint can't handle this, so the check is disabled.
+ "key-spacing": 0,
+ // Allow shadowing vars in outer scope (needs discussion)
+ "no-shadow": 0,
+ // Use if () { }
+ // ^ space
+ "space-after-keywords": [2, "always"],
+ // Use if () { }
+ // ^ space
+ "space-before-blocks": [2, "always"]
+ }
+}
diff --git a/deps/npm/node_modules/request/node_modules/bl/.jshintrc b/deps/npm/node_modules/request/node_modules/bl/.jshintrc
new file mode 100644
index 00000000000000..c8ef3ca4097f82
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/bl/.jshintrc
@@ -0,0 +1,59 @@
+{
+ "predef": [ ]
+ , "bitwise": false
+ , "camelcase": false
+ , "curly": false
+ , "eqeqeq": false
+ , "forin": false
+ , "immed": false
+ , "latedef": false
+ , "noarg": true
+ , "noempty": true
+ , "nonew": true
+ , "plusplus": false
+ , "quotmark": true
+ , "regexp": false
+ , "undef": true
+ , "unused": true
+ , "strict": false
+ , "trailing": true
+ , "maxlen": 120
+ , "asi": true
+ , "boss": true
+ , "debug": true
+ , "eqnull": true
+ , "esnext": true
+ , "evil": true
+ , "expr": true
+ , "funcscope": false
+ , "globalstrict": false
+ , "iterator": false
+ , "lastsemic": true
+ , "laxbreak": true
+ , "laxcomma": true
+ , "loopfunc": true
+ , "multistr": false
+ , "onecase": false
+ , "proto": false
+ , "regexdash": false
+ , "scripturl": true
+ , "smarttabs": false
+ , "shadow": false
+ , "sub": true
+ , "supernew": false
+ , "validthis": true
+ , "browser": true
+ , "couch": false
+ , "devel": false
+ , "dojo": false
+ , "mootools": false
+ , "node": true
+ , "nonstandard": true
+ , "prototypejs": false
+ , "rhino": false
+ , "worker": true
+ , "wsh": false
+ , "nomen": false
+ , "onevar": false
+ , "passfail": false
+}
\ No newline at end of file
diff --git a/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/.jshintrc b/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/.jshintrc
new file mode 100644
index 00000000000000..7427dce48a3c89
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/form-data/node_modules/async/.jshintrc
@@ -0,0 +1,25 @@
+{
+ // Enforcing options
+ "eqeqeq": false,
+ "forin": true,
+ "indent": 4,
+ "noarg": true,
+ "undef": true,
+ "unused": true,
+ "trailing": true,
+ "evil": true,
+ "laxcomma": true,
+
+ // Relaxing options
+ "onevar": false,
+ "asi": false,
+ "eqnull": true,
+ "expr": false,
+ "loopfunc": true,
+ "sub": true,
+ "browser": true,
+ "node": true,
+ "globals": {
+ "define": true
+ }
+}
diff --git a/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/.jshintrc b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/.jshintrc
new file mode 100644
index 00000000000000..77887b5f0f2efc
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/.jshintrc
@@ -0,0 +1,30 @@
+{
+ "maxdepth": 4,
+ "maxstatements": 200,
+ "maxcomplexity": 12,
+ "maxlen": 80,
+ "maxparams": 5,
+
+ "curly": true,
+ "eqeqeq": true,
+ "immed": true,
+ "latedef": false,
+ "noarg": true,
+ "noempty": true,
+ "nonew": true,
+ "undef": true,
+ "unused": "vars",
+ "trailing": true,
+
+ "quotmark": true,
+ "expr": true,
+ "asi": true,
+
+ "browser": false,
+ "esnext": true,
+ "devel": false,
+ "node": false,
+ "nonstandard": false,
+
+ "predef": ["require", "module", "__dirname", "__filename"]
+}
diff --git a/deps/npm/node_modules/request/node_modules/isstream/.jshintrc b/deps/npm/node_modules/request/node_modules/isstream/.jshintrc
new file mode 100644
index 00000000000000..c8ef3ca4097f82
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/isstream/.jshintrc
@@ -0,0 +1,59 @@
+{
+ "predef": [ ]
+ , "bitwise": false
+ , "camelcase": false
+ , "curly": false
+ , "eqeqeq": false
+ , "forin": false
+ , "immed": false
+ , "latedef": false
+ , "noarg": true
+ , "noempty": true
+ , "nonew": true
+ , "plusplus": false
+ , "quotmark": true
+ , "regexp": false
+ , "undef": true
+ , "unused": true
+ , "strict": false
+ , "trailing": true
+ , "maxlen": 120
+ , "asi": true
+ , "boss": true
+ , "debug": true
+ , "eqnull": true
+ , "esnext": true
+ , "evil": true
+ , "expr": true
+ , "funcscope": false
+ , "globalstrict": false
+ , "iterator": false
+ , "lastsemic": true
+ , "laxbreak": true
+ , "laxcomma": true
+ , "loopfunc": true
+ , "multistr": false
+ , "onecase": false
+ , "proto": false
+ , "regexdash": false
+ , "scripturl": true
+ , "smarttabs": false
+ , "shadow": false
+ , "sub": true
+ , "supernew": false
+ , "validthis": true
+ , "browser": true
+ , "couch": false
+ , "devel": false
+ , "dojo": false
+ , "mootools": false
+ , "node": true
+ , "nonstandard": true
+ , "prototypejs": false
+ , "rhino": false
+ , "worker": true
+ , "wsh": false
+ , "nomen": false
+ , "onevar": false
+ , "passfail": false
+}
\ No newline at end of file
diff --git a/deps/npm/node_modules/request/node_modules/qs/.jshintrc b/deps/npm/node_modules/request/node_modules/qs/.jshintrc
new file mode 100644
index 00000000000000..997b3f7d45e31b
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/qs/.jshintrc
@@ -0,0 +1,10 @@
+{
+ "node": true,
+
+ "curly": true,
+ "latedef": true,
+ "quotmark": true,
+ "undef": true,
+ "unused": true,
+ "trailing": true
+}
diff --git a/deps/npm/node_modules/request/node_modules/tunnel-agent/.jshintrc b/deps/npm/node_modules/request/node_modules/tunnel-agent/.jshintrc
new file mode 100644
index 00000000000000..4c1c8d49723519
--- /dev/null
+++ b/deps/npm/node_modules/request/node_modules/tunnel-agent/.jshintrc
@@ -0,0 +1,5 @@
+{
+ "node": true,
+ "asi": true,
+ "laxcomma": true
+}
diff --git a/deps/npm/node_modules/rimraf/package.json b/deps/npm/node_modules/rimraf/package.json
index aabb562a7a53d4..b0ec171e085d79 100644
--- a/deps/npm/node_modules/rimraf/package.json
+++ b/deps/npm/node_modules/rimraf/package.json
@@ -1,6 +1,6 @@
{
"name": "rimraf",
- "version": "2.3.4",
+ "version": "2.4.0",
"main": "rimraf.js",
"description": "A deep deletion module for node (like `rm -rf`)",
"author": {
@@ -14,7 +14,7 @@
"url": "git://github.com/isaacs/rimraf.git"
},
"scripts": {
- "test": "cd test && bash run.sh"
+ "test": "tap test/*.js"
},
"bin": {
"rimraf": "./bin.js"
@@ -28,23 +28,27 @@
"LICENSE",
"README.md"
],
- "gitHead": "2a6cc45bbbdd8da5fd703d8af62843565f7dea57",
+ "devDependencies": {
+ "mkdirp": "^0.5.1",
+ "tap": "^1.2.0"
+ },
+ "gitHead": "2128f0b9ade05a81394dd21a383fa309dd9eca94",
"bugs": {
"url": "https://github.com/isaacs/rimraf/issues"
},
"homepage": "https://github.com/isaacs/rimraf#readme",
- "_id": "rimraf@2.3.4",
- "_shasum": "82d9bc1b2fcf31e205ac7b28138a025d08e9159a",
- "_from": "rimraf@>=2.3.4 <2.4.0",
- "_npmVersion": "2.10.0",
+ "_id": "rimraf@2.4.0",
+ "_shasum": "40ba0416037d8511ecb50f6b07cf8d18e658a864",
+ "_from": "rimraf@latest",
+ "_npmVersion": "2.10.1",
"_nodeVersion": "2.0.1",
"_npmUser": {
"name": "isaacs",
"email": "isaacs@npmjs.com"
},
"dist": {
- "shasum": "82d9bc1b2fcf31e205ac7b28138a025d08e9159a",
- "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz"
+ "shasum": "40ba0416037d8511ecb50f6b07cf8d18e658a864",
+ "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.4.0.tgz"
},
"maintainers": [
{
@@ -53,6 +57,6 @@
}
],
"directories": {},
- "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
+ "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.0.tgz",
"readme": "ERROR: No README data found!"
}
diff --git a/deps/npm/node_modules/rimraf/rimraf.js b/deps/npm/node_modules/rimraf/rimraf.js
index 7f684e4b593842..447705ac97bb0b 100644
--- a/deps/npm/node_modules/rimraf/rimraf.js
+++ b/deps/npm/node_modules/rimraf/rimraf.js
@@ -35,6 +35,7 @@ function defaults (options) {
options.maxBusyTries = options.maxBusyTries || 3
options.emfileWait = options.emfileWait || 1000
+ options.disableGlob = options.disableGlob || false
}
function rimraf (p, options, cb) {
@@ -55,7 +56,7 @@ function rimraf (p, options, cb) {
var errState = null
var n = 0
- if (!glob.hasMagic(p))
+ if (options.disableGlob || !glob.hasMagic(p))
return afterGlob(null, [p])
fs.lstat(p, function (er, stat) {
@@ -262,7 +263,7 @@ function rimrafSync (p, options) {
var results
- if (!glob.hasMagic(p)) {
+ if (options.disableGlob || !glob.hasMagic(p)) {
results = [p]
} else {
try {
diff --git a/deps/npm/node_modules/spdx/README.md b/deps/npm/node_modules/spdx/README.md
index 4bf07fe1715fba..f373262474e8bb 100644
--- a/deps/npm/node_modules/spdx/README.md
+++ b/deps/npm/node_modules/spdx/README.md
@@ -104,8 +104,10 @@ spdx.gt('GPL-3.0', 'GPL-2.0'); // => true
spdx.lt('MPL-1.0', 'MPL-2.0'); // => true
spdx.gt('LPPL-1.3a', 'LPPL-1.0'); // => true
-spdx.gt('LPPL-1.3a', 'LPPL-1.3a'); // => false
+spdx.gt('LPPL-1.3c', 'LPPL-1.3a'); // => true
spdx.gt('MIT', 'ISC'); // => false
+spdx.gt('OSL-1.0', 'OPL-1.0'); // => false
+spdx.gt('AGPL-3.0', 'AGPL-1.0'); // => true
try {
spdx.gt('(MIT OR ISC)', 'GPL-3.0');
@@ -122,7 +124,9 @@ spdx.satisfies('GPL-3.0', 'GPL-2.0+'); // => true
spdx.satisfies('GPL-1.0', 'GPL-2.0+'); // => false
spdx.satisfies('GPL-2.0', 'GPL-2.0+ WITH Bison-exception-2.2'); // => false
-spdx.satisfies('GPL-3.0 WITH Bison-exception-2.2', 'GPL-2.0+ WITH Bison-exception-2.2'); // => true
+spdx.satisfies(
+ 'GPL-3.0 WITH Bison-exception-2.2', 'GPL-2.0+ WITH Bison-exception-2.2'
+); // => true
spdx.satisfies('(MIT OR GPL-2.0)', '(ISC OR MIT)'); // => true
spdx.satisfies('(MIT AND GPL-2.0)', '(MIT OR GPL-2.0)'); // => true
diff --git a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/README.md b/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/README.md
index c96e56b1e1d7d4..7ea6092d6cb3df 100755
--- a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/README.md
+++ b/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/README.md
@@ -52,4 +52,4 @@ var spdxLicenseIds = require('spdx-license-ids'); //=> ['Glide', 'Abstyles', 'AF
## License
-[The Uicense](./LICENSE).
+[The Unlicense](./LICENSE).
diff --git a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/package.json b/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/package.json
index 7ba26183b67a2f..e6e341b111d03a 100644
--- a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/package.json
+++ b/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/package.json
@@ -1,6 +1,6 @@
{
"name": "spdx-license-ids",
- "version": "1.0.0",
+ "version": "1.0.1",
"description": "A list of SPDX license identifiers",
"repository": {
"type": "git",
@@ -18,12 +18,7 @@
"coverage": "node --harmony_arrow_functions node_modules/.bin/istanbul cover test.js",
"coveralls": "${npm_package_scripts_coverage} && istanbul-coveralls"
},
- "licenses": [
- {
- "type": "Unlicense",
- "url": "https://github.com/shinnn/spdx-license-ids/blob/master/LICENSE"
- }
- ],
+ "license": "Unlicense",
"main": "spdx-license-ids.json",
"files": [
"spdx-license-ids.json"
@@ -44,25 +39,25 @@
"devDependencies": {
"@shinnn/eslintrc": "^1.0.0",
"each-async": "^1.1.1",
- "eslint": "^0.20.0",
- "istanbul": "^0.3.13",
+ "eslint": "^0.21.2",
+ "got": "^3.2.0",
+ "istanbul": "^0.3.14",
"istanbul-coveralls": "^1.0.2",
"require-bower-files": "^2.0.0",
"rm-rf": "^0.1.0",
- "spdx-license-list": "^2.0.0",
- "stringify-object": "^1.0.1",
+ "stringify-object": "^2.0.0",
"tape": "^4.0.0"
},
- "gitHead": "64eecd85af21ddfc325dc024906b281b1ebdc120",
+ "gitHead": "05c7466fcd62c8642006ef354c95064fcade3a03",
"bugs": {
"url": "https://github.com/shinnn/spdx-license-ids/issues"
},
"homepage": "https://github.com/shinnn/spdx-license-ids#readme",
- "_id": "spdx-license-ids@1.0.0",
- "_shasum": "a966050150dec883ffce877431b361b36742a28d",
+ "_id": "spdx-license-ids@1.0.1",
+ "_shasum": "8f7d365fbeb056f82d21d0c0e9c1ebbd676e6af4",
"_from": "spdx-license-ids@>=1.0.0 <2.0.0",
- "_npmVersion": "2.8.4",
- "_nodeVersion": "1.8.1",
+ "_npmVersion": "2.10.1",
+ "_nodeVersion": "2.0.2",
"_npmUser": {
"name": "shinnn",
"email": "snnskwtnb@gmail.com"
@@ -74,10 +69,10 @@
}
],
"dist": {
- "shasum": "a966050150dec883ffce877431b361b36742a28d",
- "tarball": "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.0.tgz"
+ "shasum": "8f7d365fbeb056f82d21d0c0e9c1ebbd676e6af4",
+ "tarball": "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.0.tgz",
+ "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.0.1.tgz",
"readme": "ERROR: No README data found!"
}
diff --git a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/spdx-license-ids.json b/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/spdx-license-ids.json
index c04844d6dfb2c0..3c5bdfcd0fc2dd 100644
--- a/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/spdx-license-ids.json
+++ b/deps/npm/node_modules/spdx/node_modules/spdx-license-ids/spdx-license-ids.json
@@ -56,7 +56,6 @@
"CECILL-C",
"ClArtistic",
"MIT-CMU",
- "CNRI-Jython",
"CNRI-Python",
"CNRI-Python-GPL-Compatible",
"CPOL-1.02",
@@ -147,7 +146,6 @@
"HPND",
"IBM-pibs",
"IPL-1.0",
- "ICU",
"ImageMagick",
"iMatix",
"Imlib2",
@@ -244,7 +242,6 @@
"RPL-1.5",
"RHeCos-1.1",
"RSCPL",
- "RSA-MD",
"Ruby",
"SAX-PD",
"Saxpath",
@@ -270,13 +267,12 @@
"TORQUE-1.1",
"TOSL",
"Unicode-TOU",
- "UPL-1.0",
"NCSA",
"Vim",
"VOSTROM",
"VSL-1.0",
- "W3C-19980720",
"W3C",
+ "W3C-19980720",
"Wsuipa",
"Xnet",
"X11",
@@ -295,5 +291,6 @@
"zlib-acknowledgement",
"ZPL-1.1",
"ZPL-2.0",
- "ZPL-2.1"
+ "ZPL-2.1",
+ "ICU"
]
diff --git a/deps/npm/node_modules/spdx/package.json b/deps/npm/node_modules/spdx/package.json
index 9c31ddb5076dff..d1601c60119e82 100644
--- a/deps/npm/node_modules/spdx/package.json
+++ b/deps/npm/node_modules/spdx/package.json
@@ -1,7 +1,7 @@
{
"name": "spdx",
"description": "SPDX License Expression Syntax parser",
- "version": "0.4.0",
+ "version": "0.4.1",
"author": {
"name": "Kyle E. Mitchell",
"email": "kyle@kemitchell.com",
@@ -47,11 +47,12 @@
"pretest": "npm run build",
"test": "jsmd README.md"
},
- "gitHead": "7186b8f92f0aa3c8f087e73b5f98bd1c776a4d3f",
- "_id": "spdx@0.4.0",
- "_shasum": "5a5cbff1a457b57b15204cafd3d0ea9ad9652ef8",
- "_from": "spdx@0.4.0",
- "_npmVersion": "1.4.28",
+ "gitHead": "e98233f7ebfa27ceec7d9f9bd77d7eb003ca3210",
+ "_id": "spdx@0.4.1",
+ "_shasum": "eb43a2d83483e7073d24184b5ca0d00f33e184ff",
+ "_from": "spdx@>=0.4.0 <0.5.0",
+ "_npmVersion": "2.11.0",
+ "_nodeVersion": "2.2.1",
"_npmUser": {
"name": "kemitchell",
"email": "kyle@kemitchell.com"
@@ -63,10 +64,10 @@
}
],
"dist": {
- "shasum": "5a5cbff1a457b57b15204cafd3d0ea9ad9652ef8",
- "tarball": "http://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz"
+ "shasum": "eb43a2d83483e7073d24184b5ca0d00f33e184ff",
+ "tarball": "http://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.0.tgz",
+ "_resolved": "https://registry.npmjs.org/spdx/-/spdx-0.4.1.tgz",
"readme": "ERROR: No README data found!"
}
diff --git a/deps/npm/node_modules/spdx/source/ranges.json b/deps/npm/node_modules/spdx/source/ranges.json
index a3fc260e65f06a..1f3c52b3e194dd 100644
--- a/deps/npm/node_modules/spdx/source/ranges.json
+++ b/deps/npm/node_modules/spdx/source/ranges.json
@@ -6,6 +6,10 @@
"AFL-2.1",
"AFL-3.0"
],
+ [
+ "AGPL-1.0",
+ "AGPL-3.0"
+ ],
[
"Apache-1.0",
"Apache-1.1",
@@ -111,12 +115,7 @@
"LPPL-1.0",
"LPPL-1.1",
"LPPL-1.2",
- "LPPL-1.3a"
- ],
- [
- "LPPL-1.0",
- "LPPL-1.1",
- "LPPL-1.2",
+ "LPPL-1.3a",
"LPPL-1.3c"
],
[
@@ -156,7 +155,6 @@
"OLDAP-2.8"
],
[
- "OPL-1.0",
"OSL-1.0",
"OSL-1.1",
"OSL-2.0",
diff --git a/deps/npm/node_modules/spdx/source/spdx.js b/deps/npm/node_modules/spdx/source/spdx.js
index ab0a4f6b1d5881..5aece3d5437511 100644
--- a/deps/npm/node_modules/spdx/source/spdx.js
+++ b/deps/npm/node_modules/spdx/source/spdx.js
@@ -158,4 +158,4 @@ exports.exceptions = require('./exceptions.json');
exports.specificationVersion = '2.0';
// This module's semantic version
-exports.implementationVersion = '0.4.0';
+exports.implementationVersion = '0.4.1';
diff --git a/deps/npm/package.json b/deps/npm/package.json
index ac95741b43dc9b..f66c064c03bb70 100644
--- a/deps/npm/package.json
+++ b/deps/npm/package.json
@@ -1,5 +1,5 @@
{
- "version": "2.11.2",
+ "version": "2.11.3",
"name": "npm",
"description": "a package manager for JavaScript",
"keywords": [
@@ -57,7 +57,7 @@
"hosted-git-info": "~2.1.4",
"inflight": "~1.0.4",
"inherits": "~2.0.1",
- "ini": "~1.3.3",
+ "ini": "~1.3.4",
"init-package-json": "~1.6.0",
"lockfile": "~1.0.1",
"lru-cache": "~2.6.4",
@@ -66,7 +66,7 @@
"node-gyp": "~2.0.1",
"nopt": "~3.0.2",
"normalize-git-url": "~1.0.1",
- "normalize-package-data": "~2.2.0",
+ "normalize-package-data": "~2.2.1",
"npm-cache-filename": "~1.0.1",
"npm-install-checks": "~1.0.5",
"npm-package-arg": "~4.0.1",
@@ -75,7 +75,7 @@
"npmlog": "~1.2.1",
"once": "~1.3.2",
"opener": "~1.4.1",
- "osenv": "~0.1.1",
+ "osenv": "~0.1.2",
"path-is-inside": "~1.0.0",
"read": "~1.0.6",
"read-installed": "~4.0.0",
@@ -84,12 +84,12 @@
"realize-package-specifier": "~3.0.1",
"request": "~2.57.0",
"retry": "~0.6.1",
- "rimraf": "~2.3.4",
+ "rimraf": "~2.4.0",
"semver": "~4.3.6",
"sha": "~1.3.0",
"slide": "~1.1.6",
"sorted-object": "~1.0.0",
- "spdx": "~0.4.0",
+ "spdx": "~0.4.1",
"strip-ansi": "~2.0.1",
"tar": "~2.1.1",
"text-table": "~0.2.0",
@@ -175,7 +175,7 @@
"deep-equal": "~1.0.0",
"marked": "~0.3.3",
"marked-man": "~0.1.4",
- "nock": "~2.3.0",
+ "nock": "~2.5.0",
"npm-registry-couchapp": "~2.6.7",
"npm-registry-mock": "~1.0.0",
"require-inject": "~1.2.0",
diff --git a/deps/npm/test/fixtures/config/userconfig-with-gc b/deps/npm/test/fixtures/config/userconfig-with-gc
index df741e0952ca43..7268fcb3c611f9 100644
--- a/deps/npm/test/fixtures/config/userconfig-with-gc
+++ b/deps/npm/test/fixtures/config/userconfig-with-gc
@@ -1,4 +1,4 @@
-globalconfig=/Users/rebecca/code/release/npm/test/fixtures/config/globalconfig
+globalconfig=/Users/ogd/Documents/projects/npm/npm/test/fixtures/config/globalconfig
email=i@izs.me
env-thing=asdf
init.author.name=Isaac Z. Schlueter
diff --git a/deps/npm/test/tap/version-lifecycle.js b/deps/npm/test/tap/version-lifecycle.js
index 4bd39338cae349..da0af10867f945 100644
--- a/deps/npm/test/tap/version-lifecycle.js
+++ b/deps/npm/test/tap/version-lifecycle.js
@@ -22,7 +22,8 @@ test('npm version with failing preversion lifecycle script', function (
preversion: './fail.sh'
}
}), 'utf8')
- fs.writeFileSync(path.resolve(pkg, 'fail.sh'), 'exit 50', {mode: 448})
+ fs.writeFileSync(path.resolve(pkg, 'fail.sh'), 'exit 50', 'utf8')
+ fs.chmodSync(path.resolve(pkg, 'fail.sh'), 448)
npm.load({cache: cache, registry: common.registry}, function () {
var version = require('../../lib/version')
version(['patch'], function (err) {
@@ -44,7 +45,8 @@ test('npm version with failing postversion lifecycle script', function
postversion: './fail.sh'
}
}), 'utf8')
- fs.writeFileSync(path.resolve(pkg, 'fail.sh'), 'exit 50', {mode: 448})
+ fs.writeFileSync(path.resolve(pkg, 'fail.sh'), 'exit 50', 'utf8')
+ fs.chmodSync(path.resolve(pkg, 'fail.sh'), 448)
npm.load({cache: cache, registry: common.registry}, function () {
var version = require('../../lib/version')
version(['patch'], function (err) {
From feb4acc5d9b7f6e49c39b1b982e1576b90835cfb Mon Sep 17 00:00:00 2001
From: cjihrig
Date: Fri, 27 Feb 2015 13:40:58 -0500
Subject: [PATCH 2/3] deps: make node-gyp work with io.js
Every npm version bump requires a few patches to be floated on
node-gyp for io.js compatibility. These patches are found in
03d199276e21c1fa08d8df14eeb654c90cc5aa20,
5de334c23096492014a097ff487f07ad8eaee6d2, and
da730c76e98fb9fd18dac445dafbbec74d79f802. This commit squashes
them into a single commit.
PR-URL: https://github.com/iojs/io.js/pull/990
Reviewed-By: Ben Noordhuis
---
deps/npm/node_modules/node-gyp/addon.gypi | 2 +-
deps/npm/node_modules/node-gyp/lib/build.js | 8 ++--
deps/npm/node_modules/node-gyp/lib/install.js | 40 +++++++++----------
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/deps/npm/node_modules/node-gyp/addon.gypi b/deps/npm/node_modules/node-gyp/addon.gypi
index 7f6264ac611c65..39b1994b67cd12 100644
--- a/deps/npm/node_modules/node-gyp/addon.gypi
+++ b/deps/npm/node_modules/node-gyp/addon.gypi
@@ -78,7 +78,7 @@
'-luuid.lib',
'-lodbc32.lib',
'-lDelayImp.lib',
- '-l"<(node_root_dir)/$(ConfigurationName)/node.lib"'
+ '-l"<(node_root_dir)/$(ConfigurationName)/iojs.lib"'
],
'msvs_disabled_warnings': [
# warning C4251: 'node::ObjectWrap::handle_' : class 'v8::Persistent'
diff --git a/deps/npm/node_modules/node-gyp/lib/build.js b/deps/npm/node_modules/node-gyp/lib/build.js
index eeeb60266e04fb..b35ca01624b979 100644
--- a/deps/npm/node_modules/node-gyp/lib/build.js
+++ b/deps/npm/node_modules/node-gyp/lib/build.js
@@ -173,7 +173,7 @@ function build (gyp, argv, callback) {
}
/**
- * Copies the node.lib file for the current target architecture into the
+ * Copies the iojs.lib file for the current target architecture into the
* current proper dev dir location.
*/
@@ -181,15 +181,15 @@ function build (gyp, argv, callback) {
if (!win || !copyDevLib) return doBuild()
var buildDir = path.resolve(nodeDir, buildType)
- , archNodeLibPath = path.resolve(nodeDir, arch, 'node.lib')
- , buildNodeLibPath = path.resolve(buildDir, 'node.lib')
+ , archNodeLibPath = path.resolve(nodeDir, arch, 'iojs.lib')
+ , buildNodeLibPath = path.resolve(buildDir, 'iojs.lib')
mkdirp(buildDir, function (err, isNew) {
if (err) return callback(err)
log.verbose('"' + buildType + '" dir needed to be created?', isNew)
var rs = fs.createReadStream(archNodeLibPath)
, ws = fs.createWriteStream(buildNodeLibPath)
- log.verbose('copying "node.lib" for ' + arch, buildNodeLibPath)
+ log.verbose('copying "iojs.lib" for ' + arch, buildNodeLibPath)
rs.pipe(ws)
rs.on('error', callback)
ws.on('error', callback)
diff --git a/deps/npm/node_modules/node-gyp/lib/install.js b/deps/npm/node_modules/node-gyp/lib/install.js
index 89e4956a8caed7..0407feba0e8bdb 100644
--- a/deps/npm/node_modules/node-gyp/lib/install.js
+++ b/deps/npm/node_modules/node-gyp/lib/install.js
@@ -39,7 +39,7 @@ function install (gyp, argv, callback) {
}
}
- var distUrl = gyp.opts['dist-url'] || gyp.opts.disturl || 'http://nodejs.org/dist'
+ var distUrl = gyp.opts['dist-url'] || gyp.opts.disturl || 'https://iojs.org/dist'
// Determine which node dev files version we are installing
@@ -185,7 +185,7 @@ function install (gyp, argv, callback) {
// now download the node tarball
var tarPath = gyp.opts['tarball']
- var tarballUrl = tarPath ? tarPath : distUrl + '/v' + version + '/node-v' + version + '.tar.gz'
+ var tarballUrl = tarPath ? tarPath : distUrl + '/v' + version + '/iojs-v' + version + '.tar.gz'
, badDownload = false
, extractCount = 0
, gunzip = zlib.createGunzip()
@@ -272,7 +272,7 @@ function install (gyp, argv, callback) {
var async = 0
if (win) {
- // need to download node.lib
+ // need to download iojs.lib
async++
downloadNodeLib(deref)
}
@@ -351,36 +351,36 @@ function install (gyp, argv, callback) {
}
function downloadNodeLib (done) {
- log.verbose('on Windows; need to download `node.lib`...')
+ log.verbose('on Windows; need to download `iojs.lib`...')
var dir32 = path.resolve(devDir, 'ia32')
, dir64 = path.resolve(devDir, 'x64')
- , nodeLibPath32 = path.resolve(dir32, 'node.lib')
- , nodeLibPath64 = path.resolve(dir64, 'node.lib')
- , nodeLibUrl32 = distUrl + '/v' + version + '/node.lib'
- , nodeLibUrl64 = distUrl + '/v' + version + '/x64/node.lib'
+ , nodeLibPath32 = path.resolve(dir32, 'iojs.lib')
+ , nodeLibPath64 = path.resolve(dir64, 'iojs.lib')
+ , nodeLibUrl32 = distUrl + '/v' + version + '/win-x86/iojs.lib'
+ , nodeLibUrl64 = distUrl + '/v' + version + '/win-x64/iojs.lib'
- log.verbose('32-bit node.lib dir', dir32)
- log.verbose('64-bit node.lib dir', dir64)
- log.verbose('`node.lib` 32-bit url', nodeLibUrl32)
- log.verbose('`node.lib` 64-bit url', nodeLibUrl64)
+ log.verbose('32-bit iojs.lib dir', dir32)
+ log.verbose('64-bit iojs.lib dir', dir64)
+ log.verbose('`iojs.lib` 32-bit url', nodeLibUrl32)
+ log.verbose('`iojs.lib` 64-bit url', nodeLibUrl64)
var async = 2
mkdir(dir32, function (err) {
if (err) return done(err)
- log.verbose('streaming 32-bit node.lib to:', nodeLibPath32)
+ log.verbose('streaming 32-bit iojs.lib to:', nodeLibPath32)
var req = download(nodeLibUrl32)
if (!req) return
req.on('error', done)
req.on('response', function (res) {
if (res.statusCode !== 200) {
- done(new Error(res.statusCode + ' status code downloading 32-bit node.lib'))
+ done(new Error(res.statusCode + ' status code downloading 32-bit iojs.lib'))
return
}
getContentSha(res, function (_, checksum) {
- contentShasums['node.lib'] = checksum
- log.verbose('content checksum', 'node.lib', checksum)
+ contentShasums['win-x86/iojs.lib'] = checksum
+ log.verbose('content checksum', 'win-x86/iojs.lib', checksum)
})
var ws = fs.createWriteStream(nodeLibPath32)
@@ -393,20 +393,20 @@ function install (gyp, argv, callback) {
})
mkdir(dir64, function (err) {
if (err) return done(err)
- log.verbose('streaming 64-bit node.lib to:', nodeLibPath64)
+ log.verbose('streaming 64-bit iojs.lib to:', nodeLibPath64)
var req = download(nodeLibUrl64)
if (!req) return
req.on('error', done)
req.on('response', function (res) {
if (res.statusCode !== 200) {
- done(new Error(res.statusCode + ' status code downloading 64-bit node.lib'))
+ done(new Error(res.statusCode + ' status code downloading 64-bit iojs.lib'))
return
}
getContentSha(res, function (_, checksum) {
- contentShasums['x64/node.lib'] = checksum
- log.verbose('content checksum', 'x64/node.lib', checksum)
+ contentShasums['win-x64/iojs.lib'] = checksum
+ log.verbose('content checksum', 'win-x64/iojs.lib', checksum)
})
var ws = fs.createWriteStream(nodeLibPath64)
From 12e8dd2c12c376e52a659d0c5670bf93847d0ccd Mon Sep 17 00:00:00 2001
From: Bert Belder
Date: Wed, 15 Apr 2015 13:58:50 -0700
Subject: [PATCH 3/3] win,node-gyp: enable delay-load hook by default
The delay-load hook allows node.exe/iojs.exe to be renamed. See efadffe
for more background.
PR-URL: https://github.com/iojs/io.js/pull/1433
Reviewed-By: Ben Noordhuis
---
deps/npm/node_modules/node-gyp/addon.gypi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deps/npm/node_modules/node-gyp/addon.gypi b/deps/npm/node_modules/node-gyp/addon.gypi
index 39b1994b67cd12..09ee70d9c22a64 100644
--- a/deps/npm/node_modules/node-gyp/addon.gypi
+++ b/deps/npm/node_modules/node-gyp/addon.gypi
@@ -1,7 +1,7 @@
{
'target_defaults': {
'type': 'loadable_module',
- 'win_delay_load_hook': 'false',
+ 'win_delay_load_hook': 'true',
'product_prefix': '',
'include_dirs': [