Modernize code to ES2025

Author: hhvrc

src/lib/components/dialog-manager/dialog-store.svelte.ts

@@ -27,19 +27,19 @@ export function removeDialog(id: number): void {
 export function createDialog<R>(
   contextFactory: (resolve: (result: R) => void) => DialogContext<R>
 ): Promise<R> {
-  return new Promise((resolve) => {
-    const id = ++dialogCount;
-    let resolved = false;
+  const { promise, resolve } = Promise.withResolvers<R>();
+  const id = ++dialogCount;
+  let resolved = false;
 
-    const wrappedResolve = (result: R) => {
-      if (resolved) return;
-      resolved = true;
-      setTimeout(() => removeDialog(id), 150);
-      resolve(result);
-    };
+  const wrappedResolve = (result: R) => {
+    if (resolved) return;
+    resolved = true;
+    setTimeout(() => removeDialog(id), 150);
+    resolve(result);
+  };
 
-    dialogs.set(id, contextFactory(wrappedResolve) as DialogContext);
-  });
+  dialogs.set(id, contextFactory(wrappedResolve) as DialogContext);
+  return promise;
 }
 
 /**

src/routes/(app)/home/+page.svelte

@@ -11,12 +11,13 @@
 
   registerBreadcrumbs(() => [{ label: 'Home', href: '/home' }]);
 
-  let shockerCount = $derived(
-    Array.from(ownHubs).reduce((sum, [, hub]) => sum + hub.shockers.length, 0)
-  );
+  let shockerCount = $derived(ownHubs.values().reduce((sum, hub) => sum + hub.shockers.length, 0));
   let hubCount = $derived(ownHubs.size);
   let onlineHubCount = $derived(
-    Array.from(onlineHubs).filter(([, state]) => state.isOnline).length
+    onlineHubs
+      .values()
+      .filter((state) => state.isOnline)
+      .toArray().length
   );
 
   onMount(refreshOwnHubs);

src/routes/(app)/hubs/+page.svelte

@@ -21,26 +21,29 @@
   const isMobile = new IsMobile();
 
   let data = $derived.by<Hub[]>(() => {
-    return Array.from(ownHubs).map(([, hub]) => {
-      const onlineState = onlineHubs.get(hub.id);
-      return {
-        id: hub.id,
-        name: hub.name,
-        is_online: onlineState?.isOnline ?? false,
-        firmware_version: onlineState?.firmwareVersion ?? null,
-        shockers: hub.shockers.map((shocker) => {
-          return {
-            id: shocker.id,
-            rf_id: shocker.rfId,
-            model: shocker.model,
-            name: shocker.name,
-            is_paused: shocker.isPaused,
-            created_at: shocker.createdOn,
-          };
-        }),
-        created_at: hub.createdOn,
-      };
-    });
+    return ownHubs
+      .values()
+      .map((hub) => {
+        const onlineState = onlineHubs.get(hub.id);
+        return {
+          id: hub.id,
+          name: hub.name,
+          is_online: onlineState?.isOnline ?? false,
+          firmware_version: onlineState?.firmwareVersion ?? null,
+          shockers: hub.shockers.map((shocker) => {
+            return {
+              id: shocker.id,
+              rf_id: shocker.rfId,
+              model: shocker.model,
+              name: shocker.name,
+              is_paused: shocker.isPaused,
+              created_at: shocker.createdOn,
+            };
+          }),
+          created_at: hub.createdOn,
+        };
+      })
+      .toArray();
   });
 
   async function openCreateHubDialog() {

src/routes/(app)/shares/public/[shareId=guid]/edit/dialog-add-shocker.svelte

@@ -6,12 +6,14 @@
   import { ownHubs } from '$lib/state/hubs-state.svelte';
 
   let availableShockers = $derived(
-    Array.from(ownHubs)
-      .flatMap(([, hub]) => hub.shockers)
+    ownHubs
+      .values()
+      .flatMap((hub) => hub.shockers)
       .map((shocker) => ({
         value: shocker.id,
         label: shocker.name,
       }))
+      .toArray()
   );
 
   interface Props {

src/routes/(app)/shares/user/dialog-share-code-create.svelte

@@ -12,12 +12,14 @@
   import { refreshOutgoingInvites } from '$lib/state/user-shares-state.svelte';
 
   let availableShockers = $derived(
-    Array.from(ownHubs)
-      .flatMap(([, hub]) => hub.shockers)
+    ownHubs
+      .values()
+      .flatMap((hub) => hub.shockers)
       .map((shocker) => ({
         value: shocker.id,
         label: shocker.name,
       }))
+      .toArray()
   );
 
   interface Props {

src/routes/(app)/shockers/own/+page.svelte

@@ -25,7 +25,12 @@
 
   registerBreadcrumbs(() => [{ label: 'Shockers' }]);
 
-  let shockers = $derived(Array.from(ownHubs).flatMap(([, hub]) => hub.shockers));
+  let shockers = $derived(
+    ownHubs
+      .values()
+      .flatMap((hub) => hub.shockers)
+      .toArray()
+  );
 
   let moduleType = $state<ModuleType>(ModuleType.ClassicControlModule);
   let loading = $state(true);
@@ -49,7 +54,7 @@
   }
 
   async function openAddShockerDialog() {
-    const hubs = Array.from(ownHubs);
+    const hubs = ownHubs.entries().toArray();
     if (hubs.length === 0) {
       toast.error('You need to create a hub before adding shockers.');
       return;

src/routes/flashtool/FlashManager.ts

@@ -37,7 +37,9 @@ async function setupESPLoader(
 }
 
 function sleep(ms: number): Promise<void> {
-  return new Promise((f) => setTimeout(f, ms));
+  const { promise, resolve } = Promise.withResolvers<void>();
+  setTimeout(resolve, ms);
+  return promise;
 }
 
 function appendBuffer(buffer: Uint8Array | null, data: Uint8Array): Uint8Array {

tsconfig.json

@@ -1,16 +1,11 @@
 {
   "extends": "./.svelte-kit/tsconfig.json",
   "compilerOptions": {
-    "target": "es2024",
+    "target": "es2025",
     "rewriteRelativeImportExtensions": true,
-    "allowJs": true,
     "checkJs": true,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
     "skipLibCheck": true,
     "sourceMap": true,
-    "strict": true,
     "moduleResolution": "bundler"
   }
   // Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias

vite.config.ts

@@ -8,7 +8,7 @@ import net from 'node:net';
 import os from 'node:os';
 import { env } from 'node:process';
 import license from 'rollup-plugin-license';
-import { type Plugin, type PluginOption, defineConfig, loadEnv } from 'vite';
+import { type Plugin, type PluginOption, type UserConfig, defineConfig, loadEnv } from 'vite';
 import devtoolsJson from 'vite-plugin-devtools-json';
 import mkcert from 'vite-plugin-mkcert';
 
@@ -157,55 +157,55 @@ async function getServerConfig(mode: string, useLocalRedirect: boolean) {
 }
 
 async function ensurePortBindable(host: string, port: number): Promise<void> {
-  return new Promise((resolve) => {
-    const server = net.createServer();
-    server.once('error', (err: NodeJS.ErrnoException) => {
-      if (err.code === 'EACCES') {
-        const platform = os.platform();
-        let fix: string;
-
-        if (platform === 'linux') {
-          fix = [
-            `Node.js needs permission to serve HTTPS on port ${port}.\n`,
-            'Option 1 (Recommended): Set up a reverse proxy',
-            '  Use Nginx or Caddy to proxy traffic to your Node server.',
-            '  This is more secure and follows best practices.\n',
-            'Option 2 (Quick fix): Grant Node.js permission to bind to privileged ports',
-            chalk.blue.bold(`  sudo setcap 'cap_net_bind_service=+ep' $(which node)\n`),
-            chalk.yellow.bold(
-              '  ⚠️  Security note: This allows Node to bind to ANY port below 1024.'
-            ),
-            chalk.yellow.bold('  Only use this in trusted development environments.'),
-          ].join('\n');
-        } else if (platform === 'darwin') {
-          fix = [
-            `Node.js needs permission to serve HTTPS on port ${port}.\n`,
-            'Fix: Run the dev server with sudo, or set up a reverse proxy.',
-          ].join('\n');
-        } else {
-          fix = `Node.js does not have permission to bind to port ${port}.\nTry running with elevated privileges or use a reverse proxy.`;
-        }
-
-        console.log(
-          boxen(fix, {
-            padding: 1,
-            margin: 1,
-            borderStyle: 'round',
-            borderColor: 'yellow',
-            title: `Port ${port} Permission Denied`,
-            titleAlignment: 'center',
-          })
-        );
-        process.exit(1);
+  const { promise, resolve } = Promise.withResolvers<void>();
+  const server = net.createServer();
+  server.once('error', (err: NodeJS.ErrnoException) => {
+    if (err.code === 'EACCES') {
+      const platform = os.platform();
+      let fix: string;
+
+      if (platform === 'linux') {
+        fix = [
+          `Node.js needs permission to serve HTTPS on port ${port}.\n`,
+          'Option 1 (Recommended): Set up a reverse proxy',
+          '  Use Nginx or Caddy to proxy traffic to your Node server.',
+          '  This is more secure and follows best practices.\n',
+          'Option 2 (Quick fix): Grant Node.js permission to bind to privileged ports',
+          chalk.blue.bold(`  sudo setcap 'cap_net_bind_service=+ep' $(which node)\n`),
+          chalk.yellow.bold(
+            '  ⚠️  Security note: This allows Node to bind to ANY port below 1024.'
+          ),
+          chalk.yellow.bold('  Only use this in trusted development environments.'),
+        ].join('\n');
+      } else if (platform === 'darwin') {
+        fix = [
+          `Node.js needs permission to serve HTTPS on port ${port}.\n`,
+          'Fix: Run the dev server with sudo, or set up a reverse proxy.',
+        ].join('\n');
+      } else {
+        fix = `Node.js does not have permission to bind to port ${port}.\nTry running with elevated privileges or use a reverse proxy.`;
       }
-      // For other errors (e.g. EADDRINUSE), let Vite handle them
-      resolve();
-    });
-    server.once('listening', () => {
-      server.close(() => resolve());
-    });
-    server.listen(port, host);
+
+      console.log(
+        boxen(fix, {
+          padding: 1,
+          margin: 1,
+          borderStyle: 'round',
+          borderColor: 'yellow',
+          title: `Port ${port} Permission Denied`,
+          titleAlignment: 'center',
+        })
+      );
+      process.exit(1);
+    }
+    // For other errors (e.g. EADDRINUSE), let Vite handle them
+    resolve();
+  });
+  server.once('listening', () => {
+    server.close(() => resolve());
   });
+  server.listen(port, host);
+  return promise;
 }
 
 export default defineConfig(async ({ command, mode, isPreview }) => {
@@ -215,17 +215,20 @@ export default defineConfig(async ({ command, mode, isPreview }) => {
   // If we are running locally, ensure that local.{PUBLIC_SITE_URL} resolves to localhost, and then use mkcert to generate a certificate
   const useLocalRedirect = isLocalServe && !isProduction && !isTruthy(env.CI);
 
-  return defineConfig({
+  return {
     build: {
-      target: 'es2024',
+      rolldownOptions: {
+        output: {
+          legalComments: 'none',
+        },
+        treeshake:
+          mode === 'production'
+            ? { manualPureFunctions: ['console.log', 'console.debug', 'console.trace'] }
+            : undefined,
+      },
     },
     plugins: getPlugins(useLocalRedirect),
     server: await getServerConfig(mode, useLocalRedirect),
     test: { include: ['src/**/*.{test,spec}.{js,ts}'] },
-    esbuild: {
-      legalComments: 'none',
-      drop: mode === 'production' ? ['debugger'] : [],
-      pure: mode === 'production' ? ['console.log', 'console.debug', 'console.trace'] : [],
-    },
-  });
+  } satisfies UserConfig;
 });