@icebreakers/monorepo 2.0.8 → 2.0.10

package/dist/cli.cjs

@@ -605,7 +605,7 @@ var import_node_url = require("url");
 
 // package.json
 var name = "@icebreakers/monorepo";
-var version = "2.0.8";
+var version = "2.0.10";
 
 // src/constants.ts
 var packageJsonPath = (0, import_node_url.fileURLToPath)(new URL("../package.json", importMetaUrl));
@@ -980,14 +980,11 @@ ${Array.from(set7).map((x) => `- ${import_picocolors2.default.green(x ?? "")}`).
 
 // src/commands/upgrade/index.ts
 init_cjs_shims();
-var import_node_buffer = require("buffer");
 var import_node_process2 = __toESM(require("process"), 1);
-var import_checkbox2 = __toESM(require("@inquirer/checkbox"), 1);
-var import_confirm = __toESM(require("@inquirer/confirm"), 1);
-var import_fs_extra7 = __toESM(require("fs-extra"), 1);
+var import_checkbox3 = __toESM(require("@inquirer/checkbox"), 1);
+var import_fs_extra8 = __toESM(require("fs-extra"), 1);
 var import_klaw = __toESM(require("klaw"), 1);
 var import_pathe11 = __toESM(require("pathe"), 1);
-var import_picocolors3 = __toESM(require("picocolors"), 1);
 var import_set_value6 = __toESM(require_set_value(), 1);
 
 // src/utils/fs.ts
@@ -1033,6 +1030,98 @@ function isMatch(str, arr) {
   return false;
 }
 
+// src/commands/upgrade/overwrite.ts
+init_cjs_shims();
+var import_node_buffer = require("buffer");
+var import_checkbox2 = __toESM(require("@inquirer/checkbox"), 1);
+var import_fs_extra7 = __toESM(require("fs-extra"), 1);
+var import_picocolors3 = __toESM(require("picocolors"), 1);
+function asBuffer(data) {
+  return typeof data === "string" ? import_node_buffer.Buffer.from(data) : data;
+}
+async function evaluateWriteIntent(targetPath, options) {
+  const { skipOverwrite, source } = options;
+  const exists = await import_fs_extra7.default.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 import_fs_extra7.default.stat(targetPath);
+    destSize = stat.size;
+  } catch {
+    return {
+      type: "write",
+      reason: "missing"
+    };
+  }
+  if (destSize !== src.length) {
+    return {
+      type: "prompt",
+      reason: "changed"
+    };
+  }
+  const dest = await import_fs_extra7.default.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 (0, import_checkbox2.default)({
+    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: import_picocolors3.default.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_cjs_shims();
+var import_semver = require("semver");
+
 // src/commands/upgrade/scripts.ts
 init_cjs_shims();
 var scripts = {
@@ -1044,6 +1133,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(input2) {
+  if (typeof input2 !== "string" || input2.trim().length === 0) {
+    return null;
+  }
+  return (0, import_semver.minVersion)(input2) ?? (0, import_semver.coerce)(input2);
+}
+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 !(0, import_semver.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_cjs_shims();
 function getAssetTargets(raw) {
@@ -1082,80 +1255,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 (0, import_confirm.default)({ message: `${import_picocolors3.default.greenBright(filename)} \u6587\u4EF6\u5185\u5BB9\u53D1\u751F\u6539\u53D8,\u662F\u5426\u8986\u76D6?`, default: true });
-}
-function asBuffer(data) {
-  return typeof data === "string" ? import_node_buffer.Buffer.from(data) : data;
-}
-async function shouldWriteFile(targetPath, options) {
-  const { skipOverwrite, source, promptLabel } = options;
-  const exists = await import_fs_extra7.default.pathExists(targetPath);
-  if (!exists) {
-    return true;
-  }
-  if (skipOverwrite) {
-    return false;
-  }
-  const src = asBuffer(source);
-  let destSize = 0;
-  try {
-    const stat = await import_fs_extra7.default.stat(targetPath);
-    destSize = stat.size;
-  } catch {
-    return true;
-  }
-  if (destSize !== src.length) {
-    return confirmOverwrite(promptLabel);
-  }
-  const dest = await import_fs_extra7.default.readFile(targetPath);
-  if (!isFileChanged(src, dest)) {
-    return false;
-  }
-  return confirmOverwrite(promptLabel);
-}
 async function upgradeMonorepo(opts) {
   const cwd2 = opts.cwd ?? import_node_process2.default.cwd();
   const upgradeConfig = await resolveCommandConfig("upgrade", cwd2);
@@ -1176,7 +1275,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 (0, import_checkbox2.default)({
+    targets = await (0, import_checkbox3.default)({
       message: "\u9009\u62E9\u4F60\u9700\u8981\u7684\u6587\u4EF6",
       choices: targets.map((x) => {
         return {
@@ -1192,6 +1291,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 (0, import_klaw.default)(assetsDir, {
     filter(p) {
       const str = import_pathe11.default.relative(assetsDir, p);
@@ -1211,43 +1311,72 @@ async function upgradeMonorepo(opts) {
     const targetPath = import_pathe11.default.resolve(absOutDir, relPath);
     try {
       if (relPath === "package.json") {
-        if (!await import_fs_extra7.default.pathExists(targetPath)) {
+        if (!await import_fs_extra8.default.pathExists(targetPath)) {
           continue;
         }
-        const sourcePkgJson = await import_fs_extra7.default.readJson(file.path);
-        const targetPkgJson = await import_fs_extra7.default.readJson(targetPath);
+        const sourcePkgJson = await import_fs_extra8.default.readJson(file.path);
+        const targetPkgJson = await import_fs_extra8.default.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 import_fs_extra7.default.outputFile(targetPath, data, "utf8");
+        const intent2 = await evaluateWriteIntent(targetPath, { skipOverwrite, source: data });
+        const action2 = async () => {
+          await import_fs_extra8.default.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 import_fs_extra7.default.readJson(file.path);
+        const changesetJson = await import_fs_extra8.default.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 import_fs_extra7.default.outputFile(targetPath, data, "utf8");
+        const intent2 = await evaluateWriteIntent(targetPath, { skipOverwrite, source: data });
+        const action2 = async () => {
+          await import_fs_extra8.default.outputFile(targetPath, data, "utf8");
           logger.success(targetPath);
-        }
+        };
+        await scheduleOverwrite(intent2, {
+          relPath,
+          targetPath,
+          action: action2,
+          pending: pendingOverwrites
+        });
         continue;
       }
       if (relPath === "LICENSE") {
-        const source = await import_fs_extra7.default.readFile(file.path);
-        if (await shouldWriteFile(targetPath, { skipOverwrite: true, source, promptLabel: relPath })) {
-          await import_fs_extra7.default.copy(file.path, targetPath);
+        const source2 = await import_fs_extra8.default.readFile(file.path);
+        const intent2 = await evaluateWriteIntent(targetPath, { skipOverwrite: true, source: source2 });
+        const action2 = async () => {
+          await import_fs_extra8.default.outputFile(targetPath, source2);
           logger.success(targetPath);
-        }
+        };
+        await scheduleOverwrite(intent2, {
+          relPath,
+          targetPath,
+          action: action2,
+          pending: pendingOverwrites
+        });
         continue;
       }
-      if (await shouldWriteFile(targetPath, { skipOverwrite, source: await import_fs_extra7.default.readFile(file.path), promptLabel: relPath })) {
-        await import_fs_extra7.default.copy(file.path, targetPath);
+      const source = await import_fs_extra8.default.readFile(file.path);
+      const intent = await evaluateWriteIntent(targetPath, { skipOverwrite, source });
+      const action = async () => {
+        await import_fs_extra8.default.outputFile(targetPath, source);
         logger.success(targetPath);
-      }
+      };
+      await scheduleOverwrite(intent, {
+        relPath,
+        targetPath,
+        action,
+        pending: pendingOverwrites
+      });
     } catch (error) {
       if (isIgnorableFsError(error)) {
         continue;
@@ -1255,6 +1384,7 @@ async function upgradeMonorepo(opts) {
       throw error;
     }
   }
+  await flushPendingOverwrites(pendingOverwrites);
 }
 
 // src/cli/program.ts

package/dist/cli.js

@@ -12,7 +12,7 @@ import {
   syncNpmMirror,
   upgradeMonorepo,
   version
-} from "./chunk-4R64J5LE.js";
+} from "./chunk-3TJYHDE6.js";
 
 // src/cli.ts
 init_esm_shims();