Skip to content

Commit 5a079d2

Browse files
erickzhaoerickzhao
authored
Merge branch 'main' into fix-dont-sanitize-github-asset-names
2 parents 715034a + 81160c5 commit 5a079d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+263
-175
lines changed

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
33
"useWorkspaces": true,
4-
"version": "7.2.0",
4+
"version": "7.3.0",
55
"npmClient": "yarn"
66
}

‎packages/api/cli/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/cli",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "A complete tool for building modern Electron applications",
55
"repository": "https://github.com/electron/forge",
66
"author": "Samuel Attard",
@@ -17,8 +17,8 @@
1717
"mocha": "^9.0.1"
1818
},
1919
"dependencies": {
20-
"@electron-forge/core": "7.2.0",
21-
"@electron-forge/shared-types": "7.2.0",
20+
"@electron-forge/core": "7.3.0",
21+
"@electron-forge/shared-types": "7.3.0",
2222
"@electron/get": "^3.0.0",
2323
"chalk": "^4.0.0",
2424
"commander": "^4.1.1",

‎packages/api/core/package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/core",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "A complete tool for building modern Electron applications",
55
"repository": "https://github.com/electron/forge",
66
"main": "dist/api/index.js",
@@ -15,16 +15,16 @@
1515
"test:slow": "yarn test:base test/slow/**/*_spec_slow.ts"
1616
},
1717
"devDependencies": {
18-
"@electron-forge/maker-appx": "7.2.0",
19-
"@electron-forge/maker-deb": "7.2.0",
20-
"@electron-forge/maker-dmg": "7.2.0",
21-
"@electron-forge/maker-flatpak": "7.2.0",
22-
"@electron-forge/maker-rpm": "7.2.0",
23-
"@electron-forge/maker-snap": "7.2.0",
24-
"@electron-forge/maker-squirrel": "7.2.0",
25-
"@electron-forge/maker-wix": "7.2.0",
26-
"@electron-forge/maker-zip": "7.2.0",
27-
"@electron-forge/test-utils": "7.2.0",
18+
"@electron-forge/maker-appx": "7.3.0",
19+
"@electron-forge/maker-deb": "7.3.0",
20+
"@electron-forge/maker-dmg": "7.3.0",
21+
"@electron-forge/maker-flatpak": "7.3.0",
22+
"@electron-forge/maker-rpm": "7.3.0",
23+
"@electron-forge/maker-snap": "7.3.0",
24+
"@electron-forge/maker-squirrel": "7.3.0",
25+
"@electron-forge/maker-wix": "7.3.0",
26+
"@electron-forge/maker-zip": "7.3.0",
27+
"@electron-forge/test-utils": "7.3.0",
2828
"@types/interpret": "^1.1.1",
2929
"@types/progress": "^2.0.5",
3030
"@types/rechoir": "^0.6.1",
@@ -40,17 +40,17 @@
4040
"yaml-hook": "^1.0.0"
4141
},
4242
"dependencies": {
43-
"@electron-forge/core-utils": "7.2.0",
44-
"@electron-forge/maker-base": "7.2.0",
45-
"@electron-forge/plugin-base": "7.2.0",
46-
"@electron-forge/publisher-base": "7.2.0",
47-
"@electron-forge/shared-types": "7.2.0",
48-
"@electron-forge/template-base": "7.2.0",
49-
"@electron-forge/template-vite": "7.2.0",
50-
"@electron-forge/template-vite-typescript": "7.2.0",
51-
"@electron-forge/template-webpack": "7.2.0",
52-
"@electron-forge/template-webpack-typescript": "7.2.0",
53-
"@electron-forge/tracer": "7.2.0",
43+
"@electron-forge/core-utils": "7.3.0",
44+
"@electron-forge/maker-base": "7.3.0",
45+
"@electron-forge/plugin-base": "7.3.0",
46+
"@electron-forge/publisher-base": "7.3.0",
47+
"@electron-forge/shared-types": "7.3.0",
48+
"@electron-forge/template-base": "7.3.0",
49+
"@electron-forge/template-vite": "7.3.0",
50+
"@electron-forge/template-vite-typescript": "7.3.0",
51+
"@electron-forge/template-webpack": "7.3.0",
52+
"@electron-forge/template-webpack-typescript": "7.3.0",
53+
"@electron-forge/tracer": "7.3.0",
5454
"@electron/get": "^3.0.0",
5555
"@electron/packager": "^18.1.2",
5656
"@electron/rebuild": "^3.2.10",

‎packages/api/core/src/util/out-dir.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ import { ResolvedForgeConfig } from '@electron-forge/shared-types';
55
const BASE_OUT_DIR = 'out';
66

77
export default (baseDir: string, forgeConfig: ResolvedForgeConfig): string => {
8+
const baseOutDir = forgeConfig.outDir || BASE_OUT_DIR;
9+
810
if (forgeConfig.buildIdentifier) {
911
let identifier = forgeConfig.buildIdentifier;
1012
if (typeof identifier === 'function') {
1113
identifier = identifier();
1214
}
13-
if (identifier) return path.resolve(baseDir, BASE_OUT_DIR, identifier);
15+
if (identifier) return path.resolve(baseDir, baseOutDir, identifier);
1416
}
15-
return path.resolve(baseDir, BASE_OUT_DIR);
17+
18+
return path.resolve(baseDir, baseOutDir);
1619
};

‎packages/api/core/test/fast/out-dir_spec.ts

+32
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,35 @@ describe('out-dir', () => {
3030
});
3131
});
3232
});
33+
34+
describe('out-dir-dist', () => {
35+
const DIR = __dirname;
36+
37+
describe('getCurrentOutDir', () => {
38+
it('resolves to the dist directory when dist is declared', () => {
39+
expect(
40+
getCurrentOutDir(DIR, {
41+
outDir: 'dist',
42+
} as ResolvedForgeConfig)
43+
).to.equal(`${DIR}${path.sep}dist`);
44+
});
45+
46+
it('resolves to the provided identifier', () => {
47+
expect(
48+
getCurrentOutDir(DIR, {
49+
buildIdentifier: 'bar',
50+
outDir: 'dist',
51+
} as ResolvedForgeConfig)
52+
).to.equal(`${DIR}${path.sep}dist${path.sep}bar`);
53+
});
54+
55+
it('resolves to the return value of provided identifier getter', () => {
56+
expect(
57+
getCurrentOutDir(DIR, {
58+
buildIdentifier: () => 'thing',
59+
outDir: 'dist',
60+
} as ResolvedForgeConfig)
61+
).to.equal(`${DIR}${path.sep}dist${path.sep}thing`);
62+
});
63+
});
64+
});

‎packages/external/create-electron-app/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "create-electron-app",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "Create Electron App",
55
"main": "dist/index.js",
66
"typings": "dist/index.d.ts",
77
"author": "Samuel Attard",
88
"license": "MIT",
99
"dependencies": {
10-
"@electron-forge/cli": "7.2.0"
10+
"@electron-forge/cli": "7.3.0"
1111
},
1212
"bin": {
1313
"create-electron-app": "dist/index.js"

‎packages/maker/appx/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/maker-appx",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "AppX maker for Electron Forge",
55
"repository": "https://github.com/electron/forge",
66
"author": "Samuel Attard",
@@ -15,8 +15,8 @@
1515
"node": ">= 16.4.0"
1616
},
1717
"dependencies": {
18-
"@electron-forge/maker-base": "7.2.0",
19-
"@electron-forge/shared-types": "7.2.0",
18+
"@electron-forge/maker-base": "7.3.0",
19+
"@electron-forge/shared-types": "7.3.0",
2020
"cross-spawn": "^7.0.3",
2121
"fs-extra": "^10.0.0",
2222
"parse-author": "^2.0.0"

‎packages/maker/base/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/maker-base",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "Base maker for Electron Forge",
55
"repository": "https://github.com/electron/forge",
66
"author": "Samuel Attard",
@@ -16,7 +16,7 @@
1616
"node": ">= 16.4.0"
1717
},
1818
"dependencies": {
19-
"@electron-forge/shared-types": "7.2.0",
19+
"@electron-forge/shared-types": "7.3.0",
2020
"fs-extra": "^10.0.0",
2121
"which": "^2.0.2"
2222
},

‎packages/maker/deb/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/maker-deb",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "Deb maker for Electron Forge",
55
"repository": "https://github.com/electron/forge",
66
"author": "Samuel Attard",
@@ -18,8 +18,8 @@
1818
"node": ">= 16.4.0"
1919
},
2020
"dependencies": {
21-
"@electron-forge/maker-base": "7.2.0",
22-
"@electron-forge/shared-types": "7.2.0"
21+
"@electron-forge/maker-base": "7.3.0",
22+
"@electron-forge/shared-types": "7.3.0"
2323
},
2424
"optionalDependencies": {
2525
"electron-installer-debian": "^3.2.0"

‎packages/maker/dmg/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/maker-dmg",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "DMG maker for Electron Forge",
55
"repository": "https://github.com/electron/forge",
66
"author": "Samuel Attard",
@@ -22,8 +22,8 @@
2222
"node": ">= 16.4.0"
2323
},
2424
"dependencies": {
25-
"@electron-forge/maker-base": "7.2.0",
26-
"@electron-forge/shared-types": "7.2.0",
25+
"@electron-forge/maker-base": "7.3.0",
26+
"@electron-forge/shared-types": "7.3.0",
2727
"fs-extra": "^10.0.0"
2828
},
2929
"optionalDependencies": {

‎packages/maker/flatpak/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/maker-flatpak",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "Flatpak maker for Electron Forge",
55
"repository": "https://github.com/electron/forge",
66
"author": "Samuel Attard",
@@ -22,8 +22,8 @@
2222
"node": ">= 16.4.0"
2323
},
2424
"dependencies": {
25-
"@electron-forge/maker-base": "7.2.0",
26-
"@electron-forge/shared-types": "7.2.0",
25+
"@electron-forge/maker-base": "7.3.0",
26+
"@electron-forge/shared-types": "7.3.0",
2727
"fs-extra": "^10.0.0"
2828
},
2929
"optionalDependencies": {

‎packages/maker/pkg/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/maker-pkg",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "PKG maker for Electron Forge",
55
"repository": "https://github.com/electron/forge",
66
"license": "MIT",
@@ -17,8 +17,8 @@
1717
"node": ">= 16.4.0"
1818
},
1919
"dependencies": {
20-
"@electron-forge/maker-base": "7.2.0",
21-
"@electron-forge/shared-types": "7.2.0",
20+
"@electron-forge/maker-base": "7.3.0",
21+
"@electron-forge/shared-types": "7.3.0",
2222
"@electron/osx-sign": "^1.0.5"
2323
},
2424
"publishConfig": {

‎packages/maker/rpm/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/maker-rpm",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "Rpm maker for Electron Forge",
55
"repository": "https://github.com/electron/forge",
66
"author": "Samuel Attard",
@@ -22,8 +22,8 @@
2222
"node": ">= 16.4.0"
2323
},
2424
"dependencies": {
25-
"@electron-forge/maker-base": "7.2.0",
26-
"@electron-forge/shared-types": "7.2.0"
25+
"@electron-forge/maker-base": "7.3.0",
26+
"@electron-forge/shared-types": "7.3.0"
2727
},
2828
"optionalDependencies": {
2929
"electron-installer-redhat": "^3.2.0"

‎packages/maker/snap/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/maker-snap",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "Snap maker for Electron Forge",
55
"repository": "https://github.com/electron/forge",
66
"license": "MIT",
@@ -21,8 +21,8 @@
2121
"node": ">= 16.4.0"
2222
},
2323
"dependencies": {
24-
"@electron-forge/maker-base": "7.2.0",
25-
"@electron-forge/shared-types": "7.2.0"
24+
"@electron-forge/maker-base": "7.3.0",
25+
"@electron-forge/shared-types": "7.3.0"
2626
},
2727
"optionalDependencies": {
2828
"electron-installer-snap": "^5.2.0"

‎packages/maker/squirrel/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/maker-squirrel",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "Squirrel maker for Electron Forge",
55
"repository": "https://github.com/electron/forge",
66
"author": "Samuel Attard",
@@ -15,8 +15,8 @@
1515
"node": ">= 16.4.0"
1616
},
1717
"dependencies": {
18-
"@electron-forge/maker-base": "7.2.0",
19-
"@electron-forge/shared-types": "7.2.0",
18+
"@electron-forge/maker-base": "7.3.0",
19+
"@electron-forge/shared-types": "7.3.0",
2020
"fs-extra": "^10.0.0"
2121
},
2222
"optionalDependencies": {

‎packages/maker/wix/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/maker-wix",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "Wix maker for Electron Forge",
55
"repository": "https://github.com/electron/forge",
66
"author": "Samuel Attard",
@@ -15,8 +15,8 @@
1515
"node": ">= 16.4.0"
1616
},
1717
"dependencies": {
18-
"@electron-forge/maker-base": "7.2.0",
19-
"@electron-forge/shared-types": "7.2.0",
18+
"@electron-forge/maker-base": "7.3.0",
19+
"@electron-forge/shared-types": "7.3.0",
2020
"chalk": "^4.0.0",
2121
"electron-wix-msi": "^5.0.0",
2222
"log-symbols": "^4.0.0",

‎packages/maker/zip/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/maker-zip",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "ZIP maker for Electron Forge",
55
"repository": "https://github.com/electron/forge",
66
"author": "Samuel Attard",
@@ -16,8 +16,8 @@
1616
"node": ">= 16.4.0"
1717
},
1818
"dependencies": {
19-
"@electron-forge/maker-base": "7.2.0",
20-
"@electron-forge/shared-types": "7.2.0",
19+
"@electron-forge/maker-base": "7.3.0",
20+
"@electron-forge/shared-types": "7.3.0",
2121
"cross-zip": "^4.0.0",
2222
"fs-extra": "^10.0.0",
2323
"got": "^11.8.5"

‎packages/plugin/auto-unpack-natives/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@electron-forge/plugin-auto-unpack-natives",
3-
"version": "7.2.0",
3+
"version": "7.3.0",
44
"description": "Auto Unpack Natives plugin for Electron Forge, automatically adds native node modules to asar.unpacked",
55
"repository": "https://github.com/electron/forge",
66
"author": "Samuel Attard",
@@ -11,8 +11,8 @@
1111
"node": ">= 16.4.0"
1212
},
1313
"dependencies": {
14-
"@electron-forge/plugin-base": "7.2.0",
15-
"@electron-forge/shared-types": "7.2.0"
14+
"@electron-forge/plugin-base": "7.3.0",
15+
"@electron-forge/shared-types": "7.3.0"
1616
},
1717
"publishConfig": {
1818
"access": "public"

0 commit comments

Comments
 (0)