module: fix regression in require ../

Evan Lucas · Evan Lucas · commit 393b3555ffff · 2014-12-11T10:15:20.000-06:00
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.
diff --git a/lib/module.js b/lib/module.js
@@ -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);
diff --git a/test/fixtures/require-bin/bin/req.js b/test/fixtures/require-bin/bin/req.js
@@ -0,0 +1 @@
+module.exports = require('../');
diff --git a/test/fixtures/require-bin/lib/req.js b/test/fixtures/require-bin/lib/req.js
@@ -0,0 +1 @@
+module.exports = '';
diff --git a/test/fixtures/require-bin/package.json b/test/fixtures/require-bin/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "req",
+  "main": "./lib/req.js"
+}
diff --git a/test/simple/test-require-extensions-main.js b/test/simple/test-require-extensions-main.js
@@ -0,0 +1,4 @@
+var common = require('../common');
+var assert = require('assert');
+
+require(common.fixturesDir + '/require-bin/bin/req.js');

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,10 @@ Module._findPath = function(request, paths) {`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
	`189`	`+ if (!filename) {`
	`190`	`+ filename = tryPackage(basePath, exts);`
	`191`	`+ }`
	`192`	`+`
`189`	`193`	`if (!filename) {`
`190`	`194`	`// try it with each of the extensions at "index"`
`191`	`195`	`filename = tryExtensions(path.resolve(basePath, 'index'), exts);`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "name": "req",
 +  "main": "./lib/req.js"
 +}