Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
module: fix regression in require ../
Fixes regression in require system that prevented loading relative
packages via main property in package.json where the file is not
index.{ext}. The regression was introduced in
cfc1272.
  • Loading branch information
Evan Lucas committed Dec 11, 2014
commit 393b3555ffff9a0742bbfb3590d26a769d948f7c
4 changes: 4 additions & 0 deletions lib/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,10 @@ Module._findPath = function(request, paths) {
}
}

if (!filename) {
filename = tryPackage(basePath, exts);
}

if (!filename) {
// try it with each of the extensions at "index"
filename = tryExtensions(path.resolve(basePath, 'index'), exts);
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/require-bin/bin/req.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('../');
1 change: 1 addition & 0 deletions test/fixtures/require-bin/lib/req.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = '';
4 changes: 4 additions & 0 deletions test/fixtures/require-bin/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "req",
"main": "./lib/req.js"
}
4 changes: 4 additions & 0 deletions test/simple/test-require-extensions-main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
var common = require('../common');
var assert = require('assert');

require(common.fixturesDir + '/require-bin/bin/req.js');