@cedarjs/cli 1.1.1-next.21 → 1.1.1-rc.3

package/dist/commands/buildHandler.js

@@ -29,14 +29,14 @@ const handler = async ({
   const rwjsConfig = getConfig();
   const useFragments = rwjsConfig.graphql?.fragments;
   const useTrustedDocuments = rwjsConfig.graphql?.trustedDocuments;
-  const prismaSchemaExists = fs.existsSync(rwjsPaths.api.prismaConfig);
+  const prismaSchemaExists = fs.existsSync(rwjsPaths.api.dbSchema);
   const prerenderRoutes = prerender && side.includes("web") ? detectPrerenderRoutes() : [];
   const shouldGeneratePrismaClient = prisma && prismaSchemaExists && (side.includes("api") || prerenderRoutes.length > 0);
   const tasks = [
     shouldGeneratePrismaClient && {
       title: "Generating Prisma Client...",
-      task: async () => {
-        const { cmd, args } = await generatePrismaCommand();
+      task: () => {
+        const { cmd, args } = generatePrismaCommand(rwjsPaths.api.dbSchema);
         return execa(cmd, args, {
           stdio: verbose ? "inherit" : "pipe",
           shell: true,

package/dist/commands/deploy/baremetal/baremetalHandler.js

@@ -19,8 +19,7 @@ const DEFAULT_SERVER_CONFIG = {
   packageManagerCommand: "yarn",
   monitorCommand: "pm2",
   sides: ["api", "web"],
-  keepReleases: 5,
-  freeSpaceRequired: 2048
+  keepReleases: 5
 };
 const pathJoin = path.posix.join;
 const throwMissingConfig = (name) => {
@@ -49,7 +48,7 @@ const verifyServerConfig = (config) => {
   if (!config.repo) {
     throwMissingConfig("repo");
   }
-  if (!/^\d+$/.test(config.freeSpaceRequired)) {
+  if (config.freeSpaceRequired && !/^\d+$/.test(config.freeSpaceRequired)) {
     throw new Error('"freeSpaceRequired" must be an integer >= 0');
   }
   return true;
@@ -233,8 +232,15 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
             10
           );
           if (dfMb < freeSpaceRequired) {
+            if (typeof serverConfig.freeSpaceRequired === "undefined") {
+              return task.skip(
+                c.warning(
+                  `Warning: Your server is running low on disk space. (${Math.round(dfMb)}MB available)`
+                )
+              );
+            }
             throw new Error(
-              `Not enough disk space. You need at least ${freeSpaceRequired}MB free space to continue. (Currently ${Math.round(dfMb)}MB available)`
+              `Not enough disk space. You need at least ${freeSpaceRequired}MB free space to continue.`
             );
           }
         }

package/dist/commands/deploy/flightcontrol.js

@@ -26,7 +26,6 @@ const builder = (yargs) => {
       "https://cedarjs.com/docs/cli-commands#deploy"
     )}`
   );
-  return yargs;
 };
 async function handler(yargs) {
   const { handler: importedHandler } = await import("./flightcontrolHandler.js");

package/dist/commands/deploy/flightcontrolHandler.js

@@ -3,12 +3,7 @@ import execa from "execa";
 import fs from "fs-extra";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getPaths } from "@cedarjs/project-config";
-const handler = async ({
-  side,
-  serve,
-  prisma,
-  dm: dataMigrate
-}) => {
+const handler = async ({ side, serve, prisma, dm: dataMigrate }) => {
   recordTelemetryAttributes({
     command: "deploy flightcontrol",
     side,
@@ -22,26 +17,20 @@ const handler = async ({
     shell: true,
     stdio: "inherit"
   };
-  async function runExecaCommand(command) {
-    const result = await execa.command(command, execaConfig);
-    if (result.failed) {
-      throw new Error(`Command (${command}) failed`);
-    }
-    return result;
-  }
   async function runApiCommands() {
     if (!serve) {
       console.log("Building api...");
-      await runExecaCommand("yarn rw build api --verbose");
+      execa.commandSync("yarn rw build api --verbose", execaConfig);
       if (prisma) {
         console.log("Running database migrations...");
-        await runExecaCommand(
-          `node_modules/.bin/prisma migrate deploy --config "${rwjsPaths.api.prismaConfig}"`
+        execa.commandSync(
+          `node_modules/.bin/prisma migrate deploy --schema "${rwjsPaths.api.dbSchema}"`,
+          execaConfig
         );
       }
       if (dataMigrate) {
         console.log("Running data migrations...");
-        await runExecaCommand("yarn rw dataMigrate up");
+        execa.commandSync("yarn rw dataMigrate up", execaConfig);
       }
       return;
     }
@@ -56,12 +45,12 @@ const handler = async ({
   }
   async function runWebCommands() {
     console.log("Building web...");
-    await runExecaCommand("yarn rw build web --verbose");
+    execa.commandSync("yarn rw build web --verbose", execaConfig);
   }
   if (side === "api") {
-    await runApiCommands();
+    runApiCommands();
   } else if (side === "web") {
-    await runWebCommands();
+    runWebCommands();
   }
 };
 export {

package/dist/commands/deploy/renderHandler.js

@@ -10,9 +10,9 @@ const handler = async ({ side, prisma, dataMigrate }) => {
     prisma,
     dataMigrate
   });
-  const cedarPaths = getPaths();
+  const rwjsPaths = getPaths();
   const execaConfig = {
-    cwd: cedarPaths.base,
+    cwd: rwjsPaths.base,
     shell: true,
     stdio: "inherit"
   };
@@ -20,14 +20,14 @@ const handler = async ({ side, prisma, dataMigrate }) => {
     if (prisma) {
       console.log("Running database migrations...");
       execa.commandSync(
-        `node_modules/.bin/prisma migrate deploy --config "${cedarPaths.api.prismaConfig}"`,
+        `node_modules/.bin/prisma migrate deploy --schema "${rwjsPaths.api.dbSchema}"`,
         execaConfig
       );
     }
     if (dataMigrate) {
       console.log("Running data migrations...");
       const packageJson = fs.readJsonSync(
-        path.join(cedarPaths.base, "package.json")
+        path.join(rwjsPaths.base, "package.json")
       );
       const hasDataMigratePackage = !!packageJson.devDependencies["@cedarjs/cli-data-migrate"];
       if (!hasDataMigratePackage) {
@@ -43,10 +43,10 @@ const handler = async ({ side, prisma, dataMigrate }) => {
           ].join("\n")
         );
       } else {
-        execa.commandSync("yarn cedar dataMigrate up", execaConfig);
+        execa.commandSync("yarn rw dataMigrate up", execaConfig);
       }
     }
-    const serverFilePath = path.join(cedarPaths.api.dist, "server.js");
+    const serverFilePath = path.join(rwjsPaths.api.dist, "server.js");
     const hasServerFile = fs.pathExistsSync(serverFilePath);
     if (hasServerFile) {
       execa(`yarn node ${serverFilePath}`, execaConfig);
@@ -57,7 +57,7 @@ const handler = async ({ side, prisma, dataMigrate }) => {
   }
   async function runWebCommands() {
     execa.commandSync("yarn install", execaConfig);
-    execa.commandSync("yarn cedar build web --verbose", execaConfig);
+    execa.commandSync("yarn rw build web --verbose", execaConfig);
   }
   if (side === "api") {
     runApiCommands();

package/dist/commands/devHandler.js

@@ -81,7 +81,8 @@ const handler = async ({
     try {
       await generatePrismaClient({
         verbose: false,
-        force: false
+        force: false,
+        schema: rwjsPaths.api.dbSchema
       });
     } catch (e) {
       errorTelemetry(

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -4,11 +4,7 @@ import execa from "execa";
 import fs from "fs-extra";
 import { Listr } from "listr2";
 import { addApiPackages } from "@cedarjs/cli-helpers";
-import {
-  getConfigPath,
-  resolveFile,
-  getSchemaPath
-} from "@cedarjs/project-config";
+import { getConfigPath, resolveFile } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../lib/index.js";
@@ -130,8 +126,8 @@ const handler = async ({ force, verbose }) => {
   const prismaTasks = [
     {
       title: "Setup Prisma OpenTelemetry...",
-      task: async (_ctx, task) => {
-        const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
+      task: (_ctx, task) => {
+        const schemaPath = path.join(getPaths().api.db, "schema.prisma");
         const schemaContent = fs.readFileSync(schemaPath, {
           encoding: "utf-8",
           flag: "r"

package/dist/commands/generate/dataMigration/dataMigration.js

@@ -4,7 +4,6 @@ import fs from "fs-extra";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { getDataMigrationsPath } from "@cedarjs/project-config";
 import c from "../../../lib/colors.js";
 import { getPaths, writeFilesTask } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
@@ -30,16 +29,13 @@ const TEMPLATE_PATHS = {
     "dataMigration.ts.template"
   )
 };
-const files = async ({ name, typescript }) => {
+const files = ({ name, typescript }) => {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const timestamp = now.split(".")[0].replace(/\D/g, "");
   const basename = `${timestamp}-${paramCase(name)}`;
   const extension = typescript ? "ts" : "js";
   const outputFilename = basename + "." + extension;
-  const dataMigrationsPath = await getDataMigrationsPath(
-    getPaths().api.prismaConfig
-  );
-  const outputPath = path.join(dataMigrationsPath, outputFilename);
+  const outputPath = path.join(getPaths().api.dataMigrations, outputFilename);
   return {
     [outputPath]: fs.readFileSync(TEMPLATE_PATHS[extension]).toString()
   };
@@ -76,8 +72,8 @@ const handler = async (args) => {
     [
       {
         title: "Generating data migration file...",
-        task: async () => {
-          return writeFilesTask(await files(args));
+        task: () => {
+          return writeFilesTask(files(args));
         }
       },
       {

package/dist/commands/generate/helpers.js

@@ -55,7 +55,7 @@ const mapPrismaScalarToPagePropTsType = (scalarType) => {
     Float: "number",
     Decimal: "number",
     DateTime: "string",
-    Bytes: "Uint8Array"
+    Bytes: "Buffer"
   };
   return prismaScalarToTsType[scalarType] || "unknown";
 };

package/dist/commands/generate/service/serviceHandler.js

@@ -52,7 +52,7 @@ const scenarioFieldValue = (field) => {
     case "String":
       return field.isUnique ? `String${randInt}` : "String";
     case "Bytes":
-      return `new Uint8Array([${randIntArray}])`;
+      return `Buffer.from([${randIntArray}])`;
     default: {
       if (field.kind === "enum" && field.enumValues[0]) {
         return field.enumValues[0].dbName || field.enumValues[0].name;
@@ -118,10 +118,7 @@ const buildStringifiedScenario = async (model) => {
     }
     return value;
   });
-  return jsonString.replace(
-    /"new Uint8Array\(([^)]+)\)"/g,
-    "new Uint8Array($1)"
-  );
+  return jsonString.replace(/"Buffer\.from\(([^)]+)\)"/g, "Buffer.from($1)");
 };
 const fieldTypes = async (model) => {
   const { scalarFields } = await parseSchema(model);

package/dist/commands/generate/service/templates/test.ts.template

@@ -29,7 +29,7 @@
     })
 
     // Not all values can be represented as JSON, like function invocations
-    return jsonString.replace(/"new Uint8Array\(([^)]+)\)"/g, 'new Uint8Array($1)')
+    return jsonString.replace(/"Buffer\.from\(([^)]+)\)"/g, 'Buffer.from($1)')
   } %>
 <% if (prismaImport) { %>import { Prisma, ${prismaModel} } from '@prisma/client'<% } else { %>import type { ${prismaModel} } from '@prisma/client'<% } %>
 

package/dist/commands/prismaHandler.js

@@ -18,14 +18,22 @@ const handler = async ({ _, $0, commands = [], ...options }) => {
   }
   const hasHelpOption = options.help || options.h;
   if (!hasHelpOption) {
-    if (!fs.existsSync(rwjsPaths.api.prismaConfig)) {
-      console.error();
-      console.error(c.error("No Prisma config file found."));
-      console.error(`Cedar searched here '${rwjsPaths.api.prismaConfig}'`);
-      console.error();
-      process.exit(1);
+    if (["generate", "introspect", "db", "migrate", "studio", "format"].includes(
+      commands[0]
+    )) {
+      const schemaDir = path.dirname(rwjsPaths.api.dbSchema);
+      if (!fs.existsSync(rwjsPaths.api.dbSchema) && !fs.existsSync(schemaDir)) {
+        console.error();
+        console.error(c.error("No Prisma Schema found."));
+        console.error(`Redwood searched here '${rwjsPaths.api.dbSchema}'`);
+        console.error();
+        process.exit(1);
+      }
+      options.schema = `${rwjsPaths.api.dbSchema}`;
+      if (["seed", "diff"].includes(commands[1])) {
+        delete options.schema;
+      }
     }
-    options.config = `${rwjsPaths.api.prismaConfig}`;
   }
   const args = commands;
   for (const [name, value] of Object.entries(options)) {
@@ -57,10 +65,10 @@ const handler = async ({ _, $0, commands = [], ...options }) => {
 };
 const printWrapInfo = () => {
   const message = [
-    c.bold("Cedar CLI wraps Prisma CLI"),
+    c.bold("Redwood CLI wraps Prisma CLI"),
     "",
-    "Use `yarn cedar prisma` to automatically pass `--config` and `--preview-feature` options.",
-    "Use `yarn prisma` to skip Cedar's automatic CLI options.",
+    "Use `yarn rw prisma` to automatically pass `--schema` and `--preview-feature` options.",
+    "Use `yarn prisma` to skip Redwood CLI automatic options.",
     "",
     "Find more information in our docs:",
     c.underline("https://cedarjs.com/docs/cli-commands#prisma")

package/dist/commands/record/init.js

@@ -4,7 +4,7 @@ const handler = async () => {
     command: "record"
   });
   const { parseDatamodel } = await import("@cedarjs/record");
-  await parseDatamodel();
+  parseDatamodel();
 };
 export {
   handler

package/dist/commands/serve.js

@@ -33,7 +33,12 @@ const builder = async (yargs) => {
         const { bothSsrRscServerHandler } = await import("./serveBothHandler.js");
         await 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({

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

@@ -12,7 +12,7 @@ import { errorTelemetry } from "@cedarjs/telemetry";
 import { printSetupNotes } from "../../../../lib/index.js";
 import { serverFileExists } from "../../../../lib/project.js";
 import { addFilesTask } from "../helpers/index.js";
-const { getSchemaWithPath, getConfig } = prismaInternals;
+const { getSchema, getConfig } = prismaInternals;
 const redwoodProjectPaths = getPaths();
 const EXTENSION = isTypeScriptProject ? "ts" : "js";
 async function handler({ force }) {
@@ -57,8 +57,8 @@ async function getAddCoherenceFilesTask(force) {
   });
 }
 async function getCoherenceConfigFileContent() {
-  const result = await getSchemaWithPath(redwoodProjectPaths.api.dbSchema);
-  const prismaConfig = await getConfig({ datamodel: result.schemas });
+  const prismaSchema = await getSchema(redwoodProjectPaths.api.dbSchema);
+  const prismaConfig = await getConfig({ datamodel: prismaSchema });
   let db = prismaConfig.datasources[0].activeProvider;
   if (!SUPPORTED_DATABASES.includes(db)) {
     throw new Error(

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

@@ -18,7 +18,7 @@ import {
   postgresDatabaseService,
   mysqlDatabaseService
 } from "../templates/flightcontrol.js";
-const { getSchemaWithPath, getConfig } = prismaInternals;
+const { getSchema, getConfig } = prismaInternals;
 const getFlightcontrolJson = async (database) => {
   if (database === "none") {
     return {
@@ -29,10 +29,10 @@ const getFlightcontrolJson = async (database) => {
   if (!fs.existsSync(path.join(getPaths().base, "api/db/schema.prisma"))) {
     throw new Error("Could not find prisma schema at 'api/db/schema.prisma'");
   }
-  const result = await getSchemaWithPath(
+  const schema = await getSchema(
     path.join(getPaths().base, "api/db/schema.prisma")
   );
-  const config = await getConfig({ datamodel: result.schemas });
+  const config = await getConfig({ datamodel: schema });
   const detectedDatabase = config.datasources[0].activeProvider;
   if (detectedDatabase === database) {
     let dbService;

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

@@ -17,7 +17,7 @@ import {
   RENDER_YAML,
   SQLITE_YAML
 } from "../templates/render.js";
-const { getSchemaWithPath, getConfig } = prismaInternals;
+const { getSchema, getConfig } = prismaInternals;
 const getRenderYamlContent = async (database) => {
   if (database === "none") {
     return {
@@ -28,8 +28,8 @@ const getRenderYamlContent = async (database) => {
   if (!fs.existsSync("api/db/schema.prisma")) {
     throw new Error("Could not find prisma schema at 'api/db/schema.prisma'");
   }
-  const { schemas } = await getSchemaWithPath("api/db/schema.prisma");
-  const config = await getConfig({ datamodel: schemas });
+  const schema = await getSchema("api/db/schema.prisma");
+  const config = await getConfig({ datamodel: schema });
   const detectedDatabase = config.datasources[0].activeProvider;
   if (detectedDatabase === database) {
     switch (database) {

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

@@ -2,7 +2,6 @@ import path from "path";
 import fs from "fs-extra";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { getSchemaPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../../../lib/colors.js";
 import {
@@ -57,16 +56,15 @@ const files = [
     content: SERVERLESS_WEB_YML
   }
 ];
-const prismaBinaryTargetAdditions = async () => {
-  const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
-  const content = fs.readFileSync(schemaPath).toString();
+const prismaBinaryTargetAdditions = () => {
+  const content = fs.readFileSync(getPaths().api.dbSchema).toString();
   if (!content.includes("rhel-openssl-1.0.x")) {
     const result = content.replace(
       /binaryTargets =.*\n/,
       `binaryTargets = ["native", "rhel-openssl-1.0.x"]
 `
     );
-    fs.writeFileSync(schemaPath, result);
+    fs.writeFileSync(getPaths().api.dbSchema, result);
   }
 };
 const updateRedwoodTomlTask = () => {
@@ -121,7 +119,7 @@ const handler = async ({ force }) => {
       }),
       {
         title: "Adding necessary Prisma binaries...",
-        task: async () => await prismaBinaryTargetAdditions()
+        task: () => prismaBinaryTargetAdditions()
       },
       printSetupNotes(notes)
     ],

package/dist/commands/setup/jobs/jobsHandler.js

@@ -3,11 +3,9 @@ import * as path from "node:path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import { addApiPackages } from "@cedarjs/cli-helpers";
-import { getSchemaPath } from "@cedarjs/project-config";
 import c from "../../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
-const { getDMMF, getSchemaWithPath } = prismaInternals;
 const MODEL_SCHEMA = `
 model BackgroundJob {
   id        Int       @id @default(autoincrement())
@@ -26,16 +24,15 @@ model BackgroundJob {
 }
 `;
 const getModelNames = async () => {
-  const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
-  const { schemas } = await getSchemaWithPath(schemaPath);
-  const schema = await getDMMF({ datamodel: schemas });
+  const schema = await prismaInternals.getDMMF({
+    datamodelPath: getPaths().api.dbSchema
+  });
   return schema.datamodel.models.map((model) => model.name);
 };
-const addDatabaseModel = async () => {
-  const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
-  const schema = fs.readFileSync(schemaPath, "utf-8");
+const addDatabaseModel = () => {
+  const schema = fs.readFileSync(getPaths().api.dbSchema, "utf-8");
   const schemaWithUser = schema + MODEL_SCHEMA;
-  fs.writeFileSync(schemaPath, schemaWithUser);
+  fs.writeFileSync(getPaths().api.dbSchema, schemaWithUser);
 };
 const tasks = async ({ force }) => {
   const modelExists = (await getModelNames()).includes("BackgroundJob");
@@ -47,8 +44,8 @@ const tasks = async ({ force }) => {
     [
       {
         title: "Creating job database model...",
-        task: async () => {
-          await addDatabaseModel();
+        task: () => {
+          addDatabaseModel();
         },
         skip: () => {
           if (modelExists) {

package/dist/commands/type-checkHandler.js

@@ -38,7 +38,8 @@ const handler = async ({ sides, verbose, prisma, generate }) => {
   };
   if (generate && prisma) {
     await generatePrismaClient({
-      verbose
+      verbose,
+      schema: getPaths().api.dbSchema
     });
   }
   if (generate) {

package/dist/commands/upgrade.js

@@ -35,11 +35,6 @@ const builder = (yargs) => {
     description: "Skip dedupe check with --no-dedupe",
     type: "boolean",
     default: true
-  }).option("yes", {
-    alias: "y",
-    describe: "Skip prompts and use defaults",
-    default: false,
-    type: "boolean"
   }).epilogue(
     `Also see the ${terminalLink(
       "CedarJS CLI Reference for the upgrade command",
@@ -69,42 +64,16 @@ const validateTag = (tag) => {
   }
   return tag;
 };
-const handler = async ({ dryRun, tag, verbose, dedupe, yes }) => {
+const handler = async ({ dryRun, tag, verbose, dedupe }) => {
   recordTelemetryAttributes({
     command: "upgrade",
     dryRun,
     tag,
     verbose,
-    dedupe,
-    yes
+    dedupe
   });
   const tasks = new Listr(
     [
-      {
-        title: "Confirm upgrade",
-        task: async (ctx, task) => {
-          if (yes) {
-            task.skip("Skipping confirmation prompt because of --yes flag.");
-            return;
-          }
-          const proceed = await task.prompt({
-            type: "Confirm",
-            message: "This will upgrade your RedwoodJS project to the latest version. Do you want to proceed?",
-            initial: "Y",
-            default: "(Yes/no)",
-            format: function(value) {
-              if (this.state.submitted) {
-                return this.isTrue(value) ? "yes" : "no";
-              }
-              return "Yes";
-            }
-          });
-          if (!proceed) {
-            task.skip("Upgrade cancelled by user.");
-            process.exit(0);
-          }
-        }
-      },
       {
         title: "Checking latest version",
         task: async (ctx) => setLatestVersionToContext(ctx, tag)
@@ -195,7 +164,7 @@ const handler = async ({ dryRun, tag, verbose, dedupe, yes }) => {
       }
     ],
     {
-      renderer: verbose ? "verbose" : "default",
+      renderer: verbose && "verbose",
       rendererOptions: { collapseSubtasks: false }
     }
   );
@@ -415,7 +384,8 @@ async function refreshPrismaClient(task, { verbose }) {
   try {
     await generatePrismaClient({
       verbose,
-      force: false
+      force: false,
+      schema: getPaths().api.dbSchema
     });
   } catch (e) {
     task.skip("Refreshing the Prisma client caused an Error.");

package/dist/lib/generatePrismaClient.js

@@ -2,19 +2,35 @@ import { createRequire } from "node:module";
 import path from "node:path";
 import fs from "fs-extra";
 import { runCommandTask, getPaths } from "../lib/index.js";
-const generatePrismaCommand = async () => {
+const skipTask = (schema = getPaths().api.dbSchema) => {
+  if (!fs.existsSync(schema)) {
+    console.log(
+      `Skipping database and Prisma client generation, no \`schema.prisma\` file found: \`${schema}\``
+    );
+    return true;
+  }
+  return false;
+};
+const generatePrismaCommand = (schema) => {
+  if (skipTask(schema)) {
+    return {};
+  }
   const createdRequire = createRequire(import.meta.url);
   const prismaIndexPath = createdRequire.resolve("prisma/build/index.js");
   return {
     cmd: `node "${prismaIndexPath}"`,
-    args: ["generate", `--config="${getPaths().api.prismaConfig}"`]
+    args: ["generate", schema && `--schema="${schema}"`]
   };
 };
 const generatePrismaClient = async ({
   verbose = true,
   force = true,
-  silent = false
+  silent = false,
+  schema = getPaths().api.dbSchema
 }) => {
+  if (skipTask(schema)) {
+    return;
+  }
   if (!force) {
     const prismaClientPath = path.join(
       getPaths().base,
@@ -29,7 +45,7 @@ const generatePrismaClient = async ({
     [
       {
         title: "Generating the Prisma client...",
-        ...await generatePrismaCommand()
+        ...generatePrismaCommand(schema)
       }
     ],
     {

package/dist/lib/schemaHelpers.js

@@ -1,9 +1,8 @@
 import prismaInternals from "@prisma/internals";
-import { getSchemaPath } from "@cedarjs/project-config";
 import { ensureUniquePlural } from "./pluralHelpers.js";
 import { singularize, isPlural } from "./rwPluralize.js";
 import { getPaths } from "./index.js";
-const { getConfig, getDMMF, getSchemaWithPath } = prismaInternals;
+const { getConfig, getDMMF, getSchema: getSchemaPrisma } = prismaInternals;
 const schemaMemo = {};
 const getExistingModelName = async (name) => {
   if (!name) {
@@ -63,20 +62,15 @@ const getEnum = async (name) => {
   }
   return model;
 };
-const getDataModel = async () => {
-  const prismaConfigPath = getPaths().api.prismaConfig;
-  const schemaPath = await getSchemaPath(prismaConfigPath);
-  const result = await getSchemaWithPath(schemaPath);
-  return result.schemas;
+const getDataModel = (path = getPaths().api.dbSchema) => {
+  return getSchemaPrisma(path);
 };
-const getSchemaDefinitions = async () => {
-  return getDMMF({ datamodel: await getDataModel() });
-};
-const getSchemaConfig = async () => {
-  return getConfig({
-    datamodel: await getDataModel()
-  });
+const getSchemaDefinitions = () => {
+  return getDMMF({ datamodel: getDataModel() });
 };
+const getSchemaConfig = () => getConfig({
+  datamodel: getDataModel()
+});
 async function verifyModelName(options) {
   const modelName = await getExistingModelName(options.name) || await getExistingModelName(singularize(options.name));
   if (modelName === void 0) {

package/dist/lib/test.js

@@ -10,6 +10,7 @@ vi.mock("@cedarjs/internal/dist/generate/generate", () => {
   };
 });
 vi.mock("@cedarjs/project-config", async (importOriginal) => {
+  const path2 = await import("path");
   const originalProjectConfig = await importOriginal();
   return {
     ...originalProjectConfig,
@@ -18,48 +19,44 @@ vi.mock("@cedarjs/project-config", async (importOriginal) => {
       return {
         base: BASE_PATH,
         api: {
-          prismaConfig: path.join(
-            // Current test folder
+          dataMigrations: path2.join(BASE_PATH, "./api/prisma/dataMigrations"),
+          db: path2.join(globalThis.__dirname, "fixtures"),
+          // this folder
+          dbSchema: path2.join(
             globalThis.__dirname,
             "fixtures",
-            "prisma.config.cjs"
+            "schema.prisma"
           ),
-          dataMigrations: path.join(BASE_PATH, "./api/dataMigrations"),
-          generators: path.join(BASE_PATH, "./api/generators"),
-          src: path.join(BASE_PATH, "./api/src"),
-          jobs: path.join(BASE_PATH, "./api/src/jobs"),
-          services: path.join(BASE_PATH, "./api/src/services"),
-          directives: path.join(BASE_PATH, "./api/src/directives"),
-          graphql: path.join(BASE_PATH, "./api/src/graphql"),
-          functions: path.join(BASE_PATH, "./api/src/functions")
+          // this folder
+          generators: path2.join(BASE_PATH, "./api/generators"),
+          src: path2.join(BASE_PATH, "./api/src"),
+          jobs: path2.join(BASE_PATH, "./api/src/jobs"),
+          services: path2.join(BASE_PATH, "./api/src/services"),
+          directives: path2.join(BASE_PATH, "./api/src/directives"),
+          graphql: path2.join(BASE_PATH, "./api/src/graphql"),
+          functions: path2.join(BASE_PATH, "./api/src/functions")
         },
         web: {
-          base: path.join(BASE_PATH, "./web"),
-          config: path.join(BASE_PATH, "./web/config"),
-          src: path.join(BASE_PATH, "./web/src"),
-          generators: path.join(BASE_PATH, "./web/generators"),
-          routes: path.join(BASE_PATH, "web/src/Routes.js"),
-          components: path.join(BASE_PATH, "/web/src/components"),
-          layouts: path.join(BASE_PATH, "/web/src/layouts"),
-          pages: path.join(BASE_PATH, "/web/src/pages"),
-          app: path.join(BASE_PATH, "/web/src/App.js")
+          base: path2.join(BASE_PATH, "./web"),
+          config: path2.join(BASE_PATH, "./web/config"),
+          src: path2.join(BASE_PATH, "./web/src"),
+          generators: path2.join(BASE_PATH, "./web/generators"),
+          routes: path2.join(BASE_PATH, "web/src/Routes.js"),
+          components: path2.join(BASE_PATH, "/web/src/components"),
+          layouts: path2.join(BASE_PATH, "/web/src/layouts"),
+          pages: path2.join(BASE_PATH, "/web/src/pages"),
+          app: path2.join(BASE_PATH, "/web/src/App.js")
         },
-        scripts: path.join(BASE_PATH, "scripts"),
+        scripts: path2.join(BASE_PATH, "scripts"),
         generated: {
-          base: path.join(BASE_PATH, ".redwood"),
-          schema: path.join(BASE_PATH, ".redwood/schema.graphql"),
+          base: path2.join(BASE_PATH, ".redwood"),
+          schema: path2.join(BASE_PATH, ".redwood/schema.graphql"),
           types: {
-            includes: path.join(BASE_PATH, ".redwood/types/includes"),
-            mirror: path.join(BASE_PATH, ".redwood/types/mirror")
+            includes: path2.join(BASE_PATH, ".redwood/types/includes"),
+            mirror: path2.join(BASE_PATH, ".redwood/types/mirror")
           }
         }
       };
-    },
-    getSchemaPath: () => {
-      return path.join(globalThis.__dirname, "fixtures", "schema.prisma");
-    },
-    getDataMigrationsPath: () => {
-      return path.join(globalThis.__dirname, "fixtures", "migrations");
     }
   };
 });

package/dist/middleware/checkNodeVersion.js

@@ -4,8 +4,9 @@ function checkNodeVersion() {
   const checks = { ok: true };
   const pVersion = process.version;
   const pVersionC = semver.clean(pVersion);
-  const LOWER_BOUND = "v24.0.0";
-  if (semver.gte(pVersionC, LOWER_BOUND)) {
+  const LOWER_BOUND = "v20.0.0";
+  const LOWER_BOUND_C = semver.clean(LOWER_BOUND);
+  if (semver.gt(pVersionC, LOWER_BOUND_C)) {
     return checks;
   }
   checks.ok = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.1.1-next.21+77cfbaa90",
+  "version": "1.1.1-rc.3",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -31,15 +31,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.27.1",
     "@babel/runtime-corejs3": "7.27.6",
-    "@cedarjs/api-server": "1.1.1-next.21+77cfbaa90",
-    "@cedarjs/cli-helpers": "1.1.1-next.21+77cfbaa90",
-    "@cedarjs/fastify-web": "1.1.1-next.21+77cfbaa90",
-    "@cedarjs/internal": "1.1.1-next.21+77cfbaa90",
-    "@cedarjs/prerender": "1.1.1-next.21+77cfbaa90",
-    "@cedarjs/project-config": "1.1.1-next.21+77cfbaa90",
-    "@cedarjs/structure": "1.1.1-next.21+77cfbaa90",
-    "@cedarjs/telemetry": "1.1.1-next.21+77cfbaa90",
-    "@cedarjs/web-server": "1.1.1-next.21+77cfbaa90",
+    "@cedarjs/api-server": "1.1.1-rc.3",
+    "@cedarjs/cli-helpers": "1.1.1-rc.3",
+    "@cedarjs/fastify-web": "1.1.1-rc.3",
+    "@cedarjs/internal": "1.1.1-rc.3",
+    "@cedarjs/prerender": "1.1.1-rc.3",
+    "@cedarjs/project-config": "1.1.1-rc.3",
+    "@cedarjs/structure": "1.1.1-rc.3",
+    "@cedarjs/telemetry": "1.1.1-rc.3",
+    "@cedarjs/web-server": "1.1.1-rc.3",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -47,7 +47,7 @@
     "@opentelemetry/resources": "1.22.0",
     "@opentelemetry/sdk-trace-node": "1.22.0",
     "@opentelemetry/semantic-conventions": "1.22.0",
-    "@prisma/internals": "6.19.0",
+    "@prisma/internals": "5.20.0",
     "ansis": "4.1.0",
     "archiver": "7.0.1",
     "boxen": "5.1.2",
@@ -74,7 +74,7 @@
     "pluralize": "8.0.0",
     "portfinder": "1.0.37",
     "prettier": "3.6.2",
-    "prisma": "6.19.0",
+    "prisma": "5.20.0",
     "prompts": "2.4.2",
     "rimraf": "6.0.1",
     "semver": "7.6.3",
@@ -101,5 +101,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "77cfbaa90a726923a763fb33b836638d94b2d431"
+  "gitHead": "1332c50070b0ab7f2cfc0d7bc802c60cd8a664a9"
 }