@icebreakers/monorepo 2.0.9 → 2.0.11

package/assets/package.json

@@ -48,7 +48,7 @@
     "@icebreakers/monorepo": "workspace:*",
     "@icebreakers/stylelint-config": "^1.2.1",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^24.7.2",
+    "@types/node": "^24.8.0",
     "@types/semver": "^7.7.1",
     "@vitest/coverage-v8": "~3.2.4",
     "ci-info": "^4.3.1",

package/dist/{chunk-NHJHKD7Y.js → chunk-T3OVPIEE.js}

@@ -27,11 +27,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.5.0_@microsoft+api-extractor@7.52.12_@types+node@24.7.2__jiti@2.6.1_postcss@8.5._3d4ae7d8e5b6f496c0110ecf5a7e8328/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.5.0_@microsoft+api-extractor@7.52.12_@types+node@24.8.0__jiti@2.6.1_postcss@8.5._ab94ebbbd28243190e5d9689f774411e/node_modules/tsup/assets/esm_shims.js
 import path from "path";
 import { fileURLToPath } from "url";
 var init_esm_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.5.0_@microsoft+api-extractor@7.52.12_@types+node@24.7.2__jiti@2.6.1_postcss@8.5._3d4ae7d8e5b6f496c0110ecf5a7e8328/node_modules/tsup/assets/esm_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.5.0_@microsoft+api-extractor@7.52.12_@types+node@24.8.0__jiti@2.6.1_postcss@8.5._ab94ebbbd28243190e5d9689f774411e/node_modules/tsup/assets/esm_shims.js"() {
     "use strict";
   }
 });
@@ -578,7 +578,7 @@ async function cleanProjects(cwd) {
 
 // package.json
 var name = "@icebreakers/monorepo";
-var version = "2.0.9";
+var version = "2.0.11";
 
 // src/constants.ts
 init_esm_shims();
@@ -595,6 +595,88 @@ init_esm_shims();
 import { createConsola } from "consola";
 var logger = createConsola();
 
+// src/utils/fs.ts
+init_esm_shims();
+function isIgnorableFsError(error) {
+  if (!error) {
+    return false;
+  }
+  const code = error.code;
+  return code === "ENOENT" || code === "EBUSY" || code === "EEXIST";
+}
+
+// src/utils/gitignore.ts
+init_esm_shims();
+var publishBasename = "gitignore";
+var workspaceBasename = ".gitignore";
+function detectSeparator(input) {
+  if (input.includes("\\") && !input.includes("/")) {
+    return "\\";
+  }
+  return "/";
+}
+function replaceBasename(input, from, to) {
+  if (!input) {
+    return input;
+  }
+  const separator = detectSeparator(input);
+  const normalized = input.replace(/[\\/]/g, separator);
+  const hasTrailingSeparator = normalized.endsWith(separator);
+  const segments = normalized.split(separator);
+  if (hasTrailingSeparator && segments[segments.length - 1] === "") {
+    segments.pop();
+  }
+  const lastIndex = segments.length - 1;
+  if (lastIndex >= 0 && segments[lastIndex] === from) {
+    segments[lastIndex] = to;
+    const rebuilt = segments.join(separator);
+    return hasTrailingSeparator ? `${rebuilt}${separator}` : rebuilt;
+  }
+  return input;
+}
+function toPublishGitignorePath(input) {
+  return replaceBasename(input, workspaceBasename, publishBasename);
+}
+function toWorkspaceGitignorePath(input) {
+  return replaceBasename(input, publishBasename, workspaceBasename);
+}
+function isGitignoreFile(name2) {
+  return toPublishGitignorePath(name2) !== name2 || toWorkspaceGitignorePath(name2) !== name2;
+}
+
+// src/utils/hash.ts
+init_esm_shims();
+import crypto from "crypto";
+function getFileHash(data) {
+  const hashSum = crypto.createHash("md5");
+  hashSum.update(data);
+  return hashSum.digest("hex");
+}
+function isFileChanged(src, dest) {
+  try {
+    const currentHash = getFileHash(src);
+    const previousHash = getFileHash(dest);
+    return currentHash !== previousHash;
+  } catch (err) {
+    logger.error("Error calculating file hash:", err);
+    return false;
+  }
+}
+
+// src/utils/regexp.ts
+init_esm_shims();
+function escapeStringRegexp(str) {
+  return str.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&").replace(/-/g, "\\x2d");
+}
+function isMatch(str, arr) {
+  for (const reg of arr) {
+    if (reg.test(str)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 // src/commands/create.ts
 init_esm_shims();
 var import_set_value2 = __toESM(require_set_value(), 1);
@@ -660,7 +742,7 @@ async function createNewProject(options) {
   const shouldSkip = (src) => path6.basename(src) === ".DS_Store";
   const copyTasks = filelist.filter((filename) => filename !== "package.json").map(async (filename) => {
     const sourcePath = path6.resolve(from, filename);
-    const targetPath = path6.resolve(to, filename === "gitignore" ? ".gitignore" : filename);
+    const targetPath = path6.resolve(to, toWorkspaceGitignorePath(filename));
     await fs2.copy(sourcePath, targetPath, {
       filter(src) {
         if (shouldSkip(src)) {
@@ -960,60 +1042,105 @@ ${Array.from(set7).map((x) => `- ${pc2.green(x ?? "")}`).join("\n")}
   await Promise.all(tasks);
 }
 
-// src/utils/fs.ts
+// src/commands/upgrade/index.ts
 init_esm_shims();
-function isIgnorableFsError(error) {
-  if (!error) {
-    return false;
-  }
-  const code = error.code;
-  return code === "ENOENT" || code === "EBUSY" || code === "EEXIST";
-}
+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/utils/hash.ts
+// src/commands/upgrade/overwrite.ts
 init_esm_shims();
-import crypto from "crypto";
-function getFileHash(data) {
-  const hashSum = crypto.createHash("md5");
-  hashSum.update(data);
-  return hashSum.digest("hex");
+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;
 }
-function isFileChanged(src, dest) {
+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 currentHash = getFileHash(src);
-    const previousHash = getFileHash(dest);
-    return currentHash !== previousHash;
-  } catch (err) {
-    logger.error("Error calculating file hash:", err);
-    return false;
+    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"
+  };
 }
-
-// src/utils/regexp.ts
-init_esm_shims();
-function escapeStringRegexp(str) {
-  return str.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&").replace(/-/g, "\\x2d");
+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
+    });
+  }
 }
-function isMatch(str, arr) {
-  for (const reg of arr) {
-    if (reg.test(str)) {
-      return true;
+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();
     }
   }
-  return false;
 }
 
-// src/commands/upgrade/index.ts
+// src/commands/upgrade/pkg-json.ts
 init_esm_shims();
-var import_set_value6 = __toESM(require_set_value(), 1);
-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";
-import klaw from "klaw";
-import path13 from "pathe";
-import pc3 from "picocolors";
 import { coerce, gte, minVersion } from "semver";
 
 // src/commands/upgrade/scripts.ts
@@ -1027,44 +1154,7 @@ var scripts = {
 };
 var scriptsEntries = Object.entries(scripts);
 
-// src/commands/upgrade/targets.ts
-init_esm_shims();
-function getAssetTargets(raw) {
-  const list = [
-    ".changeset",
-    ".husky",
-    ".vscode",
-    ".editorconfig",
-    ".gitattributes",
-    ".gitignore",
-    ".npmrc",
-    "commitlint.config.ts",
-    "eslint.config.js",
-    "lint-staged.config.js",
-    "stylelint.config.js",
-    "monorepo.config.ts",
-    "package.json",
-    // pnpm
-    "pnpm-workspace.yaml",
-    // base tsconfig
-    "tsconfig.json",
-    // turbo
-    "turbo.json",
-    // vitest
-    "vitest.config.ts",
-    // 'vitest.workspace.ts',
-    // #region docker
-    "Dockerfile",
-    ".dockerignore"
-    // #endregion
-  ];
-  if (!raw) {
-    list.push(".github", "LICENSE", "renovate.json", "SECURITY.md", "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "netlify.toml");
-  }
-  return list;
-}
-
-// src/commands/upgrade/index.ts
+// src/commands/upgrade/pkg-json.ts
 function isWorkspace(version2) {
   if (typeof version2 === "string") {
     return version2.startsWith("workspace:");
@@ -1147,38 +1237,45 @@ function setPkgJson(sourcePkgJson, targetPkgJson, options) {
     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;
+
+// src/commands/upgrade/targets.ts
+init_esm_shims();
+function getAssetTargets(raw) {
+  const list = [
+    ".changeset",
+    ".husky",
+    ".vscode",
+    ".editorconfig",
+    ".gitattributes",
+    ".gitignore",
+    ".npmrc",
+    "commitlint.config.ts",
+    "eslint.config.js",
+    "lint-staged.config.js",
+    "stylelint.config.js",
+    "monorepo.config.ts",
+    "package.json",
+    // pnpm
+    "pnpm-workspace.yaml",
+    // base tsconfig
+    "tsconfig.json",
+    // turbo
+    "turbo.json",
+    // vitest
+    "vitest.config.ts",
+    // 'vitest.workspace.ts',
+    // #region docker
+    "Dockerfile",
+    ".dockerignore"
+    // #endregion
+  ];
+  if (!raw) {
+    list.push(".github", "LICENSE", "renovate.json", "SECURITY.md", "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "netlify.toml");
   }
-  return confirmOverwrite(promptLabel);
+  return list;
 }
+
+// src/commands/upgrade/index.ts
 async function upgradeMonorepo(opts) {
   const cwd = opts.cwd ?? process2.cwd();
   const upgradeConfig = await resolveCommandConfig("upgrade", cwd);
@@ -1199,7 +1296,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 {
@@ -1215,62 +1312,89 @@ 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);
-      return isMatch(str, regexpArr);
+      const rel = toWorkspaceGitignorePath(path13.relative(assetsDir, p));
+      return isMatch(rel, regexpArr);
     }
   })) {
     if (!file.stats.isFile()) {
       continue;
     }
-    let relPath = path13.relative(assetsDir, file.path);
-    if (relPath === "gitignore") {
-      relPath = ".gitignore";
-    }
+    const relPath = toWorkspaceGitignorePath(path13.relative(assetsDir, file.path));
     if (skipChangesetMarkdown && relPath.startsWith(".changeset/") && relPath.endsWith(".md")) {
       continue;
     }
     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;
@@ -1278,6 +1402,7 @@ async function upgradeMonorepo(opts) {
       throw error;
     }
   }
+  await flushPendingOverwrites(pendingOverwrites);
 }
 
 // src/commands/index.ts
@@ -1299,6 +1424,14 @@ export {
   assetsDir,
   rootDir,
   logger,
+  isIgnorableFsError,
+  toPublishGitignorePath,
+  toWorkspaceGitignorePath,
+  isGitignoreFile,
+  getFileHash,
+  isFileChanged,
+  escapeStringRegexp,
+  isMatch,
   templateMap,
   defaultTemplate,
   getCreateChoices,
@@ -1308,11 +1441,6 @@ export {
   init,
   setVscodeBinaryMirror,
   syncNpmMirror,
-  isIgnorableFsError,
-  getFileHash,
-  isFileChanged,
-  escapeStringRegexp,
-  isMatch,
   upgradeMonorepo
 };
 /*! Bundled license information: