@cedarjs/vite 7.0.0 → 7.0.1-next.305

package/dist/devFeServer.js

@@ -25,7 +25,7 @@ async function createServer() {
   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
@@ -102,8 +102,8 @@ async function createServer() {
     },
     vite
   );
-  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);

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/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"}

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

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

package/dist/runFeServer.js

@@ -67,7 +67,7 @@ async function runFeServer() {
     "/assets",
     express.static(rwPaths.web.distBrowser + "/assets", { index: false })
   );
-  app.use("*", (req, _res, next) => {
+  app.use((req, _res, next) => {
     const fullUrl = getFullUrl(req, rscEnabled);
     const headers = convertExpressHeaders(req.headersDistinct);
     const perReqStore = createPerRequestMap({ headers, fullUrl });
@@ -99,8 +99,8 @@ async function runFeServer() {
     getStylesheetLinks,
     getMiddlewareRouter: async () => middlewareRouter
   });
-  app.get("*", createServerAdapter(routeHandler));
-  app.post("*", handleWithMiddleware());
+  app.get("/{*splat}", createServerAdapter(routeHandler));
+  app.post("/{*splat}", handleWithMiddleware());
   app.listen(rwConfig.web.port);
   console.log(
     `Started production FE server on http://localhost:${rwConfig.web.port}`

package/dist/streaming/streamHelpers.d.ts

@@ -3,9 +3,14 @@ import type { ServerAuthState } from '@cedarjs/auth/dist/AuthProvider/ServerAuth
 import type { TagDescriptor } from '@cedarjs/web';
 import type { MiddlewareResponse } from '@cedarjs/web/middleware';
 import type { ServerEntryType } from '../types.js';
+interface FallbackDocumentProps {
+    css: string[];
+    meta: TagDescriptor[];
+    children?: React.ReactNode;
+}
 interface RenderToStreamArgs {
     ServerEntry: ServerEntryType;
-    FallbackDocument: React.FunctionComponent;
+    FallbackDocument: React.FunctionComponent<FallbackDocumentProps>;
     currentUrl: URL;
     metaTags: TagDescriptor[];
     cssLinks: string[];

package/dist/streaming/streamHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streamHelpers.d.ts","sourceRoot":"","sources":["../../src/streaming/streamHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAQ9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAA;AAI5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAYlD,UAAU,kBAAkB;IAC1B,WAAW,EAAE,eAAe,CAAA;IAC5B,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,CAAA;IACzC,UAAU,EAAE,GAAG,CAAA;IACf,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,eAAe,CAAA;CAC3B;AAED,UAAU,aAAa;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;CAC/B;AA2BD,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,kBAAkB,EACzB,aAAa,EAAE,kBAAkB,EACjC,aAAa,EAAE,aAAa,qBAgM7B;AA2BD,wBAAsB,YAAY,CAChC,GAAG,EACC,WAAW,GACX,kBAAkB,GAClB,qBAAqB,GACrB,iCAAiC,GACjC,0BAA0B,gBA6B/B"}
+{"version":3,"file":"streamHelpers.d.ts","sourceRoot":"","sources":["../../src/streaming/streamHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAQ9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAA;AAI5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAYlD,UAAU,qBAAqB;IAC7B,GAAG,EAAE,MAAM,EAAE,CAAA;IACb,IAAI,EAAE,aAAa,EAAE,CAAA;IACrB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAC3B;AAED,UAAU,kBAAkB;IAC1B,WAAW,EAAE,eAAe,CAAA;IAC5B,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAA;IAChE,UAAU,EAAE,GAAG,CAAA;IACf,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,SAAS,EAAE,eAAe,CAAA;CAC3B;AAED,UAAU,aAAa;IACrB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;CAC/B;AA2BD,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,kBAAkB,EACzB,aAAa,EAAE,kBAAkB,EACjC,aAAa,EAAE,aAAa,qBAgM7B;AA2BD,wBAAsB,YAAY,CAChC,GAAG,EACC,WAAW,GACX,kBAAkB,GAClB,qBAAqB,GACrB,iCAAiC,GACjC,0BAA0B,gBA6B/B"}

package/dist/streaming/streamHelpers.js

@@ -137,7 +137,7 @@ async function reactRenderToStreamResponse(mwRes, renderOptions, streamOptions)
     console.error("\u{1F53B} Failed to render shell");
     streamOptions.onError?.(e);
     const fallbackShell = await renderToReadableStream(
-      FallbackDocument({
+      createElement(FallbackDocument, {
         children: null,
         css: cssLinks,
         meta: metaTags

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "7.0.0",
+  "version": "7.0.1-next.305",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -48,40 +48,42 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
+    "@babel/core": "^7.26.10",
     "@babel/generator": "7.29.8",
     "@babel/parser": "7.29.9",
+    "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.8",
     "@babel/types": "7.29.8",
-    "@cedarjs/api": "7.0.0",
-    "@cedarjs/api-server": "7.0.0",
-    "@cedarjs/babel-config": "7.0.0",
-    "@cedarjs/context": "7.0.0",
-    "@cedarjs/graphql-server": "7.0.0",
-    "@cedarjs/internal": "7.0.0",
-    "@cedarjs/jobs": "7.0.0",
-    "@cedarjs/project-config": "7.0.0",
-    "@cedarjs/server-store": "7.0.0",
-    "@cedarjs/structure": "7.0.0",
-    "@cedarjs/testing": "7.0.0",
+    "@cedarjs/api": "7.0.1-next.305",
+    "@cedarjs/api-server": "7.0.1-next.305",
+    "@cedarjs/babel-config": "7.0.1-next.305",
+    "@cedarjs/context": "7.0.1-next.305",
+    "@cedarjs/graphql-server": "7.0.1-next.305",
+    "@cedarjs/internal": "7.0.1-next.305",
+    "@cedarjs/jobs": "7.0.1-next.305",
+    "@cedarjs/project-config": "7.0.1-next.305",
+    "@cedarjs/server-store": "7.0.1-next.305",
+    "@cedarjs/structure": "7.0.1-next.305",
+    "@cedarjs/testing": "7.0.1-next.305",
     "@swc/core": "1.16.2",
     "@universal-deploy/store": "^0.2.1",
     "@universal-deploy/vite": "^0.1.9",
     "@vitejs/plugin-react": "4.7.0",
-    "@whatwg-node/fetch": "0.10.13",
-    "@whatwg-node/server": "0.11.0",
+    "@whatwg-node/fetch": "0.12.0",
+    "@whatwg-node/server": "0.13.0",
     "acorn": "8.18.0",
     "acorn-loose": "8.5.2",
     "ansis": "4.4.0",
     "busboy": "^1.6.0",
     "dotenv-defaults": "5.0.2",
-    "express": "4.22.2",
+    "express": "5.2.1",
     "fast-glob": "3.3.3",
     "find-my-way": "9.9.0",
     "http-proxy-middleware": "3.0.7",
     "isbot": "5.2.2",
     "magic-string": "0.30.21",
     "oxc-parser": "0.151.0",
-    "react-server-dom-webpack": "19.2.8",
+    "react-server-dom-webpack": "19.3.0",
     "unimport": "5.7.0",
     "unplugin-auto-import": "19.3.0",
     "vite": "7.3.6",
@@ -92,36 +94,36 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@cedarjs/auth": "7.0.0",
-    "@cedarjs/framework-tools": "7.0.0",
-    "@cedarjs/router": "7.0.0",
-    "@cedarjs/web": "7.0.0",
+    "@cedarjs/auth": "7.0.1-next.305",
+    "@cedarjs/framework-tools": "7.0.1-next.305",
+    "@cedarjs/router": "7.0.1-next.305",
+    "@cedarjs/web": "7.0.1-next.305",
     "@dr.pogodin/react-helmet": "2.0.4",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
     "@oxc-project/types": "^0.151.0",
     "@types/aws-lambda": "8.10.163",
     "@types/busboy": "^1",
-    "@types/express": "4",
-    "@types/react": "^18.2.55",
+    "@types/express": "5.0.6",
+    "@types/react": "^19.2.0",
     "@types/ws": "^8",
     "@types/yargs-parser": "21.0.3",
     "concurrently": "9.2.4",
-    "memfs": "4.78.1",
+    "memfs": "4.79.0",
     "publint": "0.3.24",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
+    "react": "19.3.0",
+    "react-dom": "19.3.0",
     "rollup": "4.63.4",
     "ts-dedent": "2.3.0",
     "typescript": "5.9.3",
     "vitest": "4.1.11"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "7.0.0",
-    "@cedarjs/router": "7.0.0",
-    "@cedarjs/web": "7.0.0",
-    "react": "18.3.1",
-    "react-dom": "18.3.1"
+    "@cedarjs/auth": "7.0.1-next.305",
+    "@cedarjs/router": "7.0.1-next.305",
+    "@cedarjs/web": "7.0.1-next.305",
+    "react": "19.3.0",
+    "react-dom": "19.3.0"
   },
   "engines": {
     "node": ">=24"