fix: deepAssign error without config

Close #1177
electron-userland · Jan 29, 2017 · 5d72c10 · 5d72c10
1 parent 5d64693
commit 5d72c10
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/packages/electron-builder/src/cli/install-app-deps.ts b/packages/electron-builder/src/cli/install-app-deps.ts
@@ -20,7 +20,7 @@ async function main() {
     .argv
 
   const projectDir = process.cwd()
-  const config = await loadConfig(projectDir)
+  const config = (await loadConfig(projectDir)) || {}
   const results: Array<string> = await BluebirdPromise.all([
     computeDefaultAppDirectory(projectDir, use(config.directories, it => it!.app)),
     getElectronVersion(config, projectDir)

diff --git a/packages/electron-builder/src/packager.ts b/packages/electron-builder/src/packager.ts
@@ -93,7 +93,8 @@ export class Packager implements BuildInfo {
       configFromOptions = devMetadataFromOptions.build
     }
 
-    const config = deepAssign(await loadConfig(this.projectDir), configFromOptions)
+    const fileOrPackageConfig = await loadConfig(this.projectDir)
+    const config = fileOrPackageConfig == null ? configFromOptions : deepAssign(fileOrPackageConfig, configFromOptions)
 
     const extraMetadata = this.options.extraMetadata
     if (extraMetadata != null) {

diff --git a/packages/electron-builder/src/util/readPackageJson.ts b/packages/electron-builder/src/util/readPackageJson.ts
@@ -31,7 +31,7 @@ async function authors(file: string, data: any) {
     .map(it => it.replace(/^\s*#.*$/, "").trim())
 }
 
-export async function loadConfig(projectDir: string): Promise<Config> {
+export async function loadConfig(projectDir: string): Promise<Config | null> {
   try {
     const configPath = path.join(projectDir, "electron-builder.yml")
     const result = safeLoad(await readFile(configPath, "utf8"))

diff --git a/test/src/helpers/runTests.ts b/test/src/helpers/runTests.ts
@@ -125,6 +125,7 @@ async function runTests() {
           switch (scriptArg) {
             case "skipFpm": {
               testPathIgnorePatterns.push("[\\/]{1}fpmTest.js$")
+              testPathIgnorePatterns.push("[\\/]{1}linuxArchiveTest.js$")
               config.cacheDirectory += `-${suffix}`
             }
             break