Skip to content

Commit 1affc61

Browse files
develardevelar
committed
feat(mac): mac build zip file name does not follow build.artifactName
Close #1398
1 parent 55abc32 commit 1affc61

File tree

10 files changed

+48
-38
lines changed

10 files changed

+48
-38
lines changed

‎.github/issue_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<!-- Which version of electron-builder are you using? -->
2+
<!-- Please always try to use latest version before report. -->
23
* **Version**:
34

45
<!-- Which version of electron-updater are you using (if applicable)? -->

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
"///": "all dependencies for all packages (hoisted)",
2929
"dependencies": {
3030
"7zip-bin": "^2.0.4",
31-
"ajv": "^5.0.4-beta.0",
31+
"ajv": "^5.0.4-beta.2",
3232
"ajv-keywords": "^2.0.1-beta.2",
3333
"archiver": "^1.3.0",
34-
"aws-sdk": "^2.33.0",
34+
"aws-sdk": "^2.34.0",
3535
"bluebird-lst": "^1.0.2",
3636
"chalk": "^1.1.3",
3737
"chromium-pickle-js": "^0.2.0",
@@ -77,7 +77,7 @@
7777
"babel-plugin-transform-es2015-spread": "^6.22.0",
7878
"babel-plugin-transform-inline-imports-commonjs": "^1.2.0",
7979
"catharsis": "^0.8.8",
80-
"convert-source-map": "^1.4.0",
80+
"convert-source-map": "^1.5.0",
8181
"decompress-zip": "^0.3.0",
8282
"depcheck": "^0.6.7",
8383
"globby": "^6.1.0",
@@ -90,7 +90,7 @@
9090
"ts-babel": "^3.0.0",
9191
"tslint": "^4.5.1",
9292
"typescript": "^2.2.2",
93-
"typescript-json-schema": "0.10.0",
93+
"typescript-json-schema": "0.11.0",
9494
"whitespace": "^2.1.0",
9595
"xml2js": "^0.4.17"
9696
},

‎packages/electron-builder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"homepage": "https://github.com/electron-userland/electron-builder",
4646
"dependencies": {
4747
"7zip-bin": "^2.0.4",
48-
"ajv": "^5.0.4-beta.0",
48+
"ajv": "^5.0.4-beta.2",
4949
"ajv-keywords": "^2.0.1-beta.2",
5050
"bluebird-lst": "^1.0.2",
5151
"chalk": "^1.1.3",

‎packages/electron-builder/src/macPackager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export default class MacPackager extends PlatformPackager<MacOptions> {
6060
break
6161

6262
default:
63-
mapper(name, outDir => name === "mas" || name === "mas-dev" ? new NoOpTarget(name) : createCommonTarget(name, path.join(outDir, "mac"), this))
63+
mapper(name, outDir => name === "mas" || name === "mas-dev" ? new NoOpTarget(name) : createCommonTarget(name, outDir, this))
6464
break
6565
}
6666
}

‎packages/electron-builder/src/targets/ArchiveTarget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class ArchiveTarget extends Target {
2323
const outFile = (() => {
2424
switch (packager.platform) {
2525
case Platform.MAC:
26-
return path.join(outDir, packager.generateName2(format, "mac", false))
26+
return path.join(outDir, packager.expandArtifactNamePattern(this.options, format, arch, "${productName}-${version}-${os}.${ext}"))
2727
case Platform.WINDOWS:
2828
return path.join(outDir, packager.generateName(format, arch, false, "win"))
2929
case Platform.LINUX:

‎packages/lint.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict"
22

3-
const Linter = require("tslint").Linter
3+
const { Linter } = require("tslint")
44
const path = require("path")
55

66
const configuration = {

‎test/out/mac/__snapshots__/macPackagerTest.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Object {
8888
"mac": Array [
8989
Object {
9090
"arch": 1,
91-
"file": "TestApp-1.1.0.dmg",
91+
"file": "TestApp-1.1.0-mac.dmg",
9292
"safeArtifactName": "TestApp-1.1.0.dmg",
9393
},
9494
Object {

‎test/src/helpers/packTester.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ export function createMacTargetTest(target: Array<MacOsTargetName>) {
424424

425425
const tempDir = path.join(context.outDir, getTempName())
426426
await mkdir(tempDir)
427-
await exec("tar", ["xf", path.join(context.outDir, "mac", "Test App ßW-1.1.0-mac.tar.gz")], {cwd: tempDir})
427+
await exec("tar", ["xf", path.join(context.outDir, "Test App ßW-1.1.0-mac.tar.gz")], {cwd: tempDir})
428428
await assertThat(path.join(tempDir, "Test App ßW.app")).isDirectory()
429429
}
430430
})

‎test/src/mac/macPackagerTest.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ test.ifMac("two-package", () => assertPack("test-app", {
1111
appMetadata: {
1212
repository: "foo/bar"
1313
},
14+
config: {
15+
artifactName: "${name}-${version}-${os}.${ext}",
16+
},
1417
}, {
1518
signed: true,
1619
}))
@@ -60,7 +63,7 @@ test.ifMac("one-package", app({
6063
await assertThat(path.join(appDir, "Contents", "Resources", "someFoo.icns")).isFile()
6164
},
6265
packed: async context => {
63-
expect(convertUpdateInfo(await readJson(path.join(context.outDir, "mac", "latest-mac.json")))).toMatchSnapshot()
66+
expect(convertUpdateInfo(await readJson(path.join(context.outDir, "latest-mac.json")))).toMatchSnapshot()
6467
},
6568
}))
6669

‎yarn.lock

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"7zip-bin-mac" "^1.0.1"
2323
"7zip-bin-win" "^2.0.2"
2424

25-
"@types/electron@^1.4.34":
26-
version "1.4.34"
27-
resolved "https://registry.yarnpkg.com/@types/electron/-/electron-1.4.34.tgz#f9ff3d4b54c0abc80710f40f935c59b253da23ad"
25+
"@types/electron@^1.4.35":
26+
version "1.4.35"
27+
resolved "https://registry.yarnpkg.com/@types/electron/-/electron-1.4.35.tgz#48e5e6ef0b49f27b9f78b87d80f796e3f0a4f33c"
2828
dependencies:
2929
"@types/node" "*"
3030

@@ -45,8 +45,8 @@
4545
resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-0.6.8.tgz#fb38ae420be9c9b679bed3f974201120947b920f"
4646

4747
"@types/node@*":
48-
version "7.0.11"
49-
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.11.tgz#55680189f2335f080f0aeb57871f0b9823646d89"
48+
version "7.0.12"
49+
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.12.tgz#ae5f67a19c15f752148004db07cbbb372e69efc9"
5050

5151
"@types/source-map-support@^0.2.28":
5252
version "0.2.28"
@@ -97,7 +97,7 @@ ajv@^4.9.1:
9797
co "^4.6.0"
9898
json-stable-stringify "^1.0.1"
9999

100-
ajv@^5.0.4-beta.0:
100+
ajv@^5.0.4-beta.2:
101101
version "5.0.4-beta.2"
102102
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.0.4-beta.2.tgz#2b1dbc09cbd69ee0797489894ab38d12c914e121"
103103
dependencies:
@@ -271,9 +271,9 @@ asynckit@^0.4.0:
271271
version "0.4.0"
272272
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
273273

274-
aws-sdk@^2.32.0:
275-
version "2.32.0"
276-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.32.0.tgz#9fe278b2ec1b12fddd1afeb74439581cdc2e5990"
274+
aws-sdk@^2.34.0:
275+
version "2.34.0"
276+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.34.0.tgz#bf96fb617aa0e1d8728760ca7f00d46d0d9c685c"
277277
dependencies:
278278
buffer "4.9.1"
279279
crypto-browserify "1.0.9"
@@ -854,9 +854,9 @@ content-type-parser@^1.0.1:
854854
version "1.0.1"
855855
resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
856856

857-
convert-source-map@^1.1.0, convert-source-map@^1.4.0:
858-
version "1.4.0"
859-
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.4.0.tgz#e3dad195bf61bfe13a7a3c73e9876ec14a0268f3"
857+
convert-source-map@^1.1.0, convert-source-map@^1.5.0:
858+
version "1.5.0"
859+
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
860860

861861
core-js@^2.4.0:
862862
version "2.4.1"
@@ -2285,9 +2285,9 @@ node-emoji@^1.5.1:
22852285
dependencies:
22862286
string.prototype.codepointat "^0.2.0"
22872287

2288-
node-forge@^0.7.0:
2289-
version "0.7.0"
2290-
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.0.tgz#5e0782a44e5e093fae3676d59f84ecfb38a4baad"
2288+
node-forge@^0.7.1:
2289+
version "0.7.1"
2290+
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.1.tgz#9da611ea08982f4b94206b3beb4cc9665f20c300"
22912291

22922292
node-int64@^0.4.0:
22932293
version "0.4.0"
@@ -2324,8 +2324,10 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-
23242324
validate-npm-package-license "^3.0.1"
23252325

23262326
normalize-path@^2.0.0, normalize-path@^2.0.1:
2327-
version "2.0.1"
2328-
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
2327+
version "2.1.1"
2328+
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
2329+
dependencies:
2330+
remove-trailing-separator "^1.0.1"
23292331

23302332
npm-run-path@^1.0.0:
23312333
version "1.0.0"
@@ -2608,8 +2610,8 @@ randomatic@^1.1.3:
26082610
kind-of "^3.0.2"
26092611

26102612
rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
2611-
version "1.1.7"
2612-
resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea"
2613+
version "1.2.0"
2614+
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.0.tgz#c7de973b7b46297c041366b2fd3d2363b1697c66"
26132615
dependencies:
26142616
deep-extend "~0.4.0"
26152617
ini "~1.3.0"
@@ -2702,6 +2704,10 @@ registry-url@^3.0.3:
27022704
dependencies:
27032705
rc "^1.0.1"
27042706

2707+
remove-trailing-separator@^1.0.1:
2708+
version "1.0.1"
2709+
resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
2710+
27052711
repeat-element@^1.1.2:
27062712
version "1.1.2"
27072713
resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
@@ -3207,16 +3213,16 @@ type-check@~0.3.2:
32073213
dependencies:
32083214
prelude-ls "~1.1.2"
32093215

3210-
typescript-json-schema@0.10.0:
3211-
version "0.10.0"
3212-
resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.10.0.tgz#e05a02c466e9f5998d09e9565dab76f1bf5d6bae"
3216+
typescript-json-schema@0.11.0:
3217+
version "0.11.0"
3218+
resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.11.0.tgz#58b8ca2697937bb99edc6662c7bbf39c6145b231"
32133219
dependencies:
32143220
glob "~7.1.1"
32153221
json-stable-stringify "^1.0.1"
32163222
typescript "~2.1.5"
3217-
yargs "^6.6.0"
3223+
yargs "^7.0.2"
32183224

3219-
typescript@^2.2.1:
3225+
typescript@^2.2.2:
32203226
version "2.2.2"
32213227
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.2.tgz#606022508479b55ffa368b58fee963a03dfd7b0c"
32223228

@@ -3229,8 +3235,8 @@ typical@^2.4.2, typical@^2.6.0:
32293235
resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.0.tgz#89d51554ab139848a65bcc2c8772f8fb450c40ed"
32303236

32313237
uglify-js@^2.6:
3232-
version "2.8.16"
3233-
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.16.tgz#d286190b6eefc6fd65eb0ecac6551e0b0e8839a4"
3238+
version "2.8.18"
3239+
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.18.tgz#925d14bae48ab62d1883b41afe6e2261662adb8e"
32343240
dependencies:
32353241
source-map "~0.5.1"
32363242
yargs "~3.10.0"
@@ -3535,7 +3541,7 @@ yargs-parser@^5.0.0:
35353541
dependencies:
35363542
camelcase "^3.0.0"
35373543

3538-
yargs@^6.0.0, yargs@^6.3.0, yargs@^6.6.0:
3544+
yargs@^6.0.0, yargs@^6.3.0:
35393545
version "6.6.0"
35403546
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
35413547
dependencies:

0 commit comments

Comments
 (0)