diff --git a/package.json b/package.json index 1d3c109..df71c43 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "VencordDesktop", - "version": "0.3.0", + "version": "0.3.1", "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": "^26.2.2", "electron-builder": "^24.6.3", "esbuild": "^0.18.17", "eslint": "^8.46.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8123ea5..ba88bed 100644 --- 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: ^26.2.2 + version: 26.2.2 electron-builder: specifier: ^24.6.3 version: 24.6.3 @@ -1764,8 +1764,8 @@ packages: - supports-color dev: true - /electron@25.4.0: - resolution: {integrity: sha512-VLTRxDhL4UvQbqM7pTNENnJo62cdAPZT92N+B7BZQ5Xfok1wuVPEewIjBot4K7U3EpLUuHn1veeLzho3ihiP+Q==} + /electron@26.2.2: + resolution: {integrity: sha512-Ihb3Zt4XYnHF52DYSq17ySkgFqJV4OT0VnfhUYZASAql7Vembz3VsAq7mB3OALBHXltAW34P8BxTIwTqZaMS3g==} engines: {node: '>= 12.20.55'} hasBin: true requiresBuild: true @@ -4356,10 +4356,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: diff --git a/src/main/firstLaunch.ts b/src/main/firstLaunch.ts index b65b930..0ce585d 100644 --- 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); diff --git a/src/main/splash.ts b/src/main/splash.ts index bf910fb..042ecc0 100644 --- 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")); diff --git a/src/updater/main.ts b/src/updater/main.ts index 9ed64e0..ec42217 100644 --- 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);