fix: --ia32 parameter not working as expected anymore

develar · develar · commit c37bd009d606 · 2017-03-13T17:34:13.000+01:00
Close #1348
diff --git a/appveyor.yml b/appveyor.yml
@@ -6,7 +6,7 @@ cache:
   - '%USERPROFILE%\.electron'
 
 environment:
-  TEST_FILES: BuildTest,extraMetadataTest,filesTest,globTest,nsisUpdaterTest,oneClickInstallerTest,installerTest
+  TEST_FILES: ExtraBuildTest,BuildTest,extraMetadataTest,filesTest,globTest,nsisUpdaterTest,oneClickInstallerTest,installerTest
 
 install:
   - ps: Install-Product node 6 x64
diff --git a/packages/electron-builder/src/targets/targetFactory.ts b/packages/electron-builder/src/targets/targetFactory.ts
@@ -14,8 +14,8 @@ export function computeArchToTargetNamesMap(raw: Map<Arch, string[]>, options: P
     }
   }
   
+  const defaultArchs: Array<string> = raw.size === 0 ? [platform === Platform.MAC ? "x64" : process.arch] : Array.from(raw.keys()).map(it => Arch[it])
   const result = new Map(raw)
-  const defaultArch = platform === Platform.MAC ? "x64" : process.arch
   for (const target of asArray(options.target).map<TargetConfig>(it => typeof it === "string" ? {target: it} : it)) {
     let name = target.target
     let archs = target.arch
@@ -27,13 +27,15 @@ export function computeArchToTargetNamesMap(raw: Map<Arch, string[]>, options: P
       }
     }
 
-    for (const arch of asArray(archs || defaultArch)) {
+    for (const arch of archs == null ? defaultArchs : asArray(archs)) {
       addValue(result, archFromString(arch), name)
     }
   }
 
   if (result.size === 0) {
-    result.set(archFromString(defaultArch), [])
+    for (const arch of defaultArchs) {
+      result.set(archFromString(arch), [])
+    }
   }
 
   return result
diff --git a/test/out/__snapshots__/ExtraBuildTest.js.snap b/test/out/__snapshots__/ExtraBuildTest.js.snap
@@ -27,6 +27,17 @@ Object {
 }
 `;
 
+exports[`override targets in the config - only arch 1`] = `
+Object {
+  "win": Array [
+    Object {
+      "file": "Test App ßW Setup 1.1.0.exe",
+      "safeArtifactName": "TestApp-Setup-1.1.0.exe",
+    },
+  ],
+}
+`;
+
 exports[`override targets in the config 1`] = `
 Object {
   "linux": Array [],
diff --git a/test/src/ExtraBuildTest.ts b/test/src/ExtraBuildTest.ts
@@ -1,4 +1,4 @@
-import { DIR_TARGET, Platform } from "electron-builder"
+import { Arch, DIR_TARGET, Platform } from "electron-builder"
 import { build } from "electron-builder/out/builder"
 import { move } from "fs-extra-p"
 import * as path from "path"
@@ -54,12 +54,12 @@ test.ifAll.ifLinuxOrDevMac("prepackaged", app({
   }
 }))
 
-test.ifAll.ifLinuxOrDevMac("override targets in the config", app({
+test.ifAll.ifDevOrWinCi("override targets in the config", app({
   targets: linuxDirTarget,
 }, {
   packed: async (context) => {
     await build({
-      project: context.projectDir,
+      projectDir: context.projectDir,
       linux: ["deb"],
       config: {
         publish: null,
@@ -77,6 +77,23 @@ test.ifAll.ifLinuxOrDevMac("override targets in the config", app({
   }
 }))
 
+
+test.ifAll.ifDevOrWinCi("override targets in the config - only arch", app({
+  targets: Platform.WINDOWS.createTarget(null, Arch.ia32),
+  config: {
+    // https://github.com/electron-userland/electron-builder/issues/1348
+    win: {
+      target: [
+        "nsis",
+      ],
+    },
+  },
+}, {
+  packed: async (context) => {
+    await assertThat(path.join(context.projectDir, "dist", "win-unpacked")).doesNotExist()
+  },
+}))
+
 test.ifAll.ifDevOrLinuxCi("scheme validation", appThrows({
   targets: linuxDirTarget,
   config: <any>{
diff --git a/test/src/helpers/packTester.ts b/test/src/helpers/packTester.ts
@@ -192,7 +192,7 @@ async function packAndCheck(packagerOptions: PackagerOptions, checkOptions: Asse
         return result
       })
   }
-
+  
   expect(objectToCompare).toMatchSnapshot()
 
   c: for (const [platform, archToType] of packagerOptions.targets) {
diff --git a/yarn.lock b/yarn.lock
@@ -91,8 +91,8 @@ ajv-keywords@^2.0.1-beta.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.0.1-beta.1.tgz#f724f5495a1c71b09d1772560df8a4c5a4d018a5"
 
 ajv@^4.9.1:
-  version "4.11.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.4.tgz#ebf3a55d4b132ea60ff5847ae85d2ef069960b45"
+  version "4.11.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
@@ -301,15 +301,15 @@ babel-code-frame@^6.20.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.0.0, babel-core@^6.23.0, babel-core@^6.23.1:
-  version "6.23.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df"
+babel-core@^6.0.0, babel-core@^6.23.1, babel-core@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02"
   dependencies:
     babel-code-frame "^6.22.0"
-    babel-generator "^6.23.0"
+    babel-generator "^6.24.0"
     babel-helpers "^6.23.0"
     babel-messages "^6.23.0"
-    babel-register "^6.23.0"
+    babel-register "^6.24.0"
     babel-runtime "^6.22.0"
     babel-template "^6.23.0"
     babel-traverse "^6.23.1"
@@ -325,9 +325,9 @@ babel-core@^6.0.0, babel-core@^6.23.0, babel-core@^6.23.1:
     slash "^1.0.0"
     source-map "^0.5.0"
 
-babel-generator@^6.18.0, babel-generator@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.23.0.tgz#6b8edab956ef3116f79d8c84c5a3c05f32a74bc5"
+babel-generator@^6.18.0, babel-generator@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56"
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
@@ -474,11 +474,11 @@ babel-preset-jest@^19.0.0:
   dependencies:
     babel-plugin-jest-hoist "^19.0.0"
 
-babel-register@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3"
+babel-register@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd"
   dependencies:
-    babel-core "^6.23.0"
+    babel-core "^6.24.0"
     babel-runtime "^6.22.0"
     core-js "^2.4.0"
     home-or-tmp "^2.0.0"
@@ -2006,8 +2006,8 @@ jsdoc2md-stats@^2.0.0:
     app-usage-stats "^0.5.0"
 
 jsdom@^9.11.0:
-  version "9.11.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.11.0.tgz#a95b0304e521a2ca5a63c6ea47bf7708a7a84591"
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
   dependencies:
     abab "^1.0.3"
     acorn "^4.0.4"
@@ -3047,8 +3047,8 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
 sumchecker@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-2.0.1.tgz#9ce42ecefc5fce2c602d3623315c52b57a2d69dd"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-2.0.2.tgz#0f42c10e5d05da5d42eea3e56c3399a37d6c5b3e"
   dependencies:
     debug "^2.2.0"
 
@@ -3220,8 +3220,8 @@ tslint@^4.5.1:
     update-notifier "^2.0.0"
 
 tsutils@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.2.2.tgz#7e165c601367b9f89200b97ff47d9e38d1a6e4c8"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.3.0.tgz#dd86cb304f7a2e86c012deade2f8d0f886f57808"
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
@@ -3413,8 +3413,8 @@ whatwg-encoding@^1.0.1:
     iconv-lite "0.4.13"
 
 whatwg-url@^4.3.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.5.0.tgz#79bb6f0e370a4dda1cbc8f3062a490cf8bbb09ea"
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.5.1.tgz#ba634f630ff0778212c52ea9055d2d061380b1bb"
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
@@ -3555,8 +3555,8 @@ y18n@^3.2.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
 yallist@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.0.tgz#306c543835f09ee1a4cb23b7bce9ab341c91cdd4"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.0.tgz#3a0f3b45f42cb60f822c92f69ade2bb88beb1ae0"
 
 yargs-parser@^4.2.0:
   version "4.2.1"

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ export function computeArchToTargetNamesMap(raw: Map<Arch, string[]>, options: P`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ const defaultArchs: Array<string> = raw.size === 0 ? [platform === Platform.MAC ? "x64" : process.arch] : Array.from(raw.keys()).map(it => Arch[it])`
`17`	`18`	`const result = new Map(raw)`
`18`		`- const defaultArch = platform === Platform.MAC ? "x64" : process.arch`
`19`	`19`	`for (const target of asArray(options.target).map<TargetConfig>(it => typeof it === "string" ? {target: it} : it)) {`
`20`	`20`	`let name = target.target`
`21`	`21`	`let archs = target.arch`
`@@ -27,13 +27,15 @@ export function computeArchToTargetNamesMap(raw: Map<Arch, string[]>, options: P`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`- for (const arch of asArray(archs \|\| defaultArch)) {`
	`30`	`+ for (const arch of archs == null ? defaultArchs : asArray(archs)) {`
`31`	`31`	`addValue(result, archFromString(arch), name)`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (result.size === 0) {`
`36`		`- result.set(archFromString(defaultArch), [])`
	`36`	`+ for (const arch of defaultArchs) {`
	`37`	`+ result.set(archFromString(arch), [])`
	`38`	`+ }`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`return result`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ async function packAndCheck(packagerOptions: PackagerOptions, checkOptions: Asse`
`192`	`192`	`return result`
`193`	`193`	`})`
`194`	`194`	`}`
`195`		`-`
	`195`	`+`
`196`	`196`	`expect(objectToCompare).toMatchSnapshot()`
`197`	`197`
`198`	`198`	`c: for (const [platform, archToType] of packagerOptions.targets) {`