From: Michaël Zasso <mic.besace@gmail.com>
Date: Wed, 18 Mar 2015 07:38:00 +0000 (+0100)
Subject: module: allow require('.')
X-Git-Tag: v1.6.2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6fc5e953547bfbdf97bc380d4bfc471e3378fad9;p=platform%2Fupstream%2Fnodejs.git

module: allow require('.')

Previously, the minimal argument to require the current directory was
require('./'). This commits allows to skip the trailing slash.

Fixes: https://github.com/iojs/io.js/issues/1178
PR-URL: https://github.com/iojs/io.js/pull/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
index 30e1f72..b2ddbd8 100644
--- 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
new file mode 100644
index 0000000..9817d8d
--- /dev/null
+++ 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
new file mode 100644
index 0000000..edac839
--- /dev/null
+++ 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
new file mode 100644
index 0000000..f16abdc
--- /dev/null
+++ 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
index 032f2eb..2a102af 100644
--- 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("./")');