diff options
author | Forrest L Norvell <forrest@npmjs.com> | 2015-10-15 08:17:03 +0300 |
---|---|---|
committer | Rebecca Turner <me@re-becca.org> | 2015-10-16 01:25:33 +0300 |
commit | 25a234b4595ee3f1a2c09e2a39e3c238aa642557 (patch) | |
tree | def772e3c15c7bd3d0b05eeeb6069898617cbf23 /node_modules/read-installed | |
parent | 4cd74b0cdc639081fcf292eb9a03dbd93451c7c0 (diff) |
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
Diffstat (limited to 'node_modules/read-installed')
5 files changed, 133 insertions, 60 deletions
diff --git a/node_modules/read-installed/node_modules/util-extend/README.md b/node_modules/read-installed/node_modules/util-extend/README.md new file mode 100644 index 000000000..be03922ab --- /dev/null +++ b/node_modules/read-installed/node_modules/util-extend/README.md @@ -0,0 +1,13 @@ +# util-extend + +The Node object extending function that Node uses for Node! + +## Usage + +```js +var extend = require('util-extend'); +function functionThatTakesOptions(options) { + var options = extend(defaults, options); + // now any unset options are set to the defaults. +} +``` diff --git a/node_modules/read-installed/node_modules/util-extend/extend.js b/node_modules/read-installed/node_modules/util-extend/extend.js new file mode 100644 index 000000000..de9fcf471 --- /dev/null +++ b/node_modules/read-installed/node_modules/util-extend/extend.js @@ -0,0 +1,33 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// 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. + +module.exports = extend; +function extend(origin, add) { + // Don't do anything if add isn't an object + if (!add || typeof add !== 'object') return origin; + + var keys = Object.keys(add); + var i = keys.length; + while (i--) { + origin[keys[i]] = add[keys[i]]; + } + return origin; +} diff --git a/node_modules/read-installed/node_modules/util-extend/package.json b/node_modules/read-installed/node_modules/util-extend/package.json new file mode 100644 index 000000000..259d6c104 --- /dev/null +++ b/node_modules/read-installed/node_modules/util-extend/package.json @@ -0,0 +1,41 @@ +{ + "name": "util-extend", + "version": "1.0.1", + "description": "Node's internal object extension function", + "main": "extend.js", + "scripts": { + "test": "node test.js" + }, + "repository": { + "type": "git", + "url": "git://github.com/isaacs/util-extend.git" + }, + "author": "", + "license": "MIT", + "readmeFilename": "README.md", + "readme": "# util-extend\n\nThe Node object extending function that Node uses for Node!\n\n## Usage\n\n```js\nvar extend = require('util-extend');\nfunction functionThatTakesOptions(options) {\n var options = extend(defaults, options);\n // now any unset options are set to the defaults.\n}\n```\n", + "bugs": { + "url": "https://github.com/isaacs/util-extend/issues" + }, + "_id": "util-extend@1.0.1", + "dist": { + "shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc", + "tarball": "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz" + }, + "_from": "util-extend@>=1.0.1 <2.0.0", + "_npmVersion": "1.3.4", + "_npmUser": { + "name": "isaacs", + "email": "i@izs.me" + }, + "maintainers": [ + { + "name": "isaacs", + "email": "i@izs.me" + } + ], + "directories": {}, + "_shasum": "bb703b79480293ddcdcfb3c6a9fea20f483415bc", + "_resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz", + "homepage": "https://github.com/isaacs/util-extend#readme" +} diff --git a/node_modules/read-installed/node_modules/util-extend/test.js b/node_modules/read-installed/node_modules/util-extend/test.js new file mode 100644 index 000000000..fbee2b1e1 --- /dev/null +++ b/node_modules/read-installed/node_modules/util-extend/test.js @@ -0,0 +1,10 @@ +var assert = require('assert'); +var extend = require('./'); +assert.deepEqual(extend({a:1}), {a:1}); +assert.deepEqual(extend({a:1}, []), {a:1}); +assert.deepEqual(extend({a:1}, null), {a:1}); +assert.deepEqual(extend({a:1}, true), {a:1}); +assert.deepEqual(extend({a:1}, false), {a:1}); +assert.deepEqual(extend({a:1}, {b:2}), {a:1, b:2}); +assert.deepEqual(extend({a:1, b:2}, {b:3}), {a:1, b:3}); +console.log('ok'); diff --git a/node_modules/read-installed/package.json b/node_modules/read-installed/package.json index 546f7f339..76977474c 100644 --- a/node_modules/read-installed/package.json +++ b/node_modules/read-installed/package.json @@ -1,70 +1,56 @@ { - "_args": [ - [ - "read-installed@~4.0.2", - "/Users/rebecca/code/npm" - ] - ], - "_from": "read-installed@>=4.0.2 <4.1.0", - "_id": "read-installed@4.0.3", - "_inCache": true, - "_location": "/read-installed", - "_nodeVersion": "2.2.2", - "_npmUser": { - "email": "kat@sykosomatic.org", - "name": "zkat" - }, - "_npmVersion": "2.14.3", - "_phantomChildren": {}, - "_requested": { - "name": "read-installed", - "raw": "read-installed@~4.0.2", - "rawSpec": "~4.0.2", - "scope": null, - "spec": ">=4.0.2 <4.1.0", - "type": "range" - }, - "_requiredBy": [ - "/" - ], - "_resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz", - "_shasum": "ff9b8b67f187d1e4c29b9feb31f6b223acd19067", - "_shrinkwrap": null, - "_spec": "read-installed@~4.0.2", - "_where": "/Users/rebecca/code/npm", - "author": { - "email": "i@izs.me", - "name": "Isaac Z. Schlueter", - "url": "http://blog.izs.me/" + "name": "read-installed", + "description": "Read all the installed packages in a folder, and return a tree structure with all the data.", + "version": "4.0.3", + "repository": { + "type": "git", + "url": "git://github.com/isaacs/read-installed.git" }, - "bugs": { - "url": "https://github.com/isaacs/read-installed/issues" + "main": "read-installed.js", + "scripts": { + "test": "tap ./test/*.js" }, "dependencies": { "debuglog": "^1.0.1", - "graceful-fs": "^4.1.2", "read-package-json": "^2.0.0", "readdir-scoped-modules": "^1.0.0", "semver": "2 || 3 || 4 || 5", "slide": "~1.1.3", - "util-extend": "^1.0.1" + "util-extend": "^1.0.1", + "graceful-fs": "^4.1.2" }, - "description": "Read all the installed packages in a folder, and return a tree structure with all the data.", + "optionalDependencies": { + "graceful-fs": "^4.1.2" + }, + "author": { + "name": "Isaac Z. Schlueter", + "email": "i@izs.me", + "url": "http://blog.izs.me/" + }, + "license": "ISC", "devDependencies": { "mkdirp": "^0.5.0", "rimraf": "^2.2.8", "tap": "^1.2.0" }, - "directories": {}, + "gitHead": "da02df6acdb5f5ee31d8c637ef31fb50efb455c1", + "bugs": { + "url": "https://github.com/isaacs/read-installed/issues" + }, + "homepage": "https://github.com/isaacs/read-installed#readme", + "_id": "read-installed@4.0.3", + "_shasum": "ff9b8b67f187d1e4c29b9feb31f6b223acd19067", + "_from": "read-installed@>=4.0.3 <4.1.0", + "_npmVersion": "2.14.3", + "_nodeVersion": "2.2.2", + "_npmUser": { + "name": "zkat", + "email": "kat@sykosomatic.org" + }, "dist": { "shasum": "ff9b8b67f187d1e4c29b9feb31f6b223acd19067", "tarball": "http://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz" }, - "gitHead": "da02df6acdb5f5ee31d8c637ef31fb50efb455c1", - "homepage": "https://github.com/isaacs/read-installed#readme", - "installable": true, - "license": "ISC", - "main": "read-installed.js", "maintainers": [ { "name": "iarna", @@ -83,16 +69,6 @@ "email": "kat@sykosomatic.org" } ], - "name": "read-installed", - "optionalDependencies": { - "graceful-fs": "^4.1.2" - }, - "repository": { - "type": "git", - "url": "git://github.com/isaacs/read-installed.git" - }, - "scripts": { - "test": "tap ./test/*.js" - }, - "version": "4.0.3" + "directories": {}, + "_resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz" } |