module: allow require('.')

targos · silverwind · commit 6fc5e953547b · 2015-03-20T18:17:25.000+01:00
Previously, the minimal argument to require the current directory was require('./'). This commits allows to skip the trailing slash. Fixes: #1178 PR-URL: #1185 Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com> Reviewed-By: Christian Tellnes <christian@tellnes.no> Reviewed-By: Roman Reiss <me@silverwind.io>
diff --git a/lib/module.js b/lib/module.js
@@ -205,7 +205,7 @@ Module._resolveLookupPaths = function(request, parent) {
   }
 
   var start = request.substring(0, 2);
-  if (start !== './' && start !== '..') {
+  if (start !== '.' && start !== './' && start !== '..') {
     var paths = modulePaths;
     if (parent) {
       if (!parent.paths) parent.paths = [];
diff --git a/test/fixtures/module-require/relative/dot-slash.js b/test/fixtures/module-require/relative/dot-slash.js
@@ -0,0 +1 @@
+module.exports = require('./');
diff --git a/test/fixtures/module-require/relative/dot.js b/test/fixtures/module-require/relative/dot.js
@@ -0,0 +1 @@
+module.exports = require('.');
diff --git a/test/fixtures/module-require/relative/index.js b/test/fixtures/module-require/relative/index.js
@@ -0,0 +1 @@
+exports.value = 42;
diff --git a/test/parallel/test-require-extensions-main.js b/test/parallel/test-require-extensions-main.js
@@ -2,3 +2,9 @@ var common = require('../common');
 var assert = require('assert');
 
 require(common.fixturesDir + '/require-bin/bin/req.js');
+
+var a = require(common.fixturesDir + '/module-require/relative/dot.js');
+var b = require(common.fixturesDir + '/module-require/relative/dot-slash.js');
+
+assert.equal(a.value, 42);
+assert.equal(a, b, 'require(".") should resolve like require("./")');

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ Module._resolveLookupPaths = function(request, parent) {`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`var start = request.substring(0, 2);`
`208`		`- if (start !== './' && start !== '..') {`
	`208`	`+ if (start !== '.' && start !== './' && start !== '..') {`
`209`	`209`	`var paths = modulePaths;`
`210`	`210`	`if (parent) {`
`211`	`211`	`if (!parent.paths) parent.paths = [];`