arcway 0.4.10 → 0.4.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "A convention-based framework for building modular monoliths with strict domain boundaries.",
   "license": "MIT",
   "type": "module",

package/server/config/modules/pages.js

@@ -11,14 +11,65 @@ const DEFAULTS = {
   },
 };
 
+const HMR_KEYS = new Set(['protocol', 'host', 'clientPort']);
+
+function resolveHmr(rawHmr) {
+  if (rawHmr == null) return undefined;
+  if (typeof rawHmr !== 'object' || Array.isArray(rawHmr)) {
+    throw new TypeError('Invalid config: pages.vite.hmr must be an object');
+  }
+
+  for (const key of Object.keys(rawHmr)) {
+    if (!HMR_KEYS.has(key)) {
+      throw new TypeError(`Invalid config: pages.vite.hmr.${key} is not supported`);
+    }
+  }
+
+  const hmr = {};
+  if (rawHmr.protocol != null) {
+    if (!['ws', 'wss'].includes(rawHmr.protocol)) {
+      throw new TypeError('Invalid config: pages.vite.hmr.protocol must be "ws" or "wss"');
+    }
+    hmr.protocol = rawHmr.protocol;
+  }
+  if (rawHmr.host != null) {
+    if (
+      typeof rawHmr.host !== 'string' ||
+      rawHmr.host.length === 0 ||
+      rawHmr.host.trim() !== rawHmr.host ||
+      /[/?#\s]/.test(rawHmr.host)
+    ) {
+      throw new TypeError('Invalid config: pages.vite.hmr.host must be a hostname');
+    }
+    hmr.host = rawHmr.host;
+  }
+  if (rawHmr.clientPort != null) {
+    if (
+      !Number.isInteger(rawHmr.clientPort) ||
+      rawHmr.clientPort < 1 ||
+      rawHmr.clientPort > 65535
+    ) {
+      throw new TypeError(
+        'Invalid config: pages.vite.hmr.clientPort must be an integer from 1 to 65535',
+      );
+    }
+    hmr.clientPort = rawHmr.clientPort;
+  }
+
+  return Object.keys(hmr).length > 0 ? hmr : undefined;
+}
+
 function resolve(config, { rootDir } = {}) {
   const rawPages = config.pages ?? {};
+  const { hmr: rawHmr, ...rawVite } = rawPages.vite ?? {};
+  const hmr = resolveHmr(rawHmr);
   const pages = {
     ...DEFAULTS,
     ...rawPages,
     vite: {
       ...DEFAULTS.vite,
-      ...(rawPages.vite ?? {}),
+      ...rawVite,
+      ...(hmr ? { hmr } : {}),
     },
   };
   if (pages.dir && !path.isAbsolute(pages.dir)) {
@@ -33,4 +84,5 @@ function resolve(config, { rootDir } = {}) {
   return { ...config, pages };
 }
 
+export { resolveHmr };
 export default resolve;

package/server/pages/vite-dev.js

@@ -5,6 +5,7 @@ import reactPlugin from '@vitejs/plugin-react';
 import tailwindcss from '@tailwindcss/vite';
 import { createServer as createViteServer } from 'vite';
 import { patternToFileName } from './build-server.js';
+import { closeServer, createHttpServer, listen } from '../server.js';
 
 function toPosixPath(value) {
   return value.replace(/\\/g, '/');
@@ -203,38 +204,60 @@ function resolveAppAliases(rootDir) {
   return aliases;
 }
 
-async function createViteDevRouter({ rootDir, log }) {
+function getViteServerOptions(config, hmrServer) {
+  const hmr = config?.pages?.vite?.hmr;
+  return {
+    middlewareMode: true,
+    ...(hmr ? { hmr: { ...hmr, ...(hmrServer ? { server: hmrServer } : {}) } } : {}),
+  };
+}
+
+async function createViteHmrServer(log, { host = '0.0.0.0', port = 24678 } = {}) {
+  const server = createHttpServer((_req, res) => {
+    res.writeHead(426, { 'Content-Type': 'text/plain' });
+    res.end('Upgrade Required');
+  }, log);
+  await listen(server, port, host);
+  return server;
+}
+
+async function createViteDevRouter({ rootDir, log, config }) {
   const appAliases = resolveAppAliases(rootDir);
-  const vite = await createViteServer({
-    root: rootDir,
-    appType: 'custom',
-    server: {
-      middlewareMode: true,
-    },
-    resolve: {
-      alias: appAliases,
-      dedupe: ['react', 'react-dom', 'swr'],
-    },
-    css: {
-      devSourcemap: true,
-    },
-    esbuild: {
-      keepNames: true,
-    },
-    optimizeDeps: {
-      include: [
-        'react',
-        'react-dom',
-        'react/jsx-runtime',
-        'react/jsx-dev-runtime',
-        'swr',
-        'use-sync-external-store/shim',
-        '@radix-ui/react-use-is-hydrated',
-      ],
-    },
-    plugins: [reactPlugin(), tailwindcss()],
-    clearScreen: false,
-  });
+  const hmrServer = config?.pages?.vite?.hmr ? await createViteHmrServer(log) : null;
+  let vite;
+  try {
+    vite = await createViteServer({
+      root: rootDir,
+      appType: 'custom',
+      server: getViteServerOptions(config, hmrServer),
+      resolve: {
+        alias: appAliases,
+        dedupe: ['react', 'react-dom', 'swr'],
+      },
+      css: {
+        devSourcemap: true,
+      },
+      esbuild: {
+        keepNames: true,
+      },
+      optimizeDeps: {
+        include: [
+          'react',
+          'react-dom',
+          'react/jsx-runtime',
+          'react/jsx-dev-runtime',
+          'swr',
+          'use-sync-external-store/shim',
+          '@radix-ui/react-use-is-hydrated',
+        ],
+      },
+      plugins: [reactPlugin(), tailwindcss()],
+      clearScreen: false,
+    });
+  } catch (error) {
+    if (hmrServer) await closeServer(hmrServer);
+    throw error;
+  }
 
   const internalPrefixes = ['/@vite/', '/@id/', '/@react-refresh', '/@fs/', '/node_modules/.vite/'];
   const sourceExt = /\.(?:[cm]?[jt]sx?|css|pcss|postcss|json|svg)$/i;
@@ -264,7 +287,11 @@ async function createViteDevRouter({ rootDir, log }) {
     vite,
     handle,
     async close() {
-      await vite.close();
+      try {
+        await vite.close();
+      } finally {
+        if (hmrServer) await closeServer(hmrServer);
+      }
       log?.info?.('Vite dev server closed');
     },
   };
@@ -274,6 +301,8 @@ export {
   buildViteClientManifestJson,
   buildViteRoute,
   createViteDevRouter,
+  createViteHmrServer,
+  getViteServerOptions,
   getViteEntryPath,
   getViteFontsPath,
   syncViteHydrationEntries,