Skip to content

Commit 002a714

Browse files
committed
feat(forge): support electron-forge 3.0 API
1 parent f01415a commit 002a714

File tree

5 files changed

+22
-9
lines changed

5 files changed

+22
-9
lines changed

packages/electron-builder/src/forge/forge-maker.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
import * as path from "path"
22
import { build, CliOptions } from "../builder"
33

4-
export function buildForge(appDir: string, options: CliOptions) {
4+
export interface ForgeOptions {
5+
readonly dir: string
6+
}
7+
8+
export function buildForge(forgeOptions: ForgeOptions, options: CliOptions) {
9+
const appDir = forgeOptions.dir
510
return build(Object.assign({
611
prepackaged: appDir,
712
config: {

packages/electron-forge-maker-appimage/main.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
66

77
const buildForge = require("electron-builder").buildForge
88

9-
exports.default = function (appDir, appName, targetArch) {
10-
return buildForge(appDir, {linux: [`appimage:${targetArch}`]})
9+
exports.isSupportedOnCurrentPlatform = () => Promise.resolve(true)
10+
11+
exports.default = function (options) {
12+
return buildForge(options, {linux: [`appimage:${options.targetArch}`]})
1113
}

packages/electron-forge-maker-nsis-web/main.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
66

77
const buildForge = require("electron-builder").buildForge
88

9-
exports.default = function (appDir, appName, targetArch) {
10-
return buildForge(appDir, {win: [`nsis-web:${targetArch}`]})
9+
exports.isSupportedOnCurrentPlatform = () => Promise.resolve(true)
10+
11+
exports.default = function (options) {
12+
return buildForge(options, {win: [`nsis-web:${options.targetArch}`]})
1113
}

packages/electron-forge-maker-nsis/main.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
66

77
const buildForge = require("electron-builder").buildForge
88

9-
exports.default = function (appDir, appName, targetArch) {
10-
return buildForge(appDir, {win: [`nsis:${targetArch}`]})
9+
exports.isSupportedOnCurrentPlatform = () => Promise.resolve(true)
10+
11+
exports.default = function (options) {
12+
return buildForge(options, {win: [`nsis:${options.targetArch}`]})
1113
}

packages/electron-forge-maker-snap/main.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
66

77
const buildForge = require("electron-builder").buildForge
88

9-
exports.default = function (appDir, appName, targetArch) {
10-
return buildForge(appDir, {linux: [`snap:${targetArch}`]})
9+
exports.isSupportedOnCurrentPlatform = () => Promise.resolve(true)
10+
11+
exports.default = function (options) {
12+
return buildForge(options, {linux: [`snap:${options.targetArch}`]})
1113
}

0 commit comments

Comments
 (0)