@cedarjs/vite 7.0.0-canary.3259 → 7.0.0-rc.123

package/dist/devFeServer.js

@@ -1,12 +1,7 @@
 #!/usr/bin/env node
-import http from "node:http";
 import { createServerAdapter } from "@whatwg-node/server";
 import express from "express";
-import {
-  createServer as createViteServer,
-  createServerModuleRunner,
-  defaultServerConditions
-} from "vite";
+import { createServer as createViteServer } from "vite";
 import { cjsInterop } from "vite-plugin-cjs-interop";
 import { getProjectRoutes } from "@cedarjs/internal/dist/routes.js";
 import { getConfig, getPaths } from "@cedarjs/project-config";
@@ -15,10 +10,6 @@ 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 {
@@ -27,17 +18,14 @@ 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
@@ -56,78 +44,8 @@ async function createServer() {
       "Vite config not found. Please set up Vite before running the dev server."
     );
   }
-  const viteSsrDevServer = await createViteServer({
+  const vite = 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: [
@@ -136,186 +54,16 @@ async function createServer() {
           "@cedarjs/prerender/*"
         ]
       }),
-      rscEnabled && rscRoutesAutoLoader(),
-      rscEnabled && rscSsrRouterImport()
+      rscEnabled && rscRoutesAutoLoader()
     ],
     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(viteSsrDevServer);
+      const middlewareRouter = await createMiddlewareRouter(vite);
       const middleware = middlewareRouter.find(
         req.method,
         req.url
@@ -325,22 +73,19 @@ async function createServer() {
       }
       const [mwRes] = await invoke(req, middleware, {
         route,
-        viteSsrDevServer
+        viteDevServer: vite
       });
       return mwRes.toResponse();
     });
   };
-  app.use(viteSsrDevServer.middlewares);
+  app.use(vite.middlewares);
   if (rscEnabled) {
-    createWebSocketServer();
-    const { createRscRequestHandler } = await globalThis.__cedarjs__vite_rsc_runtime.import(
-      new URL("./rsc/rscRequestHandler.js", import.meta.url).pathname
-    );
+    const { createRscRequestHandler } = await import("./rsc/rscRequestHandler.js");
     app.use(
       "/rw-rsc",
-      await createRscRequestHandler({
-        getMiddlewareRouter: async () => createMiddlewareRouter(viteSsrDevServer),
-        viteSsrDevServer
+      createRscRequestHandler({
+        getMiddlewareRouter: async () => createMiddlewareRouter(vite),
+        viteDevServer: vite
       })
     );
   }
@@ -350,22 +95,18 @@ async function createServer() {
       routes,
       clientEntryPath: rwPaths.web.entryClient,
       getStylesheetLinks: (route) => {
-        return getCssLinks({
-          rwPaths,
-          route,
-          viteSsrDevServer
-        });
+        return getCssLinks({ rwPaths, route, vite });
       },
       // Recreate middleware router on each request in dev
-      getMiddlewareRouter: async () => createMiddlewareRouter(viteSsrDevServer)
+      getMiddlewareRouter: async () => createMiddlewareRouter(vite)
     },
-    viteSsrDevServer
+    vite
   );
-  app.get("/{*splat}", createServerAdapter(routeHandler));
-  app.post("/{*splat}", handleWithMiddleware());
+  app.get("*", createServerAdapter(routeHandler));
+  app.post("*", handleWithMiddleware());
   const port = getConfig().web.port;
   console.log(`Started server on http://localhost:${port}`);
-  return server.listen(port);
+  return app.listen(port);
 }
 let devApp = createServer();
 process.stdin.on("data", async (data) => {
@@ -380,11 +121,11 @@ process.stdin.on("data", async (data) => {
 function getCssLinks({
   rwPaths,
   route,
-  viteSsrDevServer
+  vite
 }) {
   const appAndRouteModules = componentsModules(
     [rwPaths.web.app, route?.filePath].filter(Boolean),
-    viteSsrDevServer
+    vite
   );
   const collectedCss = collectCssPaths(appAndRouteModules);
   const cssLinks = Array.from(collectedCss);

package/dist/index.d.ts

@@ -19,7 +19,6 @@ 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;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"}
+{"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"}

package/dist/index.js

@@ -20,7 +20,6 @@ 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";
@@ -50,7 +49,6 @@ 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";
@@ -81,7 +79,6 @@ function cedar({ mode, babel } = {}) {
     cedarMergedConfig(),
     cedarjsResolveCedarStyleImportsPlugin(),
     cedarSwapApolloProvider(),
-    cedarParsedScalarsPlugin(),
     cedarCellTransform(),
     cedarRemoveFromBundle(),
     cedarRemoveDevFatalErrorPage(),
@@ -110,7 +107,6 @@ 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,15 +65,6 @@ 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/middleware/types.d.ts

@@ -1,6 +1,3 @@
 import type { Middleware, MiddlewareClass } from '@cedarjs/web/dist/server/middleware';
-export type MiddlewareReg = ([
-    Middleware | MiddlewareClass,
-    string
-] | Middleware | MiddlewareClass)[];
+export type MiddlewareReg = ([Middleware | MiddlewareClass, string] | Middleware | MiddlewareClass)[];
 //# sourceMappingURL=types.d.ts.map

package/dist/middleware/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/middleware/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EAChB,MAAM,qCAAqC,CAAA;AAG5C,MAAM,MAAM,aAAa,GAAG,CAC1B;IAAC,UAAU,GAAG,eAAe;IAAE,MAAM;CAAC,GAAG,UAAU,GAAG,eAAe,CACtE,EAAE,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/middleware/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EAChB,MAAM,qCAAqC,CAAA;AAG5C,MAAM,MAAM,aAAa,GAAG,CACxB,CAAC,UAAU,GAAG,eAAe,EAAE,MAAM,CAAC,GACtC,UAAU,GACV,eAAe,CAClB,EAAE,CAAA"}

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

@@ -16,8 +16,7 @@ import type { Plugin } from 'vite';
  * export const QUERY = gql`...`
  * export const Loading = () => <div>Loading...</div>
  * export const Success = ({ data }) => <div>{data}</div>
- * const MyCell = createCell({ QUERY, Loading, Success, displayName: 'MyCell' })
- * export default MyCell
+ * export default createCell({ QUERY, Loading, Success, displayName: '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;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAsM3C"}
+{"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"}

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

@@ -23,7 +23,6 @@ function cedarCellTransform() {
       if (!id.match(/Cell\.[jt]sx?$/)) {
         return null;
       }
-      const cellComponentName = parsePath(id).name;
       try {
         const ast = parse(code, {
           sourceType: "module",
@@ -112,38 +111,20 @@ 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: "Identifier",
-                name: cellComponentName
+                type: "CallExpression",
+                callee: {
+                  type: "Identifier",
+                  name: createCellHookName
+                },
+                arguments: [
+                  {
+                    type: "ObjectExpression",
+                    properties: objectProperties
+                  }
+                ]
               }
             };
             path.node.body.push(exportDefaultDeclaration);

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

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-mock-cell-data.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-mock-cell-data.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAMlC;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAyKhD;AAcD,eAAO,MAAM,eAAe,GAAI,GAAG,MAAM;;;;;;CAoFxC,CAAA;AAgCD,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,UAAU,GAAG,OAAO,CAAA;CACtD"}
+{"version":3,"file":"vite-plugin-cedar-mock-cell-data.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-mock-cell-data.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAMlC;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CA2KhD;AAcD,eAAO,MAAM,eAAe,GAAI,GAAG,MAAM;;;;;;CAoFxC,CAAA;AAgCD,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,UAAU,GAAG,OAAO,CAAA;CACtD"}

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

@@ -25,7 +25,9 @@ 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(): Plugin;
+export declare function handlerAlsWrappingPlugin({ projectIsEsm, }?: {
+    projectIsEsm?: boolean;
+}): 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
@@ -36,5 +38,7 @@ export declare function handlerAlsWrappingPlugin(): Plugin;
  * 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): string | null;
+export declare function applyHandlerAlsWrapping(code: string, { projectIsEsm }?: {
+    projectIsEsm?: boolean;
+}): 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,IAAI,MAAM,CAuBjD;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkDnE"}
+{"version":3,"file":"vite-plugin-handler-als-wrapping.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-handler-als-wrapping.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,YAAoB,GACrB,GAAE;IACD,YAAY,CAAC,EAAE,OAAO,CAAA;CAClB,GAAG,MAAM,CAuBd;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,EAAE,YAAoB,EAAE,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACxD,MAAM,GAAG,IAAI,CAsDf"}

package/dist/plugins/vite-plugin-handler-als-wrapping.js

@@ -1,7 +1,9 @@
 import path from "node:path";
 import { normalizePath } from "vite";
 import { getPaths } from "@cedarjs/project-config";
-function handlerAlsWrappingPlugin() {
+function handlerAlsWrappingPlugin({
+  projectIsEsm = false
+} = {}) {
   return {
     name: "handler-als-wrapping",
     transform(code, id) {
@@ -15,12 +17,12 @@ function handlerAlsWrappingPlugin() {
       if (!normalizePath(id).startsWith(functionsDir + "/")) {
         return null;
       }
-      const wrapped = applyHandlerAlsWrapping(code);
+      const wrapped = applyHandlerAlsWrapping(code, { projectIsEsm });
       return wrapped ? { code: wrapped, map: null } : null;
     }
   };
 }
-function applyHandlerAlsWrapping(code) {
+function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
   const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
   const handlerMatch = handlerRe.exec(code);
   if (!handlerMatch) {
@@ -28,7 +30,8 @@ function applyHandlerAlsWrapping(code) {
   }
   const afterEquals = code.slice(handlerMatch.index + handlerMatch[0].length).trimStart();
   const isAsync = /^async(?:\s*[\(\*]|\s+function)/.test(afterEquals);
-  const importStatement = `import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '@cedarjs/context/dist/store.js'
+  const storePath = projectIsEsm ? "@cedarjs/context/dist/store.js" : "@cedarjs/context/dist/store";
+  const importStatement = `import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '${storePath}'
 `;
   const handlerStart = handlerMatch.index;
   const before = code.slice(0, handlerStart);

package/dist/plugins/vite-plugin-rsc-ssr-router-import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-rsc-ssr-router-import.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-rsc-ssr-router-import.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAsC3C"}
+{"version":3,"file":"vite-plugin-rsc-ssr-router-import.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-rsc-ssr-router-import.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAqC3C"}

package/dist/plugins/vite-plugin-rsc-ssr-router-import.js

@@ -11,8 +11,8 @@ function rscSsrRouterImport() {
   const routesFileId = normalizePath(getPaths().web.routes);
   return {
     name: "rsc-ssr-router-import",
-    transform: async function(code, id, options) {
-      if (!options?.ssr || id !== routesFileId) {
+    transform: async function(code, id) {
+      if (id !== routesFileId) {
         return null;
       }
       const ext = path.extname(id);

package/dist/plugins/vite-plugin-rsc-transform-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-rsc-transform-server.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-rsc-transform-server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACvC,MAAM,CAuHR"}
+{"version":3,"file":"vite-plugin-rsc-transform-server.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-rsc-transform-server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACvC,MAAM,CA8GR"}

package/dist/plugins/vite-plugin-rsc-transform-server.js

@@ -8,10 +8,6 @@ function rscTransformUseServerPlugin(outDir, serverEntryFiles) {
       if (!code.includes("use server")) {
         return code;
       }
-      if (id.includes("node_modules/.vite") || id.includes("/react-server-dom-webpack/") || id.includes("/react-server-dom-webpack.server")) {
-        console.log("vite-plugin-rsc-transform-server.ts: Skipping", id);
-        return code;
-      }
       let mod;
       const isTypescript = id.endsWith(".ts") || id.endsWith(".tsx");
       try {

package/dist/rsc/rscRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rscRenderer.d.ts","sourceRoot":"","sources":["../../src/rsc/rscRenderer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AASrD,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,SAAS,CAAA;CAC7B,CAAA;AAID,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,WAAW,GACjB,OAAO,CAAC,cAAc,CAAC,CAEzB;AAyCD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CA2BtD"}
+{"version":3,"file":"rscRenderer.d.ts","sourceRoot":"","sources":["../../src/rsc/rscRenderer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAWrD,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,SAAS,CAAA;CAC7B,CAAA;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAE7E;AAyBD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CA2BtD"}