@cedarjs/cli 8.0.0-canary.3611 → 8.0.0-canary.3613

package/dist/commands/upgrade/upgradeHandler.js

@@ -4,7 +4,7 @@ import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import execa from "execa";
 import latestVersion from "latest-version";
 import { Listr } from "listr2";
-import packageJson from "package-json";
+import packageJson, { VersionNotFoundError } from "package-json";
 import { terminalLink } from "termi-link";
 import { colors as c } from "@cedarjs/cli-helpers/colors";
 import {
@@ -111,6 +111,13 @@ const handler = async (upgradeOptions) => {
         task: (ctx, task) => updatePrismaDeps(ctx, task, { dryRun, verbose }),
         enabled: (ctx) => !!ctx.versionToUpgradeTo && notBlockedByPreUpgradeChecks(ctx)
       },
+      {
+        title: "Updating Vite and Vitest to the versions CedarJS uses",
+        // Runs after the canary template sync, so the versions come from the
+        // target release rather than from the template on main
+        task: (ctx, task) => updateViteDeps(ctx, task, { dryRun, verbose }),
+        enabled: (ctx) => !!ctx.versionToUpgradeTo && notBlockedByPreUpgradeChecks(ctx)
+      },
       {
         title: "Downloading yarn patches",
         task: (ctx) => downloadYarnPatches(ctx, { dryRun, verbose }),
@@ -320,20 +327,34 @@ function updateCedarJSDepsForAllSides(ctx, options) {
     })
   );
 }
-async function fetchPrismaPeerVersion(cedarVersion) {
+async function fetchCedarManifest(packageName, cedarVersion) {
   const version = cedarVersion.split("+")[0];
-  let manifest;
   try {
-    manifest = await packageJson("@cedarjs/cli", { version });
+    return await packageJson(packageName, { version });
   } catch (e) {
     const message = e instanceof Error ? e.message : String(e);
     throw new Error(
-      `Failed to fetch @cedarjs/cli@${version} from the npm registry: ` + message
+      `Failed to fetch ${packageName}@${version} from the npm registry: ` + message
     );
   }
+}
+async function fetchPrismaPeerVersion(cedarVersion) {
+  const manifest = await fetchCedarManifest("@cedarjs/cli", cedarVersion);
   const prismaVersion = manifest.peerDependencies?.["prisma"];
   return typeof prismaVersion === "string" ? prismaVersion : void 0;
 }
+async function fetchViteVersions(cedarVersion) {
+  const [viteManifest, testingManifest] = await Promise.all([
+    fetchCedarManifest("@cedarjs/vite", cedarVersion),
+    fetchCedarManifest("@cedarjs/testing", cedarVersion)
+  ]);
+  const vite = viteManifest.dependencies?.["vite"];
+  const vitest = testingManifest.peerDependencies?.["vitest"];
+  return {
+    vite: typeof vite === "string" ? vite : void 0,
+    vitest: typeof vitest === "string" ? vitest : void 0
+  };
+}
 function isPrismaReleasePackage(depName) {
   return depName === "prisma" || depName === "@prisma/client" || depName.startsWith("@prisma/adapter-");
 }
@@ -444,6 +465,239 @@ async function updatePrismaDeps(ctx, task, { dryRun, verbose }) {
     task.title = task.title + "\n" + messages.join("\n");
   }
 }
+async function fetchVitestReleasePackages(depNames, vitestVersion) {
+  const candidates = [...new Set(depNames)].filter(
+    (depName) => depName.startsWith("@vitest/")
+  );
+  const published = await Promise.all(
+    candidates.map(async (depName) => {
+      try {
+        await packageJson(depName, { version: vitestVersion });
+        return true;
+      } catch (e) {
+        if (e instanceof VersionNotFoundError) {
+          return false;
+        }
+        const message = e instanceof Error ? e.message : String(e);
+        throw new Error(
+          `Failed to fetch ${depName}@${vitestVersion} from the npm registry: ` + message
+        );
+      }
+    })
+  );
+  return new Set(candidates.filter((_, i) => published[i]));
+}
+function updateViteDependencies(pkg, versions, messages, {
+  dryRun,
+  verbose,
+  vitestPackages = /* @__PURE__ */ new Set()
+} = {}) {
+  const versionFor = (depName) => {
+    if (depName === "vite") {
+      return versions.vite;
+    }
+    if (depName === "vitest" || vitestPackages.has(depName)) {
+      return versions.vitest;
+    }
+    return void 0;
+  };
+  let updated = false;
+  for (const field of ["dependencies", "devDependencies"]) {
+    const deps = pkg[field] ?? {};
+    for (const [depName, depVersion] of Object.entries(deps)) {
+      const version = versionFor(depName);
+      if (!version || depVersion === version) {
+        continue;
+      }
+      if (verbose || dryRun) {
+        messages.push(` - ${depName}: ${depVersion} => ${version}`);
+      }
+      deps[depName] = version;
+      updated = true;
+    }
+  }
+  for (const field of ["resolutions", "overrides"]) {
+    const pin = pkg[field]?.["vite"];
+    if (!versions.vite || typeof pin !== "string" || pin === versions.vite) {
+      continue;
+    }
+    if (verbose || dryRun) {
+      messages.push(` - ${field}.vite: ${pin} => ${versions.vite}`);
+    }
+    pkg[field] = { ...pkg[field], vite: versions.vite };
+    updated = true;
+  }
+  return updated;
+}
+function addVitePin(pkg, packageManager, viteVersion, messages) {
+  const field = packageManager === "yarn" ? "resolutions" : packageManager === "npm" ? "overrides" : void 0;
+  if (!field || pkg[field]?.["vite"] !== void 0) {
+    return false;
+  }
+  pkg[field] = { ...pkg[field], vite: viteVersion };
+  messages.push(` - ${field}.vite: added at ${viteVersion}`);
+  return true;
+}
+function findPnpmOverridesBlock(lines) {
+  const start = lines.findIndex(
+    (line) => /^overrides:\s*(#[^\n]*)?$/.test(line)
+  );
+  if (start === -1) {
+    return void 0;
+  }
+  const block = {
+    start,
+    lastEntry: start,
+    style: { indent: "  ", keyQuote: "", valueQuote: "'" }
+  };
+  for (let i = start + 1; i < lines.length; i++) {
+    const line = lines[i];
+    if (/^[^\s#]/.test(line)) {
+      break;
+    }
+    const entry = /^(\s+)(['"]?)[^\s'"#:]+\2\s*:\s*(['"]?)/.exec(line);
+    if (!entry) {
+      continue;
+    }
+    if (block.lastEntry === start) {
+      const [, indent, keyQuote, valueQuote] = entry;
+      block.style = { indent, keyQuote, valueQuote };
+    }
+    block.lastEntry = i;
+    if (block.vite === void 0 && /^\s+(['"]?)vite\1\s*:/.test(line)) {
+      block.vite = i;
+    }
+  }
+  return block;
+}
+function updatePnpmViteOverride(content, viteVersion) {
+  const lines = content.split("\n");
+  const viteIndex = findPnpmOverridesBlock(lines)?.vite;
+  if (viteIndex === void 0) {
+    return void 0;
+  }
+  const match = /^(\s+)(['"]?)vite\2(\s*:\s*)(?:(['"])([^\n]*?)\4|([^'"\s#]+))([^\n]*)$/.exec(
+    lines[viteIndex]
+  );
+  if (!match) {
+    return void 0;
+  }
+  const [, indent, keyQuote, separator, quote, quotedVersion, bareVersion] = match;
+  const valueQuote = quote ?? "";
+  const version = quotedVersion ?? bareVersion;
+  const rest = match[7];
+  if (version === viteVersion) {
+    return void 0;
+  }
+  lines[viteIndex] = indent + keyQuote + "vite" + keyQuote + separator + valueQuote + viteVersion + valueQuote + rest;
+  return lines.join("\n");
+}
+function addPnpmViteOverride(content, viteVersion) {
+  const eol = content.includes("\r\n") ? "\r\n" : "\n";
+  const lines = content.split("\n");
+  const block = findPnpmOverridesBlock(lines);
+  if (!block) {
+    if (lines.some((line) => /^['"]?overrides['"]?\s*:/.test(line))) {
+      return void 0;
+    }
+    return content.replace(/\s*$/, "") + eol + eol + "overrides:" + eol + `  vite: '${viteVersion}'` + eol;
+  }
+  if (block.vite) {
+    return void 0;
+  }
+  const { indent, keyQuote, valueQuote } = block.style;
+  const entry = indent + keyQuote + "vite" + keyQuote + ": " + valueQuote + viteVersion + valueQuote + (eol === "\r\n" ? "\r" : "");
+  lines.splice(block.lastEntry + 1, 0, entry);
+  return lines.join("\n");
+}
+async function updateViteDeps(ctx, task, { dryRun, verbose }) {
+  if (!ctx.versionToUpgradeTo) {
+    throw new Error("Failed to upgrade");
+  }
+  const versions = await fetchViteVersions(String(ctx.versionToUpgradeTo));
+  if (!versions.vite && !versions.vitest) {
+    task.skip(
+      `CedarJS ${ctx.versionToUpgradeTo} doesn't declare Vite or Vitest versions`
+    );
+    return;
+  }
+  const messages = [];
+  const projectPackages = [
+    { basePath: getPaths().base, isRoot: true, requiresVite: false },
+    { basePath: getPaths().web.base, isRoot: false, requiresVite: true },
+    { basePath: getPaths().api.base, isRoot: false, requiresVite: true }
+  ];
+  const projectPackageJsons = projectPackages.map(({ basePath, ...rest }) => ({
+    ...rest,
+    pkgJsonPath: path.join(basePath, "package.json")
+  })).filter(({ pkgJsonPath }) => fs.existsSync(pkgJsonPath)).map((projectPackage) => ({
+    ...projectPackage,
+    pkg: JSON.parse(fs.readFileSync(projectPackage.pkgJsonPath, "utf-8"))
+  }));
+  const packageManager = getPackageManager();
+  const vitestPackages = versions.vitest ? await fetchVitestReleasePackages(
+    projectPackageJsons.flatMap(({ pkg }) => [
+      ...Object.keys(pkg.dependencies ?? {}),
+      ...Object.keys(pkg.devDependencies ?? {})
+    ]),
+    versions.vitest
+  ) : /* @__PURE__ */ new Set();
+  for (const {
+    pkgJsonPath,
+    isRoot,
+    requiresVite,
+    pkg
+  } of projectPackageJsons) {
+    const pkgMessages = [];
+    const pinned = isRoot && !!versions.vite && addVitePin(pkg, packageManager, versions.vite, pkgMessages);
+    const added = requiresVite && !!versions.vite && addMissingDependency(
+      pkg,
+      "devDependencies",
+      "vite",
+      versions.vite,
+      pkgMessages
+    );
+    const updated = updateViteDependencies(pkg, versions, pkgMessages, {
+      dryRun,
+      verbose,
+      vitestPackages
+    });
+    if (pinned || added || updated) {
+      if (pkgMessages.length > 0) {
+        messages.push(`Updating ${pkgJsonPath}`, ...pkgMessages);
+      }
+      if (!dryRun) {
+        fs.writeFileSync(pkgJsonPath, JSON.stringify(pkg, void 0, 2));
+      }
+    }
+  }
+  const pnpmWorkspacePath = path.join(getPaths().base, "pnpm-workspace.yaml");
+  if (versions.vite && fs.existsSync(pnpmWorkspacePath)) {
+    const content = fs.readFileSync(pnpmWorkspacePath, "utf-8");
+    const updatedContent = updatePnpmViteOverride(content, versions.vite);
+    const addedContent = updatedContent === void 0 && packageManager === "pnpm" ? addPnpmViteOverride(content, versions.vite) : void 0;
+    if (updatedContent !== void 0) {
+      if (verbose || dryRun) {
+        messages.push(
+          `Updating ${pnpmWorkspacePath}`,
+          ` - overrides.vite => ${versions.vite}`
+        );
+      }
+    } else if (addedContent !== void 0) {
+      messages.push(
+        `Updating ${pnpmWorkspacePath}`,
+        ` - overrides.vite: added at ${versions.vite}`
+      );
+    }
+    const newContent = updatedContent ?? addedContent;
+    if (newContent !== void 0 && !dryRun) {
+      fs.writeFileSync(pnpmWorkspacePath, newContent);
+    }
+  }
+  if (messages.length > 0) {
+    task.title = task.title + "\n" + messages.join("\n");
+  }
+}
 function mergeTemplateDependencies(field, templatePackageJson, localPackageJson, messages, { dryRun, verbose } = {}) {
   const templateDeps = templatePackageJson[field];
   if (!templateDeps) {
@@ -612,8 +866,14 @@ async function dedupeDeps(_task, { verbose }) {
 }
 export {
   addMissingDependency,
+  addPnpmViteOverride,
+  addVitePin,
   fetchPrismaPeerVersion,
+  fetchViteVersions,
+  fetchVitestReleasePackages,
   handler,
   mergeTemplateDependencies,
-  updatePrismaDependencies
+  updatePnpmViteOverride,
+  updatePrismaDependencies,
+  updateViteDependencies
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3611",
+  "version": "8.0.0-canary.3613",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.12",
     "@babel/types": "7.29.11",
-    "@cedarjs/api-server": "8.0.0-canary.3611",
-    "@cedarjs/babel-config": "8.0.0-canary.3611",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3611",
-    "@cedarjs/internal": "8.0.0-canary.3611",
-    "@cedarjs/prerender": "8.0.0-canary.3611",
-    "@cedarjs/project-config": "8.0.0-canary.3611",
-    "@cedarjs/structure": "8.0.0-canary.3611",
-    "@cedarjs/telemetry": "8.0.0-canary.3611",
-    "@cedarjs/utils": "8.0.0-canary.3611",
-    "@cedarjs/vite": "8.0.0-canary.3611",
-    "@cedarjs/web-server": "8.0.0-canary.3611",
+    "@cedarjs/api-server": "8.0.0-canary.3613",
+    "@cedarjs/babel-config": "8.0.0-canary.3613",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3613",
+    "@cedarjs/internal": "8.0.0-canary.3613",
+    "@cedarjs/prerender": "8.0.0-canary.3613",
+    "@cedarjs/project-config": "8.0.0-canary.3613",
+    "@cedarjs/structure": "8.0.0-canary.3613",
+    "@cedarjs/telemetry": "8.0.0-canary.3613",
+    "@cedarjs/utils": "8.0.0-canary.3613",
+    "@cedarjs/vite": "8.0.0-canary.3613",
+    "@cedarjs/web-server": "8.0.0-canary.3613",
     "@listr2/prompt-adapter-enquirer": "4.4.3",
     "@prisma/internals": "7.10.1",
     "ansis": "4.4.0",
@@ -87,7 +87,7 @@
     "yargs": "18.2.0"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3611",
+    "@cedarjs/framework-tools": "8.0.0-canary.3613",
     "@prisma/dmmf": "7.10.1",
     "@types/archiver": "^7.0.0",
     "memfs": "4.80.0",