Configure builder and change to yarn

jloh02 · Jun 5, 2022 · 57a2510 · 57a2510
1 parent 7c4d1bc
commit 57a2510
Show file tree

Hide file tree

Showing 8 changed files with 2,599 additions and 2,797 deletions.
diff --git a/electron-builder.json5 b/electron-builder.json5
@@ -5,12 +5,11 @@
   productName: "VALORANT Chat Client",
   publish: ["github"],
   directories: {
+    buildResources: "build",
     output: "release/${version}",
   },
-  files: ["dist"],
   win: {
     target: ["nsis"],
-    icon: "assets/icon.png",
   },
   nsis: {
     oneClick: false,
@@ -19,4 +18,11 @@
     allowToChangeInstallationDirectory: true,
     deleteAppDataOnUninstall: false,
   },
+  extraResources: [
+    {
+      from: "node_modules/regedit/vbs",
+      to: "regedit/vbs",
+      filter: ["**/*"],
+    },
+  ],
 }
diff --git a/packages/main/browser_window.ts b/packages/main/browser_window.ts
@@ -1,13 +1,11 @@
 import { SCREEN_DEFAULTS } from "./../constants";
 import { join } from "path";
-import { BrowserWindow, Tray, shell, globalShortcut, ipcMain } from "electron";
+import { BrowserWindow, shell, globalShortcut, ipcMain } from "electron";
 import log from "electron-log";
 import { getPreference, saveWindowPreferences } from "./preferences";
 import { startRiotClient } from "./windows";
 import { closeNotifications, showNotification } from "./notifications";
 
-let tray: Tray;
-
 export function createWindow(isPackaged: boolean, prefFound?: boolean) {
   let x: number | undefined;
   let y: number | undefined;
@@ -136,7 +134,7 @@ export function createMainRendererWindow(
         }
         break;
       case "OPEN_RIOT_CLIENT":
-        startRiotClient();
+        startRiotClient(isPackaged);
         break;
       default:
         log.warn("[WINDOW] Invalid window control command: " + command);

diff --git a/packages/main/index.ts b/packages/main/index.ts
@@ -52,7 +52,7 @@ app.on("activate", () => {
 });
 
 app.whenReady().then(() => {
-  startRiotClient();
+  startRiotClient(app.isPackaged);
 
   const prefFound = readPreferences(app);
   win = createMainRendererWindow(app.isPackaged, prefFound);

diff --git a/packages/main/windows.ts b/packages/main/windows.ts
@@ -2,10 +2,8 @@ import log from "electron-log";
 import child_process from "child_process";
 import regedit, { RegistryItemCollection } from "regedit";
 
-export async function startRiotClient() {
-  regedit.setExternalVBSLocation(
-    process.env.NODE_ENV === "production" ? "resources/regedit/vbs" : "vbs"
-  );
+export async function startRiotClient(isPackaged: boolean) {
+  regedit.setExternalVBSLocation(isPackaged ? "resources/regedit/vbs" : "vbs");
 
   const regPath = [
     "HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Riot Game valorant.live",

diff --git a/packages/renderer/src/components/chat/Chat.vue b/packages/renderer/src/components/chat/Chat.vue
@@ -125,7 +125,7 @@ onMounted(() => {
         if (unreadTimeout) clearTimeout(unreadTimeout);
         unreadTimeout = setTimeout(() => {
           allowUnread.value = true;
-        }, 1000);
+        }, 1000) as unknown as number;
       }
     } else if (command === "FRIEND") updateFriends(data);
   });
@@ -136,8 +136,8 @@ onMounted(() => {
       updateMessages(messages, false);
       chatMessagesView.value?.scrollLastMessage(false);
       unreadTimeout = setTimeout(() => {
-          allowUnread.value = true;
-        }, 1000);
+        allowUnread.value = true;
+      }, 1000) as unknown as number;
     });
   });
 });

diff --git a/packages/renderer/src/components/chat/UserList/ContextMenu/PartyInviteDialog.vue b/packages/renderer/src/components/chat/UserList/ContextMenu/PartyInviteDialog.vue
@@ -15,7 +15,7 @@ function show(message: string) {
   clearTimeout(timeout.value);
   timeout.value = setTimeout(() => {
     visibility.value = "no-show";
-  }, 2500);
+  }, 2500) as unknown as number;
 }
 
 defineExpose({ show });