@cedarjs/cli 6.0.0-canary.2825 → 6.0.0-canary.2828

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -114,7 +114,7 @@ const handler = async ({
       },
       task: (_ctx, task) => {
         task.output = [
-          "Please add the following to your 'redwoodFastifyGraphQLServer' plugin options to enable OTel for your graphql",
+          "Please add the following to your 'cedarFastifyGraphQLServer' plugin options to enable OTel for your graphql",
           "openTelemetryOptions: {",
           "  resolvers: true,",
           "  result: true,",

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

@@ -5,13 +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 } from "../helpers/index.js";
-import {
-  POSTGRES_YAML,
-  RENDER_HEALTH_CHECK,
-  RENDER_YAML,
-  SQLITE_YAML
-} from "../templates/render.js";
+import { POSTGRES_YAML, RENDER_YAML, SQLITE_YAML } from "../templates/render.js";
 const { getConfig } = prismaInternals;
 const getRenderYamlContent = async (database) => {
   if (database === "none") {
@@ -55,13 +49,8 @@ const notes = [
   "You are ready to deploy to Render!\n",
   "Go to https://dashboard.render.com/iacs to create your account and deploy to Render",
   "Check out the deployment docs at https://cedarjs.com/docs/deploy/render for detailed instructions",
-  "Note: After first deployment to Render update the rewrite rule destination in `./render.yaml`"
-];
-const additionalFiles = [
-  {
-    path: path.join(getPaths().base, "api/src/functions/healthz.js"),
-    content: RENDER_HEALTH_CHECK
-  }
+  "Note: After first deployment to Render update the rewrite rule destination in `./render.yaml`",
+  "Note: The api service now health checks `/graphql/health`. If a previous setup left an unused `api/src/functions/healthz.js` behind, you can delete it"
 ];
 const handler = async ({
   force,
@@ -83,11 +72,6 @@ const handler = async ({
           return writeFilesTask(files, { overwriteExisting: force });
         }
       },
-      // Add health check api function
-      addFilesTask({
-        files: additionalFiles,
-        force
-      }),
       printSetupNotes(notes)
     ],
     { rendererOptions: { collapseSubtasks: false } }

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

@@ -47,6 +47,17 @@ services:
   buildCommand: npm install --global corepack && yarn install && yarn cedar build api
   startCommand: yarn cedar deploy render api
 
+  # Proves the GraphQL server is actually serving, not just that the process
+  # is alive. Returns 200 with an \`x-yoga-id\` response header.
+  #
+  # The route is \`<apiRootPath><graphiQLEndpoint>/health\`, and the value below
+  # assumes both defaults (\`/\` and \`/graphql\`). Update it to match if you
+  # customize either \u2014 by setting \`CEDAR_API_ROOT_PATH\` in the envVars below,
+  # by passing \`apiRootPath\` to \`createServer\` in \`api/src/server.ts\`, or by
+  # setting \`graphiQLEndpoint\` in \`api/src/functions/graphql.ts\`. A mismatch
+  # here 404s, and Render will not promote the deploy.
+  healthCheckPath: /graphql/health
+
   envVars:
 ${database}
 `;
@@ -65,17 +76,9 @@ const SQLITE_YAML = `  - key: DATABASE_URL
     name: sqlite-data
     mountPath: /opt/render/project/src/api/db/data
     sizeGB: 1`;
-const RENDER_HEALTH_CHECK = `// render-health-check
-export const handler = async () => {
-  return {
-    statusCode: 200,
-  }
-}
-`;
 export {
   POSTGRES_YAML,
   PROJECT_NAME,
-  RENDER_HEALTH_CHECK,
   RENDER_YAML,
   SQLITE_YAML
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-canary.2825",
+  "version": "6.0.0-canary.2828",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.7",
     "@babel/preset-typescript": "7.29.7",
-    "@cedarjs/api-server": "6.0.0-canary.2825",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2825",
-    "@cedarjs/fastify-web": "6.0.0-canary.2825",
-    "@cedarjs/internal": "6.0.0-canary.2825",
-    "@cedarjs/prerender": "6.0.0-canary.2825",
-    "@cedarjs/project-config": "6.0.0-canary.2825",
-    "@cedarjs/structure": "6.0.0-canary.2825",
-    "@cedarjs/telemetry": "6.0.0-canary.2825",
-    "@cedarjs/utils": "6.0.0-canary.2825",
-    "@cedarjs/vite": "6.0.0-canary.2825",
-    "@cedarjs/web-server": "6.0.0-canary.2825",
+    "@cedarjs/api-server": "6.0.0-canary.2828",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2828",
+    "@cedarjs/fastify-web": "6.0.0-canary.2828",
+    "@cedarjs/internal": "6.0.0-canary.2828",
+    "@cedarjs/prerender": "6.0.0-canary.2828",
+    "@cedarjs/project-config": "6.0.0-canary.2828",
+    "@cedarjs/structure": "6.0.0-canary.2828",
+    "@cedarjs/telemetry": "6.0.0-canary.2828",
+    "@cedarjs/utils": "6.0.0-canary.2828",
+    "@cedarjs/vite": "6.0.0-canary.2828",
+    "@cedarjs/web-server": "6.0.0-canary.2828",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",