@cedarjs/vite 5.0.0-canary.2596 → 5.0.0-rc.261

package/dist/index.js

@@ -12,7 +12,6 @@ import { cedarHtmlEnvPlugin } from "./plugins/vite-plugin-cedar-html-env.js";
 import { cedarNodePolyfills } from "./plugins/vite-plugin-cedar-node-polyfills.js";
 import { cedarRemoveDevFatalErrorPage } from "./plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js";
 import { cedarRemoveFromBundle } from "./plugins/vite-plugin-cedar-remove-from-bundle.js";
-import { cedarRoutesAutoLoaderPlugin } from "./plugins/vite-plugin-cedar-routes-auto-loader.js";
 import { cedarWaitForApiServer } from "./plugins/vite-plugin-cedar-wait-for-api-server.js";
 import { cedarjsResolveCedarStyleImportsPlugin } from "./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js";
 import { cedarTransformJsAsJsx } from "./plugins/vite-plugin-jsx-loader.js";
@@ -26,7 +25,6 @@ import { cedarHtmlEnvPlugin as cedarHtmlEnvPlugin2 } from "./plugins/vite-plugin
 import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
 import { cedarNodePolyfills as cedarNodePolyfills2 } from "./plugins/vite-plugin-cedar-node-polyfills.js";
 import { cedarRemoveDevFatalErrorPage as cedarRemoveDevFatalErrorPage2 } from "./plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js";
-import { cedarRoutesAutoLoaderPlugin as cedarRoutesAutoLoaderPlugin2 } from "./plugins/vite-plugin-cedar-routes-auto-loader.js";
 import { cedarRemoveFromBundle as cedarRemoveFromBundle2 } from "./plugins/vite-plugin-cedar-remove-from-bundle.js";
 import { cedarjsResolveCedarStyleImportsPlugin as cedarjsResolveCedarStyleImportsPlugin2 } from "./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js";
 import { cedarjsJobPathInjectorPlugin } from "./plugins/vite-plugin-cedarjs-job-path-injector.js";
@@ -42,7 +40,14 @@ function cedar({ mode } = {}) {
     forVite: true
   });
   const babelConfig = {
-    ...webSideDefaultBabelConfig
+    ...webSideDefaultBabelConfig,
+    // For RSC we don't want to include the routes auto-loader plugin as we
+    // handle that differently in each specific RSC build stage
+    overrides: rscEnabled ? webSideDefaultBabelConfig.overrides.filter((override) => {
+      return !override.plugins?.some((plugin) => {
+        return Array.isArray(plugin) && plugin[2] === "babel-plugin-redwood-routes-auto-loader";
+      });
+    }) : webSideDefaultBabelConfig.overrides
   };
   return [
     mode === "test" && cedarJsRouterImportTransformPlugin(),
@@ -59,8 +64,6 @@ function cedar({ mode } = {}) {
     cedarTransformJsAsJsx(),
     cedarRemoveFromBundle(),
     cedarRemoveDevFatalErrorPage(),
-    // RSC handles route auto-loading differently in each build stage
-    !rscEnabled && cedarRoutesAutoLoaderPlugin(),
     react({ babel: babelConfig })
   ];
 }
@@ -77,7 +80,6 @@ export {
   cedarNodePolyfills2 as cedarNodePolyfills,
   cedarRemoveDevFatalErrorPage2 as cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle2 as cedarRemoveFromBundle,
-  cedarRoutesAutoLoaderPlugin2 as cedarRoutesAutoLoaderPlugin,
   cedarSwapApolloProvider2 as cedarSwapApolloProvider,
   cedarTransformJsAsJsx2 as cedarTransformJsAsJsx,
   cedarUniversalDeployPlugin,

package/dist/lib/registerFwGlobalsAndShims.js

@@ -55,15 +55,6 @@ function registerFwShims() {
   globalThis.__rw_module_cache__ ||= /* @__PURE__ */ new Map();
   globalThis.__webpack_chunk_load__ ||= async (id) => {
     console.log("registerFwShims chunk load id", id);
-    if (globalThis.__cedarjs__vite_ssr_runtime) {
-      return globalThis.__cedarjs__vite_ssr_runtime?.import(id).then((mod) => {
-        console.log("registerFwShims chunk load mod", mod);
-        if (mod.default && typeof mod.default === "object") {
-          return globalThis.__rw_module_cache__.set(id, mod.default);
-        }
-        return globalThis.__rw_module_cache__.set(id, mod);
-      });
-    }
     return import(id).then((mod) => {
       console.log("registerFwShims chunk load mod", mod);
       if (mod.default && typeof mod.default === "object") {

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,CAsC3C"}
+{"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"}

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, options) {
-      if (!options?.ssr || id !== routesFileId) {
+    transform: async function(code, id) {
+      if (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,CAuHR"}
+{"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"}

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

@@ -8,10 +8,6 @@ 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;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"}
+{"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"}

package/dist/rsc/rscRenderer.js

@@ -1,26 +1,18 @@
 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 = {};
-async function renderRscToStream(input) {
+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(
@@ -61,12 +53,10 @@ function getBundlerConfig() {
     {},
     {
       get(_target, encodedId) {
-        console.log("rscRenderer.ts Proxy get encodedId", encodedId);
+        console.log("Proxy get encodedId", encodedId);
         const [filePath, name] = encodedId.split("#");
-        console.log("filePath", filePath);
-        console.log("name", name);
         const filePathSlash = filePath.replaceAll("\\", "/");
-        const id = globalThis.__cedarjs__vite_rsc_runtime ? filePath : absoluteClientEntries[filePathSlash];
+        const id = absoluteClientEntries[filePathSlash];
         console.log("absoluteClientEntries", absoluteClientEntries);
         console.log("filePath", filePathSlash);
         if (!id) {
@@ -89,8 +79,6 @@ 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)
@@ -127,8 +115,6 @@ 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>>;
-    viteSsrDevServer?: ViteDevServer;
+    viteDevServer?: ViteDevServer;
 }
-export declare function createRscRequestHandler(options: CreateRscRequestHandlerOptions): Promise<(req: ExpressRequest, res: ExpressResponse, next: () => void) => Promise<void>>;
+export declare function createRscRequestHandler(options: CreateRscRequestHandlerOptions): (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;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"}
+{"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"}

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/";
-async function createRscRequestHandler(options) {
-  const { renderRscToStream } = await import("./rscRenderer.js");
-  const { sendRscFlightToStudio } = await import("./rscStudioHandlers.js");
+function createRscRequestHandler(options) {
   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 @@ async function createRscRequestHandler(options) {
         matchedMw?.handler,
         {
           params: matchedMw?.params,
-          viteSsrDevServer: options.viteSsrDevServer
+          viteDevServer: options.viteDevServer
         }
       );
       const webRes = mwResponse.toResponse();

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({
@@ -86,7 +86,7 @@ async function runFeServer() {
     const { createRscRequestHandler } = await import("./rsc/rscRequestHandler.js");
     app.use(
       "/rw-rsc",
-      await createRscRequestHandler({
+      createRscRequestHandler({
         getMiddlewareRouter: async () => middlewareRouter
       })
     );
@@ -106,6 +106,25 @@ async function runFeServer() {
     `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, viteSsrDevServer?: ViteDevServer) => Promise<(req: Request) => Promise<Response>>;
+export declare const createReactStreamingHandler: ({ routes, clientEntryPath, getStylesheetLinks, getMiddlewareRouter, }: CreateReactStreamingHandlerOptions, viteDevServer?: 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,mBAAmB,aAAa,mBAuBb,OAAO,uBAiJ3B,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,gBAAgB,aAAa,mBAuBV,OAAO,uBA8I3B,CAAA"}

package/dist/streaming/createReactStreamingHandler.js

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

package/dist/streaming/streamHelpers.d.ts

@@ -1,5 +1,4 @@
 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';
@@ -18,6 +17,7 @@ interface StreamOptions {
     waitForAllReady?: boolean;
     onError?: (err: Error) => void;
 }
-export declare function reactRenderToStreamResponse(mwRes: MiddlewareResponse, renderOptions: RenderToStreamArgs, streamOptions: StreamOptions, viteDevServer?: ViteDevServer): Promise<Response>;
+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 {};
 //# 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;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,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,EAC5B,aAAa,CAAC,EAAE,aAAa,qBAgM9B"}
+{"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"}

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, viteDevServer) {
+async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions) {
   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", !!viteDevServer) : await import("react");
+  const { createElement } = rscEnabled ? await importModule("__cedarjs__react") : await import("react");
   const {
     createInjector,
     ServerHtmlProvider,
     ServerInjectedHtml
-  } = 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");
+  } = rscEnabled ? await importModule("__cedarjs__server_inject") : await import("@cedarjs/web/serverInject");
+  const { renderToString } = rscEnabled ? await importModule("rd-server") : 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", !!viteDevServer) : await import("@cedarjs/auth/dist/AuthProvider/ServerAuthProvider.js");
-  const { LocationProvider } = rscEnabled ? await importModule("__cedarjs__location", !!viteDevServer) : await import("@cedarjs/router/location");
+  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 renderRoot = (url) => {
     return createElement(
       ServerAuthProvider,
@@ -103,7 +103,7 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions,
     ),
     bootstrapModules: jsBundles
   };
-  const { renderToReadableStream } = rscEnabled ? await importModule("rd-server", !!viteDevServer) : await import("react-dom/server.edge");
+  const { renderToReadableStream } = rscEnabled ? await importModule("rd-server") : await import("react-dom/server.edge");
   try {
     let didErrorOutsideShell = false;
     const renderToStreamOptions = {
@@ -162,51 +162,33 @@ function applyStreamTransforms(reactStream, transformsToApply) {
   }
   return outputStream;
 }
-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);
-    }
+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);
   }
   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>;
     };
-    viteSsrDevServer?: ViteDevServer;
+    viteDevServer?: ViteDevServer;
     previousOutput?: RouteHookOutput;
 }
-export declare const loadAndRunRouteHooks: ({ paths, reqMeta, viteSsrDevServer, previousOutput, }: LoadAndRunRouteHooks) => Promise<RouteHookOutput>;
+export declare const loadAndRunRouteHooks: ({ paths, reqMeta, viteDevServer, 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,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"}
+{"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"}

package/dist/streaming/triggerRouteHooks.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "5.0.0-canary.2596",
+  "version": "5.0.0-rc.261",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -49,7 +49,7 @@
     "inject"
   ],
   "scripts": {
-    "build": "node ./build.ts && yarn build:types",
+    "build": "tsx build.ts && yarn build:types",
     "build:pack": "yarn pack -o cedarjs-vite.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "check:attw": "tsx ./attw.ts",
@@ -63,15 +63,15 @@
     "@babel/parser": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api": "5.0.0-canary.2596",
-    "@cedarjs/babel-config": "5.0.0-canary.2596",
-    "@cedarjs/context": "5.0.0-canary.2596",
-    "@cedarjs/cookie-jar": "5.0.0-canary.2596",
-    "@cedarjs/graphql-server": "5.0.0-canary.2596",
-    "@cedarjs/internal": "5.0.0-canary.2596",
-    "@cedarjs/project-config": "5.0.0-canary.2596",
-    "@cedarjs/server-store": "5.0.0-canary.2596",
-    "@cedarjs/testing": "5.0.0-canary.2596",
+    "@cedarjs/api": "5.0.0-rc.261",
+    "@cedarjs/babel-config": "5.0.0-rc.261",
+    "@cedarjs/context": "5.0.0-rc.261",
+    "@cedarjs/cookie-jar": "5.0.0-rc.261",
+    "@cedarjs/graphql-server": "5.0.0-rc.261",
+    "@cedarjs/internal": "5.0.0-rc.261",
+    "@cedarjs/project-config": "5.0.0-rc.261",
+    "@cedarjs/server-store": "5.0.0-rc.261",
+    "@cedarjs/testing": "5.0.0-rc.261",
     "@fastify/url-data": "6.0.3",
     "@swc/core": "1.15.41",
     "@universal-deploy/store": "^0.2.1",
@@ -93,7 +93,7 @@
     "find-my-way": "8.2.2",
     "http-proxy-middleware": "3.0.7",
     "isbot": "5.1.43",
-    "react": "19.2.3",
+    "react": "18.3.1",
     "react-server-dom-webpack": "19.2.4",
     "rimraf": "6.1.3",
     "rou3": "^0.8.1",
@@ -105,9 +105,9 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.4",
-    "@cedarjs/auth": "5.0.0-canary.2596",
-    "@cedarjs/router": "5.0.0-canary.2596",
-    "@cedarjs/web": "5.0.0-canary.2596",
+    "@cedarjs/auth": "5.0.0-rc.261",
+    "@cedarjs/router": "5.0.0-rc.261",
+    "@cedarjs/web": "5.0.0-rc.261",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
     "@types/aws-lambda": "8.10.162",
@@ -127,9 +127,9 @@
     "vitest": "3.2.6"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "workspace:*",
-    "@cedarjs/router": "workspace:*",
-    "@cedarjs/web": "workspace:*"
+    "@cedarjs/auth": "5.0.0-rc.261",
+    "@cedarjs/router": "5.0.0-rc.261",
+    "@cedarjs/web": "5.0.0-rc.261"
   },
   "engines": {
     "node": ">=24"