Skip to content

Commit

Permalink
Fix some type-related issues.
Browse files Browse the repository at this point in the history
• Update MakerDMG config and type check.
• Update type assertion in isPartialBuildInfo switch.
  • Loading branch information
SpacingBat3 committed Oct 6, 2024
1 parent 23093b1 commit 03288fc
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
27 changes: 14 additions & 13 deletions sources/code/build/forge.mts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
* Electron Forge Config (configForge.js)
*/

// Let's import some keys from the package.json:

import { resolve, dirname } from "node:path";
import { existsSync } from "node:fs";
import { fileURLToPath } from "node:url";
Expand All @@ -16,15 +14,15 @@ import type { BuildInfo } from "../common/global.js";

// Makers

import { MakerDeb } from "@electron-forge/maker-deb";
import { MakerSnap } from "@electron-forge/maker-snap";
import { MakerFlatpak } from "@electron-forge/maker-flatpak";
import { MakerRpm } from "@electron-forge/maker-rpm";
import { MakerZIP } from "@electron-forge/maker-zip";
import { MakerAppImage } from "@reforged/maker-appimage";
import { MakerDMG } from "@electron-forge/maker-dmg";
import { MakerWix } from "@electron-forge/maker-wix";
import { MakerSquirrel } from "@electron-forge/maker-squirrel";
import { MakerDeb } from "@electron-forge/maker-deb";
import { MakerSnap } from "@electron-forge/maker-snap";
import { MakerFlatpak } from "@electron-forge/maker-flatpak";
import { MakerRpm } from "@electron-forge/maker-rpm";
import { MakerZIP } from "@electron-forge/maker-zip";
import { MakerAppImage } from "@reforged/maker-appimage";
import { MakerDMG, type MakerDMGConfig } from "@electron-forge/maker-dmg";
import { MakerWix } from "@electron-forge/maker-wix";
import { MakerSquirrel } from "@electron-forge/maker-squirrel";

// Publishers

Expand Down Expand Up @@ -127,12 +125,14 @@ const config:ForgeConfig = {
setupExe: `${packageJson.data.name}-squirrel-${arch}.exe`,
setupMsi: `${packageJson.data.name}-squirrel-${arch}.msi`,
noMsi: false,
// I have no clue what it does, but I'm gonna risk it.
fixUpPaths: true,
iconUrl: `https://raw.githubusercontent.com/SpacingBat3/WebCord/${packageJson.data.version}/${iconFile}.ico`,
noDelta: true
})),
new MakerDMG({ icon: `${iconFile}.icns`, debug: getBuildID() === "devel" }),
new MakerDMG({
icon: `${iconFile}.icns`,
overwrite: true
} satisfies Partial<MakerDMGConfig> as unknown as MakerDMGConfig),
new MakerAppImage({ options: {
icon: `${iconFile}.png`,
genericName: desktopGeneric,
Expand Down Expand Up @@ -229,6 +229,7 @@ const config:ForgeConfig = {
owner: author,
name: "WebCord"
},
generateReleaseNotes: true,
draft: false
})
],
Expand Down
2 changes: 1 addition & 1 deletion sources/code/common/global.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export function isPartialBuildInfo(object: unknown): object is Partial<BuildInfo
return false;
// #2 'type' property contains 'release' and 'devel' strings if defined.
if("type" in object)
switch ((object as BuildInfo).type) {
switch ((object as Partial<BuildInfo>).type) {
case "release":
case "devel":
break;
Expand Down

0 comments on commit 03288fc

Please sign in to comment.