From ca16df602bb0bda7b0b31821fde4d29a5d1aaa59 Mon Sep 17 00:00:00 2001 From: Roman Reiss Date: Fri, 17 Apr 2015 15:59:42 +0200 Subject: [PATCH] module: remove require('.') with NODE_PATH compatibilty --- lib/module.js | 19 +------------------ test/parallel/test-require-dot.js | 10 +--------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/lib/module.js b/lib/module.js index a89f544e51f619..bb21a5f6f0f1c5 100644 --- a/lib/module.js +++ b/lib/module.js @@ -125,11 +125,6 @@ function tryExtensions(p, exts) { } -const noopDeprecateRequireDot = util.deprecate(function() {}, - "warning: require('.') resolved outside the package directory. " + - "This functionality is deprecated and will be removed soon."); - - Module._findPath = function(request, paths) { var exts = Object.keys(Module._extensions); @@ -174,8 +169,6 @@ Module._findPath = function(request, paths) { } if (filename) { - // Warn once if '.' resolved outside the module dir - if (request === '.' && i > 0) noopDeprecateRequireDot(); Module._pathCache[cacheKey] = filename; return filename; } @@ -212,23 +205,13 @@ 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 = []; paths = parent.paths.concat(paths); } - // Maintain backwards compat with certain broken uses of require('.') - // by putting the module's directory in front of the lookup paths. - if (request === '.') { - if (parent && parent.filename) { - paths.splice(0, 0, path.dirname(parent.filename)); - } else { - paths.splice(0, 0, path.resolve(request)); - } - } - return [request, paths]; } diff --git a/test/parallel/test-require-dot.js b/test/parallel/test-require-dot.js index 2551d88d2204e8..ab1bb2329007ae 100644 --- a/test/parallel/test-require-dot.js +++ b/test/parallel/test-require-dot.js @@ -1,16 +1,8 @@ var common = require('../common'); var assert = require('assert'); -var module = require('module'); 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("./")'); - -process.env.NODE_PATH = common.fixturesDir + '/module-require/relative'; -module._initPaths(); - -var c = require('.'); - -assert.equal(c.value, 42, 'require(".") should honor NODE_PATH'); \ No newline at end of file +assert.equal(a, b, 'require(".") should resolve like require("./")'); \ No newline at end of file