From a0ae52601710cc410d2fdd21079711a118eeb0b1 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 13 Oct 2014 16:21:40 -0400 Subject: [PATCH] Check candidates after ranges MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way builtins are checked for correctly when the range isn’t found --- src/module-cache.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/module-cache.coffee b/src/module-cache.coffee index 666531d4b..bbb3ec18b 100644 --- a/src/module-cache.coffee +++ b/src/module-cache.coffee @@ -121,9 +121,6 @@ resolveModulePath = (relativePath, parentModule) -> return if relativePath[0] is '.' return if isAbsolute(relativePath) - candidates = cache.dependencies[relativePath] - return unless candidates? - folderPath = path.dirname(parentModule.filename) range = cache.folders[folderPath]?[relativePath] @@ -133,6 +130,9 @@ resolveModulePath = (relativePath, parentModule) -> else return + candidates = cache.dependencies[relativePath] + return unless candidates? + for version, resolvedPath of candidates if Module._cache.hasOwnProperty(resolvedPath) or isCorePath(resolvedPath) return resolvedPath if satisfies(version, range)