diff options
Diffstat (limited to 'deps/npm/node_modules/fstream-npm')
3 files changed, 18 insertions, 11 deletions
diff --git a/deps/npm/node_modules/fstream-npm/fstream-npm.js b/deps/npm/node_modules/fstream-npm/fstream-npm.js index 39429d18ca..43c0f169f6 100644 --- a/deps/npm/node_modules/fstream-npm/fstream-npm.js +++ b/deps/npm/node_modules/fstream-npm/fstream-npm.js @@ -26,14 +26,20 @@ function Packer (props) { this.bundleLinks = props.bundleLinks this.package = props.package + // only do the magic bundling stuff for the node_modules folder that + // lives right next to a package.json file. + this.bundleMagic = this.parent && + this.parent.packageRoot && + this.basename === "node_modules" + // in a node_modules folder, resolve symbolic links to // bundled dependencies when creating the package. - props.follow = this.follow = this.basename === "node_modules" + props.follow = this.follow = this.bundleMagic // console.error("follow?", this.path, props.follow) if (this === this.root || this.parent && - this.parent.basename === "node_modules" && + this.parent.bundleMagic && this.basename.charAt(0) !== ".") { this.readBundledLinks() } @@ -85,7 +91,7 @@ Packer.prototype.applyIgnores = function (entry, partial, entryObj) { if (entry === "package.json") return true // special rules. see below. - if (entry === "node_modules") return true + if (entry === "node_modules" && this.packageRoot) return true // some files are *never* allowed under any circumstances if (entry === ".git" || @@ -110,7 +116,7 @@ Packer.prototype.applyIgnores = function (entry, partial, entryObj) { // To prevent infinite cycles in the case of cyclic deps that are // linked with npm link, even in a bundle, deps are only bundled // if they're not already present at a higher level. - if (this.basename === "node_modules") { + if (this.bundleMagic) { // bubbling up. stop here and allow anything the bundled pkg allows if (entry.indexOf("/") !== -1) return true diff --git a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json index 53f37281ae..ed82c65433 100644 --- a/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json +++ b/deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json @@ -35,8 +35,8 @@ "node": "*" }, "_engineSupported": true, - "_npmVersion": "1.1.16", - "_nodeVersion": "v0.7.8-pre", + "_npmVersion": "1.1.23", + "_nodeVersion": "v0.7.10-pre", "_defaultsLoaded": true, "_from": "fstream-ignore@~0.0.5" } diff --git a/deps/npm/node_modules/fstream-npm/package.json b/deps/npm/node_modules/fstream-npm/package.json index 83acd0d82b..fa46c74e6c 100644 --- a/deps/npm/node_modules/fstream-npm/package.json +++ b/deps/npm/node_modules/fstream-npm/package.json @@ -6,7 +6,7 @@ }, "name": "fstream-npm", "description": "fstream class for creating npm packages", - "version": "0.0.6", + "version": "0.1.0", "repository": { "type": "git", "url": "git://github.com/isaacs/fstream-npm.git" @@ -16,19 +16,20 @@ "fstream-ignore": "~0.0.5", "inherits": "" }, + "license": "BSD", "_npmUser": { "name": "isaacs", "email": "i@izs.me" }, - "_id": "fstream-npm@0.0.6", + "_id": "fstream-npm@0.1.0", "devDependencies": {}, "optionalDependencies": {}, "engines": { "node": "*" }, "_engineSupported": true, - "_npmVersion": "1.1.16", - "_nodeVersion": "v0.7.8-pre", + "_npmVersion": "1.1.23", + "_nodeVersion": "v0.7.10-pre", "_defaultsLoaded": true, - "_from": "fstream-npm@0 >=0.0.5" + "_from": "fstream-npm@0.1" } |