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/spdx-exceptions/.npmignore | 2 - node_modules/spdx-exceptions/LICENSE.md | 9 ---- node_modules/spdx-exceptions/README.md | 13 ------ node_modules/spdx-exceptions/index.json | 24 ---------- node_modules/spdx-exceptions/package.json | 78 ------------------------------- 5 files changed, 126 deletions(-) delete mode 100644 node_modules/spdx-exceptions/.npmignore delete mode 100644 node_modules/spdx-exceptions/LICENSE.md delete mode 100644 node_modules/spdx-exceptions/README.md delete mode 100644 node_modules/spdx-exceptions/index.json delete mode 100644 node_modules/spdx-exceptions/package.json (limited to 'node_modules/spdx-exceptions') diff --git a/node_modules/spdx-exceptions/.npmignore b/node_modules/spdx-exceptions/.npmignore deleted file mode 100644 index 582506777..000000000 --- a/node_modules/spdx-exceptions/.npmignore +++ /dev/null @@ -1,2 +0,0 @@ -.npmiginore -.travis.yml diff --git a/node_modules/spdx-exceptions/LICENSE.md b/node_modules/spdx-exceptions/LICENSE.md deleted file mode 100644 index 6c2555895..000000000 --- a/node_modules/spdx-exceptions/LICENSE.md +++ /dev/null @@ -1,9 +0,0 @@ -The MIT License - -Copyright (c) 2015 Kyle E. Mitchell - -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/node_modules/spdx-exceptions/README.md b/node_modules/spdx-exceptions/README.md deleted file mode 100644 index ef377325e..000000000 --- a/node_modules/spdx-exceptions/README.md +++ /dev/null @@ -1,13 +0,0 @@ -```javascript -var assert = require('assert') -var spdxExceptions = require('spdx-exceptions') - -assert(Array.isArray(spdxExceptions)) - -assert(spdxExceptions.length > 0) - -function isString(x) { - return typeof x === 'string' } - -assert(spdxExceptions.every(isString)) -``` diff --git a/node_modules/spdx-exceptions/index.json b/node_modules/spdx-exceptions/index.json deleted file mode 100644 index dd9277891..000000000 --- a/node_modules/spdx-exceptions/index.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - "389-exception", - "Autoconf-exception-2.0 ", - "Autoconf-exception-3.0 ", - "Bison-exception-2.2", - "CLISP-exception-2.0", - "Classpath-exception-2.0", - "FLTK-exception ", - "FLTK-exception-2.0 ", - "Font-exception-2.0 ", - "GCC-exception-2.0", - "GCC-exception-3.1", - "LZMA-exception ", - "Libtool-exception", - "Nokia-Qt-exception-1.1 ", - "Qwt-exception-1.0", - "WxWindows-exception-3.1", - "eCos-exception-2.0 ", - "freertos-exception-2.0 ", - "gnu-javamail-exception ", - "i2p-gpl-java-exception ", - "mif-exception", - "u-boot-exception-2.0 " -] diff --git a/node_modules/spdx-exceptions/package.json b/node_modules/spdx-exceptions/package.json deleted file mode 100644 index 0ed389b57..000000000 --- a/node_modules/spdx-exceptions/package.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "_args": [ - [ - "spdx-exceptions@^1.0.0", - "/Users/ogd/Documents/projects/npm/npm/node_modules/spdx-expression-parse" - ] - ], - "_from": "spdx-exceptions@>=1.0.0 <2.0.0", - "_id": "spdx-exceptions@1.0.2", - "_inCache": true, - "_location": "/spdx-exceptions", - "_nodeVersion": "0.12.7", - "_npmUser": { - "email": "kyle@kemitchell.com", - "name": "kemitchell" - }, - "_npmVersion": "2.13.3", - "_phantomChildren": {}, - "_requested": { - "name": "spdx-exceptions", - "raw": "spdx-exceptions@^1.0.0", - "rawSpec": "^1.0.0", - "scope": null, - "spec": ">=1.0.0 <2.0.0", - "type": "range" - }, - "_requiredBy": [ - "/spdx-expression-parse" - ], - "_resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz", - "_shasum": "c584a2875a1db1c8743266990af6e0c82e143a5b", - "_shrinkwrap": null, - "_spec": "spdx-exceptions@^1.0.0", - "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/spdx-expression-parse", - "author": { - "name": "The Linux Foundation" - }, - "bugs": { - "url": "https://github.com/kemitchell/spdx-exceptions.js/issues" - }, - "contributors": [ - { - "name": "Kyle E. Mitchell", - "email": "kyle@kemitchell.com", - "url": "https://kemitchell.com/" - } - ], - "dependencies": {}, - "description": "list of SPDX standard license exceptions", - "devDependencies": { - "defence-cli": "^1.0.1" - }, - "directories": {}, - "dist": { - "shasum": "c584a2875a1db1c8743266990af6e0c82e143a5b", - "tarball": "http://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.2.tgz" - }, - "gitHead": "a1e7b0595efee0e4436e9807dd36280791e44c82", - "homepage": "https://github.com/kemitchell/spdx-exceptions.js#readme", - "installable": true, - "license": "CC-BY-3.0", - "maintainers": [ - { - "name": "kemitchell", - "email": "kyle@kemitchell.com" - } - ], - "name": "spdx-exceptions", - "optionalDependencies": {}, - "repository": { - "type": "git", - "url": "git+https://github.com/kemitchell/spdx-exceptions.js.git" - }, - "scripts": { - "test": "defence -i javascript README.md | sed 's!spdx-exceptions!./!' | node" - }, - "version": "1.0.2" -} -- cgit v1.2.3