diff --git a/forge.config.ts b/forge.config.ts index fa8f10115..e44e895d1 100644 --- a/forge.config.ts +++ b/forge.config.ts @@ -158,9 +158,13 @@ const config: ForgeConfig = { iconUrl: "https://app.follow.is/favicon.ico", }), new MakerAppImage({ - options: { - icon: "resources/icon.png", - mimeType: ["x-scheme-handler/follow"], + config: { + icons: [ + { + file: "resources/icon.png", + size: 256, + }, + ], }, }), ], diff --git a/package.json b/package.json index 80928d3d8..0c1e1ae43 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,8 @@ "daisyui": "patches/daisyui.patch", "jsonpointer": "patches/jsonpointer.patch", "workbox-precaching": "patches/workbox-precaching.patch", - "@tanstack/react-virtual": "patches/@tanstack__react-virtual.patch" + "@tanstack/react-virtual": "patches/@tanstack__react-virtual.patch", + "@pengx17/electron-forge-maker-appimage": "patches/@pengx17__electron-forge-maker-appimage.patch" }, "overrides": { "@types/react": "npm:@types/react@^18.3.12", diff --git a/patches/@pengx17__electron-forge-maker-appimage.patch b/patches/@pengx17__electron-forge-maker-appimage.patch new file mode 100644 index 000000000..7a881b85e --- /dev/null +++ b/patches/@pengx17__electron-forge-maker-appimage.patch @@ -0,0 +1,55 @@ +diff --git a/dist/src/MakerAppimage.d.ts b/dist/src/MakerAppimage.d.ts +index 389100d510dd90c10b28d3f3ee0996c01a7714d9..7fa2bfd46bbf7b7d10e4b0190fda6a3fae053c37 100644 +--- a/dist/src/MakerAppimage.d.ts ++++ b/dist/src/MakerAppimage.d.ts +@@ -1,14 +1,28 @@ +-import MakerBase, { MakerOptions } from "@electron-forge/maker-base"; +-import { ForgePlatform } from "@electron-forge/shared-types"; +-import { MakerAppImageConfig } from "./Config"; ++import MakerBase, { MakerOptions } from "@electron-forge/maker-base" ++import { ForgePlatform } from "@electron-forge/shared-types" ++import { MakerAppImageConfig } from "./Config" ++ ++export interface AppImageForgeConfig { ++ template?: string ++ chmodChromeSandbox?: string ++ icons?: { file: string; size: number }[] ++} ++ + export default class MakerAppImage extends MakerBase { +- name: string; +- defaultPlatforms: ForgePlatform[]; +- isSupportedOnCurrentPlatform(): boolean; +- make({ dir, // '/home/build/Software/monorepo/packages/electron/out/canary/name-linux-x64' ++ constructor(private config: { config: AppImageForgeConfig }) { ++ super() ++ } ++ ++ name: string ++ defaultPlatforms: ForgePlatform[] ++ isSupportedOnCurrentPlatform(): boolean ++ make({ ++ dir, // '/home/build/Software/monorepo/packages/electron/out/canary/name-linux-x64' + appName, // 'name' + makeDir, // '/home/build/Software/monorepo/packages/electron/out/canary/make', + targetArch, // 'x64' +- packageJSON, targetPlatform, //'linux', +- forgeConfig, }: MakerOptions): Promise; ++ packageJSON, ++ targetPlatform, //'linux', ++ forgeConfig, ++ }: MakerOptions): Promise + } +diff --git a/dist/src/MakerAppimage.js b/dist/src/MakerAppimage.js +index a57b183ad759c91aa36691a430e87c385ba63f62..a0bce031399f4dbc7cefab9a5c4460ee4cd88518 100644 +--- a/dist/src/MakerAppimage.js ++++ b/dist/src/MakerAppimage.js +@@ -48,7 +48,7 @@ const isIForgeResolvableMaker = (maker) => { + class MakerAppImage extends maker_base_1.default { + constructor() { + super(...arguments); +- this.name = "appImage"; ++ this.name = makerPackageName; + this.defaultPlatforms = ["linux"]; + } + isSupportedOnCurrentPlatform() { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d0f613725..40bf4367b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,15 +5,18 @@ settings: excludeLinksFromLockfile: false overrides: - is-core-module: npm:@nolyfill/is-core-module@^1 - isarray: npm:@nolyfill/isarray@^1 '@types/react': npm:@types/react@^18.3.12 '@types/react-dom': npm:@types/react-dom@^18.3.1 + is-core-module: npm:@nolyfill/is-core-module@^1 + isarray: npm:@nolyfill/isarray@^1 patchedDependencies: '@mozilla/readability': hash: 43niildbdafdxi7qfcwhpkkxwa path: patches/@mozilla__readability.patch + '@pengx17/electron-forge-maker-appimage': + hash: okasuqmiq36v5m3p4p53exuk3e + path: patches/@pengx17__electron-forge-maker-appimage.patch '@tanstack/react-virtual': hash: 44veyovhgqddxy4cx3biv6jmoa path: patches/@tanstack__react-virtual.patch @@ -102,7 +105,7 @@ importers: version: 0.5.0(patch_hash=43niildbdafdxi7qfcwhpkkxwa) '@pengx17/electron-forge-maker-appimage': specifier: 1.2.1 - version: 1.2.1(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8) + version: 1.2.1(patch_hash=okasuqmiq36v5m3p4p53exuk3e)(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8) '@sentry/vite-plugin': specifier: 2.22.7 version: 2.22.7(encoding@0.1.13) @@ -14556,7 +14559,7 @@ snapshots: pvtsutils: 1.3.6 tslib: 2.8.1 - '@pengx17/electron-forge-maker-appimage@1.2.1(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8)': + '@pengx17/electron-forge-maker-appimage@1.2.1(patch_hash=okasuqmiq36v5m3p4p53exuk3e)(dmg-builder@25.1.8)(electron-builder-squirrel-windows@25.1.8)': dependencies: '@electron-forge/maker-base': 7.6.0 '@electron-forge/shared-types': 7.6.0