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

package/dist/cjs/devFeServer.js

@@ -22,7 +22,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var import_node_http = __toESM(require("node:http"), 1);
 var import_server = require("@whatwg-node/server");
 var import_express = __toESM(require("express"), 1);
 var import_vite = require("vite");
@@ -34,22 +33,14 @@ var import_registerFwGlobalsAndShims = require("./lib/registerFwGlobalsAndShims.
 var import_invokeMiddleware = require("./middleware/invokeMiddleware.js");
 var import_register = require("./middleware/register.js");
 var import_vite_plugin_rsc_routes_auto_loader = require("./plugins/vite-plugin-rsc-routes-auto-loader.js");
-var import_vite_plugin_rsc_routes_imports = require("./plugins/vite-plugin-rsc-routes-imports.js");
-var import_vite_plugin_rsc_ssr_router_import = require("./plugins/vite-plugin-rsc-ssr-router-import.js");
-var import_vite_plugin_rsc_transform_server = require("./plugins/vite-plugin-rsc-transform-server.js");
-var import_rscWebSocketServer = require("./rsc/rscWebSocketServer.js");
 var import_collectCss = require("./streaming/collectCss.js");
 var import_createReactStreamingHandler = require("./streaming/createReactStreamingHandler.js");
 var import_utils = require("./utils.js");
-const import_meta = {};
 globalThis.__REDWOOD__PRERENDER_PAGES = {};
-globalThis.__cedarjs__vite_ssr_runtime = void 0;
-globalThis.__cedarjs__vite_rsc_runtime = void 0;
 async function createServer() {
   (0, import_utils.ensureProcessDirWeb)();
   (0, import_registerFwGlobalsAndShims.registerFwGlobalsAndShims)();
   const app = (0, import_express.default)();
-  const server = import_node_http.default.createServer(app);
   const rwPaths = (0, import_project_config.getPaths)();
   const rscEnabled = (0, import_project_config.getConfig)().experimental.rsc?.enabled ?? false;
   const serverStorage = (0, import_server_store.createServerStorage)();
@@ -72,78 +63,8 @@ async function createServer() {
       "Vite config not found. Please set up Vite before running the dev server."
     );
   }
-  const viteSsrDevServer = await (0, import_vite.createServer)({
+  const vite = await (0, import_vite.createServer)({
     configFile: rwPaths.web.viteConfig,
-    envFile: false,
-    define: {
-      "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
-    },
-    ssr: {
-      // Inline every file apart from node built-ins. We want vite/rollup to
-      // inline dependencies in the server build. This gets round runtime
-      // importing of "server-only" and other packages with poisoned imports.
-      //
-      // Files included in `noExternal` are files we want Vite to analyze
-      // As of vite 5.2 `true` here means "all except node built-ins"
-      // noExternal: true,
-      // TODO (RSC): Other frameworks build for RSC without `noExternal: true`.
-      // What are we missing here? When/why is that a better choice? I know
-      // we would have to explicitly add a bunch of packages to noExternal, if
-      // we wanted to go that route.
-      // noExternal: ['@tobbe.dev/rsc-test'],
-      // Can't inline prisma client (db calls fail at runtime) or react-dom
-      // (css pre-init failure)
-      // Server store has to be externalized, because it's a singleton (shared between FW and App)
-      external: [
-        "@prisma/client",
-        "@prisma/adapter-better-sqlite3",
-        "@prisma/fetch-engine",
-        "@prisma/internals",
-        "better-sqlite3",
-        "@cedarjs/auth-dbauth-api",
-        "@cedarjs/cookie-jar",
-        "@cedarjs/server-store",
-        "@simplewebauthn/server",
-        "graphql-scalars",
-        "minimatch",
-        "playwright",
-        "react-dom"
-      ],
-      resolve: {
-        // These conditions are used in the plugin pipeline, and only affect non-externalized
-        // dependencies during the SSR build. Which because of `noExternal: true` means all
-        // dependencies apart from node built-ins.
-        // TODO (RSC): What's the difference between `conditions` and
-        // `externalConditions`? When is one used over the other?
-        // conditions: ['react-server'],
-        // externalConditions: ['react-server'],
-      },
-      optimizeDeps: {
-        // We need Vite to optimize these dependencies so that they are resolved
-        // with the correct conditions. And so that CJS modules work correctly.
-        // include: [
-        //   'react/**/*',
-        //   'react-dom/server',
-        //   'react-dom/server.edge',
-        //   'rehackt',
-        //   'react-server-dom-webpack/server',
-        //   'react-server-dom-webpack/client',
-        //   '@apollo/client/cache/*',
-        //   '@apollo/client/utilities/*',
-        //   '@apollo/client/react/hooks/*',
-        //   'react-fast-compare',
-        //   'invariant',
-        //   'shallowequal',
-        //   'graphql/language/*',
-        //   'stacktracey',
-        //   'deepmerge',
-        //   'fast-glob',
-        // ],
-      }
-    },
-    resolve: {
-      // conditions: ['react-server'],
-    },
     plugins: [
       (0, import_vite_plugin_cjs_interop.cjsInterop)({
         dependencies: [
@@ -157,195 +78,16 @@ async function createServer() {
           "@cedarjs/auth-!(dbauth)-web"
         ]
       }),
-      rscEnabled && (0, import_vite_plugin_rsc_routes_auto_loader.rscRoutesAutoLoader)(),
-      rscEnabled && (0, import_vite_plugin_rsc_ssr_router_import.rscSsrRouterImport)()
+      rscEnabled && (0, import_vite_plugin_rsc_routes_auto_loader.rscRoutesAutoLoader)()
     ],
     server: { middlewareMode: true },
     logLevel: "info",
     clearScreen: false,
     appType: "custom"
   });
-  globalThis.__cedarjs__vite_ssr_runtime = (0, import_vite.createServerModuleRunner)(
-    viteSsrDevServer.environments.ssr
-  );
-  globalThis.__cedarjs__client_references = /* @__PURE__ */ new Set();
-  globalThis.__cedarjs__server_references = /* @__PURE__ */ new Set();
-  const viteRscServer = await (0, import_vite.createServer)({
-    envFile: false,
-    define: {
-      "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
-    },
-    ssr: {
-      // Inline every file apart from node built-ins. We want vite/rollup to
-      // inline dependencies in the server build. This gets round runtime
-      // importing of "server-only" and other packages with poisoned imports.
-      //
-      // Files included in `noExternal` are files we want Vite to analyze
-      // As of vite 5.2 `true` here means "all except node built-ins"
-      noExternal: true,
-      // TODO (RSC): Other frameworks build for RSC without `noExternal: true`.
-      // What are we missing here? When/why is that a better choice? I know
-      // we would have to explicitly add a bunch of packages to noExternal, if
-      // we wanted to go that route.
-      // noExternal: ['@tobbe.dev/rsc-test'],
-      // Can't inline prisma client (db calls fail at runtime) or react-dom
-      // (css pre-init failure)
-      // Server store has to be externalized, because it's a singleton (shared between FW and App)
-      external: [
-        "@prisma/client",
-        "@prisma/adapter-better-sqlite3",
-        "@prisma/fetch-engine",
-        "@prisma/internals",
-        "better-sqlite3",
-        "@cedarjs/auth-dbauth-api",
-        "@cedarjs/cookie-jar",
-        "@cedarjs/server-store",
-        "@cedarjs/structure",
-        "@simplewebauthn/server",
-        "graphql-scalars",
-        "minimatch",
-        "playwright",
-        "react-dom"
-      ],
-      resolve: {
-        // These conditions are used in the plugin pipeline, and only affect non-externalized
-        // dependencies during the SSR build. Which because of `noExternal: true` means all
-        // dependencies apart from node built-ins.
-        // TODO (RSC): What's the difference between `conditions` and
-        // `externalConditions`? When is one used over the other?
-        // In Vite 6, we must include `defaultServerConditions` alongside
-        // `react-server` so that nested condition maps (e.g. the `node`
-        // sub-condition inside `react-server-dom-webpack/server`'s exports)
-        // can still be resolved. Without `node` (or another environment
-        // condition), the resolver throws "No known conditions for
-        // './server' specifier in 'react-server-dom-webpack' package".
-        conditions: ["react-server", ...import_vite.defaultServerConditions],
-        externalConditions: ["react-server", ...import_vite.defaultServerConditions]
-      },
-      optimizeDeps: {
-        // We need Vite to optimize these dependencies so that they are resolved
-        // with the correct conditions. And so that CJS modules work correctly.
-        include: [
-          "react/**/*",
-          "react-dom/server",
-          "react-dom/server.edge",
-          "rehackt",
-          "react-server-dom-webpack/server",
-          "react-server-dom-webpack/server.edge",
-          "react-server-dom-webpack/client",
-          "react-server-dom-webpack/client.edge",
-          "@apollo/client/cache/*",
-          "@apollo/client/utilities/*",
-          "@apollo/client/react/hooks/*",
-          "react-fast-compare",
-          "invariant",
-          "shallowequal",
-          "graphql/language/*",
-          "stacktracey",
-          "deepmerge",
-          "fast-glob",
-          "@whatwg-node/fetch",
-          "busboy",
-          "cookie"
-        ],
-        // Without excluding `util` we get "TypeError: util.TextEncoder is not
-        // a constructor" in react-server-dom-webpack.server because it'll try
-        // to use Browserify's `util` instead of Node's. And Browserify's
-        // polyfill is missing TextEncoder+TextDecoder. The reason it's using
-        // the Browserify polyfill is because we have
-        // `vite-plugin-node-polyfills` as a dependency, and that'll add
-        // Browserify's `node-util` to `node_modules`, so when Vite goes to
-        // resolve `import { TextEncoder } from 'util` it'll find the one in
-        // `node_modules` instead of Node's internal version.
-        // We only see this in dev, and not in prod. I'm not entirely sure why
-        // but I have two guesses: 1. When RSC is enabled we don't actually use
-        // `vite-plugin-node-polyfill`, so some kind of tree shaking is
-        // happening, which prevents the issue from occurring. 2. In prod we
-        // only use Node's dependency resolution. Vite is not involved. And
-        // that difference in resolution is what prevents the issue from
-        // occurring.
-        exclude: ["util"]
-      }
-    },
-    resolve: {
-      // See comment above in ssr.resolve for why we include defaultServerConditions.
-      conditions: ["react-server", ...import_vite.defaultServerConditions]
-    },
-    plugins: [
-      {
-        name: "rsc-record-and-tranform-use-client-plugin",
-        transform(code, id, _options) {
-          globalThis.__cedarjs__client_references?.delete(id);
-          if (!/^(["'])use client\1/.test(code)) {
-            return void 0;
-          }
-          console.log(
-            "rsc-record-and-transform-use-client-plugin: adding client reference",
-            id
-          );
-          globalThis.__cedarjs__client_references?.add(id);
-          const fns = code.matchAll(/export function (\w+)\(/g);
-          const consts = code.matchAll(/export const (\w+) = \(/g);
-          const names = [...fns, ...consts].map(([, name]) => name);
-          const result = [
-            `import { registerClientReference } from "react-server-dom-webpack/server.edge";`,
-            "",
-            ...names.map((name) => {
-              return name === "default" ? `export default registerClientReference({}, "${id}", "${name}");` : `export const ${name} = registerClientReference({}, "${id}", "${name}");`;
-            })
-          ].join("\n");
-          console.log("rsc-record-and-transform-use-client-plugin result");
-          console.log(
-            result.split("\n").map((line, i) => `  ${i + 1}: ${line}`).join("\n")
-          );
-          return { code: result, map: null };
-        }
-      },
-      (0, import_vite_plugin_rsc_transform_server.rscTransformUseServerPlugin)("", {}),
-      // The rscTransformUseClientPlugin maps paths like
-      // /Users/tobbe/.../rw-app/node_modules/@tobbe.dev/rsc-test/dist/rsc-test.es.js
-      // to
-      // /Users/tobbe/.../rw-app/web/dist/ssr/assets/rsc0.js
-      // That's why it needs the `clientEntryFiles` data
-      // (It does other things as well, but that's why it needs clientEntryFiles)
-      // rscTransformUseClientPlugin(clientEntryFiles),
-      // rscTransformUseServerPlugin(outDir, serverEntryFiles),
-      (0, import_vite_plugin_rsc_routes_imports.rscRoutesImports)(),
-      {
-        name: "rsc-hot-update",
-        handleHotUpdate(ctx) {
-          console.log("rsc-hot-update ctx.modules", ctx.modules);
-          return [];
-        }
-      }
-    ],
-    build: {
-      ssr: true
-    },
-    server: {
-      // We never call `viteRscServer.listen()`, so we should run this in
-      // middleware mode
-      middlewareMode: true,
-      // The hmr/fast-refresh websocket in this server collides with the one in
-      // the other Vite server. So we can either disable it or run it on a
-      // different port.
-      // TODO (RSC): Figure out if we should disable or just pick a different
-      // port
-      ws: false
-      // hmr: {
-      //   port: 24679,
-      // },
-    },
-    appType: "custom",
-    // Using a unique cache dir here to not clash with our other vite server
-    cacheDir: "../node_modules/.vite-rsc"
-  });
-  globalThis.__cedarjs__vite_rsc_runtime = (0, import_vite.createServerModuleRunner)(
-    viteRscServer.environments.ssr
-  );
   const handleWithMiddleware = (route) => {
     return (0, import_server.createServerAdapter)(async (req) => {
-      const middlewareRouter = await (0, import_register.createMiddlewareRouter)(viteSsrDevServer);
+      const middlewareRouter = await (0, import_register.createMiddlewareRouter)(vite);
       const middleware = middlewareRouter.find(
         req.method,
         req.url
@@ -355,22 +97,19 @@ async function createServer() {
       }
       const [mwRes] = await (0, import_invokeMiddleware.invoke)(req, middleware, {
         route,
-        viteSsrDevServer
+        viteDevServer: vite
       });
       return mwRes.toResponse();
     });
   };
-  app.use(viteSsrDevServer.middlewares);
+  app.use(vite.middlewares);
   if (rscEnabled) {
-    (0, import_rscWebSocketServer.createWebSocketServer)();
-    const { createRscRequestHandler } = await globalThis.__cedarjs__vite_rsc_runtime.import(
-      new URL("./rsc/rscRequestHandler.js", import_meta.url).pathname
-    );
+    const { createRscRequestHandler } = await import("./rsc/rscRequestHandler.js");
     app.use(
       "/rw-rsc",
-      await createRscRequestHandler({
-        getMiddlewareRouter: async () => (0, import_register.createMiddlewareRouter)(viteSsrDevServer),
-        viteSsrDevServer
+      createRscRequestHandler({
+        getMiddlewareRouter: async () => (0, import_register.createMiddlewareRouter)(vite),
+        viteDevServer: vite
       })
     );
   }
@@ -380,22 +119,18 @@ async function createServer() {
       routes,
       clientEntryPath: rwPaths.web.entryClient,
       getStylesheetLinks: (route) => {
-        return getCssLinks({
-          rwPaths,
-          route,
-          viteSsrDevServer
-        });
+        return getCssLinks({ rwPaths, route, vite });
       },
       // Recreate middleware router on each request in dev
-      getMiddlewareRouter: async () => (0, import_register.createMiddlewareRouter)(viteSsrDevServer)
+      getMiddlewareRouter: async () => (0, import_register.createMiddlewareRouter)(vite)
     },
-    viteSsrDevServer
+    vite
   );
   app.get("*", (0, import_server.createServerAdapter)(routeHandler));
   app.post("*", handleWithMiddleware());
   const port = (0, import_project_config.getConfig)().web.port;
   console.log(`Started server on http://localhost:${port}`);
-  return server.listen(port);
+  return app.listen(port);
 }
 let devApp = createServer();
 process.stdin.on("data", async (data) => {
@@ -410,11 +145,11 @@ process.stdin.on("data", async (data) => {
 function getCssLinks({
   rwPaths,
   route,
-  viteSsrDevServer
+  vite
 }) {
   const appAndRouteModules = (0, import_collectCss.componentsModules)(
     [rwPaths.web.app, route?.filePath].filter(Boolean),
-    viteSsrDevServer
+    vite
   );
   const collectedCss = (0, import_collectCss.collectCssPaths)(appAndRouteModules);
   const cssLinks = Array.from(collectedCss);

package/dist/cjs/index.js

@@ -39,7 +39,6 @@ __export(index_exports, {
   cedarNodePolyfills: () => import_vite_plugin_cedar_node_polyfills2.cedarNodePolyfills,
   cedarRemoveDevFatalErrorPage: () => import_vite_plugin_cedar_remove_dev_fatal_error_page2.cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle: () => import_vite_plugin_cedar_remove_from_bundle2.cedarRemoveFromBundle,
-  cedarRoutesAutoLoaderPlugin: () => import_vite_plugin_cedar_routes_auto_loader2.cedarRoutesAutoLoaderPlugin,
   cedarSwapApolloProvider: () => import_vite_plugin_swap_apollo_provider2.cedarSwapApolloProvider,
   cedarTransformJsAsJsx: () => import_vite_plugin_jsx_loader2.cedarTransformJsAsJsx,
   cedarUniversalDeployPlugin: () => import_vite_plugin_cedar_universal_deploy.cedarUniversalDeployPlugin,
@@ -59,7 +58,6 @@ var import_vite_plugin_cedar_html_env = require("./plugins/vite-plugin-cedar-htm
 var import_vite_plugin_cedar_node_polyfills = require("./plugins/vite-plugin-cedar-node-polyfills.js");
 var import_vite_plugin_cedar_remove_dev_fatal_error_page = require("./plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js");
 var import_vite_plugin_cedar_remove_from_bundle = require("./plugins/vite-plugin-cedar-remove-from-bundle.js");
-var import_vite_plugin_cedar_routes_auto_loader = require("./plugins/vite-plugin-cedar-routes-auto-loader.js");
 var import_vite_plugin_cedar_wait_for_api_server = require("./plugins/vite-plugin-cedar-wait-for-api-server.js");
 var import_vite_plugin_cedarjs_resolve_cedar_style_imports = require("./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js");
 var import_vite_plugin_jsx_loader = require("./plugins/vite-plugin-jsx-loader.js");
@@ -73,7 +71,6 @@ var import_vite_plugin_cedar_html_env2 = require("./plugins/vite-plugin-cedar-ht
 var import_vite_plugin_cedar_import_dir = require("./plugins/vite-plugin-cedar-import-dir.js");
 var import_vite_plugin_cedar_node_polyfills2 = require("./plugins/vite-plugin-cedar-node-polyfills.js");
 var import_vite_plugin_cedar_remove_dev_fatal_error_page2 = require("./plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js");
-var import_vite_plugin_cedar_routes_auto_loader2 = require("./plugins/vite-plugin-cedar-routes-auto-loader.js");
 var import_vite_plugin_cedar_remove_from_bundle2 = require("./plugins/vite-plugin-cedar-remove-from-bundle.js");
 var import_vite_plugin_cedarjs_resolve_cedar_style_imports2 = require("./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js");
 var import_vite_plugin_cedarjs_job_path_injector = require("./plugins/vite-plugin-cedarjs-job-path-injector.js");
@@ -89,7 +86,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" && (0, import_vitest.cedarJsRouterImportTransformPlugin)(),
@@ -106,8 +110,6 @@ function cedar({ mode } = {}) {
     (0, import_vite_plugin_jsx_loader.cedarTransformJsAsJsx)(),
     (0, import_vite_plugin_cedar_remove_from_bundle.cedarRemoveFromBundle)(),
     (0, import_vite_plugin_cedar_remove_dev_fatal_error_page.cedarRemoveDevFatalErrorPage)(),
-    // RSC handles route auto-loading differently in each build stage
-    !rscEnabled && (0, import_vite_plugin_cedar_routes_auto_loader.cedarRoutesAutoLoaderPlugin)(),
     (0, import_plugin_react.default)({ babel: babelConfig })
   ];
 }
@@ -125,7 +127,6 @@ var index_default = cedar;
   cedarNodePolyfills,
   cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle,
-  cedarRoutesAutoLoaderPlugin,
   cedarSwapApolloProvider,
   cedarTransformJsAsJsx,
   cedarUniversalDeployPlugin,

package/dist/cjs/lib/registerFwGlobalsAndShims.js

@@ -79,15 +79,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/cjs/plugins/vite-plugin-rsc-ssr-router-import.js

@@ -44,8 +44,8 @@ function rscSsrRouterImport() {
   const routesFileId = (0, import_vite.normalizePath)((0, import_project_config.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 = import_node_path.default.extname(id);

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

@@ -41,10 +41,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/cjs/rsc/rscRenderer.js

@@ -33,28 +33,20 @@ __export(rscRenderer_exports, {
 });
 module.exports = __toCommonJS(rscRenderer_exports);
 var import_node_path = __toESM(require("node:path"), 1);
+var import_react = require("react");
+var import_server = require("react-server-dom-webpack/server.edge");
 var import_project_config = require("@cedarjs/project-config");
 var import_entries = require("../lib/entries.js");
 var import_StatusError = require("../lib/StatusError.js");
-var import_utils = require("./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 = (0, import_project_config.getPaths)().web.routes;
-    const routesMod = await globalThis.__cedarjs__vite_rsc_runtime.import(routesPath2);
-    return routesMod.default;
-  }
   const serverEntries = await (0, import_entries.getEntriesFromDist)();
   console.log("rscRenderer.ts serverEntries", serverEntries);
   const routesPath = import_node_path.default.join(
@@ -95,12 +87,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) {
@@ -123,14 +113,12 @@ async function renderRsc(input) {
     throw new Error("Unexpected input. Missing rscId or props.");
   }
   console.log("renderRsc input", input);
-  const { createElement } = await (0, import_utils.importRscReact)();
-  const { renderToReadableStream } = await (0, import_utils.importRsdwServer)();
   const serverRoutes = await getRoutesComponent();
   const model = {
-    __cedarjs__Routes: createElement(serverRoutes)
+    __cedarjs__Routes: (0, import_react.createElement)(serverRoutes)
   };
   console.log("rscRenderer.ts renderRsc model", model);
-  return renderToReadableStream(model, getBundlerConfig());
+  return (0, import_server.renderToReadableStream)(model, getBundlerConfig());
 }
 function isSerializedFormData(data) {
   return !!data && data?.__formData__;
@@ -161,16 +149,14 @@ 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 (0, import_utils.importRscReact)();
-  const { renderToReadableStream } = await (0, import_utils.importRsdwServer)();
   const serverRoutes = await getRoutesComponent();
   console.log("rscRenderer.ts executeRsa serverRoutes", serverRoutes);
   const model = {
-    __cedarjs__Routes: createElement(serverRoutes),
+    __cedarjs__Routes: (0, import_react.createElement)(serverRoutes),
     __cedarjs__rsa_data: data
   };
   console.log("rscRenderer.ts executeRsa model", model);
-  return renderToReadableStream(model, getBundlerConfig());
+  return (0, import_server.renderToReadableStream)(model, getBundlerConfig());
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/rsc/rscRequestHandler.js

@@ -38,10 +38,10 @@ var import_busboy = __toESM(require("busboy"), 1);
 var import_react_server_dom_webpack_server = require("../bundled/react-server-dom-webpack.server.js");
 var import_StatusError = require("../lib/StatusError.js");
 var import_invokeMiddleware = require("../middleware/invokeMiddleware.js");
+var import_rscRenderer = require("./rscRenderer.js");
+var import_rscStudioHandlers = require("./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);
@@ -56,7 +56,7 @@ async function createRscRequestHandler(options) {
         matchedMw?.handler,
         {
           params: matchedMw?.params,
-          viteSsrDevServer: options.viteSsrDevServer
+          viteDevServer: options.viteDevServer
         }
       );
       const webRes = mwResponse.toResponse();
@@ -101,9 +101,9 @@ async function createRscRequestHandler(options) {
         res.end(String(err));
       };
       try {
-        const readable = await renderRscToStream({ rscId, rsaId, args });
+        const readable = await (0, import_rscRenderer.renderRscToStream)({ rscId, rsaId, args });
         import_node_stream.Readable.fromWeb(readable).pipe(res);
-        await sendRscFlightToStudio({
+        await (0, import_rscStudioHandlers.sendRscFlightToStudio)({
           rscId,
           rsaId,
           args,

package/dist/cjs/runFeServer.js

@@ -38,13 +38,13 @@ var import_server = require("@whatwg-node/server");
 var import_dotenv_defaults = require("dotenv-defaults");
 var import_express = __toESM(require("express"), 1);
 var import_http_proxy_middleware = require("http-proxy-middleware");
+var import_ws = __toESM(require("ws"), 1);
 var import_project_config = require("@cedarjs/project-config");
 var import_rscCss = require("@cedarjs/router/rscCss");
 var import_server_store = require("@cedarjs/server-store");
 var import_registerFwGlobalsAndShims = require("./lib/registerFwGlobalsAndShims.js");
 var import_invokeMiddleware = require("./middleware/invokeMiddleware.js");
 var import_register = require("./middleware/register.js");
-var import_rscWebSocketServer = require("./rsc/rscWebSocketServer.js");
 var import_createReactStreamingHandler = require("./streaming/createReactStreamingHandler.js");
 var import_utils = require("./utils.js");
 (0, import_dotenv_defaults.config)({
@@ -60,7 +60,7 @@ async function runFeServer() {
   (0, import_registerFwGlobalsAndShims.registerFwGlobalsAndShims)();
   if (rscEnabled) {
     const { setClientEntries } = await import("./rsc/rscRenderer.js");
-    (0, import_rscWebSocketServer.createWebSocketServer)();
+    createWebSocketServer();
     try {
       await setClientEntries();
     } catch (e) {
@@ -119,7 +119,7 @@ async function runFeServer() {
     const { createRscRequestHandler } = await import("./rsc/rscRequestHandler.js");
     app.use(
       "/rw-rsc",
-      await createRscRequestHandler({
+      createRscRequestHandler({
         getMiddlewareRouter: async () => middlewareRouter
       })
     );
@@ -139,6 +139,25 @@ async function runFeServer() {
     `Started production FE server on http://localhost:${rwConfig.web.port}`
   );
 }
+function createWebSocketServer() {
+  const wsServer = new import_ws.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 === import_ws.default.OPEN) {
+          client.send(message);
+        }
+      });
+    });
+    ws.on("close", () => {
+      console.log("A client disconnected.");
+    });
+  });
+}
 runFeServer();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {