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

package/dist/commands/test/testHandler.js

@@ -1,11 +1,13 @@
+import fs from "node:fs";
+import path from "node:path";
+import execa from "execa";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../../lib/index.js";
 import * as project from "../../lib/project.js";
 import { warnIfNonStandardDatasourceUrl } from "./datasourceWarning.js";
-import { assertSingleViteVersion } from "./viteVersionCheck.js";
 function hasStringMessage(value) {
   return typeof value === "object" && value !== null && "message" in value && value.message === "string";
 }
@@ -15,29 +17,73 @@ function getExitCode(value) {
   }
   return value.exitCode;
 }
+function isInGitRepository() {
+  try {
+    execa.commandSync("git rev-parse --is-inside-work-tree");
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isInMercurialRepository() {
+  try {
+    execa.commandSync("hg --cwd . root");
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isJestConfigFile(sides) {
+  for (const side of sides) {
+    try {
+      const jestConfigExists = fs.existsSync(path.join(side, "jest.config.js")) || fs.existsSync(path.join(side, "jest.config.ts"));
+      if (!jestConfigExists) {
+        console.error(
+          c.error(
+            `
+Error: Missing Jest config file ${side}/jest.config.js
+To add this file, run \`npx @cedarjs/codemods update-jest-config\`
+`
+          )
+        );
+        throw new Error(`Error: Jest config file not found in ${side} side`);
+      }
+    } catch (error) {
+      const message = hasStringMessage(error) ? error.message : `Error: Jest config file not found in ${side} side`;
+      errorTelemetry(process.argv, message);
+      process.exit(getExitCode(error) ?? 1);
+    }
+  }
+}
 const handler = async ({
   filter: filterParams = [],
+  watch = true,
+  collectCoverage = false,
   dbPush = true,
   force = false,
   ...others
 }) => {
   recordTelemetryAttributes({
     command: "test",
+    watch,
+    collectCoverage,
     dbPush
   });
-  let watch = true;
   const rwjsPaths = getPaths();
-  const forwardVitestFlags = Object.keys(others).flatMap((flagName) => {
-    if (["db-push", "force", "loadEnvFiles", "$0", "_"].includes(flagName)) {
+  const forwardJestFlags = Object.keys(others).flatMap((flagName) => {
+    if ([
+      "collect-coverage",
+      "db-push",
+      "force",
+      "loadEnvFiles",
+      "watch",
+      "$0",
+      "_"
+    ].includes(flagName)) {
       return [];
     }
     const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
     const flagValue = others[flagName];
-    if (flagName === "watch") {
-      watch = flagValue === true;
-    } else if (flagName === "run" && flagValue) {
-      watch = false;
-    }
     if (Array.isArray(flagValue)) {
       return flagValue.flatMap((val) => [flag, val]);
     }
@@ -46,25 +92,28 @@ const handler = async ({
   const sides = filterParams.filter(
     (filterString) => project.workspaces().includes(filterString)
   );
-  const vitestFilterArgs = [
+  const jestFilterArgs = [
     ...filterParams.filter(
       (filterString) => !project.workspaces().includes(filterString)
     )
   ];
-  const vitestArgs = [
-    ...vitestFilterArgs,
-    ...forwardVitestFlags,
+  const jestArgs = [
+    ...jestFilterArgs,
+    ...forwardJestFlags,
+    collectCoverage ? "--collectCoverage" : null,
     "--passWithNoTests"
   ].filter((flagOrValue) => flagOrValue !== null);
-  if (process.env.CI) {
-    vitestArgs.push("--run");
+  if (watch && !process.env.CI && !collectCoverage) {
+    const hasSourceControl = isInGitRepository() || isInMercurialRepository();
+    jestArgs.push(hasSourceControl ? "--watch" : "--watchAll");
   }
-  if (!others["config"]) {
-    sides.forEach((side) => vitestArgs.push("--project", side));
-    if (!sides.length) {
-      project.workspaces().forEach((side) => sides.push(side));
-    }
+  if (!sides.length) {
+    project.workspaces().forEach((side) => sides.push(side));
+  }
+  if (sides.length > 0) {
+    jestArgs.push("--projects", ...sides);
   }
+  isJestConfigFile(sides);
   try {
     const cacheDirDb = `file:${ensurePosixPath(
       rwjsPaths.generated.base
@@ -77,11 +126,8 @@ const handler = async ({
     if (sides.includes("api")) {
       await warnIfNonStandardDatasourceUrl({ force });
     }
-    if (sides.includes("web")) {
-      assertSingleViteVersion();
-    }
     const runCommand = async () => {
-      await runBin("vitest", vitestArgs, {
+      await runBin("jest", jestArgs, {
         cwd: rwjsPaths.base,
         stdio: "inherit",
         env: {

package/dist/commands/test/testHandlerEsm.js

@@ -0,0 +1,109 @@
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
+import { ensurePosixPath } from "@cedarjs/project-config";
+import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
+import { getPaths } from "../../lib/index.js";
+import * as project from "../../lib/project.js";
+import { warnIfNonStandardDatasourceUrl } from "./datasourceWarning.js";
+function hasStringMessage(value) {
+  return typeof value === "object" && value !== null && "message" in value && value.message === "string";
+}
+function getExitCode(value) {
+  if (!value || typeof value !== "object" || !("exitCode" in value) || typeof value.exitCode !== "number") {
+    return void 0;
+  }
+  return value.exitCode;
+}
+const handler = async ({
+  filter: filterParams = [],
+  dbPush = true,
+  force = false,
+  ...others
+}) => {
+  recordTelemetryAttributes({
+    command: "test",
+    dbPush
+  });
+  let watch = true;
+  const rwjsPaths = getPaths();
+  const forwardVitestFlags = Object.keys(others).flatMap((flagName) => {
+    if (["db-push", "force", "loadEnvFiles", "$0", "_"].includes(flagName)) {
+      return [];
+    }
+    const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
+    const flagValue = others[flagName];
+    if (flagName === "watch") {
+      watch = flagValue === true;
+    } else if (flagName === "run" && flagValue) {
+      watch = false;
+    }
+    if (Array.isArray(flagValue)) {
+      return flagValue.flatMap((val) => [flag, val]);
+    }
+    return [flag, flagValue];
+  });
+  const sides = filterParams.filter(
+    (filterString) => project.workspaces().includes(filterString)
+  );
+  const vitestFilterArgs = [
+    ...filterParams.filter(
+      (filterString) => !project.workspaces().includes(filterString)
+    )
+  ];
+  const vitestArgs = [
+    ...vitestFilterArgs,
+    ...forwardVitestFlags,
+    "--passWithNoTests"
+  ].filter((flagOrValue) => flagOrValue !== null);
+  if (process.env.CI) {
+    vitestArgs.push("--run");
+  }
+  if (!others["config"]) {
+    sides.forEach((side) => vitestArgs.push("--project", side));
+    if (!sides.length) {
+      project.workspaces().forEach((side) => sides.push(side));
+    }
+  }
+  try {
+    const cacheDirDb = `file:${ensurePosixPath(
+      rwjsPaths.generated.base
+    )}/test.db`;
+    const mainDatabaseUrl = process.env.DATABASE_URL;
+    const DATABASE_URL = process.env.TEST_DATABASE_URL || cacheDirDb;
+    if (sides.includes("api") && !dbPush) {
+      process.env.SKIP_DB_PUSH = "1";
+    }
+    if (sides.includes("api")) {
+      await warnIfNonStandardDatasourceUrl({ force });
+    }
+    const runCommand = async () => {
+      await runBin("vitest", vitestArgs, {
+        cwd: rwjsPaths.base,
+        stdio: "inherit",
+        env: {
+          ...process.env,
+          DATABASE_URL,
+          // Always set, even to '', so CedarApiVitestEnv can tell "there's
+          // no real DATABASE_URL to compare against" apart from "this isn't
+          // running through `cedar test` at all" (e.g. a direct `vitest`
+          // invocation, whose own DATABASE_URL hasn't been touched yet).
+          CEDAR_APP_DATABASE_URL: mainDatabaseUrl ?? ""
+        }
+      });
+    };
+    if (watch) {
+      await runCommand();
+    } else {
+      await timedTelemetry(process.argv, { type: "test" }, async () => {
+        await runCommand();
+      });
+    }
+  } catch (error) {
+    const message = hasStringMessage(error) ? error.message : "Test command failed";
+    errorTelemetry(process.argv, message);
+    process.exit(getExitCode(error) ?? 1);
+  }
+};
+export {
+  handler
+};

package/dist/commands/test.js

@@ -1,31 +1,39 @@
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { workspaces } from "../lib/project.js";
 const command = "test [filter..]";
-const description = "Run Vitest tests. Defaults to watch mode";
+const description = "Run Jest tests. Defaults to watch mode";
 const builder = (yargs) => {
-  const cliDocsLink = terminalLink(
-    "CedarJS CLI Reference",
-    "https://cedarjs.com/docs/cli-commands#test"
-  );
-  const vitestTip = c.tip("yarn vitest --help");
   yargs.strict(false).positional("filter", {
     default: workspaces(),
     description: "Which side(s) to test, and/or a regular expression to match against your test files to filter by",
     type: "string",
     array: true
+  }).option("watch", {
+    describe: "Run tests related to changed files based on hg/git. Specify the name or path to a file to focus on a specific set of tests",
+    type: "boolean",
+    default: true
+  }).option("collect-coverage", {
+    describe: "Show test coverage summary and output info to coverage directory",
+    type: "boolean",
+    default: false
   }).option("db-push", {
     describe: "Syncs the test database with your Prisma schema without requiring a migration. It creates a test database if it doesn't already exist.",
     type: "boolean",
     default: true
   }).option("force", {
-    describe: "Skip any confirmation prompts and run tests without interruption. Useful in CI or scripted environments.",
+    describe: "Run tests without prompting for confirmation, even when a non-standard datasource url env var is detected.",
     type: "boolean",
     default: false
   }).epilogue(
-    `For all available flags, run vitest cli directly ${vitestTip}
+    `For all available flags, run jest cli directly ${c.tip(
+      "yarn jest --help"
+    )}
 
-Also see the ${cliDocsLink}
+Also see the ${terminalLink(
+      "CedarJS CLI Reference",
+      "https://cedarjs.com/docs/cli-commands#test"
+    )}
 `
   );
 };

package/dist/commands/testEsm.js

@@ -0,0 +1,41 @@
+import { terminalLink } from "termi-link";
+import { colors as c } from "@cedarjs/cli-helpers";
+import { workspaces } from "../lib/project.js";
+const command = "test [filter..]";
+const description = "Run Vitest tests. Defaults to watch mode";
+const builder = (yargs) => {
+  const cliDocsLink = terminalLink(
+    "CedarJS CLI Reference",
+    "https://cedarjs.com/docs/cli-commands#test"
+  );
+  const vitestTip = c.tip("yarn vitest --help");
+  yargs.strict(false).positional("filter", {
+    default: workspaces(),
+    description: "Which side(s) to test, and/or a regular expression to match against your test files to filter by",
+    type: "string",
+    array: true
+  }).option("db-push", {
+    describe: "Syncs the test database with your Prisma schema without requiring a migration. It creates a test database if it doesn't already exist.",
+    type: "boolean",
+    default: true
+  }).option("force", {
+    describe: "Skip any confirmation prompts and run tests without interruption. Useful in CI or scripted environments.",
+    type: "boolean",
+    default: false
+  }).epilogue(
+    `For all available flags, run vitest cli directly ${vitestTip}
+
+Also see the ${cliDocsLink}
+`
+  );
+};
+const handler = async (options) => {
+  const { handler: handler2 } = await import("./test/testHandlerEsm.js");
+  return handler2(options);
+};
+export {
+  builder,
+  command,
+  description,
+  handler
+};

package/dist/commands/type-checkHandler.js

@@ -1,9 +1,9 @@
 import path from "node:path";
 import concurrently from "concurrently";
 import { Listr } from "listr2";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { generatePrismaClient } from "../lib/generatePrismaClient.js";
 import { getPaths } from "../lib/index.js";
 const isConcurrentlyErrorArray = (value) => {

package/dist/commands/upgrade/preUpgradeScripts.js

@@ -3,7 +3,7 @@ import { builtinModules } from "node:module";
 import os from "node:os";
 import path from "node:path";
 import execa from "execa";
-import { tryParse } from "verkit";
+import semver from "semver";
 const MAIN_BRANCH_PRERELEASE_TAGS = ["canary"];
 function isExecaError(e) {
   return e instanceof Error && ("stdout" in e || "stderr" in e || "exitCode" in e);
@@ -13,7 +13,7 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
     return;
   }
   const version = typeof ctx.versionToUpgradeTo === "string" ? ctx.versionToUpgradeTo : void 0;
-  const parsed = version ? tryParse(version) : null;
+  const parsed = semver.parse(version);
   const baseUrl = "https://raw.githubusercontent.com/cedarjs/cedar/main/upgrade-scripts/";
   const manifestUrl = `${baseUrl}manifest.json`;
   let manifest = [];
@@ -34,7 +34,7 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
   if (!Array.isArray(manifest) || manifest.length === 0) {
     return;
   }
-  const prereleaseTag = parsed?.prerelease?.[0];
+  const prereleaseTag = parsed?.prerelease[0];
   const isMainBranchPrerelease = typeof prereleaseTag === "string" && MAIN_BRANCH_PRERELEASE_TAGS.includes(prereleaseTag);
   const checkLevels = [];
   if (parsed && isMainBranchPrerelease) {

package/dist/commands/upgrade/upgrade.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { dedupeIsSupported } from "@cedarjs/cli-helpers/packageManager";
 import { isValidCedarJSTag } from "./tags.js";
 const SEMVER_REGEX = /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(?=$|\s)/i;

package/dist/commands/upgrade/upgradeHandler.js

@@ -5,7 +5,7 @@ import execa from "execa";
 import latestVersion from "latest-version";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import {
   dedupe,
   dedupeIsSupported,
@@ -13,7 +13,6 @@ import {
   installationErrorMessage,
   prettyPrintCedarCommand
 } from "@cedarjs/cli-helpers/packageManager";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getConfig } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { generatePrismaClient } from "../../lib/generatePrismaClient.js";

package/dist/index.js

@@ -4,10 +4,12 @@ import path from "path";
 import { trace, SpanStatusCode } from "@opentelemetry/api";
 import { hideBin, Parser } from "yargs/helpers";
 import yargs from "yargs/yargs";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { loadEnvFiles } from "@cedarjs/cli-helpers/loadEnvFiles";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
-import { findUp, getConfigPath } from "@cedarjs/project-config";
+import {
+  loadEnvFiles,
+  recordTelemetryAttributes,
+  colors as c
+} from "@cedarjs/cli-helpers";
+import { findUp, projectIsEsm, getConfigPath } from "@cedarjs/project-config";
 import { telemetryMiddleware } from "@cedarjs/telemetry";
 import * as buildCommand from "./commands/build.js";
 import * as checkCommand from "./commands/check.js";
@@ -28,6 +30,7 @@ import * as serveCommand from "./commands/serve.js";
 import * as setupCommand from "./commands/setup.js";
 import * as studioCommand from "./commands/studio.js";
 import * as testCommand from "./commands/test.js";
+import * as testCommandEsm from "./commands/testEsm.js";
 import * as typeCheckCommand from "./commands/type-check.js";
 import * as upgradeCommand from "./commands/upgrade/upgrade.js";
 import { exitWithError } from "./lib/exit.js";
@@ -131,7 +134,7 @@ async function runYargs() {
   }).example(
     "yarn cedar g page home /",
     "Create a page component named 'Home' at path '/'"
-  ).demandCommand().strict().exitProcess(false).alias("h", "help").command(buildCommand).command(checkCommand).command(consoleCommand).command(deployCommand).command(destroyCommand).command(devCommand).command(execCommand).command(experimentalCommand).command(generateCommand).command(infoCommand).command(jobsCommand).command(lintCommand).command(prerenderCommand).command(prismaCommand).command(recordCommand).command(serveCommand).command(setupCommand).command(studioCommand).command(testCommand).command(typeCheckCommand).command(upgradeCommand);
+  ).demandCommand().strict().exitProcess(false).alias("h", "help").command(buildCommand).command(checkCommand).command(consoleCommand).command(deployCommand).command(destroyCommand).command(devCommand).command(execCommand).command(experimentalCommand).command(generateCommand).command(infoCommand).command(jobsCommand).command(lintCommand).command(prerenderCommand).command(prismaCommand).command(recordCommand).command(serveCommand).command(setupCommand).command(studioCommand).command(projectIsEsm() ? testCommandEsm : testCommand).command(typeCheckCommand).command(upgradeCommand);
   await loadPlugins(yarg);
   const pkgJson = await import("../package.json", { with: { type: "json" } });
   yarg.version(pkgJson.default["version"]);

package/dist/lib/exit.js

@@ -4,7 +4,7 @@ import { v4 as uuidv4 } from "uuid";
 import {
   recordTelemetryAttributes,
   recordTelemetryError
-} from "@cedarjs/cli-helpers/telemetry";
+} from "@cedarjs/cli-helpers";
 const discordLink = terminalLink("Discord", "https://cedarjs.com/discord");
 const githubLink = terminalLink("GitHub", "https://github.com/cedarjs/cedar");
 const DEFAULT_ERROR_EPILOGUE = [

package/dist/lib/index.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import https from "node:https";
 import path from "node:path";
+import * as babel from "@babel/core";
 import boxen from "boxen";
 import camelcase from "camelcase";
 import { paramCase } from "change-case";
@@ -11,12 +12,11 @@ import memoize from "lodash/memoize.js";
 import template from "lodash/template.js";
 import pascalcase from "pascalcase";
 import { format } from "prettier";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { colors as c } from "@cedarjs/cli-helpers";
 import {
   addRootPackages,
   addWorkspacePackages
 } from "@cedarjs/cli-helpers/packageManager/packages";
-import { transpileTSToJS } from "@cedarjs/cli-helpers/transpileTSToJS";
 import {
   getConfig as getCedarConfig,
   getPaths as getCedarPaths,
@@ -206,10 +206,29 @@ const getPrettierOptions = async () => {
   }
 };
 const transformTSToJS = async (filename, content) => {
-  return prettify(
-    filename.replace(/\.ts(x)?$/, ".js$1"),
-    transpileTSToJS(filename, content)
-  );
+  const result = babel.transform(content, {
+    filename,
+    // If you ran `yarn cedar generate` in `./web` transformSync would import
+    // the `.babelrc.js` file, in `./web` despite us setting `configFile: false`
+    cwd: process.env.NODE_ENV === "test" ? void 0 : getPaths().base,
+    configFile: false,
+    plugins: [
+      [
+        "@babel/plugin-transform-typescript",
+        {
+          isTSX: true,
+          allExtensions: true
+        }
+      ]
+    ],
+    retainLines: true
+  });
+  if (result?.code == null) {
+    throw new Error(
+      `Could not transform ${filename} from TypeScript to JavaScript`
+    );
+  }
+  return prettify(filename.replace(/\.ts(x)?$/, ".js$1"), result.code);
 };
 const transformTSToJSMap = async (files, typescript) => {
   return files.reduce(
@@ -286,17 +305,18 @@ const cleanupEmptyDirsTask = (files) => {
     })
   );
 };
-function wrapWithSet(routesContent, layout, routes, newLineAndIndent, privateSetProps) {
+function wrapWithSet(routesContent, layout, routes, newLineAndIndent, props = {}, privateSetProps) {
   const [_, indentOne, indentTwo] = routesContent.match(
     /([ \t]*)<Router.*?>[^<]*[\r\n]+([ \t]+)/
   ) || ["", "", ""];
   const oneLevelIndent = indentTwo.slice(0, indentTwo.length - indentOne.length);
+  const propsString = Object.entries(props).map((values) => `${values[0]}="${values[1]}"`).join(" ");
   if (!privateSetProps) {
     const newRoutesWithExtraIndent2 = routes.map(
       (route) => oneLevelIndent + route
     );
     return [
-      `<Set wrap={${layout}}>`,
+      `<Set wrap={${layout}}${propsString && " " + propsString}>`,
       ...newRoutesWithExtraIndent2,
       `</Set>`
     ].join(newLineAndIndent);
@@ -307,13 +327,13 @@ function wrapWithSet(routesContent, layout, routes, newLineAndIndent, privateSet
   );
   return [
     `<PrivateSet${privateSetPropsString && " " + privateSetPropsString}>`,
-    `${oneLevelIndent}<Set wrap={${layout}}>`,
+    `${oneLevelIndent}<Set wrap={${layout}}${propsString && " " + propsString}>`,
     ...newRoutesWithExtraIndent,
     `${oneLevelIndent}</Set>`,
     `</PrivateSet>`
   ].join(newLineAndIndent);
 }
-function addRoutesToRouterTask(routes, layout, privateSetProps) {
+function addRoutesToRouterTask(routes, layout, setProps = {}, privateSetProps) {
   const cedarPaths = getPaths();
   const routesContent = readFile(cedarPaths.web.routes).toString();
   let newRoutes = routes.filter((route) => !routesContent.match(route));
@@ -337,6 +357,7 @@ ${route}`);
       layout,
       newRoutes,
       newLineAndIndent,
+      setProps,
       privateSetProps
     ) : newRoutes.join(newLineAndIndent);
     const newRoutesContent = routesContent.replace(
@@ -375,12 +396,6 @@ function removeEmtpySet(routesContent, layout) {
   if (child.length > 0) {
     return routesContent;
   }
-  const privateSetWithLayoutReg = new RegExp(
-    `\\s*<PrivateSet[^>]*>\\s*<Set[^>]*wrap={${layout}}[^<]*>\\s*</Set>\\s*</PrivateSet>`
-  );
-  if (privateSetWithLayoutReg.test(routesContent)) {
-    return routesContent.replace(privateSetWithLayoutReg, "");
-  }
   return routesContent.replace(setWithLayoutReg, "");
 }
 function removeRoutesFromRouterTask(routes, layout) {

package/dist/lib/loadEnvFiles.js

@@ -3,7 +3,7 @@ import {
   loadDefaultEnvFiles,
   loadNodeEnvDerivedEnvFile,
   loadUserSpecifiedEnvFiles
-} from "@cedarjs/cli-helpers/loadEnvFiles";
+} from "@cedarjs/cli-helpers";
 export {
   loadDefaultEnvFiles,
   loadEnvFiles,

package/dist/lib/plugin.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "path";
 import ansis from "ansis";
 import enquirer from "enquirer";
-import { getCompatibilityData } from "@cedarjs/cli-helpers/version";
+import { getCompatibilityData } from "@cedarjs/cli-helpers";
 import { installModule, isModuleInstalled } from "./packages.js";
 import { getPaths } from "./index.js";
 const { Select } = enquirer;

package/dist/lib/test.js

@@ -80,7 +80,7 @@ vi.mock("@cedarjs/project-config/packageManager", () => ({
   getPackageManager: vi.fn(() => "yarn"),
   resetPackageManagerCache: vi.fn()
 }));
-vi.mock("@cedarjs/cli-helpers/project", async (importOriginal) => {
+vi.mock("@cedarjs/cli-helpers", async (importOriginal) => {
   const originalCliHelpers = await importOriginal();
   return {
     ...originalCliHelpers,

package/dist/lib/updateCheck.js

@@ -3,7 +3,7 @@ import path from "path";
 import ansis from "ansis";
 import boxen from "boxen";
 import latestVersion from "latest-version";
-import { isGreaterThan, isValid } from "verkit";
+import semver from "semver";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getNodeRunnerArgs } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfig } from "@cedarjs/project-config";
@@ -34,7 +34,7 @@ function getLocalVersion() {
   } catch {
     return void 0;
   }
-  if (typeof version === "string" && isValid(version)) {
+  if (typeof version === "string" && semver.valid(version)) {
     return version;
   }
   return void 0;
@@ -106,7 +106,7 @@ function shouldShow() {
   const data = readUpdateDataFile();
   let newerVersion = false;
   data.remoteVersions.forEach((version) => {
-    newerVersion ||= isGreaterThan(version, localVersion);
+    newerVersion ||= semver.gt(version, localVersion);
   });
   return data.shownAt < (/* @__PURE__ */ new Date()).getTime() - SHOW_PERIOD && newerVersion;
 }
@@ -120,7 +120,7 @@ function getUpdateMessage() {
   let updateCount = 0;
   let message = ` New updates to Cedar are available via \`${formatCedarCommand(["upgrade#REPLACEME#"])}\` `;
   data.remoteVersions.forEach((version, tag) => {
-    if (isGreaterThan(version, data.localVersion)) {
+    if (semver.gt(version, data.localVersion)) {
       updateCount += 1;
       if (tag === localTag) {
         message += `

package/dist/middleware/checkNodeVersion.js

@@ -1,16 +1,16 @@
-import { clean, isGreaterThanOrEqual } from "verkit";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import semver from "semver";
+import { colors as c } from "@cedarjs/cli-helpers";
 function checkNodeVersion() {
   const checks = { ok: true };
   const pVersion = process.version;
-  const pVersionC = clean(pVersion);
+  const pVersionC = semver.clean(pVersion);
   const LOWER_BOUND = "v24.0.0";
   if (!pVersionC) {
     checks.ok = false;
     checks.message = `Invalid Node.js version: ${pVersion}`;
     return checks;
   }
-  if (isGreaterThanOrEqual(pVersionC, LOWER_BOUND)) {
+  if (semver.gte(pVersionC, LOWER_BOUND)) {
     return checks;
   }
   checks.ok = false;