Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix -e/--eval can't load module from node_modules

With -e or --eval, require() can load module using relative path.

    node -e 'require("./foo")'

But it can't load module from node_modules directory.

    node -e 'require("foo")'

Fixes #1196.
  • Loading branch information...
commit d6ec8f668e308763ba1db4b603113ba9085f4391 1 parent d627083
@koichik koichik authored ry committed
Showing with 41 additions and 1 deletion.
  1. +6 −1 src/node.js
  2. +35 −0 test/simple/test-eval-require.js
View
7 src/node.js
@@ -353,8 +353,13 @@
}
var Module = NativeModule.require('module');
+ var path = NativeModule.require('path');
+ var cwd = process.cwd();
- var rv = new Module()._compile('return eval(process._eval)', 'eval');
+ var module = new Module('eval');
+ module.filename = path.join(cwd, 'eval');
+ module.paths = Module._nodeModulePaths(cwd);
+ var rv = module._compile('return eval(process._eval)', 'eval');
console.log(rv);
return true;
};
View
35 test/simple/test-eval-require.js
@@ -0,0 +1,35 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+var spawn = require('child_process').spawn;
+var path = require('path');
+var fs = require('fs');
+
+var options = {
+ cwd: common.fixturesDir
+};
+var child = spawn(process.execPath, ['-e', 'require("foo")'], options);
+child.on('exit', function(code) {
+ assert.equal(code, 0);
+});
+
Please sign in to comment.
Something went wrong with that request. Please try again.