src: install npm@3 with npm@2

Restore the ability to do one-shot upgrades from the versions of npm
bundled with Node 0.8 to npm@3, which simplifies using Travis with old
Node and new npm, for compatibility testing purposes. Older versions of
npm repack packages on install, which works poorly with the way npm@3
handles bundledDependencies with flat trees.

Fixes: #9668

PR-URL: https://github.com/npm/npm/pull/9981

6 files changed, 173 insertions, 59 deletions

diff --git a/node_modules/validate-npm-package-name/node_modules/builtins/.travis.yml b/node_modules/validate-npm-package-name/node_modules/builtins/.travis.yml
new file mode 100644
index 000000000..cc4dba29d
--- /dev/null
+++ b/node_modules/validate-npm-package-name/node_modules/builtins/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - "0.8"
+  - "0.10"
diff --git a/node_modules/validate-npm-package-name/node_modules/builtins/History.md b/node_modules/validate-npm-package-name/node_modules/builtins/History.md
new file mode 100644
index 000000000..0eb45c420
--- /dev/null
+++ b/node_modules/validate-npm-package-name/node_modules/builtins/History.md
@@ -0,0 +1,39 @@
+
+0.0.7 / 2014-09-01 
+==================
+
+ * update .repository
+
+0.0.6 / 2014-09-01 
+==================
+
+ * add travis
+ * add test script
+ * add constants
+
+0.0.5 / 2014-06-27
+==================
+
+ * add module
+ * publish to public npm
+
+0.0.4 / 2014-04-25
+==================
+
+ * add timers
+
+0.0.3 / 2014-02-22 
+==================
+
+ * add buffer
+
+0.0.2 / 2014-02-11 
+==================
+
+ * add assert
+
+0.0.1 / 2014-02-11 
+==================
+
+ * add main
+ * initial commit
diff --git a/node_modules/validate-npm-package-name/node_modules/builtins/Readme.md b/node_modules/validate-npm-package-name/node_modules/builtins/Readme.md
new file mode 100644
index 000000000..96f4b1f6c
--- /dev/null
+++ b/node_modules/validate-npm-package-name/node_modules/builtins/Readme.md
@@ -0,0 +1,18 @@
+
+# builtins
+
+  List of node.js [builtin modules](http://nodejs.org/api/).
+
+  [![build status](https://secure.travis-ci.org/juliangruber/builtins.svg)](http://travis-ci.org/juliangruber/builtins)
+
+## Example
+
+```js
+var builtins = require('builtins');
+
+assert(builtins.indexOf('http') > -1);
+```
+
+## License
+
+  MIT
diff --git a/node_modules/validate-npm-package-name/node_modules/builtins/builtins.json b/node_modules/validate-npm-package-name/node_modules/builtins/builtins.json
new file mode 100644
index 000000000..c52221d77
--- /dev/null
+++ b/node_modules/validate-npm-package-name/node_modules/builtins/builtins.json
@@ -0,0 +1,31 @@
+[
+  "assert",
+  "buffer",
+  "child_process",
+  "cluster",
+  "constants",
+  "crypto",
+  "dns",
+  "domain",
+  "events",
+  "fs",
+  "http",
+  "https",
+  "module",
+  "net",
+  "os",
+  "path",
+  "punycode",
+  "querystring",
+  "repl",
+  "stream",
+  "string_decoder",
+  "timers",
+  "tls",
+  "tty",
+  "dgram",
+  "url",
+  "util",
+  "vm",
+  "zlib"
+]
diff --git a/node_modules/validate-npm-package-name/node_modules/builtins/package.json b/node_modules/validate-npm-package-name/node_modules/builtins/package.json
new file mode 100644
index 000000000..c5ec77f13
--- /dev/null
+++ b/node_modules/validate-npm-package-name/node_modules/builtins/package.json
@@ -0,0 +1,46 @@
+{
+  "name": "builtins",
+  "version": "0.0.7",
+  "description": "List of node.js builtin modules",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/builtins.git"
+  },
+  "license": "MIT",
+  "main": "builtins.json",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
+  "scripts": {
+    "test": "node -e \"require('./builtins.json')\""
+  },
+  "bugs": {
+    "url": "https://github.com/juliangruber/builtins/issues"
+  },
+  "homepage": "https://github.com/juliangruber/builtins",
+  "_id": "builtins@0.0.7",
+  "dist": {
+    "shasum": "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a",
+    "tarball": "http://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
+  },
+  "_from": "builtins@0.0.7",
+  "_npmVersion": "1.3.22",
+  "_npmUser": {
+    "name": "juliangruber",
+    "email": "julian@juliangruber.com"
+  },
+  "maintainers": [
+    {
+      "name": "juliangruber",
+      "email": "julian@juliangruber.com"
+    },
+    {
+      "name": "segment",
+      "email": "tj@segment.io"
+    }
+  ],
+  "directories": {},
+  "_shasum": "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a",
+  "_resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz",
+  "readme": "ERROR: No README data found!"
+}
diff --git a/node_modules/validate-npm-package-name/package.json b/node_modules/validate-npm-package-name/package.json
index 63cfacd94..5b706da2d 100644
--- a/node_modules/validate-npm-package-name/package.json
+++ b/node_modules/validate-npm-package-name/package.json
@@ -1,68 +1,52 @@
 {
-  "_args": [
-    [
-      "validate-npm-package-name@~2.2.0",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "validate-npm-package-name@>=2.2.0 <2.3.0",
-  "_id": "validate-npm-package-name@2.2.2",
-  "_inCache": true,
-  "_location": "/validate-npm-package-name",
-  "_nodeVersion": "0.12.5",
-  "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
-  },
-  "_npmVersion": "3.0.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "validate-npm-package-name",
-    "raw": "validate-npm-package-name@~2.2.0",
-    "rawSpec": "~2.2.0",
-    "scope": null,
-    "spec": ">=2.2.0 <2.3.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/",
-    "/init-package-json"
-  ],
-  "_resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
-  "_shasum": "f65695b22f7324442019a3c7fa39a6e7fd299085",
-  "_shrinkwrap": null,
-  "_spec": "validate-npm-package-name@~2.2.0",
-  "_where": "/Users/rebecca/code/npm",
-  "author": {
-    "name": "zeke"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/validate-npm-package-name/issues"
+  "name": "validate-npm-package-name",
+  "version": "2.2.2",
+  "description": "Give me a string and I'll tell you if it's a valid npm package name",
+  "main": "index.js",
+  "directories": {
+    "test": "test"
   },
   "dependencies": {
     "builtins": "0.0.7"
   },
-  "description": "Give me a string and I'll tell you if it's a valid npm package name",
   "devDependencies": {
     "tap": "^0.4.13"
   },
-  "directories": {
-    "test": "test"
+  "scripts": {
+    "test": "tap test/*.js"
   },
-  "dist": {
-    "shasum": "f65695b22f7324442019a3c7fa39a6e7fd299085",
-    "tarball": "http://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/validate-npm-package-name.git"
   },
-  "gitHead": "3af92c881549f1b96f05ab6bfb5768bba94ad72d",
-  "homepage": "https://github.com/npm/validate-npm-package-name",
   "keywords": [
-    "names",
     "npm",
     "package",
+    "names",
     "validation"
   ],
+  "author": {
+    "name": "zeke"
+  },
   "license": "ISC",
-  "main": "index.js",
+  "bugs": {
+    "url": "https://github.com/npm/validate-npm-package-name/issues"
+  },
+  "homepage": "https://github.com/npm/validate-npm-package-name",
+  "gitHead": "3af92c881549f1b96f05ab6bfb5768bba94ad72d",
+  "_id": "validate-npm-package-name@2.2.2",
+  "_shasum": "f65695b22f7324442019a3c7fa39a6e7fd299085",
+  "_from": "validate-npm-package-name@>=2.2.2 <2.3.0",
+  "_npmVersion": "3.0.0",
+  "_nodeVersion": "0.12.5",
+  "_npmUser": {
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
+  },
+  "dist": {
+    "shasum": "f65695b22f7324442019a3c7fa39a6e7fd299085",
+    "tarball": "http://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz"
+  },
   "maintainers": [
     {
       "name": "zeke",
@@ -77,14 +61,6 @@
       "email": "kat@sykosomatic.org"
     }
   ],
-  "name": "validate-npm-package-name",
-  "optionalDependencies": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/validate-npm-package-name.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "2.2.2"
+  "_resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz",
+  "readme": "ERROR: No README data found!"
 }