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

fix: app.getAppPath() returning default-app path for files or directories without package.json (#18763)

Browse source
This commit is contained in:
Milan Burda 2019-06-19 23:34:22 +02:00 • committed by Alexey Kuzmin
parent 7201845894
commit 79f0c444fd
4 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default_app/main.ts
View file

@ -85,6 +85,7 @@ function loadApplicationPackage (packagePath: string) {
// Override app name and version.
packagePath = path.resolve(packagePath)
const packageJsonPath = path.join(packagePath, 'package.json')
let appPath
if (fs.existsSync(packageJsonPath)) {
let packageJson
try {
@ -102,11 +103,12 @@ function loadApplicationPackage (packagePath: string) {
} else if (packageJson.name) {
app.name = packageJson.name
}
app._setDefaultAppPaths(packagePath)
appPath = packagePath
}
try {
Module._resolveFilename(packagePath, module, true)
const filePath = Module._resolveFilename(packagePath, module, true)
app._setDefaultAppPaths(appPath || path.dirname(filePath))
} catch (e) {
showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${e.message}`)
return