@cedarjs/cli 4.0.0-canary.13865 → 4.0.0-canary.13866

package/dist/commands/experimental/templates/opentelemetry.ts.template

@@ -24,11 +24,12 @@ const resource = Resource.default().merge(
 )
 
 const studioPort = getConfig().studio.basePort
+const apiUrl = getConfig().web.apiUrl.replace(/\/$/, '')
 const exporter = new OTLPTraceExporter({
   // Update this URL to point to where your OTLP compatible collector is listening
   // The redwood development studio (`yarn cedar exp studio`) can collect your
   // telemetry at `http://127.0.0.1:<PORT>/v1/traces` (default PORT is 4318)
-  url: `http://127.0.0.1:${studioPort}/.redwood/functions/otel-trace`,
+  url: `http://127.0.0.1:${studioPort}${apiUrl}/otel-trace`,
   concurrencyLimit: 64,
 })
 

package/dist/commands/setup/deploy/helpers/index.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
-import { getConfigPath } from "@cedarjs/project-config";
+import { getConfigPath, getConfig } from "@cedarjs/project-config";
 import { getPaths, writeFilesTask } from "../../../../lib/index.js";
 const updateApiURLTask = (apiUrl) => {
   const configTomlPath = getConfigPath();
@@ -25,6 +25,9 @@ const updateApiURLTask = (apiUrl) => {
     }
   };
 };
+function getUserApiUrl() {
+  return getConfig().web.apiUrl;
+}
 const preRequisiteCheckTask = (preRequisites) => {
   return {
     title: "Checking pre-requisites",
@@ -101,6 +104,7 @@ export {
   addFilesTask,
   addToDotEnvTask,
   addToGitIgnoreTask,
+  getUserApiUrl,
   preRequisiteCheckTask,
   updateApiURLTask
 };

package/dist/commands/setup/deploy/providers/flightcontrolHandler.js

@@ -7,7 +7,7 @@ import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";
-import { updateApiURLTask } from "../helpers/index.js";
+import { getUserApiUrl, updateApiURLTask } from "../helpers/index.js";
 import {
   flightcontrolConfig,
   databaseEnvVariables,
@@ -47,7 +47,7 @@ const getFlightcontrolJson = async (database) => {
             ...flightcontrolConfig.environments[0],
             services: [
               ...flightcontrolConfig.environments[0].services.map((service) => {
-                if (service.id === "redwood-api") {
+                if (service.id === "cedar-api") {
                   return {
                     ...service,
                     envVariables: {
@@ -96,7 +96,7 @@ const updateGraphQLFunction = () => {
     Couldn't find graphql handler in api/src/functions/graphql.js.
     You'll have to add the following cors config manually:
 
-      cors: { origin: process.env.REDWOOD_WEB_URL, credentials: true}
+      cors: { origin: process.env.CEDAR_WEB_URL, credentials: true}
     `);
         return;
       }
@@ -109,14 +109,14 @@ const updateGraphQLFunction = () => {
     Couldn't find graphql handler in api/src/functions/graphql.js.
     You'll have to add the following cors config manually:
 
-      cors: { origin: process.env.REDWOOD_WEB_URL, credentials: true}
+      cors: { origin: process.env.CEDAR_WEB_URL, credentials: true}
     `);
         return;
       }
       graphqlContent.splice(
         graphqlHanderIndex + 1,
         0,
-        "  cors: { origin: process.env.REDWOOD_WEB_URL, credentials: true },"
+        "  cors: { origin: process.env.CEDAR_WEB_URL, credentials: true },"
       );
       fs.writeFileSync(graphqlFunctionsPath, graphqlContent.join(EOL));
     }
@@ -158,14 +158,14 @@ const updateDbAuth = () => {
     Couldn't find DbAuthHandler in api/src/functions/auth.js.
     You'll have to add the following cors config manually:
 
-      cors: { origin: process.env.REDWOOD_WEB_URL, credentials: true}
+      cors: { origin: process.env.CEDAR_WEB_URL, credentials: true}
     `);
         return;
       }
       authContent.splice(
         dbHandlerIndex + 1,
         0,
-        "  cors: { origin: process.env.REDWOOD_WEB_URL, credentials: true },"
+        "  cors: { origin: process.env.CEDAR_WEB_URL, credentials: true },"
       );
       fs.writeFileSync(authFnPath, authContent.join(EOL));
     }
@@ -229,13 +229,17 @@ const addToDotEnvDefaultTask = () => {
 
         You'll have to add the following env var manually:
 
-        REDWOOD_API_URL=/.redwood/functions
+        CEDAR_API_URL=${getUserApiUrl()}
         `;
       }
     },
     task: async (_ctx) => {
       const env = path.resolve(getPaths().base, ".env.defaults");
-      const line = "\n\nREDWOOD_API_URL=/.redwood/functions\n";
+      const apiUrl = getUserApiUrl();
+      const line = `
+
+CEDAR_API_URL=${apiUrl}
+`;
       fs.appendFileSync(env, line);
     }
   };
@@ -266,7 +270,7 @@ const handler = async ({ force, database }) => {
       updateGraphQLFunction(),
       updateDbAuth(),
       updateApp(),
-      updateApiURLTask("${REDWOOD_API_URL}"),
+      updateApiURLTask("${CEDAR_API_URL}"),
       addToDotEnvDefaultTask(),
       printSetupNotes(notes)
     ],

package/dist/commands/setup/deploy/providers/renderHandler.js

@@ -5,7 +5,7 @@ import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";
-import { addFilesTask, updateApiURLTask } from "../helpers/index.js";
+import { addFilesTask } from "../helpers/index.js";
 import {
   POSTGRES_YAML,
   RENDER_HEALTH_CHECK,
@@ -80,7 +80,6 @@ const handler = async ({ force, database }) => {
           return writeFilesTask(files, { overwriteExisting: force });
         }
       },
-      updateApiURLTask("/.redwood/functions"),
       // Add health check api function
       addFilesTask({
         files: additionalFiles,

package/dist/commands/setup/deploy/templates/flightcontrol.js

@@ -10,8 +10,8 @@ const flightcontrolConfig = {
       },
       services: [
         {
-          id: "redwood-api",
-          name: "Redwood API",
+          id: "cedar-api",
+          name: "Cedar API",
           type: "web",
           buildType: "nixpacks",
           cpu: 0.5,
@@ -24,14 +24,14 @@ const flightcontrolConfig = {
             type: "ec2"
           },
           envVariables: {
-            REDWOOD_WEB_URL: {
-              fromService: { id: "redwood-web", value: "origin" }
+            CEDAR_WEB_URL: {
+              fromService: { id: "cedar-web", value: "origin" }
             }
           }
         },
         {
-          id: "redwood-web",
-          name: "Redwood Web",
+          id: "cedar-web",
+          name: "Cedar Web",
           type: "static",
           buildType: "nixpacks",
           singlePageApp: true,
@@ -41,8 +41,8 @@ const flightcontrolConfig = {
             type: "ec2"
           },
           envVariables: {
-            REDWOOD_API_URL: {
-              fromService: { id: "redwood-api", value: "origin" }
+            CEDAR_API_URL: {
+              fromService: { id: "cedar-api", value: "origin" }
             }
           }
         }

package/dist/commands/setup/deploy/templates/render.js

@@ -1,7 +1,9 @@
 import path from "path";
 import { getPaths } from "../../../../lib/index.js";
+import { getUserApiUrl } from "../helpers/index.js";
 const PROJECT_NAME = path.basename(getPaths().base);
 const RENDER_YAML = (database) => {
+  const apiUrl = getUserApiUrl().replace(/\/$/, "");
   return `# Quick links to the docs:
 # - Redwood on Render: https://render.com/docs/deploy-redwood
 # - Render's Blueprint spec: https://render.com/docs/yaml-spec
@@ -19,7 +21,7 @@ services:
 
   routes:
   - type: rewrite
-    source: /.redwood/functions/*
+    source: ${apiUrl}/*
     # Replace \`destination\` here after your first deploy:
     #
     # \`\`\`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "4.0.0-canary.13865+57f1e8c260",
+  "version": "4.0.0-canary.13866+7648078da1",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,16 +33,16 @@
   "dependencies": {
     "@babel/parser": "7.29.2",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "4.0.0-canary.13865",
-    "@cedarjs/cli-helpers": "4.0.0-canary.13865",
-    "@cedarjs/fastify-web": "4.0.0-canary.13865",
-    "@cedarjs/internal": "4.0.0-canary.13865",
-    "@cedarjs/prerender": "4.0.0-canary.13865",
-    "@cedarjs/project-config": "4.0.0-canary.13865",
-    "@cedarjs/structure": "4.0.0-canary.13865",
-    "@cedarjs/telemetry": "4.0.0-canary.13865",
-    "@cedarjs/utils": "4.0.0-canary.13865",
-    "@cedarjs/web-server": "4.0.0-canary.13865",
+    "@cedarjs/api-server": "4.0.0-canary.13866",
+    "@cedarjs/cli-helpers": "4.0.0-canary.13866",
+    "@cedarjs/fastify-web": "4.0.0-canary.13866",
+    "@cedarjs/internal": "4.0.0-canary.13866",
+    "@cedarjs/prerender": "4.0.0-canary.13866",
+    "@cedarjs/project-config": "4.0.0-canary.13866",
+    "@cedarjs/structure": "4.0.0-canary.13866",
+    "@cedarjs/telemetry": "4.0.0-canary.13866",
+    "@cedarjs/utils": "4.0.0-canary.13866",
+    "@cedarjs/web-server": "4.0.0-canary.13866",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "57f1e8c260ef230a4d43b620d51f610cee65f91f"
+  "gitHead": "7648078da12445eb41f35b7dce028119f22bf5cf"
 }