1 files changed, 34 insertions, 18 deletions

diff --git a/scripts/watch.js b/scripts/watch.js
index a61d3c8..1345a0f 100644
--- a/scripts/watch.js
+++ b/scripts/watch.js
@@ -1,11 +1,12 @@
-import { build as esbuildBuild } from 'esbuild';
 import { spawn } from 'child_process';
+import { join } from 'path';
+
 import { watch } from 'chokidar';
 import electronPath from 'electron';
-import { join } from 'path';
+import { build as esbuildBuild } from 'esbuild';
 import { createServer } from 'vite';
 
-import { fileURLToDirname } from '../config/utils.js';
+import fileURLToDirname from '../config/fileURLToDirname.js';
 
 /** @type {string} */
 const thisDir = fileURLToDirname(import.meta.url);
@@ -35,6 +36,7 @@ const stderrIgnorePatterns = [
  */
 async function setupEsbuildWatcher(packageName, extraPaths, callback) {
   /** @type {{ default: import('esbuild').BuildOptions }} */
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- Read untyped config file.
   const { default: config } = await import(`../packages/${packageName}/esbuild.config.js`);
   config.logLevel = 'info';
   config.incremental = true;
@@ -45,7 +47,7 @@ async function setupEsbuildWatcher(packageName, extraPaths, callback) {
     ...(extraPaths || []),
   ];
   const watcher = watch(paths, {
-    ignored: /(^|[\/\\])\.|__(tests|mocks)__|\.(spec|test)\.[jt]sx?$/,
+    ignored: /(^|[/\\])\.|__(tests|mocks)__|\.(spec|test)\.[jt]sx?$/,
     ignoreInitial: true,
     persistent: true,
   });
@@ -59,13 +61,26 @@ async function setupEsbuildWatcher(packageName, extraPaths, callback) {
         callback();
       }
     }).catch((err) => {
-      const errCount = err.errors.length;
+      if (typeof err === 'object' && 'errors' in err) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- We just checked.
+        const { errors } = err;
+        if (Array.isArray(errors)) {
+          const errCount = errors.length;
+          console.error(
+            '\ud83d\udd25',
+            errCount,
+            errCount > 1 ? 'errors' : 'error',
+            'while rebuilding package',
+            packageName,
+          );
+          return;
+        }
+      }
       console.error(
         '\ud83d\udd25',
-        errCount,
-        errCount > 1 ? 'errors' : 'error',
-        'while rebuilding package',
+        'error while rebuilding package',
         packageName,
+        err,
       );
     });
   });
@@ -121,13 +136,14 @@ function setupServicePackageWatcher(packageName, sendEvent) {
  */
 function setupMainPackageWatcher(viteDevServer) {
   // Write a value to an environment variable to pass it to the main process.
-  const protocol = `http${viteDevServer.config.server.https ? 's' : ''}:`;
-  const host = viteDevServer.config.server.host || 'localhost';
-  const port = viteDevServer.config.server.port;
-  const path = '/';
-  process.env.VITE_DEV_SERVER_URL = `${protocol}//${host}:${port}${path}`;
-
-  /** @type {import('child_process').ChildProcessByStdio<null, null, import('stream').Readable> | null} */
+  const { config: { server: { port, https, host } } } = viteDevServer;
+  const protocol = `http${https ? 's' : ''}:`;
+  const hostOrDefault = typeof host === 'string' ? host : 'localhost';
+  const portOrDefault = port || 3000;
+  process.env.VITE_DEV_SERVER_URL = `${protocol}//${hostOrDefault}:${portOrDefault}/`;
+
+  /** @type {import('child_process').ChildProcessByStdio<null, null, import('stream').Readable>
+    | null} */
   let spawnProcess = null;
 
   return setupEsbuildWatcher(
@@ -146,8 +162,8 @@ function setupMainPackageWatcher(viteDevServer) {
         stdio: ['inherit', 'inherit', 'pipe'],
       });
 
-      spawnProcess.stderr.on('data', (data) => {
-        const stderrString = data.toString('utf-8').trimRight();
+      spawnProcess.stderr.on('data', (/** @type {Buffer} */ data) => {
+        const stderrString = data.toString('utf-8').trimEnd();
         if (!stderrIgnorePatterns.some((r) => r.test(stderrString))) {
           console.error(stderrString);
         }
@@ -193,7 +209,7 @@ async function setupDevEnvironment() {
   }
 
   console.log('\ud83c\udf80 Sophie is starting up');
-  return setupMainPackageWatcher(viteDevServer);
+  await setupMainPackageWatcher(viteDevServer);
 }
 
 setupDevEnvironment().catch((err) => {