@cedarjs/vite 5.0.0-canary.2363 → 5.0.0-canary.2374

package/dist/buildUDApiServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildUDApiServer.d.ts","sourceRoot":"","sources":["../src/buildUDApiServer.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,OAAe,EACf,WAAW,GACZ,GAAE,uBAA4B,iBAkG9B"}
+{"version":3,"file":"buildUDApiServer.d.ts","sourceRoot":"","sources":["../src/buildUDApiServer.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,OAAe,EACf,WAAW,GACZ,GAAE,uBAA4B,iBA2F9B"}

package/dist/buildUDApiServer.js

@@ -18,13 +18,6 @@ async function buildUDApiServer({
       // Load the user's Vite config so all plugins (Cedar's UD plugin,
       // provider plugins, etc.) run during the build.
       configFile: cedarPaths.web.viteConfig,
-      // Cedar's getMergedConfig (from the cedar() plugin) overrides root to
-      // web/src/. For the UD server build, we want root to be the config
-      // file directory (web/) so that plugins like @netlify/vite-plugin
-      // output their files relative to the project structure, not a source
-      // directory.
-      // TODO: See what it'd take to *not* have cedar() set it to web/src
-      root: cedarPaths.web.base,
       logLevel: verbose ? "info" : "warn",
       plugins: [
         // catchAll() generates the rou3-based route dispatcher

package/dist/cjs/buildUDApiServer.js

@@ -51,13 +51,6 @@ async function buildUDApiServer({
       // Load the user's Vite config so all plugins (Cedar's UD plugin,
       // provider plugins, etc.) run during the build.
       configFile: cedarPaths.web.viteConfig,
-      // Cedar's getMergedConfig (from the cedar() plugin) overrides root to
-      // web/src/. For the UD server build, we want root to be the config
-      // file directory (web/) so that plugins like @netlify/vite-plugin
-      // output their files relative to the project structure, not a source
-      // directory.
-      // TODO: See what it'd take to *not* have cedar() set it to web/src
-      root: cedarPaths.web.base,
       logLevel: verbose ? "info" : "warn",
       plugins: [
         // catchAll() generates the rou3-based route dispatcher

package/dist/cjs/lib/getMergedConfig.js

@@ -50,7 +50,7 @@ function getMergedConfig(cedarConfig, cedarPaths) {
       apiPort = cedarConfig.api.port;
     }
     const defaultCedarViteConfig = {
-      root: cedarPaths.web.src,
+      root: cedarPaths.web.base,
       resolve: {
         alias: workspaceAliases
       },
@@ -104,7 +104,7 @@ function getMergedConfig(cedarConfig, cedarPaths) {
         // Note that sourcemap can be boolean or 'inline'
         sourcemap: !env.isSsrBuild && cedarConfig.web.sourceMap,
         rollupOptions: {
-          input: getRollupInput(!!env.isSsrBuild)
+          input: getRollupInput(userConfig, !!env.isSsrBuild)
         }
       },
       // @MARK: do not set buildSsrCjsExternalHeuristics here
@@ -137,9 +137,12 @@ function getMergedConfig(cedarConfig, cedarPaths) {
     return (0, import_vite.mergeConfig)(defaultCedarViteConfig, userConfig);
   };
 }
-function getRollupInput(ssr) {
+function getRollupInput(userConfig, ssr) {
   const cedarConfig = (0, import_project_config.getConfig)();
   const cedarPaths = (0, import_project_config.getPaths)();
+  if (userConfig.build?.rollupOptions?.input) {
+    return userConfig.build.rollupOptions.input;
+  }
   if (!cedarPaths.web.entryClient) {
     throw new Error("entryClient not defined");
   }

package/dist/cjs/plugins/vite-plugin-cedar-entry-injection.js

@@ -36,21 +36,36 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_vite = require("vite");
 var import_project_config = require("@cedarjs/project-config");
 function cedarEntryInjectionPlugin() {
-  const rwPaths = (0, import_project_config.getPaths)();
-  const clientEntryPath = rwPaths.web.entryClient;
+  const cedarPaths = (0, import_project_config.getPaths)();
+  const clientEntryPath = cedarPaths.web.entryClient;
   if (!clientEntryPath) {
     throw new Error(
       "Vite client entry point not found. Please check that your project has an entry.client.{jsx,tsx} file in the web/src directory."
     );
   }
-  const relativeEntryPath = import_node_path.default.relative(rwPaths.web.src, clientEntryPath);
+  const relativeEntryPath = (0, import_vite.normalizePath)(
+    import_node_path.default.relative(cedarPaths.web.base, clientEntryPath)
+  );
   return {
     name: "cedar-entry-injection",
+    // Vite's dependency optimizer and dev server resolve the script tag
+    // src="/src/entry.client.{tsx,jsx}" as an absolute filesystem path
+    // (/src/entry.client.tsx) instead of relative to the Vite root.
+    // This hook maps it to the real file path so Vite can find it.
+    resolveId(id) {
+      if (id === "/" + relativeEntryPath) {
+        return clientEntryPath;
+      }
+      return null;
+    },
     // ---------- Bundle injection ----------
     // Used by Vite during dev, to inject the entrypoint.
     transformIndexHtml: {
       order: "pre",
-      handler: (html) => {
+      handler: (html, ctx) => {
+        if (!ctx.filename || (0, import_vite.normalizePath)(ctx.filename) !== (0, import_vite.normalizePath)(cedarPaths.web.html)) {
+          return html;
+        }
         if (import_node_fs.default.existsSync(clientEntryPath)) {
           return html.replace(
             "</head>",
@@ -67,7 +82,7 @@ function cedarEntryInjectionPlugin() {
     // Used by rollup during build to inject the entrypoint
     // but note index.html does not come through as an id during dev
     transform: (code, id) => {
-      if (import_node_fs.default.existsSync(clientEntryPath) && (0, import_vite.normalizePath)(id) === (0, import_vite.normalizePath)(rwPaths.web.html)) {
+      if (import_node_fs.default.existsSync(clientEntryPath) && (0, import_vite.normalizePath)(id) === (0, import_vite.normalizePath)(cedarPaths.web.html)) {
         return {
           code: code.replace(
             "</head>",

package/dist/cjs/runFeServer.js

@@ -74,7 +74,7 @@ async function runFeServer() {
     import_node_path.default.join(rwPaths.web.distBrowser, "client-build-manifest.json")
   ).href;
   const clientBuildManifest = (await import(clientBuildManifestUrl, { with: { type: "json" } })).default;
-  const clientEntry = rscEnabled ? clientBuildManifest["entry.client.tsx"] || clientBuildManifest["entry.client.jsx"] : Object.values(clientBuildManifest).find(
+  const clientEntry = rscEnabled ? clientBuildManifest["src/entry.client.tsx"] || clientBuildManifest["src/entry.client.jsx"] : Object.values(clientBuildManifest).find(
     (manifestItem) => manifestItem.isEntry
   );
   if (!clientEntry) {

package/dist/lib/getMergedConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMergedConfig.d.ts","sourceRoot":"","sources":["../../src/lib/getMergedConfig.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAS5D;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,IAC5D,YAAY,cAAc,EAAE,KAAK,SAAS,KAAG,cAAc,CAqHpE"}
+{"version":3,"file":"getMergedConfig.d.ts","sourceRoot":"","sources":["../../src/lib/getMergedConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAS5D;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,IAC5D,YAAY,cAAc,EAAE,KAAK,SAAS,KAAG,cAAc,CAqHpE"}

package/dist/lib/getMergedConfig.js

@@ -21,7 +21,7 @@ function getMergedConfig(cedarConfig, cedarPaths) {
       apiPort = cedarConfig.api.port;
     }
     const defaultCedarViteConfig = {
-      root: cedarPaths.web.src,
+      root: cedarPaths.web.base,
       resolve: {
         alias: workspaceAliases
       },
@@ -75,7 +75,7 @@ function getMergedConfig(cedarConfig, cedarPaths) {
         // Note that sourcemap can be boolean or 'inline'
         sourcemap: !env.isSsrBuild && cedarConfig.web.sourceMap,
         rollupOptions: {
-          input: getRollupInput(!!env.isSsrBuild)
+          input: getRollupInput(userConfig, !!env.isSsrBuild)
         }
       },
       // @MARK: do not set buildSsrCjsExternalHeuristics here
@@ -108,9 +108,12 @@ function getMergedConfig(cedarConfig, cedarPaths) {
     return mergeConfig(defaultCedarViteConfig, userConfig);
   };
 }
-function getRollupInput(ssr) {
+function getRollupInput(userConfig, ssr) {
   const cedarConfig = getConfig();
   const cedarPaths = getPaths();
+  if (userConfig.build?.rollupOptions?.input) {
+    return userConfig.build.rollupOptions.input;
+  }
   if (!cedarPaths.web.entryClient) {
     throw new Error("entryClient not defined");
   }

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

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-entry-injection.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-entry-injection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC,wBAAgB,yBAAyB,IAAI,MAAM,CA6DlD"}
+{"version":3,"file":"vite-plugin-cedar-entry-injection.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-entry-injection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC,wBAAgB,yBAAyB,IAAI,MAAM,CAqFlD"}

package/dist/plugins/vite-plugin-cedar-entry-injection.js

@@ -3,21 +3,36 @@ import path from "node:path";
 import { normalizePath } from "vite";
 import { getPaths } from "@cedarjs/project-config";
 function cedarEntryInjectionPlugin() {
-  const rwPaths = getPaths();
-  const clientEntryPath = rwPaths.web.entryClient;
+  const cedarPaths = getPaths();
+  const clientEntryPath = cedarPaths.web.entryClient;
   if (!clientEntryPath) {
     throw new Error(
       "Vite client entry point not found. Please check that your project has an entry.client.{jsx,tsx} file in the web/src directory."
     );
   }
-  const relativeEntryPath = path.relative(rwPaths.web.src, clientEntryPath);
+  const relativeEntryPath = normalizePath(
+    path.relative(cedarPaths.web.base, clientEntryPath)
+  );
   return {
     name: "cedar-entry-injection",
+    // Vite's dependency optimizer and dev server resolve the script tag
+    // src="/src/entry.client.{tsx,jsx}" as an absolute filesystem path
+    // (/src/entry.client.tsx) instead of relative to the Vite root.
+    // This hook maps it to the real file path so Vite can find it.
+    resolveId(id) {
+      if (id === "/" + relativeEntryPath) {
+        return clientEntryPath;
+      }
+      return null;
+    },
     // ---------- Bundle injection ----------
     // Used by Vite during dev, to inject the entrypoint.
     transformIndexHtml: {
       order: "pre",
-      handler: (html) => {
+      handler: (html, ctx) => {
+        if (!ctx.filename || normalizePath(ctx.filename) !== normalizePath(cedarPaths.web.html)) {
+          return html;
+        }
         if (fs.existsSync(clientEntryPath)) {
           return html.replace(
             "</head>",
@@ -34,7 +49,7 @@ function cedarEntryInjectionPlugin() {
     // Used by rollup during build to inject the entrypoint
     // but note index.html does not come through as an id during dev
     transform: (code, id) => {
-      if (fs.existsSync(clientEntryPath) && normalizePath(id) === normalizePath(rwPaths.web.html)) {
+      if (fs.existsSync(clientEntryPath) && normalizePath(id) === normalizePath(cedarPaths.web.html)) {
         return {
           code: code.replace(
             "</head>",

package/dist/runFeServer.js

@@ -41,7 +41,7 @@ async function runFeServer() {
     path.join(rwPaths.web.distBrowser, "client-build-manifest.json")
   ).href;
   const clientBuildManifest = (await import(clientBuildManifestUrl, { with: { type: "json" } })).default;
-  const clientEntry = rscEnabled ? clientBuildManifest["entry.client.tsx"] || clientBuildManifest["entry.client.jsx"] : Object.values(clientBuildManifest).find(
+  const clientEntry = rscEnabled ? clientBuildManifest["src/entry.client.tsx"] || clientBuildManifest["src/entry.client.jsx"] : Object.values(clientBuildManifest).find(
     (manifestItem) => manifestItem.isEntry
   );
   if (!clientEntry) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "5.0.0-canary.2363",
+  "version": "5.0.0-canary.2374",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -99,18 +99,18 @@
     "@babel/generator": "7.29.1",
     "@babel/parser": "7.29.3",
     "@babel/traverse": "7.29.0",
-    "@cedarjs/api": "5.0.0-canary.2363",
-    "@cedarjs/api-server": "5.0.0-canary.2363",
-    "@cedarjs/auth": "5.0.0-canary.2363",
-    "@cedarjs/babel-config": "5.0.0-canary.2363",
-    "@cedarjs/context": "5.0.0-canary.2363",
-    "@cedarjs/cookie-jar": "5.0.0-canary.2363",
-    "@cedarjs/graphql-server": "5.0.0-canary.2363",
-    "@cedarjs/internal": "5.0.0-canary.2363",
-    "@cedarjs/project-config": "5.0.0-canary.2363",
-    "@cedarjs/server-store": "5.0.0-canary.2363",
-    "@cedarjs/testing": "5.0.0-canary.2363",
-    "@cedarjs/web": "5.0.0-canary.2363",
+    "@cedarjs/api": "5.0.0-canary.2374",
+    "@cedarjs/api-server": "5.0.0-canary.2374",
+    "@cedarjs/auth": "5.0.0-canary.2374",
+    "@cedarjs/babel-config": "5.0.0-canary.2374",
+    "@cedarjs/context": "5.0.0-canary.2374",
+    "@cedarjs/cookie-jar": "5.0.0-canary.2374",
+    "@cedarjs/graphql-server": "5.0.0-canary.2374",
+    "@cedarjs/internal": "5.0.0-canary.2374",
+    "@cedarjs/project-config": "5.0.0-canary.2374",
+    "@cedarjs/server-store": "5.0.0-canary.2374",
+    "@cedarjs/testing": "5.0.0-canary.2374",
+    "@cedarjs/web": "5.0.0-canary.2374",
     "@fastify/url-data": "6.0.3",
     "@swc/core": "1.15.33",
     "@universal-deploy/store": "^0.2.1",