devproje/project-client
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into feat/macos-menubar

Browse source
This commit is contained in:
Tornike Khintibidze 2023-09-25 09:05:18 +04:00 committed by GitHub
commit 47b15a22db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "VencordDesktop", "name": "VencordDesktop",
"version": "0.3.0", "version": "0.3.1",
"private": true, "private": true,
"description": "", "description": "",
"keywords": [], "keywords": [],
@ -23,7 +23,7 @@
"watch": "pnpm build --watch" "watch": "pnpm build --watch"
}, },
"dependencies": { "dependencies": {
"arrpc": "github:OpenAsar/arrpc#b47fd7d498e248955c843a7857dd26478b82190a" "arrpc": "github:OpenAsar/arrpc#89f4da610ccfac93f461826a446a17cd3b23953d"
}, },
"devDependencies": { "devDependencies": {
"@fal-works/esbuild-plugin-global-externals": "^2.1.2", "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
@ -33,7 +33,7 @@
"@typescript-eslint/parser": "^6.2.1", "@typescript-eslint/parser": "^6.2.1",
"@vencord/types": "^0.1.2", "@vencord/types": "^0.1.2",
"dotenv": "^16.3.1", "dotenv": "^16.3.1",
"electron": "^25.4.0", "electron": "^26.2.2",
"electron-builder": "^24.6.3", "electron-builder": "^24.6.3",
"esbuild": "^0.18.17", "esbuild": "^0.18.17",
"eslint": "^8.46.0", "eslint": "^8.46.0",

19
pnpm-lock.yaml
View file

@ -6,8 +6,8 @@ settings:
dependencies: dependencies:
arrpc: arrpc:
specifier: github:OpenAsar/arrpc#b47fd7d498e248955c843a7857dd26478b82190a specifier: github:OpenAsar/arrpc#89f4da610ccfac93f461826a446a17cd3b23953d
version: github.com/OpenAsar/arrpc/b47fd7d498e248955c843a7857dd26478b82190a version: github.com/OpenAsar/arrpc/89f4da610ccfac93f461826a446a17cd3b23953d
devDependencies: devDependencies:
'@fal-works/esbuild-plugin-global-externals': '@fal-works/esbuild-plugin-global-externals':
@ -32,8 +32,8 @@ devDependencies:
specifier: ^16.3.1 specifier: ^16.3.1
version: 16.3.1 version: 16.3.1
electron: electron:
specifier: ^25.4.0 specifier: ^26.2.2
version: 25.4.0 version: 26.2.2
electron-builder: electron-builder:
specifier: ^24.6.3 specifier: ^24.6.3
version: 24.6.3 version: 24.6.3
@ -1764,8 +1764,8 @@ packages:
- supports-color - supports-color
dev: true dev: true
/electron@25.4.0: /electron@26.2.2:
resolution: {integrity: sha512-VLTRxDhL4UvQbqM7pTNENnJo62cdAPZT92N+B7BZQ5Xfok1wuVPEewIjBot4K7U3EpLUuHn1veeLzho3ihiP+Q==} resolution: {integrity: sha512-Ihb3Zt4XYnHF52DYSq17ySkgFqJV4OT0VnfhUYZASAql7Vembz3VsAq7mB3OALBHXltAW34P8BxTIwTqZaMS3g==}
engines: {node: '>= 12.20.55'} engines: {node: '>= 12.20.55'}
hasBin: true hasBin: true
requiresBuild: true requiresBuild: true
@ -4356,10 +4356,11 @@ packages:
engines: {node: '>=10'} engines: {node: '>=10'}
dev: true dev: true
github.com/OpenAsar/arrpc/b47fd7d498e248955c843a7857dd26478b82190a: github.com/OpenAsar/arrpc/89f4da610ccfac93f461826a446a17cd3b23953d:
resolution: {tarball: https://codeload.github.com/OpenAsar/arrpc/tar.gz/b47fd7d498e248955c843a7857dd26478b82190a} resolution: {tarball: https://codeload.github.com/OpenAsar/arrpc/tar.gz/89f4da610ccfac93f461826a446a17cd3b23953d}
name: arrpc name: arrpc
version: 3.1.0 version: 3.2.0
hasBin: true
dependencies: dependencies:
ws: 8.13.0 ws: 8.13.0
transitivePeerDependencies: transitivePeerDependencies:

5
src/main/firstLaunch.ts
View file

@ -9,7 +9,7 @@ import { BrowserWindow } from "electron/main";
import { copyFileSync, mkdirSync, readdirSync } from "fs"; import { copyFileSync, mkdirSync, readdirSync } from "fs";
import { join } from "path"; import { join } from "path";
import { SplashProps } from "shared/browserWinProperties"; import { SplashProps } from "shared/browserWinProperties";
import { VIEW_DIR } from "shared/paths"; import { ICON_PATH, VIEW_DIR } from "shared/paths";
import { autoStart } from "./autoStart"; import { autoStart } from "./autoStart";
import { DATA_DIR } from "./constants"; import { DATA_DIR } from "./constants";
@ -31,7 +31,8 @@ export function createFirstLaunchTour() {
frame: true, frame: true,
autoHideMenuBar: true, autoHideMenuBar: true,
height: 470, height: 470,
width: 550 width: 550,
icon: ICON_PATH
}); });
makeLinksOpenExternally(win); makeLinksOpenExternally(win);

7
src/main/splash.ts
View file

@ -7,10 +7,13 @@
import { BrowserWindow } from "electron"; import { BrowserWindow } from "electron";
import { join } from "path"; import { join } from "path";
import { SplashProps } from "shared/browserWinProperties"; import { SplashProps } from "shared/browserWinProperties";
import { VIEW_DIR } from "shared/paths"; import { ICON_PATH, VIEW_DIR } from "shared/paths";
export function createSplashWindow() { export function createSplashWindow() {
const splash = new BrowserWindow(SplashProps); const splash = new BrowserWindow({
...SplashProps,
icon: ICON_PATH
});
splash.loadFile(join(VIEW_DIR, "splash.html")); splash.loadFile(join(VIEW_DIR, "splash.html"));

5
src/updater/main.ts
View file

@ -11,7 +11,7 @@ import { makeLinksOpenExternally } from "main/utils/makeLinksOpenExternally";
import { githubGet, ReleaseData } from "main/utils/vencordLoader"; import { githubGet, ReleaseData } from "main/utils/vencordLoader";
import { join } from "path"; import { join } from "path";
import { IpcEvents } from "shared/IpcEvents"; import { IpcEvents } from "shared/IpcEvents";
import { VIEW_DIR } from "shared/paths"; import { ICON_PATH, VIEW_DIR } from "shared/paths";
export interface UpdateData { export interface UpdateData {
currentVersion: string; currentVersion: string;
@ -108,7 +108,8 @@ function openNewUpdateWindow() {
nodeIntegration: false, nodeIntegration: false,
contextIsolation: true, contextIsolation: true,
sandbox: true sandbox: true
} },
icon: ICON_PATH
}); });
makeLinksOpenExternally(win); makeLinksOpenExternally(win);