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>
This commit is contained in:
parent
a0d32ff5ae
commit
6fc5e95354
@ -205,7 +205,7 @@ Module._resolveLookupPaths = function(request, parent) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var start = request.substring(0, 2);
|
var start = request.substring(0, 2);
|
||||||
if (start !== './' && start !== '..') {
|
if (start !== '.' && start !== './' && start !== '..') {
|
||||||
var paths = modulePaths;
|
var paths = modulePaths;
|
||||||
if (parent) {
|
if (parent) {
|
||||||
if (!parent.paths) parent.paths = [];
|
if (!parent.paths) parent.paths = [];
|
||||||
|
1
test/fixtures/module-require/relative/dot-slash.js
vendored
Normal file
1
test/fixtures/module-require/relative/dot-slash.js
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
module.exports = require('./');
|
1
test/fixtures/module-require/relative/dot.js
vendored
Normal file
1
test/fixtures/module-require/relative/dot.js
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
module.exports = require('.');
|
1
test/fixtures/module-require/relative/index.js
vendored
Normal file
1
test/fixtures/module-require/relative/index.js
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
exports.value = 42;
|
@ -2,3 +2,9 @@ var common = require('../common');
|
|||||||
var assert = require('assert');
|
var assert = require('assert');
|
||||||
|
|
||||||
require(common.fixturesDir + '/require-bin/bin/req.js');
|
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("./")');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user