Update Electron

This commit is contained in:
smartfrigde 2023-06-10 23:04:27 +02:00
parent 37c1951a33
commit 35b6ee7a5f
7 changed files with 14 additions and 15 deletions

View file

@ -34,7 +34,7 @@
"settings-spellcheck": "Spellcheck",
"settings-spellcheck-desc": "Helps you correct misspelled words by highlighting them.",
"settings-tray": "Tray",
"settings-tray-desc": "ArmCord's tray menu is a place where you can easily and quickly access ArmCord's settings and allows you to quickly show up Discord window.",
"settings-tray-desc": "ArmCord's tray menu is a place where you can easily and quickly access ArmCord's settings and allows you to quickly pull up the Discord window.",
"settings-channel": "Discord channel",
"settings-channel-desc1": "You can use this setting to change current instance of Discord:",
"settings-channel-desc2": "you're probably most familiar with this one. It's the one you see in default Discord\n client!",

View file

@ -36,7 +36,7 @@
"@typescript-eslint/parser": "^5.59.2",
"chalk-cli": "^5.0.0",
"copyfiles": "^2.4.1",
"electron": "^24.3.0",
"electron": "^25.1.0",
"electron-builder": "^23.6.0",
"eslint": "^8.40.0",
"eslint-config-dmitmel": "github:dmitmel/eslint-config-dmitmel",

View file

@ -3,7 +3,7 @@ lockfileVersion: '6.0'
dependencies:
'@pyke/vibe':
specifier: github:pykeio/vibe#3c61074414cbed96ad51870e4dde379b16d9da6d
version: github.com/pykeio/vibe/3c61074414cbed96ad51870e4dde379b16d9da6d(electron@24.3.0)
version: github.com/pykeio/vibe/3c61074414cbed96ad51870e4dde379b16d9da6d(electron@25.1.0)
arrpc:
specifier: file:src/arrpc
version: file:src/arrpc
@ -43,8 +43,8 @@ devDependencies:
specifier: ^2.4.1
version: 2.4.1
electron:
specifier: ^24.3.0
version: 24.3.0
specifier: ^25.1.0
version: 25.1.0
electron-builder:
specifier: ^23.6.0
version: 23.6.0
@ -1184,8 +1184,8 @@ packages:
- supports-color
dev: true
/electron@24.3.0:
resolution: {integrity: sha512-M7PpfpOzGdLeZPr2xhxXuvJeoXPEHMH40Rtv8BCGleRPolwna9BepAGc0H0F+Uz5kGKOv3xcm99fTurvXUH0nw==}
/electron@25.1.0:
resolution: {integrity: sha512-VKk4G/0euO7ysMKQKHXmI4d3/qR4uHsAtVFXK2WfQUVxBmc160OAm2R6PN9/EXmgXEioKQBtbc2/lvWyYpDbuA==}
engines: {node: '>= 12.20.55'}
hasBin: true
requiresBuild: true
@ -2977,7 +2977,7 @@ packages:
eslint: 8.40.0
dev: true
github.com/pykeio/vibe/3c61074414cbed96ad51870e4dde379b16d9da6d(electron@24.3.0):
github.com/pykeio/vibe/3c61074414cbed96ad51870e4dde379b16d9da6d(electron@25.1.0):
resolution: {tarball: https://codeload.github.com/pykeio/vibe/tar.gz/3c61074414cbed96ad51870e4dde379b16d9da6d}
id: github.com/pykeio/vibe/3c61074414cbed96ad51870e4dde379b16d9da6d
name: '@pyke/vibe'
@ -2987,5 +2987,5 @@ packages:
electron: '>=11.0'
dependencies:
cargo-cp-artifact: 0.1.7
electron: 24.3.0
electron: 25.1.0
dev: false

View file

@ -1,7 +1,6 @@
import {BrowserWindow, app, ipcMain} from "electron";
import path from "path";
import * as fs from "fs";
import * as os from "os";
import {iconPath} from "../main";
import {Settings, getConfigLocation, setConfigBulk} from "../utils";
let setupWindow: BrowserWindow;

View file

@ -19,7 +19,7 @@
<div id="setup">
<div id="logo" class="hidden"></div>
<div id="page1" class="hidden">
<p id="setup_question1">Welcome to the ArmCord Setup</p>
<p id="setup_question1">Welcome to ArmCord Setup</p>
<div id="buttons">
<button id="full" class="center">Next</button>
</div>

View file

@ -1,5 +1,5 @@
import * as fs from "fs";
import {Menu, Tray, app, dialog, nativeImage} from "electron";
import {Menu, MessageBoxOptions, Tray, app, dialog, nativeImage} from "electron";
import {createInviteWindow, mainWindow} from "./window";
import {getConfig, getConfigLocation, getDisplayVersion, setConfig, setWindowState} from "./utils";
import * as path from "path";
@ -145,7 +145,7 @@ app.whenReady().then(async () => {
} else {
if ((await getConfig("tray")) == undefined) {
if (process.platform == "win32") {
const options = {
const options: MessageBoxOptions = {
type: "question",
buttons: ["Yes, please", "No, I don't"],
defaultId: 1,

View file

@ -2,7 +2,7 @@
// I had to add most of the window creation code here to split both into seperete functions
// WHY? Because I can't use the same code for both due to annoying bug with value `frame` not responding to variables
// I'm sorry for this mess but I'm not sure how to fix it.
import {BrowserWindow, app, dialog, nativeImage, shell} from "electron";
import {BrowserWindow, MessageBoxOptions, app, dialog, nativeImage, shell} from "electron";
import path from "path";
import {
checkIfConfigIsBroken,
@ -106,7 +106,7 @@ async function doAfterDefiningTheWindow(): Promise<void> {
} else if (ignoreProtocolWarning) {
shell.openExternal(url);
} else {
const options = {
const options: MessageBoxOptions = {
type: "question",
buttons: ["Yes, please", "No, I don't"],
defaultId: 1,