fix: prevent router from being code-split

Author: rturnq

.changeset/hungry-spies-train.md

@@ -0,0 +1,5 @@
+---
+"@marko/run-adapter-node": patch
+---
+
+Prevent router code from being code-split

packages/adapters/node/src/ensure-runtime.ts

@@ -1,3 +1,5 @@
+import "@marko/run/router";
+
 import type { IncomingMessage } from "http";
 import type { Connect, ViteDevServer } from "vite";
 
@@ -12,41 +14,35 @@ declare global {
     | undefined;
 }
 
-// Prevent importing the router and subsequent runtime in dev mode without going through Vite's ssrLoadModule
-if (process.env.NODE_ENV && process.env.NODE_ENV !== "development") {
-  import("@marko/run/router");
-}
-
 export default globalThis.__marko_run_middleware__ ??=
   process.env.NODE_ENV && process.env.NODE_ENV !== "development"
     ? (factory) => factory
     : (() => {
-        let devServer: ViteDevServer | undefined;
+        let devServer: ViteDevServer;
         let errorMiddleware: Connect.ErrorHandleFunction | undefined;
+        let devMiddleware: NodeMiddleware = async (req, res, next) => {
+          await initPromise;
+          devMiddleware(req, res, next);
+        };
 
         const seenReqs = new WeakSet<IncomingMessage>();
-        const devServerPromise = import("@marko/run/adapter").then(
-          async (mod) => {
-            devServer = await mod.createViteDevServer(
-              globalThis.__marko_run_vite_config__,
-            );
-            errorMiddleware = mod.createErrorMiddleware(devServer);
+        const initPromise = (async () => {
+          const adapter = await import("@marko/run/adapter");
+          devServer = await adapter.createViteDevServer(
+            globalThis.__marko_run_vite_config__,
+          );
 
-            void devServer!.ssrLoadModule("@marko/run/router").catch(() => {});
-            devMiddleware = (req, res, next) => {
-              if (seenReqs.has(req)) {
-                return next?.();
-              }
-              seenReqs.add(req);
-              devServer!.middlewares(req, res, next);
-            };
-          },
-        );
+          await devServer.ssrLoadModule("@marko/run/router");
 
-        let devMiddleware: NodeMiddleware = async (req, res, next) => {
-          await devServerPromise;
-          devMiddleware(req, res, next);
-        };
+          errorMiddleware = adapter.createErrorMiddleware(devServer);
+          devMiddleware = (req, res, next) => {
+            if (seenReqs.has(req)) {
+              return next?.();
+            }
+            seenReqs.add(req);
+            devServer.middlewares(req, res, next);
+          };
+        })();
 
         return (factory) =>
           (...args) => {
@@ -69,7 +65,7 @@ export default globalThis.__marko_run_middleware__ ??=
                 }
 
                 try {
-                  await devServer!.ssrLoadModule("@marko/run/router");
+                  await devServer.ssrLoadModule("@marko/run/router");
                 } catch (err) {
                   handleError(err as Error);
                   return;