use typescript for electron-builder-config

Lunarequest · Dec 5, 2023 · d78400e · d78400e
1 parent a7e0a19
commit d78400e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 31 deletions.
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001502-1bb6149371-40dc63c640.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001502-1bb6149371-40dc63c640.zip
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001566-4f87887103-fdff43ed49.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001566-4f87887103-fdff43ed49.zip
diff --git a/electron-builder-config.js → electron-builder-config.ts b/electron-builder-config.js → electron-builder-config.ts
@@ -1,4 +1,6 @@
-const config = {
+import { Configuration } from "electron-builder";
+
+const config: Configuration = {
 	appId: "io.github.lunarequest.NightPDF",
 	productName: "NightPDF",
 	files: [
@@ -61,18 +63,9 @@ const config = {
 		synopsis: "Dark Mode PDF reader",
 		publish: ["github"],
 		target: [
-			{
-				target: "AppImage",
-				arch: ["x64", "arm64"],
-			},
-			{
-				target: "deb",
-				arch: ["x64", "arm64"],
-			},
-			{
-				target: "rpm",
-				arch: ["x64", "arm64"],
-			},
+			{ target: "AppImage", arch: ["x64", "arm64"] },
+			{ target: "deb", arch: ["x64", "arm64"] },
+			{ target: "rpm", arch: ["x64", "arm64"] },
 		],
 		mimeTypes: [
 			"application/pdf",
@@ -88,16 +81,7 @@ const config = {
 	},
 	win: {
 		publish: ["github"],
-		target: [
-			{
-				target: "nsis",
-				arch: ["x64", "arm64"],
-			},
-			{
-				target: "portable",
-				arch: ["x64", "arm64"],
-			},
-		],
+		target: ["nsis", "portable"],
 		icon: "build/icon.ico",
 	},
 	nsis: {
@@ -130,9 +114,11 @@ const config = {
 		sign: false,
 	},
 };
-
 if (process.env.OUTPUTDIR === "1") {
-	config.linux.target = ["dir"];
+	if (config.linux && config.target) {
+		//@ts-ignore
+		config.linux.target = ["dir"];
+	}
 }
 
-module.exports = config;
+export default config;
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
 		"typecheck": "tsc --noEmit",
 		"build": "rimraf out && tsx ./build.mts",
 		"dev": "yarn typecheck && yarn build && DEBUG=1 electron .",
-		"dist": "NODE_ENV='production' NODE_OPTIONS='--max-old-space-size=4096' yarn build && NODE_ENV='production' NODE_OPTIONS='--max-old-space-size=4096' electron-builder --config electron-builder-config.js",
+		"dist": "NODE_ENV='production' NODE_OPTIONS='--max-old-space-size=4096' yarn build && NODE_ENV='production' NODE_OPTIONS='--max-old-space-size=4096' electron-builder --config electron-builder-config.ts",
 		"lint": "biome check .",
 		"format": "biome format . --write",
 		"ci": "biome ci .",

diff --git a/tsconfig.json b/tsconfig.json
@@ -11,6 +11,5 @@
 	},
 	"exclude": [
 		"app/libs",
-		"electron-builder-config.json"
 	]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1277,9 +1277,9 @@ __metadata:
   linkType: hard
 
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001489":
-  version: 1.0.30001502
-  resolution: "caniuse-lite@npm:1.0.30001502"
-  checksum: 40dc63c6408c76d4cc54e75864dd843cdef0a58646fccba9e06bceb4c6ec0363568715d9224d850af5cebe5bd623a9059123d76d93a12ab71be40e5d714ef659
+  version: 1.0.30001566
+  resolution: "caniuse-lite@npm:1.0.30001566"
+  checksum: fdff43ed498201bf4f6074bd1112bd853e91973b6ccb016049b030948a7d197cba235ac4d93e712d1862b33a3c947bf4e62bad7011ccdac78e5179501b28d04a
   languageName: node
   linkType: hard