@cedarjs/cli 4.2.1-next.0 → 4.2.1-next.258

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

@@ -1,7 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
+import * as parser from "@babel/parser";
+import * as t from "@babel/types";
 import execa from "execa";
 import { Listr } from "listr2";
+import * as recast from "recast";
 import { getConfigPath, getConfig } from "@cedarjs/project-config";
 import { getPaths, writeFilesTask } from "../../../../lib/index.js";
 const updateApiURLTask = (apiUrl) => {
@@ -38,9 +41,10 @@ const preRequisiteCheckTask = (preRequisites) => {
           task: async () => {
             try {
               await execa(...preReq.command);
-            } catch (error) {
-              error.message = error.message + "\n" + preReq.errorMessage;
-              throw error;
+            } catch (e) {
+              const baseMsg = e instanceof Error ? e.message : String(e);
+              const err = new Error(baseMsg + "\n" + preReq.errorMessage);
+              throw err;
             }
           }
         };
@@ -56,7 +60,7 @@ const addFilesTask = ({
   return {
     title: `${title}...`,
     task: () => {
-      let fileNameToContentMap = {};
+      const fileNameToContentMap = {};
       files.forEach((fileData) => {
         fileNameToContentMap[fileData.path] = fileData.content;
       });
@@ -64,6 +68,150 @@ const addFilesTask = ({
     }
   };
 };
+const verifyUDSetupTask = () => {
+  return {
+    title: "Checking if Universal Deploy is set up...",
+    task: () => {
+      const paths = getPaths();
+      const viteConfigTs = path.join(paths.web.base, "vite.config.ts");
+      const viteConfigJs = path.join(paths.web.base, "vite.config.js");
+      const viteConfigPath = fs.existsSync(viteConfigTs) ? viteConfigTs : viteConfigJs;
+      if (!fs.existsSync(viteConfigPath)) {
+        throw new Error("Vite config file not found");
+      }
+      const content = fs.readFileSync(viteConfigPath, "utf-8");
+      if (!content.includes("cedarUniversalDeployPlugin")) {
+        throw new Error(
+          "Universal Deploy is not set up. Please run `yarn cedar setup deploy universal-deploy` first."
+        );
+      }
+    }
+  };
+};
+function posToIndex(str, line, column) {
+  const lines = str.split("\n");
+  let index = 0;
+  for (let i = 0; i < line - 1; i++) {
+    index += lines[i].length + 1;
+  }
+  return index + column;
+}
+function resolveConfigObject(arg) {
+  if (t.isObjectExpression(arg)) {
+    return arg;
+  }
+  if (t.isArrowFunctionExpression(arg)) {
+    if (t.isObjectExpression(arg.body)) {
+      return arg.body;
+    }
+    if (t.isBlockStatement(arg.body)) {
+      const returnStmt = arg.body.body.find((s) => t.isReturnStatement(s));
+      if (t.isObjectExpression(returnStmt?.argument)) {
+        return returnStmt.argument;
+      }
+    }
+    return null;
+  }
+  if (t.isFunctionExpression(arg)) {
+    if (t.isBlockStatement(arg.body)) {
+      const returnStmt = arg.body.body.find(t.isReturnStatement);
+      if (t.isObjectExpression(returnStmt?.argument)) {
+        return returnStmt.argument;
+      }
+    }
+    return null;
+  }
+  return null;
+}
+function insertPluginsBeforeCedar({
+  content,
+  pluginCodes
+}) {
+  const ast = recast.parse(content, {
+    parser: {
+      parse(source) {
+        return parser.parse(source, {
+          sourceType: "module",
+          plugins: ["typescript", "jsx"]
+        });
+      }
+    }
+  });
+  const defaultExport = ast.program.body.find(t.isExportDefaultDeclaration);
+  if (!defaultExport) {
+    return null;
+  }
+  const declaration = defaultExport.declaration;
+  const configArg = resolveConfigObject(declaration.arguments[0]);
+  if (!configArg) {
+    return null;
+  }
+  const pluginsProp = configArg.properties.find(t.isObjectProperty);
+  if (!t.isArrayExpression(pluginsProp?.value)) {
+    return null;
+  }
+  const arrayExpr = pluginsProp.value;
+  const elements = arrayExpr.elements;
+  const cedarIndex = elements.findIndex(
+    (el) => t.isCallExpression(el) && t.isIdentifier(el.callee) && el.callee.name === "cedar"
+  );
+  if (cedarIndex === -1) {
+    return null;
+  }
+  const cedarElement = elements[cedarIndex];
+  if (!cedarElement || !t.isCallExpression(cedarElement)) {
+    return null;
+  }
+  const cedarNode = cedarElement;
+  if (!cedarNode.loc || !arrayExpr.loc || !pluginsProp.loc) {
+    return null;
+  }
+  const isInline = cedarNode.loc.start.line === arrayExpr.loc.start.line;
+  if (isInline) {
+    const startPos = posToIndex(
+      content,
+      arrayExpr.loc.start.line,
+      arrayExpr.loc.start.column
+    );
+    const endPos = posToIndex(
+      content,
+      arrayExpr.loc.end.line,
+      arrayExpr.loc.end.column
+    );
+    const precedingText = content.slice(0, startPos);
+    const followingText = content.slice(endPos);
+    const existingCodes = elements.flatMap((el) => {
+      if (!el?.loc) {
+        return [];
+      }
+      return [
+        content.slice(
+          posToIndex(content, el.loc.start.line, el.loc.start.column),
+          posToIndex(content, el.loc.end.line, el.loc.end.column)
+        )
+      ];
+    });
+    const lines2 = content.split("\n");
+    const pluginsLine = pluginsProp.loc.start.line;
+    const pluginsIndent = (lines2[pluginsLine - 1].match(/^\s*/) ?? [""])[0];
+    const elemIndent = pluginsIndent + "  ";
+    const allCodes = [...existingCodes];
+    allCodes.splice(cedarIndex, 0, ...pluginCodes);
+    const multiline = [
+      "[",
+      ...allCodes.map((code) => `${elemIndent}${code},`),
+      `${pluginsIndent}]`
+    ].join("\n");
+    return precedingText + multiline + followingText;
+  }
+  const cedarLine = cedarNode.loc.start.line;
+  const insertPos = posToIndex(content, cedarLine, 0);
+  const lines = content.split("\n");
+  const indent = (lines[cedarLine - 1].match(/^\s*/) ?? [""])[0];
+  const insertion = pluginCodes.map((code) => `${indent}${code},
+`).join("");
+  return content.slice(0, insertPos) + insertion + content.slice(insertPos);
+}
 const addToGitIgnoreTask = ({ paths }) => {
   return {
     title: "Updating .gitignore...",
@@ -71,6 +219,7 @@ const addToGitIgnoreTask = ({ paths }) => {
       if (!fs.existsSync(path.resolve(getPaths().base, ".gitignore"))) {
         return "No gitignore present, skipping.";
       }
+      return void 0;
     },
     task: async (_ctx, task) => {
       const gitIgnore = path.resolve(getPaths().base, ".gitignore");
@@ -89,6 +238,7 @@ const addToDotEnvTask = ({ lines }) => {
       if (!fs.existsSync(path.resolve(getPaths().base, ".env"))) {
         return "No .env present, skipping.";
       }
+      return void 0;
     },
     task: async (_ctx, task) => {
       const env = path.resolve(getPaths().base, ".env");
@@ -105,6 +255,8 @@ export {
   addToDotEnvTask,
   addToGitIgnoreTask,
   getUserApiUrl,
+  insertPluginsBeforeCedar,
   preRequisiteCheckTask,
-  updateApiURLTask
+  updateApiURLTask,
+  verifyUDSetupTask
 };

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

@@ -1,5 +1,7 @@
-import path from "path";
+import fs from "node:fs";
+import path from "node:path";
 import { Listr } from "listr2";
+import prompts from "prompts";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
@@ -35,6 +37,24 @@ const handler = async ({ force }) => {
     command: "setup deploy baremetal",
     force
   });
+  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 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();
+    const { confirmed } = await prompts({
+      type: "confirm",
+      name: "confirmed",
+      message: "Generate the default config anyway? (You can edit it later)"
+    });
+    if (!confirmed) {
+      console.log("Aborting baremetal setup.");
+      return;
+    }
+    console.log();
+  }
   const tasks = new Listr(
     [
       await addPackagesTask({
@@ -52,9 +72,11 @@ const handler = async ({ force }) => {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

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

@@ -8,6 +8,10 @@ import {
   isTypeScriptProject,
   getConfigPath
 } from "@cedarjs/cli-helpers";
+import {
+  formatCedarCommand,
+  formatRunBinCommand
+} from "@cedarjs/cli-helpers/packageManager/display";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { printSetupNotes } from "../../../../lib/index.js";
@@ -34,9 +38,11 @@ async function handler({ force }) {
     );
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 }
 async function getAddCoherenceFilesTask(force) {
@@ -46,11 +52,11 @@ async function getAddCoherenceFilesTask(force) {
       content: coherenceFiles.healthCheck
     }
   ];
-  const coherenceConfigFile = {
-    path: path.join(cedarPaths.base, "coherence.yml")
-  };
-  coherenceConfigFile.content = await getCoherenceConfigFileContent();
-  files.push(coherenceConfigFile);
+  const coherenceConfigContent = await getCoherenceConfigFileContent();
+  files.push({
+    path: path.join(cedarPaths.base, "coherence.yml"),
+    content: coherenceConfigContent
+  });
   return addFilesTask({
     title: `Adding coherence.yml and health.${EXTENSION}`,
     files,
@@ -74,20 +80,34 @@ async function getCoherenceConfigFileContent() {
   if (db === "postgresql") {
     db = "postgres";
   }
-  const apiProdCommand = ["yarn", "cedar", "build", "api", "&&"];
+  const apiProdCommandSegments = [formatCedarCommand(["build", "api"]), "&&"];
   if (serverFileExists()) {
-    apiProdCommand.push(
-      "yarn",
-      "node",
-      "api/dist/server.js",
-      "--apiRootPath=/api"
+    apiProdCommandSegments.push(
+      formatRunBinCommand("node", ["api/dist/server.js", "--apiRootPath=/api"])
     );
   } else {
-    apiProdCommand.push("yarn", "cedar", "serve", "api", "--apiRootPath=/api");
+    apiProdCommandSegments.push(
+      formatCedarCommand(["serve", "api", "--apiRootPath=/api"])
+    );
   }
+  const apiDevCommandSegments = [
+    formatCedarCommand(["build", "api"]),
+    "&&",
+    formatCedarCommand(["dev", "api", "--apiRootPath=/api"])
+  ];
+  const migrationCommandSegments = [
+    formatCedarCommand(["prisma", "migrate", "deploy"]),
+    "&&",
+    formatCedarCommand(["data-migrate", "up"])
+  ];
   return coherenceFiles.yamlTemplate({
     db,
-    apiProdCommand: `[${apiProdCommand.map((cmd) => `"${cmd}"`).join(", ")}]`
+    apiProdCommand: `[${apiProdCommandSegments.map((cmd) => `"${cmd}"`).join(", ")}]`,
+    apiDevCommand: `[${apiDevCommandSegments.map((cmd) => `"${cmd}"`).join(", ")}]`,
+    migrationCommand: `[${migrationCommandSegments.map((cmd) => `"${cmd}"`).join(", ")}]`,
+    webProdCommand: `["${formatCedarCommand(["serve", "web"])}"]`,
+    webDevCommand: `["${formatCedarCommand(["dev", "web", '--fwd=\\"--allowed-hosts all\\"'])}"]`,
+    webBuildCommand: `["${formatCedarCommand(["build", "web", "--no-prerender"])}"]`
   });
 }
 const SUPPORTED_DATABASES = ["mysql", "postgresql"];
@@ -117,13 +137,13 @@ function updateConfigTomlTask() {
       }
       configContent = configContent.replaceAll(
         HOST_REGEXP,
-        (match, spaceBeforeAssign, spaceAfterAssign) => ["host", spaceBeforeAssign, "=", spaceAfterAssign, '"0.0.0.0"'].join(
+        (_match, spaceBeforeAssign, spaceAfterAssign) => ["host", spaceBeforeAssign, "=", spaceAfterAssign, '"0.0.0.0"'].join(
           ""
         )
       );
       configContent = configContent.replace(
         API_URL_REGEXP,
-        (match, spaceBeforeAssign, spaceAfterAssign) => ["apiUrl", spaceBeforeAssign, "=", spaceAfterAssign, '"/api"'].join(
+        (_match, spaceBeforeAssign, spaceAfterAssign) => ["apiUrl", spaceBeforeAssign, "=", spaceAfterAssign, '"/api"'].join(
           ""
         )
       );
@@ -145,14 +165,22 @@ const HOST_REGEXP = /host(\s*)=(\s*)\".+\"/g;
 const API_URL_REGEXP = /apiUrl(\s*)=(\s*)\".+\"/;
 const PORT_REGEXP = /port(\s*)=(\s*)(?<port>\d{4})/g;
 const coherenceFiles = {
-  yamlTemplate({ db, apiProdCommand }) {
+  yamlTemplate({
+    db,
+    apiProdCommand,
+    apiDevCommand,
+    migrationCommand,
+    webProdCommand,
+    webDevCommand,
+    webBuildCommand
+  }) {
     return `api:
   type: backend
   url_path: "/api"
   prod:
     command: ${apiProdCommand}
   dev:
-    command: ["yarn", "cedar", "build", "api", "&&", "yarn", "cedar", "dev", "api", "--apiRootPath=/api"]
+    command: ${apiDevCommand}
   local_packages: ["node_modules"]
 
   system:
@@ -168,20 +196,20 @@ const coherenceFiles = {
       ${db === "postgres" ? "adapter: postgresql" : ""}
 
   # If you use data migrations, use the following instead:
-  # migration: ["yarn", "cedar", "prisma", "migrate", "deploy", "&&", "yarn", "cedar", "data-migrate", "up"]
-  migration: ["yarn", "cedar", "prisma", "migrate", "deploy"]
+  # migration: ["${formatCedarCommand(["prisma", "migrate", "deploy"])}", "&&", "${formatCedarCommand(["data-migrate", "up"])}"]
+  migration: ${migrationCommand}
 
 web:
   type: frontend
   assets_path: "web/dist"
   prod:
-    command: ["yarn", "cedar", "serve", "web"]
+    command: ${webProdCommand}
   dev:
-    command: ["yarn", "cedar", "dev", "web", "--fwd=\\"--allowed-hosts all\\""]
+    command: ${webDevCommand}
 
   # Heads up: Redwood's prerender doesn't work with Coherence yet.
   # For current status and updates, see https://github.com/redwoodjs/redwood/issues/8333.
-  build: ["yarn", "cedar", "build", "web", "--no-prerender"]
+  build: ${webBuildCommand}
   local_packages: ["node_modules"]
 
   system:

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

@@ -4,18 +4,20 @@ import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";
 import { getUserApiUrl, updateApiURLTask } from "../helpers/index.js";
 import {
-  flightcontrolConfig,
+  getFlightcontrolConfig,
   databaseEnvVariables,
   postgresDatabaseService,
   mysqlDatabaseService
 } from "../templates/flightcontrol.js";
 const { getConfig } = prismaInternals;
 const getFlightcontrolJson = async (database) => {
+  const flightcontrolConfig = getFlightcontrolConfig();
   if (database === "none") {
     return {
       path: path.join(getPaths().base, "flightcontrol.json"),
@@ -46,18 +48,20 @@ const getFlightcontrolJson = async (database) => {
           {
             ...flightcontrolConfig.environments[0],
             services: [
-              ...flightcontrolConfig.environments[0].services.map((service) => {
-                if (service.id === "cedar-api") {
-                  return {
-                    ...service,
-                    envVariables: {
-                      ...service.envVariables,
-                      ...databaseEnvVariables
-                    }
-                  };
+              ...flightcontrolConfig.environments[0].services.map(
+                (service) => {
+                  if (service.id === "cedar-api") {
+                    return {
+                      ...service,
+                      envVariables: {
+                        ...service.envVariables,
+                        ...databaseEnvVariables
+                      }
+                    };
+                  }
+                  return service;
                 }
-                return service;
-              }),
+              ),
               dbService
             ]
           }
@@ -69,15 +73,15 @@ const getFlightcontrolJson = async (database) => {
     Prisma datasource provider is detected to be ${detectedDatabase}.
 
     Update your schema.prisma provider to be postgresql or mysql, then run
-    yarn cedar prisma migrate dev
-    yarn cedar setup deploy flightcontrol
+    ${formatCedarCommand(["prisma", "migrate", "dev"])}
+    ${formatCedarCommand(["setup", "deploy", "flightcontrol"])}
     `);
   }
 };
 const updateGraphQLFunction = () => {
   return {
     title: "Adding CORS config to createGraphQLHandler...",
-    task: (_ctx) => {
+    task: () => {
       const graphqlTsPath = path.join(
         getPaths().base,
         "api/src/functions/graphql.ts"
@@ -125,7 +129,7 @@ const updateGraphQLFunction = () => {
 const updateDbAuth = () => {
   return {
     title: "Updating dbAuth cookie config (if used)...",
-    task: (_ctx) => {
+    task: () => {
       const authTsPath = path.join(getPaths().base, "api/src/functions/auth.ts");
       const authJsPath = path.join(getPaths().base, "api/src/functions/auth.js");
       let authFnPath;
@@ -174,7 +178,7 @@ const updateDbAuth = () => {
 const updateApp = () => {
   return {
     title: "Updating App.jsx fetch config...",
-    task: (_ctx) => {
+    task: () => {
       const appTsPath = path.join(getPaths().base, "web/src/App.tsx");
       const appJsPath = path.join(getPaths().base, "web/src/App.jsx");
       let appPath;
@@ -232,8 +236,9 @@ const addToDotEnvDefaultTask = () => {
         CEDAR_API_URL=${getUserApiUrl()}
         `;
       }
+      return void 0;
     },
-    task: async (_ctx) => {
+    task: async () => {
       const env = path.resolve(getPaths().base, ".env.defaults");
       const apiUrl = getUserApiUrl();
       const line = `
@@ -250,7 +255,10 @@ const notes = [
   "Check out the deployment docs at https://app.flightcontrol.dev/docs for detailed instructions\n",
   "NOTE: If you are using yarn v1, remove the installCommand's from flightcontrol.json"
 ];
-const handler = async ({ force, database }) => {
+const handler = async ({
+  force,
+  database
+}) => {
   recordTelemetryAttributes({
     command: "setup deploy flightcontrol",
     force,
@@ -262,7 +270,7 @@ const handler = async ({ force, database }) => {
         title: "Adding flightcontrol.json",
         task: async () => {
           const fileData = await getFlightcontrolJson(database);
-          let files = {};
+          const files = {};
           files[fileData.path] = JSON.stringify(fileData.content, null, 2);
           return writeFilesTask(files, { overwriteExisting: force });
         }
@@ -279,9 +287,11 @@ const handler = async ({ force, database }) => {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

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

@@ -1,8 +1,14 @@
 import { createHandler } from "../helpers/helpers.js";
 const command = "netlify";
 const description = "Setup Netlify deploy";
+const builder = (yargs) => yargs.option("ud", {
+  description: "Setup for use with Universal Deploy",
+  type: "boolean",
+  default: false
+});
 const handler = createHandler("netlify");
 export {
+  builder,
   command,
   description,
   handler