@cedarjs/vite 7.0.0 → 8.0.0-canary.3265

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,14 +27,17 @@ 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();
-  app.use("*", (req, _res, next) => {
+  app.use((req, _res, next) => {
     const fullUrl = getFullUrl(req, rscEnabled);
     const perReqStore = createPerRequestMap({
       // Convert express headers to fetch header
@@ -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: [
@@ -54,16 +136,186 @@ async function createServer() {
           "@cedarjs/prerender/*"
         ]
       }),
-      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",
+          "react-server-dom-webpack/server",
+          "react-server-dom-webpack/server.edge",
+          "react-server-dom-webpack/client",
+          "react-server-dom-webpack/client.edge",
+          "@apollo/client",
+          "@apollo/client/cache",
+          "@apollo/client/link/context",
+          "@apollo/client/link/persisted-queries",
+          "@apollo/client/react",
+          "@apollo/client/utilities",
+          "rxjs",
+          "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
@@ -73,19 +325,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
       })
     );
   }
@@ -95,18 +350,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());
+  app.get("/{*splat}", createServerAdapter(routeHandler));
+  app.post("/{*splat}", 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) => {
@@ -121,11 +380,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

@@ -19,6 +19,7 @@ export { cedarRemoveFromBundle } from './plugins/vite-plugin-cedar-remove-from-b
 export { cedarjsResolveCedarStyleImportsPlugin } from './plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js';
 export { cedarjsJobPathInjectorPlugin } from './plugins/vite-plugin-cedarjs-job-path-injector.js';
 export { cedarMockCellDataPlugin } from './plugins/vite-plugin-cedar-mock-cell-data.js';
+export { cedarParsedScalarsPlugin } from './plugins/vite-plugin-cedar-parsed-scalars.js';
 export { cedarMergedConfig } from './plugins/vite-plugin-merged-config.js';
 export { cedarSwapApolloProvider } from './plugins/vite-plugin-swap-apollo-provider.js';
 export { cedarUniversalDeployPlugin } from './plugins/vite-plugin-cedar-universal-deploy.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,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAoCxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAA;AAC3F,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,+BAA+B,EAAE,MAAM,uDAAuD,CAAA;AACvG,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,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,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;IACzB,KAAK,CAAC,EAAE,YAAY,GAAG,SAAS,CAAA;CACjC,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CA+CzE;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,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAqCxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAA;AAC3F,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,+BAA+B,EAAE,MAAM,uDAAuD,CAAA;AACvG,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,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAA;AACxF,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;IACzB,KAAK,CAAC,EAAE,YAAY,GAAG,SAAS,CAAA;CACjC,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAgDzE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}

package/dist/index.js

@@ -20,6 +20,7 @@ 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 { cedarMockCellDataPlugin } from "./plugins/vite-plugin-cedar-mock-cell-data.js";
+import { cedarParsedScalarsPlugin } from "./plugins/vite-plugin-cedar-parsed-scalars.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";
@@ -49,6 +50,7 @@ import { cedarRemoveFromBundle as cedarRemoveFromBundle2 } from "./plugins/vite-
 import { cedarjsResolveCedarStyleImportsPlugin as cedarjsResolveCedarStyleImportsPlugin2 } from "./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js";
 import { cedarjsJobPathInjectorPlugin } from "./plugins/vite-plugin-cedarjs-job-path-injector.js";
 import { cedarMockCellDataPlugin as cedarMockCellDataPlugin2 } from "./plugins/vite-plugin-cedar-mock-cell-data.js";
+import { cedarParsedScalarsPlugin as cedarParsedScalarsPlugin2 } from "./plugins/vite-plugin-cedar-parsed-scalars.js";
 import { cedarMergedConfig as cedarMergedConfig2 } from "./plugins/vite-plugin-merged-config.js";
 import { cedarSwapApolloProvider as cedarSwapApolloProvider2 } from "./plugins/vite-plugin-swap-apollo-provider.js";
 import { cedarUniversalDeployPlugin } from "./plugins/vite-plugin-cedar-universal-deploy.js";
@@ -79,6 +81,7 @@ function cedar({ mode, babel } = {}) {
     cedarMergedConfig(),
     cedarjsResolveCedarStyleImportsPlugin(),
     cedarSwapApolloProvider(),
+    cedarParsedScalarsPlugin(),
     cedarCellTransform(),
     cedarRemoveFromBundle(),
     cedarRemoveDevFatalErrorPage(),
@@ -107,6 +110,7 @@ export {
   cedarMergedConfig2 as cedarMergedConfig,
   cedarMockCellDataPlugin2 as cedarMockCellDataPlugin,
   cedarOtelWrappingPlugin,
+  cedarParsedScalarsPlugin2 as cedarParsedScalarsPlugin,
   cedarRemoveDevFatalErrorPage2 as cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle2 as cedarRemoveFromBundle,
   cedarRoutesAutoLoaderPlugin2 as cedarRoutesAutoLoaderPlugin,

package/dist/lib/registerFwGlobalsAndShims.js

@@ -65,6 +65,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-cell.d.ts

@@ -16,7 +16,8 @@ import type { Plugin } from 'vite';
  * export const QUERY = gql`...`
  * export const Loading = () => <div>Loading...</div>
  * export const Success = ({ data }) => <div>{data}</div>
- * export default createCell({ QUERY, Loading, Success, displayName: 'MyCell' })
+ * const MyCell = createCell({ QUERY, Loading, Success, displayName: 'MyCell' })
+ * export default MyCell
  * ```
  */
 export declare function cedarCellTransform(): Plugin;

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

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-cell.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-cell.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAqBlC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAsK3C"}
+{"version":3,"file":"vite-plugin-cedar-cell.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-cell.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAqBlC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAsM3C"}

package/dist/plugins/vite-plugin-cedar-cell.js

@@ -23,6 +23,7 @@ function cedarCellTransform() {
       if (!id.match(/Cell\.[jt]sx?$/)) {
         return null;
       }
+      const cellComponentName = parsePath(id).name;
       try {
         const ast = parse(code, {
           sourceType: "module",
@@ -111,20 +112,38 @@ function cedarCellTransform() {
                 computed: false
               }
             ];
+            const cellVariableDeclaration = {
+              type: "VariableDeclaration",
+              kind: "const",
+              declarations: [
+                {
+                  type: "VariableDeclarator",
+                  id: {
+                    type: "Identifier",
+                    name: cellComponentName
+                  },
+                  init: {
+                    type: "CallExpression",
+                    callee: {
+                      type: "Identifier",
+                      name: createCellHookName
+                    },
+                    arguments: [
+                      {
+                        type: "ObjectExpression",
+                        properties: objectProperties
+                      }
+                    ]
+                  }
+                }
+              ]
+            };
+            path.node.body.push(cellVariableDeclaration);
             const exportDefaultDeclaration = {
               type: "ExportDefaultDeclaration",
               declaration: {
-                type: "CallExpression",
-                callee: {
-                  type: "Identifier",
-                  name: createCellHookName
-                },
-                arguments: [
-                  {
-                    type: "ObjectExpression",
-                    properties: objectProperties
-                  }
-                ]
+                type: "Identifier",
+                name: cellComponentName
               }
             };
             path.node.body.push(exportDefaultDeclaration);

package/dist/plugins/vite-plugin-cedar-parsed-scalars.d.ts

@@ -0,0 +1,20 @@
+import type { Plugin } from 'vite';
+/**
+ * Gives `CedarApolloProvider` the cache config for the scalars in
+ * `graphql.parsedScalars` in `cedar.toml`. Does nothing when no scalar is set
+ * to be parsed.
+ *
+ * The config comes from the project's generated GraphQL schema, so it is built
+ * into the virtual module `virtual:cedar-parsed-scalars` rather than into the
+ * provider, which is a published package that Vite pre-bundles in dev. The
+ * module puts the config on `globalThis.__CEDAR__PARSED_SCALARS`, where the
+ * provider reads it when it creates the cache, and `App` and the web test
+ * setup file import the module so that every entry point that renders the
+ * provider has it. The module is a
+ * dependency of the generated schema file, so a change to the schema reloads
+ * the app. The generated schema is only read, and `graphql` and its schema
+ * loader only imported, when the virtual module is actually resolved, so a
+ * project that doesn't use this setting doesn't pay for loading them.
+ */
+export declare function cedarParsedScalarsPlugin(): Plugin | undefined;
+//# sourceMappingURL=vite-plugin-cedar-parsed-scalars.d.ts.map

package/dist/plugins/vite-plugin-cedar-parsed-scalars.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedar-parsed-scalars.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-parsed-scalars.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAclC;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,GAAG,SAAS,CA4E7D"}

package/dist/plugins/vite-plugin-cedar-parsed-scalars.js

@@ -0,0 +1,60 @@
+import { normalizePath } from "vite";
+import { getParsedScalars, getPaths } from "@cedarjs/project-config";
+const VIRTUAL_MODULE_ID = "virtual:cedar-parsed-scalars";
+const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
+const APP_FILE_REGEXP = /web[\\/]src[\\/]App\.(ts|tsx|js|jsx)$/;
+const VITEST_WEB_SETUP_FILE_REGEXP = /[\\/]vitest-web\.setup\.(ts|js)$/;
+function cedarParsedScalarsPlugin() {
+  if (Object.keys(getParsedScalars()).length === 0) {
+    return void 0;
+  }
+  return {
+    name: "cedar-parsed-scalars",
+    resolveId(id) {
+      if (id === VIRTUAL_MODULE_ID) {
+        return RESOLVED_VIRTUAL_MODULE_ID;
+      }
+      return null;
+    },
+    async load(id) {
+      if (id !== RESOLVED_VIRTUAL_MODULE_ID) {
+        return null;
+      }
+      this.addWatchFile(getPaths().generated.schema);
+      const { loadParsedScalarsCacheConfig } = await import("@cedarjs/internal/dist/generate/parsedScalars.js");
+      const config = loadParsedScalarsCacheConfig();
+      return `globalThis.__CEDAR__PARSED_SCALARS = ${JSON.stringify(config)}`;
+    },
+    transform(code, id) {
+      if (!APP_FILE_REGEXP.test(id) && !VITEST_WEB_SETUP_FILE_REGEXP.test(id)) {
+        return null;
+      }
+      return `import '${VIRTUAL_MODULE_ID}'
+${code}`;
+    },
+    // `this.addWatchFile` in `load` only reruns the virtual module for a
+    // change to a file it has already watched. The schema doesn't exist yet
+    // on a clean `cedar dev` (the web server and `cedar-gen-watch` start
+    // concurrently), so its first appearance is a 'create' event on a path
+    // nothing has watched yet, and reaches here without an `addWatchFile`
+    // call ever having registered it. Reload the virtual module for exactly
+    // that file, on every event type, so the app picks up the first schema
+    // once `cedar-gen-watch` writes it, the same way it already does for a
+    // later edit.
+    hotUpdate(options) {
+      if (options.file !== normalizePath(getPaths().generated.schema)) {
+        return;
+      }
+      const moduleGraph = this.environment.moduleGraph;
+      const module = moduleGraph.getModuleById(RESOLVED_VIRTUAL_MODULE_ID);
+      if (!module) {
+        return;
+      }
+      moduleGraph.invalidateModule(module);
+      return [module];
+    }
+  };
+}
+export {
+  cedarParsedScalarsPlugin
+};

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

@@ -25,9 +25,7 @@ import type { Plugin } from 'vite';
  * This replaces `babel-plugin-handler-als-wrapping` for Vite builds.
  * The babel plugin is still used for Jest and prerender.
  */
-export declare function handlerAlsWrappingPlugin({ projectIsEsm, }?: {
-    projectIsEsm?: boolean;
-}): Plugin;
+export declare function handlerAlsWrappingPlugin(): Plugin;
 /**
  * Wraps the `handler` export of an API function file with an async context
  * store guard. Returns the transformed code, or `null` if the file does not
@@ -38,7 +36,5 @@ export declare function handlerAlsWrappingPlugin({ projectIsEsm, }?: {
  * 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 applyHandlerAlsWrapping(code: string, { projectIsEsm }?: {
-    projectIsEsm?: boolean;
-}): string | null;
+export declare function applyHandlerAlsWrapping(code: string): string | null;
 //# sourceMappingURL=vite-plugin-handler-als-wrapping.d.ts.map

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

@@ -1 +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"}
+{"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,IAAI,MAAM,CAuBjD;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkDnE"}