@cedarjs/cli 7.0.0-canary.3014 → 7.0.0-canary.3018

package/dist/commands/experimental/setupReactCompilerHandler.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import semver from "semver";
+import { coerce, isGreaterOrEqual } from "verkit";
 import { colors as c } from "@cedarjs/cli-helpers";
 import {
   addRootPackages,
@@ -39,8 +39,8 @@ const handler = async (options) => {
             )
           );
           const reactVersion = webPkgJson["dependencies"]["react"];
-          const coercedReactVersion = semver.coerce(reactVersion);
-          if (!coercedReactVersion || !semver.gte(coercedReactVersion, "19.0.0")) {
+          const coercedReactVersion = coerce(reactVersion);
+          if (!coercedReactVersion || !isGreaterOrEqual(coercedReactVersion, "19.0.0")) {
             throw new Error(
               "You need to be using at least React version 19 to enable the React Compiler"
             );

package/dist/commands/setup/package/packageHandler.js

@@ -1,5 +1,5 @@
 import enq from "enquirer";
-import semver from "semver";
+import { isGreaterOrEqual, isLess, tryParse } from "verkit";
 import { getCompatibilityData } from "@cedarjs/cli-helpers";
 import { dlx } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getPaths } from "@cedarjs/project-config";
@@ -16,7 +16,7 @@ async function handler({
     console.log(
       "No compatibility check will be performed because you used the --force flag."
     );
-    if (semver.parse(packageVersion) !== null && semver.lt(packageVersion, "1.0.0")) {
+    if (tryParse(packageVersion) !== null && isLess(packageVersion, "1.0.0")) {
       console.log(
         "Be aware that this package is under version 1.0.0 and so should be considered experimental."
       );
@@ -86,7 +86,7 @@ The latest version compatible with your project is ${latestCompatibleVersionText
   await runPackage(packageName, versionToUse, additionalOptionsToForward);
 }
 async function showExperimentalWarning(version) {
-  if (version === void 0 || semver.parse(version) === null || semver.gte(version, "1.0.0")) {
+  if (version === void 0 || tryParse(version) === null || isGreaterOrEqual(version, "1.0.0")) {
     return;
   }
   const decision = await promptWithChoices(

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 semver from "semver";
+import { tryParse } from "verkit";
 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 = semver.parse(version);
+  const parsed = version ? tryParse(version) : null;
   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/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 semver from "semver";
+import { isGreater, isValid } from "verkit";
 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" && semver.valid(version)) {
+  if (typeof version === "string" && isValid(version)) {
     return version;
   }
   return void 0;
@@ -106,7 +106,7 @@ function shouldShow() {
   const data = readUpdateDataFile();
   let newerVersion = false;
   data.remoteVersions.forEach((version) => {
-    newerVersion ||= semver.gt(version, localVersion);
+    newerVersion ||= isGreater(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 (semver.gt(version, data.localVersion)) {
+    if (isGreater(version, data.localVersion)) {
       updateCount += 1;
       if (tag === localTag) {
         message += `

package/dist/middleware/checkNodeVersion.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "7.0.0-canary.3014",
+  "version": "7.0.0-canary.3018",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.8",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "7.0.0-canary.3014",
-    "@cedarjs/babel-config": "7.0.0-canary.3014",
-    "@cedarjs/cli-helpers": "7.0.0-canary.3014",
-    "@cedarjs/internal": "7.0.0-canary.3014",
-    "@cedarjs/prerender": "7.0.0-canary.3014",
-    "@cedarjs/project-config": "7.0.0-canary.3014",
-    "@cedarjs/structure": "7.0.0-canary.3014",
-    "@cedarjs/telemetry": "7.0.0-canary.3014",
-    "@cedarjs/utils": "7.0.0-canary.3014",
-    "@cedarjs/vite": "7.0.0-canary.3014",
-    "@cedarjs/web-server": "7.0.0-canary.3014",
+    "@cedarjs/api-server": "7.0.0-canary.3018",
+    "@cedarjs/babel-config": "7.0.0-canary.3018",
+    "@cedarjs/cli-helpers": "7.0.0-canary.3018",
+    "@cedarjs/internal": "7.0.0-canary.3018",
+    "@cedarjs/prerender": "7.0.0-canary.3018",
+    "@cedarjs/project-config": "7.0.0-canary.3018",
+    "@cedarjs/structure": "7.0.0-canary.3018",
+    "@cedarjs/telemetry": "7.0.0-canary.3018",
+    "@cedarjs/utils": "7.0.0-canary.3018",
+    "@cedarjs/vite": "7.0.0-canary.3018",
+    "@cedarjs/web-server": "7.0.0-canary.3018",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -82,7 +82,6 @@
     "prettier": "3.8.4",
     "prisma": "7.8.0",
     "prompts": "2.4.2",
-    "semver": "7.8.5",
     "smol-toml": "1.8.0",
     "srvx": "0.12.5",
     "string-env-interpolation": "1.0.1",
@@ -91,10 +90,11 @@
     "title-case": "3.0.3",
     "unionfs": "4.6.0",
     "uuid": "11.1.0",
+    "verkit": "0.4.0",
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.0-canary.3014",
+    "@cedarjs/framework-tools": "7.0.0-canary.3018",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.68.1",