mirror of
https://github.com/nodejs/node.git
synced 2026-10-14 10:26:26 -04:00
module: fix module preloading when cwd is ENOENT
Fixes a regression from 5759722cfa
that prevented modules from being preloaded if the cwd does not exist.
Absolute and builtin modules now preload correctly again.
Refs: https://github.com/nodejs/node/issues/1803
PR-URL: https://github.com/nodejs/node/pull/2353
Reviewed-By: Jeremiah Senkpiel <fishrock123@rockemail.com>
This commit is contained in:
1 parent
6480f42288
commit
2d251e661a
2 files changed
+37
-2
No files matched your search
+9
-2
@@ -515,9 +515,16 @@ Module._preloadModules = function(requests) {
|
||||
// in the current working directory. This seeds the search path for
|
||||
// preloaded modules.
|
||||
var parent = new Module('internal/preload', null);
|
||||
parent.paths = Module._nodeModulePaths(process.cwd());
|
||||
try {
|
||||
parent.paths = Module._nodeModulePaths(process.cwd());
|
||||
}
|
||||
catch (e) {
|
||||
if (e.code !== 'ENOENT') {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
requests.forEach(function(request) {
|
||||
Module._load(request, parent, false);
|
||||
parent.require(request);
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
'use strict';
|
||||
const common = require('../common');
|
||||
const assert = require('assert');
|
||||
const fs = require('fs');
|
||||
const spawn = require('child_process').spawn;
|
||||
|
||||
// Fails with EINVAL on SmartOS, EBUSY on Windows.
|
||||
if (process.platform === 'sunos' || common.isWindows) {
|
||||
console.log('1..0 # Skipped: cannot rmdir current working directory');
|
||||
return;
|
||||
}
|
||||
|
||||
const dirname = common.tmpDir + '/cwd-does-not-exist-' + process.pid;
|
||||
const abspathFile = require('path').join(common.fixturesDir, 'a.js');
|
||||
common.refreshTmpDir();
|
||||
fs.mkdirSync(dirname);
|
||||
process.chdir(dirname);
|
||||
fs.rmdirSync(dirname);
|
||||
|
||||
|
||||
const proc = spawn(process.execPath, ['-r', abspathFile, '-e', '0']);
|
||||
proc.stdout.pipe(process.stdout);
|
||||
proc.stderr.pipe(process.stderr);
|
||||
|
||||
proc.once('exit', common.mustCall(function(exitCode, signalCode) {
|
||||
assert.strictEqual(exitCode, 0);
|
||||
assert.strictEqual(signalCode, null);
|
||||
}));
|
||||
Reference in new issue
Block a user