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

package/dist/devFeServer.js

@@ -1,7 +1,12 @@
 #!/usr/bin/env node
+import http from "node:http";
 import { createServerAdapter } from "@whatwg-node/server";
 import express from "express";
-import { createServer as createViteServer } from "vite";
+import {
+  createServer as createViteServer,
+  createServerModuleRunner,
+  defaultServerConditions
+} from "vite";
 import { cjsInterop } from "vite-plugin-cjs-interop";
 import { getProjectRoutes } from "@cedarjs/internal/dist/routes.js";
 import { getConfig, getPaths } from "@cedarjs/project-config";
@@ -10,6 +15,10 @@ import { registerFwGlobalsAndShims } from "./lib/registerFwGlobalsAndShims.js";
 import { invoke } from "./middleware/invokeMiddleware.js";
 import { createMiddlewareRouter } from "./middleware/register.js";
 import { rscRoutesAutoLoader } from "./plugins/vite-plugin-rsc-routes-auto-loader.js";
+import { rscRoutesImports } from "./plugins/vite-plugin-rsc-routes-imports.js";
+import { rscSsrRouterImport } from "./plugins/vite-plugin-rsc-ssr-router-import.js";
+import { rscTransformUseServerPlugin } from "./plugins/vite-plugin-rsc-transform-server.js";
+import { createWebSocketServer } from "./rsc/rscWebSocketServer.js";
 import { collectCssPaths, componentsModules } from "./streaming/collectCss.js";
 import { createReactStreamingHandler } from "./streaming/createReactStreamingHandler.js";
 import {
@@ -18,10 +27,13 @@ import {
   getFullUrl
 } from "./utils.js";
 globalThis.__REDWOOD__PRERENDER_PAGES = {};
+globalThis.__cedarjs__vite_ssr_runtime = void 0;
+globalThis.__cedarjs__vite_rsc_runtime = void 0;
 async function createServer() {
   ensureProcessDirWeb();
   registerFwGlobalsAndShims();
   const app = express();
+  const server = http.createServer(app);
   const rwPaths = getPaths();
   const rscEnabled = getConfig().experimental.rsc?.enabled ?? false;
   const serverStorage = createServerStorage();
@@ -44,8 +56,78 @@ async function createServer() {
       "Vite config not found. Please set up Vite before running the dev server."
     );
   }
-  const vite = await createViteServer({
+  const viteSsrDevServer = await createViteServer({
     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: [
       cjsInterop({
         dependencies: [
@@ -59,16 +141,183 @@ async function createServer() {
           "@cedarjs/auth-!(dbauth)-web"
         ]
       }),
-      rscEnabled && rscRoutesAutoLoader()
+      rscEnabled && rscRoutesAutoLoader(),
+      rscEnabled && rscSsrRouterImport()
     ],
     server: { middlewareMode: true },
     logLevel: "info",
     clearScreen: false,
     appType: "custom"
   });
+  globalThis.__cedarjs__vite_ssr_runtime = createServerModuleRunner(
+    viteSsrDevServer.environments.ssr
+  );
+  globalThis.__cedarjs__client_references = /* @__PURE__ */ new Set();
+  globalThis.__cedarjs__server_references = /* @__PURE__ */ new Set();
+  const viteRscServer = await createViteServer({
+    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", ...defaultServerConditions],
+        externalConditions: ["react-server", ...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", ...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 };
+        }
+      },
+      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),
+      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 = createServerModuleRunner(
+    viteRscServer.environments.ssr
+  );
   const handleWithMiddleware = (route) => {
     return createServerAdapter(async (req) => {
-      const middlewareRouter = await createMiddlewareRouter(vite);
+      const middlewareRouter = await createMiddlewareRouter(viteSsrDevServer);
       const middleware = middlewareRouter.find(
         req.method,
         req.url
@@ -78,19 +327,22 @@ async function createServer() {
       }
       const [mwRes] = await 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");
+    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 () => createMiddlewareRouter(vite),
-        viteDevServer: vite
+      await createRscRequestHandler({
+        getMiddlewareRouter: async () => createMiddlewareRouter(viteSsrDevServer),
+        viteSsrDevServer
       })
     );
   }
@@ -100,18 +352,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 () => createMiddlewareRouter(vite)
+      getMiddlewareRouter: async () => createMiddlewareRouter(viteSsrDevServer)
     },
-    vite
+    viteSsrDevServer
   );
   app.get("*", createServerAdapter(routeHandler));
   app.post("*", handleWithMiddleware());
   const port = 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) => {
@@ -126,11 +382,11 @@ process.stdin.on("data", async (data) => {
 function getCssLinks({
   rwPaths,
   route,
-  vite
+  viteSsrDevServer
 }) {
   const appAndRouteModules = componentsModules(
     [rwPaths.web.app, route?.filePath].filter(Boolean),
-    vite
+    viteSsrDevServer
   );
   const collectedCss = collectCssPaths(appAndRouteModules);
   const cssLinks = Array.from(collectedCss);

package/dist/index.d.ts

@@ -2,12 +2,14 @@ import type { PluginOption } from 'vite';
 export { cedarAutoImportsPlugin } from './plugins/vite-plugin-cedar-auto-import.js';
 export { cedarCjsCompatPlugin } from './plugins/vite-plugin-cedar-cjs-compat.js';
 export { cedarCellTransform } from './plugins/vite-plugin-cedar-cell.js';
-export { cedarContextWrappingPlugin } from './plugins/vite-plugin-cedar-context-wrapping.js';
-export { applyContextWrapping } from './plugins/vite-plugin-cedar-context-wrapping.js';
+export { cedarGqlormInjectPlugin } from './plugins/vite-plugin-cedar-gqlorm-inject.js';
+export { cedarGraphqlOptionsExtractPlugin } from './plugins/vite-plugin-cedar-graphql-options-extract.js';
+export { cedarOtelWrappingPlugin } from './plugins/vite-plugin-cedar-otel-wrapping.js';
+export { applyHandlerAlsWrapping, handlerAlsWrappingPlugin, } from './plugins/vite-plugin-handler-als-wrapping.js';
 export { cedarEntryInjectionPlugin } from './plugins/vite-plugin-cedar-entry-injection.js';
 export { cedarHtmlEnvPlugin } from './plugins/vite-plugin-cedar-html-env.js';
 export { cedarImportDirPlugin } from './plugins/vite-plugin-cedar-import-dir.js';
-export { cedarNodePolyfills } from './plugins/vite-plugin-cedar-node-polyfills.js';
+export { cedarDataUriShim } from './plugins/vite-plugin-cedar-data-uri-shim.js';
 export { cedarRemoveDevFatalErrorPage } from './plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js';
 export { cedarRoutesAutoLoaderPlugin } from './plugins/vite-plugin-cedar-routes-auto-loader.js';
 export { cedarRemoveFromBundle } from './plugins/vite-plugin-cedar-remove-from-bundle.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAuBxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAA;AACtF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAA;AAClF,OAAO,EAAE,4BAA4B,EAAE,MAAM,4DAA4D,CAAA;AACzG,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAA;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,qCAAqC,EAAE,MAAM,8DAA8D,CAAA;AACpH,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAA;AAE1F,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAgClE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAuBxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,EAAE,gCAAgC,EAAE,MAAM,wDAAwD,CAAA;AACzG,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,EACL,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,+CAA+C,CAAA;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAC/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,4DAA4D,CAAA;AACzG,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAA;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,qCAAqC,EAAE,MAAM,8DAA8D,CAAA;AACpH,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAA;AAE1F,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAgClE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}

package/dist/index.js

@@ -7,9 +7,9 @@ import {
   createAuthImportTransformPlugin
 } from "@cedarjs/testing/web/vitest";
 import { cedarCellTransform } from "./plugins/vite-plugin-cedar-cell.js";
+import { cedarDataUriShim } from "./plugins/vite-plugin-cedar-data-uri-shim.js";
 import { cedarEntryInjectionPlugin } from "./plugins/vite-plugin-cedar-entry-injection.js";
 import { cedarHtmlEnvPlugin } from "./plugins/vite-plugin-cedar-html-env.js";
-import { cedarNodePolyfills } from "./plugins/vite-plugin-cedar-node-polyfills.js";
 import { cedarRemoveDevFatalErrorPage } from "./plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js";
 import { cedarRemoveFromBundle } from "./plugins/vite-plugin-cedar-remove-from-bundle.js";
 import { cedarRoutesAutoLoaderPlugin } from "./plugins/vite-plugin-cedar-routes-auto-loader.js";
@@ -21,12 +21,17 @@ import { cedarSwapApolloProvider } from "./plugins/vite-plugin-swap-apollo-provi
 import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
 import { cedarCjsCompatPlugin } from "./plugins/vite-plugin-cedar-cjs-compat.js";
 import { cedarCellTransform as cedarCellTransform2 } from "./plugins/vite-plugin-cedar-cell.js";
-import { cedarContextWrappingPlugin } from "./plugins/vite-plugin-cedar-context-wrapping.js";
-import { applyContextWrapping } from "./plugins/vite-plugin-cedar-context-wrapping.js";
+import { cedarGqlormInjectPlugin } from "./plugins/vite-plugin-cedar-gqlorm-inject.js";
+import { cedarGraphqlOptionsExtractPlugin } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
+import { cedarOtelWrappingPlugin } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
+import {
+  applyHandlerAlsWrapping,
+  handlerAlsWrappingPlugin
+} from "./plugins/vite-plugin-handler-als-wrapping.js";
 import { cedarEntryInjectionPlugin as cedarEntryInjectionPlugin2 } from "./plugins/vite-plugin-cedar-entry-injection.js";
 import { cedarHtmlEnvPlugin as cedarHtmlEnvPlugin2 } from "./plugins/vite-plugin-cedar-html-env.js";
 import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
-import { cedarNodePolyfills as cedarNodePolyfills2 } from "./plugins/vite-plugin-cedar-node-polyfills.js";
+import { cedarDataUriShim as cedarDataUriShim2 } from "./plugins/vite-plugin-cedar-data-uri-shim.js";
 import { cedarRemoveDevFatalErrorPage as cedarRemoveDevFatalErrorPage2 } from "./plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js";
 import { cedarRoutesAutoLoaderPlugin as cedarRoutesAutoLoaderPlugin2 } from "./plugins/vite-plugin-cedar-routes-auto-loader.js";
 import { cedarRemoveFromBundle as cedarRemoveFromBundle2 } from "./plugins/vite-plugin-cedar-remove-from-bundle.js";
@@ -51,7 +56,7 @@ function cedar({ mode } = {}) {
     mode === "test" && createAuthImportTransformPlugin(),
     mode === "test" && autoImportsPlugin(),
     cedarWaitForApiServer(),
-    cedarNodePolyfills(),
+    cedarDataUriShim(),
     cedarHtmlEnvPlugin(),
     cedarEntryInjectionPlugin(),
     cedarMergedConfig(),
@@ -68,17 +73,19 @@ function cedar({ mode } = {}) {
 }
 var index_default = cedar;
 export {
-  applyContextWrapping,
+  applyHandlerAlsWrapping,
   cedar,
   cedarAutoImportsPlugin,
   cedarCellTransform2 as cedarCellTransform,
   cedarCjsCompatPlugin,
-  cedarContextWrappingPlugin,
+  cedarDataUriShim2 as cedarDataUriShim,
   cedarEntryInjectionPlugin2 as cedarEntryInjectionPlugin,
+  cedarGqlormInjectPlugin,
+  cedarGraphqlOptionsExtractPlugin,
   cedarHtmlEnvPlugin2 as cedarHtmlEnvPlugin,
   cedarImportDirPlugin,
   cedarMergedConfig2 as cedarMergedConfig,
-  cedarNodePolyfills2 as cedarNodePolyfills,
+  cedarOtelWrappingPlugin,
   cedarRemoveDevFatalErrorPage2 as cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle2 as cedarRemoveFromBundle,
   cedarRoutesAutoLoaderPlugin2 as cedarRoutesAutoLoaderPlugin,
@@ -88,5 +95,6 @@ export {
   cedarWaitForApiServer2 as cedarWaitForApiServer,
   cedarjsJobPathInjectorPlugin,
   cedarjsResolveCedarStyleImportsPlugin2 as cedarjsResolveCedarStyleImportsPlugin,
-  index_default as default
+  index_default as default,
+  handlerAlsWrappingPlugin
 };

package/dist/lib/registerFwGlobalsAndShims.js

@@ -55,6 +55,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/plugins/vite-plugin-cedar-data-uri-shim.d.ts

@@ -0,0 +1,3 @@
+import type { Plugin } from 'vite';
+export declare function cedarDataUriShim(): Plugin | undefined;
+//# sourceMappingURL=vite-plugin-cedar-data-uri-shim.d.ts.map

package/dist/plugins/vite-plugin-cedar-data-uri-shim.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedar-data-uri-shim.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-data-uri-shim.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAgClC,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CA4BrD"}

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
+};