Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-16 18:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/cli): exclude nodejs built-ins from process.cwd() resolve

Browse Source
This commit is contained in:
Dennis Sanders 2018-01-20 07:45:23 -06:00 committed by Hans
parent 5a736bd90b
commit f724722914
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/bootstrap-local.js vendored
View File

@ -4,6 +4,7 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const ts = require('typescript'); const ts = require('typescript');
const builtinModules = require('builtin-modules');
Error.stackTraceLimit = Infinity; Error.stackTraceLimit = Infinity;
@ -79,12 +80,14 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
const p = path.join(packages[match].root, request.substr(match.length)); const p = path.join(packages[match].root, request.substr(match.length));
return oldLoad.call(this, p, parent); return oldLoad.call(this, p, parent);
} else { } else {
try { if (!(builtinModules.indexOf(request) > -1)) {
if (isAngularProject) { try {
return oldLoad.call(this, resolve.sync(request, { basedir: process.cwd() }), parent); if (isAngularProject) {
return oldLoad.call(this, resolve.sync(request, { basedir: process.cwd() }), parent);
}
} catch (e) {
// Do nothing. Fallback to the old method.
} }
} catch (e) {
// Do nothing. Fallback to the old method.
} }
return oldLoad.apply(this, arguments); return oldLoad.apply(this, arguments);

14
package-lock.json generated
View File

@ -1053,9 +1053,10 @@
"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
}, },
"builtin-modules": { "builtin-modules": {
"version": "1.1.1", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-2.0.0.tgz",
"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" "integrity": "sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==",
"dev": true
}, },
"builtin-status-codes": { "builtin-status-codes": {
"version": "3.0.0", "version": "3.0.0",
@ -4985,6 +4986,13 @@
"integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
"requires": { "requires": {
"builtin-modules": "1.1.1" "builtin-modules": "1.1.1"
},
"dependencies": {
"builtin-modules": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
}
} }
}, },
"is-callable": { "is-callable": {

1
package.json
View File

@ -125,6 +125,7 @@
"@types/source-map": "0.5.2", "@types/source-map": "0.5.2",
"@types/webpack": "^3.0.5", "@types/webpack": "^3.0.5",
"@types/webpack-sources": "^0.1.3", "@types/webpack-sources": "^0.1.3",
"builtin-modules": "2.0.0",
"conventional-changelog": "1.1.0", "conventional-changelog": "1.1.0",
"dtsgenerator": "^0.9.1", "dtsgenerator": "^0.9.1",
"eslint": "^3.11.0", "eslint": "^3.11.0",