fix: deepAssign error without config

develar · develar · commit 5d72c1040c9d · 2017-01-29T11:31:19.000+01:00
Close #1177
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

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ export class Packager implements BuildInfo {`
`93`	`93`	`configFromOptions = devMetadataFromOptions.build`
`94`	`94`	`}`
`95`	`95`
`96`		`- const config = deepAssign(await loadConfig(this.projectDir), configFromOptions)`
	`96`	`+ const fileOrPackageConfig = await loadConfig(this.projectDir)`
	`97`	`+ const config = fileOrPackageConfig == null ? configFromOptions : deepAssign(fileOrPackageConfig, configFromOptions)`
`97`	`98`
`98`	`99`	`const extraMetadata = this.options.extraMetadata`
`99`	`100`	`if (extraMetadata != null) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ async function authors(file: string, data: any) {`
`31`	`31`	`.map(it => it.replace(/^\s#.$/, "").trim())`
`32`	`32`	`}`
`33`	`33`
`34`		`-export async function loadConfig(projectDir: string): Promise<Config> {`
	`34`	`+export async function loadConfig(projectDir: string): Promise<Config \| null> {`
`35`	`35`	`try {`
`36`	`36`	`const configPath = path.join(projectDir, "electron-builder.yml")`
`37`	`37`	`const result = safeLoad(await readFile(configPath, "utf8"))`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ async function runTests() {`
`125`	`125`	`switch (scriptArg) {`
`126`	`126`	`case "skipFpm": {`
`127`	`127`	`testPathIgnorePatterns.push("[\\/]{1}fpmTest.js$")`
	`128`	`+ testPathIgnorePatterns.push("[\\/]{1}linuxArchiveTest.js$")`
`128`	`129`	config.cacheDirectory += `-${suffix}`
`129`	`130`	`}`
`130`	`131`	`break`