From 25a234b4595ee3f1a2c09e2a39e3c238aa642557 Mon Sep 17 00:00:00 2001 From: Forrest L Norvell Date: Wed, 14 Oct 2015 22:17:03 -0700 Subject: 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 --- node_modules/unique-slug/.npmignore | 5 --- node_modules/unique-slug/README.md | 20 --------- node_modules/unique-slug/index.js | 15 ------- node_modules/unique-slug/package.json | 74 ---------------------------------- node_modules/unique-slug/test/index.js | 13 ------ 5 files changed, 127 deletions(-) delete mode 100644 node_modules/unique-slug/.npmignore delete mode 100644 node_modules/unique-slug/README.md delete mode 100644 node_modules/unique-slug/index.js delete mode 100644 node_modules/unique-slug/package.json delete mode 100644 node_modules/unique-slug/test/index.js (limited to 'node_modules/unique-slug') diff --git a/node_modules/unique-slug/.npmignore b/node_modules/unique-slug/.npmignore deleted file mode 100644 index 1ab9fa63f..000000000 --- a/node_modules/unique-slug/.npmignore +++ /dev/null @@ -1,5 +0,0 @@ -*~ -.#* -DEADJOE - -node_modules diff --git a/node_modules/unique-slug/README.md b/node_modules/unique-slug/README.md deleted file mode 100644 index 978f69b72..000000000 --- a/node_modules/unique-slug/README.md +++ /dev/null @@ -1,20 +0,0 @@ -unique-slug -=========== - -Generate a unique character string suitible for use in files and URLs. - -``` -var uniqueSlug = require('unique-slug') - -var randomSlug = uniqueSlug() -var fileSlug = uniqueSlug('/etc/passwd') -``` - -### uniqueSlug(*str*) → String (32 chars) - -If *str* is passed in then the return value will be its md5 digest in -hex. - -If *str* is not passed in, it will be 16 bytes coverted into 32 hex -characters, generated by `crypto.pseudoRandomBytes`. - diff --git a/node_modules/unique-slug/index.js b/node_modules/unique-slug/index.js deleted file mode 100644 index 747cf6d06..000000000 --- a/node_modules/unique-slug/index.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict' -var crypto = require('crypto') - -module.exports = function (uniq) { - if (uniq) { - var hash = crypto.createHash('md5') - hash.update(uniq) - return hash.digest('hex') - } else { - // Safe because w/o a callback because this interface can - // neither block nor error (by contrast with randomBytes - // which will throw an exception without enough entropy) - return crypto.pseudoRandomBytes(16).toString('hex') - } -} diff --git a/node_modules/unique-slug/package.json b/node_modules/unique-slug/package.json deleted file mode 100644 index 959233482..000000000 --- a/node_modules/unique-slug/package.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "_args": [ - [ - "unique-slug@^1.0.0", - "/Users/rebecca/code/npm/node_modules/unique-filename" - ] - ], - "_from": "unique-slug@>=1.0.0 <2.0.0", - "_id": "unique-slug@1.0.0", - "_inCache": true, - "_location": "/unique-slug", - "_nodeVersion": "1.6.2", - "_npmUser": { - "email": "me@re-becca.org", - "name": "iarna" - }, - "_npmVersion": "2.7.6", - "_phantomChildren": {}, - "_requested": { - "name": "unique-slug", - "raw": "unique-slug@^1.0.0", - "rawSpec": "^1.0.0", - "scope": null, - "spec": ">=1.0.0 <2.0.0", - "type": "range" - }, - "_requiredBy": [ - "/unique-filename" - ], - "_shasum": "4459d12416f576cc091a3deb19939ec99c735626", - "_shrinkwrap": null, - "_spec": "unique-slug@^1.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/unique-filename", - "author": { - "email": "me@re-becca.org", - "name": "Rebecca Turner", - "url": "http://re-becca.org" - }, - "bugs": { - "url": "https://github.com/iarna/unique-slug/issues" - }, - "dependencies": {}, - "description": "Generate a unique character string suitible for use in files and URLs.", - "devDependencies": { - "standard": "^3.7.3", - "tap": "^1.0.0" - }, - "directories": {}, - "dist": { - "shasum": "4459d12416f576cc091a3deb19939ec99c735626", - "tarball": "http://registry.npmjs.org/unique-slug/-/unique-slug-1.0.0.tgz" - }, - "gitHead": "024b3bd3c0184550702c93f088822e3f38da5c17", - "homepage": "https://github.com/iarna/unique-slug", - "keywords": [], - "license": "ISC", - "main": "index.js", - "maintainers": [ - { - "name": "iarna", - "email": "me@re-becca.org" - } - ], - "name": "unique-slug", - "optionalDependencies": {}, - "repository": { - "type": "git", - "url": "git://github.com/iarna/unique-slug.git" - }, - "scripts": { - "test": "standard && tap test" - }, - "version": "1.0.0" -} diff --git a/node_modules/unique-slug/test/index.js b/node_modules/unique-slug/test/index.js deleted file mode 100644 index 6866678ed..000000000 --- a/node_modules/unique-slug/test/index.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict' -var t = require('tap') -var uniqueSlug = require('../index.js') - -t.plan(5) -var slugA = uniqueSlug() -t.is(slugA.length, 32, 'random slugs are 32 chars') -t.notEqual(slugA, uniqueSlug(), "two slugs aren't the same") -var base = '/path/to/thingy' -var slugB = uniqueSlug(base) -t.is(slugB.length, 32, 'string based slugs are 32 chars') -t.is(slugB, uniqueSlug(base), 'two string based slugs, from the same string are the same') -t.notEqual(slugB, uniqueSlug(slugA), 'two string based slongs, from diff strings are different') -- cgit v1.2.3