@cedarjs/cli 6.0.0-rc.189 → 6.0.0-rc.221

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/generate/scaffold/scaffoldHandler.js

@@ -42,6 +42,7 @@ import { files as serviceFiles } from "../service/serviceHandler.js";
 import { customOrDefaultTemplatePath } from "../yargsHandlerHelpers.js";
 const SKIPPABLE_ASSETS = ["scaffold.css"];
 const PACKAGE_SET = "Set";
+const PACKAGE_PRIVATE_SET = "PrivateSet";
 const getIdType = (model) => {
   return model.fields.find((field) => field.isId)?.type;
 };
@@ -512,6 +513,65 @@ const addHelperPackages = async (task) => {
     await removeWorkspacePackages("web", ["humanize-string"]);
   });
 };
+const isAuthSetup = () => {
+  const extensions = ["ts", "js", "tsx", "jsx"];
+  return extensions.some(
+    (ext) => fs.existsSync(path.join(getPaths().web.src, "auth." + ext))
+  );
+};
+const ROUTE_TAG_RE = /<Route\s+([^>]*?)\/?>/g;
+const extractRouteAttr = (tagAttrs, attrName) => tagAttrs.match(new RegExp(`\\b${attrName}=["']([^"']+)["']`))?.[1];
+const getRoutesFileContent = () => {
+  const routesPath = getPaths().web.routes;
+  if (!fs.existsSync(routesPath)) {
+    return void 0;
+  }
+  return readFile(routesPath).toString();
+};
+const hasLoginRoute = () => {
+  const content = getRoutesFileContent();
+  if (!content) {
+    return false;
+  }
+  return Array.from(content.matchAll(ROUTE_TAG_RE)).some(
+    ([, attrs]) => extractRouteAttr(attrs, "name") === "login"
+  );
+};
+const findUnprotectedLandingPageRouteName = () => {
+  const content = getRoutesFileContent();
+  if (!content) {
+    return void 0;
+  }
+  const privateSetRanges = Array.from(
+    content.matchAll(/<PrivateSet\b[^>]*>([\s\S]*?)<\/PrivateSet>/g)
+  ).map((match) => ({
+    start: match.index ?? 0,
+    end: (match.index ?? 0) + match[0].length
+  }));
+  for (const match of content.matchAll(ROUTE_TAG_RE)) {
+    const [, attrs] = match;
+    if (extractRouteAttr(attrs, "path") !== "/") {
+      continue;
+    }
+    const tagStart = match.index ?? 0;
+    const isProtected = privateSetRanges.some(
+      (range) => tagStart >= range.start && tagStart < range.end
+    );
+    if (!isProtected) {
+      return extractRouteAttr(attrs, "name");
+    }
+  }
+  return void 0;
+};
+const getUnauthenticatedRedirectRoute = () => {
+  if (!isAuthSetup()) {
+    return void 0;
+  }
+  if (hasLoginRoute()) {
+    return "login";
+  }
+  return findUnprotectedLandingPageRouteName();
+};
 const addSetImport = (task) => {
   const routesPath = getPaths().web.routes;
   const routesContent = readFile(routesPath).toString();
@@ -525,15 +585,19 @@ const addSetImport = (task) => {
     return void 0;
   }
   const routerImports = importContent.replace(/\s/g, "").split(",");
-  if (routerImports.includes(PACKAGE_SET)) {
+  const namesToImport = [
+    PACKAGE_SET,
+    ...getUnauthenticatedRedirectRoute() ? [PACKAGE_PRIVATE_SET] : []
+  ].filter((name) => !routerImports.includes(name));
+  if (!namesToImport.length) {
     return "Skipping Set import";
   }
   const newRoutesContent = routesContent.replace(
     cedarRouterImport,
-    importStart + spacing + PACKAGE_SET + `,` + spacing + importContent + importEnd
+    importStart + spacing + namesToImport.join("," + spacing) + `,` + spacing + importContent + importEnd
   );
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });
-  return "Added Set import to Routes.{jsx,tsx}";
+  return `Added ${namesToImport.join(", ")} import to Routes.{jsx,tsx}`;
 };
 const addScaffoldSetToRouter = async (model, scaffoldPath) => {
   const templateNames = getTemplateStrings(model, scaffoldPath);
@@ -542,10 +606,12 @@ const addScaffoldSetToRouter = async (model, scaffoldPath) => {
   const titleTo = templateNames.pluralRouteName;
   const buttonLabel = `New ${nameVars.singularPascalName}`;
   const buttonTo = templateNames.newRouteName;
+  const unauthenticatedRoute = getUnauthenticatedRedirectRoute();
   return addRoutesToRouterTask(
     await routes({ model, path: scaffoldPath }),
     "ScaffoldLayout",
-    { title, titleTo, buttonLabel, buttonTo }
+    { title, titleTo, buttonLabel, buttonTo },
+    unauthenticatedRoute ? { unauthenticated: unauthenticatedRoute } : void 0
   );
 };
 const tasks = ({
@@ -664,7 +730,10 @@ const splitPathAndModel = (pathSlashModel) => {
 };
 export {
   files,
+  getUnauthenticatedRedirectRoute,
   handler,
+  hasLoginRoute,
+  isAuthSetup,
   routes,
   shouldUseTailwindCSS,
   splitPathAndModel,

package/dist/commands/serve.js

@@ -10,6 +10,14 @@ 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"]) {
@@ -90,17 +98,13 @@ const builder = async (yargs) => {
           process.exit(1);
         }
         if (serverFileExists()) {
-          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"
-            )
-          );
+          refuseServerFileUnderUD();
         }
         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,7 +191,15 @@ 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(
@@ -197,8 +209,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/database/database.js

@@ -0,0 +1,15 @@
+import { terminalLink } from "termi-link";
+import * as setupDatabasePostgres from "./postgres.js";
+const command = "database <command>";
+const description = "Switch your project's database";
+const builder = (yargs) => yargs.command(setupDatabasePostgres).demandCommand().epilogue(
+  `Also see the ${terminalLink(
+    "CedarJS CLI Reference",
+    "https://cedarjs.com/docs/cli-commands#setup"
+  )}`
+);
+export {
+  builder,
+  command,
+  description
+};

package/dist/commands/setup/database/postgres.js

@@ -0,0 +1,19 @@
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+const command = "postgres";
+const description = "Switch your project from SQLite to PostgreSQL (schema, dependencies, and database adapter)";
+function builder(yargs) {
+  return yargs;
+}
+async function handler() {
+  recordTelemetryAttributes({
+    command: "setup database postgres"
+  });
+  const { handler: handler2 } = await import("./postgresHandler.js");
+  return handler2();
+}
+export {
+  builder,
+  command,
+  description,
+  handler
+};

package/dist/commands/setup/database/postgresHandler.js

@@ -0,0 +1,194 @@
+import fs from "node:fs";
+import path from "node:path";
+import execa from "execa";
+import { Listr } from "listr2";
+import { colors, getPaths, installPackages } from "@cedarjs/cli-helpers";
+import { prettyPrintCedarCommand } from "@cedarjs/cli-helpers/packageManager";
+import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
+import { resolveFile } from "@cedarjs/project-config";
+import { errorTelemetry } from "@cedarjs/telemetry";
+function checkProjectShape(cedarPaths) {
+  const schemaPath = path.join(cedarPaths.api.base, "db", "schema.prisma");
+  const dbPath = resolveFile(path.join(cedarPaths.api.lib, "db"));
+  if (!fs.existsSync(schemaPath)) {
+    return blocked(`Could not find ${schemaPath}.`);
+  }
+  if (!dbPath) {
+    return blocked(`No ${path.join(cedarPaths.api.lib, "db")} file found`);
+  }
+  const schemaContent = fs.readFileSync(schemaPath, "utf-8");
+  const hasPgAdapter = fs.readFileSync(dbPath, "utf-8").includes("PrismaPg");
+  if (schemaContent.includes('provider = "postgresql"') && hasPgAdapter) {
+    return {
+      ok: false,
+      alreadyConverted: true,
+      message: "This project is already configured for PostgreSQL."
+    };
+  }
+  if (!schemaContent.includes('provider = "sqlite"') || hasPgAdapter) {
+    return blocked(
+      "This command only converts a project that is still on SQLite, with the default adapter in api/src/lib/db.ts (or db.js) untouched. This project doesn't match that shape (a different provider, or a partial previous conversion). Please switch it over to PostgreSQL manually."
+    );
+  }
+  return { ok: true, dbPath };
+}
+function blocked(message) {
+  return { ok: false, alreadyConverted: false, message };
+}
+function getSqliteToPostgresTasks({
+  dbPath
+}) {
+  const cedarPaths = getPaths();
+  const schemaPath = path.join(cedarPaths.api.base, "db", "schema.prisma");
+  const rootPkgPath = path.join(cedarPaths.base, "package.json");
+  const apiPkgPath = path.join(cedarPaths.api.base, "package.json");
+  const dbTsTemplatePath = path.join(
+    import.meta.dirname,
+    "templates",
+    "db.ts.template"
+  );
+  return [
+    {
+      title: "Removing SQLite dependencies from api/package.json",
+      task: () => {
+        const pkg = JSON.parse(fs.readFileSync(apiPkgPath, "utf-8"));
+        if (pkg.dependencies) {
+          delete pkg.dependencies["better-sqlite3"];
+          delete pkg.dependencies["@prisma/adapter-better-sqlite3"];
+        }
+        fs.writeFileSync(apiPkgPath, JSON.stringify(pkg, null, 2) + "\n");
+      }
+    },
+    {
+      title: "Removing better-sqlite3 dependenciesMeta",
+      task: () => {
+        if (!fs.existsSync(rootPkgPath)) {
+          return;
+        }
+        const pkg = JSON.parse(fs.readFileSync(rootPkgPath, "utf-8"));
+        if (pkg.dependenciesMeta?.["better-sqlite3"]) {
+          delete pkg.dependenciesMeta["better-sqlite3"];
+          if (Object.keys(pkg.dependenciesMeta).length === 0) {
+            delete pkg.dependenciesMeta;
+          }
+          fs.writeFileSync(rootPkgPath, JSON.stringify(pkg, null, 2) + "\n");
+        }
+      }
+    },
+    {
+      title: "Switching Prisma schema to PostgreSQL",
+      task: () => {
+        const schemaContent = fs.readFileSync(schemaPath, "utf-8");
+        fs.writeFileSync(
+          schemaPath,
+          schemaContent.replace(
+            'provider = "sqlite"',
+            'provider = "postgresql"'
+          )
+        );
+      }
+    },
+    {
+      title: "Updating database adapter",
+      task: () => {
+        const pgDbTs = fs.readFileSync(dbTsTemplatePath, "utf-8");
+        fs.writeFileSync(dbPath, pgDbTs);
+      }
+    },
+    {
+      title: "Adding required api packages...",
+      task: async () => {
+        await addWorkspacePackages("api", ["@prisma/adapter-pg@7.8.0"], {
+          cwd: cedarPaths.api.base
+        });
+      }
+    }
+  ];
+}
+function readEnvVar(envContent, name) {
+  return envContent.match(new RegExp(`^${name}=(.*)$`, "m"))?.[1] || void 0;
+}
+async function handler() {
+  const cedarPaths = getPaths();
+  const shape = checkProjectShape(cedarPaths);
+  if (!shape.ok) {
+    if (shape.alreadyConverted) {
+      console.log(colors.note(shape.message));
+      return;
+    }
+    console.error(colors.error(shape.message));
+    process.exit(1);
+  }
+  const envPath = path.join(cedarPaths.base, ".env");
+  const envContent = fs.existsSync(envPath) ? fs.readFileSync(envPath, "utf-8") : "";
+  const databaseUrl = readEnvVar(envContent, "DATABASE_URL");
+  const tasks = new Listr(
+    [
+      ...getSqliteToPostgresTasks({ dbPath: shape.dbPath }),
+      installPackages,
+      {
+        title: "Running Prisma migrations",
+        skip: () => {
+          if (!databaseUrl) {
+            return `No DATABASE_URL found in \`.env\`. Set it to your PostgreSQL connection string, then run \`${prettyPrintCedarCommand(["prisma", "migrate", "dev"])}\``;
+          }
+          return false;
+        },
+        task: () => {
+          const result = execa.commandSync(
+            "yarn cedar prisma migrate dev --name init-postgres",
+            {
+              cwd: cedarPaths.base,
+              stdio: ["inherit", "inherit", "pipe"],
+              reject: false
+            }
+          );
+          if (result.exitCode !== 0) {
+            throw new Error(
+              "Prisma migration failed:\n\n" + result.stderr + `
+
+You can try running it manually:
+  ${prettyPrintCedarCommand(["prisma", "migrate", "dev", "--name", "init-postgres"])}`
+            );
+          }
+        }
+      }
+    ],
+    {
+      exitOnError: false,
+      collectErrors: "minimal"
+    }
+  );
+  try {
+    await tasks.run();
+    if (tasks.errors.length > 0) {
+      for (const error of tasks.errors) {
+        if (isErrorWithMessage(error)) {
+          errorTelemetry(process.argv, error.message);
+          console.error(colors.error(error.message));
+        }
+      }
+      process.exit(1);
+    }
+  } catch (e) {
+    if (isErrorWithMessage(e)) {
+      errorTelemetry(process.argv, e.message);
+      console.error(colors.error(e.message));
+    }
+    if (isErrorWithExitCode(e)) {
+      process.exit(e.exitCode);
+    }
+    process.exit(1);
+  }
+}
+function isErrorWithMessage(e) {
+  return !!e && typeof e === "object" && "message" in e;
+}
+function isErrorWithExitCode(e) {
+  return !!e && typeof e === "object" && "exitCode" in e && typeof e.exitCode === "number";
+}
+export {
+  checkProjectShape,
+  getSqliteToPostgresTasks,
+  handler
+};

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") {
@@ -54,14 +48,9 @@ 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",
-  "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
-  }
+  "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"
 ];
 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

@@ -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,11 +42,22 @@ 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
 
+  # 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}
 `;
@@ -58,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/dist/commands/setup/docker/templates/Dockerfile.yarn

@@ -94,11 +94,8 @@ ENV NODE_ENV=production
 
 # default api serve command
 # ---------
-# 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" ]
+# See https://cedarjs.com/docs/server-file for customizing the api server
+# (Realtime, custom Fastify plugins, etc).
 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
-      - REDWOOD_API_HOST=0.0.0.0
+      - CEDAR_API_HOST=0.0.0.0
 
   db:
     image: postgres:18-bookworm

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

@@ -4,11 +4,8 @@ services:
       context: .
       dockerfile: ./Dockerfile
       target: api_serve
-    # 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"
+    # See https://cedarjs.com/docs/server-file for customizing the api
+    # server (Realtime, custom Fastify plugins, etc).
     ports:
       - '8911:8911'
     depends_on:

package/dist/commands/setup/neon/neonHandler.js

@@ -3,213 +3,76 @@ import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
 import { colors, getPaths, installPackages } from "@cedarjs/cli-helpers";
-import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
+import { prettyPrintCedarCommand } from "@cedarjs/cli-helpers/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
-const cedarPaths = getPaths();
+import {
+  checkProjectShape,
+  getSqliteToPostgresTasks
+} from "../database/postgresHandler.js";
 async function handler({ force }) {
-  const schemaPath = path.join(cedarPaths.api.base, "db", "schema.prisma");
-  const dbTsPath = path.join(cedarPaths.api.src, "lib", "db.ts");
-  const prismaConfigPathCjs = path.join(
-    cedarPaths.api.base,
-    "prisma.config.cjs"
-  );
-  const prismaConfigPathMts = path.join(
-    cedarPaths.api.base,
-    "prisma.config.mts"
-  );
+  const cedarPaths = getPaths();
+  const shape = checkProjectShape(cedarPaths);
+  if (!shape.ok) {
+    if (shape.alreadyConverted) {
+      console.log(colors.note(shape.message));
+      return;
+    }
+    console.error(colors.error(shape.message));
+    process.exit(1);
+  }
   const envPath = path.join(cedarPaths.base, ".env");
-  const rootPkgPath = path.join(cedarPaths.base, "package.json");
-  const apiPkgPath = path.join(cedarPaths.api.base, "package.json");
-  const dbTsTemplatePath = path.join(
-    import.meta.dirname,
-    "templates",
-    "db.ts.template"
-  );
-  let hasDirectDatabaseUrl = false;
+  let hasExistingDatabaseUrl = false;
   if (fs.existsSync(envPath)) {
-    hasDirectDatabaseUrl = /^DATABASE_URL=/m.test(
+    hasExistingDatabaseUrl = /^DATABASE_URL=/m.test(
       fs.readFileSync(envPath, "utf-8")
     );
   }
+  const skipProvisioning = hasExistingDatabaseUrl && !force;
   const notes = [];
+  if (skipProvisioning) {
+    notes.push(
+      colors.note(
+        "DATABASE_URL is already set in .env. Use --force to overwrite."
+      )
+    );
+  }
   const tasks = new Listr(
     [
+      ...getSqliteToPostgresTasks({ dbPath: shape.dbPath }),
       {
-        title: "Checking current database configuration",
-        task: (ctx) => {
-          const schemaContent = fs.readFileSync(schemaPath, "utf-8");
-          ctx.schemaContent = schemaContent;
-          ctx.isSqlite = schemaContent.includes('provider = "sqlite"');
-          ctx.isPostgres = schemaContent.includes('provider = "postgresql"');
-          if (fs.existsSync(dbTsPath)) {
-            ctx.dbTsContent = fs.readFileSync(dbTsPath, "utf-8");
-            ctx.isNeon = ctx.dbTsContent.includes("PrismaPg");
-          } else {
-            ctx.isNeon = false;
-          }
-          if (!ctx.isSqlite && !ctx.isPostgres) {
-            ctx.unsupportedProvider = true;
-            notes.push(
-              colors.note(
-                "setup neon only supports migrating from SQLite to PostgreSQL. Your project uses a different database provider."
-              )
-            );
-            return;
-          }
-          if (!ctx.isPostgres) {
-            ctx.hasSqliteUsageOutsideDb = hasSqliteUsageOutsideDb(
-              cedarPaths.api.src,
-              dbTsPath
-            );
-          }
-          if (hasDirectDatabaseUrl && !force) {
-            ctx.skipWithNote = true;
-            notes.push(
-              colors.note(
-                "DATABASE_URL is already set in .env. Use --force to overwrite."
-              )
-            );
-          }
-        }
-      },
-      {
-        title: "Removing SQLite dependencies from api/package.json",
-        skip: (ctx) => {
-          if (ctx.unsupportedProvider) {
-            return "Unsupported database provider";
-          }
-          if (ctx.isPostgres) {
-            return "Already configured for PostgreSQL";
-          }
-          if (ctx.hasSqliteUsageOutsideDb) {
-            return "SQLite is in use outside db.ts \u2014 keeping packages";
-          }
-          return false;
-        },
-        task: () => {
-          const pkg = JSON.parse(fs.readFileSync(apiPkgPath, "utf-8"));
-          if (pkg.dependencies) {
-            delete pkg.dependencies["better-sqlite3"];
-            delete pkg.dependencies["@prisma/adapter-better-sqlite3"];
-          }
-          fs.writeFileSync(apiPkgPath, JSON.stringify(pkg, null, 2) + "\n");
-        }
-      },
-      {
-        title: "Removing better-sqlite3 dependenciesMeta",
-        skip: (ctx) => {
-          if (ctx.unsupportedProvider) {
-            return "Unsupported database provider";
-          }
-          if (ctx.isPostgres) {
-            return "Already configured for PostgreSQL";
-          }
-          if (ctx.hasSqliteUsageOutsideDb) {
-            return "SQLite is in use outside db.ts so we're keeping it installed";
-          }
-          return false;
-        },
-        task: () => {
-          if (!fs.existsSync(rootPkgPath)) {
-            return;
-          }
-          const pkg = JSON.parse(fs.readFileSync(rootPkgPath, "utf-8"));
-          if (pkg.dependenciesMeta?.["better-sqlite3"]) {
-            delete pkg.dependenciesMeta["better-sqlite3"];
-            if (Object.keys(pkg.dependenciesMeta).length === 0) {
-              delete pkg.dependenciesMeta;
-            }
-            fs.writeFileSync(rootPkgPath, JSON.stringify(pkg, null, 2) + "\n");
-          }
-        }
-      },
-      {
-        title: "Switching Prisma schema to PostgreSQL",
-        skip: (ctx) => {
-          if (ctx.unsupportedProvider) {
-            return "Unsupported database provider";
-          }
-          if (ctx.isPostgres) {
-            return "Schema is already configured for PostgreSQL";
-          }
-          return false;
-        },
-        task: (ctx) => {
-          const updated = ctx.schemaContent.replace(
-            'provider = "sqlite"',
-            'provider = "postgresql"'
+        title: "Setting DIRECT_DATABASE_URL in Prisma config",
+        skip: () => skipProvisioning,
+        task: (ctx, task) => {
+          const prismaConfigPathCjs = path.join(
+            cedarPaths.api.base,
+            "prisma.config.cjs"
+          );
+          const prismaConfigPathMts = path.join(
+            cedarPaths.api.base,
+            "prisma.config.mts"
           );
-          fs.writeFileSync(schemaPath, updated);
-        }
-      },
-      {
-        title: "Updating database adapter",
-        skip: (ctx) => {
-          if (ctx.unsupportedProvider) {
-            return "Unsupported database provider";
-          }
-          if (ctx.isNeon) {
-            return "Database adapter is already configured for Neon (PrismaPg)";
-          }
-          if (ctx.skipWithNote) {
-            return "DATABASE_URL already configured \u2014 skipping adapter update";
-          }
-          return false;
-        },
-        task: () => {
-          const neonDbTs = fs.readFileSync(dbTsTemplatePath, "utf-8");
-          fs.writeFileSync(dbTsPath, neonDbTs);
-        }
-      },
-      {
-        title: "Updating Prisma config",
-        skip: (ctx) => {
-          if (ctx.unsupportedProvider) {
-            return "Unsupported database provider";
-          }
-          if (ctx.isNeon) {
-            return "Prisma config is already configured for Neon";
-          }
-          if (ctx.skipWithNote) {
-            return "DATABASE_URL already configured \u2014 skipping config update";
-          }
-          return false;
-        },
-        task: () => {
-          if (!fs.existsSync(prismaConfigPathCjs) && !fs.existsSync(prismaConfigPathMts)) {
-            throw new Error(
-              "No Prisma config file found. Expected prisma.config.cjs or prisma.config.mts in the api directory."
-            );
-          }
           const configPath = fs.existsSync(prismaConfigPathCjs) ? prismaConfigPathCjs : prismaConfigPathMts;
           const configContent = fs.readFileSync(configPath, "utf-8");
-          const updated = configContent.replace(
-            /env\(["']DATABASE_URL["']\)/,
-            "env('DIRECT_DATABASE_URL')"
+          const datasourceUrlRegex = /(\burl\s*:\s*)env\(["'][^"']*?["']\)/;
+          if (!datasourceUrlRegex.test(configContent)) {
+            ctx.directDatabaseUrlNotSet = true;
+            task.skip(
+              "Could not set DIRECT_DATABASE_URL. Please manually set datasource.url in " + configPath
+            );
+            return;
+          }
+          fs.writeFileSync(
+            configPath,
+            configContent.replace(
+              datasourceUrlRegex,
+              "$1env('DIRECT_DATABASE_URL')"
+            )
           );
-          fs.writeFileSync(configPath, updated);
-        }
-      },
-      {
-        title: "Adding required api packages...",
-        skip: (ctx) => ctx.unsupportedProvider,
-        task: async () => {
-          await addWorkspacePackages("api", ["@prisma/adapter-pg@7.8.0"], {
-            cwd: cedarPaths.api.base
-          });
         }
       },
       {
         title: "Provisioning Neon database",
-        skip: (ctx) => {
-          if (ctx.unsupportedProvider) {
-            return true;
-          }
-          if (hasDirectDatabaseUrl && !force) {
-            return true;
-          }
-          return false;
-        },
+        skip: () => skipProvisioning,
         task: async (ctx) => {
           const res = await fetch("https://neon.new/api/v1/database", {
             method: "POST",
@@ -239,20 +102,52 @@ async function handler({ force }) {
           ctx.neonClaimExpiry = new Date(data.expires_at).toUTCString();
         }
       },
+      installPackages,
       {
-        title: "Writing database connection to .env",
+        title: "Running Prisma migrations",
         skip: (ctx) => {
-          if (ctx.unsupportedProvider) {
+          if (skipProvisioning) {
             return true;
           }
-          if (hasDirectDatabaseUrl && !force) {
-            return true;
-          }
-          if (!ctx.databaseUrl) {
-            return "No database URL to write (Neon provisioning skipped)";
+          if (ctx.directDatabaseUrlNotSet) {
+            return `Skipping migrations \u2014 could not confirm prisma.config is reading DIRECT_DATABASE_URL, so migrations could target the wrong database. Fix datasource.url, then run \`${prettyPrintCedarCommand(["prisma", "migrate", "dev"])}\` manually.`;
           }
           return false;
         },
+        task: (ctx) => {
+          const result = execa.commandSync(
+            "yarn cedar prisma migrate dev --name init-neon",
+            {
+              cwd: cedarPaths.base,
+              stdio: ["inherit", "inherit", "pipe"],
+              reject: false,
+              env: {
+                ...process.env,
+                DIRECT_DATABASE_URL: ctx.databaseUrlDirect
+              }
+            }
+          );
+          if (result.exitCode !== 0) {
+            throw new Error(
+              "Prisma migration failed:\n\n" + result.stderr + `
+
+You can try running it manually:
+  ${prettyPrintCedarCommand(["prisma", "migrate", "dev", "--name", "init-neon"])}`
+            );
+          }
+        }
+      },
+      {
+        title: "Writing database connection to .env",
+        // Deliberately runs after migrations, not before — with
+        // `exitOnError: true`, a migration failure stops the list here and
+        // this task never runs. That means a project whose migrations
+        // failed never has DATABASE_URL/DIRECT_DATABASE_URL written to
+        // .env, so it's never left pointing at a Neon database it doesn't
+        // know it needs to claim. Provisioning that database anyway (and
+        // letting it expire unclaimed) is fine — it's exactly as if the
+        // command were re-run from scratch, which is safe.
+        skip: () => skipProvisioning,
         task: (ctx) => {
           let envContent = "";
           if (fs.existsSync(envPath)) {
@@ -275,49 +170,10 @@ async function handler({ force }) {
           fs.writeFileSync(envPath, envContent);
         }
       },
-      installPackages,
-      {
-        title: "Running Prisma migrations",
-        skip: (ctx) => {
-          if (ctx.unsupportedProvider) {
-            return true;
-          }
-          if (ctx.skipWithNote) {
-            return "DATABASE_URL already configured \u2014 skipping migration";
-          }
-          if (!ctx.databaseUrl) {
-            return "No database provisioned \u2014 skipping migration";
-          }
-          return false;
-        },
-        task: (ctx) => {
-          const result = execa.commandSync(
-            "yarn cedar prisma migrate dev --name init-neon",
-            {
-              cwd: cedarPaths.base,
-              stdio: ["inherit", "inherit", "pipe"],
-              reject: false,
-              env: {
-                ...process.env,
-                DIRECT_DATABASE_URL: ctx.databaseUrlDirect
-              }
-            }
-          );
-          if (result.exitCode !== 0) {
-            throw new Error(
-              "Prisma migration failed:\n\n" + result.stderr + "\n\nYou can try running it manually:\n  yarn cedar prisma migrate dev --name init-neon"
-            );
-          }
-        }
-      },
       {
         title: "One more thing...",
         task: (ctx, task) => {
-          if (ctx.unsupportedProvider) {
-            task.output = "Skipped \u2014 unsupported database provider";
-            return;
-          }
-          if (ctx.skipWithNote) {
+          if (skipProvisioning) {
             task.output = "Skipped \u2014 DATABASE_URL already configured";
             return;
           }
@@ -336,7 +192,11 @@ async function handler({ force }) {
       }
     ],
     {
-      exitOnError: false
+      // Migrations run before .env is written (see above) specifically so
+      // that a failure here — the one step that shouldn't be allowed to
+      // continue — stops the whole list via the default exitOnError
+      // behavior, rather than needing every later task to know to skip.
+      exitOnError: true
     }
   );
   try {
@@ -362,24 +222,6 @@ function isErrorWithMessage(e) {
 function isErrorWithExitCode(e) {
   return !!e && typeof e === "object" && "exitCode" in e && typeof e.exitCode === "number";
 }
-function hasSqliteUsageOutsideDb(srcPath, dbTsPath) {
-  const sqlitePattern = /better-sqlite3|@prisma\/adapter-better-sqlite3/;
-  const files = fs.globSync("**/*.{ts,tsx,js,jsx}", { cwd: srcPath });
-  for (const file of files) {
-    const fullPath = path.join(srcPath, file);
-    if (fullPath === dbTsPath) {
-      continue;
-    }
-    try {
-      const content = fs.readFileSync(fullPath, "utf-8");
-      if (sqlitePattern.test(content)) {
-        return true;
-      }
-    } catch {
-    }
-  }
-  return false;
-}
 export {
   handler
 };

package/dist/commands/setup.js

@@ -2,6 +2,7 @@ import { terminalLink } from "termi-link";
 import { detectCedarVersion } from "../middleware/detectProjectCedarVersion.js";
 import * as setupAuth from "./setup/auth/auth.js";
 import * as setupCache from "./setup/cache/cache.js";
+import * as setupDatabase from "./setup/database/database.js";
 import * as setupDeploy from "./setup/deploy/deploy.js";
 import * as setupDocker from "./setup/docker/docker.js";
 import * as setupGenerator from "./setup/generator/generator.js";
@@ -20,7 +21,7 @@ import * as setupUi from "./setup/ui/ui.js";
 import * as setupUploads from "./setup/uploads/uploads.js";
 const command = "setup <command>";
 const description = "Initialize project config and install packages";
-const builder = (yargs) => yargs.command(setupAuth).command(setupCache).command(setupDeploy).command(setupDocker).command(setupGenerator).command(setupGraphql).command(setupI18n).command(setupJobs).command(setupMailer).command(setupMiddleware).command(setupMonitoring).command(setupNeon).command(setupPackage).command(setupRealtime).command(setupServerFile).command(setupTsconfig).command(setupUi).command(setupUploads).demandCommand().middleware(detectCedarVersion).epilogue(
+const builder = (yargs) => yargs.command(setupAuth).command(setupCache).command(setupDatabase).command(setupDeploy).command(setupDocker).command(setupGenerator).command(setupGraphql).command(setupI18n).command(setupJobs).command(setupMailer).command(setupMiddleware).command(setupMonitoring).command(setupNeon).command(setupPackage).command(setupRealtime).command(setupServerFile).command(setupTsconfig).command(setupUi).command(setupUploads).demandCommand().middleware(detectCedarVersion).epilogue(
   `Also see the ${terminalLink(
     "CedarJS CLI Reference",
     "https://cedarjs.com/docs/cli-commands#setup"

package/dist/lib/index.js

@@ -305,20 +305,35 @@ const cleanupEmptyDirsTask = (files) => {
     })
   );
 };
-function wrapWithSet(routesContent, layout, routes, newLineAndIndent, props = {}) {
+function wrapWithSet(routesContent, layout, routes, newLineAndIndent, props = {}, privateSetProps) {
   const [_, indentOne, indentTwo] = routesContent.match(
     /([ \t]*)<Router.*?>[^<]*[\r\n]+([ \t]+)/
   ) || ["", "", ""];
   const oneLevelIndent = indentTwo.slice(0, indentTwo.length - indentOne.length);
-  const newRoutesWithExtraIndent = routes.map((route) => oneLevelIndent + route);
   const propsString = Object.entries(props).map((values) => `${values[0]}="${values[1]}"`).join(" ");
+  if (!privateSetProps) {
+    const newRoutesWithExtraIndent2 = routes.map(
+      (route) => oneLevelIndent + route
+    );
+    return [
+      `<Set wrap={${layout}}${propsString && " " + propsString}>`,
+      ...newRoutesWithExtraIndent2,
+      `</Set>`
+    ].join(newLineAndIndent);
+  }
+  const privateSetPropsString = Object.entries(privateSetProps).map((values) => `${values[0]}="${values[1]}"`).join(" ");
+  const newRoutesWithExtraIndent = routes.map(
+    (route) => oneLevelIndent + oneLevelIndent + route
+  );
   return [
-    `<Set wrap={${layout}}${propsString && " " + propsString}>`,
+    `<PrivateSet${privateSetPropsString && " " + privateSetPropsString}>`,
+    `${oneLevelIndent}<Set wrap={${layout}}${propsString && " " + propsString}>`,
     ...newRoutesWithExtraIndent,
-    `</Set>`
+    `${oneLevelIndent}</Set>`,
+    `</PrivateSet>`
   ].join(newLineAndIndent);
 }
-function addRoutesToRouterTask(routes, layout, setProps = {}) {
+function addRoutesToRouterTask(routes, layout, setProps = {}, privateSetProps) {
   const cedarPaths = getPaths();
   const routesContent = readFile(cedarPaths.web.routes).toString();
   let newRoutes = routes.filter((route) => !routesContent.match(route));
@@ -342,7 +357,8 @@ ${route}`);
       layout,
       newRoutes,
       newLineAndIndent,
-      setProps
+      setProps,
+      privateSetProps
     ) : newRoutes.join(newLineAndIndent);
     const newRoutesContent = routesContent.replace(
       routerStart,

package/dist/telemetry/resource.js

@@ -7,13 +7,10 @@ import system from "systeminformation";
 import { v4 as uuidv4, validate as validateUUID } from "uuid";
 import { getPaths, getRawConfig } from "@cedarjs/project-config";
 import { RWProject } from "@cedarjs/structure/dist/model/RWProject";
-import {
-  name as _packageName,
-  version as _packageVersion
-} from "../../package.js";
-const packageName = _packageName;
-const packageVersion = _packageVersion;
 async function getResources() {
+  const packageJson = await import("../../package.json", { with: { type: "json" } });
+  const packageName = packageJson.default["name"];
+  const packageVersion = packageJson.default["version"];
   let UID = uuidv4();
   try {
     const telemetryFile = path.join(getPaths().generated.base, "telemetry.txt");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-rc.189",
+  "version": "6.0.0-rc.221",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -31,19 +31,22 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
+    "@babel/core": "^7.26.10",
     "@babel/parser": "7.29.7",
     "@babel/preset-typescript": "7.29.7",
-    "@cedarjs/api-server": "6.0.0-rc.189",
-    "@cedarjs/cli-helpers": "6.0.0-rc.189",
-    "@cedarjs/fastify-web": "6.0.0-rc.189",
-    "@cedarjs/internal": "6.0.0-rc.189",
-    "@cedarjs/prerender": "6.0.0-rc.189",
-    "@cedarjs/project-config": "6.0.0-rc.189",
-    "@cedarjs/structure": "6.0.0-rc.189",
-    "@cedarjs/telemetry": "6.0.0-rc.189",
-    "@cedarjs/utils": "6.0.0-rc.189",
-    "@cedarjs/vite": "6.0.0-rc.189",
-    "@cedarjs/web-server": "6.0.0-rc.189",
+    "@babel/traverse": "7.29.7",
+    "@babel/types": "7.29.7",
+    "@cedarjs/api-server": "6.0.0-rc.221",
+    "@cedarjs/babel-config": "6.0.0-rc.221",
+    "@cedarjs/cli-helpers": "6.0.0-rc.221",
+    "@cedarjs/internal": "6.0.0-rc.221",
+    "@cedarjs/prerender": "6.0.0-rc.221",
+    "@cedarjs/project-config": "6.0.0-rc.221",
+    "@cedarjs/structure": "6.0.0-rc.221",
+    "@cedarjs/telemetry": "6.0.0-rc.221",
+    "@cedarjs/utils": "6.0.0-rc.221",
+    "@cedarjs/vite": "6.0.0-rc.221",
+    "@cedarjs/web-server": "6.0.0-rc.221",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -61,7 +64,6 @@
     "ci-info": "4.4.0",
     "concurrently": "9.2.4",
     "configstore": "7.1.0",
-    "cross-env": "7.0.3",
     "decamelize": "6.0.1",
     "dotenv-defaults": "5.0.2",
     "enquirer": "2.4.1",
@@ -80,7 +82,6 @@
     "prettier": "3.8.4",
     "prisma": "7.8.0",
     "prompts": "2.4.2",
-    "rimraf": "6.1.3",
     "semver": "7.7.4",
     "smol-toml": "1.6.1",
     "srvx": "0.11.16",
@@ -93,8 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@babel/cli": "7.29.7",
-    "@babel/core": "^7.26.10",
+    "@cedarjs/framework-tools": "6.0.0-rc.221",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.64.0",