@cedarjs/cli 7.0.1-next.467 → 7.1.0-rc.34

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

@@ -2,144 +2,45 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addPackagesTask,
   getPaths,
   printSetupNotes
 } from "../../../../lib/index.js";
-import { MONITORS, isMonitor } from "../../../deploy/baremetal/monitors.js";
 import { addFilesTask } from "../helpers/index.js";
-import {
-  MAINTENANCE,
-  SYSTEMD_DIR,
-  deployToml,
-  ecosystemConfig,
-  systemdJobsUnit,
-  systemdServiceUnit
-} from "../templates/baremetal.js";
+import { DEPLOY, ECOSYSTEM, MAINTENANCE } from "../templates/baremetal.js";
 const configFilename = "deploy.toml";
-const MONITOR_CHOICES = [
+const files = [
   {
-    title: "pm2",
-    description: "Node process manager, configured in ecosystem.config.js",
-    value: "pm2"
+    path: path.join(getPaths().base, configFilename),
+    content: DEPLOY
   },
   {
-    title: "systemd (user units)",
-    description: "Units in ~/.config/systemd/user, managed by the deploy user without sudo",
-    value: "systemd-user"
+    path: path.join(getPaths().base, "ecosystem.config.js"),
+    content: ECOSYSTEM
   },
   {
-    title: "systemd (system units)",
-    description: "Units in /etc/systemd/system, managed with sudo systemctl",
-    value: "systemd-system"
-  }
-];
-const appNameFromPath = (projectPath) => {
-  const name = path.basename(projectPath).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-  return name || "cedar";
-};
-const setupFiles = ({
-  monitor,
-  jobs,
-  appName,
-  basePath,
-  webSrcPath
-}) => {
-  const files = [];
-  let processNames;
-  if (monitor === "pm2") {
-    processNames = jobs ? ["serve", "jobs"] : ["serve"];
-    files.push({
-      path: path.join(basePath, "ecosystem.config.js"),
-      content: ecosystemConfig({ jobs })
-    });
-  } else {
-    const jobsUnit = `${appName}-jobs`;
-    processNames = jobs ? [appName, `${jobsUnit}@0`] : [appName];
-    files.push({
-      path: path.join(basePath, SYSTEMD_DIR, `${appName}.service`),
-      content: systemdServiceUnit({ appName, monitor })
-    });
-    if (jobs) {
-      files.push({
-        path: path.join(basePath, SYSTEMD_DIR, `${jobsUnit}@.service`),
-        content: systemdJobsUnit({ appName, monitor })
-      });
-    }
-  }
-  files.unshift({
-    path: path.join(basePath, configFilename),
-    content: deployToml({ monitor, processNames })
-  });
-  files.push({
-    path: path.join(webSrcPath, "maintenance.html"),
+    path: path.join(getPaths().web.src, "maintenance.html"),
     content: MAINTENANCE
-  });
-  return { files, processNames };
-};
-const notesFor = (monitor, jobs, processNames) => {
-  const notes = ["You are almost ready to go BAREMETAL!", ""];
-  if (monitor !== "pm2") {
-    notes.push(
-      `Copy the unit files in ${SYSTEMD_DIR}/ to the server before your first`,
-      "deploy. The comments at the top of each file say where they go.",
-      ""
-    );
   }
-  if (jobs) {
-    notes.push(
-      `Background jobs are set up, so deploy.toml lists a jobs worker process`,
-      `(${processNames[processNames.length - 1]}). Add one per entry in the`,
-      "`workers` array of api/src/lib/jobs.ts.",
-      ""
-    );
-  }
-  notes.push(
-    "See https://cedarjs.com/docs/deploy/baremetal for the remaining",
-    "config and setup required before you can perform your first deploy."
-  );
-  return notes;
-};
-const promptForMonitor = async () => {
-  const { monitor } = await prompts({
-    type: "select",
-    name: "monitor",
-    message: "Which process monitor will run your app on the server?",
-    choices: MONITOR_CHOICES
-  });
-  return isMonitor(monitor) ? monitor : void 0;
-};
-const handler = async ({
-  force,
-  monitor: monitorOption
-}) => {
+];
+const notes = [
+  "You are almost ready to go BAREMETAL!",
+  "",
+  "See https://cedarjs.com/docs/deploy/baremetal for the remaining",
+  "config and setup required before you can perform your first deploy."
+];
+const handler = async ({ force }) => {
   recordTelemetryAttributes({
     command: "setup deploy baremetal",
-    force,
-    monitor: monitorOption
+    force
   });
-  if (monitorOption !== void 0 && !isMonitor(monitorOption)) {
-    console.error(
-      c.error(
-        `Unknown monitor "${monitorOption}". Use one of ${MONITORS.join(", ")}.`
-      )
-    );
-    process.exit(1);
-  }
-  const monitor = monitorOption ?? await promptForMonitor();
-  if (!monitor) {
-    console.log("Aborting baremetal setup.");
-    return;
-  }
-  const paths = getPaths();
-  if (fs.existsSync(path.join(paths.base, ".pnp.cjs"))) {
+  if (fs.existsSync(path.join(getPaths().base, ".pnp.cjs"))) {
     console.warn(
       c.warning(
-        "Your project uses Yarn PnP (Plug'n'Play), which is not officially supported for Baremetal deployments. The generated process config starts the app with node_modules/.bin/cedar, which will most likely not work under PnP.\n\nYou will need to manually configure the server. See also the packageManagerCommand field in deploy.toml."
+        "Your project uses Yarn PnP (Plug'n'Play), which is not officially supported for Baremetal deployments. The generated ecosystem.config.js file uses node_modules/.bin/cedar as the PM2 script path, which will most likely not work under PnP.\n\nYou will need to manually configure the server. See also the packageManagerCommand field in deploy.toml."
       )
     );
     console.log();
@@ -154,14 +55,6 @@ const handler = async ({
     }
     console.log();
   }
-  const jobs = Boolean(paths.api.jobsConfig);
-  const { files, processNames } = setupFiles({
-    monitor,
-    jobs,
-    appName: appNameFromPath(paths.base),
-    basePath: paths.base,
-    webSrcPath: paths.web.src
-  });
   const tasks = new Listr(
     [
       await addPackagesTask({
@@ -172,7 +65,7 @@ const handler = async ({
         files,
         force
       }),
-      printSetupNotes(notesFor(monitor, jobs, processNames))
+      printSetupNotes(notes)
     ],
     { rendererOptions: { collapseSubtasks: false } }
   );
@@ -187,8 +80,6 @@ const handler = async ({
   }
 };
 export {
-  appNameFromPath,
   configFilename,
-  handler,
-  setupFiles
+  handler
 };

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

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "coherence";
 const description = "Setup Coherence deploy";
 function builder(yargs) {

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

@@ -3,17 +3,16 @@ import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import * as toml from "smol-toml";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import {
+  colors as c,
+  isTypeScriptProject,
+  getConfigPath
+} from "@cedarjs/cli-helpers";
 import {
   formatCedarCommand,
   formatRunBinCommand
 } from "@cedarjs/cli-helpers/packageManager/display";
-import { isTypeScriptProject } from "@cedarjs/cli-helpers/project";
-import {
-  getConfigPath,
-  getPaths,
-  getPrismaSchemas
-} from "@cedarjs/project-config";
+import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { printSetupNotes } from "../../../../lib/index.js";
 import { serverFileExists } from "../../../../lib/project.js";

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

@@ -3,9 +3,8 @@ import { EOL } from "os";
 import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";

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

@@ -1,9 +1,8 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addPackagesTask,

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

@@ -2,8 +2,7 @@ import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+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";

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

@@ -1,8 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { getSchemaPath, getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {

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

@@ -1,10 +1,12 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { getPaths } from "@cedarjs/cli-helpers/paths";
-import { isTypeScriptProject } from "@cedarjs/cli-helpers/project";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import {
+  colors as c,
+  getPaths,
+  isTypeScriptProject,
+  recordTelemetryAttributes
+} from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { printSetupNotes } from "../../../../lib/index.js";
 const notes = [

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

@@ -1,9 +1,8 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addPackagesTask,

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

@@ -1,26 +1,5 @@
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
-const SYSTEMD_DIR = "systemd";
-const JOBS_WORKER_BIN = "api/node_modules/.bin/cedar-jobs-worker";
-const WORKER_STOP_TIMEOUT_SECONDS = 600;
-const JOBS_WORKER_COMMENT = `# Runs one background jobs worker. \`--index\` picks the entry of the \`workers\`
-# array in api/src/lib/jobs.ts and \`--id\` numbers the worker within that
-# entry, so an entry with \`count: 2\` needs a second worker with \`--id=1\`.`;
-const ecosystemConfig = ({ jobs }) => {
-  const jobsApp = jobs ? `
-    {
-      // Runs one background jobs worker. \`--index\` picks the entry of the
-      // \`workers\` array in api/src/lib/jobs.ts and \`--id\` numbers the worker
-      // within that entry, so an entry with \`count: 2\` needs a second app
-      // with \`--id=1\`.
-      name: 'jobs',
-      cwd: 'current',
-      script: '${JOBS_WORKER_BIN}',
-      args: '--index=0 --id=0',
-      // pm2 stops the worker with SIGINT, which lets it finish the job it is
-      // running. This is how long pm2 waits for that (in ms) before killing it.
-      kill_timeout: ${WORKER_STOP_TIMEOUT_SECONDS * 1e3},
-    },` : "";
-  return `module.exports = {
+const ECOSYSTEM = `module.exports = {
   apps: [
     {
       name: 'serve',
@@ -31,79 +10,10 @@ const ecosystemConfig = ({ jobs }) => {
       exec_mode: 'cluster',
       wait_ready: true,
       listen_timeout: 10000,
-    },${jobsApp}
+    },
   ],
-}
-`;
-};
-const unitHeader = (appName, monitor) => {
-  const install = monitor === "systemd-system" ? `#   sudo cp ${SYSTEMD_DIR}/*.service /etc/systemd/system/` : `#   mkdir -p ~/.config/systemd/user && cp ${SYSTEMD_DIR}/*.service ~/.config/systemd/user/`;
-  const linger = monitor === "systemd-system" ? "" : `#
-# User units only run while the user has a session, so let them run after a
-# reboot too:
-#   sudo loginctl enable-linger $(whoami)
-`;
-  return `# systemd unit for the ${appName} Cedar app, generated by \`cedar setup deploy baremetal\`.
-#
-# Copy the unit files to the server once, before the first deploy:
-${install}
-${linger}#
-# Then deploy with \`--first-run\`, which reloads the unit files and enables and
-# starts every process listed in deploy.toml.
-#
-# WorkingDirectory must be the \`path\` from deploy.toml followed by \`/current\`.`;
-};
-const unitService = (monitor, execStart, extraDirectives = "") => {
-  const user = monitor === "systemd-system" ? "\nUser=deploy" : "";
-  return `[Service]
-WorkingDirectory=/var/www/app/current
-# A login shell puts node and ${getPackageManager()} from a version manager such as nvm on the PATH
-ExecStart=/bin/bash -lc '${execStart}'
-Restart=always
-RestartSec=5
-Environment=NODE_ENV=production${user}${extraDirectives}`;
-};
-const JOBS_STOP_DIRECTIVES = `
-# Stopping sends SIGINT so the worker finishes the job it is running before it
-# exits. systemd waits this long for that before killing the worker.
-KillSignal=SIGINT
-TimeoutStopSec=${WORKER_STOP_TIMEOUT_SECONDS}`;
-const unitInstall = (monitor) => `[Install]
-WantedBy=${monitor === "systemd-system" ? "multi-user.target" : "default.target"}`;
-const systemdServiceUnit = ({
-  appName,
-  monitor
-}) => `${unitHeader(appName, monitor)}
-
-[Unit]
-Description=${appName} (Cedar)
-After=network.target
-
-${unitService(monitor, "exec node_modules/.bin/cedar serve")}
-
-${unitInstall(monitor)}
-`;
-const systemdJobsUnit = ({
-  appName,
-  monitor
-}) => `${unitHeader(appName, monitor)}
-#
-${JOBS_WORKER_COMMENT}
-# Start one instance per \`workers\` entry: \`${appName}-jobs@0\`, \`${appName}-jobs@1\`
-# and so on, and list each one in \`processNames\` in deploy.toml.
-
-[Unit]
-Description=${appName} background jobs worker %i (Cedar)
-After=network.target
-
-${unitService(monitor, `exec ${JOBS_WORKER_BIN} --index=%i --id=0`, JOBS_STOP_DIRECTIVES)}
-
-${unitInstall(monitor)}
-`;
-const deployToml = ({
-  monitor,
-  processNames
-}) => `# This file contains config for a baremetal deployment
+}`;
+const DEPLOY = `# This file contains config for a baremetal deployment
 #
 # SSH connection options include:
 #
@@ -116,22 +26,6 @@ const deployToml = ({
 # * passphrase - used if your private key has a passphrase
 # * agentForward - set to \`true\` to forward the client machine's ssh credentials
 #
-# Process monitor options:
-#
-# * monitor - "pm2", "systemd-user" or "systemd-system". Decides how processes
-#   are started for the first time, restarted and stopped
-# * monitorCommand - overrides the command the monitor is invoked with. Defaults
-#   to \`pm2\`, \`systemctl --user\` or \`sudo systemctl\` depending on \`monitor\`,
-#   for example \`doppler run -- pm2\`
-# * processNames - the pm2 app names or systemd unit names to (re)start
-#
-# After restarting the processes, the deploy requests the api side's health
-# check endpoint on the server and fails if it doesn't respond in time:
-#
-# * healthCheckUrl - defaults to http://localhost:<[api].port>/graphql/health
-#   on servers that host the api side. Set to \`false\` to skip the check
-# * healthCheckTimeout - seconds to keep retrying, defaults to 30
-#
 # See https://cedarjs.com/docs/deploy/baremetal for more info
 
 [[production.servers]]
@@ -140,14 +34,13 @@ username = "user"
 agentForward = true
 sides = ["api","web"]
 packageManagerCommand = "${getPackageManager()}"
-monitor = "${monitor}"
+monitorCommand = "pm2"
 path = "/var/www/app"
-processNames = [${processNames.map((name) => `"${name}"`).join(", ")}]
+processNames = ["serve"]
 repo = "git@github.com:myorg/myapp.git"
 branch = "main"
 keepReleases = 5
 freeSpaceRequired = 2048
-healthCheckTimeout = 30
 
 # If you have separate api and web servers:
 #
@@ -230,10 +123,7 @@ And take it back down with:
 </html>
 `;
 export {
-  MAINTENANCE,
-  SYSTEMD_DIR,
-  deployToml,
-  ecosystemConfig,
-  systemdJobsUnit,
-  systemdServiceUnit
+  DEPLOY,
+  ECOSYSTEM,
+  MAINTENANCE
 };

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

@@ -10,9 +10,6 @@ NODE_VERSION = "24"
 
 [functions]
 directory = "api/dist/ud"
-# Sandboxed child scripts (\`@cedarjs/api/sandbox\`) and the packages they
-# import. Nothing imports them, so Netlify's file tracing can't find them
-included_files = ["api/dist/ud/sandbox-children/**"]
 
 # To use Netlify Dev, install Netlify's CLI (\`netlify-cli\`) from NPM and use
 # \`netlify link\` to connect your local project to a site on Netlify. Then run

package/dist/commands/setup/docker/docker.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "docker";
 const description = "Setup the default Cedar Dockerfile";
 function builder(yargs) {

package/dist/commands/setup/docker/dockerHandler.js

@@ -3,8 +3,7 @@ import { createRequire } from "node:module";
 import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { writeFile } from "@cedarjs/cli-helpers/fileHelpers";
+import { writeFile, colors as c } from "@cedarjs/cli-helpers";
 import { dedupe } from "@cedarjs/cli-helpers/packageManager";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";

package/dist/commands/setup/generator/generator.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "path";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "generator <name>";
 const description = "Copies generator templates locally for customization";
 const EXCLUDE_GENERATORS = ["dataMigration", "dbAuth", "generator", "secret"];

package/dist/commands/setup/generator/generatorHandler.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { getPaths } from "../../../lib/index.js";
 const SIDE_MAP = {
   web: ["cell", "component", "layout", "page", "scaffold"],

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

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "fragments";
 const description = "Set up Fragments for GraphQL";
 function builder(yargs) {

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

@@ -2,10 +2,12 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import { format } from "prettier";
-import { colors } from "@cedarjs/cli-helpers/colors";
-import { getPrettierOptions } from "@cedarjs/cli-helpers/fileHelpers";
+import {
+  colors,
+  getPrettierOptions,
+  setTomlSetting
+} from "@cedarjs/cli-helpers";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
-import { setTomlSetting } from "@cedarjs/cli-helpers/project";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { runTransform } from "../../../../../lib/runTransform.js";
 const command = "fragments";

package/dist/commands/setup/graphql/features/trustedDocuments/trustedDocuments.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "trusted-documents";
 const description = "Set up Trusted Documents for GraphQL";
 function builder(yargs) {

package/dist/commands/setup/graphql/features/trustedDocuments/trustedDocumentsHandler.js

@@ -2,9 +2,8 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import { format } from "prettier";
-import { getPrettierOptions } from "@cedarjs/cli-helpers/fileHelpers";
+import { getPrettierOptions, setTomlSetting } from "@cedarjs/cli-helpers";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
-import { setTomlSetting } from "@cedarjs/cli-helpers/project";
 import { getConfig, getPaths, resolveFile } from "@cedarjs/project-config";
 import { runTransform } from "../../../../../lib/runTransform.js";
 async function handler({ force }) {

package/dist/commands/setup/i18n/i18n.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "i18n";
 const description = "Set up i18n";
 const builder = (yargs) => {

package/dist/commands/setup/i18n/i18nHandler.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import extendStorybookConfiguration from "../../../lib/configureStorybook.js";

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

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "jobs";
 const description = "Sets up the config file and parent directory for background jobs";
 const builder = (yargs) => {

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

@@ -3,8 +3,7 @@ import * as path from "node:path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getSchemaPath, getPrismaSchemas } from "@cedarjs/project-config";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
@@ -23,8 +22,6 @@ model BackgroundJob {
   lockedBy  String?
   lastError String?
   failedAt  DateTime?
-  key       String?   @unique
-  pausedAt  DateTime?
   createdAt DateTime  @default(now())
   updatedAt DateTime  @updatedAt
 }

package/dist/commands/setup/mailer/mailer.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "mailer";
 const description = "Setup the Cedar mailer. This will install the required packages and add the required initial configuration to your Cedar app.";
 const builder = (yargs) => {

package/dist/commands/setup/mailer/mailerHandler.js

@@ -1,8 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";

package/dist/commands/setup/middleware/ogImage/ogImage.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "og-image";
 const aliases = ["ogImage", "ogimage"];
 const description = "Set up OG Image generation middleware";

package/dist/commands/setup/middleware/ogImage/ogImageHandler.js

@@ -2,8 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import { format } from "prettier";
-import { getPrettierOptions } from "@cedarjs/cli-helpers/fileHelpers";
-import { addWebPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { addWebPackages, getPrettierOptions } from "@cedarjs/cli-helpers";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { runTransform } from "../../../../lib/runTransform.js";
 async function handler({ force }) {

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

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "sentry";
 const description = "Setup Sentry error and performance tracking";
 const builder = (yargs) => {