@cedarjs/cli 5.0.7-next.338 → 5.0.7

package/dist/commands/lint.js

@@ -1,8 +1,63 @@
 import fs from "node:fs";
+import path from "node:path";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { getPaths } from "@cedarjs/project-config";
+import { getPaths, getConfig } from "@cedarjs/project-config";
+function detectLegacyEslintConfig() {
+  const projectRoot = getPaths().base;
+  const legacyConfigFiles = [
+    ".eslintrc.js",
+    ".eslintrc.cjs",
+    ".eslintrc.json",
+    ".eslintrc.yaml",
+    ".eslintrc.yml"
+  ];
+  const foundLegacyFiles = [];
+  for (const configFile of legacyConfigFiles) {
+    if (fs.existsSync(path.join(projectRoot, configFile))) {
+      foundLegacyFiles.push(configFile);
+    }
+  }
+  const packageJsonPath = path.join(projectRoot, "package.json");
+  if (fs.existsSync(packageJsonPath)) {
+    try {
+      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+      if (packageJson.eslintConfig) {
+        foundLegacyFiles.push("package.json (eslintConfig field)");
+      }
+      if (packageJson.eslint) {
+        foundLegacyFiles.push("package.json (eslint field)");
+      }
+    } catch {
+    }
+  }
+  return foundLegacyFiles;
+}
+function showLegacyEslintDeprecationWarning(legacyFiles) {
+  console.warn("");
+  console.warn("\u26A0\uFE0F  DEPRECATION WARNING: Legacy ESLint Configuration Detected");
+  console.warn("");
+  console.warn("   The following legacy ESLint configuration files were found:");
+  legacyFiles.forEach((file) => {
+    console.warn(`   - ${file}`);
+  });
+  console.warn("");
+  console.warn(
+    "   Cedar has migrated to ESLint flat config format. Legacy configurations"
+  );
+  console.warn(
+    "   still work but are deprecated and will be removed in a future version."
+  );
+  console.warn("");
+  console.warn("   To migrate to the new format:");
+  console.warn("   1. Remove the legacy config file(s) listed above");
+  console.warn("   2. Create an eslint.config.mjs");
+  console.warn("   3. Use the flat config format with @cedarjs/eslint-config");
+  console.warn("");
+  console.warn("   See more here: https://github.com/cedarjs/cedar/pull/629");
+  console.warn("");
+}
 const command = "lint [paths..]";
 const description = "Lint your files";
 const builder = (yargs) => {
@@ -31,6 +86,11 @@ const handler = async ({
   format = "stylish"
 }) => {
   recordTelemetryAttributes({ command: "lint", fix, format });
+  const config = getConfig();
+  const legacyConfigFiles = detectLegacyEslintConfig();
+  if (legacyConfigFiles.length > 0 && config instanceof Object && "eslintLegacyConfigWarning" in config && config.eslintLegacyConfigWarning) {
+    showLegacyEslintDeprecationWarning(legacyConfigFiles);
+  }
   try {
     const sbPath = getPaths().web.storybook;
     const eslintArgs = [

package/dist/commands/prismaHandler.js

@@ -3,8 +3,7 @@ import boxen from "boxen";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import {
   formatCedarCommand,
-  formatRunBinCommand,
-  formatRunTransitiveBinCommand
+  formatRunBinCommand
 } from "@cedarjs/cli-helpers/packageManager/display";
 import { runTransitiveBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { errorTelemetry } from "@cedarjs/telemetry";
@@ -50,14 +49,18 @@ const handler = async ({
   for (const [name, value] of Object.entries(options)) {
     args.push(name.length > 1 ? `--${name}` : `-${name}`);
     if (typeof value === "string") {
-      args.push(value);
+      if (value.split(" ").length > 1) {
+        args.push(`"${value}"`);
+      } else {
+        args.push(value);
+      }
     } else if (typeof value === "number") {
       args.push(String(value));
     }
   }
   console.log();
   console.log(c.note("Running Prisma CLI..."));
-  console.log(c.underline(`$ ${formatRunTransitiveBinCommand("prisma", args)}`));
+  console.log(c.underline(`$ <pm exec> prisma ${args.join(" ")}`));
   console.log();
   try {
     runTransitiveBinSync("prisma", args, {

package/dist/commands/serve.js

@@ -6,18 +6,11 @@ import { terminalLink } from "termi-link";
 import * as apiServerCLIConfig from "@cedarjs/api-server/apiCliConfig";
 import * as bothServerCLIConfig from "@cedarjs/api-server/bothCliConfig";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { projectIsEsm } from "@cedarjs/project-config";
 import * as webServerCLIConfig from "@cedarjs/web-server";
 import { getPaths, getConfig } from "../lib/index.js";
 import { serverFileExists } from "../lib/project.js";
 import { webSsrServerHandler } from "./serveWebHandler.js";
-function refuseServerFileUnderUD() {
-  console.error(
-    c.error(
-      "\n api/src/server.ts was detected, but a custom server file is not supported with --ud. It is a Fastify concept \u2014 anything registered there (Realtime, custom plugins, custom middleware) would silently be skipped if serving continued.\n"
-    )
-  );
-  process.exit(1);
-}
 function resolveUDEntryPath() {
   const base = path.join(getPaths().api.dist, "ud", "index");
   for (const ext of [".mjs", ".js"]) {
@@ -98,16 +91,20 @@ const builder = async (yargs) => {
           process.exit(1);
         }
         if (serverFileExists()) {
-          refuseServerFileUnderUD();
+          console.warn(
+            c.warning(
+              "\n Note: api/src/server.ts was detected. This file is a Fastify concept and will be ignored when using --ud. You are testing the experimental UD support, so the behavior will not match your production Fastify setup.\n"
+            )
+          );
         }
         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({ isPublicSide: true });
-        const webHost = argv.webHost ?? getWebHost({ isPublicSide: true });
+        const webPort = argv.webPort ?? getWebPort();
+        const webHost = argv.webHost ?? getWebHost();
         const apiRootPath = argv.apiRootPath ?? "/";
         const apiTarget = `http://${apiHost.includes(":") ? `[${apiHost}]` : apiHost}:${apiPort}`;
-        const { staticMiddleware } = await import("srvx/static");
+        const { serveStatic } = await import("srvx/static");
         const apiUrl = getConfig().web.apiUrl;
         const webDist = getPaths().web.dist;
         const prerenderIndexPath = path.join(webDist, "200.html");
@@ -117,7 +114,7 @@ const builder = async (yargs) => {
           // Dummy fetch handler. All requests are handled by middleware
           fetch: async () => new Response("Not Found", { status: 404 }),
           middleware: [
-            staticMiddleware({ dir: webDist }),
+            serveStatic({ dir: webDist }),
             async (req, next) => {
               const url = new URL(req.url, "http://localhost");
               if (!url.pathname.startsWith(apiUrl)) {
@@ -165,7 +162,12 @@ const builder = async (yargs) => {
         const serveBothHandlers = await import("./serveBothHandler.js");
         await serveBothHandlers.bothSsrRscServerHandler(argv, rscEnabled);
       } else {
-        await bothServerCLIConfig.handler(argv);
+        if (!projectIsEsm()) {
+          const { handler } = await import("@cedarjs/api-server/cjs/bothCliConfigHandler");
+          await handler(argv);
+        } else {
+          await bothServerCLIConfig.handler(argv);
+        }
       }
     }
   }).command({
@@ -191,15 +193,7 @@ 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) {
-        if (serverFileExists()) {
-          refuseServerFileUnderUD();
-        }
         const udEntryPath = resolveUDEntryPath();
         if (!udEntryPath) {
           console.error(
@@ -209,6 +203,8 @@ 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}...`
         );
@@ -223,7 +219,12 @@ const builder = async (yargs) => {
         const { apiServerFileHandler } = await import("./serveApiHandler.js");
         await apiServerFileHandler(argv);
       } else {
-        await apiServerCLIConfig.handler(argv);
+        if (!projectIsEsm()) {
+          const { handler } = await import("@cedarjs/api-server/cjs/apiCliConfigHandler");
+          await handler(argv);
+        } else {
+          await apiServerCLIConfig.handler(argv);
+        }
       }
     }
   }).command({

package/dist/commands/serveBothHandler.js

@@ -1,13 +1,13 @@
 import path from "path";
 import concurrently from "concurrently";
-import { handler as apiServerHandler } from "@cedarjs/api-server/apiCliConfigHandler";
+import { handler as apiServerHandler } from "@cedarjs/api-server/cjs/apiCliConfigHandler";
 import {
   getAPIHost,
   getAPIPort,
   getAPIRootPath,
   getWebHost,
   getWebPort
-} from "@cedarjs/api-server/cliHelpers";
+} from "@cedarjs/api-server/cjs/cliHelpers";
 import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfig, getPaths } from "@cedarjs/project-config";
@@ -27,8 +27,8 @@ const bothServerFileHandler = async (argv) => {
   } else {
     argv.apiPort ??= getAPIPort();
     argv.apiHost ??= getAPIHost();
-    argv.webPort ??= getWebPort({ isPublicSide: true });
-    argv.webHost ??= getWebHost({ isPublicSide: true });
+    argv.webPort ??= getWebPort();
+    argv.webHost ??= getWebHost();
     const apiRootPath = argv.apiRootPath ?? getAPIRootPath();
     const apiProxyTarget = [
       "http://",

package/dist/commands/setup/auth/auth.js

@@ -237,7 +237,7 @@ async function getAuthSetupHandler(module) {
     });
   }
   const setupModule = await import(module);
-  return setupModule.handler;
+  return setupModule.default.handler;
 }
 function isInstalled(module) {
   const { dependencies, devDependencies } = JSON.parse(

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

@@ -4,6 +4,7 @@ import * as parser from "@babel/parser";
 import * as t from "@babel/types";
 import execa from "execa";
 import { Listr } from "listr2";
+import * as recast from "recast";
 import { getConfigPath, getConfig } from "@cedarjs/project-config";
 import { getPaths, writeFilesTask } from "../../../../lib/index.js";
 const updateApiURLTask = (apiUrl) => {
@@ -87,6 +88,14 @@ const verifyUDSetupTask = () => {
     }
   };
 };
+function posToIndex(str, line, column) {
+  const lines = str.split("\n");
+  let index = 0;
+  for (let i = 0; i < line - 1; i++) {
+    index += lines[i].length + 1;
+  }
+  return index + column;
+}
 function resolveConfigObject(arg) {
   if (t.isObjectExpression(arg)) {
     return arg;
@@ -118,9 +127,15 @@ function insertPluginsBeforeCedar({
   content,
   pluginCodes
 }) {
-  const ast = parser.parse(content, {
-    sourceType: "module",
-    plugins: ["typescript", "jsx"]
+  const ast = recast.parse(content, {
+    parser: {
+      parse(source) {
+        return parser.parse(source, {
+          sourceType: "module",
+          plugins: ["typescript", "jsx"]
+        });
+      }
+    }
   });
   const defaultExport = ast.program.body.find(t.isExportDefaultDeclaration);
   if (!defaultExport) {
@@ -148,18 +163,33 @@ function insertPluginsBeforeCedar({
     return null;
   }
   const cedarNode = cedarElement;
-  if (!cedarNode.loc || !arrayExpr.loc || !pluginsProp.loc || cedarNode.start == null || arrayExpr.start == null || arrayExpr.end == null) {
+  if (!cedarNode.loc || !arrayExpr.loc || !pluginsProp.loc) {
     return null;
   }
   const isInline = cedarNode.loc.start.line === arrayExpr.loc.start.line;
   if (isInline) {
-    const precedingText = content.slice(0, arrayExpr.start);
-    const followingText = content.slice(arrayExpr.end);
+    const startPos = posToIndex(
+      content,
+      arrayExpr.loc.start.line,
+      arrayExpr.loc.start.column
+    );
+    const endPos = posToIndex(
+      content,
+      arrayExpr.loc.end.line,
+      arrayExpr.loc.end.column
+    );
+    const precedingText = content.slice(0, startPos);
+    const followingText = content.slice(endPos);
     const existingCodes = elements.flatMap((el) => {
-      if (el?.start == null || el.end == null) {
+      if (!el?.loc) {
         return [];
       }
-      return [content.slice(el.start, el.end)];
+      return [
+        content.slice(
+          posToIndex(content, el.loc.start.line, el.loc.start.column),
+          posToIndex(content, el.loc.end.line, el.loc.end.column)
+        )
+      ];
     });
     const lines2 = content.split("\n");
     const pluginsLine = pluginsProp.loc.start.line;
@@ -175,7 +205,7 @@ function insertPluginsBeforeCedar({
     return precedingText + multiline + followingText;
   }
   const cedarLine = cedarNode.loc.start.line;
-  const insertPos = cedarNode.start - cedarNode.loc.start.column;
+  const insertPos = posToIndex(content, cedarLine, 0);
   const lines = content.split("\n");
   const indent = (lines[cedarLine - 1].match(/^\s*/) ?? [""])[0];
   const insertion = pluginCodes.map((code) => `${indent}${code},

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

@@ -16,10 +16,6 @@ import {
   mysqlDatabaseService
 } from "../templates/flightcontrol.js";
 const { getConfig } = prismaInternals;
-const APOLLO_PROVIDER_COMPONENT_NAMES = [
-  "CedarApolloProvider",
-  "RedwoodApolloProvider"
-];
 const getFlightcontrolJson = async (database) => {
   const flightcontrolConfig = getFlightcontrolConfig();
   if (database === "none") {
@@ -209,26 +205,18 @@ const updateApp = () => {
         appContent[authLineIndex] = `      <AuthProvider type="dbAuth" config={{ fetchConfig: { credentials: 'include' } }}>
 `;
       }
-      let gqlLineIndex = -1;
-      let apolloProviderComponentName = "";
-      for (const componentName of APOLLO_PROVIDER_COMPONENT_NAMES) {
-        gqlLineIndex = appContent.findIndex(
-          (line) => line.includes(`<${componentName}`)
-        );
-        if (gqlLineIndex !== -1) {
-          apolloProviderComponentName = componentName;
-          break;
-        }
-      }
+      const gqlLineIndex = appContent.findIndex(
+        (line) => line.includes("<RedwoodApolloProvider")
+      );
       if (gqlLineIndex === -1) {
         console.log(`
-    Couldn't find <CedarApolloProvider in web/src/App.js
+    Couldn't find <RedwoodApolloProvider in web/src/App.js
     If (and when) you use *dbAuth*, you'll have to add the following fetch config manually:
 
     graphQLClientConfig={{ httpLinkConfig: { credentials: 'include' }}}
     `);
       } else if (appContent.toString().match(/dbAuth/)) {
-        appContent[gqlLineIndex] = `        <${apolloProviderComponentName} graphQLClientConfig={{ httpLinkConfig: { credentials: 'include' }}} >
+        appContent[gqlLineIndex] = `        <RedwoodApolloProvider graphQLClientConfig={{ httpLinkConfig: { credentials: 'include' }}} >
 `;
       }
       fs.writeFileSync(appPath, appContent.join(EOL));

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

@@ -1,14 +1,18 @@
 import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
-import prompts from "prompts";
 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 { POSTGRES_YAML, RENDER_YAML, SQLITE_YAML } from "../templates/render.js";
+import { addFilesTask } from "../helpers/index.js";
+import {
+  POSTGRES_YAML,
+  RENDER_HEALTH_CHECK,
+  RENDER_YAML,
+  SQLITE_YAML
+} from "../templates/render.js";
 const { getConfig } = prismaInternals;
-const SQLITE_API_PLAN = "starter";
 const getRenderYamlContent = async (database) => {
   if (database === "none") {
     return {
@@ -29,7 +33,7 @@ const getRenderYamlContent = async (database) => {
       case "sqlite":
         return {
           path: path.join(getPaths().base, "render.yaml"),
-          content: RENDER_YAML(SQLITE_YAML, SQLITE_API_PLAN)
+          content: RENDER_YAML(SQLITE_YAML)
         };
       default:
         throw new Error(`
@@ -50,9 +54,14 @@ 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://cedarjs.com/docs/deploy/render for detailed instructions",
-  "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"
+  "Check out the deployment docs at https://render.com/docs/deploy-redwood 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
+  }
 ];
 const handler = async ({
   force,
@@ -63,26 +72,6 @@ const handler = async ({
     force,
     database
   });
-  if (database === "sqlite") {
-    console.warn(
-      c.warning(
-        `Render's free plan doesn't support persistent disks, which the \`sqlite\` deploy option requires for its database file. The generated render.yaml will set the api service's plan to "${SQLITE_API_PLAN}" (a paid plan) instead of "free" so the disk can actually attach.
-
-If you want to stay on the free plan, rerun this command with \`--database postgresql\` (a managed database, not a disk) or \`--database none\`.`
-      )
-    );
-    console.log();
-    const { confirmed } = await prompts({
-      type: "confirm",
-      name: "confirmed",
-      message: `Generate render.yaml with the api service on the "${SQLITE_API_PLAN}" plan?`
-    });
-    if (!confirmed) {
-      console.log("Aborting render setup.");
-      return;
-    }
-    console.log();
-  }
   const tasks = new Listr(
     [
       {
@@ -94,6 +83,11 @@ If you want to stay on the free plan, rerun this command with \`--database postg
           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

@@ -2,18 +2,16 @@ 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, plan = "free") => {
+const RENDER_YAML = (database) => {
   const apiUrl = getUserApiUrl().replace(/\/$/, "");
   return `# Quick links to the docs:
-# - 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
+# - Redwood on Render: https://render.com/docs/deploy-redwood
+# - Render's Blueprint spec: https://render.com/docs/yaml-spec
 
 services:
 - name: ${PROJECT_NAME}-web
   type: web
-  runtime: static
+  env: static
   buildCommand: npm install --global corepack && yarn install && yarn cedar deploy render web
   staticPublishPath: ./web/dist
 
@@ -24,16 +22,11 @@ services:
   routes:
   - type: rewrite
     source: ${apiUrl}/*
-    # Replace \`destination\` after your first deploy, with the api service's
-    # URL from the Render dashboard:
+    # Replace \`destination\` here after your first deploy:
     #
     # \`\`\`
-    # destination: https://${PROJECT_NAME}-api.onrender.com/*
+    # destination: https://my-redwood-project-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: /*
@@ -41,23 +34,12 @@ services:
 
 - name: ${PROJECT_NAME}-api
   type: web
-  plan: ${plan}
-  runtime: node
+  plan: free
+  env: node
   region: oregon
   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}
 `;
@@ -69,19 +51,24 @@ const POSTGRES_YAML = `  - key: DATABASE_URL
 
 databases:
   - name: ${PROJECT_NAME}-db
-    plan: free
     region: oregon`;
 const SQLITE_YAML = `  - key: DATABASE_URL
     value: file:./data/sqlite.db
-  # Persistent disks aren't available on Render's free plan, which is why
-  # the api service above is on a paid plan when SQLite is selected.
   disk:
     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/dist/commands/setup/docker/templates/Dockerfile.yarn

@@ -94,8 +94,11 @@ ENV NODE_ENV=production
 
 # default api serve command
 # ---------
-# See https://cedarjs.com/docs/server-file for customizing the api server
-# (Realtime, custom Fastify plugins, etc).
+# If you are using a custom server file, you must use the following
+# command to launch your server instead of the default api-server below.
+# This is important if you intend to configure GraphQL to use Realtime.
+#
+# CMD [ "./api/dist/server.js" ]
 CMD ["node_modules/.bin/cedarjs-server", "api"]
 
 # web serve

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
-      - CEDAR_API_HOST=0.0.0.0
+      - REDWOOD_API_HOST=0.0.0.0
 
   db:
     image: postgres:18-bookworm

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

@@ -4,8 +4,11 @@ services:
       context: .
       dockerfile: ./Dockerfile
       target: api_serve
-    # See https://cedarjs.com/docs/server-file for customizing the api
-    # server (Realtime, custom Fastify plugins, etc).
+    # Without a command specified, the Dockerfile's api_serve CMD will be used.
+    # If you are using a custom server file, you should either use the following
+    # command to launch your server or update the Dockerfile to do so.
+    # This is important if you intend to configure GraphQL to use Realtime.
+    # command: "./api/dist/server.js"
     ports:
       - '8911:8911'
     depends_on:

package/dist/commands/setup/graphql/features/fragments/appGqlConfigTransform.js

@@ -16,11 +16,8 @@ function isPropertyWithName(node, name) {
 function transform(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
-  let apolloProviderElements = root.findJSXElements("CedarApolloProvider");
-  if (apolloProviderElements.length === 0) {
-    apolloProviderElements = root.findJSXElements("RedwoodApolloProvider");
-  }
-  const graphQLClientConfigCollection = apolloProviderElements.find(
+  const redwoodApolloProvider = root.findJSXElements("RedwoodApolloProvider");
+  const graphQLClientConfigCollection = redwoodApolloProvider.find(
     j.JSXAttribute,
     {
       name: { name: "graphQLClientConfig" }
@@ -107,7 +104,7 @@ function transform(file, api) {
     cacheConfigValue.properties.push(property);
   }
   graphQLClientConfigCollection.remove();
-  apolloProviderElements.get(0).node.openingElement.attributes.push(
+  redwoodApolloProvider.get(0).node.openingElement.attributes.push(
     j.jsxAttribute(
       j.jsxIdentifier("graphQLClientConfig"),
       j.jsxExpressionContainer(j.identifier(graphQLClientConfigVariableName))

package/dist/commands/setup/monitoring/sentry/sentryHandler.js

@@ -90,20 +90,15 @@ const handler = async ({ force }) => {
       title: "Replacing Redwood's Error boundary",
       task: async () => {
         const contentLines = fs.readFileSync(rwPaths.web.app).toString().split("\n");
-        const webImportRe = /^import \{ FatalErrorBoundary, ((?:Cedar|Redwood)Provider) \} from '@cedarjs\/web'$/;
         const webImportIndex = contentLines.findLastIndex(
-          (line) => webImportRe.test(line)
+          (line) => /^import { FatalErrorBoundary, RedwoodProvider } from '@cedarjs\/web'$/.test(
+            line
+          )
         );
-        if (webImportIndex === -1) {
-          throw new Error(
-            `Could not find "import { FatalErrorBoundary, CedarProvider } from '@cedarjs/web'" in web/src/App`
-          );
-        }
-        const providerName = contentLines[webImportIndex].match(webImportRe)?.[1];
         contentLines.splice(
           webImportIndex,
           1,
-          `import { ${providerName} } from '@cedarjs/web'`
+          "import { RedwoodProvider } from '@cedarjs/web'"
         );
         const boundaryOpenIndex = contentLines.findLastIndex(
           (line) => line.includes("<FatalErrorBoundary page={FatalErrorPage}>")