From: Kevin Sawicki Date: Thu, 23 Jun 2016 22:56:29 +0000 (-0700) Subject: Reuse root path variable X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bac4d51169b5b8167e90b60bd8107324de459186;p=platform%2Fframework%2Fweb%2Fcrosswalk-tizen.git Reuse root path variable --- diff --git a/lib/common/reset-search-paths.js b/lib/common/reset-search-paths.js index 5cec77b..924cb38 100644 --- a/lib/common/reset-search-paths.js +++ b/lib/common/reset-search-paths.js @@ -9,21 +9,19 @@ module.paths = [] module.parent.paths = [] // Prevent Node from adding paths outside this app to search paths. +const resourcesPathWithTrailingSlash = process.resourcesPath + path.sep const originalNodeModulePaths = Module._nodeModulePaths Module._nodeModulePaths = function (from) { const paths = originalNodeModulePaths(from) - - // If "from" is outside the app then we do nothing. - const rootPath = process.resourcesPath + path.sep const fromPath = path.resolve(from) + path.sep - const skipOutsidePaths = fromPath.startsWith(rootPath) - if (skipOutsidePaths) { + // If "from" is outside the app then we do nothing. + if (fromPath.startsWith(resourcesPathWithTrailingSlash)) { return paths.filter(function (candidate) { - return candidate.startsWith(rootPath) + return candidate.startsWith(resourcesPathWithTrailingSlash) }) + } else { + return paths } - - return paths } // Patch Module._resolveFilename to always require the Electron API when