Skip to content

Commit

Permalink
module: fix module preloading when cwd is ENOENT
Browse files Browse the repository at this point in the history
Fixes a regression from 5759722
that prevented modules from being preloaded if the cwd does not exist.
Absolute and builtin modules now preload correctly again.

Refs: #1803
PR-URL: #2353
Reviewed-By: Jeremiah Senkpiel <[email protected]>
  • Loading branch information
bmeck authored and Fishrock123 committed Aug 24, 2015
1 parent 6480f42 commit 2d251e6
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 2 deletions.
11 changes: 9 additions & 2 deletions lib/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
};

Expand Down
28 changes: 28 additions & 0 deletions test/parallel/test-cwd-enoent-preload.js
Original file line number Diff line number Diff line change
@@ -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);
}));

0 comments on commit 2d251e6

Please sign in to comment.