@cedarjs/vite 7.0.1-next.467 → 7.1.0-rc.34

package/dist/buildApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AAuEA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBAyd3B"}
+{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AAkEA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBAgc3B"}

package/dist/buildApp.js

@@ -23,14 +23,10 @@ import { findApiFiles } from "@cedarjs/internal/dist/files.js";
 import {
   createPrismaClientFileMatcher,
   getConfig,
-  getPaths
+  getPaths,
+  projectSideIsEsm
 } from "@cedarjs/project-config";
 import { generateDiffSourceMap } from "./lib/generateDiffSourceMap.js";
-import {
-  copySandboxChildrenIntoVercelFunctions,
-  findSandboxChildScripts,
-  SANDBOX_CHILDREN_DIR
-} from "./lib/sandboxChildren.js";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
 import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
 import { cedarDirectoryNamedImportPlugin } from "./plugins/vite-plugin-cedar-directory-named-import.js";
@@ -39,7 +35,6 @@ import { cedarGraphqlOptionsExtractPlugin } from "./plugins/vite-plugin-cedar-gr
 import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
 import { cedarMockCellDataPlugin } from "./plugins/vite-plugin-cedar-mock-cell-data.js";
 import { cedarOtelWrappingPlugin } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
-import { cedarSandboxChildrenPlugin } from "./plugins/vite-plugin-cedar-sandbox-children.js";
 import { cedarjsJobPathInjectorPlugin } from "./plugins/vite-plugin-cedarjs-job-path-injector.js";
 import { handlerAlsWrappingPlugin } from "./plugins/vite-plugin-handler-als-wrapping.js";
 function resolveWithExtensions(id) {
@@ -62,7 +57,6 @@ async function buildCedarApp({
   const cedarPaths = getPaths();
   const cedarConfig = getConfig();
   const environments = {};
-  let sandboxChildren = {};
   if (workspace.includes("web")) {
     environments.client = {
       build: {
@@ -71,6 +65,8 @@ async function buildCedarApp({
     };
   }
   if (workspace.includes("api")) {
+    const isEsm = projectSideIsEsm("api");
+    const format = isEsm ? "es" : "cjs";
     const apiFiles = findApiFiles();
     const input = {};
     for (const f of apiFiles) {
@@ -86,7 +82,7 @@ async function buildCedarApp({
         rollupOptions: {
           input,
           output: {
-            format: "es",
+            format,
             preserveModules: true,
             preserveModulesRoot: cedarPaths.api.src,
             entryFileNames: "[name].js",
@@ -104,16 +100,15 @@ async function buildCedarApp({
       }
     };
     if (ud) {
-      sandboxChildren = findSandboxChildScripts(cedarPaths.api.src);
       environments["ssr"] = {
         build: {
           ssr: true,
           outDir: path.join(cedarPaths.api.dist, "ud"),
           emptyOutDir: true,
           rollupOptions: {
-            input: { index: catchAllEntry, ...sandboxChildren },
+            input: catchAllEntry,
             output: {
-              entryFileNames: "[name].js"
+              entryFileNames: "index.js"
             },
             external: (id) => {
               if (id.startsWith("virtual:")) {
@@ -209,12 +204,6 @@ async function buildCedarApp({
   ];
   if (ud) {
     plugins.push(catchAll());
-    plugins.push(
-      cedarSandboxChildrenPlugin({
-        environment: "ssr",
-        children: sandboxChildren
-      })
-    );
     plugins.push({
       name: "cedar-ud-verify-routes",
       configResolved() {
@@ -272,7 +261,9 @@ async function buildCedarApp({
     plugins.push(cedarDirectoryNamedImportPlugin());
     plugins.push(cedarOtelWrappingPlugin());
     plugins.push(cedarjsJobPathInjectorPlugin());
-    plugins.push(handlerAlsWrappingPlugin());
+    plugins.push(
+      handlerAlsWrappingPlugin({ projectIsEsm: projectSideIsEsm("api") })
+    );
   }
   plugins.push(cedarMockCellDataPlugin());
   if (workspace.includes("api")) {
@@ -355,19 +346,7 @@ async function buildCedarApp({
     },
     plugins
   });
-  await builder.buildApp();
-  const vercelNode = builder.environments["vercel_node"];
-  if (ud && vercelNode && Object.keys(sandboxChildren).length > 0) {
-    const outDir = path.resolve(
-      vercelNode.config.root,
-      vercelNode.config.build.outDir
-    );
-    copySandboxChildrenIntoVercelFunctions({
-      appRoot: cedarPaths.base,
-      childrenDir: path.join(cedarPaths.api.dist, "ud", SANDBOX_CHILDREN_DIR),
-      functionsDir: path.join(outDir, "functions")
-    });
-  }
+  return builder.buildApp();
 }
 export {
   buildCedarApp

package/dist/buildRouteHooks.d.ts

@@ -1,16 +1,22 @@
 import type { Paths } from '@cedarjs/project-config';
 /**
- * Returns the path, relative to `web/dist/ssr/routeHooks` and with a `.js`
- * extension, that the built version of the given route hook source file is
- * written to. The layout mirrors `web/src`, so
- * `web/src/pages/HomePage/HomePage.routeHooks.ts` ends up at
- * `pages/HomePage/HomePage.routeHooks.js` and `web/src/App.routeHooks.ts` at
- * `App.routeHooks.js`.
+ * Route hooks are built as ES modules. Node reads a `.js` file as CommonJS
+ * when the nearest package.json has no `"type": "module"`, so in a CommonJS
+ * web side the output gets the `.mjs` extension instead.
+ */
+export declare function getRouteHookDistExtension(): ".js" | ".mjs";
+/**
+ * Returns the path, relative to `web/dist/ssr/routeHooks`, that the built
+ * version of the given route hook source file is written to. The layout
+ * mirrors `web/src`, so `web/src/pages/HomePage/HomePage.routeHooks.ts` ends
+ * up at `pages/HomePage/HomePage.routeHooks.js` and `web/src/App.routeHooks.ts`
+ * at `App.routeHooks.js` (`.mjs` in a CommonJS web side, see
+ * getRouteHookDistExtension()).
  *
  * Used both by the build (to name the Rollup entries) and by the route
  * manifest (so the streaming handler can find the file at request time).
  */
-export declare function getRouteHookDistPath(routeHookSrcPath: string, webSrc?: string): string;
+export declare function getRouteHookDistPath(routeHookSrcPath: string, webSrc?: string, extension?: string): string;
 /**
  * Bundles every `web/src/** /*.routeHooks.{js,ts,tsx,jsx}` file into
  * `web/dist/ssr/routeHooks` as a node ESM module, one output file per route

package/dist/buildRouteHooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildRouteHooks.d.ts","sourceRoot":"","sources":["../src/buildRouteHooks.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAiBpD;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,gBAAgB,EAAE,MAAM,EACxB,MAAM,SAAqB,UAG5B;AA6BD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,KAAK,iBAuEf"}
+{"version":3,"file":"buildRouteHooks.d.ts","sourceRoot":"","sources":["../src/buildRouteHooks.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAiBpD;;;;GAIG;AACH,wBAAgB,yBAAyB,mBAExC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,gBAAgB,EAAE,MAAM,EACxB,MAAM,SAAqB,EAC3B,SAAS,SAA8B,UAGxC;AA6BD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,KAAK,iBAyEf"}

package/dist/buildRouteHooks.js

@@ -3,7 +3,7 @@ import { build as viteBuild } from "vite";
 import { gqlPlugin as gqlTagPlugin } from "vite-plugin-graphql-tag";
 import tsPathsMod from "vite-tsconfig-paths";
 import { findRouteHooksSrc } from "@cedarjs/internal/dist/files.js";
-import { getPaths } from "@cedarjs/project-config";
+import { getPaths, projectSideIsEsm } from "@cedarjs/project-config";
 import { cedarApiImportGuardPlugin } from "./plugins/vite-plugin-cedar-api-import-guard.js";
 import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
 import { cedarDirectoryNamedImportPlugin } from "./plugins/vite-plugin-cedar-directory-named-import.js";
@@ -13,8 +13,11 @@ const tsconfigPaths = (
   // interop
   tsPathsMod.default?.default || tsPathsMod.default || tsPathsMod
 );
-function getRouteHookDistPath(routeHookSrcPath, webSrc = getPaths().web.src) {
-  return getRouteHookEntryName(routeHookSrcPath, webSrc) + ".js";
+function getRouteHookDistExtension() {
+  return projectSideIsEsm("web") ? ".js" : ".mjs";
+}
+function getRouteHookDistPath(routeHookSrcPath, webSrc = getPaths().web.src, extension = getRouteHookDistExtension()) {
+  return getRouteHookEntryName(routeHookSrcPath, webSrc) + extension;
 }
 function getRouteHookEntryName(routeHookSrcPath, webSrc) {
   return path.relative(webSrc, routeHookSrcPath).replace(/\.(js|ts|tsx|jsx)$/, "").split(path.sep).join("/");
@@ -35,6 +38,7 @@ async function buildRouteHooks(verbose, rwPaths) {
   for (const routeHook of allRouteHooks) {
     input[getRouteHookEntryName(routeHook, rwPaths.web.src)] = routeHook;
   }
+  const extension = getRouteHookDistExtension();
   await viteBuild({
     // Route hooks run in node, so the project's web/vite.config, which is set
     // up for browser and SSR builds of React code, doesn't apply. Only the
@@ -77,9 +81,9 @@ async function buildRouteHooks(verbose, rwPaths) {
         input,
         output: {
           format: "es",
-          entryFileNames: "[name].js",
+          entryFileNames: "[name]" + extension,
           // Modules shared between route hooks, like the api side's db.js
-          chunkFileNames: "chunks/[name]-[hash].js",
+          chunkFileNames: "chunks/[name]-[hash]" + extension,
           exports: "named"
         }
       }
@@ -96,5 +100,6 @@ async function buildRouteHooks(verbose, rwPaths) {
 }
 export {
   buildRouteHooks,
+  getRouteHookDistExtension,
   getRouteHookDistPath
 };