Skip to content

Commit 0bba4fe

Browse files
develardevelar
committed
fix: dmg/pkg in the out dir, not in the subdir mac
BREAKING CHANGE: dmg/pkg in the out dir, not in the subdir mac
1 parent 8dd6cd5 commit 0bba4fe

23 files changed

+484
-432
lines changed

‎.idea/dictionaries/develar.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ export default class MacPackager extends PlatformPackager<MacOptions> {
5252
break
5353

5454
case "dmg":
55-
mapper("dmg", outDir => new DmgTarget(this, path.join(outDir, "mac")))
55+
mapper("dmg", outDir => new DmgTarget(this, outDir))
5656
break
5757

5858
case "pkg":
59-
mapper("pkg", outDir => new PkgTarget(this, path.join(outDir, "mac")))
59+
mapper("pkg", outDir => new PkgTarget(this, outDir))
6060
break
6161

6262
default:

‎test/out/__snapshots__/BuildTest.js.snap

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -237,90 +237,3 @@ Object {
237237
},
238238
}
239239
`;
240-
241-
exports[`sign custom buildResources and output dirs: linux 1`] = `
242-
Array [
243-
"TestApp-1.1.0-x86_64.AppImage",
244-
]
245-
`;
246-
247-
exports[`sign custom buildResources and output dirs: win 1`] = `
248-
Array [
249-
"Test App ßW Setup 1.1.0.exe",
250-
]
251-
`;
252-
253-
exports[`sign custom buildResources and output dirs: win 2`] = `
254-
Array [
255-
"TestApp-Setup-1.1.0.exe",
256-
]
257-
`;
258-
259-
exports[`sign scheme validation 1`] = `
260-
"Config is invalid:
261-
{
262-
\\"foo\\": \\"Unknown option\\",
263-
\\"mac\\": [
264-
{
265-
\\"foo\\": \\"Unknown option\\"
266-
},
267-
\\"Invalid option object\\"
268-
]
269-
}
270-
271-
Raw validation errors: [
272-
{
273-
\\"keyword\\": \\"additionalProperties\\",
274-
\\"dataPath\\": \\"\\",
275-
\\"schemaPath\\": \\"#/additionalProperties\\",
276-
\\"params\\": {
277-
\\"additionalProperty\\": \\"foo\\"
278-
},
279-
\\"message\\": \\"should NOT have additional properties\\"
280-
},
281-
{
282-
\\"keyword\\": \\"additionalProperties\\",
283-
\\"dataPath\\": \\".mac\\",
284-
\\"schemaPath\\": \\"#/additionalProperties\\",
285-
\\"params\\": {
286-
\\"additionalProperty\\": \\"foo\\"
287-
},
288-
\\"message\\": \\"should NOT have additional properties\\"
289-
},
290-
{
291-
\\"keyword\\": \\"type\\",
292-
\\"dataPath\\": \\".mac\\",
293-
\\"schemaPath\\": \\"#/properties/mac/anyOf/1/type\\",
294-
\\"params\\": {
295-
\\"type\\": \\"null\\"
296-
},
297-
\\"message\\": \\"should be null\\"
298-
},
299-
{
300-
\\"keyword\\": \\"anyOf\\",
301-
\\"dataPath\\": \\".mac\\",
302-
\\"schemaPath\\": \\"#/properties/mac/anyOf\\",
303-
\\"params\\": {},
304-
\\"message\\": \\"should match some schema in anyOf\\"
305-
}
306-
]"
307-
`;
308-
309-
exports[`sign scheme validation 2 1`] = `
310-
"Config is invalid:
311-
{
312-
\\"appId\\": \\"Should be null,string\\"
313-
}
314-
315-
Raw validation errors: [
316-
{
317-
\\"keyword\\": \\"type\\",
318-
\\"dataPath\\": \\".appId\\",
319-
\\"schemaPath\\": \\"#/properties/appId/type\\",
320-
\\"params\\": {
321-
\\"type\\": \\"null,string\\"
322-
},
323-
\\"message\\": \\"should be null,string\\"
324-
}
325-
]"
326-
`;

‎test/out/__snapshots__/ExtraBuildTest.js.snap

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
// Jest Snapshot v1, https://goo.gl/fbAQLP
2+
3+
exports[`custom buildResources and output dirs: linux 1`] = `
4+
Array [
5+
Object {
6+
"file": "TestApp-1.1.0-x86_64.AppImage",
7+
"safeArtifactName": undefined,
8+
},
9+
]
10+
`;
11+
12+
exports[`custom buildResources and output dirs: win 1`] = `
13+
Array [
14+
Object {
15+
"file": "Test App ßW Setup 1.1.0.exe",
16+
"safeArtifactName": "TestApp-Setup-1.1.0.exe",
17+
},
18+
]
19+
`;
20+
21+
exports[`scheme validation 1`] = `
22+
"Config is invalid:
23+
{
24+
\\"foo\\": \\"Unknown option\\",
25+
\\"mac\\": [
26+
{
27+
\\"foo\\": \\"Unknown option\\"
28+
},
29+
\\"Invalid option object\\"
30+
]
31+
}
32+
33+
Raw validation errors: [
34+
{
35+
\\"keyword\\": \\"additionalProperties\\",
36+
\\"dataPath\\": \\"\\",
37+
\\"schemaPath\\": \\"#/additionalProperties\\",
38+
\\"params\\": {
39+
\\"additionalProperty\\": \\"foo\\"
40+
},
41+
\\"message\\": \\"should NOT have additional properties\\"
42+
},
43+
{
44+
\\"keyword\\": \\"additionalProperties\\",
45+
\\"dataPath\\": \\".mac\\",
46+
\\"schemaPath\\": \\"#/additionalProperties\\",
47+
\\"params\\": {
48+
\\"additionalProperty\\": \\"foo\\"
49+
},
50+
\\"message\\": \\"should NOT have additional properties\\"
51+
},
52+
{
53+
\\"keyword\\": \\"type\\",
54+
\\"dataPath\\": \\".mac\\",
55+
\\"schemaPath\\": \\"#/properties/mac/anyOf/1/type\\",
56+
\\"params\\": {
57+
\\"type\\": \\"null\\"
58+
},
59+
\\"message\\": \\"should be null\\"
60+
},
61+
{
62+
\\"keyword\\": \\"anyOf\\",
63+
\\"dataPath\\": \\".mac\\",
64+
\\"schemaPath\\": \\"#/properties/mac/anyOf\\",
65+
\\"params\\": {},
66+
\\"message\\": \\"should match some schema in anyOf\\"
67+
}
68+
]"
69+
`;
70+
71+
exports[`scheme validation 2 1`] = `
72+
"Config is invalid:
73+
{
74+
\\"appId\\": \\"Should be null,string\\"
75+
}
76+
77+
Raw validation errors: [
78+
{
79+
\\"keyword\\": \\"type\\",
80+
\\"dataPath\\": \\".appId\\",
81+
\\"schemaPath\\": \\"#/properties/appId/type\\",
82+
\\"params\\": {
83+
\\"type\\": \\"null,string\\"
84+
},
85+
\\"message\\": \\"should be null,string\\"
86+
}
87+
]"
88+
`;

‎test/out/__snapshots__/filesTest.js.snap

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ exports[`expand not defined env 1`] = `"Env FOO_NOT_DEFINED is not defined"`;
44

55
exports[`extraResources on Linux and Windows 1`] = `
66
Array [
7-
"RELEASES",
8-
"Test App ßW Setup 1.1.0.exe",
9-
"TestApp-1.1.0-full.nupkg",
10-
]
11-
`;
12-
13-
exports[`extraResources on Linux and Windows 2`] = `
14-
Array [
15-
"TestApp-Setup-1.1.0.exe",
7+
Object {
8+
"file": "Test App ßW Setup 1.1.0.exe",
9+
"safeArtifactName": "TestApp-Setup-1.1.0.exe",
10+
},
11+
Object {
12+
"file": "TestApp-1.1.0-full.nupkg",
13+
"safeArtifactName": undefined,
14+
},
15+
Object {
16+
"file": "RELEASES",
17+
"safeArtifactName": undefined,
18+
},
1619
]
1720
`;

‎test/out/linux/__snapshots__/debTest.js.snap

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
exports[`arm deb 1`] = `
44
Array [
5-
"TestApp_1.1.0_armv7l.deb",
5+
Object {
6+
"file": "TestApp_1.1.0_armv7l.deb",
7+
"safeArtifactName": undefined,
8+
},
69
]
710
`;
811

@@ -20,6 +23,9 @@ Categories=Development;
2023

2124
exports[`deb 1`] = `
2225
Array [
23-
"TestApp_1.1.0_amd64.deb",
26+
Object {
27+
"file": "TestApp_1.1.0_amd64.deb",
28+
"safeArtifactName": undefined,
29+
},
2430
]
2531
`;

‎test/out/linux/__snapshots__/fpmTest.js.snap

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,38 @@
22

33
exports[`rpm and tar.gz 1`] = `
44
Array [
5-
"TestApp-1.1.0.rpm",
6-
"TestApp-1.1.0.tar.gz",
5+
Object {
6+
"file": "TestApp-1.1.0.rpm",
7+
"safeArtifactName": undefined,
8+
},
9+
Object {
10+
"file": "TestApp-1.1.0.tar.gz",
11+
"safeArtifactName": "TestApp-1.1.0.tar.gz",
12+
},
713
]
814
`;
915

1016
exports[`targets 1`] = `
1117
Array [
12-
"TestApp-1.1.0.7z",
13-
"TestApp-1.1.0.freebsd",
14-
"TestApp-1.1.0.pacman",
15-
"TestApp-1.1.0.sh",
16-
"TestApp-1.1.0.zip",
18+
Object {
19+
"file": "TestApp-1.1.0.7z",
20+
"safeArtifactName": "TestApp-1.1.0.7z",
21+
},
22+
Object {
23+
"file": "TestApp-1.1.0.freebsd",
24+
"safeArtifactName": undefined,
25+
},
26+
Object {
27+
"file": "TestApp-1.1.0.pacman",
28+
"safeArtifactName": undefined,
29+
},
30+
Object {
31+
"file": "TestApp-1.1.0.sh",
32+
"safeArtifactName": undefined,
33+
},
34+
Object {
35+
"file": "TestApp-1.1.0.zip",
36+
"safeArtifactName": "TestApp-1.1.0.zip",
37+
},
1738
]
1839
`;

‎test/out/linux/__snapshots__/linuxArchiveTest.js.snap

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,17 @@
22

33
exports[`tar 1`] = `
44
Array [
5-
"TestApp-1.1.0.tar.bz2",
6-
"TestApp-1.1.0.tar.lz",
7-
"TestApp-1.1.0.tar.xz",
5+
Object {
6+
"file": "TestApp-1.1.0.tar.bz2",
7+
"safeArtifactName": "TestApp-1.1.0.tar.bz2",
8+
},
9+
Object {
10+
"file": "TestApp-1.1.0.tar.lz",
11+
"safeArtifactName": "TestApp-1.1.0.tar.lz",
12+
},
13+
Object {
14+
"file": "TestApp-1.1.0.tar.xz",
15+
"safeArtifactName": "TestApp-1.1.0.tar.xz",
16+
},
817
]
918
`;

‎test/out/linux/__snapshots__/linuxPackagerTest.js.snap

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,19 @@ Categories=Development;
1515

1616
exports[`AppImage 1`] = `
1717
Array [
18-
"TestApp-1.1.0-x86_64.AppImage",
18+
Object {
19+
"file": "TestApp-1.1.0-x86_64.AppImage",
20+
"safeArtifactName": undefined,
21+
},
1922
]
2023
`;
2124

2225
exports[`icons from ICNS 1`] = `
2326
Array [
24-
"TestApp-1.1.0-x86_64.AppImage",
27+
Object {
28+
"file": "TestApp-1.1.0-x86_64.AppImage",
29+
"safeArtifactName": undefined,
30+
},
2531
]
2632
`;
2733

‎test/out/linux/__snapshots__/snapTest.js.snap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,9 @@ Categories=Development;
257257

258258
exports[`snap 1`] = `
259259
Array [
260-
"sep_1.1.0_amd64.snap",
260+
Object {
261+
"file": "sep_1.1.0_amd64.snap",
262+
"safeArtifactName": undefined,
263+
},
261264
]
262265
`;

0 commit comments

Comments
 (0)