@cedarjs/cli 1.0.0-canary.12748 → 1.0.0-rc.26

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

@@ -5,8 +5,10 @@ import { Listr } from "listr2";
 import * as toml from "smol-toml";
 import { env as envInterpolation } from "string-env-interpolation";
 import { titleCase } from "title-case";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import c from "../../../lib/colors.js";
 import { getPaths } from "../../../lib/index.js";
+import { SshExecutor } from "./SshExecutor.js";
 const CONFIG_FILENAME = "deploy.toml";
 const SYMLINK_FLAGS = "-nsf";
 const CURRENT_RELEASE_SYMLINK_NAME = "current";
@@ -17,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) => {
@@ -47,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;
@@ -231,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.`
             );
           }
         }
@@ -491,7 +499,20 @@ const commands = (yargs, ssh) => {
   return servers;
 };
 const handler = async (yargs) => {
-  const { SshExecutor } = await import("./SshExecutor.js");
+  recordTelemetryAttributes({
+    command: "deploy baremetal",
+    firstRun: yargs.firstRun,
+    df: yargs.df,
+    update: yargs.update,
+    install: yargs.install,
+    migrate: yargs.migrate,
+    build: yargs.build,
+    restart: yargs.restart,
+    cleanup: yargs.cleanup,
+    maintenance: yargs.maintenance,
+    rollback: yargs.rollback,
+    verbose: yargs.verbose
+  });
   const tomlPath = path.join(getPaths().base, "deploy.toml");
   const ecosystemPath = path.join(getPaths().base, "ecosystem.config.js");
   if (!fs.existsSync(tomlPath) || !fs.existsSync(ecosystemPath)) {

package/dist/commands/deploy/baremetal.js

@@ -1,5 +1,4 @@
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "baremetal [environment]";
 const description = "Deploy to baremetal server(s)";
 const builder = (yargs) => {
@@ -79,22 +78,8 @@ const builder = (yargs) => {
   );
 };
 async function handler(yargs) {
-  recordTelemetryAttributes({
-    command: "deploy baremetal",
-    firstRun: yargs.firstRun,
-    df: yargs.df,
-    update: yargs.update,
-    install: yargs.install,
-    migrate: yargs.migrate,
-    build: yargs.build,
-    restart: yargs.restart,
-    cleanup: yargs.cleanup,
-    maintenance: yargs.maintenance,
-    rollback: yargs.rollback,
-    verbose: yargs.verbose
-  });
-  const { handler: baremetalHandler } = await import("./baremetal/baremetalHandler.js");
-  return baremetalHandler(yargs);
+  const { handler: importedHandler } = await import("./baremetal/baremetalHandler.js");
+  return importedHandler(yargs);
 }
 export {
   builder,

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 --schema "${rwjsPaths.api.dbSchema}"`
+        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/execHandler.js

@@ -41,11 +41,6 @@ const handler = async (args) => {
     printAvailableScriptsToConsole();
     return;
   }
-  scriptArgs._ = scriptArgs._.slice(1);
-  delete scriptArgs.$0;
-  delete scriptArgs.l;
-  delete scriptArgs.s;
-  delete scriptArgs.silent;
   const scriptPath = resolveScriptPath(name);
   if (!scriptPath) {
     console.error(

package/dist/commands/generate/cell/templates/stories.tsx.template

@@ -1,4 +1,4 @@
-import type { Meta, StoryObj } from '@storybook/react-vite'
+import type { Meta, StoryObj } from '@storybook/react'
 
 import { Loading, Empty, Failure, Success } from './${pascalName}Cell'
 import { standard } from './${pascalName}Cell.mock'

package/dist/commands/generate/component/templates/stories.tsx.template

@@ -10,7 +10,7 @@
 //
 // See https://storybook.js.org/docs/7/writing-stories/args
 
-import type { Meta, StoryObj } from '@storybook/react-vite'
+import type { Meta, StoryObj } from '@storybook/react'
 
 import ${pascalName} from './${pascalName}'
 

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/layout/templates/stories.tsx.template

@@ -1,4 +1,4 @@
-import type { Meta, StoryObj } from '@storybook/react-vite'
+import type { Meta, StoryObj } from '@storybook/react'
 
 import ${singularPascalName}Layout from './${pascalName}Layout'
 

package/dist/commands/generate/page/templates/stories.tsx.parameters.template

@@ -1,4 +1,4 @@
-import type { Meta, StoryObj } from '@storybook/react-vite'
+import type { Meta, StoryObj } from '@storybook/react'
 
 import ${pascalName}Page from './${pascalName}Page'
 

package/dist/commands/generate/page/templates/stories.tsx.template

@@ -1,4 +1,4 @@
-import type { Meta, StoryObj } from '@storybook/react-vite'
+import type { Meta, StoryObj } from '@storybook/react'
 
 import ${pascalName}Page from './${pascalName}Page'
 

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/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/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/i18n/templates/storybook.preview.tsx.template

@@ -1,7 +1,7 @@
 import * as React from 'react'
 
 import type { GlobalTypes } from '@storybook/csf'
-import type { Preview, StoryContext, StoryFn } from '@storybook/react-vite'
+import type { Preview, StoryContext, StoryFn } from '@storybook/react'
 import { I18nextProvider } from 'react-i18next'
 import i18n from 'web/src/i18n'
 

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

@@ -6,7 +6,6 @@ import { addApiPackages } from "@cedarjs/cli-helpers";
 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())
@@ -25,8 +24,9 @@ model BackgroundJob {
 }
 `;
 const getModelNames = async () => {
-  const { schemas } = await getSchemaWithPath(getPaths().api.dbSchema);
-  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 = () => {

package/dist/commands/setup/ui/templates/chakra.storybook.preview.tsx.template

@@ -1,7 +1,7 @@
 import * as React from 'react'
 
 import { ChakraProvider, extendTheme } from '@chakra-ui/react'
-import type { Preview, StoryFn } from '@storybook/react-vite'
+import type { Preview, StoryFn } from '@storybook/react'
 import theme from 'config/chakra.config'
 
 const extendedTheme = extendTheme(theme)

package/dist/commands/setup/ui/templates/mantine.storybook.preview.tsx.template

@@ -1,7 +1,7 @@
 import * as React from 'react'
 
 import { MantineProvider } from '@mantine/core'
-import type { Preview, StoryFn } from '@storybook/react-vite'
+import type { Preview, StoryFn } from '@storybook/react'
 import theme from 'config/mantine.config'
 
 import '@mantine/core/styles.css'

package/dist/commands/upgrade.js

@@ -1,5 +1,4 @@
 import path from "path";
-import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import execa from "execa";
 import fs from "fs-extra";
 import latestVersion from "latest-version";
@@ -36,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",
@@ -70,43 +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 prompt = task.prompt(ListrEnquirerPromptAdapter);
-          const proceed = await prompt.run({
-            type: "Confirm",
-            message: "This will upgrade your CedarJS 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)
@@ -197,7 +164,7 @@ const handler = async ({ dryRun, tag, verbose, dedupe, yes }) => {
       }
     ],
     {
-      renderer: verbose ? "verbose" : "default",
+      renderer: verbose && "verbose",
       rendererOptions: { collapseSubtasks: false }
     }
   );

package/dist/lib/schemaHelpers.js

@@ -2,7 +2,7 @@ import prismaInternals from "@prisma/internals";
 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) {
@@ -62,18 +62,15 @@ const getEnum = async (name) => {
   }
   return model;
 };
-const getDataModel = async (path = getPaths().api.dbSchema) => {
-  const result = await getSchemaWithPath(path);
-  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/templates/storybook.preview.tsx.template

@@ -1,7 +1,7 @@
 import * as React from 'react'
 
 import type { GlobalTypes } from '@storybook/csf'
-import type { Preview, StoryContext, StoryFn } from '@storybook/react-vite'
+import type { Preview, StoryContext, StoryFn } from '@storybook/react'
 
 /** @see {@link https://storybook.js.org/docs/7/essentials/toolbars-and-globals#global-types-and-the-toolbar-annotation | Global types and the toolbar annotation}  */
 export const globalTypes: GlobalTypes = {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.12748+2337a6e2e",
+  "version": "1.0.0-rc.26",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -10,7 +10,6 @@
   "license": "MIT",
   "type": "module",
   "bin": {
-    "cdr": "./dist/index.js",
     "cedarjs": "./dist/index.js",
     "redwood": "./dist/index.js",
     "rw": "./dist/index.js",
@@ -32,15 +31,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.27.1",
     "@babel/runtime-corejs3": "7.27.6",
-    "@cedarjs/api-server": "1.0.0-canary.12748",
-    "@cedarjs/cli-helpers": "1.0.0-canary.12748",
-    "@cedarjs/fastify-web": "1.0.0-canary.12748",
-    "@cedarjs/internal": "1.0.0-canary.12748",
-    "@cedarjs/prerender": "1.0.0-canary.12748",
-    "@cedarjs/project-config": "1.0.0-canary.12748",
-    "@cedarjs/structure": "1.0.0-canary.12748",
-    "@cedarjs/telemetry": "1.0.0-canary.12748",
-    "@cedarjs/web-server": "1.0.0-canary.12748",
+    "@cedarjs/api-server": "1.0.0-rc.26",
+    "@cedarjs/cli-helpers": "1.0.0-rc.26",
+    "@cedarjs/fastify-web": "1.0.0-rc.26",
+    "@cedarjs/internal": "1.0.0-rc.26",
+    "@cedarjs/prerender": "1.0.0-rc.26",
+    "@cedarjs/project-config": "1.0.0-rc.26",
+    "@cedarjs/structure": "1.0.0-rc.26",
+    "@cedarjs/telemetry": "1.0.0-rc.26",
+    "@cedarjs/web-server": "1.0.0-rc.26",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -48,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",
@@ -75,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",
@@ -102,5 +101,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2337a6e2e76b6996f5aded510367bf83aa4c7b8f"
+  "gitHead": "2ea84a564123f5d986dd88efcb6dddc55cbef367"
 }