@cedarjs/vite 2.4.1 → 2.4.2-next.143

package/dist/cjs/index.js

@@ -51,6 +51,7 @@ var import_vite_plugin_cedar_entry_injection = require("./plugins/vite-plugin-ce
 var import_vite_plugin_cedar_html_env = require("./plugins/vite-plugin-cedar-html-env.js");
 var import_vite_plugin_cedar_node_polyfills = require("./plugins/vite-plugin-cedar-node-polyfills.js");
 var import_vite_plugin_cedar_remove_from_bundle = require("./plugins/vite-plugin-cedar-remove-from-bundle.js");
+var import_vite_plugin_cedar_wait_for_api_server = require("./plugins/vite-plugin-cedar-wait-for-api-server.js");
 var import_vite_plugin_jsx_loader = require("./plugins/vite-plugin-jsx-loader.js");
 var import_vite_plugin_merged_config = require("./plugins/vite-plugin-merged-config.js");
 var import_vite_plugin_swap_apollo_provider = require("./plugins/vite-plugin-swap-apollo-provider.js");
@@ -65,8 +66,8 @@ var import_vite_plugin_jsx_loader2 = require("./plugins/vite-plugin-jsx-loader.j
 var import_vite_plugin_merged_config2 = require("./plugins/vite-plugin-merged-config.js");
 var import_vite_plugin_swap_apollo_provider2 = require("./plugins/vite-plugin-swap-apollo-provider.js");
 function cedar({ mode } = {}) {
-  const rwConfig = (0, import_project_config.getConfig)();
-  const rscEnabled = rwConfig.experimental?.rsc?.enabled;
+  const cedarConfig = (0, import_project_config.getConfig)();
+  const rscEnabled = cedarConfig.experimental?.rsc?.enabled;
   const webSideDefaultBabelConfig = (0, import_babel_config.getWebSideDefaultBabelConfig)();
   const babelConfig = {
     ...webSideDefaultBabelConfig,
@@ -82,6 +83,7 @@ function cedar({ mode } = {}) {
     mode === "test" && (0, import_vitest.cedarJsRouterImportTransformPlugin)(),
     mode === "test" && (0, import_vitest.createAuthImportTransformPlugin)(),
     mode === "test" && (0, import_vitest.autoImportsPlugin)(),
+    (0, import_vite_plugin_cedar_wait_for_api_server.cedarWaitForApiServer)(),
     (0, import_vite_plugin_cedar_node_polyfills.cedarNodePolyfills)(),
     (0, import_vite_plugin_cedar_html_env.cedarHtmlEnvPlugin)(),
     (0, import_vite_plugin_cedar_entry_injection.cedarEntryInjectionPlugin)(),

package/dist/cjs/lib/getMergedConfig.js

@@ -34,21 +34,21 @@ module.exports = __toCommonJS(getMergedConfig_exports);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_vite = require("vite");
 var import_project_config = require("@cedarjs/project-config");
-function getMergedConfig(rwConfig, rwPaths) {
+function getMergedConfig(cedarConfig, cedarPaths) {
   return (userConfig, env) => {
     let apiHost = process.env.REDWOOD_API_HOST;
-    apiHost ??= rwConfig.api.host;
+    apiHost ??= cedarConfig.api.host;
     apiHost ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "[::]";
-    const streamingSsrEnabled = rwConfig.experimental.streamingSsr?.enabled;
-    const rscEnabled = rwConfig.experimental.rsc?.enabled;
+    const streamingSsrEnabled = cedarConfig.experimental.streamingSsr?.enabled;
+    const rscEnabled = cedarConfig.experimental.rsc?.enabled;
     let apiPort;
     if (process.env.REDWOOD_API_PORT) {
       apiPort = parseInt(process.env.REDWOOD_API_PORT);
     } else {
-      apiPort = rwConfig.api.port;
+      apiPort = cedarConfig.api.port;
     }
-    const defaultRwViteConfig = {
-      root: rwPaths.web.src,
+    const defaultCedarViteConfig = {
+      root: cedarPaths.web.src,
       // @MARK: when we have these aliases, the warnings from the FE server go
       // away BUT, if you have imports like this:
       // ```
@@ -62,56 +62,29 @@ function getMergedConfig(rwConfig, rwPaths) {
       //   alias: [
       //     {
       //       find: 'src',
-      //       replacement: rwPaths.web.src,
+      //       replacement: cedarPaths.web.src,
       //     },
       //   ],
       // },
       envPrefix: "REDWOOD_ENV_",
-      publicDir: import_node_path.default.join(rwPaths.web.base, "public"),
+      publicDir: import_node_path.default.join(cedarPaths.web.base, "public"),
       define: (0, import_project_config.getEnvVarDefinitions)(),
       css: {
         // @NOTE config path is relative to where vite.config.js is if you use
         // a relative path
-        postcss: rwPaths.web.config
+        postcss: cedarPaths.web.config
       },
       server: {
-        open: rwConfig.browser.open,
-        port: rwConfig.web.port,
+        open: cedarConfig.browser.open,
+        port: cedarConfig.web.port,
         host: true,
         // Listen to all hosts
         proxy: {
-          [rwConfig.web.apiUrl]: {
+          [cedarConfig.web.apiUrl]: {
             target: `http://${apiHost}:${apiPort}`,
             changeOrigin: false,
-            // Remove the `.redwood/functions` part, but leave the `/graphql`
-            rewrite: (path2) => path2.replace(rwConfig.web.apiUrl, ""),
-            configure: (proxy) => {
-              let waitingForApiServer = true;
-              setTimeout(() => {
-                waitingForApiServer = false;
-              }, 2500);
-              proxy.on("error", (err, req, res) => {
-                const isWaiting = waitingForApiServer && err.message.includes("ECONNREFUSED");
-                if (!isWaiting) {
-                  console.error(err);
-                }
-                const isAuthTokenRequest = isWaiting && req.url === "/auth?method=getToken";
-                const waitingMessage = "\u231B API Server launching, please refresh your page...";
-                const genericMessage = "The Cedar API server is not available or is currently reloading. Please refresh.";
-                const responseBody = {
-                  errors: [
-                    { message: isWaiting ? waitingMessage : genericMessage }
-                  ]
-                };
-                res.writeHead(203, {
-                  "Content-Type": "application/json",
-                  "Cache-Control": "no-cache"
-                });
-                if (!isAuthTokenRequest) {
-                  res.write(JSON.stringify(responseBody));
-                }
-                res.end();
-              });
+            rewrite: (path2) => {
+              return path2.replace(cedarConfig.web.apiUrl, "");
             }
           }
         }
@@ -120,11 +93,11 @@ function getMergedConfig(rwConfig, rwPaths) {
         // TODO (RSC): Remove `minify: false` when we don't need to debug as often
         minify: false,
         // NOTE this gets overridden when build gets called anyway!
-        outDir: streamingSsrEnabled || rscEnabled ? rwPaths.web.distBrowser : rwPaths.web.dist,
+        outDir: streamingSsrEnabled || rscEnabled ? cedarPaths.web.distBrowser : cedarPaths.web.dist,
         emptyOutDir: true,
         manifest: !env.isSsrBuild ? "client-build-manifest.json" : void 0,
         // Note that sourcemap can be boolean or 'inline'
-        sourcemap: !env.isSsrBuild && rwConfig.web.sourceMap,
+        sourcemap: !env.isSsrBuild && cedarConfig.web.sourceMap,
         rollupOptions: {
           input: getRollupInput(!!env.isSsrBuild)
         }
@@ -133,7 +106,7 @@ function getMergedConfig(rwConfig, rwPaths) {
       // because rsc builds want false, client and server build wants true
       optimizeDeps: {
         esbuildOptions: {
-          // @MARK this is because JS projects in Redwood don't have .jsx
+          // @MARK this is because JS projects in Cedar don't have .jsx
           // extensions
           loader: {
             ".js": "jsx"
@@ -156,26 +129,26 @@ function getMergedConfig(rwConfig, rwPaths) {
         environment: "jsdom"
       }
     };
-    return (0, import_vite.mergeConfig)(defaultRwViteConfig, userConfig);
+    return (0, import_vite.mergeConfig)(defaultCedarViteConfig, userConfig);
   };
 }
 function getRollupInput(ssr) {
-  const rwConfig = (0, import_project_config.getConfig)();
-  const rwPaths = (0, import_project_config.getPaths)();
-  if (!rwPaths.web.entryClient) {
+  const cedarConfig = (0, import_project_config.getConfig)();
+  const cedarPaths = (0, import_project_config.getPaths)();
+  if (!cedarPaths.web.entryClient) {
     throw new Error("entryClient not defined");
   }
-  const streamingEnabled = rwConfig.experimental?.streamingSsr?.enabled;
-  const rscEnabled = rwConfig.experimental?.rsc?.enabled;
+  const streamingEnabled = cedarConfig.experimental?.streamingSsr?.enabled;
+  const rscEnabled = cedarConfig.experimental?.rsc?.enabled;
   if (streamingEnabled) {
     if (ssr) {
-      if (!rwPaths.web.entryServer) {
+      if (!cedarPaths.web.entryServer) {
         throw new Error("entryServer not defined");
       }
       if (rscEnabled) {
         return {
-          Document: rwPaths.web.document,
-          "entry.server": rwPaths.web.entryServer
+          Document: cedarPaths.web.document,
+          "entry.server": cedarPaths.web.entryServer
         };
       }
       return {
@@ -184,14 +157,14 @@ function getRollupInput(ssr) {
         // enabled, but not when RSC + SSR are both enabled
         // For RSC we have this configured in rscBuildForServer.ts to get a
         // build with the proper resolution conditions set.
-        "entry.server": rwPaths.web.entryServer,
+        "entry.server": cedarPaths.web.entryServer,
         // We need the document for React's fallback
-        Document: rwPaths.web.document
+        Document: cedarPaths.web.document
       };
     }
-    return rwPaths.web.entryClient;
+    return cedarPaths.web.entryClient;
   }
-  return rwPaths.web.html;
+  return cedarPaths.web.html;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/plugins/vite-plugin-cedar-wait-for-api-server.js

@@ -0,0 +1,133 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var vite_plugin_cedar_wait_for_api_server_exports = {};
+__export(vite_plugin_cedar_wait_for_api_server_exports, {
+  cedarWaitForApiServer: () => cedarWaitForApiServer
+});
+module.exports = __toCommonJS(vite_plugin_cedar_wait_for_api_server_exports);
+var import_node_net = __toESM(require("node:net"), 1);
+var import_project_config = require("@cedarjs/project-config");
+let waitingPromise = null;
+let serverHasBeenUp = false;
+function cedarWaitForApiServer() {
+  const cedarConfig = (0, import_project_config.getConfig)();
+  const apiPort = cedarConfig.api.port;
+  const apiHost = cedarConfig.api.host || "localhost";
+  return {
+    name: "cedar-wait-for-api-server",
+    apply: "serve",
+    configureServer(server) {
+      server.middlewares.use(async (req, res, next) => {
+        const url = req.originalUrl;
+        const apiUrl = cedarConfig.web.apiUrl.replace(/\/$/, "");
+        const apiGqlUrl = cedarConfig.web.apiGraphQLUrl ?? apiUrl + "/graphql";
+        const isApiRequest = url && (url.startsWith(apiUrl) || // Only match on .../graphql not on .../graphql-foo. That's why I
+        // don't use startsWith here
+        url === apiGqlUrl || // The two checks below are for when we support GraphQL-over-HTTP
+        url.startsWith(apiGqlUrl + "/") || url.startsWith(apiGqlUrl + "?"));
+        if (!isApiRequest || serverHasBeenUp) {
+          return next();
+        }
+        try {
+          if (!waitingPromise) {
+            waitingPromise = waitForPort(apiPort, apiHost).finally(() => {
+              waitingPromise = null;
+            });
+          }
+          await waitingPromise;
+          serverHasBeenUp = true;
+        } catch {
+          const message = `Vite timed out waiting for the Cedar API server at ${apiHost}:${apiPort}
+Please manually refresh the page when the server is ready`;
+          console.error(message);
+          const isAuthTokenRequest = url === apiUrl + "/auth?method=getToken";
+          const responseBody = {
+            errors: [{ message }]
+          };
+          req.resume();
+          const body = JSON.stringify(responseBody);
+          res.writeHead(203, {
+            "Content-Type": "application/json",
+            "Cache-Control": "no-cache",
+            ...!isAuthTokenRequest && {
+              "Content-Length": Buffer.byteLength(body)
+            },
+            Connection: "close"
+          });
+          return isAuthTokenRequest ? res.end() : res.end(body);
+        }
+        next();
+      });
+    }
+  };
+}
+const ONE_MINUTE_IN_MS = 6e4;
+async function waitForPort(port, host) {
+  const start = Date.now();
+  let lastLogTime = Date.now();
+  while (Date.now() - start < ONE_MINUTE_IN_MS) {
+    const isOpen = await checkPort(port, host);
+    if (isOpen) {
+      if (lastLogTime - start >= 6e3) {
+        console.log("\u2705 API server is ready");
+      }
+      return;
+    }
+    const now = Date.now();
+    if (now - lastLogTime >= 6e3) {
+      console.log("\u23F3 Waiting for API server...");
+      lastLogTime = now;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  }
+  throw new Error("Timeout waiting for port");
+}
+function checkPort(port, host) {
+  return new Promise((resolve) => {
+    const socket = new import_node_net.default.Socket();
+    socket.setTimeout(200);
+    socket.on("connect", () => {
+      socket.destroy();
+      resolve(true);
+    });
+    socket.on("timeout", () => {
+      socket.destroy();
+      resolve(false);
+    });
+    socket.on("error", () => {
+      socket.destroy();
+      resolve(false);
+    });
+    socket.connect(port, host);
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cedarWaitForApiServer
+});

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,MAAM,CAAA;AAmBxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAA;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,iCAAiC,EAAE,MAAM,yDAAyD,CAAA;AAC3G,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AAEvF,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAqClE;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,MAAM,CAAA;AAoBxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAA;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,iCAAiC,EAAE,MAAM,yDAAyD,CAAA;AAC3G,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AAEvF,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAsClE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}

package/dist/index.js

@@ -11,6 +11,7 @@ import { cedarEntryInjectionPlugin } from "./plugins/vite-plugin-cedar-entry-inj
 import { cedarHtmlEnvPlugin } from "./plugins/vite-plugin-cedar-html-env.js";
 import { cedarNodePolyfills } from "./plugins/vite-plugin-cedar-node-polyfills.js";
 import { cedarRemoveFromBundle } from "./plugins/vite-plugin-cedar-remove-from-bundle.js";
+import { cedarWaitForApiServer } from "./plugins/vite-plugin-cedar-wait-for-api-server.js";
 import { cedarTransformJsAsJsx } from "./plugins/vite-plugin-jsx-loader.js";
 import { cedarMergedConfig } from "./plugins/vite-plugin-merged-config.js";
 import { cedarSwapApolloProvider } from "./plugins/vite-plugin-swap-apollo-provider.js";
@@ -25,8 +26,8 @@ import { cedarTransformJsAsJsx as cedarTransformJsAsJsx2 } from "./plugins/vite-
 import { cedarMergedConfig as cedarMergedConfig2 } from "./plugins/vite-plugin-merged-config.js";
 import { cedarSwapApolloProvider as cedarSwapApolloProvider2 } from "./plugins/vite-plugin-swap-apollo-provider.js";
 function cedar({ mode } = {}) {
-  const rwConfig = getConfig();
-  const rscEnabled = rwConfig.experimental?.rsc?.enabled;
+  const cedarConfig = getConfig();
+  const rscEnabled = cedarConfig.experimental?.rsc?.enabled;
   const webSideDefaultBabelConfig = getWebSideDefaultBabelConfig();
   const babelConfig = {
     ...webSideDefaultBabelConfig,
@@ -42,6 +43,7 @@ function cedar({ mode } = {}) {
     mode === "test" && cedarJsRouterImportTransformPlugin(),
     mode === "test" && createAuthImportTransformPlugin(),
     mode === "test" && autoImportsPlugin(),
+    cedarWaitForApiServer(),
     cedarNodePolyfills(),
     cedarHtmlEnvPlugin(),
     cedarEntryInjectionPlugin(),

package/dist/lib/getMergedConfig.d.ts

@@ -1,11 +1,11 @@
 import type { ConfigEnv, ViteUserConfig } from 'vitest/config';
 import type { Config, Paths } from '@cedarjs/project-config';
 /**
- * This function will merge in the default Redwood Vite config passed into the
+ * This function will merge in the default Cedar Vite config passed into the
  * build function (or in Vite.config.xxx)
  *
  * Note that returning plugins in this function will have no effect on the
  * build
  */
-export declare function getMergedConfig(rwConfig: Config, rwPaths: Paths): (userConfig: ViteUserConfig, env: ConfigEnv) => ViteUserConfig;
+export declare function getMergedConfig(cedarConfig: Config, cedarPaths: Paths): (userConfig: ViteUserConfig, env: ConfigEnv) => ViteUserConfig;
 //# sourceMappingURL=getMergedConfig.d.ts.map

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;AAO5D;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,IACtD,YAAY,cAAc,EAAE,KAAK,SAAS,KAAG,cAAc,CA0JpE"}
+{"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;AAO5D;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,IAC5D,YAAY,cAAc,EAAE,KAAK,SAAS,KAAG,cAAc,CAwGpE"}

package/dist/lib/getMergedConfig.js

@@ -5,21 +5,21 @@ import {
   getEnvVarDefinitions,
   getPaths
 } from "@cedarjs/project-config";
-function getMergedConfig(rwConfig, rwPaths) {
+function getMergedConfig(cedarConfig, cedarPaths) {
   return (userConfig, env) => {
     let apiHost = process.env.REDWOOD_API_HOST;
-    apiHost ??= rwConfig.api.host;
+    apiHost ??= cedarConfig.api.host;
     apiHost ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "[::]";
-    const streamingSsrEnabled = rwConfig.experimental.streamingSsr?.enabled;
-    const rscEnabled = rwConfig.experimental.rsc?.enabled;
+    const streamingSsrEnabled = cedarConfig.experimental.streamingSsr?.enabled;
+    const rscEnabled = cedarConfig.experimental.rsc?.enabled;
     let apiPort;
     if (process.env.REDWOOD_API_PORT) {
       apiPort = parseInt(process.env.REDWOOD_API_PORT);
     } else {
-      apiPort = rwConfig.api.port;
+      apiPort = cedarConfig.api.port;
     }
-    const defaultRwViteConfig = {
-      root: rwPaths.web.src,
+    const defaultCedarViteConfig = {
+      root: cedarPaths.web.src,
       // @MARK: when we have these aliases, the warnings from the FE server go
       // away BUT, if you have imports like this:
       // ```
@@ -33,56 +33,29 @@ function getMergedConfig(rwConfig, rwPaths) {
       //   alias: [
       //     {
       //       find: 'src',
-      //       replacement: rwPaths.web.src,
+      //       replacement: cedarPaths.web.src,
       //     },
       //   ],
       // },
       envPrefix: "REDWOOD_ENV_",
-      publicDir: path.join(rwPaths.web.base, "public"),
+      publicDir: path.join(cedarPaths.web.base, "public"),
       define: getEnvVarDefinitions(),
       css: {
         // @NOTE config path is relative to where vite.config.js is if you use
         // a relative path
-        postcss: rwPaths.web.config
+        postcss: cedarPaths.web.config
       },
       server: {
-        open: rwConfig.browser.open,
-        port: rwConfig.web.port,
+        open: cedarConfig.browser.open,
+        port: cedarConfig.web.port,
         host: true,
         // Listen to all hosts
         proxy: {
-          [rwConfig.web.apiUrl]: {
+          [cedarConfig.web.apiUrl]: {
             target: `http://${apiHost}:${apiPort}`,
             changeOrigin: false,
-            // Remove the `.redwood/functions` part, but leave the `/graphql`
-            rewrite: (path2) => path2.replace(rwConfig.web.apiUrl, ""),
-            configure: (proxy) => {
-              let waitingForApiServer = true;
-              setTimeout(() => {
-                waitingForApiServer = false;
-              }, 2500);
-              proxy.on("error", (err, req, res) => {
-                const isWaiting = waitingForApiServer && err.message.includes("ECONNREFUSED");
-                if (!isWaiting) {
-                  console.error(err);
-                }
-                const isAuthTokenRequest = isWaiting && req.url === "/auth?method=getToken";
-                const waitingMessage = "\u231B API Server launching, please refresh your page...";
-                const genericMessage = "The Cedar API server is not available or is currently reloading. Please refresh.";
-                const responseBody = {
-                  errors: [
-                    { message: isWaiting ? waitingMessage : genericMessage }
-                  ]
-                };
-                res.writeHead(203, {
-                  "Content-Type": "application/json",
-                  "Cache-Control": "no-cache"
-                });
-                if (!isAuthTokenRequest) {
-                  res.write(JSON.stringify(responseBody));
-                }
-                res.end();
-              });
+            rewrite: (path2) => {
+              return path2.replace(cedarConfig.web.apiUrl, "");
             }
           }
         }
@@ -91,11 +64,11 @@ function getMergedConfig(rwConfig, rwPaths) {
         // TODO (RSC): Remove `minify: false` when we don't need to debug as often
         minify: false,
         // NOTE this gets overridden when build gets called anyway!
-        outDir: streamingSsrEnabled || rscEnabled ? rwPaths.web.distBrowser : rwPaths.web.dist,
+        outDir: streamingSsrEnabled || rscEnabled ? cedarPaths.web.distBrowser : cedarPaths.web.dist,
         emptyOutDir: true,
         manifest: !env.isSsrBuild ? "client-build-manifest.json" : void 0,
         // Note that sourcemap can be boolean or 'inline'
-        sourcemap: !env.isSsrBuild && rwConfig.web.sourceMap,
+        sourcemap: !env.isSsrBuild && cedarConfig.web.sourceMap,
         rollupOptions: {
           input: getRollupInput(!!env.isSsrBuild)
         }
@@ -104,7 +77,7 @@ function getMergedConfig(rwConfig, rwPaths) {
       // because rsc builds want false, client and server build wants true
       optimizeDeps: {
         esbuildOptions: {
-          // @MARK this is because JS projects in Redwood don't have .jsx
+          // @MARK this is because JS projects in Cedar don't have .jsx
           // extensions
           loader: {
             ".js": "jsx"
@@ -127,26 +100,26 @@ function getMergedConfig(rwConfig, rwPaths) {
         environment: "jsdom"
       }
     };
-    return mergeConfig(defaultRwViteConfig, userConfig);
+    return mergeConfig(defaultCedarViteConfig, userConfig);
   };
 }
 function getRollupInput(ssr) {
-  const rwConfig = getConfig();
-  const rwPaths = getPaths();
-  if (!rwPaths.web.entryClient) {
+  const cedarConfig = getConfig();
+  const cedarPaths = getPaths();
+  if (!cedarPaths.web.entryClient) {
     throw new Error("entryClient not defined");
   }
-  const streamingEnabled = rwConfig.experimental?.streamingSsr?.enabled;
-  const rscEnabled = rwConfig.experimental?.rsc?.enabled;
+  const streamingEnabled = cedarConfig.experimental?.streamingSsr?.enabled;
+  const rscEnabled = cedarConfig.experimental?.rsc?.enabled;
   if (streamingEnabled) {
     if (ssr) {
-      if (!rwPaths.web.entryServer) {
+      if (!cedarPaths.web.entryServer) {
         throw new Error("entryServer not defined");
       }
       if (rscEnabled) {
         return {
-          Document: rwPaths.web.document,
-          "entry.server": rwPaths.web.entryServer
+          Document: cedarPaths.web.document,
+          "entry.server": cedarPaths.web.entryServer
         };
       }
       return {
@@ -155,14 +128,14 @@ function getRollupInput(ssr) {
         // enabled, but not when RSC + SSR are both enabled
         // For RSC we have this configured in rscBuildForServer.ts to get a
         // build with the proper resolution conditions set.
-        "entry.server": rwPaths.web.entryServer,
+        "entry.server": cedarPaths.web.entryServer,
         // We need the document for React's fallback
-        Document: rwPaths.web.document
+        Document: cedarPaths.web.document
       };
     }
-    return rwPaths.web.entryClient;
+    return cedarPaths.web.entryClient;
   }
-  return rwPaths.web.html;
+  return cedarPaths.web.html;
 }
 export {
   getMergedConfig

package/dist/plugins/vite-plugin-cedar-wait-for-api-server.d.ts

@@ -0,0 +1,3 @@
+import type { PluginOption } from 'vite';
+export declare function cedarWaitForApiServer(): PluginOption;
+//# sourceMappingURL=vite-plugin-cedar-wait-for-api-server.d.ts.map

package/dist/plugins/vite-plugin-cedar-wait-for-api-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedar-wait-for-api-server.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-wait-for-api-server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAiB,MAAM,MAAM,CAAA;AAOvD,wBAAgB,qBAAqB,IAAI,YAAY,CA8FpD"}

package/dist/plugins/vite-plugin-cedar-wait-for-api-server.js

@@ -0,0 +1,99 @@
+import net from "node:net";
+import { getConfig } from "@cedarjs/project-config";
+let waitingPromise = null;
+let serverHasBeenUp = false;
+function cedarWaitForApiServer() {
+  const cedarConfig = getConfig();
+  const apiPort = cedarConfig.api.port;
+  const apiHost = cedarConfig.api.host || "localhost";
+  return {
+    name: "cedar-wait-for-api-server",
+    apply: "serve",
+    configureServer(server) {
+      server.middlewares.use(async (req, res, next) => {
+        const url = req.originalUrl;
+        const apiUrl = cedarConfig.web.apiUrl.replace(/\/$/, "");
+        const apiGqlUrl = cedarConfig.web.apiGraphQLUrl ?? apiUrl + "/graphql";
+        const isApiRequest = url && (url.startsWith(apiUrl) || // Only match on .../graphql not on .../graphql-foo. That's why I
+        // don't use startsWith here
+        url === apiGqlUrl || // The two checks below are for when we support GraphQL-over-HTTP
+        url.startsWith(apiGqlUrl + "/") || url.startsWith(apiGqlUrl + "?"));
+        if (!isApiRequest || serverHasBeenUp) {
+          return next();
+        }
+        try {
+          if (!waitingPromise) {
+            waitingPromise = waitForPort(apiPort, apiHost).finally(() => {
+              waitingPromise = null;
+            });
+          }
+          await waitingPromise;
+          serverHasBeenUp = true;
+        } catch {
+          const message = `Vite timed out waiting for the Cedar API server at ${apiHost}:${apiPort}
+Please manually refresh the page when the server is ready`;
+          console.error(message);
+          const isAuthTokenRequest = url === apiUrl + "/auth?method=getToken";
+          const responseBody = {
+            errors: [{ message }]
+          };
+          req.resume();
+          const body = JSON.stringify(responseBody);
+          res.writeHead(203, {
+            "Content-Type": "application/json",
+            "Cache-Control": "no-cache",
+            ...!isAuthTokenRequest && {
+              "Content-Length": Buffer.byteLength(body)
+            },
+            Connection: "close"
+          });
+          return isAuthTokenRequest ? res.end() : res.end(body);
+        }
+        next();
+      });
+    }
+  };
+}
+const ONE_MINUTE_IN_MS = 6e4;
+async function waitForPort(port, host) {
+  const start = Date.now();
+  let lastLogTime = Date.now();
+  while (Date.now() - start < ONE_MINUTE_IN_MS) {
+    const isOpen = await checkPort(port, host);
+    if (isOpen) {
+      if (lastLogTime - start >= 6e3) {
+        console.log("\u2705 API server is ready");
+      }
+      return;
+    }
+    const now = Date.now();
+    if (now - lastLogTime >= 6e3) {
+      console.log("\u23F3 Waiting for API server...");
+      lastLogTime = now;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  }
+  throw new Error("Timeout waiting for port");
+}
+function checkPort(port, host) {
+  return new Promise((resolve) => {
+    const socket = new net.Socket();
+    socket.setTimeout(200);
+    socket.on("connect", () => {
+      socket.destroy();
+      resolve(true);
+    });
+    socket.on("timeout", () => {
+      socket.destroy();
+      resolve(false);
+    });
+    socket.on("error", () => {
+      socket.destroy();
+      resolve(false);
+    });
+    socket.connect(port, host);
+  });
+}
+export {
+  cedarWaitForApiServer
+};

package/dist/runFeServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runFeServer.d.ts","sourceRoot":"","sources":["../src/runFeServer.ts"],"names":[],"mappings":"AAgDA,wBAAsB,WAAW,kBAsJhC"}
+{"version":3,"file":"runFeServer.d.ts","sourceRoot":"","sources":["../src/runFeServer.ts"],"names":[],"mappings":"AAgDA,wBAAsB,WAAW,kBAqJhC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "2.4.1",
+  "version": "2.4.2-next.143+b69a4494c",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -60,19 +60,19 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@ast-grep/napi": "0.40.4",
-    "@babel/generator": "7.28.5",
-    "@babel/parser": "7.28.5",
-    "@babel/traverse": "7.28.5",
-    "@cedarjs/auth": "2.4.1",
-    "@cedarjs/babel-config": "2.4.1",
-    "@cedarjs/cookie-jar": "2.4.1",
-    "@cedarjs/internal": "2.4.1",
-    "@cedarjs/project-config": "2.4.1",
-    "@cedarjs/server-store": "2.4.1",
-    "@cedarjs/testing": "2.4.1",
-    "@cedarjs/web": "2.4.1",
-    "@swc/core": "1.15.8",
+    "@ast-grep/napi": "0.40.5",
+    "@babel/generator": "7.28.6",
+    "@babel/parser": "7.28.6",
+    "@babel/traverse": "7.28.6",
+    "@cedarjs/auth": "2.4.2-next.143+b69a4494c",
+    "@cedarjs/babel-config": "2.4.2-next.143+b69a4494c",
+    "@cedarjs/cookie-jar": "2.4.2-next.143+b69a4494c",
+    "@cedarjs/internal": "2.4.2-next.143+b69a4494c",
+    "@cedarjs/project-config": "2.4.2-next.143+b69a4494c",
+    "@cedarjs/server-store": "2.4.2-next.143+b69a4494c",
+    "@cedarjs/testing": "2.4.2-next.143+b69a4494c",
+    "@cedarjs/web": "2.4.2-next.143+b69a4494c",
+    "@swc/core": "1.15.11",
     "@vitejs/plugin-react": "4.7.0",
     "@whatwg-node/fetch": "0.10.13",
     "@whatwg-node/server": "0.10.18",
@@ -80,19 +80,19 @@
     "buffer": "6.0.3",
     "busboy": "^1.6.0",
     "cookie": "1.1.1",
-    "core-js": "3.47.0",
+    "core-js": "3.48.0",
     "dotenv-defaults": "5.0.2",
     "execa": "5.1.1",
     "express": "4.22.1",
     "find-my-way": "8.2.2",
     "http-proxy-middleware": "3.0.5",
-    "isbot": "5.1.32",
+    "isbot": "5.1.34",
     "react": "18.3.1",
     "react-server-dom-webpack": "19.2.3",
     "rimraf": "6.1.2",
     "vite": "5.4.21",
     "vite-plugin-cjs-interop": "2.4.0",
-    "vite-plugin-node-polyfills": "0.24.0",
+    "vite-plugin-node-polyfills": "0.25.0",
     "ws": "8.19.0",
     "yargs-parser": "21.1.1"
   },
@@ -106,9 +106,9 @@
     "@types/yargs-parser": "21.0.3",
     "concurrently": "9.2.1",
     "glob": "11.1.0",
-    "memfs": "4.51.1",
-    "publint": "0.3.16",
-    "rollup": "4.55.1",
+    "memfs": "4.56.10",
+    "publint": "0.3.17",
+    "rollup": "4.57.1",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
     "vitest": "3.2.4"
@@ -116,5 +116,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d42ba2ec10b823aeb18587f04678bfec340d533a"
+  "gitHead": "b69a4494c40b0a4807f6b492ae65d0596f374e8a"
 }