@cedarjs/vite 5.0.2-rc.5 → 6.0.0-canary.2619

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-otel-wrapping.d.ts

@@ -0,0 +1,39 @@
+import type { Plugin } from 'vite';
+/**
+ * Vite plugin that wraps exported API functions with OpenTelemetry spans to
+ * provide automatic tracing in your Cedar API.
+ *
+ * For each `export const fn = (async?) (...) => {...}` declaration in an API
+ * file this plugin:
+ *
+ * 1. Adds an import at the top of the file:
+ *      import { trace as OTEL_TRACE } from '@opentelemetry/api'
+ *
+ * 2. Wraps the original export with an OTel span:
+ *      export const fn = (async?) (...params) => {
+ *        const __fn = (async?) (...params) => { ...original body... }
+ *        const OTEL_TRACER = OTEL_TRACE.getTracer('redwoodjs')
+ *        const OTEL_RESULT = (await?) OTEL_TRACER.startActiveSpan(
+ *          'redwoodjs:api:<folder>:<fnName>',
+ *          (async?) (span) => { ... }
+ *        )
+ *        return OTEL_RESULT
+ *      }
+ *
+ * This replaces `babel-plugin-redwood-otel-wrapping` for all Vite and esbuild
+ * builds. The previous Babel plugin has been removed entirely; Jest transforms
+ * through the Vite SSR pipeline.
+ *
+ * NOTE: Known limitation. Spans will close before a Promise settles if a
+ * synchronous function returns a Promise. To trace async work correctly, mark
+ * the function as `async` if it returns or awaits Promises.
+ */
+export declare function cedarOtelWrappingPlugin(): Plugin;
+/**
+ * Applies OpenTelemetry span wrapping to API source files.
+ *
+ * Exported as a standalone function so it can be tested without a Vite context.
+ * Returns the transformed code string, or `null` if nothing was changed.
+ */
+export declare function applyOtelWrapping(code: string, filename: string, apiFolder: string): string | null;
+//# sourceMappingURL=vite-plugin-cedar-otel-wrapping.d.ts.map

package/dist/plugins/vite-plugin-cedar-otel-wrapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedar-otel-wrapping.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-otel-wrapping.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAwBhD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,MAAM,GAAG,IAAI,CA+Ef"}

package/dist/plugins/vite-plugin-cedar-otel-wrapping.js

@@ -0,0 +1,200 @@
+import { parseSync } from "oxc-parser";
+import { normalizePath } from "vite";
+import { getPaths } from "@cedarjs/project-config";
+function cedarOtelWrappingPlugin() {
+  return {
+    name: "cedar-otel-wrapping",
+    transform(code, id) {
+      let apiSrc;
+      try {
+        apiSrc = normalizePath(getPaths().api.src);
+      } catch {
+        return null;
+      }
+      if (!normalizePath(id).startsWith(apiSrc + "/")) {
+        return null;
+      }
+      const relativePath = normalizePath(id).slice(apiSrc.length + 1);
+      const apiFolder = relativePath.split("/")[0] ?? "?";
+      const result = applyOtelWrapping(code, id, apiFolder);
+      return result ? { code: result, map: null } : null;
+    }
+  };
+}
+function applyOtelWrapping(code, filename, apiFolder) {
+  const parseResult = parseSync(filename, code, { sourceType: "module" });
+  const replacements = [];
+  for (const node of parseResult.program.body) {
+    if (node.type !== "ExportNamedDeclaration") {
+      continue;
+    }
+    const decl = node.declaration;
+    if (decl?.type !== "VariableDeclaration") {
+      continue;
+    }
+    const declarator = decl.declarations[0];
+    if (!declarator) {
+      continue;
+    }
+    const fn = declarator.init;
+    if (fn?.type !== "ArrowFunctionExpression") {
+      continue;
+    }
+    if (declarator.id.type !== "Identifier") {
+      continue;
+    }
+    const fnName = declarator.id.name;
+    const innerArgs = buildInnerArgs(fn.params);
+    if (innerArgs === null) {
+      continue;
+    }
+    const fnHeader = code.slice(fn.start, fn.body.start);
+    const originalFnSrc = code.slice(fn.start, fn.end);
+    const isAsync = fn.async;
+    const awaitKw = isAsync ? "await " : "";
+    const asyncKw = isAsync ? "async " : "";
+    replacements.push({
+      start: node.start,
+      end: node.end,
+      src: buildWrappedExport(
+        fnName,
+        fnHeader,
+        originalFnSrc,
+        innerArgs,
+        awaitKw,
+        asyncKw,
+        apiFolder,
+        filename
+      )
+    });
+  }
+  if (replacements.length === 0) {
+    return null;
+  }
+  let output = code;
+  for (let i = replacements.length - 1; i >= 0; i--) {
+    const r = replacements[i];
+    output = output.slice(0, r.start) + r.src + output.slice(r.end);
+  }
+  return `import { trace as OTEL_TRACE } from '@opentelemetry/api'
+` + output;
+}
+function buildInnerArgs(params) {
+  const args = [];
+  for (const param of params) {
+    if (param.type === "RestElement" || param.type === "ArrayPattern" || param.type === "TSParameterProperty") {
+      return null;
+    }
+    if (param.type === "Identifier") {
+      args.push(param.name);
+      continue;
+    }
+    if (param.type === "ObjectPattern") {
+      for (const prop of param.properties) {
+        if (prop.type === "RestElement") {
+          return null;
+        }
+        if (prop.key.type !== "Identifier") {
+          return null;
+        }
+        const value = prop.value;
+        if (value.type !== "Identifier" && value.type !== "AssignmentPattern" && value.type !== "ObjectPattern") {
+          return null;
+        }
+        if (value.type === "AssignmentPattern") {
+          if (value.left.type !== "Identifier" && value.left.type !== "ObjectPattern") {
+            return null;
+          }
+        }
+      }
+      const obj = buildObjectCallArg(param);
+      if (obj === null) {
+        return null;
+      }
+      args.push(obj);
+      continue;
+    }
+    if (param.type === "AssignmentPattern") {
+      const ap = param;
+      if (ap.left.type === "Identifier") {
+        args.push(ap.left.name);
+      } else if (ap.left.type === "ObjectPattern") {
+        const obj = buildObjectCallArg(ap.left);
+        if (obj === null) {
+          return null;
+        }
+        args.push(obj);
+      } else {
+        return null;
+      }
+      continue;
+    }
+    return null;
+  }
+  return args.join(", ");
+}
+function buildObjectCallArg(pattern) {
+  const keys = [];
+  for (const prop of pattern.properties) {
+    if (prop.type === "RestElement") {
+      return null;
+    }
+    if (prop.key.type !== "Identifier") {
+      return null;
+    }
+    const keyName = prop.key.name;
+    let valueName = null;
+    if (prop.value.type === "Identifier") {
+      valueName = prop.value.name;
+    } else if (prop.value.type === "AssignmentPattern") {
+      if (prop.value.left.type === "Identifier") {
+        valueName = prop.value.left.name;
+      } else {
+        return null;
+      }
+    } else {
+      return null;
+    }
+    if (valueName !== keyName) {
+      keys.push(`${keyName}: ${valueName}`);
+    } else {
+      keys.push(keyName);
+    }
+  }
+  return `{ ${keys.join(", ")} }`;
+}
+function buildWrappedExport(fnName, fnHeader, originalFnSrc, innerArgs, awaitKw, asyncKw, apiFolder, filename) {
+  const privateName = `__${fnName}`;
+  const spanName = `redwoodjs:api:${apiFolder}:${fnName}`;
+  return `export const ${fnName} = ${fnHeader}{
+  const ${privateName} = ${originalFnSrc}
+  const OTEL_TRACER = OTEL_TRACE.getTracer('redwoodjs')
+  const OTEL_RESULT = ${awaitKw}OTEL_TRACER.startActiveSpan(
+    '${spanName}',
+    ${asyncKw}(span) => {
+      span.setAttribute('code.function', '${fnName}')
+      span.setAttribute('code.filepath', ${JSON.stringify(filename)})
+      try {
+        const OTEL_INNER_RESULT = ${awaitKw}${privateName}(${innerArgs})
+        span.end()
+        return OTEL_INNER_RESULT
+      } catch (error) {
+        span.recordException(error)
+        span.setStatus({
+          code: 2,
+          message:
+            error?.message?.split('\\n')[0] ??
+            error?.toString()?.split('\\n')[0],
+        })
+        span.end()
+        throw error
+      }
+    }
+  )
+  return OTEL_RESULT
+}`;
+}
+export {
+  applyOtelWrapping,
+  cedarOtelWrappingPlugin
+};

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}

@@ -8,24 +8,24 @@ import type { Plugin } from 'vite';
  * For each file in `api/src/functions/` that exports a `handler`, this plugin:
  *
  * 1. Adds an import at the top of the file:
- *      import { getAsyncStoreInstance as __rw_getAsyncStoreInstance } from '@cedarjs/context/dist/store'
+ *      import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '@cedarjs/context/dist/store'
  *
  * 2. Renames the original handler:
- *      const __rw_handler = <original handler value>
+ *      const __cedar_handler = <original handler value>
  *
  * 3. Replaces the handler export with a wrapper that checks context isolation:
- *      export const handler = (__rw_event, __rw__context) => {
- *        const __rw_contextStore = __rw_getAsyncStoreInstance().getStore()
- *        if (__rw_contextStore === undefined) {
- *          return __rw_getAsyncStoreInstance().run(new Map(), __rw_handler, __rw_event, __rw__context)
+ *      export const handler = (__cedar_event, __cedar_context) => {
+ *        const __cedar_contextStore = __cedar_getAsyncStoreInstance().getStore()
+ *        if (__cedar_contextStore === undefined) {
+ *          return __cedar_getAsyncStoreInstance().run(new Map(), __cedar_handler, __cedar_event, __cedar_context)
  *        }
- *        return __rw_handler(__rw_event, __rw__context)
+ *        return __cedar_handler(__cedar_event, __cedar_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) {
@@ -31,30 +31,30 @@ function applyContextWrapping(code, { projectIsEsm = false } = {}) {
   const afterEquals = code.slice(handlerMatch.index + handlerMatch[0].length).trimStart();
   const isAsync = /^async(?:\s*[\(\*]|\s+function)/.test(afterEquals);
   const storePath = projectIsEsm ? "@cedarjs/context/dist/store.js" : "@cedarjs/context/dist/store";
-  const importStatement = `import { getAsyncStoreInstance as __rw_getAsyncStoreInstance } from '${storePath}'
+  const importStatement = `import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '${storePath}'
 `;
   const handlerStart = handlerMatch.index;
   const before = code.slice(0, handlerStart);
   const after = code.slice(handlerStart);
-  const renamed = after.replace(handlerRe, "const __rw_handler =");
+  const renamed = after.replace(handlerRe, "const __cedar_handler =");
   const wrappedHandler = `
-export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) => {
+export const handler = ${isAsync ? "async " : ""}(__cedar_event, __cedar_context) => {
   // The store will be undefined if no context isolation has been performed yet
-  const __rw_contextStore = __rw_getAsyncStoreInstance().getStore()
-  if (__rw_contextStore === undefined) {
-    return __rw_getAsyncStoreInstance().run(
+  const __cedar_contextStore = __cedar_getAsyncStoreInstance().getStore()
+  if (__cedar_contextStore === undefined) {
+    return __cedar_getAsyncStoreInstance().run(
       new Map(),
-      __rw_handler,
-      __rw_event,
-      __rw__context
+      __cedar_handler,
+      __cedar_event,
+      __cedar_context
     )
   }
-  return __rw_handler(__rw_event, __rw__context)
+  return __cedar_handler(__cedar_event, __cedar_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"}