diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/module.js | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/lib/module.js b/lib/module.js index 339a228da9..7bb8288f54 100644 --- a/lib/module.js +++ b/lib/module.js @@ -159,7 +159,6 @@ function tryExtensions(p, exts, isMain) { return false; } -var warned = false; Module._findPath = function(request, paths, isMain) { if (path.isAbsolute(request)) { paths = ['']; @@ -221,18 +220,6 @@ Module._findPath = function(request, paths, isMain) { } if (filename) { - // Warn once if '.' resolved outside the module dir - if (request === '.' && i > 0) { - if (!warned) { - warned = true; - process.emitWarning( - 'warning: require(\'.\') resolved outside the package ' + - 'directory. This functionality is deprecated and will be removed ' + - 'soon.', - 'DeprecationWarning', 'DEP0019'); - } - } - Module._pathCache[cacheKey] = filename; return filename; } @@ -335,8 +322,7 @@ Module._resolveLookupPaths = function(request, parent, newReturn) { } // Check for relative path - if (request.length < 2 || - request.charCodeAt(0) !== 46/*.*/ || + if (request.charCodeAt(0) !== 46/*.*/ && (request.charCodeAt(1) !== 46/*.*/ && request.charCodeAt(1) !== 47/*/*/)) { var paths = modulePaths; @@ -347,16 +333,6 @@ Module._resolveLookupPaths = function(request, parent, newReturn) { 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.unshift(path.dirname(parent.filename)); - } else { - paths.unshift(path.resolve(request)); - } - } - debug('looking for %j in %j', request, paths); return (newReturn ? (paths.length > 0 ? paths : null) : [request, paths]); } |