From 7dffc58c5ba254e65b0062cb77dd933a7f807591 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 9 Oct 2014 14:21:38 -0700 Subject: [PATCH] Use Module's filename instead of id --- src/module-cache.coffee | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/module-cache.coffee b/src/module-cache.coffee index 39073a2a5..ec7dc6369 100644 --- a/src/module-cache.coffee +++ b/src/module-cache.coffee @@ -81,11 +81,11 @@ satisfies = (version, rawRange) -> resolveFilePath = (relativePath, parentModule) -> return unless relativePath - return unless parentModule?.id + return unless parentModule?.filename return unless relativePath[0] is '.' or fs.isAbsolute(relativePath) return if relativePath[relativePath.length - 1] is '/' - resolvedPath = path.resolve(path.dirname(parentModule.id), relativePath) + resolvedPath = path.resolve(path.dirname(parentModule.filename), relativePath) if resolvedPath.indexOf(cache.resourcePath) is 0 extension = path.extname(resolvedPath) if extension @@ -99,14 +99,14 @@ resolveFilePath = (relativePath, parentModule) -> resolveModulePath = (relativePath, parentModule) -> return unless relativePath - return unless parentModule?.id + return unless parentModule?.filename return if nativeModules.hasOwnProperty(relativePath) return if relativePath[0] is '.' return if relativePath[relativePath.length - 1] is '/' return if fs.isAbsolute(relativePath) - folderPath = path.dirname(parentModule.id) + folderPath = path.dirname(parentModule.filename) range = cache.folders[folderPath]?[relativePath] unless range?