@icebreakers/monorepo 2.0.8 → 2.0.10

package/assets/package.json

@@ -44,11 +44,12 @@
     "@changesets/cli": "^2.29.7",
     "@commitlint/cli": "^20.1.0",
     "@icebreakers/commitlint-config": "^1.2.1",
-    "@icebreakers/eslint-config": "^1.5.0",
+    "@icebreakers/eslint-config": "^1.5.2",
     "@icebreakers/monorepo": "workspace:*",
     "@icebreakers/stylelint-config": "^1.2.1",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^24.7.2",
+    "@types/semver": "^7.7.1",
     "@vitest/coverage-v8": "~3.2.4",
     "ci-info": "^4.3.1",
     "cross-env": "^10.1.0",

package/dist/{chunk-4R64J5LE.js → chunk-3TJYHDE6.js}

@@ -578,7 +578,7 @@ async function cleanProjects(cwd) {
 
 // package.json
 var name = "@icebreakers/monorepo";
-var version = "2.0.8";
+var version = "2.0.10";
 
 // src/constants.ts
 init_esm_shims();
@@ -1005,15 +1005,104 @@ function isMatch(str, arr) {
 
 // src/commands/upgrade/index.ts
 init_esm_shims();
-import { Buffer as Buffer2 } from "buffer";
-import process2 from "process";
-import checkbox2 from "@inquirer/checkbox";
-import confirm from "@inquirer/confirm";
-import fs7 from "fs-extra";
 var import_set_value6 = __toESM(require_set_value(), 1);
+import process2 from "process";
+import checkbox3 from "@inquirer/checkbox";
+import fs8 from "fs-extra";
 import klaw from "klaw";
 import path13 from "pathe";
+
+// src/commands/upgrade/overwrite.ts
+init_esm_shims();
+import { Buffer as Buffer2 } from "buffer";
+import checkbox2 from "@inquirer/checkbox";
+import fs7 from "fs-extra";
 import pc3 from "picocolors";
+function asBuffer(data) {
+  return typeof data === "string" ? Buffer2.from(data) : data;
+}
+async function evaluateWriteIntent(targetPath, options) {
+  const { skipOverwrite, source } = options;
+  const exists = await fs7.pathExists(targetPath);
+  if (!exists) {
+    return {
+      type: "write",
+      reason: "missing"
+    };
+  }
+  if (skipOverwrite) {
+    return {
+      type: "skip",
+      reason: "skipOverwrite"
+    };
+  }
+  const src = asBuffer(source);
+  let destSize = 0;
+  try {
+    const stat = await fs7.stat(targetPath);
+    destSize = stat.size;
+  } catch {
+    return {
+      type: "write",
+      reason: "missing"
+    };
+  }
+  if (destSize !== src.length) {
+    return {
+      type: "prompt",
+      reason: "changed"
+    };
+  }
+  const dest = await fs7.readFile(targetPath);
+  if (!isFileChanged(src, dest)) {
+    return {
+      type: "skip",
+      reason: "identical"
+    };
+  }
+  return {
+    type: "prompt",
+    reason: "changed"
+  };
+}
+async function scheduleOverwrite(intent, options) {
+  const { relPath, targetPath, action, pending } = options;
+  if (intent.type === "write") {
+    await action();
+    return;
+  }
+  if (intent.type === "prompt") {
+    pending.push({
+      relPath,
+      targetPath,
+      action
+    });
+  }
+}
+async function flushPendingOverwrites(pending) {
+  if (!pending.length) {
+    return;
+  }
+  const selected = await checkbox2({
+    message: "\u68C0\u6D4B\u5230\u4EE5\u4E0B\u6587\u4EF6\u5185\u5BB9\u4E0E\u5F53\u524D\u4ED3\u5E93\u4E0D\u540C\uFF0C\u9009\u62E9\u9700\u8981\u8986\u76D6\u7684\u6587\u4EF6",
+    choices: pending.map((item) => ({
+      name: pc3.greenBright(item.relPath),
+      value: item.targetPath,
+      checked: false
+    })),
+    loop: false
+  });
+  const selectedSet = new Set(selected);
+  for (const item of pending) {
+    if (selectedSet.has(item.targetPath)) {
+      await item.action();
+    }
+  }
+}
+
+// src/commands/upgrade/pkg-json.ts
+init_esm_shims();
+import { coerce, gte, minVersion } from "semver";
 
 // src/commands/upgrade/scripts.ts
 init_esm_shims();
@@ -1026,6 +1115,90 @@ var scripts = {
 };
 var scriptsEntries = Object.entries(scripts);
 
+// src/commands/upgrade/pkg-json.ts
+function isWorkspace(version2) {
+  if (typeof version2 === "string") {
+    return version2.startsWith("workspace:");
+  }
+  return false;
+}
+function parseVersion(input) {
+  if (typeof input !== "string" || input.trim().length === 0) {
+    return null;
+  }
+  return minVersion(input) ?? coerce(input);
+}
+function shouldAssignVersion(currentVersion, nextVersion) {
+  if (typeof currentVersion !== "string" || currentVersion.trim().length === 0) {
+    return true;
+  }
+  if (currentVersion === nextVersion) {
+    return false;
+  }
+  const current = parseVersion(currentVersion);
+  const next = parseVersion(nextVersion);
+  if (!current || !next) {
+    return true;
+  }
+  return !gte(current, next);
+}
+function setPkgJson(sourcePkgJson, targetPkgJson, options) {
+  const packageManager = sourcePkgJson.packageManager ?? "";
+  const sourceDeps = sourcePkgJson.dependencies ?? {};
+  const sourceDevDeps = sourcePkgJson.devDependencies ?? {};
+  const targetDeps = { ...targetPkgJson.dependencies ?? {} };
+  const targetDevDeps = { ...targetPkgJson.devDependencies ?? {} };
+  if (packageManager) {
+    targetPkgJson.packageManager = packageManager;
+  }
+  for (const [depName, depVersion] of Object.entries(sourceDeps)) {
+    if (typeof depVersion !== "string") {
+      continue;
+    }
+    const targetVersion = targetDeps[depName];
+    if (isWorkspace(targetVersion)) {
+      continue;
+    }
+    if (shouldAssignVersion(targetVersion, depVersion)) {
+      targetDeps[depName] = depVersion;
+    }
+  }
+  if (Object.keys(targetDeps).length) {
+    targetPkgJson.dependencies = targetDeps;
+  }
+  for (const [depName, depVersion] of Object.entries(sourceDevDeps)) {
+    if (typeof depVersion !== "string") {
+      continue;
+    }
+    if (depName === name) {
+      const nextVersion = `^${version}`;
+      const targetVersion = targetDevDeps[depName];
+      if (!isWorkspace(targetVersion) && shouldAssignVersion(targetVersion, nextVersion)) {
+        targetDevDeps[depName] = nextVersion;
+      }
+    } else {
+      const targetVersion = targetDevDeps[depName];
+      if (isWorkspace(targetVersion)) {
+        continue;
+      }
+      if (shouldAssignVersion(targetVersion, depVersion)) {
+        targetDevDeps[depName] = depVersion;
+      }
+    }
+  }
+  if (Object.keys(targetDevDeps).length) {
+    targetPkgJson.devDependencies = targetDevDeps;
+  }
+  const scriptPairs = (options == null ? void 0 : options.scripts) ? Object.entries(options.scripts) : scriptsEntries;
+  if (scriptPairs.length) {
+    const scripts2 = { ...targetPkgJson.scripts ?? {} };
+    for (const [scriptName, scriptCmd] of scriptPairs) {
+      scripts2[scriptName] = scriptCmd;
+    }
+    targetPkgJson.scripts = scripts2;
+  }
+}
+
 // src/commands/upgrade/targets.ts
 init_esm_shims();
 function getAssetTargets(raw) {
@@ -1064,80 +1237,6 @@ function getAssetTargets(raw) {
 }
 
 // src/commands/upgrade/index.ts
-function isWorkspace(version2) {
-  if (typeof version2 === "string") {
-    return version2.startsWith("workspace:");
-  }
-  return false;
-}
-function setPkgJson(sourcePkgJson, targetPkgJson, options) {
-  const packageManager = index_default(sourcePkgJson, "packageManager", { default: "" });
-  const sourceDeps = index_default(sourcePkgJson, "dependencies", { default: {} });
-  const sourceDevDeps = index_default(sourcePkgJson, "devDependencies", { default: {} });
-  const targetDeps = { ...index_default(targetPkgJson, "dependencies", { default: {} }) };
-  const targetDevDeps = { ...index_default(targetPkgJson, "devDependencies", { default: {} }) };
-  if (packageManager) {
-    targetPkgJson.packageManager = packageManager;
-  }
-  for (const [depName, depVersion] of Object.entries(sourceDeps)) {
-    if (!isWorkspace(targetDeps[depName])) {
-      targetDeps[depName] = depVersion;
-    }
-  }
-  if (Object.keys(targetDeps).length) {
-    targetPkgJson.dependencies = targetDeps;
-  }
-  for (const [depName, depVersion] of Object.entries(sourceDevDeps)) {
-    if (depName === name) {
-      targetDevDeps[depName] = `^${version}`;
-    } else if (!isWorkspace(targetDevDeps[depName])) {
-      targetDevDeps[depName] = depVersion;
-    }
-  }
-  if (Object.keys(targetDevDeps).length) {
-    targetPkgJson.devDependencies = targetDevDeps;
-  }
-  const scriptPairs = (options == null ? void 0 : options.scripts) ? Object.entries(options.scripts) : scriptsEntries;
-  if (scriptPairs.length) {
-    const scripts2 = { ...targetPkgJson.scripts ?? {} };
-    for (const [scriptName, scriptCmd] of scriptPairs) {
-      scripts2[scriptName] = scriptCmd;
-    }
-    targetPkgJson.scripts = scripts2;
-  }
-}
-function confirmOverwrite(filename) {
-  return confirm({ message: `${pc3.greenBright(filename)} \u6587\u4EF6\u5185\u5BB9\u53D1\u751F\u6539\u53D8,\u662F\u5426\u8986\u76D6?`, default: true });
-}
-function asBuffer(data) {
-  return typeof data === "string" ? Buffer2.from(data) : data;
-}
-async function shouldWriteFile(targetPath, options) {
-  const { skipOverwrite, source, promptLabel } = options;
-  const exists = await fs7.pathExists(targetPath);
-  if (!exists) {
-    return true;
-  }
-  if (skipOverwrite) {
-    return false;
-  }
-  const src = asBuffer(source);
-  let destSize = 0;
-  try {
-    const stat = await fs7.stat(targetPath);
-    destSize = stat.size;
-  } catch {
-    return true;
-  }
-  if (destSize !== src.length) {
-    return confirmOverwrite(promptLabel);
-  }
-  const dest = await fs7.readFile(targetPath);
-  if (!isFileChanged(src, dest)) {
-    return false;
-  }
-  return confirmOverwrite(promptLabel);
-}
 async function upgradeMonorepo(opts) {
   const cwd = opts.cwd ?? process2.cwd();
   const upgradeConfig = await resolveCommandConfig("upgrade", cwd);
@@ -1158,7 +1257,7 @@ async function upgradeMonorepo(opts) {
   const mergeTargets = upgradeConfig == null ? void 0 : upgradeConfig.mergeTargets;
   let targets = configTargets.length ? mergeTargets === false ? [...configTargets] : Array.from(/* @__PURE__ */ new Set([...baseTargets, ...configTargets])) : baseTargets;
   if (merged.interactive) {
-    targets = await checkbox2({
+    targets = await checkbox3({
       message: "\u9009\u62E9\u4F60\u9700\u8981\u7684\u6587\u4EF6",
       choices: targets.map((x) => {
         return {
@@ -1174,6 +1273,7 @@ async function upgradeMonorepo(opts) {
   const skipChangesetMarkdown = (upgradeConfig == null ? void 0 : upgradeConfig.skipChangesetMarkdown) ?? true;
   const scriptOverrides = upgradeConfig == null ? void 0 : upgradeConfig.scripts;
   const skipOverwrite = merged.skipOverwrite;
+  const pendingOverwrites = [];
   for await (const file of klaw(assetsDir, {
     filter(p) {
       const str = path13.relative(assetsDir, p);
@@ -1193,43 +1293,72 @@ async function upgradeMonorepo(opts) {
     const targetPath = path13.resolve(absOutDir, relPath);
     try {
       if (relPath === "package.json") {
-        if (!await fs7.pathExists(targetPath)) {
+        if (!await fs8.pathExists(targetPath)) {
           continue;
         }
-        const sourcePkgJson = await fs7.readJson(file.path);
-        const targetPkgJson = await fs7.readJson(targetPath);
+        const sourcePkgJson = await fs8.readJson(file.path);
+        const targetPkgJson = await fs8.readJson(targetPath);
         setPkgJson(sourcePkgJson, targetPkgJson, { scripts: scriptOverrides });
         const data = `${JSON.stringify(targetPkgJson, void 0, 2)}
 `;
-        if (await shouldWriteFile(targetPath, { skipOverwrite, source: data, promptLabel: relPath })) {
-          await fs7.outputFile(targetPath, data, "utf8");
+        const intent2 = await evaluateWriteIntent(targetPath, { skipOverwrite, source: data });
+        const action2 = async () => {
+          await fs8.outputFile(targetPath, data, "utf8");
           logger.success(targetPath);
-        }
+        };
+        await scheduleOverwrite(intent2, {
+          relPath,
+          targetPath,
+          action: action2,
+          pending: pendingOverwrites
+        });
         continue;
       }
       if (relPath === ".changeset/config.json" && repoName) {
-        const changesetJson = await fs7.readJson(file.path);
+        const changesetJson = await fs8.readJson(file.path);
         (0, import_set_value6.default)(changesetJson, "changelog.1.repo", repoName);
         const data = `${JSON.stringify(changesetJson, void 0, 2)}
 `;
-        if (await shouldWriteFile(targetPath, { skipOverwrite, source: data, promptLabel: relPath })) {
-          await fs7.outputFile(targetPath, data, "utf8");
+        const intent2 = await evaluateWriteIntent(targetPath, { skipOverwrite, source: data });
+        const action2 = async () => {
+          await fs8.outputFile(targetPath, data, "utf8");
           logger.success(targetPath);
-        }
+        };
+        await scheduleOverwrite(intent2, {
+          relPath,
+          targetPath,
+          action: action2,
+          pending: pendingOverwrites
+        });
         continue;
       }
       if (relPath === "LICENSE") {
-        const source = await fs7.readFile(file.path);
-        if (await shouldWriteFile(targetPath, { skipOverwrite: true, source, promptLabel: relPath })) {
-          await fs7.copy(file.path, targetPath);
+        const source2 = await fs8.readFile(file.path);
+        const intent2 = await evaluateWriteIntent(targetPath, { skipOverwrite: true, source: source2 });
+        const action2 = async () => {
+          await fs8.outputFile(targetPath, source2);
           logger.success(targetPath);
-        }
+        };
+        await scheduleOverwrite(intent2, {
+          relPath,
+          targetPath,
+          action: action2,
+          pending: pendingOverwrites
+        });
         continue;
       }
-      if (await shouldWriteFile(targetPath, { skipOverwrite, source: await fs7.readFile(file.path), promptLabel: relPath })) {
-        await fs7.copy(file.path, targetPath);
+      const source = await fs8.readFile(file.path);
+      const intent = await evaluateWriteIntent(targetPath, { skipOverwrite, source });
+      const action = async () => {
+        await fs8.outputFile(targetPath, source);
         logger.success(targetPath);
-      }
+      };
+      await scheduleOverwrite(intent, {
+        relPath,
+        targetPath,
+        action,
+        pending: pendingOverwrites
+      });
     } catch (error) {
       if (isIgnorableFsError(error)) {
         continue;
@@ -1237,6 +1366,7 @@ async function upgradeMonorepo(opts) {
       throw error;
     }
   }
+  await flushPendingOverwrites(pendingOverwrites);
 }
 
 // src/commands/index.ts