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

package/dist/cjs/apiDevMiddleware.js

@@ -44,8 +44,11 @@ var import_runtime = require("@cedarjs/api/runtime");
 var import_babel_config = require("@cedarjs/babel-config");
 var import_store = require("@cedarjs/context/dist/store");
 var import_graphql_server = require("@cedarjs/graphql-server");
+var import_api_graphql_transforms = require("@cedarjs/internal/dist/build/api-graphql-transforms.js");
 var import_project_config = require("@cedarjs/project-config");
 var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
+var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
+var import_vite_plugin_cedar_otel_wrapping = require("./plugins/vite-plugin-cedar-otel-wrapping.js");
 const LAMBDA_FUNCTIONS = {};
 let graphqlYoga = null;
 let loadApiFunctionsInFlight = null;
@@ -152,7 +155,6 @@ async function createApiViteServer() {
   const isEsm = (0, import_project_config.projectSideIsEsm)("api");
   const normalizedBase = (0, import_vite.normalizePath)(cedarPaths.base);
   const babelPlugins = (0, import_babel_config.getApiSideBabelPlugins)({
-    openTelemetry: (cedarConfig.experimental?.opentelemetry?.enabled ?? false) && (cedarConfig.experimental?.opentelemetry?.wrapApi ?? false),
     projectIsEsm: isEsm
   });
   const workspacePkgSourceMap = Object.fromEntries(
@@ -188,8 +190,20 @@ async function createApiViteServer() {
             return null;
           }
           try {
+            let sourceCode = code;
+            if ((0, import_vite.normalizePath)(id).endsWith("/graphql.ts") || (0, import_vite.normalizePath)(id).endsWith("/graphql.js")) {
+              sourceCode = (0, import_vite_plugin_cedar_graphql_options_extract.applyGraphqlOptionsExtract)(sourceCode) ?? sourceCode;
+              sourceCode = (0, import_api_graphql_transforms.applyGqlormInject)(sourceCode, id) ?? sourceCode;
+            }
+            if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
+              const relativePath = (0, import_vite.normalizePath)(id).slice(
+                normalizedBase.length + "/api/src/".length
+              );
+              const apiFolder = relativePath.split("/")[0] ?? "?";
+              sourceCode = (0, import_vite_plugin_cedar_otel_wrapping.applyOtelWrapping)(sourceCode, id, apiFolder) ?? sourceCode;
+            }
             const result = await (0, import_babel_config.transformWithBabel)(
-              code,
+              sourceCode,
               id,
               babelPlugins,
               true

package/dist/cjs/buildApp.js

@@ -40,7 +40,10 @@ var import_babel_config = require("@cedarjs/babel-config");
 var import_files = require("@cedarjs/internal/dist/files.js");
 var import_project_config = require("@cedarjs/project-config");
 var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
-var import_vite_plugin_cedar_context_wrapping = require("./plugins/vite-plugin-cedar-context-wrapping.js");
+var import_vite_plugin_cedar_gqlorm_inject = require("./plugins/vite-plugin-cedar-gqlorm-inject.js");
+var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
+var import_vite_plugin_cedar_otel_wrapping = require("./plugins/vite-plugin-cedar-otel-wrapping.js");
+var import_vite_plugin_handler_als_wrapping = require("./plugins/vite-plugin-handler-als-wrapping.js");
 function resolveWithExtensions(id) {
   if (import_node_fs.default.existsSync(id)) {
     return id;
@@ -130,7 +133,6 @@ async function buildCedarApp({
     }
   }
   const babelPlugins = workspace.includes("api") ? (0, import_babel_config.getApiSideBabelPlugins)({
-    openTelemetry: (cedarConfig.experimental?.opentelemetry?.enabled ?? false) && (cedarConfig.experimental?.opentelemetry?.wrapApi ?? false),
     projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
   }) : null;
   const workspacePkgSourceMap = workspace.includes("api") ? Object.fromEntries(
@@ -254,8 +256,11 @@ async function buildCedarApp({
     });
   }
   if (workspace.includes("api")) {
+    plugins.push((0, import_vite_plugin_cedar_graphql_options_extract.cedarGraphqlOptionsExtractPlugin)());
+    plugins.push((0, import_vite_plugin_cedar_gqlorm_inject.cedarGqlormInjectPlugin)());
+    plugins.push((0, import_vite_plugin_cedar_otel_wrapping.cedarOtelWrappingPlugin)());
     plugins.push(
-      (0, import_vite_plugin_cedar_context_wrapping.cedarContextWrappingPlugin)({ projectIsEsm: (0, import_project_config.projectSideIsEsm)("api") })
+      (0, import_vite_plugin_handler_als_wrapping.handlerAlsWrappingPlugin)({ projectIsEsm: (0, import_project_config.projectSideIsEsm)("api") })
     );
   }
   if (babelPlugins) {

package/dist/cjs/devFeServer.js

@@ -22,6 +22,7 @@ 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");
@@ -33,14 +34,22 @@ 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)();
@@ -63,8 +72,78 @@ async function createServer() {
       "Vite config not found. Please set up Vite before running the dev server."
     );
   }
-  const vite = await (0, import_vite.createServer)({
+  const viteSsrDevServer = 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: [
@@ -78,16 +157,183 @@ async function createServer() {
           "@cedarjs/auth-!(dbauth)-web"
         ]
       }),
-      rscEnabled && (0, import_vite_plugin_rsc_routes_auto_loader.rscRoutesAutoLoader)()
+      rscEnabled && (0, import_vite_plugin_rsc_routes_auto_loader.rscRoutesAutoLoader)(),
+      rscEnabled && (0, import_vite_plugin_rsc_ssr_router_import.rscSsrRouterImport)()
     ],
     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"
+        ],
+        // Ensure `util` resolves to Node's built-in module and not to
+        // Browserify's `node-util` polyfill (which lacks TextEncoder).
+        // The polyfill may be hoisted into node_modules by optional
+        // dependencies like `@cedarjs/storybook`.
+        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)(vite);
+      const middlewareRouter = await (0, import_register.createMiddlewareRouter)(viteSsrDevServer);
       const middleware = middlewareRouter.find(
         req.method,
         req.url
@@ -97,19 +343,22 @@ async function createServer() {
       }
       const [mwRes] = await (0, import_invokeMiddleware.invoke)(req, middleware, {
         route,
-        viteDevServer: vite
+        viteSsrDevServer
       });
       return mwRes.toResponse();
     });
   };
-  app.use(vite.middlewares);
+  app.use(viteSsrDevServer.middlewares);
   if (rscEnabled) {
-    const { createRscRequestHandler } = await import("./rsc/rscRequestHandler.js");
+    (0, import_rscWebSocketServer.createWebSocketServer)();
+    const { createRscRequestHandler } = await globalThis.__cedarjs__vite_rsc_runtime.import(
+      new URL("./rsc/rscRequestHandler.js", import_meta.url).pathname
+    );
     app.use(
       "/rw-rsc",
-      createRscRequestHandler({
-        getMiddlewareRouter: async () => (0, import_register.createMiddlewareRouter)(vite),
-        viteDevServer: vite
+      await createRscRequestHandler({
+        getMiddlewareRouter: async () => (0, import_register.createMiddlewareRouter)(viteSsrDevServer),
+        viteSsrDevServer
       })
     );
   }
@@ -119,18 +368,22 @@ async function createServer() {
       routes,
       clientEntryPath: rwPaths.web.entryClient,
       getStylesheetLinks: (route) => {
-        return getCssLinks({ rwPaths, route, vite });
+        return getCssLinks({
+          rwPaths,
+          route,
+          viteSsrDevServer
+        });
       },
       // Recreate middleware router on each request in dev
-      getMiddlewareRouter: async () => (0, import_register.createMiddlewareRouter)(vite)
+      getMiddlewareRouter: async () => (0, import_register.createMiddlewareRouter)(viteSsrDevServer)
     },
-    vite
+    viteSsrDevServer
   );
   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 app.listen(port);
+  return server.listen(port);
 }
 let devApp = createServer();
 process.stdin.on("data", async (data) => {
@@ -145,11 +398,11 @@ process.stdin.on("data", async (data) => {
 function getCssLinks({
   rwPaths,
   route,
-  vite
+  viteSsrDevServer
 }) {
   const appAndRouteModules = (0, import_collectCss.componentsModules)(
     [rwPaths.web.app, route?.filePath].filter(Boolean),
-    vite
+    viteSsrDevServer
   );
   const collectedCss = (0, import_collectCss.collectCssPaths)(appAndRouteModules);
   const cssLinks = Array.from(collectedCss);

package/dist/cjs/index.js

@@ -28,17 +28,19 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var index_exports = {};
 __export(index_exports, {
-  applyContextWrapping: () => import_vite_plugin_cedar_context_wrapping2.applyContextWrapping,
+  applyHandlerAlsWrapping: () => import_vite_plugin_handler_als_wrapping.applyHandlerAlsWrapping,
   cedar: () => cedar,
   cedarAutoImportsPlugin: () => import_vite_plugin_cedar_auto_import.cedarAutoImportsPlugin,
   cedarCellTransform: () => import_vite_plugin_cedar_cell2.cedarCellTransform,
   cedarCjsCompatPlugin: () => import_vite_plugin_cedar_cjs_compat.cedarCjsCompatPlugin,
-  cedarContextWrappingPlugin: () => import_vite_plugin_cedar_context_wrapping.cedarContextWrappingPlugin,
+  cedarDataUriShim: () => import_vite_plugin_cedar_data_uri_shim2.cedarDataUriShim,
   cedarEntryInjectionPlugin: () => import_vite_plugin_cedar_entry_injection2.cedarEntryInjectionPlugin,
+  cedarGqlormInjectPlugin: () => import_vite_plugin_cedar_gqlorm_inject.cedarGqlormInjectPlugin,
+  cedarGraphqlOptionsExtractPlugin: () => import_vite_plugin_cedar_graphql_options_extract.cedarGraphqlOptionsExtractPlugin,
   cedarHtmlEnvPlugin: () => import_vite_plugin_cedar_html_env2.cedarHtmlEnvPlugin,
   cedarImportDirPlugin: () => import_vite_plugin_cedar_import_dir.cedarImportDirPlugin,
   cedarMergedConfig: () => import_vite_plugin_merged_config2.cedarMergedConfig,
-  cedarNodePolyfills: () => import_vite_plugin_cedar_node_polyfills2.cedarNodePolyfills,
+  cedarOtelWrappingPlugin: () => import_vite_plugin_cedar_otel_wrapping.cedarOtelWrappingPlugin,
   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,
@@ -48,7 +50,8 @@ __export(index_exports, {
   cedarWaitForApiServer: () => import_vite_plugin_cedar_wait_for_api_server2.cedarWaitForApiServer,
   cedarjsJobPathInjectorPlugin: () => import_vite_plugin_cedarjs_job_path_injector.cedarjsJobPathInjectorPlugin,
   cedarjsResolveCedarStyleImportsPlugin: () => import_vite_plugin_cedarjs_resolve_cedar_style_imports2.cedarjsResolveCedarStyleImportsPlugin,
-  default: () => index_default
+  default: () => index_default,
+  handlerAlsWrappingPlugin: () => import_vite_plugin_handler_als_wrapping.handlerAlsWrappingPlugin
 });
 module.exports = __toCommonJS(index_exports);
 var import_plugin_react = __toESM(require("@vitejs/plugin-react"), 1);
@@ -56,9 +59,9 @@ var import_babel_config = require("@cedarjs/babel-config");
 var import_project_config = require("@cedarjs/project-config");
 var import_vitest = require("@cedarjs/testing/web/vitest");
 var import_vite_plugin_cedar_cell = require("./plugins/vite-plugin-cedar-cell.js");
+var import_vite_plugin_cedar_data_uri_shim = require("./plugins/vite-plugin-cedar-data-uri-shim.js");
 var import_vite_plugin_cedar_entry_injection = require("./plugins/vite-plugin-cedar-entry-injection.js");
 var import_vite_plugin_cedar_html_env = require("./plugins/vite-plugin-cedar-html-env.js");
-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");
@@ -70,12 +73,14 @@ var import_vite_plugin_swap_apollo_provider = require("./plugins/vite-plugin-swa
 var import_vite_plugin_cedar_auto_import = require("./plugins/vite-plugin-cedar-auto-import.js");
 var import_vite_plugin_cedar_cjs_compat = require("./plugins/vite-plugin-cedar-cjs-compat.js");
 var import_vite_plugin_cedar_cell2 = require("./plugins/vite-plugin-cedar-cell.js");
-var import_vite_plugin_cedar_context_wrapping = require("./plugins/vite-plugin-cedar-context-wrapping.js");
-var import_vite_plugin_cedar_context_wrapping2 = require("./plugins/vite-plugin-cedar-context-wrapping.js");
+var import_vite_plugin_cedar_gqlorm_inject = require("./plugins/vite-plugin-cedar-gqlorm-inject.js");
+var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
+var import_vite_plugin_cedar_otel_wrapping = require("./plugins/vite-plugin-cedar-otel-wrapping.js");
+var import_vite_plugin_handler_als_wrapping = require("./plugins/vite-plugin-handler-als-wrapping.js");
 var import_vite_plugin_cedar_entry_injection2 = require("./plugins/vite-plugin-cedar-entry-injection.js");
 var import_vite_plugin_cedar_html_env2 = require("./plugins/vite-plugin-cedar-html-env.js");
 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_data_uri_shim2 = require("./plugins/vite-plugin-cedar-data-uri-shim.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");
@@ -100,7 +105,7 @@ function cedar({ mode } = {}) {
     mode === "test" && (0, import_vitest.createAuthImportTransformPlugin)(),
     mode === "test" && (0, import_vitest.autoImportsPlugin)(),
     (0, import_vite_plugin_cedar_wait_for_api_server.cedarWaitForApiServer)(),
-    (0, import_vite_plugin_cedar_node_polyfills.cedarNodePolyfills)(),
+    (0, import_vite_plugin_cedar_data_uri_shim.cedarDataUriShim)(),
     (0, import_vite_plugin_cedar_html_env.cedarHtmlEnvPlugin)(),
     (0, import_vite_plugin_cedar_entry_injection.cedarEntryInjectionPlugin)(),
     (0, import_vite_plugin_merged_config.cedarMergedConfig)(),
@@ -118,17 +123,19 @@ function cedar({ mode } = {}) {
 var index_default = cedar;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  applyContextWrapping,
+  applyHandlerAlsWrapping,
   cedar,
   cedarAutoImportsPlugin,
   cedarCellTransform,
   cedarCjsCompatPlugin,
-  cedarContextWrappingPlugin,
+  cedarDataUriShim,
   cedarEntryInjectionPlugin,
+  cedarGqlormInjectPlugin,
+  cedarGraphqlOptionsExtractPlugin,
   cedarHtmlEnvPlugin,
   cedarImportDirPlugin,
   cedarMergedConfig,
-  cedarNodePolyfills,
+  cedarOtelWrappingPlugin,
   cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle,
   cedarRoutesAutoLoaderPlugin,
@@ -137,5 +144,6 @@ var index_default = cedar;
   cedarUniversalDeployPlugin,
   cedarWaitForApiServer,
   cedarjsJobPathInjectorPlugin,
-  cedarjsResolveCedarStyleImportsPlugin
+  cedarjsResolveCedarStyleImportsPlugin,
+  handlerAlsWrappingPlugin
 });

package/dist/cjs/lib/registerFwGlobalsAndShims.js

@@ -79,6 +79,15 @@ 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-cedar-data-uri-shim.js

@@ -0,0 +1,67 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var vite_plugin_cedar_data_uri_shim_exports = {};
+__export(vite_plugin_cedar_data_uri_shim_exports, {
+  cedarDataUriShim: () => cedarDataUriShim
+});
+module.exports = __toCommonJS(vite_plugin_cedar_data_uri_shim_exports);
+var import_project_config = require("@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 ((0, import_project_config.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;
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cedarDataUriShim
+});