@cedarjs/vite 5.0.7-next.186 → 5.0.7-next.219

package/dist/apiDevMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AA4E7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAoMlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAmGnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}
+{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AA4E7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAyMlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAmGnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}

package/dist/apiDevMiddleware.js

@@ -209,21 +209,21 @@ async function createApiViteServer() {
           if (!id.startsWith(normalizedBase)) {
             return null;
           }
-          try {
-            let sourceCode = code;
-            let sourceMap = null;
-            if (normalizePath(id).endsWith("/graphql.ts") || normalizePath(id).endsWith("/graphql.js")) {
-              const extracted = applyGraphqlOptionsExtract(sourceCode);
-              if (extracted) {
-                sourceCode = extracted.code;
-                sourceMap = extracted.map;
-              }
-              const injected = applyGqlormInject(sourceCode, id);
-              if (injected) {
-                sourceCode = injected;
-                sourceMap = null;
-              }
+          let sourceCode = code;
+          let sourceMap = null;
+          if (normalizePath(id).endsWith("/graphql.ts") || normalizePath(id).endsWith("/graphql.js")) {
+            const extracted = applyGraphqlOptionsExtract(sourceCode);
+            if (extracted) {
+              sourceCode = extracted.code;
+              sourceMap = extracted.map;
             }
+            const injected = applyGqlormInject(sourceCode, id);
+            if (injected) {
+              sourceCode = injected;
+              sourceMap = null;
+            }
+          }
+          try {
             if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
               const relativePath = normalizePath(id).slice(
                 normalizedBase.length + "/api/src/".length

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

@@ -1 +1 @@
-{"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,CAgIpE"}
+{"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;AAW5D;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,IAC5D,YAAY,cAAc,EAAE,KAAK,SAAS,KAAG,cAAc,CAyIpE"}

package/dist/lib/getMergedConfig.js

@@ -3,20 +3,26 @@ import { mergeConfig } from "vite";
 import {
   getConfig,
   getEnvVarDefinitions,
-  getPaths
+  getPaths,
+  parsePort,
+  readEnvVar
 } from "@cedarjs/project-config";
 import { getWorkspacePackageAliases } from "./workspacePackageAliases.js";
 function getMergedConfig(cedarConfig, cedarPaths) {
   return (userConfig, env) => {
     const workspaceAliases = env.command === "serve" ? getWorkspacePackageAliases(cedarPaths, cedarConfig) : {};
-    let apiHost = process.env.REDWOOD_API_HOST;
-    apiHost ??= cedarConfig.api.host;
-    apiHost ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "127.0.0.1";
+    const hostEnv = readEnvVar("CEDAR_API_HOST", {
+      deprecatedAlias: "REDWOOD_API_HOST"
+    });
+    const apiHost = hostEnv ?? cedarConfig.api.host ?? "127.0.0.1";
     const streamingSsrEnabled = cedarConfig.experimental.streamingSsr?.enabled;
     const rscEnabled = cedarConfig.experimental.rsc?.enabled;
+    const apiPortEnvVar = readEnvVar("CEDAR_API_PORT", {
+      deprecatedAlias: "REDWOOD_API_PORT"
+    });
     let apiPort;
-    if (process.env.REDWOOD_API_PORT) {
-      apiPort = parseInt(process.env.REDWOOD_API_PORT);
+    if (apiPortEnvVar) {
+      apiPort = parsePort(apiPortEnvVar, "CEDAR_API_PORT");
     } else {
       apiPort = cedarConfig.api.port;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"registerFwGlobalsAndShims.d.ts","sourceRoot":"","sources":["../../src/lib/registerFwGlobalsAndShims.ts"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,YAGrC,CAAA"}
+{"version":3,"file":"registerFwGlobalsAndShims.d.ts","sourceRoot":"","sources":["../../src/lib/registerFwGlobalsAndShims.ts"],"names":[],"mappings":"AASA;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,YAGrC,CAAA"}

package/dist/lib/registerFwGlobalsAndShims.js

@@ -1,5 +1,10 @@
 import { createRequire } from "node:module";
-import { getConfig, getEnvVarDefinitions } from "@cedarjs/project-config";
+import {
+  getConfig,
+  getEnvVarDefinitions,
+  parsePort,
+  readEnvVar
+} from "@cedarjs/project-config";
 const registerFwGlobalsAndShims = () => {
   registerFwGlobals();
   registerFwShims();
@@ -14,12 +19,17 @@ function registerFwGlobals() {
       if (/^[a-zA-Z][a-zA-Z\d+\-.]*?:/.test(apiPath)) {
         return apiPath;
       } else {
-        let webHost = process.env.REDWOOD_WEB_HOST;
+        let webHost = readEnvVar("CEDAR_WEB_HOST", {
+          deprecatedAlias: "REDWOOD_WEB_HOST"
+        });
         webHost ??= rwConfig.web.host;
         webHost ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "[::]";
+        const webPortEnvVar = readEnvVar("CEDAR_WEB_PORT", {
+          deprecatedAlias: "REDWOOD_WEB_PORT"
+        });
         let webPort;
-        if (process.env.REDWOOD_WEB_PORT) {
-          webPort = parseInt(process.env.REDWOOD_WEB_PORT);
+        if (webPortEnvVar) {
+          webPort = parsePort(webPortEnvVar, "CEDAR_WEB_PORT");
         } else {
           webPort = rwConfig.web.port;
         }

package/dist/plugins/vite-plugin-cedar-graphql-options-extract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-graphql-options-extract.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-graphql-options-extract.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAG7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,gCAAgC,IAAI,MAAM,CA2BzD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,MAAM,GACX;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,SAAS,CAAA;CAAE,GAAG,IAAI,CAgGzC"}
+{"version":3,"file":"vite-plugin-cedar-graphql-options-extract.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-graphql-options-extract.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAG7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,gCAAgC,IAAI,MAAM,CA2BzD;AAQD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,MAAM,GACX;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,SAAS,CAAA;CAAE,GAAG,IAAI,CAiHzC"}

package/dist/plugins/vite-plugin-cedar-graphql-options-extract.js

@@ -21,6 +21,8 @@ function cedarGraphqlOptionsExtractPlugin() {
     }
   };
 }
+const GRAPHQL_OPTIONS_ERROR_PREFIX = "Could not read the GraphQL options in api/src/functions/graphql. Cedar needs to statically extract them so the api server can serve /graphql and its health endpoint. ";
+const GRAPHQL_OPTIONS_ERROR_SUFFIX = " Expected a single `createGraphQLHandler({ ... })` call with the options passed directly as an object, an identifier, a call, or a ternary.";
 function applyGraphqlOptionsExtract(code) {
   if (code.includes("__cedar_graphqlOptions")) {
     return null;
@@ -56,18 +58,26 @@ function applyGraphqlOptionsExtract(code) {
     }
   }).visit(program);
   if (callExpressionPaths.length > 1) {
-    return null;
+    throw new Error(
+      GRAPHQL_OPTIONS_ERROR_PREFIX + "Found more than one call to createGraphQLHandler." + GRAPHQL_OPTIONS_ERROR_SUFFIX
+    );
   }
   const callExpression = callExpressionPaths[0];
   if (!callExpression) {
-    return null;
+    throw new Error(
+      GRAPHQL_OPTIONS_ERROR_PREFIX + "createGraphQLHandler is imported but never called." + GRAPHQL_OPTIONS_ERROR_SUFFIX
+    );
   }
   const options = callExpression.arguments[0];
   if (!options) {
-    return null;
+    throw new Error(
+      GRAPHQL_OPTIONS_ERROR_PREFIX + "createGraphQLHandler was called without any options." + GRAPHQL_OPTIONS_ERROR_SUFFIX
+    );
   }
   if (options.type !== "Identifier" && options.type !== "ObjectExpression" && options.type !== "CallExpression" && options.type !== "ConditionalExpression") {
-    return null;
+    throw new Error(
+      GRAPHQL_OPTIONS_ERROR_PREFIX + `The options argument is a ${options.type}, which can't be read statically.` + GRAPHQL_OPTIONS_ERROR_SUFFIX
+    );
   }
   const optionsStart = options.start;
   const optionsEnd = options.end;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "5.0.7-next.186",
+  "version": "5.0.7-next.219",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -52,16 +52,16 @@
     "@babel/parser": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api": "5.0.7-next.186",
-    "@cedarjs/api-server": "5.0.7-next.186",
-    "@cedarjs/babel-config": "5.0.7-next.186",
-    "@cedarjs/context": "5.0.7-next.186",
-    "@cedarjs/graphql-server": "5.0.7-next.186",
-    "@cedarjs/internal": "5.0.7-next.186",
-    "@cedarjs/project-config": "5.0.7-next.186",
-    "@cedarjs/server-store": "5.0.7-next.186",
-    "@cedarjs/structure": "5.0.7-next.186",
-    "@cedarjs/testing": "5.0.7-next.186",
+    "@cedarjs/api": "5.0.7-next.219",
+    "@cedarjs/api-server": "5.0.7-next.219",
+    "@cedarjs/babel-config": "5.0.7-next.219",
+    "@cedarjs/context": "5.0.7-next.219",
+    "@cedarjs/graphql-server": "5.0.7-next.219",
+    "@cedarjs/internal": "5.0.7-next.219",
+    "@cedarjs/project-config": "5.0.7-next.219",
+    "@cedarjs/server-store": "5.0.7-next.219",
+    "@cedarjs/structure": "5.0.7-next.219",
+    "@cedarjs/testing": "5.0.7-next.219",
     "@swc/core": "1.15.46",
     "@universal-deploy/store": "^0.2.1",
     "@universal-deploy/vite": "^0.1.9",
@@ -92,10 +92,10 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@cedarjs/auth": "5.0.7-next.186",
-    "@cedarjs/framework-tools": "5.0.7-next.186",
-    "@cedarjs/router": "5.0.7-next.186",
-    "@cedarjs/web": "5.0.7-next.186",
+    "@cedarjs/auth": "5.0.7-next.219",
+    "@cedarjs/framework-tools": "5.0.7-next.219",
+    "@cedarjs/router": "5.0.7-next.219",
+    "@cedarjs/web": "5.0.7-next.219",
     "@dr.pogodin/react-helmet": "2.0.4",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
@@ -115,9 +115,9 @@
     "vitest": "4.1.10"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "5.0.7-next.186",
-    "@cedarjs/router": "5.0.7-next.186",
-    "@cedarjs/web": "5.0.7-next.186"
+    "@cedarjs/auth": "5.0.7-next.219",
+    "@cedarjs/router": "5.0.7-next.219",
+    "@cedarjs/web": "5.0.7-next.219"
   },
   "engines": {
     "node": ">=24"