@cedarjs/vite 6.0.2-rc.53 → 6.0.3-next.227

package/dist/apiDevMiddleware.js

@@ -18,7 +18,7 @@ import {
   transformWithBabel
 } from "@cedarjs/babel-config";
 import { getAsyncStoreInstance } from "@cedarjs/context/dist/store";
-import { createGraphQLYoga } from "@cedarjs/graphql-server";
+import { createGraphQLServer } from "@cedarjs/graphql-server";
 import { applyGqlormInject } from "@cedarjs/internal/dist/build/api-graphql-transforms.js";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { generateDiffSourceMap } from "./lib/generateDiffSourceMap.js";
@@ -133,7 +133,7 @@ async function internalLoadApiFunctions(viteServer) {
   });
   await Promise.all(imports);
   if (extractedGraphqlOptions) {
-    loadedGraphqlServer = await createGraphQLYoga(extractedGraphqlOptions);
+    loadedGraphqlServer = await createGraphQLServer(extractedGraphqlOptions);
   } else {
     loadedGraphqlServer = null;
   }

package/dist/buildApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AA6DA,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,iBA0a3B"}
+{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AA6DA,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,iBAsa3B"}

package/dist/buildApp.js

@@ -20,7 +20,7 @@ import {
   applySrcAlias
 } from "@cedarjs/internal/dist/build/api.js";
 import { findApiFiles } from "@cedarjs/internal/dist/files.js";
-import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
+import { getConfig, getPaths } from "@cedarjs/project-config";
 import { generateDiffSourceMap } from "./lib/generateDiffSourceMap.js";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
 import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
@@ -60,8 +60,6 @@ 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) {
@@ -77,7 +75,7 @@ async function buildCedarApp({
         rollupOptions: {
           input,
           output: {
-            format,
+            format: "es",
             preserveModules: true,
             preserveModulesRoot: cedarPaths.api.src,
             entryFileNames: "[name].js",
@@ -256,9 +254,7 @@ async function buildCedarApp({
     plugins.push(cedarDirectoryNamedImportPlugin());
     plugins.push(cedarOtelWrappingPlugin());
     plugins.push(cedarjsJobPathInjectorPlugin());
-    plugins.push(
-      handlerAlsWrappingPlugin({ projectIsEsm: projectSideIsEsm("api") })
-    );
+    plugins.push(handlerAlsWrappingPlugin());
   }
   plugins.push(cedarMockCellDataPlugin());
   if (workspace.includes("api")) {

package/dist/buildRouteHooks.d.ts

@@ -1,3 +1,20 @@
 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`.
+ *
+ * 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;
+/**
+ * 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
+ * hook. The streaming SSR handler `import()`s them at request time.
+ */
 export declare function buildRouteHooks(verbose: boolean | undefined, rwPaths: Paths): Promise<void>;
 //# sourceMappingURL=buildRouteHooks.d.ts.map

package/dist/buildRouteHooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildRouteHooks.d.ts","sourceRoot":"","sources":["../src/buildRouteHooks.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AA2BpD,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,KAAK,iBA+Ef"}
+{"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"}

package/dist/buildRouteHooks.js

@@ -1,81 +1,100 @@
-import fs from "node:fs";
 import path from "node:path";
-import { build as esbuildBuild } from "esbuild";
-import { gqlPlugin } from "vite-plugin-graphql-tag";
-import {
-  getRouteHookBabelPlugins,
-  transformWithBabel
-} from "@cedarjs/babel-config";
+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";
-const GQL_TAG_PLUGIN_NAME = "rwjs-babel-graphql-tag";
-const gqlPluginResult = gqlPlugin();
-if (!gqlPluginResult || Array.isArray(gqlPluginResult) || !("transform" in gqlPluginResult) || !gqlPluginResult.transform) {
-  throw new Error("vite-plugin-graphql-tag did not return the expected shape");
+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";
+import { cedarjsResolveCedarStyleImportsPlugin } from "./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js";
+const tsconfigPaths = (
+  // @ts-expect-error – .default only exists at runtime in CJS double-wrap
+  // interop
+  tsPathsMod.default?.default || tsPathsMod.default || tsPathsMod
+);
+function getRouteHookDistPath(routeHookSrcPath, webSrc = getPaths().web.src) {
+  return getRouteHookEntryName(routeHookSrcPath, webSrc) + ".js";
 }
-const transform = gqlPluginResult.transform;
-if (typeof transform !== "object" || !("handler" in transform)) {
-  throw new Error("vite-plugin-graphql-tag did not return the expected shape");
+function getRouteHookEntryName(routeHookSrcPath, webSrc) {
+  return path.relative(webSrc, routeHookSrcPath).replace(/\.(js|ts|tsx|jsx)$/, "").split(path.sep).join("/");
+}
+function postGqlTagPlugin() {
+  const plugin = gqlTagPlugin();
+  if (!plugin || Array.isArray(plugin) || plugin instanceof Promise) {
+    throw new Error("vite-plugin-graphql-tag did not return a plugin object");
+  }
+  return { ...plugin, enforce: "post" };
 }
-const gqlTransform = transform.handler;
 async function buildRouteHooks(verbose, rwPaths) {
   const allRouteHooks = findRouteHooksSrc();
-  const runRwBabelTransformsPlugin = {
-    name: "cedar-esbuild-babel-transform",
-    setup(build) {
-      build.onLoad({ filter: /\.(js|ts|tsx|jsx)$/ }, async (args) => {
-        const fileContents = await fs.promises.readFile(args.path, "utf-8");
-        const babelPlugins = getRouteHookBabelPlugins().filter(
-          (p) => !(Array.isArray(p) && p[2] === GQL_TAG_PLUGIN_NAME)
-        );
-        const transformedCode = await transformWithBabel(
-          fileContents,
-          args.path,
-          babelPlugins
-        );
-        if (transformedCode?.code) {
-          const mockCtx = {
-            warn(msg) {
-              console.warn(`[gql-plugin] ${msg}`);
-            },
-            error(err) {
-              throw new Error(String(err));
-            }
-          };
-          const gqlResult = await gqlTransform.call(
-            mockCtx,
-            transformedCode.code,
-            args.path
-          );
-          const gqlCode = gqlResult && typeof gqlResult === "object" && "code" in gqlResult ? gqlResult.code : void 0;
-          return {
-            contents: gqlCode ?? transformedCode.code,
-            loader: "js"
-          };
-        }
-        throw new Error(`Could not transform file: ${args.path}`);
-      });
-    }
-  };
-  await esbuildBuild({
-    absWorkingDir: getPaths().web.base,
-    entryPoints: allRouteHooks,
-    platform: "node",
-    target: "node16",
-    // @MARK Disable splitting and esm, because Redwood web modules don't support esm yet
-    // outExtension: { '.js': '.mjs' },
-    // format: 'esm',
-    // splitting: true,
-    bundle: true,
-    plugins: [runRwBabelTransformsPlugin],
-    packages: "external",
+  if (allRouteHooks.length === 0) {
+    return;
+  }
+  const input = {};
+  for (const routeHook of allRouteHooks) {
+    input[getRouteHookEntryName(routeHook, rwPaths.web.src)] = routeHook;
+  }
+  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
+    // plugins listed below are used.
+    configFile: false,
+    root: rwPaths.web.base,
+    // Route hooks are node modules, so the static assets in web/public
+    // must not be copied next to them
+    publicDir: false,
+    envFile: false,
     logLevel: verbose ? "info" : "error",
-    outdir: rwPaths.web.distRouteHooks,
-    alias: {
-      "api/src": path.join(getPaths().api.base, "src")
+    plugins: [
+      // Turns `$api/` imports into an error in the client environment. It's a
+      // no-op in this ssr-only build, but it has to sit in front of
+      // tsconfigPaths() wherever that plugin is used, so it's kept here for
+      // parity with the web build
+      cedarApiImportGuardPlugin(),
+      // Resolves the `paths` mapping in web/tsconfig.json, like `$api/*`
+      tsconfigPaths(),
+      // Resolves `src/` imports to the web side, `$api/` and `api/` imports to
+      // the api side, and directory-named modules for those
+      cedarjsResolveCedarStyleImportsPlugin(),
+      // Resolves relative `./Foo` imports to `./Foo/index` or `./Foo/Foo`
+      cedarDirectoryNamedImportPlugin(),
+      // Auto-imports `gql` and `React`
+      cedarAutoImportsPlugin(),
+      // Compiles `gql` template literals into DocumentNode objects. Placed
+      // after cedarAutoImportsPlugin(), see postGqlTagPlugin()
+      postGqlTagPlugin()
+    ],
+    build: {
+      ssr: true,
+      target: "node24",
+      minify: false,
+      outDir: rwPaths.web.distRouteHooks,
+      // The directory only ever holds route hook output, so clearing it keeps
+      // chunks from earlier builds from piling up
+      emptyOutDir: true,
+      rollupOptions: {
+        input,
+        output: {
+          format: "es",
+          entryFileNames: "[name].js",
+          // Modules shared between route hooks, like the api side's db.js
+          chunkFileNames: "chunks/[name]-[hash].js",
+          exports: "named"
+        }
+      }
+    },
+    // Node builtins and everything that resolves into node_modules stay as
+    // imports for node to resolve at runtime. Only project files (the route
+    // hook itself and whatever it imports from the web and api sides) are
+    // bundled. Bare specifiers like `$api/` and `src/` are resolved by the
+    // plugins above before Vite decides whether to externalize them
+    ssr: {
+      external: true
     }
   });
 }
 export {
-  buildRouteHooks
+  buildRouteHooks,
+  getRouteHookDistPath
 };

package/dist/buildRouteManifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildRouteManifest.d.ts","sourceRoot":"","sources":["../src/buildRouteManifest.ts"],"names":[],"mappings":"AAWA;;;GAGG;AACH,wBAAsB,kBAAkB,kBAgDvC"}
+{"version":3,"file":"buildRouteManifest.d.ts","sourceRoot":"","sources":["../src/buildRouteManifest.ts"],"names":[],"mappings":"AAYA;;;GAGG;AACH,wBAAsB,kBAAkB,kBAkDvC"}

package/dist/buildRouteManifest.js

@@ -2,7 +2,8 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import url from "node:url";
 import { getProjectRoutes } from "@cedarjs/internal/dist/routes.js";
-import { getAppRouteHook, getPaths } from "@cedarjs/project-config";
+import { getPaths } from "@cedarjs/project-config";
+import { getRouteHookDistPath } from "./buildRouteHooks.js";
 async function buildRouteManifest() {
   const rwPaths = getPaths();
   const buildManifestUrl = url.pathToFileURL(
@@ -24,7 +25,7 @@ async function buildRouteManifest() {
       // E.g. /blog/post/{id:Int}
       pathDefinition: route.pathDefinition,
       hasParams: route.hasParams,
-      routeHooks: FIXME_constructRouteHookPath(route.routeHooks),
+      routeHooks: route.routeHooks ? getRouteHookDistPath(route.routeHooks) : null,
       redirect: route.redirect ? {
         to: route.redirect?.to,
         permanent: false
@@ -42,17 +43,6 @@ async function buildRouteManifest() {
   await fs.mkdir(rwPaths.web.distSsr, { recursive: true });
   return fs.writeFile(webRouteManifest, JSON.stringify(routeManifest, null, 2));
 }
-const FIXME_constructRouteHookPath = (routeHookSrcPath) => {
-  const rwPaths = getPaths();
-  if (!routeHookSrcPath) {
-    return null;
-  }
-  if (getAppRouteHook()) {
-    return path.relative(rwPaths.web.src, routeHookSrcPath).replace(".ts", ".js");
-  } else {
-    return path.relative(path.join(rwPaths.web.src, "pages"), routeHookSrcPath).replace(".ts", ".js");
-  }
-};
 export {
   buildRouteManifest
 };