Upgrade dependencies, including Electron 37.4.0.

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

app/common/config-schemata.ts

@@ -37,6 +37,7 @@ export const configSchemata = {
   useProxy: z.boolean(),
   useSystemProxy: z.boolean(),
 };
+export type ConfigSchemata = typeof configSchemata;
 
 export const enterpriseConfigSchemata = {
   ...configSchemata,

app/common/config-util.ts

@@ -7,12 +7,12 @@ import {DataError} from "node-json-db/dist/lib/Errors.js";
 import type {z} from "zod";
 import {app, dialog} from "zulip:remote";
 
-import {configSchemata} from "./config-schemata.ts";
+import {type ConfigSchemata, configSchemata} from "./config-schemata.ts";
 import * as EnterpriseUtil from "./enterprise-util.ts";
 import Logger from "./logger-util.ts";
 
 export type Config = {
-  [Key in keyof typeof configSchemata]: z.output<(typeof configSchemata)[Key]>;
+  [Key in keyof ConfigSchemata]: z.output<ConfigSchemata[Key]>;
 };
 
 const logger = new Logger({
@@ -26,7 +26,7 @@ reloadDatabase();
 export function getConfigItem<Key extends keyof Config>(
   key: Key,
   defaultValue: Config[Key],
-): z.output<(typeof configSchemata)[Key]> {
+): z.output<ConfigSchemata[Key]> {
   try {
     database.reload();
   } catch (error: unknown) {
@@ -35,7 +35,13 @@ export function getConfigItem<Key extends keyof Config>(
   }
 
   try {
-    return configSchemata[key].parse(database.getObject<unknown>(`/${key}`));
+    const typedSchemata: {
+      [Key in keyof Config]: z.ZodType<
+        z.output<ConfigSchemata[Key]>,
+        z.input<ConfigSchemata[Key]>
+      >;
+    } = configSchemata; // https://github.com/colinhacks/zod/issues/5154
+    return typedSchemata[key].parse(database.getObject<unknown>(`/${key}`));
   } catch (error: unknown) {
     if (!(error instanceof DataError)) throw error;
     setConfigItem(key, defaultValue);

app/main/request.ts

@@ -59,7 +59,7 @@ export const _getServerSettings = async (
   } = z
     .object({
       realm_name: z.string(),
-      realm_uri: z.string().url(),
+      realm_uri: z.url(),
       realm_icon: z.string(),
       zulip_version: z.string().default("unknown"),
       zulip_feature_level: z.number().default(0),

app/renderer/js/main.ts

@@ -1,3 +1,5 @@
+import "./zod-config.ts"; // eslint-disable-line import-x/no-unassigned-import
+
 import {clipboard} from "electron/common";
 import path from "node:path";
 import process from "node:process";

app/renderer/js/utils/domain-util.ts

@@ -24,7 +24,7 @@ const logger = new Logger({
 export const defaultIconSentinel = "../renderer/img/icon.png";
 
 const serverConfigSchema = z.object({
-  url: z.string().url(),
+  url: z.url(),
   alias: z.string(),
   icon: z.string(),
   zulipVersion: z.string().default("unknown"),

app/renderer/js/zod-config.ts

@@ -0,0 +1,6 @@
+import * as z from "zod";
+
+// In an Electron preload script, Content-Security-Policy only takes effect
+// after the page has loaded, which breaks Zod's detection of whether eval is
+// allowed.
+z.config({jitless: true});