Revert "fix: attempt to fix package build (#570)" (#573)

This reverts commit 8839ba6.

Author: redshiftzero

forge.config.ts

@@ -1,18 +1,21 @@
-/* eslint-disable @typescript-eslint/no-require-imports, @typescript-eslint/no-explicit-any */
-const { MakerSquirrel } = require("@electron-forge/maker-squirrel");
-const { MakerDMG } = require("@electron-forge/maker-dmg");
-const { MakerZIP } = require("@electron-forge/maker-zip");
-const { MakerDeb } = require("@electron-forge/maker-deb");
-const { MakerRpm } = require("@electron-forge/maker-rpm");
-const { VitePlugin } = require("@electron-forge/plugin-vite");
-const { FusesPlugin } = require("@electron-forge/plugin-fuses");
-const { FuseV1Options, FuseVersion } = require("@electron/fuses");
-const { PublisherS3 } = require("@electron-forge/publisher-s3");
+import type { ForgeConfig } from "@electron-forge/shared-types";
+import { MakerSquirrel } from "@electron-forge/maker-squirrel";
+import { MakerDMG } from "@electron-forge/maker-dmg";
+import { MakerZIP } from "@electron-forge/maker-zip";
+import { MakerDeb } from "@electron-forge/maker-deb";
+import { MakerRpm } from "@electron-forge/maker-rpm";
+import { VitePlugin } from "@electron-forge/plugin-vite";
+import { FusesPlugin } from "@electron-forge/plugin-fuses";
+import { FuseV1Options, FuseVersion } from "@electron/fuses";
+import { PublisherS3 } from "@electron-forge/publisher-s3";
 
-const { execSync } = require("child_process");
-const path = require("path");
-const fs = require("fs");
-const os = require("os");
+import { type OsxSignOptions } from "@electron/packager/dist/types";
+import { type NotaryToolCredentials } from "@electron/notarize/lib/types";
+
+import { execSync } from "child_process";
+import path from "path";
+import fs from "fs";
+import os from "os";
 
 // Make sure build path exists
 const buildPath = path.join(__dirname, "build");
@@ -124,12 +127,12 @@ const mimeTypeScheme =
     : "x-scheme-handler/cyd-dev";
 
 // macOS signing and notarization options
-let osxSign: any | undefined;
-let osxNotarize: any | undefined;
+let osxSign: OsxSignOptions | undefined;
+let osxNotarize: NotaryToolCredentials | undefined;
 if (process.env.MACOS_RELEASE === "true") {
   osxSign = {
     identity: "Developer ID Application: Lockdown Systems LLC (G762K6CH36)",
-    optionsForFile: (filePath: string) => {
+    optionsForFile: (filePath) => {
       const entitlementDefault = path.join(
         assetsPath,
         "entitlements",
@@ -175,7 +178,7 @@ if (process.env.MACOS_RELEASE === "true") {
   };
 }
 
-const config = {
+const config: ForgeConfig = {
   packagerConfig: {
     name: process.env.CYD_ENV == "prod" ? "Cyd" : "Cyd Dev",
     executableName:
@@ -365,4 +368,4 @@ const config = {
   ],
 };
 
-module.exports = config;
+export default config;

scripts/make.js

@@ -1,7 +1,7 @@
 /* global console */
-const process = require("process");
-const os = require("os");
-const { execSync } = require("child_process");
+import process from "process";
+import os from "os";
+import { execSync } from "child_process";
 
 // Validate input