@cedarjs/vite 5.0.0 → 6.0.0-canary.2615

package/dist/plugins/vite-plugin-cedar-data-uri-shim.js

@@ -0,0 +1,43 @@
+import { getConfig } from "@cedarjs/project-config";
+function dataUriToBuffer(uri) {
+  const match = uri.match(/^data:(.*?)(;(.*?))?(,(.*))$/);
+  if (!match) {
+    throw new Error("Invalid data URI");
+  }
+  const mediaType = match[1] || "text/plain";
+  const params = match[3] || "";
+  const data = match[5];
+  const [type] = mediaType.split(";");
+  const typeFull = params ? mediaType + ";" + params : mediaType;
+  const lowerParams = params.toLowerCase();
+  const isBase64 = lowerParams.includes("base64");
+  const charset = lowerParams.startsWith("charset=") ? lowerParams.slice(8) : "";
+  const bytes = isBase64 ? Uint8Array.from(atob(data), (c) => c.charCodeAt(0)) : new TextEncoder().encode(decodeURIComponent(data));
+  const decoder = new TextDecoder();
+  bytes.toString = () => decoder.decode(bytes);
+  return Object.assign(bytes, { type, typeFull, charset });
+}
+function cedarDataUriShim() {
+  if (getConfig().experimental?.rsc?.enabled) {
+    return void 0;
+  }
+  return {
+    name: "cedar-data-uri-shim",
+    apply: "serve",
+    resolveId(id) {
+      if (id === "data-uri-to-buffer") {
+        return "\0cedar-data-uri-to-buffer";
+      }
+      return void 0;
+    },
+    load(id) {
+      if (id === "\0cedar-data-uri-to-buffer") {
+        return "export default " + dataUriToBuffer.toString();
+      }
+      return void 0;
+    }
+  };
+}
+export {
+  cedarDataUriShim
+};

package/dist/plugins/vite-plugin-cedar-gqlorm-inject.d.ts

@@ -0,0 +1,29 @@
+import type { Plugin } from 'vite';
+/**
+ * Vite plugin that injects the auto-generated gqlorm backend into
+ * `api/src/functions/graphql.ts` at build time.
+ *
+ * When `experimental.gqlorm.enabled = true` and `.cedar/gqlorm/backend.ts`
+ * exists, this plugin:
+ *
+ * 1. Adds imports at the top of graphql.ts:
+ *      import * as __gqlorm_sdl__ from '../../../.cedar/gqlorm/backend'
+ *      import { db as __gqlorm_db__ } from 'src/lib/db'
+ *
+ * 2. Inserts a statement immediately before the `createGraphQLHandler` call:
+ *      Object.assign(sdls, {
+ *        __gqlorm__: {
+ *          schema: __gqlorm_sdl__.schema,
+ *          resolvers: __gqlorm_sdl__.createGqlormResolvers(__gqlorm_db__),
+ *        },
+ *      })
+ *
+ * The `sdls` variable is already a `let` binding because
+ * `vite-plugin-cedar-import-dir` transforms the glob import
+ * `import sdls from 'src/graphql/**\/*.sdl.{js,ts}'` into `let sdls = {}`.
+ *
+ * This plugin is a no-op when gqlorm is disabled or the backend file does
+ * not exist.
+ */
+export declare function cedarGqlormInjectPlugin(): Plugin;
+//# sourceMappingURL=vite-plugin-cedar-gqlorm-inject.d.ts.map

package/dist/plugins/vite-plugin-cedar-gqlorm-inject.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedar-gqlorm-inject.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-gqlorm-inject.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAQlC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAgHhD"}

package/dist/plugins/vite-plugin-cedar-gqlorm-inject.js

@@ -0,0 +1,76 @@
+import fs from "node:fs";
+import path from "node:path";
+import {
+  getConfig,
+  getPaths,
+  importStatementPath
+} from "@cedarjs/project-config";
+function cedarGqlormInjectPlugin() {
+  return {
+    name: "cedar-gqlorm-inject",
+    transform(code, id) {
+      if (!id.endsWith("/graphql.ts") && !id.endsWith("/graphql.js")) {
+        return null;
+      }
+      if (code.includes("__gqlorm_sdl__")) {
+        return null;
+      }
+      if (!code.includes("createGraphQLHandler")) {
+        return null;
+      }
+      let config;
+      try {
+        config = getConfig();
+      } catch {
+        return null;
+      }
+      if (!config.experimental?.gqlorm?.enabled) {
+        return null;
+      }
+      let paths;
+      try {
+        paths = getPaths();
+      } catch {
+        return null;
+      }
+      const backendPathWithoutExt = path.join(
+        paths.generated.base,
+        "gqlorm",
+        "backend"
+      );
+      if (!fs.existsSync(backendPathWithoutExt + ".ts")) {
+        return null;
+      }
+      const handlerPattern = /^export\s+const\s+(\w+)\s*=\s*createGraphQLHandler\s*\(/m;
+      const handlerMatch = handlerPattern.exec(code);
+      if (!handlerMatch) {
+        return null;
+      }
+      const handlerLineStart = code.lastIndexOf("\n", handlerMatch.index) + 1;
+      const relPath = importStatementPath(
+        path.relative(path.dirname(id), backendPathWithoutExt)
+      ) + ".ts";
+      const dbSrcPath = path.join(paths.api.src, "lib", "db");
+      const relDbPath = importStatementPath(path.relative(path.dirname(id), dbSrcPath)) + ".ts";
+      const importDb = `import { db as __gqlorm_db__ } from '${relDbPath}'`;
+      const importSdl = `import * as __gqlorm_sdl__ from '${relPath}'`;
+      const importsToAdd = `${importDb}
+${importSdl}
+`;
+      const sdlsMutation = `Object.assign(sdls, {
+    __gqlorm__: {
+      schema: __gqlorm_sdl__.schema,
+      resolvers: __gqlorm_sdl__.createGqlormResolvers(__gqlorm_db__),
+    },
+  })
+  `;
+      const transformed = importsToAdd + code.slice(0, handlerLineStart) + sdlsMutation + code.slice(handlerLineStart);
+      return {
+        code: transformed
+      };
+    }
+  };
+}
+export {
+  cedarGqlormInjectPlugin
+};

package/dist/plugins/vite-plugin-cedar-graphql-options-extract.d.ts

@@ -0,0 +1,38 @@
+import type { Plugin } from 'vite';
+/**
+ * Vite plugin that extracts options passed to createGraphQLHandler into an
+ * exported variable.
+ *
+ * Transforms:
+ *   export const handler = createGraphQLHandler({ options })
+ * into:
+ *   export const __cedar_graphqlOptions = { options }
+ *   export const handler = createGraphQLHandler(__cedar_graphqlOptions)
+ *
+ * This allows options to be imported elsewhere and enables the gqlorm-inject
+ * plugin to mutate the sdls object in-place before the call.
+ *
+ * The extraction uses an oxc-parser AST walk (see `applyGraphqlOptionsExtract`
+ * below) so the transform is robust against aliased imports, nested calls, and
+ * string escapes. The same logic is duplicated in
+ * `@cedarjs/internal` (`applyGraphqlOptionsExtract`) for the standalone esbuild
+ * API build
+ */
+export declare function cedarGraphqlOptionsExtractPlugin(): Plugin;
+/**
+ * Extracts the options argument from createGraphQLHandler calls and stores
+ * them in an exported variable. Returns the transformed code, or null if no
+ * transformation was needed.
+ *
+ * Transforms:
+ *   export const handler = createGraphQLHandler({ options })
+ * into:
+ *   export const __cedar_graphqlOptions = { options }
+ *   export const handler = createGraphQLHandler(__cedar_graphqlOptions)
+ *
+ * Duplicate of `@cedarjs/internal`'s `applyGraphqlOptionsExtract` so this
+ * logic can run inside the Vite plugin pipeline without depending on internal's
+ * build output.
+ */
+export declare function applyGraphqlOptionsExtract(code: string): string | null;
+//# sourceMappingURL=vite-plugin-cedar-graphql-options-extract.d.ts.map

package/dist/plugins/vite-plugin-cedar-graphql-options-extract.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedar-graphql-options-extract.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-graphql-options-extract.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,gCAAgC,IAAI,MAAM,CA0BzD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA6FtE"}

package/dist/plugins/vite-plugin-cedar-graphql-options-extract.js

@@ -0,0 +1,88 @@
+import { parseSync, Visitor } from "oxc-parser";
+function cedarGraphqlOptionsExtractPlugin() {
+  return {
+    name: "cedar-graphql-options-extract",
+    transform(code, id) {
+      if (!id.endsWith("/graphql.ts") && !id.endsWith("/graphql.js")) {
+        return null;
+      }
+      if (!code.includes("createGraphQLHandler")) {
+        return null;
+      }
+      const transformed = applyGraphqlOptionsExtract(code);
+      if (!transformed || transformed === code) {
+        return null;
+      }
+      return {
+        code: transformed
+      };
+    }
+  };
+}
+function applyGraphqlOptionsExtract(code) {
+  if (code.includes("__cedar_graphqlOptions")) {
+    return null;
+  }
+  const { program } = parseSync("graphql.ts", code, {
+    // lang is only a parse hint; 'ts' also parses JS (the graphql handler can
+    // be graphql.js in JS projects), so this is safe for both file types.
+    lang: "ts",
+    sourceType: "module"
+  });
+  const importNames = /* @__PURE__ */ new Set();
+  for (const node of program.body) {
+    if (node.type === "ImportDeclaration") {
+      if (node.source.value !== "@cedarjs/graphql-server") {
+        continue;
+      }
+      for (const specifier of node.specifiers) {
+        if (specifier.type === "ImportSpecifier" && specifier.imported.type === "Identifier" && specifier.imported.name === "createGraphQLHandler") {
+          importNames.add(specifier.local.name);
+        }
+      }
+    }
+  }
+  if (importNames.size === 0) {
+    return null;
+  }
+  const callExpressionPaths = [];
+  new Visitor({
+    CallExpression(node) {
+      if (node.callee.type === "Identifier" && importNames.has(node.callee.name)) {
+        callExpressionPaths.push(node);
+      }
+    }
+  }).visit(program);
+  if (callExpressionPaths.length > 1) {
+    return null;
+  }
+  const callExpression = callExpressionPaths[0];
+  if (!callExpression) {
+    return null;
+  }
+  const options = callExpression.arguments[0];
+  if (!options) {
+    return null;
+  }
+  if (options.type !== "Identifier" && options.type !== "ObjectExpression" && options.type !== "CallExpression" && options.type !== "ConditionalExpression") {
+    return null;
+  }
+  const optionsStart = options.start;
+  const optionsEnd = options.end;
+  const lineStart = code.lastIndexOf("\n", callExpression.start) + 1;
+  const indentMatch = /^[ \t]*/.exec(code.slice(lineStart));
+  const indent = indentMatch ? indentMatch[0] : "";
+  const optionsConst = `${indent}export const __cedar_graphqlOptions = ${code.slice(
+    optionsStart,
+    optionsEnd
+  )}
+`;
+  const before = code.slice(0, lineStart);
+  const between = code.slice(lineStart, optionsStart);
+  const after = code.slice(optionsEnd);
+  return before + optionsConst + between + "__cedar_graphqlOptions" + after;
+}
+export {
+  applyGraphqlOptionsExtract,
+  cedarGraphqlOptionsExtractPlugin
+};

package/dist/plugins/vite-plugin-cedar-universal-deploy.js

@@ -296,7 +296,7 @@ async function generateFunctionModule(distPath) {
         const ctx = await buildCedarContext(request);
         // Wrap the handler in an AsyncLocalStorage run so the global
         // @cedarjs/context is available inside it (and isolated per request).
-        // Mirrors the GraphQL module above and the cedarContextWrappingPlugin
+        // Mirrors the GraphQL module above and the handlerAlsWrappingPlugin
         // used for non-UD builds.
         const { getAsyncStoreInstance } = await import(
           '@cedarjs/context/dist/store'

package/dist/plugins/{vite-plugin-cedar-context-wrapping.d.ts → vite-plugin-handler-als-wrapping.d.ts}

@@ -22,10 +22,10 @@ import type { Plugin } from 'vite';
  *        return __rw_handler(__rw_event, __rw__context)
  *      }
  *
- * This replaces `babel-plugin-redwood-context-wrapping` for Vite builds.
+ * This replaces `babel-plugin-handler-als-wrapping` for Vite builds.
  * The babel plugin is still used for Jest and prerender.
  */
-export declare function cedarContextWrappingPlugin({ projectIsEsm, }?: {
+export declare function handlerAlsWrappingPlugin({ projectIsEsm, }?: {
     projectIsEsm?: boolean;
 }): Plugin;
 /**
@@ -34,11 +34,11 @@ export declare function cedarContextWrappingPlugin({ projectIsEsm, }?: {
  * export a `handler`.
  *
  * This is the context-isolation safeguard that used to be performed by
- * `babel-plugin-redwood-context-wrapping`. It is exported as a standalone
+ * `babel-plugin-handler-als-wrapping`. It is exported as a standalone
  * function so it can be applied from build pipelines that don't go through
  * Vite's plugin pipeline (e.g. the legacy esbuild API build).
  */
-export declare function applyContextWrapping(code: string, { projectIsEsm }?: {
+export declare function applyHandlerAlsWrapping(code: string, { projectIsEsm }?: {
     projectIsEsm?: boolean;
 }): string | null;
-//# sourceMappingURL=vite-plugin-cedar-context-wrapping.d.ts.map
+//# sourceMappingURL=vite-plugin-handler-als-wrapping.d.ts.map

package/dist/plugins/vite-plugin-handler-als-wrapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-handler-als-wrapping.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-handler-als-wrapping.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,YAAoB,GACrB,GAAE;IACD,YAAY,CAAC,EAAE,OAAO,CAAA;CAClB,GAAG,MAAM,CAuBd;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,EAAE,YAAoB,EAAE,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACxD,MAAM,GAAG,IAAI,CAsDf"}

package/dist/plugins/{vite-plugin-cedar-context-wrapping.js → vite-plugin-handler-als-wrapping.js}

@@ -1,11 +1,11 @@
 import path from "node:path";
 import { normalizePath } from "vite";
 import { getPaths } from "@cedarjs/project-config";
-function cedarContextWrappingPlugin({
+function handlerAlsWrappingPlugin({
   projectIsEsm = false
 } = {}) {
   return {
-    name: "cedar-context-wrapping",
+    name: "handler-als-wrapping",
     transform(code, id) {
       let paths;
       try {
@@ -17,12 +17,12 @@ function cedarContextWrappingPlugin({
       if (!normalizePath(id).startsWith(functionsDir + "/")) {
         return null;
       }
-      const wrapped = applyContextWrapping(code, { projectIsEsm });
+      const wrapped = applyHandlerAlsWrapping(code, { projectIsEsm });
       return wrapped ? { code: wrapped, map: null } : null;
     }
   };
 }
-function applyContextWrapping(code, { projectIsEsm = false } = {}) {
+function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
   const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
   const handlerMatch = handlerRe.exec(code);
   if (!handlerMatch) {
@@ -55,6 +55,6 @@ export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) =>
   return before + importStatement + renamed + wrappedHandler;
 }
 export {
-  applyContextWrapping,
-  cedarContextWrappingPlugin
+  applyHandlerAlsWrapping,
+  handlerAlsWrappingPlugin
 };

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({
@@ -86,7 +86,7 @@ async function runFeServer() {
     const { createRscRequestHandler } = await import("./rsc/rscRequestHandler.js");
     app.use(
       "/rw-rsc",
-      createRscRequestHandler({
+      await createRscRequestHandler({
         getMiddlewareRouter: async () => middlewareRouter
       })
     );
@@ -106,25 +106,6 @@ 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, 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"}