From a08c37120f50e7ccdc10e302e36d0f8025d12d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Sat, 13 May 2017 10:01:13 -0700 Subject: fstream-npm@1.2.1 --- node_modules/fstream-npm/.travis.yml | 7 ++---- node_modules/fstream-npm/fstream-npm.js | 1 + .../node_modules/minimatch/package.json | 26 ++++++++++---------- node_modules/fstream-npm/package.json | 28 ++++++++++------------ node_modules/fstream-npm/test/scoped.js | 25 +++++++++++-------- 5 files changed, 43 insertions(+), 44 deletions(-) (limited to 'node_modules') diff --git a/node_modules/fstream-npm/.travis.yml b/node_modules/fstream-npm/.travis.yml index 3637c003f..905e270bc 100644 --- a/node_modules/fstream-npm/.travis.yml +++ b/node_modules/fstream-npm/.travis.yml @@ -1,12 +1,9 @@ language: node_js sudo: false node_js: - - "5" + - "6" - "4" - - iojs - - "0.12" - - "0.10" - - "0.8" + - "7" before_install: - "npm config set spin false" - "npm install -g npm" diff --git a/node_modules/fstream-npm/fstream-npm.js b/node_modules/fstream-npm/fstream-npm.js index 9decc8b67..a2deda173 100644 --- a/node_modules/fstream-npm/fstream-npm.js +++ b/node_modules/fstream-npm/fstream-npm.js @@ -152,6 +152,7 @@ Packer.prototype.applyIgnores = function (entry, partial, entryObj) { entry === '.DS_Store' || entry.match(/^\._/) || entry.match(/^.*\.orig$/) || + // Package locks are never allowed in tarballs -- use shrinkwrap instead entry === 'package-lock.json' ) { return false diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json index 0c6e08513..e4bdaeffc 100644 --- a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json +++ b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json @@ -1,7 +1,8 @@ { "_from": "minimatch@^3.0.0", - "_id": "minimatch@3.0.3", - "_integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=", + "_id": "minimatch@3.0.4", + "_inBundle": false, + "_integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "_location": "/fstream-npm/fstream-ignore/minimatch", "_phantomChildren": {}, "_requested": { @@ -17,9 +18,8 @@ "_requiredBy": [ "/fstream-npm/fstream-ignore" ], - "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", - "_shasum": "2a4e4090b96b2db06a9d7df01055a62a77c9b774", - "_shrinkwrap": null, + "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "_shasum": "5166e286457f03306064be5497e8dbb0c3d32083", "_spec": "minimatch@^3.0.0", "_where": "/Users/zkat/Documents/code/npm/node_modules/fstream-npm/node_modules/fstream-ignore", "author": { @@ -27,19 +27,17 @@ "email": "i@izs.me", "url": "http://blog.izs.me" }, - "bin": null, "bugs": { "url": "https://github.com/isaacs/minimatch/issues" }, "bundleDependencies": false, "dependencies": { - "brace-expansion": "^1.0.0" + "brace-expansion": "^1.1.7" }, "deprecated": false, "description": "a glob matcher in javascript", "devDependencies": { - "standard": "^3.7.2", - "tap": "^5.6.0" + "tap": "^10.3.2" }, "engines": { "node": "*" @@ -51,15 +49,15 @@ "license": "ISC", "main": "minimatch.js", "name": "minimatch", - "optionalDependencies": {}, - "peerDependencies": {}, "repository": { "type": "git", "url": "git://github.com/isaacs/minimatch.git" }, "scripts": { - "posttest": "standard minimatch.js test/*.js", - "test": "tap test/*.js" + "postpublish": "git push origin --all; git push origin --tags", + "postversion": "npm publish", + "preversion": "npm test", + "test": "tap test/*.js --cov" }, - "version": "3.0.3" + "version": "3.0.4" } diff --git a/node_modules/fstream-npm/package.json b/node_modules/fstream-npm/package.json index 223084450..3aef0ce37 100644 --- a/node_modules/fstream-npm/package.json +++ b/node_modules/fstream-npm/package.json @@ -1,36 +1,36 @@ { - "_from": "fstream-npm@~1.2.0", - "_id": "fstream-npm@1.2.0", - "_integrity": "sha1-0sPIkQE0aYLWTlcJHDhIe9qRb84=", + "_from": "fstream-npm@latest", + "_id": "fstream-npm@1.2.1", + "_inBundle": false, + "_integrity": "sha512-iBHpm/LmD1qw0TlHMAqVd9rwdU6M+EHRUnPkXpRi5G/Hf0FIFH+oZFryodAU2MFNfGRh/CzhUFlMKV3pdeOTDw==", "_location": "/fstream-npm", "_phantomChildren": { "fstream": "1.0.11", "inherits": "2.0.3" }, "_requested": { - "type": "range", + "type": "tag", "registry": true, - "raw": "fstream-npm@~1.2.0", + "raw": "fstream-npm@latest", "name": "fstream-npm", "escapedName": "fstream-npm", - "rawSpec": "~1.2.0", + "rawSpec": "latest", "saveSpec": null, - "fetchSpec": "~1.2.0" + "fetchSpec": "latest" }, "_requiredBy": [ + "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz", - "_shasum": "d2c3c89101346982d64e57091c38487bda916fce", - "_shrinkwrap": null, - "_spec": "fstream-npm@~1.2.0", + "_resolved": "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz", + "_shasum": "08c4a452f789dcbac4c89a4563c902b2c862fd5b", + "_spec": "fstream-npm@latest", "_where": "/Users/zkat/Documents/code/npm", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", "url": "http://blog.izs.me/" }, - "bin": null, "bugs": { "url": "https://github.com/npm/fstream-npm/issues" }, @@ -52,8 +52,6 @@ "license": "ISC", "main": "./fstream-npm.js", "name": "fstream-npm", - "optionalDependencies": {}, - "peerDependencies": {}, "repository": { "type": "git", "url": "git+https://github.com/npm/fstream-npm.git" @@ -61,5 +59,5 @@ "scripts": { "test": "standard && tap test/*.js" }, - "version": "1.2.0" + "version": "1.2.1" } diff --git a/node_modules/fstream-npm/test/scoped.js b/node_modules/fstream-npm/test/scoped.js index c001c1b33..db0c3d4c0 100644 --- a/node_modules/fstream-npm/test/scoped.js +++ b/node_modules/fstream-npm/test/scoped.js @@ -29,37 +29,36 @@ test('setup', function (t) { t.end() }) -var included = [ +var expected = [ 'package.json', 'elf.js', - join('node_modules', '@npmwombat', 'scoped', 'index.js') + join('node_modules', '@npmwombat', 'scoped', 'index.js'), + join('node_modules', '@npmwombat', 'scoped', 'node_modules', 'example', 'index.js') ] test('includes bundledDependencies', function (t) { var subject = new Packer({ path: pkg, type: 'Directory', isDirectory: true }) - var filenames = [] + var actual = [] subject.on('entry', function (entry) { t.equal(entry.type, 'File', 'only files in this package') - // include relative path in filename var filename = entry._path.slice(entry.root._path.length + 1) - - filenames.push(filename) + actual.push(filename) }) // need to do this so fstream doesn't explode when files are removed from // under it subject.on('end', function () { // ensure we get *exactly* the results we expect by comparing in both // directions - filenames.forEach(function (filename) { + actual.forEach(function (filename) { t.ok( - included.indexOf(filename) > -1, + expected.indexOf(filename) > -1, filename + ' is included' ) }) - included.forEach(function (filename) { + expected.forEach(function (filename) { t.ok( - filenames.indexOf(filename) > -1, + actual.indexOf(filename) > -1, filename + ' is not included' ) }) @@ -91,4 +90,10 @@ function setup () { join(scopedDir, 'index.js'), "console.log('hello wombat')" ) + var scopedContent = join(scopedDir, 'node_modules', 'example') + mkdirp.sync(scopedContent) + fs.writeFileSync( + join(scopedContent, 'index.js'), + "console.log('hello example')" + ) } -- cgit v1.2.3