Merge branch 'main' into patch-1

2023-09-25 22:52:23 +02:00 · 2023-09-25 22:52:23 +02:00 · b82a64d316
commit b82a64d316
parent 2c5055c81a d5f63da939
5 changed files with 36 additions and 19 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "VencordDesktop",
-    "version": "0.3.0",
+    "version": "0.3.2",
    "private": true,
    "description": "",
    "keywords": [],
@ -23,7 +23,7 @@
        "watch": "pnpm build --watch"
    },
    "dependencies": {
-        "arrpc": "github:OpenAsar/arrpc#b47fd7d498e248955c843a7857dd26478b82190a"
+        "arrpc": "github:OpenAsar/arrpc#89f4da610ccfac93f461826a446a17cd3b23953d"
    },
    "devDependencies": {
        "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
@ -33,7 +33,7 @@
        "@typescript-eslint/parser": "^6.2.1",
        "@vencord/types": "^0.1.2",
        "dotenv": "^16.3.1",
-        "electron": "^25.4.0",
+        "electron": "^25.8.2",
        "electron-builder": "^24.6.3",
        "esbuild": "^0.18.17",
        "eslint": "^8.46.0",
@ -79,7 +79,8 @@
                "GenericName": "Internet Messenger",
                "Type": "Application",
                "Categories": "Network;InstantMessaging;Chat;",
-                "Keywords": "discord;vencord;electron;chat;"
+                "Keywords": "discord;vencord;electron;chat;",
+                "WMClass": "VencordDesktop"
            }
        },
        "mac": {
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -6,8 +6,8 @@ settings:

 dependencies:
  arrpc:
-    specifier: github:OpenAsar/arrpc#b47fd7d498e248955c843a7857dd26478b82190a
-    version: github.com/OpenAsar/arrpc/b47fd7d498e248955c843a7857dd26478b82190a
+    specifier: github:OpenAsar/arrpc#89f4da610ccfac93f461826a446a17cd3b23953d
+    version: github.com/OpenAsar/arrpc/89f4da610ccfac93f461826a446a17cd3b23953d

 devDependencies:
  '@fal-works/esbuild-plugin-global-externals':
@ -32,8 +32,8 @@ devDependencies:
    specifier: ^16.3.1
    version: 16.3.1
  electron:
-    specifier: ^25.4.0
-    version: 25.4.0
+    specifier: ^25.8.2
+    version: 25.8.2
  electron-builder:
    specifier: ^24.6.3
    version: 24.6.3
@ -1245,6 +1245,7 @@ packages:

  /boolean@3.2.0:
    resolution: {integrity: sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==}
+    requiresBuild: true
    dev: true
    optional: true

@ -1637,6 +1638,7 @@ packages:

  /detect-node@2.1.0:
    resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
+    requiresBuild: true
    dev: true
    optional: true

@ -1764,8 +1766,8 @@ packages:
      - supports-color
    dev: true

-  /electron@25.4.0:
-    resolution: {integrity: sha512-VLTRxDhL4UvQbqM7pTNENnJo62cdAPZT92N+B7BZQ5Xfok1wuVPEewIjBot4K7U3EpLUuHn1veeLzho3ihiP+Q==}
+  /electron@25.8.2:
+    resolution: {integrity: sha512-AM1ra6b16EQuO1bJtiA8ZiWqqFLLgVfxD56ykiy+EA5C63Hkx8OmIbe+5JAsLiTwRVvBZ4oCAj6wa2qT+iq8ww==}
    engines: {node: '>= 12.20.55'}
    hasBin: true
    requiresBuild: true
@ -1863,6 +1865,7 @@ packages:

  /es6-error@4.1.1:
    resolution: {integrity: sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==}
+    requiresBuild: true
    dev: true
    optional: true

@ -3058,6 +3061,7 @@ packages:

  /json-stringify-safe@5.0.1:
    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
+    requiresBuild: true
    dev: true
    optional: true

@ -3172,6 +3176,7 @@ packages:
  /matcher@3.0.0:
    resolution: {integrity: sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==}
    engines: {node: '>=10'}
+    requiresBuild: true
    dependencies:
      escape-string-regexp: 4.0.0
    dev: true
@ -3680,6 +3685,7 @@ packages:
  /roarr@2.15.4:
    resolution: {integrity: sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==}
    engines: {node: '>=8.0'}
+    requiresBuild: true
    dependencies:
      boolean: 3.2.0
      detect-node: 2.1.0
@ -3743,6 +3749,7 @@ packages:

  /semver-compare@1.0.0:
    resolution: {integrity: sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==}
+    requiresBuild: true
    dev: true
    optional: true

@ -3762,6 +3769,7 @@ packages:
  /serialize-error@7.0.1:
    resolution: {integrity: sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==}
    engines: {node: '>=10'}
+    requiresBuild: true
    dependencies:
      type-fest: 0.13.1
    dev: true
@ -3889,6 +3897,7 @@ packages:

  /sprintf-js@1.1.2:
    resolution: {integrity: sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==}
+    requiresBuild: true
    dev: true
    optional: true

@ -4115,6 +4124,7 @@ packages:
  /type-fest@0.13.1:
    resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
    engines: {node: '>=10'}
+    requiresBuild: true
    dev: true
    optional: true

@ -4356,10 +4366,11 @@ packages:
    engines: {node: '>=10'}
    dev: true

-  github.com/OpenAsar/arrpc/b47fd7d498e248955c843a7857dd26478b82190a:
-    resolution: {tarball: https://codeload.github.com/OpenAsar/arrpc/tar.gz/b47fd7d498e248955c843a7857dd26478b82190a}
+  github.com/OpenAsar/arrpc/89f4da610ccfac93f461826a446a17cd3b23953d:
+    resolution: {tarball: https://codeload.github.com/OpenAsar/arrpc/tar.gz/89f4da610ccfac93f461826a446a17cd3b23953d}
    name: arrpc
-    version: 3.1.0
+    version: 3.2.0
+    hasBin: true
    dependencies:
      ws: 8.13.0
    transitivePeerDependencies:
--- a/src/main/firstLaunch.ts
+++ b/src/main/firstLaunch.ts
@ -9,7 +9,7 @@ import { BrowserWindow } from "electron/main";
 import { copyFileSync, mkdirSync, readdirSync } from "fs";
 import { join } from "path";
 import { SplashProps } from "shared/browserWinProperties";
-import { VIEW_DIR } from "shared/paths";
+import { ICON_PATH, VIEW_DIR } from "shared/paths";

 import { autoStart } from "./autoStart";
 import { DATA_DIR } from "./constants";
@ -31,7 +31,8 @@ export function createFirstLaunchTour() {
        frame: true,
        autoHideMenuBar: true,
        height: 470,
-        width: 550
+        width: 550,
+        icon: ICON_PATH
    });

    makeLinksOpenExternally(win);
--- a/src/main/splash.ts
+++ b/src/main/splash.ts
@ -7,10 +7,13 @@
 import { BrowserWindow } from "electron";
 import { join } from "path";
 import { SplashProps } from "shared/browserWinProperties";
-import { VIEW_DIR } from "shared/paths";
+import { ICON_PATH, VIEW_DIR } from "shared/paths";

 export function createSplashWindow() {
-    const splash = new BrowserWindow(SplashProps);
+    const splash = new BrowserWindow({
+        ...SplashProps,
+        icon: ICON_PATH
+    });

    splash.loadFile(join(VIEW_DIR, "splash.html"));

--- a/src/updater/main.ts
+++ b/src/updater/main.ts
@ -11,7 +11,7 @@ import { makeLinksOpenExternally } from "main/utils/makeLinksOpenExternally";
 import { githubGet, ReleaseData } from "main/utils/vencordLoader";
 import { join } from "path";
 import { IpcEvents } from "shared/IpcEvents";
-import { VIEW_DIR } from "shared/paths";
+import { ICON_PATH, VIEW_DIR } from "shared/paths";

 export interface UpdateData {
    currentVersion: string;
@ -108,7 +108,8 @@ function openNewUpdateWindow() {
            nodeIntegration: false,
            contextIsolation: true,
            sandbox: true
-        }
+        },
+        icon: ICON_PATH
    });

    makeLinksOpenExternally(win);