@cedarjs/cli 9.0.0-canary.1784 → 9.0.0-canary.3124

package/dist/commands/lint.js

@@ -1,69 +1,15 @@
 import fs from "node:fs";
-import path from "node:path";
-import execa from "execa";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { getPaths, getConfig } from "../lib/index.js";
-function detectLegacyEslintConfig() {
-  const projectRoot = getPaths().base;
-  const legacyConfigFiles = [
-    ".eslintrc.js",
-    ".eslintrc.cjs",
-    ".eslintrc.json",
-    ".eslintrc.yaml",
-    ".eslintrc.yml"
-  ];
-  const foundLegacyFiles = [];
-  for (const configFile of legacyConfigFiles) {
-    if (fs.existsSync(path.join(projectRoot, configFile))) {
-      foundLegacyFiles.push(configFile);
-    }
-  }
-  const packageJsonPath = path.join(projectRoot, "package.json");
-  if (fs.existsSync(packageJsonPath)) {
-    try {
-      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-      if (packageJson.eslintConfig) {
-        foundLegacyFiles.push("package.json (eslintConfig field)");
-      }
-      if (packageJson.eslint) {
-        foundLegacyFiles.push("package.json (eslint field)");
-      }
-    } catch (error) {
-    }
-  }
-  return foundLegacyFiles;
-}
-function showLegacyEslintDeprecationWarning(legacyFiles) {
-  console.warn("");
-  console.warn("\u26A0\uFE0F  DEPRECATION WARNING: Legacy ESLint Configuration Detected");
-  console.warn("");
-  console.warn("   The following legacy ESLint configuration files were found:");
-  legacyFiles.forEach((file) => {
-    console.warn(`   - ${file}`);
-  });
-  console.warn("");
-  console.warn(
-    "   Cedar has migrated to ESLint flat config format. Legacy configurations"
-  );
-  console.warn(
-    "   still work but are deprecated and will be removed in a future version."
-  );
-  console.warn("");
-  console.warn("   To migrate to the new format:");
-  console.warn("   1. Remove the legacy config file(s) listed above");
-  console.warn("   2. Create an eslint.config.mjs");
-  console.warn("   3. Use the flat config format with @cedarjs/eslint-config");
-  console.warn("");
-  console.warn("   See more here: https://github.com/cedarjs/cedar/pull/629");
-  console.warn("");
-}
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { getPaths } from "@cedarjs/project-config";
 const command = "lint [paths..]";
 const description = "Lint your files";
 const builder = (yargs) => {
   yargs.positional("paths", {
     description: "Specify file(s) or directory(ies) to lint relative to project root",
-    type: "array"
+    type: "string",
+    array: true
   }).option("fix", {
     default: false,
     description: "Try to fix errors",
@@ -79,18 +25,22 @@ const builder = (yargs) => {
     )}`
   );
 };
-const handler = async ({ paths, fix, format }) => {
+const handler = async ({
+  paths = [],
+  fix = false,
+  format = "stylish"
+}) => {
   recordTelemetryAttributes({ command: "lint", fix, format });
-  const config = getConfig();
-  const legacyConfigFiles = detectLegacyEslintConfig();
-  if (legacyConfigFiles.length > 0 && config.eslintLegacyConfigWarning) {
-    showLegacyEslintDeprecationWarning(legacyConfigFiles);
-  }
   try {
     const sbPath = getPaths().web.storybook;
-    const args = ["eslint", fix && "--fix", "--format", format, ...paths];
+    const eslintArgs = [
+      fix && "--fix",
+      "--format",
+      format,
+      ...paths
+    ];
     if (paths.length === 0) {
-      args.push(
+      eslintArgs.push(
         fs.existsSync(getPaths().web.src) && "web/src",
         fs.existsSync(getPaths().web.config) && "web/config",
         fs.existsSync(sbPath) && "web/.storybook",
@@ -98,13 +48,20 @@ const handler = async ({ paths, fix, format }) => {
         fs.existsSync(getPaths().api.src) && "api/src"
       );
     }
-    const result = await execa("yarn", args.filter(Boolean), {
+    const filteredEslintArgs = eslintArgs.filter(
+      (arg) => Boolean(arg)
+    );
+    const result = await runBin("eslint", filteredEslintArgs, {
       cwd: getPaths().base,
       stdio: "inherit"
     });
     process.exitCode = result.exitCode;
   } catch (error) {
-    process.exitCode = error.exitCode ?? 1;
+    if (error && typeof error === "object" && "exitCode" in error) {
+      process.exitCode = typeof error.exitCode === "number" ? error.exitCode : 1;
+      return;
+    }
+    process.exitCode = 1;
   }
 };
 export {

package/dist/commands/prerenderHandler.js

@@ -1,20 +1,42 @@
 import fs from "node:fs";
-import path from "path";
+import path from "node:path";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { getConfig, getPaths, projectIsEsm } from "@cedarjs/project-config";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { getConfig, getPaths } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../lib/colors.js";
 import { runScriptFunction } from "../lib/exec.js";
 import { configureBabel } from "../lib/execBabel.js";
 class PathParamError extends Error {
 }
+const hasPath = (route) => {
+  return typeof route.path === "string" && route.path.length > 0;
+};
+const normalizeRoute = (route) => {
+  const normalizedPath = route.path;
+  const normalizedName = typeof route.name === "string" ? route.name : normalizedPath;
+  const normalizedRoutePath = typeof route.routePath === "string" ? route.routePath : normalizedPath;
+  const normalizedFilePath = typeof route.filePath === "string" ? route.filePath : "";
+  return {
+    ...route,
+    name: normalizedName,
+    path: normalizedPath,
+    routePath: normalizedRoutePath,
+    filePath: normalizedFilePath
+  };
+};
+const getErrorMessage = (error) => {
+  return error instanceof Error ? error.message : String(error);
+};
+const getErrorStack = (error) => {
+  return error instanceof Error ? error.stack ?? error.message : String(error);
+};
 const mapRouterPathToHtml = (routerPath) => {
   if (routerPath === "/") {
     return "web/dist/index.html";
-  } else {
-    return `web/dist${routerPath}.html`;
   }
+  return `web/dist${routerPath}.html`;
 };
 function getRouteHooksFilePath(routeFilePath) {
   const routeHooksFilePathTs = routeFilePath.replace(
@@ -49,28 +71,32 @@ async function expandRouteParameters(route) {
         filePath: route.filePath
       }
     });
-    if (routeParameters) {
+    if (Array.isArray(routeParameters)) {
       return routeParameters.map((pathParamValues) => {
         let newPath = route.path;
-        Object.entries(pathParamValues).forEach(([paramName, paramValue]) => {
-          newPath = newPath.replace(
-            new RegExp(`{${paramName}:?[^}]*}`),
-            paramValue
+        if (typeof pathParamValues === "object" && pathParamValues !== null && !Array.isArray(pathParamValues)) {
+          Object.entries(pathParamValues).forEach(
+            ([paramName, paramValue]) => {
+              newPath = newPath.replace(
+                new RegExp(`{${paramName}:?[^}]*}`),
+                String(paramValue)
+              );
+            }
           );
-        });
+        }
         return { ...route, path: newPath };
       });
     }
-  } catch (e) {
-    console.error(c.error(e.stack));
+  } catch (error) {
+    console.error(c.error(getErrorStack(error)));
     return [route];
   }
   return [route];
 }
 const getTasks = async (dryrun, routerPathFilter = null) => {
-  const detector = projectIsEsm() ? await import("@cedarjs/prerender/detection") : await import("@cedarjs/prerender/cjs/detection");
-  const prerenderRoutes = detector.detectPrerenderRoutes().filter((route) => route.path);
-  const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
+  const detector = await import("@cedarjs/prerender/detection");
+  const detectedRoutes = detector.detectPrerenderRoutes();
+  const prerenderRoutes = detectedRoutes.filter(hasPath).map(normalizeRoute);
   if (prerenderRoutes.length === 0) {
     console.log("\nSkipping prerender...");
     console.log(
@@ -80,9 +106,10 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
     );
     return [];
   }
+  const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
   if (!fs.existsSync(indexHtmlPath)) {
     console.error(
-      "You must run `yarn cedar build web` before trying to prerender."
+      `You must run \`${formatCedarCommand(["build", "web"])}\` before trying to prerender.`
     );
     process.exit(1);
   }
@@ -90,7 +117,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
   const expandedRouteParameters = await Promise.all(
     prerenderRoutes.map((route) => expandRouteParameters(route))
   );
-  const prerenderer = projectIsEsm() ? await import("@cedarjs/prerender") : await import("@cedarjs/prerender/cjs");
+  const prerenderer = await import("@cedarjs/prerender");
   const listrTasks = expandedRouteParameters.flatMap((routesToPrerender) => {
     const queryCache = {};
     const shouldFold = routesToPrerender.length > 16;
@@ -125,24 +152,28 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
         }
       ];
     }
-    return routesToPrerender.map((routeToPrerender) => {
-      if (routerPathFilter && routeToPrerender.path !== routerPathFilter) {
-        return [];
-      }
-      const outputHtmlPath = mapRouterPathToHtml(routeToPrerender.path);
-      return {
-        title: `Prerendering ${routeToPrerender.path} -> ${outputHtmlPath}`,
-        task: async () => {
-          await prerenderRoute(
-            prerenderer,
-            queryCache,
-            routeToPrerender,
-            dryrun,
-            outputHtmlPath
-          );
+    return routesToPrerender.flatMap(
+      (routeToPrerender) => {
+        if (routerPathFilter && routeToPrerender.path !== routerPathFilter) {
+          return [];
         }
-      };
-    });
+        const outputHtmlPath = mapRouterPathToHtml(routeToPrerender.path);
+        return [
+          {
+            title: `Prerendering ${routeToPrerender.path} -> ${outputHtmlPath}`,
+            task: async () => {
+              await prerenderRoute(
+                prerenderer,
+                queryCache,
+                routeToPrerender,
+                dryrun,
+                outputHtmlPath
+              );
+            }
+          }
+        ];
+      }
+    );
   });
   return listrTasks;
 };
@@ -160,12 +191,6 @@ const diagnosticCheck = () => {
         path.join(getPaths().web.base, "node_modules/react-dom")
       )
     },
-    {
-      message: "Duplicate core-js version found in web/node_modules",
-      failure: fs.existsSync(
-        path.join(getPaths().web.base, "node_modules/core-js")
-      )
-    },
     {
       message: "Duplicate @cedarjs/web version found in web/node_modules",
       failure: fs.existsSync(
@@ -174,7 +199,7 @@ const diagnosticCheck = () => {
     }
   ];
   console.log("Running diagnostic checks");
-  if (checks.some((checks2) => checks2.failure)) {
+  if (checks.some((check) => check.failure)) {
     console.error(c.error("node_modules are being duplicated in `./web` \n"));
     console.log("\u26A0\uFE0F  Issues found: ");
     console.log("-".repeat(50));
@@ -196,8 +221,11 @@ const diagnosticCheck = () => {
     console.log("\u2714 Diagnostics checks passed \n");
   }
 };
+const hasUnexpandedPathParams = (routePath) => {
+  return /\{.*}/.test(routePath);
+};
 const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun, outputHtmlPath) => {
-  if (/\{.*}/.test(routeToPrerender.path)) {
+  if (hasUnexpandedPathParams(routeToPrerender.path)) {
     throw new PathParamError(
       `Could not retrieve route parameters for ${routeToPrerender.path}`
     );
@@ -207,25 +235,33 @@ const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun,
       queryCache,
       renderPath: routeToPrerender.path
     });
-    if (!dryrun) {
+    if (!dryrun && typeof prerenderedHtml === "string") {
       prerenderer.writePrerenderedHtmlFile(outputHtmlPath, prerenderedHtml);
     }
-  } catch (e) {
+  } catch (error) {
     console.log();
     console.log(
-      c.warning("You can use `yarn cedar prerender --dry-run` to debug")
+      c.warning(
+        "You can use `" + formatCedarCommand(["prerender", "--dry-run"]) + "` to debug"
+      )
     );
     console.log();
-    console.log(
-      `${c.info("-".repeat(10))} Error rendering path "${routeToPrerender.path}" ${c.info("-".repeat(10))}`
+    const sep = c.info("-".repeat(10));
+    console.log(`${sep} Error rendering path "${routeToPrerender.path}" ${sep}`);
+    errorTelemetry(
+      process.argv,
+      `Error prerendering: ${getErrorMessage(error)}`
     );
-    errorTelemetry(process.argv, `Error prerendering: ${e.message}`);
-    console.error(c.error(e.stack));
+    console.error(c.error(getErrorStack(error)));
     console.log();
     throw new Error(`Failed to render "${routeToPrerender.filePath}"`);
   }
 };
-const handler = async ({ path: routerPath, dryRun, verbose }) => {
+const handler = async ({
+  path: routerPath,
+  dryRun = false,
+  verbose = false
+}) => {
   if (getConfig().experimental?.streamingSsr?.enabled) {
     console.log(
       c.warning(
@@ -239,7 +275,7 @@ const handler = async ({ path: routerPath, dryRun, verbose }) => {
     dryRun,
     verbose
   });
-  const listrTasks = await getTasks(dryRun, routerPath);
+  const listrTasks = await getTasks(dryRun, routerPath ?? null);
   const tasks = new Listr(listrTasks, {
     renderer: verbose ? "verbose" : "default",
     rendererOptions: { collapseSubtasks: false },
@@ -250,11 +286,11 @@ const handler = async ({ path: routerPath, dryRun, verbose }) => {
       console.log(c.info("::: Dry run, not writing changes :::"));
     }
     await tasks.run();
-  } catch (e) {
+  } catch (error) {
     console.log();
-    await diagnosticCheck();
+    diagnosticCheck();
     console.log(c.warning("Tips:"));
-    if (e instanceof PathParamError) {
+    if (error instanceof PathParamError) {
       console.log(
         c.info(
           "- You most likely need to add or update a *.routeHooks.{js,ts} file next to the Page you're trying to prerender"
@@ -263,7 +299,7 @@ const handler = async ({ path: routerPath, dryRun, verbose }) => {
     } else {
       console.log(
         c.info(
-          `- This could mean that a library you're using does not support SSR.`
+          "- This could mean that a library you're using does not support SSR."
         )
       );
       console.log(
@@ -283,5 +319,6 @@ const handler = async ({ path: routerPath, dryRun, verbose }) => {
 };
 export {
   getTasks,
-  handler
+  handler,
+  hasUnexpandedPathParams
 };

package/dist/commands/prismaHandler.js

@@ -1,66 +1,91 @@
 import fs from "node:fs";
-import path from "path";
 import boxen from "boxen";
-import execa from "execa";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import {
+  formatCedarCommand,
+  formatRunBinCommand,
+  formatRunTransitiveBinCommand
+} from "@cedarjs/cli-helpers/packageManager/display";
+import { runTransitiveBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../lib/colors.js";
 import { getPaths } from "../lib/index.js";
-const handler = async ({ _, $0, commands = [], ...options }) => {
+const getErrorMessage = (error) => {
+  return error instanceof Error ? error.message : String(error);
+};
+function getExitCode(value) {
+  if (!value || typeof value !== "object" || !("exitCode" in value) || typeof value.exitCode !== "number") {
+    return void 0;
+  }
+  return value.exitCode;
+}
+const handler = async ({
+  _: _positionals,
+  $0: _binName,
+  commands = [],
+  ...options
+}) => {
   recordTelemetryAttributes({
     command: "prisma"
   });
-  const rwjsPaths = getPaths();
-  const helpIndex = commands.indexOf("help");
+  const cedarPaths = getPaths();
+  const args = [...Array.isArray(commands) ? commands : []].filter(
+    (value) => typeof value === "string"
+  );
+  const helpIndex = args.indexOf("help");
   if (helpIndex !== -1) {
     options.help = true;
-    commands.splice(helpIndex, 1);
+    args.splice(helpIndex, 1);
   }
   const hasHelpOption = options.help || options.h;
   if (!hasHelpOption) {
-    if (!fs.existsSync(rwjsPaths.api.prismaConfig)) {
+    if (!fs.existsSync(cedarPaths.api.prismaConfig)) {
       console.error();
       console.error(c.error("No Prisma config file found."));
-      console.error(`Cedar searched here '${rwjsPaths.api.prismaConfig}'`);
+      console.error(`Cedar searched here '${cedarPaths.api.prismaConfig}'`);
       console.error();
       process.exit(1);
     }
-    options.config = `${rwjsPaths.api.prismaConfig}`;
+    options.config = `${cedarPaths.api.prismaConfig}`;
   }
-  const args = commands;
   for (const [name, value] of Object.entries(options)) {
     args.push(name.length > 1 ? `--${name}` : `-${name}`);
     if (typeof value === "string") {
-      value.split(" ").length > 1 ? args.push(`"${value}"`) : args.push(value);
-    } else if (typeof value === "number") {
       args.push(value);
+    } else if (typeof value === "number") {
+      args.push(String(value));
     }
   }
   console.log();
   console.log(c.note("Running Prisma CLI..."));
-  console.log(c.underline("$ yarn prisma " + args.join(" ")));
+  console.log(c.underline(`$ ${formatRunTransitiveBinCommand("prisma", args)}`));
   console.log();
   try {
-    const prismaBin = path.join(rwjsPaths.base, "node_modules/.bin/prisma");
-    execa.sync(prismaBin, args, {
-      cwd: rwjsPaths.base,
-      stdio: "inherit",
-      cleanup: true
+    runTransitiveBinSync("prisma", args, {
+      cwd: cedarPaths.base,
+      stdio: [
+        process.stdin.isTTY && !process.env.CI ? "inherit" : "pipe",
+        "inherit",
+        "inherit"
+      ]
     });
-    if (hasHelpOption || commands.length === 0) {
+    if (hasHelpOption || args.length === 0) {
       printWrapInfo();
     }
-  } catch (e) {
-    errorTelemetry(process.argv, `Error generating prisma client: ${e.message}`);
-    process.exit(e?.exitCode || 1);
+  } catch (error) {
+    errorTelemetry(
+      process.argv,
+      `Error generating prisma client: ${getErrorMessage(error)}`
+    );
+    process.exit(getExitCode(error) ?? 1);
   }
 };
 const printWrapInfo = () => {
   const message = [
     c.bold("Cedar 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 \`${formatCedarCommand(["prisma"])}\` to automatically pass \`--config\` and \`--preview-feature\` options.`,
+    `Use \`${formatRunBinCommand("prisma")}\` to skip Cedar's automatic CLI options.`,
     "",
     "Find more information in our docs:",
     c.underline("https://cedarjs.com/docs/cli-commands#prisma")

package/dist/commands/record/init.js

@@ -1,5 +1,5 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-const handler = async () => {
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+const handler = async (_argv) => {
   recordTelemetryAttributes({
     command: "record"
   });

package/dist/commands/record.js

@@ -1,7 +1,8 @@
+import { terminalLink } from "termi-link";
 const command = "record <command>";
 const description = "Setup RedwoodRecord for your project. Caches a JSON version of your data model and adds api/src/models/index.js with some config.";
-import { terminalLink } from "termi-link";
-const builder = (yargs) => yargs.command({ command, description, handler }).demandCommand().epilogue(
+const builder = (yargs) => yargs.command(command, description, () => {
+}, handler).demandCommand().epilogue(
   `Also see the ${terminalLink(
     "RedwoodRecord Docs",
     "https://cedarjs.com/docs/redwoodrecord"
@@ -10,7 +11,7 @@ const builder = (yargs) => yargs.command({ command, description, handler }).dema
 );
 async function handler(argv) {
   const recordInit = await import("./record/init.js");
-  recordInit(argv);
+  return recordInit.handler(argv);
 }
 export {
   builder,