fix: 19.20.0 does not read electron-builder.yml

Close #1927
electron-userland · Aug 10, 2017 · c4aacfc · c4aacfc
1 parent 175c200
commit c4aacfc
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 132 deletions.
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "normalize-package-data": "^2.4.0",
     "parse-color": "^1.0.0",
     "plist": "^2.1.0",
-    "read-config-file": "^1.0.4",
+    "read-config-file": "^1.0.5",
     "sanitize-filename": "^1.6.1",
     "semver": "^5.4.1",
     "source-map-support": "^0.4.15",

diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json
@@ -68,7 +68,7 @@
     "is-ci": "^1.0.10",
     "isbinaryfile": "^3.0.2",
     "js-yaml": "^3.9.1",
-    "read-config-file": "^1.0.4",
+    "read-config-file": "^1.0.5",
     "minimatch": "^3.0.4",
     "normalize-package-data": "^2.4.0",
     "parse-color": "^1.0.0",

diff --git a/packages/electron-builder/src/util/config.ts b/packages/electron-builder/src/util/config.ts
@@ -4,7 +4,7 @@ import { statOrNull } from "electron-builder-util/out/fs"
 import { readJson } from "fs-extra-p"
 import { Lazy } from "lazy-val"
 import * as path from "path"
-import { getConfig as _getConfig, loadParentConfig, orNullIfFileNotExist } from "read-config-file"
+import { getConfig as _getConfig, loadParentConfig, orNullIfFileNotExist, ReadConfigRequest } from "read-config-file"
 import { deepAssign } from "read-config-file/out/deepAssign"
 import { Config } from "../metadata"
 import { reactCra } from "../presets/rectCra"
@@ -14,7 +14,7 @@ import TypeParams = ajv.TypeParams
 
 /** @internal */
 export async function getConfig(projectDir: string, configPath: string | null, configFromOptions: Config | null | undefined, packageMetadata: Lazy<{ [key: string]: any } | null> = new Lazy(() => orNullIfFileNotExist(readJson(path.join(projectDir, "package.json"))))): Promise<Config> {
-  const configRequest = {key: "build", projectDir, packageMetadata, log}
+  const configRequest: ReadConfigRequest = {packageKey: "build", configFilename: "electron-builder", projectDir, packageMetadata, log}
   const config = await _getConfig<Config>(configRequest, configPath, configFromOptions)
 
   let extendsSpec = config.extends

diff --git a/test/fixtures/app-executable-deps/app/index.html b/test/fixtures/app-executable-deps/app/index.html
diff --git a/test/fixtures/app-executable-deps/app/main.js b/test/fixtures/app-executable-deps/app/main.js
diff --git a/test/fixtures/app-executable-deps/app/notify.js b/test/fixtures/app-executable-deps/app/notify.js
diff --git a/test/fixtures/app-executable-deps/app/package.json b/test/fixtures/app-executable-deps/app/package.json
diff --git a/test/fixtures/app-executable-deps/app/start-electron.js b/test/fixtures/app-executable-deps/app/start-electron.js
diff --git a/test/fixtures/app-executable-deps/package.json b/test/fixtures/app-executable-deps/package.json
diff --git a/test/fixtures/test-app-build-sub/electron-builder.yml b/test/fixtures/test-app-build-sub/electron-builder.yml
@@ -0,0 +1,12 @@
+electronVersion: 1.7.6
+appId: org.electron-builder.testApp
+compression: store
+npmRebuild: false
+mac:
+  category: your.app.category.type
+directories:
+  output: build/dist
+files:
+- build/app/**/*.js
+- build/app/**/*.html
+asar: false
diff --git a/test/fixtures/test-app-build-sub/package.json b/test/fixtures/test-app-build-sub/package.json
@@ -2,22 +2,5 @@
   "version": "1.0.0",
   "main": "./build/app/main.js",
   "author": "true",
-  "name": "Foo",
-  "build": {
-    "electronVersion": "1.7.6",
-    "appId": "org.electron-builder.testApp",
-    "compression": "store",
-    "npmRebuild": false,
-    "mac": {
-      "category": "your.app.category.type"
-    },
-    "directories": {
-      "output": "build/dist"
-    },
-    "files": [
-      "build/app/**/*.js",
-      "build/app/**/*.html"
-    ],
-    "asar": false
-  }
+  "name": "Foo"
 }
diff --git a/yarn.lock b/yarn.lock
@@ -2201,7 +2201,7 @@ lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 
-lazy-val@^1.0.1, lazy-val@^1.0.2:
+lazy-val@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.2.tgz#d9b07fb1fce54cbc99b3c611de431b83249369b6"
 
@@ -2785,15 +2785,15 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.1:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-read-config-file@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-1.0.4.tgz#e9f00bb02551581019a2c2a54da9a1d58f33c697"
+read-config-file@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-1.0.5.tgz#9992d2a4d24a993518e7eb6f3c30c0562264c367"
   dependencies:
-    bluebird-lst "^1.0.2"
+    bluebird-lst "^1.0.3"
     fs-extra-p "^4.4.0"
     js-yaml "^3.9.1"
     json5 "^0.5.1"
-    lazy-val "^1.0.1"
+    lazy-val "^1.0.2"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"