@cedarjs/vite 7.0.0 → 8.0.0-canary.3265

package/dist/plugins/vite-plugin-handler-als-wrapping.js

@@ -1,9 +1,7 @@
 import path from "node:path";
 import { normalizePath } from "vite";
 import { getPaths } from "@cedarjs/project-config";
-function handlerAlsWrappingPlugin({
-  projectIsEsm = false
-} = {}) {
+function handlerAlsWrappingPlugin() {
   return {
     name: "handler-als-wrapping",
     transform(code, id) {
@@ -17,12 +15,12 @@ function handlerAlsWrappingPlugin({
       if (!normalizePath(id).startsWith(functionsDir + "/")) {
         return null;
       }
-      const wrapped = applyHandlerAlsWrapping(code, { projectIsEsm });
+      const wrapped = applyHandlerAlsWrapping(code);
       return wrapped ? { code: wrapped, map: null } : null;
     }
   };
 }
-function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
+function applyHandlerAlsWrapping(code) {
   const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
   const handlerMatch = handlerRe.exec(code);
   if (!handlerMatch) {
@@ -30,8 +28,7 @@ function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
   }
   const afterEquals = code.slice(handlerMatch.index + handlerMatch[0].length).trimStart();
   const isAsync = /^async(?:\s*[\(\*]|\s+function)/.test(afterEquals);
-  const storePath = projectIsEsm ? "@cedarjs/context/dist/store.js" : "@cedarjs/context/dist/store";
-  const importStatement = `import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '${storePath}'
+  const importStatement = `import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '@cedarjs/context/dist/store.js'
 `;
   const handlerStart = handlerMatch.index;
   const before = code.slice(0, handlerStart);

package/dist/plugins/vite-plugin-rsc-ssr-router-import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-rsc-ssr-router-import.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-rsc-ssr-router-import.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAqC3C"}
+{"version":3,"file":"vite-plugin-rsc-ssr-router-import.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-rsc-ssr-router-import.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAsC3C"}

package/dist/plugins/vite-plugin-rsc-ssr-router-import.js

@@ -11,8 +11,8 @@ function rscSsrRouterImport() {
   const routesFileId = normalizePath(getPaths().web.routes);
   return {
     name: "rsc-ssr-router-import",
-    transform: async function(code, id) {
-      if (id !== routesFileId) {
+    transform: async function(code, id, options) {
+      if (!options?.ssr || id !== routesFileId) {
         return null;
       }
       const ext = path.extname(id);

package/dist/plugins/vite-plugin-rsc-transform-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-rsc-transform-server.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-rsc-transform-server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACvC,MAAM,CA8GR"}
+{"version":3,"file":"vite-plugin-rsc-transform-server.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-rsc-transform-server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACvC,MAAM,CAuHR"}

package/dist/plugins/vite-plugin-rsc-transform-server.js

@@ -8,6 +8,10 @@ function rscTransformUseServerPlugin(outDir, serverEntryFiles) {
       if (!code.includes("use server")) {
         return code;
       }
+      if (id.includes("node_modules/.vite") || id.includes("/react-server-dom-webpack/") || id.includes("/react-server-dom-webpack.server")) {
+        console.log("vite-plugin-rsc-transform-server.ts: Skipping", id);
+        return code;
+      }
       let mod;
       const isTypescript = id.endsWith(".ts") || id.endsWith(".tsx");
       try {

package/dist/rsc/rscRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rscRenderer.d.ts","sourceRoot":"","sources":["../../src/rsc/rscRenderer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAWrD,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,SAAS,CAAA;CAC7B,CAAA;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAE7E;AAyBD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CA2BtD"}
+{"version":3,"file":"rscRenderer.d.ts","sourceRoot":"","sources":["../../src/rsc/rscRenderer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AASrD,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,SAAS,CAAA;CAC7B,CAAA;AAID,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,WAAW,GACjB,OAAO,CAAC,cAAc,CAAC,CAEzB;AAyCD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CA2BtD"}

package/dist/rsc/rscRenderer.js

@@ -1,18 +1,26 @@
 import path from "node:path";
-import { createElement } from "react";
-import { renderToReadableStream } from "react-server-dom-webpack/server.edge";
 import { getPaths } from "@cedarjs/project-config";
 import { getEntriesFromDist } from "../lib/entries.js";
 import { StatusError } from "../lib/StatusError.js";
+import { importRscReact, importRsdwServer } from "./utils.js";
 let absoluteClientEntries = {};
-function renderRscToStream(input) {
+async function renderRscToStream(input) {
   return input.rscId ? renderRsc(input) : executeRsa(input);
 }
 async function loadServerFile(filePath) {
   console.log("rscRenderer.ts loadServerFile filePath", filePath);
+  if (globalThis.__cedarjs__vite_rsc_runtime) {
+    const serverMod = await globalThis.__cedarjs__vite_rsc_runtime.import(filePath);
+    return serverMod.default ? serverMod.default : serverMod;
+  }
   return import(`file://${filePath}`);
 }
 const getRoutesComponent = async () => {
+  if (globalThis.__cedarjs__vite_rsc_runtime) {
+    const routesPath2 = getPaths().web.routes;
+    const routesMod = await globalThis.__cedarjs__vite_rsc_runtime.import(routesPath2);
+    return routesMod.default;
+  }
   const serverEntries = await getEntriesFromDist();
   console.log("rscRenderer.ts serverEntries", serverEntries);
   const routesPath = path.join(
@@ -53,10 +61,12 @@ function getBundlerConfig() {
     {},
     {
       get(_target, encodedId) {
-        console.log("Proxy get encodedId", encodedId);
+        console.log("rscRenderer.ts Proxy get encodedId", encodedId);
         const [filePath, name] = encodedId.split("#");
+        console.log("filePath", filePath);
+        console.log("name", name);
         const filePathSlash = filePath.replaceAll("\\", "/");
-        const id = absoluteClientEntries[filePathSlash];
+        const id = globalThis.__cedarjs__vite_rsc_runtime ? filePath : absoluteClientEntries[filePathSlash];
         console.log("absoluteClientEntries", absoluteClientEntries);
         console.log("filePath", filePathSlash);
         if (!id) {
@@ -79,6 +89,8 @@ async function renderRsc(input) {
     throw new Error("Unexpected input. Missing rscId or props.");
   }
   console.log("renderRsc input", input);
+  const { createElement } = await importRscReact();
+  const { renderToReadableStream } = await importRsdwServer();
   const serverRoutes = await getRoutesComponent();
   const model = {
     __cedarjs__Routes: createElement(serverRoutes)
@@ -115,6 +127,8 @@ async function executeRsa(input) {
   console.log("rscRenderer.ts args", ...input.args);
   const data = await method(...input.args);
   console.log("rscRenderer.ts rsa return data", data);
+  const { createElement } = await importRscReact();
+  const { renderToReadableStream } = await importRsdwServer();
   const serverRoutes = await getRoutesComponent();
   console.log("rscRenderer.ts executeRsa serverRoutes", serverRoutes);
   const model = {

package/dist/rsc/rscRequestHandler.d.ts

@@ -3,8 +3,8 @@ import type Router from 'find-my-way';
 import type { ViteDevServer } from 'vite';
 interface CreateRscRequestHandlerOptions {
     getMiddlewareRouter: () => Promise<Router.Instance<any>>;
-    viteDevServer?: ViteDevServer;
+    viteSsrDevServer?: ViteDevServer;
 }
-export declare function createRscRequestHandler(options: CreateRscRequestHandlerOptions): (req: ExpressRequest, res: ExpressResponse, next: () => void) => Promise<void>;
+export declare function createRscRequestHandler(options: CreateRscRequestHandlerOptions): Promise<(req: ExpressRequest, res: ExpressResponse, next: () => void) => Promise<void>>;
 export {};
 //# sourceMappingURL=rscRequestHandler.d.ts.map

package/dist/rsc/rscRequestHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rscRequestHandler.d.ts","sourceRoot":"","sources":["../../src/rsc/rscRequestHandler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,OAAO,IAAI,cAAc,EACzB,QAAQ,IAAI,eAAe,EAC5B,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAgBzC,UAAU,8BAA8B;IACtC,mBAAmB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;IACxD,aAAa,CAAC,EAAE,aAAa,CAAA;CAC9B;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,8BAA8B,IAMrC,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,MAAM,MAAM,IAAI,mBAqHnB"}
+{"version":3,"file":"rscRequestHandler.d.ts","sourceRoot":"","sources":["../../src/rsc/rscRequestHandler.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,OAAO,IAAI,cAAc,EACzB,QAAQ,IAAI,eAAe,EAC5B,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAazC,UAAU,8BAA8B;IACtC,mBAAmB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;IACxD,gBAAgB,CAAC,EAAE,aAAa,CAAA;CACjC;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,8BAA8B,iBAShC,cAAc,OACd,eAAe,QACd,MAAM,IAAI,oBAqHnB"}

package/dist/rsc/rscRequestHandler.js

@@ -8,10 +8,10 @@ import {
 } from "../bundled/react-server-dom-webpack.server.js";
 import { hasStatusCode } from "../lib/StatusError.js";
 import { invoke } from "../middleware/invokeMiddleware.js";
-import { renderRscToStream } from "./rscRenderer.js";
-import { sendRscFlightToStudio } from "./rscStudioHandlers.js";
 const BASE_PATH = "/rw-rsc/";
-function createRscRequestHandler(options) {
+async function createRscRequestHandler(options) {
+  const { renderRscToStream } = await import("./rscRenderer.js");
+  const { sendRscFlightToStudio } = await import("./rscStudioHandlers.js");
   return async (req, res, next) => {
     console.log("BASE_PATH", BASE_PATH);
     console.log("req.originalUrl", req.originalUrl, "req.url", req.url);
@@ -26,7 +26,7 @@ function createRscRequestHandler(options) {
         matchedMw?.handler,
         {
           params: matchedMw?.params,
-          viteDevServer: options.viteDevServer
+          viteSsrDevServer: options.viteSsrDevServer
         }
       );
       const webRes = mwResponse.toResponse();

package/dist/rsc/rscWebSocketServer.d.ts

@@ -0,0 +1,2 @@
+export declare function createWebSocketServer(): void;
+//# sourceMappingURL=rscWebSocketServer.d.ts.map

package/dist/rsc/rscWebSocketServer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rscWebSocketServer.d.ts","sourceRoot":"","sources":["../../src/rsc/rscWebSocketServer.ts"],"names":[],"mappings":"AAEA,wBAAgB,qBAAqB,SAwBpC"}

package/dist/rsc/rscWebSocketServer.js

@@ -0,0 +1,22 @@
+import WebSocket, { WebSocketServer } from "ws";
+function createWebSocketServer() {
+  const wsServer = new WebSocketServer({ port: 18998 });
+  wsServer.on("connection", (ws) => {
+    console.log("A new client connected.");
+    ws.on("message", (data) => {
+      const message = data.toString();
+      console.log("Received message:", message);
+      wsServer.clients.forEach((client) => {
+        if (client.readyState === WebSocket.OPEN) {
+          client.send(message);
+        }
+      });
+    });
+    ws.on("close", () => {
+      console.log("A client disconnected.");
+    });
+  });
+}
+export {
+  createWebSocketServer
+};

package/dist/rsc/utils.d.ts

@@ -0,0 +1,10 @@
+import type { default as RSDWServerModule } from 'react-server-dom-webpack/server.edge';
+type RSDWServerType = typeof RSDWServerModule;
+/**
+ * This function ensures we load the version of React that's been imported with
+ * the react-server condition.
+ */
+export declare function importRscReact(): Promise<any>;
+export declare function importRsdwServer(): Promise<RSDWServerType>;
+export {};
+//# sourceMappingURL=utils.d.ts.map

package/dist/rsc/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/rsc/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAEvF,KAAK,cAAc,GAAG,OAAO,gBAAgB,CAAA;AAE7C;;;GAGG;AACH,wBAAsB,cAAc,iBAQnC;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,cAAc,CAAC,CAUhE"}

package/dist/rsc/utils.js

@@ -0,0 +1,21 @@
+async function importRscReact() {
+  if (globalThis.__cedarjs__vite_rsc_runtime) {
+    const reactMod = await globalThis.__cedarjs__vite_rsc_runtime.import("react");
+    return reactMod.default;
+  }
+  return import("react");
+}
+async function importRsdwServer() {
+  if (globalThis.__cedarjs__vite_rsc_runtime) {
+    const rsdwServerMod = await globalThis.__cedarjs__vite_rsc_runtime.import(
+      "react-server-dom-webpack/server.edge"
+    );
+    return rsdwServerMod.default;
+  } else {
+    return import("react-server-dom-webpack/server.edge");
+  }
+}
+export {
+  importRscReact,
+  importRsdwServer
+};

package/dist/runFeServer.js

@@ -5,13 +5,13 @@ import { createServerAdapter } from "@whatwg-node/server";
 import { config as loadDotEnv } from "dotenv-defaults";
 import express from "express";
 import { createProxyMiddleware } from "http-proxy-middleware";
-import WebSocket, { WebSocketServer } from "ws";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { getRscStylesheetLinkGenerator } from "@cedarjs/router/rscCss";
 import { createPerRequestMap, createServerStorage } from "@cedarjs/server-store";
 import { registerFwGlobalsAndShims } from "./lib/registerFwGlobalsAndShims.js";
 import { invoke } from "./middleware/invokeMiddleware.js";
 import { createMiddlewareRouter } from "./middleware/register.js";
+import { createWebSocketServer } from "./rsc/rscWebSocketServer.js";
 import { createReactStreamingHandler } from "./streaming/createReactStreamingHandler.js";
 import { convertExpressHeaders, getFullUrl } from "./utils.js";
 loadDotEnv({
@@ -67,7 +67,7 @@ async function runFeServer() {
     "/assets",
     express.static(rwPaths.web.distBrowser + "/assets", { index: false })
   );
-  app.use("*", (req, _res, next) => {
+  app.use((req, _res, next) => {
     const fullUrl = getFullUrl(req, rscEnabled);
     const headers = convertExpressHeaders(req.headersDistinct);
     const perReqStore = createPerRequestMap({ headers, fullUrl });
@@ -86,7 +86,7 @@ async function runFeServer() {
     const { createRscRequestHandler } = await import("./rsc/rscRequestHandler.js");
     app.use(
       "/rw-rsc",
-      createRscRequestHandler({
+      await createRscRequestHandler({
         getMiddlewareRouter: async () => middlewareRouter
       })
     );
@@ -99,32 +99,13 @@ async function runFeServer() {
     getStylesheetLinks,
     getMiddlewareRouter: async () => middlewareRouter
   });
-  app.get("*", createServerAdapter(routeHandler));
-  app.post("*", handleWithMiddleware());
+  app.get("/{*splat}", createServerAdapter(routeHandler));
+  app.post("/{*splat}", handleWithMiddleware());
   app.listen(rwConfig.web.port);
   console.log(
     `Started production FE server on http://localhost:${rwConfig.web.port}`
   );
 }
-function createWebSocketServer() {
-  const wsServer = new WebSocketServer({ port: 18998 });
-  wsServer.on("connection", (ws) => {
-    console.log("A new client connected.");
-    ws.on("message", (data) => {
-      const message = data.toString();
-      console.log("runFeServer.ts: Received message:");
-      console.log(message.slice(0, 120) + "...");
-      wsServer.clients.forEach((client) => {
-        if (client.readyState === WebSocket.OPEN) {
-          client.send(message);
-        }
-      });
-    });
-    ws.on("close", () => {
-      console.log("A client disconnected.");
-    });
-  });
-}
 runFeServer();
 export {
   runFeServer

package/dist/streaming/createReactStreamingHandler.d.ts

@@ -7,6 +7,6 @@ interface CreateReactStreamingHandlerOptions {
     getStylesheetLinks: (route?: RWRouteManifestItem | RouteSpec) => string[];
     getMiddlewareRouter: () => Promise<Router.Instance<any>>;
 }
-export declare const createReactStreamingHandler: ({ routes, clientEntryPath, getStylesheetLinks, getMiddlewareRouter, }: CreateReactStreamingHandlerOptions, viteDevServer?: ViteDevServer) => Promise<(req: Request) => Promise<Response>>;
+export declare const createReactStreamingHandler: ({ routes, clientEntryPath, getStylesheetLinks, getMiddlewareRouter, }: CreateReactStreamingHandlerOptions, viteSsrDevServer?: ViteDevServer) => Promise<(req: Request) => Promise<Response>>;
 export {};
 //# sourceMappingURL=createReactStreamingHandler.d.ts.map

package/dist/streaming/createReactStreamingHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createReactStreamingHandler.d.ts","sourceRoot":"","sources":["../../src/streaming/createReactStreamingHandler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAGrC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAIzC,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAoBvE,UAAU,kCAAkC;IAC1C,MAAM,EAAE,mBAAmB,EAAE,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAA;IACvB,kBAAkB,EAAE,CAAC,KAAK,CAAC,EAAE,mBAAmB,GAAG,SAAS,KAAK,MAAM,EAAE,CAAA;IACzE,mBAAmB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;CACzD;AAOD,eAAO,MAAM,2BAA2B,GACtC,uEAKG,kCAAkC,EACrC,gBAAgB,aAAa,mBAuBV,OAAO,uBA8I3B,CAAA"}
+{"version":3,"file":"createReactStreamingHandler.d.ts","sourceRoot":"","sources":["../../src/streaming/createReactStreamingHandler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAGrC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAIzC,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAoBvE,UAAU,kCAAkC;IAC1C,MAAM,EAAE,mBAAmB,EAAE,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAA;IACvB,kBAAkB,EAAE,CAAC,KAAK,CAAC,EAAE,mBAAmB,GAAG,SAAS,KAAK,MAAM,EAAE,CAAA;IACzE,mBAAmB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;CACzD;AAOD,eAAO,MAAM,2BAA2B,GACtC,uEAKG,kCAAkC,EACrC,mBAAmB,aAAa,mBAuBb,OAAO,uBAiJ3B,CAAA"}

package/dist/streaming/createReactStreamingHandler.js

@@ -23,10 +23,10 @@ const createReactStreamingHandler = async ({
   clientEntryPath,
   getStylesheetLinks,
   getMiddlewareRouter
-}, viteDevServer) => {
+}, viteSsrDevServer) => {
   const rwPaths = getPaths();
   const rwConfig = getConfig();
-  const isProd = !viteDevServer;
+  const isProd = !viteSsrDevServer;
   const middlewareRouter = await getMiddlewareRouter();
   let entryServerImport;
   let fallbackDocumentImport;
@@ -70,7 +70,7 @@ const createReactStreamingHandler = async ({
           route: currentRoute,
           cssPaths: cssLinks,
           params: matchedMw?.params,
-          viteDevServer
+          viteSsrDevServer
         }
       );
       if (mwResponse.isRedirect() || mwResponse.body) {
@@ -89,8 +89,8 @@ const createReactStreamingHandler = async ({
       });
     }
     if (!isProd) {
-      entryServerImport = await ssrLoadEntryServer(viteDevServer);
-      fallbackDocumentImport = await viteDevServer.ssrLoadModule(
+      entryServerImport = await ssrLoadEntryServer(viteSsrDevServer);
+      fallbackDocumentImport = await viteSsrDevServer.ssrLoadModule(
         rwPaths.web.document
       );
     }
@@ -107,10 +107,12 @@ const createReactStreamingHandler = async ({
         req,
         parsedParams
       },
-      viteDevServer
+      viteSsrDevServer
     });
     metaTags = routeHookOutput.meta;
-    const jsBundles = [viteDevServer ? clientEntryPath : "/" + clientEntryPath];
+    const jsBundles = [
+      viteSsrDevServer ? clientEntryPath : "/" + clientEntryPath
+    ];
     if (currentRoute.bundle) {
       jsBundles.push("/" + currentRoute.bundle);
     }
@@ -130,12 +132,13 @@ const createReactStreamingHandler = async ({
       {
         waitForAllReady: isSeoCrawler,
         onError: (err) => {
-          if (!isProd && viteDevServer) {
-            viteDevServer.ssrFixStacktrace(err);
+          if (!isProd && viteSsrDevServer) {
+            viteSsrDevServer.ssrFixStacktrace(err);
           }
           console.error(err);
         }
-      }
+      },
+      viteSsrDevServer
     );
     return reactResponse;
   };

package/dist/streaming/streamHelpers.d.ts

@@ -1,11 +1,17 @@
 import type React from 'react';
+import type { ViteDevServer } from 'vite';
 import type { ServerAuthState } from '@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js';
 import type { TagDescriptor } from '@cedarjs/web';
 import type { MiddlewareResponse } from '@cedarjs/web/middleware';
 import type { ServerEntryType } from '../types.js';
+interface FallbackDocumentProps {
+    css: string[];
+    meta: TagDescriptor[];
+    children?: React.ReactNode;
+}
 interface RenderToStreamArgs {
     ServerEntry: ServerEntryType;
-    FallbackDocument: React.FunctionComponent;
+    FallbackDocument: React.FunctionComponent<FallbackDocumentProps>;
     currentUrl: URL;
     metaTags: TagDescriptor[];
     cssLinks: string[];
@@ -17,7 +23,6 @@ interface StreamOptions {
     waitForAllReady?: boolean;
     onError?: (err: Error) => void;
 }
-export declare function reactRenderToStreamResponse(mwRes: MiddlewareResponse, renderOptions: RenderToStreamArgs, streamOptions: StreamOptions): Promise<Response>;
-export declare function importModule(mod: 'rd-server' | '__cedarjs__react' | '__cedarjs__location' | '__cedarjs__server_auth_provider' | '__cedarjs__server_inject'): Promise<any>;
+export declare function reactRenderToStreamResponse(mwRes: MiddlewareResponse, renderOptions: RenderToStreamArgs, streamOptions: StreamOptions, viteDevServer?: ViteDevServer): Promise<Response>;
 export {};
 //# sourceMappingURL=streamHelpers.d.ts.map

package/dist/streaming/streamHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streamHelpers.d.ts","sourceRoot":"","sources":["../../src/streaming/streamHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAQ9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAA;AAI5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAYlD,UAAU,kBAAkB;IAC1B,WAAW,EAAE,eAAe,CAAA;IAC5B,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,CAAA;IACzC,UAAU,EAAE,GAAG,CAAA;IACf,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,eAAe,CAAA;CAC3B;AAED,UAAU,aAAa;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;CAC/B;AA2BD,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,kBAAkB,EACzB,aAAa,EAAE,kBAAkB,EACjC,aAAa,EAAE,aAAa,qBAgM7B;AA2BD,wBAAsB,YAAY,CAChC,GAAG,EACC,WAAW,GACX,kBAAkB,GAClB,qBAAqB,GACrB,iCAAiC,GACjC,0BAA0B,gBA6B/B"}
+{"version":3,"file":"streamHelpers.d.ts","sourceRoot":"","sources":["../../src/streaming/streamHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAO9B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAEzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAA;AAI5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAYlD,UAAU,qBAAqB;IAC7B,GAAG,EAAE,MAAM,EAAE,CAAA;IACb,IAAI,EAAE,aAAa,EAAE,CAAA;IACrB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAC3B;AAED,UAAU,kBAAkB;IAC1B,WAAW,EAAE,eAAe,CAAA;IAC5B,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAA;IAChE,UAAU,EAAE,GAAG,CAAA;IACf,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,eAAe,CAAA;CAC3B;AAED,UAAU,aAAa;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;CAC/B;AA2BD,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,kBAAkB,EACzB,aAAa,EAAE,kBAAkB,EACjC,aAAa,EAAE,aAAa,EAC5B,aAAa,CAAC,EAAE,aAAa,qBAgM9B"}

package/dist/streaming/streamHelpers.js

@@ -27,7 +27,7 @@ globalThis.__webpack_require__ ||= (id) => {
   return globalThis.__rw_module_cache__.get(id)
 };
 `;
-async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions) {
+async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions, viteDevServer) {
   const { waitForAllReady = false } = streamOptions;
   const {
     ServerEntry,
@@ -49,13 +49,13 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     meta: metaTags
   });
   const rscEnabled = getConfig().experimental?.rsc?.enabled;
-  const { createElement } = rscEnabled ? await importModule("__cedarjs__react") : await import("react");
+  const { createElement } = rscEnabled ? await importModule("__cedarjs__react", !!viteDevServer) : await import("react");
   const {
     createInjector,
     ServerHtmlProvider,
     ServerInjectedHtml
-  } = rscEnabled ? await importModule("__cedarjs__server_inject") : await import("@cedarjs/web/serverInject");
-  const { renderToString } = rscEnabled ? await importModule("rd-server") : await import("react-dom/server");
+  } = rscEnabled ? await importModule("__cedarjs__server_inject", !!viteDevServer) : await import("@cedarjs/web/serverInject");
+  const { renderToString } = rscEnabled ? await importModule("rd-server", !!viteDevServer) : await import("react-dom/server");
   const { injectionState, injectToPage } = createInjector();
   const bufferTransform = createBufferedTransformStream();
   const serverInjectionTransform = createServerInjectionTransform({
@@ -70,8 +70,8 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     controller.abort();
   }, 1e4);
   const timeoutTransform = createTimeoutTransform(timeoutHandle);
-  const { ServerAuthProvider } = rscEnabled ? await importModule("__cedarjs__server_auth_provider") : await import("@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js");
-  const { LocationProvider } = rscEnabled ? await importModule("__cedarjs__location") : await import("@cedarjs/router/location");
+  const { ServerAuthProvider } = rscEnabled ? await importModule("__cedarjs__server_auth_provider", !!viteDevServer) : await import("@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js");
+  const { LocationProvider } = rscEnabled ? await importModule("__cedarjs__location", !!viteDevServer) : await import("@cedarjs/router/location");
   const renderRoot = (url) => {
     return createElement(
       ServerAuthProvider,
@@ -103,7 +103,7 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     ),
     bootstrapModules: jsBundles
   };
-  const { renderToReadableStream } = rscEnabled ? await importModule("rd-server") : await import("react-dom/server.edge");
+  const { renderToReadableStream } = rscEnabled ? await importModule("rd-server", !!viteDevServer) : await import("react-dom/server.edge");
   try {
     let didErrorOutsideShell = false;
     const renderToStreamOptions = {
@@ -137,7 +137,7 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     console.error("\u{1F53B} Failed to render shell");
     streamOptions.onError?.(e);
     const fallbackShell = await renderToReadableStream(
-      FallbackDocument({
+      createElement(FallbackDocument, {
         children: null,
         css: cssLinks,
         meta: metaTags
@@ -162,33 +162,51 @@ function applyStreamTransforms(reactStream, transformsToApply) {
   }
   return outputStream;
 }
-async function importModule(mod) {
-  const distSsr = getPaths().web.distSsr;
-  const rdServerPath = makeFilePath(path.join(distSsr, "rd-server.mjs"));
-  const reactPath = makeFilePath(path.join(distSsr, "__cedarjs__react.mjs"));
-  const locationPath = makeFilePath(
-    path.join(distSsr, "__cedarjs__location.mjs")
-  );
-  const ServerAuthProviderPath = makeFilePath(
-    path.join(distSsr, "__cedarjs__server_auth_provider.mjs")
-  );
-  const ServerInjectPath = makeFilePath(
-    path.join(distSsr, "__cedarjs__server_inject.mjs")
-  );
-  if (mod === "rd-server") {
-    return (await import(rdServerPath)).default;
-  } else if (mod === "__cedarjs__react") {
-    return (await import(reactPath)).default;
-  } else if (mod === "__cedarjs__location") {
-    return await import(locationPath);
-  } else if (mod === "__cedarjs__server_auth_provider") {
-    return await import(ServerAuthProviderPath);
-  } else if (mod === "__cedarjs__server_inject") {
-    return await import(ServerInjectPath);
+async function importModule(mod, isDev) {
+  if (isDev) {
+    if (mod === "rd-server") {
+      const loadedMod = await import("react-dom/server.edge");
+      return loadedMod.default;
+    } else if (mod === "__cedarjs__react") {
+      const loadedMod = await import("react");
+      return loadedMod.default;
+    } else if (mod === "__cedarjs__location") {
+      const loadedMod = await import("@cedarjs/router/location");
+      return loadedMod;
+    } else if (mod === "__cedarjs__server_auth_provider") {
+      const loadedMod = await import("@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js");
+      return loadedMod;
+    } else if (mod === "__cedarjs__server_inject") {
+      const loadedMod = await import("@cedarjs/web/serverInject");
+      return loadedMod;
+    }
+  } else {
+    const distSsr = getPaths().web.distSsr;
+    const rdServerPath = makeFilePath(path.join(distSsr, "rd-server.mjs"));
+    const reactPath = makeFilePath(path.join(distSsr, "__cedarjs__react.mjs"));
+    const locationPath = makeFilePath(
+      path.join(distSsr, "__cedarjs__location.mjs")
+    );
+    const serverAuthProviderPath = makeFilePath(
+      path.join(distSsr, "__cedarjs__server_auth_provider.mjs")
+    );
+    const serverInjectPath = makeFilePath(
+      path.join(distSsr, "__cedarjs__server_inject.mjs")
+    );
+    if (mod === "rd-server") {
+      return (await import(rdServerPath)).default;
+    } else if (mod === "__cedarjs__react") {
+      return (await import(reactPath)).default;
+    } else if (mod === "__cedarjs__location") {
+      return await import(locationPath);
+    } else if (mod === "__cedarjs__server_auth_provider") {
+      return await import(serverAuthProviderPath);
+    } else if (mod === "__cedarjs__server_inject") {
+      return await import(serverInjectPath);
+    }
   }
   throw new Error("Unknown module " + mod);
 }
 export {
-  importModule,
   reactRenderToStreamResponse
 };

package/dist/streaming/triggerRouteHooks.d.ts

@@ -18,9 +18,9 @@ interface LoadAndRunRouteHooks {
         req: Request;
         parsedParams?: Record<string, any>;
     };
-    viteDevServer?: ViteDevServer;
+    viteSsrDevServer?: ViteDevServer;
     previousOutput?: RouteHookOutput;
 }
-export declare const loadAndRunRouteHooks: ({ paths, reqMeta, viteDevServer, previousOutput, }: LoadAndRunRouteHooks) => Promise<RouteHookOutput>;
+export declare const loadAndRunRouteHooks: ({ paths, reqMeta, viteSsrDevServer, previousOutput, }: LoadAndRunRouteHooks) => Promise<RouteHookOutput>;
 export {};
 //# sourceMappingURL=triggerRouteHooks.d.ts.map

package/dist/streaming/triggerRouteHooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triggerRouteHooks.d.ts","sourceRoot":"","sources":["../../src/streaming/triggerRouteHooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAGzC,OAAO,KAAK,EACV,QAAQ,EAER,eAAe,EACf,aAAa,EACd,MAAM,cAAc,CAAA;AAErB,UAAU,UAAU;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAA;CAChB;AAED,UAAU,sBAAsB;IAC9B,UAAU,EAAE,UAAU,CAAA;IACtB,GAAG,EAAE,OAAO,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAClC,cAAc,CAAC,EAAE,eAAe,CAAA;CACjC;AAED,eAAO,MAAM,iBAAiB,GAAU,oDAKrC,sBAAsB;;EA4BxB,CAAA;AAED,UAAU,oBAAoB;IAC5B,KAAK,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,CAAA;IACpC,OAAO,EAAE;QACP,GAAG,EAAE,OAAO,CAAA;QACZ,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KACnC,CAAA;IACD,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,cAAc,CAAC,EAAE,eAAe,CAAA;CACjC;AAMD,eAAO,MAAM,oBAAoB,GAAU,oDAKxC,oBAAoB,KAAG,OAAO,CAAC,eAAe,CAyChD,CAAA"}
+{"version":3,"file":"triggerRouteHooks.d.ts","sourceRoot":"","sources":["../../src/streaming/triggerRouteHooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAGzC,OAAO,KAAK,EACV,QAAQ,EAER,eAAe,EACf,aAAa,EACd,MAAM,cAAc,CAAA;AAErB,UAAU,UAAU;IAClB,IAAI,CAAC,EAAE,QAAQ,CAAA;CAChB;AAED,UAAU,sBAAsB;IAC9B,UAAU,EAAE,UAAU,CAAA;IACtB,GAAG,EAAE,OAAO,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAClC,cAAc,CAAC,EAAE,eAAe,CAAA;CACjC;AAED,eAAO,MAAM,iBAAiB,GAAU,oDAKrC,sBAAsB;;EA4BxB,CAAA;AAED,UAAU,oBAAoB;IAC5B,KAAK,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,CAAA;IACpC,OAAO,EAAE;QACP,GAAG,EAAE,OAAO,CAAA;QACZ,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KACnC,CAAA;IACD,gBAAgB,CAAC,EAAE,aAAa,CAAA;IAChC,cAAc,CAAC,EAAE,eAAe,CAAA;CACjC;AAMD,eAAO,MAAM,oBAAoB,GAAU,uDAKxC,oBAAoB,KAAG,OAAO,CAAC,eAAe,CA2ChD,CAAA"}

package/dist/streaming/triggerRouteHooks.js

@@ -31,11 +31,11 @@ const defaultRouteHookOutput = {
 const loadAndRunRouteHooks = async ({
   paths = [],
   reqMeta,
-  viteDevServer,
+  viteSsrDevServer,
   previousOutput = defaultRouteHookOutput
 }) => {
   const loadModule = async (path) => {
-    return viteDevServer ? viteDevServer.ssrLoadModule(path) : import(path);
+    return viteSsrDevServer ? viteSsrDevServer.ssrLoadModule(path) : import(path);
   };
   let currentRouteHooks;
   let rhOutput = defaultRouteHookOutput;
@@ -55,7 +55,7 @@ const loadAndRunRouteHooks = async ({
         paths,
         reqMeta,
         previousOutput: rhOutput,
-        viteDevServer
+        viteSsrDevServer
       });
     } else {
       return rhOutput;