mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Reuse root path variable

Browse source
This commit is contained in:
Kevin Sawicki 2016-06-23 15:56:29 -07:00
parent 905e9e9645
commit bac4d51169
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/common/reset-search-paths.js
View file

@ -9,21 +9,19 @@ module.paths = []
module.parent.paths = [] module.parent.paths = []
// Prevent Node from adding paths outside this app to search paths. // Prevent Node from adding paths outside this app to search paths.
const resourcesPathWithTrailingSlash = process.resourcesPath + path.sep
const originalNodeModulePaths = Module._nodeModulePaths const originalNodeModulePaths = Module._nodeModulePaths
Module._nodeModulePaths = function (from) { Module._nodeModulePaths = function (from) {
const paths = originalNodeModulePaths(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 fromPath = path.resolve(from) + path.sep
const skipOutsidePaths = fromPath.startsWith(rootPath) // If "from" is outside the app then we do nothing.
if (skipOutsidePaths) { if (fromPath.startsWith(resourcesPathWithTrailingSlash)) {
return paths.filter(function (candidate) { 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 // Patch Module._resolveFilename to always require the Electron API when