mirror of
https://github.com/zulip/zulip-desktop.git
synced 2025-11-02 21:13:32 +00:00
Upgrade dependencies, including Electron 28.1.1.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import {app} from "electron/main";
|
||||
|
||||
import * as Sentry from "@sentry/electron/main"; // eslint-disable-line n/file-extension-in-import
|
||||
import * as Sentry from "@sentry/electron/main";
|
||||
|
||||
import {getConfigItem} from "../common/config-util.js";
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import type {Html} from "../../../common/html.js";
|
||||
import {html} from "../../../common/html.js";
|
||||
import type {RendererMessage} from "../../../common/typed-ipc.js";
|
||||
import type {TabRole} from "../../../common/types.js";
|
||||
import preloadCss from "../../css/preload.css?raw"; // eslint-disable-line n/file-extension-in-import
|
||||
import preloadCss from "../../css/preload.css?raw";
|
||||
import {ipcRenderer} from "../typed-ipc-renderer.js";
|
||||
import * as SystemUtil from "../utils/system-util.js";
|
||||
|
||||
|
||||
@@ -156,12 +156,12 @@ export class ServerManagerView {
|
||||
ConfigUtil.getConfigItem("useSystemProxy", false)
|
||||
? {mode: "system"}
|
||||
: ConfigUtil.getConfigItem("useManualProxy", false)
|
||||
? {
|
||||
pacScript: ConfigUtil.getConfigItem("proxyPAC", ""),
|
||||
proxyRules: ConfigUtil.getConfigItem("proxyRules", ""),
|
||||
proxyBypassRules: ConfigUtil.getConfigItem("proxyBypass", ""),
|
||||
}
|
||||
: {mode: "direct"},
|
||||
? {
|
||||
pacScript: ConfigUtil.getConfigItem("proxyPAC", ""),
|
||||
proxyRules: ConfigUtil.getConfigItem("proxyRules", ""),
|
||||
proxyBypassRules: ConfigUtil.getConfigItem("proxyBypass", ""),
|
||||
}
|
||||
: {mode: "direct"},
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
3156
package-lock.json
generated
3156
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
14
package.json
14
package.json
@@ -159,9 +159,9 @@
|
||||
"adm-zip": "^0.5.5",
|
||||
"auto-launch": "^5.0.5",
|
||||
"backoff": "^2.5.0",
|
||||
"electron": "^25.8.1",
|
||||
"electron": "^28.1.1",
|
||||
"electron-builder": "^24.6.4",
|
||||
"electron-log": "^4.3.5",
|
||||
"electron-log": "^5.0.3",
|
||||
"electron-updater": "^6.1.4",
|
||||
"electron-window-state": "^5.0.3",
|
||||
"escape-goat": "^4.0.0",
|
||||
@@ -170,17 +170,17 @@
|
||||
"iso-639-1": "^3.1.0",
|
||||
"medium": "^1.2.0",
|
||||
"node-json-db": "^1.3.0",
|
||||
"playwright-core": "^1.30.0-alpha-jan-3-2023",
|
||||
"playwright-core": "^1.41.0-alpha-jan-9-2024",
|
||||
"pre-commit": "^1.2.2",
|
||||
"prettier": "^3.0.3",
|
||||
"rimraf": "^5.0.0",
|
||||
"semver": "^7.3.5",
|
||||
"stylelint": "^15.6.1",
|
||||
"stylelint-config-standard": "^34.0.0",
|
||||
"stylelint": "^16.1.0",
|
||||
"stylelint-config-standard": "^36.0.0",
|
||||
"tape": "^5.2.2",
|
||||
"typescript": "^5.0.4",
|
||||
"vite": "^4.1.1",
|
||||
"vite-plugin-electron": "^0.14.1",
|
||||
"vite": "^5.0.11",
|
||||
"vite-plugin-electron": "^0.28.0",
|
||||
"xo": "^0.56.0",
|
||||
"zod": "^3.5.1"
|
||||
},
|
||||
|
||||
@@ -5,15 +5,6 @@ import * as path from "node:path";
|
||||
import {defineConfig} from "vite";
|
||||
import electron from "vite-plugin-electron";
|
||||
|
||||
let resolvePreload: () => void;
|
||||
let resolveRenderer: () => void;
|
||||
const whenPreload = new Promise<void>((resolve) => {
|
||||
resolvePreload = resolve;
|
||||
});
|
||||
const whenRenderer = new Promise<void>((resolve) => {
|
||||
resolveRenderer = resolve;
|
||||
});
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [
|
||||
electron([
|
||||
@@ -21,11 +12,6 @@ export default defineConfig({
|
||||
entry: {
|
||||
index: "app/main",
|
||||
},
|
||||
async onstart({startup}) {
|
||||
await whenPreload;
|
||||
await whenRenderer;
|
||||
await startup();
|
||||
},
|
||||
vite: {
|
||||
build: {
|
||||
sourcemap: true,
|
||||
@@ -48,9 +34,6 @@ export default defineConfig({
|
||||
entry: {
|
||||
preload: "app/renderer/js/preload.ts",
|
||||
},
|
||||
onstart() {
|
||||
resolvePreload();
|
||||
},
|
||||
vite: {
|
||||
build: {
|
||||
sourcemap: "inline",
|
||||
@@ -64,9 +47,6 @@ export default defineConfig({
|
||||
entry: {
|
||||
renderer: "app/renderer/js/main.ts",
|
||||
},
|
||||
onstart() {
|
||||
resolveRenderer();
|
||||
},
|
||||
vite: {
|
||||
build: {
|
||||
sourcemap: true,
|
||||
|
||||
Reference in New Issue
Block a user