@cedarjs/cli 6.0.0-canary.2818 → 6.0.0-canary.2820

package/dist/commands/serve.js

@@ -99,8 +99,8 @@ const builder = async (yargs) => {
         const { getAPIHost, getAPIPort, getWebHost, getWebPort } = await import("@cedarjs/api-server/cliHelpers");
         const apiPort = argv.apiPort ?? getAPIPort();
         const apiHost = argv.apiHost ?? getAPIHost();
-        const webPort = argv.webPort ?? getWebPort();
-        const webHost = argv.webHost ?? getWebHost();
+        const webPort = argv.webPort ?? getWebPort({ isPublicSide: true });
+        const webHost = argv.webHost ?? getWebHost({ isPublicSide: true });
         const apiRootPath = argv.apiRootPath ?? "/";
         const apiTarget = `http://${apiHost.includes(":") ? `[${apiHost}]` : apiHost}:${apiPort}`;
         const { serveStatic } = await import("srvx/static");
@@ -187,6 +187,11 @@ const builder = async (yargs) => {
         socket: argv.socket,
         apiRootPath: argv.apiRootPath
       });
+      const { getAPIHost, getAPIPort } = await import("@cedarjs/api-server/cliHelpers");
+      const apiPort = argv.port ?? getAPIPort({ isPublicSide: true });
+      const apiHost = argv.host ?? getAPIHost({ isPublicSide: true });
+      argv.port = apiPort;
+      argv.host = apiHost;
       if (argv.ud) {
         const udEntryPath = resolveUDEntryPath();
         if (!udEntryPath) {
@@ -197,8 +202,6 @@ const builder = async (yargs) => {
           );
           process.exit(1);
         }
-        const apiPort = argv.port ?? parseInt(process.env.PORT ?? "8911", 10);
-        const apiHost = argv.host ?? process.env.HOST ?? "localhost";
         process.stdout.write(
           `API server starting at http://${apiHost}:${apiPort}...`
         );

package/dist/commands/serveBothHandler.js

@@ -27,8 +27,8 @@ const bothServerFileHandler = async (argv) => {
   } else {
     argv.apiPort ??= getAPIPort();
     argv.apiHost ??= getAPIHost();
-    argv.webPort ??= getWebPort();
-    argv.webHost ??= getWebHost();
+    argv.webPort ??= getWebPort({ isPublicSide: true });
+    argv.webHost ??= getWebHost({ isPublicSide: true });
     const apiRootPath = argv.apiRootPath ?? getAPIRootPath();
     const apiProxyTarget = [
       "http://",

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

@@ -54,7 +54,7 @@ const getRenderYamlContent = async (database) => {
 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://render.com/docs/deploy-redwood for detailed instructions",
+  "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 = [

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

@@ -5,13 +5,15 @@ 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
+# - Deploying Cedar: https://cedarjs.com/docs/deploy/render
+# - Render's own walkthrough (uses \`yarn rw\`, but just swap in \`yarn cedar\`):
+#   https://render.com/docs/deploy-redwood
+# - Render's Blueprint spec: https://render.com/docs/blueprint-spec
 
 services:
 - name: ${PROJECT_NAME}-web
   type: web
-  env: static
+  runtime: static
   buildCommand: npm install --global corepack && yarn install && yarn cedar deploy render web
   staticPublishPath: ./web/dist
 
@@ -22,11 +24,16 @@ services:
   routes:
   - type: rewrite
     source: ${apiUrl}/*
-    # Replace \`destination\` here after your first deploy:
+    # Replace \`destination\` after your first deploy, with the api service's
+    # URL from the Render dashboard:
     #
     # \`\`\`
-    # destination: https://my-redwood-project-api.onrender.com/*
+    # destination: https://${PROJECT_NAME}-api.onrender.com/*
     # \`\`\`
+    #
+    # This can't be filled in automatically \u2014 Render's \`fromService\` only
+    # resolves service hosts into \`envVars\`, not into a static site's route
+    # destination.
     destination: replace_with_api_url/*
   - type: rewrite
     source: /*
@@ -35,7 +42,7 @@ services:
 - name: ${PROJECT_NAME}-api
   type: web
   plan: free
-  env: node
+  runtime: node
   region: oregon
   buildCommand: npm install --global corepack && yarn install && yarn cedar build api
   startCommand: yarn cedar deploy render api

package/dist/commands/setup/docker/templates/docker-compose.dev.yml

@@ -18,7 +18,7 @@ services:
       - SESSION_SECRET=super_secret_session_key_change_me_in_production_please
       - CI=
       - NODE_ENV=development
-      - REDWOOD_API_HOST=0.0.0.0
+      - CEDAR_API_HOST=0.0.0.0
 
   db:
     image: postgres:18-bookworm

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-canary.2818",
+  "version": "6.0.0-canary.2820",
   "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.2818",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2818",
-    "@cedarjs/fastify-web": "6.0.0-canary.2818",
-    "@cedarjs/internal": "6.0.0-canary.2818",
-    "@cedarjs/prerender": "6.0.0-canary.2818",
-    "@cedarjs/project-config": "6.0.0-canary.2818",
-    "@cedarjs/structure": "6.0.0-canary.2818",
-    "@cedarjs/telemetry": "6.0.0-canary.2818",
-    "@cedarjs/utils": "6.0.0-canary.2818",
-    "@cedarjs/vite": "6.0.0-canary.2818",
-    "@cedarjs/web-server": "6.0.0-canary.2818",
+    "@cedarjs/api-server": "6.0.0-canary.2820",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2820",
+    "@cedarjs/fastify-web": "6.0.0-canary.2820",
+    "@cedarjs/internal": "6.0.0-canary.2820",
+    "@cedarjs/prerender": "6.0.0-canary.2820",
+    "@cedarjs/project-config": "6.0.0-canary.2820",
+    "@cedarjs/structure": "6.0.0-canary.2820",
+    "@cedarjs/telemetry": "6.0.0-canary.2820",
+    "@cedarjs/utils": "6.0.0-canary.2820",
+    "@cedarjs/vite": "6.0.0-canary.2820",
+    "@cedarjs/web-server": "6.0.0-canary.2820",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",