@icebreakers/monorepo 3.2.3 → 3.2.5

package/dist/{upgrade-B_Pvjblg.mjs → upgrade-CVZ1525B.mjs}

@@ -61,9 +61,9 @@ var join = /* @__PURE__ */ __name((segs, joinChar, options) => {
 	if (typeof options.join === "function") return options.join(segs);
 	return segs[0] + joinChar + segs[1];
 }, "join");
-var split = /* @__PURE__ */ __name((path$2, splitChar, options) => {
-	if (typeof options.split === "function") return options.split(path$2);
-	return path$2.split(splitChar);
+var split = /* @__PURE__ */ __name((path, splitChar, options) => {
+	if (typeof options.split === "function") return options.split(path);
+	return path.split(splitChar);
 }, "split");
 var isValid = /* @__PURE__ */ __name((key, target = {}, options) => {
 	if (typeof options?.isValid === "function") return options.isValid(key, target);
@@ -72,17 +72,17 @@ var isValid = /* @__PURE__ */ __name((key, target = {}, options) => {
 var isValidObject = /* @__PURE__ */ __name((v) => {
 	return isObject(v) || typeof v === "function";
 }, "isValidObject");
-var index_default = /* @__PURE__ */ __name((target, path$2, options = {}) => {
+var index_default = /* @__PURE__ */ __name((target, path, options = {}) => {
 	if (!isObject(options)) options = { default: options };
 	if (!isValidObject(target)) return typeof options.default !== "undefined" ? options.default : target;
-	if (typeof path$2 === "number") path$2 = String(path$2);
-	const pathIsArray = Array.isArray(path$2);
-	const pathIsString = typeof path$2 === "string";
+	if (typeof path === "number") path = String(path);
+	const pathIsArray = Array.isArray(path);
+	const pathIsString = typeof path === "string";
 	const splitChar = options.separator || ".";
 	const joinChar = options.joinChar || (typeof splitChar === "string" ? splitChar : ".");
 	if (!pathIsString && !pathIsArray) return target;
-	if (target[path$2] !== void 0) return isValid(path$2, target, options) ? target[path$2] : options.default;
-	const segs = pathIsArray ? path$2 : split(path$2, splitChar, options);
+	if (target[path] !== void 0) return isValid(path, target, options) ? target[path] : options.default;
+	const segs = pathIsArray ? path : split(path, splitChar, options);
 	const len = segs.length;
 	let idx = 0;
 	do {
@@ -367,7 +367,7 @@ var require_is_primitive = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 * Released under the MIT License.
 */
 var require_isobject = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	module.exports = function isObject$1(val) {
+	module.exports = function isObject(val) {
 		return val != null && typeof val === "object" && Array.isArray(val) === false;
 	};
 }));
@@ -385,7 +385,7 @@ var require_is_plain_object = /* @__PURE__ */ __commonJSMin(((exports, module) =
 	function isObjectObject(o) {
 		return isObject(o) === true && Object.prototype.toString.call(o) === "[object Object]";
 	}
-	module.exports = function isPlainObject$2(o) {
+	module.exports = function isPlainObject(o) {
 		var ctor, prot;
 		if (isObjectObject(o) === false) return false;
 		ctor = o.constructor;
@@ -419,12 +419,12 @@ var require_set_value = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		if (!isPrimitive(key)) throw new TypeError("Object keys must be strings or symbols");
 		if (isUnsafeKey(key)) throw new Error(`Cannot set unsafe key: "${key}"`);
 	};
-	const toStringKey = (input$1) => {
-		return Array.isArray(input$1) ? input$1.flat().map(String).join(",") : input$1;
+	const toStringKey = (input) => {
+		return Array.isArray(input) ? input.flat().map(String).join(",") : input;
 	};
-	const createMemoKey = (input$1, options) => {
-		if (typeof input$1 !== "string" || !options) return input$1;
-		let key = input$1 + ";";
+	const createMemoKey = (input, options) => {
+		if (typeof input !== "string" || !options) return input;
+		let key = input + ";";
 		if (options.arrays !== void 0) key += `arrays=${options.arrays};`;
 		if (options.separator !== void 0) key += `separator=${options.separator};`;
 		if (options.split !== void 0) key += `split=${options.split};`;
@@ -432,28 +432,28 @@ var require_set_value = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		if (options.preservePaths !== void 0) key += `preservePaths=${options.preservePaths};`;
 		return key;
 	};
-	const memoize = (input$1, options, fn) => {
-		const key = toStringKey(options ? createMemoKey(input$1, options) : input$1);
+	const memoize = (input, options, fn) => {
+		const key = toStringKey(options ? createMemoKey(input, options) : input);
 		validateKey(key);
 		const value = setValue.cache.get(key) || fn();
 		setValue.cache.set(key, value);
 		return value;
 	};
-	const splitString = (input$1, options = {}) => {
+	const splitString = (input, options = {}) => {
 		const sep = options.separator || ".";
 		const preserve = sep === "/" ? false : options.preservePaths;
-		if (typeof input$1 === "string" && preserve !== false && /\//.test(input$1)) return [input$1];
+		if (typeof input === "string" && preserve !== false && /\//.test(input)) return [input];
 		const parts = [];
 		let part = "";
-		const push = (part$1) => {
+		const push = (part) => {
 			let number;
-			if (part$1.trim() !== "" && Number.isInteger(number = Number(part$1))) parts.push(number);
-			else parts.push(part$1);
+			if (part.trim() !== "" && Number.isInteger(number = Number(part))) parts.push(number);
+			else parts.push(part);
 		};
-		for (let i = 0; i < input$1.length; i++) {
-			const value = input$1[i];
+		for (let i = 0; i < input.length; i++) {
+			const value = input[i];
 			if (value === "\\") {
-				part += input$1[++i];
+				part += input[++i];
 				continue;
 			}
 			if (value === sep) {
@@ -466,11 +466,11 @@ var require_set_value = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		if (part) push(part);
 		return parts;
 	};
-	const split = (input$1, options) => {
-		if (options && typeof options.split === "function") return options.split(input$1);
-		if (typeof input$1 === "symbol") return [input$1];
-		if (Array.isArray(input$1)) return input$1;
-		return memoize(input$1, options, () => splitString(input$1, options));
+	const split = (input, options) => {
+		if (options && typeof options.split === "function") return options.split(input);
+		if (typeof input === "symbol") return [input];
+		if (Array.isArray(input)) return input;
+		return memoize(input, options, () => splitString(input, options));
 	};
 	const assignProp = (obj, prop, value, options) => {
 		validateKey(prop);
@@ -482,9 +482,9 @@ var require_set_value = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		} else obj[prop] = value;
 		return obj;
 	};
-	const setValue = (target, path$2, value, options) => {
-		if (!path$2 || !isObject(target)) return target;
-		const keys = split(path$2, options);
+	const setValue = (target, path, value, options) => {
+		if (!path || !isObject(target)) return target;
+		const keys = split(path, options);
 		let obj = target;
 		for (let i = 0; i < keys.length; i++) {
 			const key = keys[i];
@@ -552,14 +552,14 @@ async function loadMonorepoConfig(cwd) {
 /**
 * 获取命令对应的合并配置，若未配置则返回空对象，保证调用端逻辑简单。
 */
-async function resolveCommandConfig(name$1, cwd) {
-	return ((await loadMonorepoConfig(cwd)).commands ?? {})[name$1] ?? {};
+async function resolveCommandConfig(name, cwd) {
+	return ((await loadMonorepoConfig(cwd)).commands ?? {})[name] ?? {};
 }
 
 //#endregion
 //#region package.json
 var name = "@icebreakers/monorepo";
-var version = "3.2.3";
+var version = "3.2.5";
 
 //#endregion
 //#region src/constants.ts
@@ -641,10 +641,10 @@ async function cleanProjects(cwd, overrides) {
 	const cleanConfig = mergeCleanConfig(await resolveCommandConfig("clean", cwd), overrides);
 	const { packages, workspaceDir } = await getWorkspaceData(cwd, cleanConfig?.includePrivate ?? true ? { ignorePrivatePackage: false } : void 0);
 	const filteredPackages = packages.filter((pkg) => {
-		const name$2 = pkg.manifest.name ?? "";
-		if (!name$2) return true;
+		const name = pkg.manifest.name ?? "";
+		if (!name) return true;
 		if (!cleanConfig?.ignorePackages?.length) return true;
-		return !cleanConfig.ignorePackages.includes(name$2);
+		return !cleanConfig.ignorePackages.includes(name);
 	});
 	let cleanDirs = [];
 	if (cleanConfig?.autoConfirm) cleanDirs = filteredPackages.map((pkg) => pkg.rootDir);
@@ -664,20 +664,20 @@ async function cleanProjects(cwd, overrides) {
 	});
 	const readmeZh = path.resolve(workspaceDir, "README.zh-CN.md");
 	const qoderDir = path.resolve(workspaceDir, ".qoder");
-	const skillTargets$1 = Object.values(getSkillTargetPaths());
+	const skillTargets = Object.values(getSkillTargetPaths());
 	const candidates = Array.from(new Set([
 		...cleanDirs.filter(Boolean),
 		readmeZh,
 		qoderDir,
-		...skillTargets$1
+		...skillTargets
 	]));
 	await Promise.all(candidates.map(async (dir) => {
 		if (await fs.pathExists(dir)) await fs.remove(dir);
 	}));
-	const name$1 = path.resolve(workspaceDir, "package.json");
-	const pkgJson = await fs.readJson(name$1);
+	const name = path.resolve(workspaceDir, "package.json");
+	const pkgJson = await fs.readJson(name);
 	(0, import_set_value.default)(pkgJson, "devDependencies.@icebreakers/monorepo", cleanConfig?.pinnedVersion ?? "latest", { preservePaths: false });
-	await fs.outputJson(name$1, pkgJson, { spaces: 2 });
+	await fs.outputJson(name, pkgJson, { spaces: 2 });
 }
 
 //#endregion
@@ -805,7 +805,7 @@ async function createNewProject(options) {
 	const createConfig = await resolveCommandConfig("create", cwd);
 	const renameJson = options?.renameJson ?? createConfig?.renameJson ?? false;
 	const rawName = options?.name ?? createConfig?.name;
-	const name$1 = typeof rawName === "string" ? rawName.trim() : void 0;
+	const name = typeof rawName === "string" ? rawName.trim() : void 0;
 	const requestedTemplate = options?.type ?? createConfig?.type ?? createConfig?.defaultTemplate ?? defaultTemplate;
 	const templateDefinitions = getTemplateMap(createConfig?.templateMap);
 	const templatesRoot = createConfig?.templatesDir ? path.resolve(cwd, createConfig.templatesDir) : templatesDir;
@@ -814,7 +814,7 @@ async function createNewProject(options) {
 	const templateDefinition = templateDefinitions[bundlerName];
 	if (!templateDefinition) throw new Error(`未找到名为 ${bundlerName} 的模板，请检查 monorepo.config.ts`);
 	const from = path.join(templatesRoot, templateDefinition.source);
-	const targetName = name$1 && name$1.length > 0 ? name$1 : templateDefinition.target;
+	const targetName = name && name.length > 0 ? name : templateDefinition.target;
 	const to = path.join(cwd, targetName);
 	if (await fs.pathExists(to)) throw new Error(`${pc.red("目标目录已存在")}: ${path.relative(cwd, to)}`);
 	await fs.ensureDir(to);
@@ -828,7 +828,7 @@ async function createNewProject(options) {
 	if (hasPackageJson) {
 		const sourceJson = await fs.readJson(sourceJsonPath);
 		(0, import_set_value.default)(sourceJson, "version", "0.0.0");
-		(0, import_set_value.default)(sourceJson, "name", name$1?.startsWith("@") ? name$1 : path.basename(targetName));
+		(0, import_set_value.default)(sourceJson, "name", name?.startsWith("@") ? name : path.basename(targetName));
 		await applyGitMetadata(sourceJson, cwd, to);
 		await fs.outputJson(path.resolve(to, renameJson ? "package.mock.json" : "package.json"), sourceJson, { spaces: 2 });
 	}
@@ -1143,15 +1143,15 @@ async function syncNpmMirror(cwd, options) {
 		...options ?? {}
 	});
 	logger.info(`[当前工作区Repo]:\n${packages.map((x) => `- ${pc.green(x.manifest.name)} : ${path.relative(workspaceDir, x.rootDir)}`).join("\n")}\n`);
-	const set$6 = new Set(packages.map((x) => x.manifest.name));
+	const set = new Set(packages.map((x) => x.manifest.name));
 	if (packageFilter?.length) {
-		for (const name$1 of Array.from(set$6)) if (!name$1 || !packageFilter.includes(name$1)) set$6.delete(name$1);
+		for (const name of Array.from(set)) if (!name || !packageFilter.includes(name)) set.delete(name);
 	}
-	logger.info(`[即将同步的包]:\n${Array.from(set$6).map((x) => `- ${pc.green(x ?? "")}`).join("\n")}\n`);
+	logger.info(`[即将同步的包]:\n${Array.from(set).map((x) => `- ${pc.green(x ?? "")}`).join("\n")}\n`);
 	const queue = new PQueue({ concurrency: configConcurrency ?? Math.max(os.cpus().length, 1) });
 	const template = configCommand ?? "cnpm sync {name}";
 	const tasks = [];
-	for (const pkgName of set$6) {
+	for (const pkgName of set) {
 		if (!pkgName) continue;
 		tasks.push(queue.add(async () => {
 			return execaCommand(renderCommand(template, pkgName), { stdio: "inherit" });
@@ -1242,17 +1242,17 @@ const scriptsEntries = Object.entries(scripts);
 //#endregion
 //#region src/commands/upgrade/pkg-json.ts
 const NON_OVERRIDABLE_PREFIXES = ["workspace:", "catalog:"];
-function parseVersion(input$1) {
-	if (typeof input$1 !== "string" || input$1.trim().length === 0) return null;
+function parseVersion(input) {
+	if (typeof input !== "string" || input.trim().length === 0) return null;
 	try {
-		return minVersion(input$1) ?? coerce(input$1);
+		return minVersion(input) ?? coerce(input);
 	} catch {
 		return null;
 	}
 }
-function hasNonOverridablePrefix(version$1) {
-	if (typeof version$1 !== "string") return false;
-	return NON_OVERRIDABLE_PREFIXES.some((prefix) => version$1.startsWith(prefix));
+function hasNonOverridablePrefix(version) {
+	if (typeof version !== "string") return false;
+	return NON_OVERRIDABLE_PREFIXES.some((prefix) => version.startsWith(prefix));
 }
 function shouldAssignVersion(currentVersion, nextVersion) {
 	if (typeof currentVersion !== "string" || currentVersion.trim().length === 0) return true;
@@ -1297,9 +1297,9 @@ function setPkgJson(sourcePkgJson, targetPkgJson, options) {
 	if (Object.keys(targetDevDeps).length) targetPkgJson.devDependencies = targetDevDeps;
 	const scriptPairs = options?.scripts ? Object.entries(options.scripts) : scriptsEntries;
 	if (scriptPairs.length) {
-		const scripts$1 = { ...targetPkgJson.scripts ?? {} };
-		for (const [scriptName, scriptCmd] of scriptPairs) scripts$1[scriptName] = scriptCmd;
-		targetPkgJson.scripts = scripts$1;
+		const scripts = { ...targetPkgJson.scripts ?? {} };
+		for (const [scriptName, scriptCmd] of scriptPairs) scripts[scriptName] = scriptCmd;
+		targetPkgJson.scripts = scripts;
 	}
 }
 
@@ -1392,7 +1392,7 @@ async function upgradeMonorepo(opts) {
 		})
 	});
 	const regexpArr = targets.map((x) => {
-		return /* @__PURE__ */ new RegExp(`^${escapeStringRegexp(x)}`);
+		return new RegExp(`^${escapeStringRegexp(x)}`);
 	});
 	const skipChangesetMarkdown = upgradeConfig?.skipChangesetMarkdown ?? true;
 	const scriptOverrides = upgradeConfig?.scripts;
@@ -1418,15 +1418,15 @@ async function upgradeMonorepo(opts) {
 				const targetPkgJson = await fs.readJson(targetPath);
 				setPkgJson(sourcePkgJson, targetPkgJson, scriptOverrides ? { scripts: scriptOverrides } : void 0);
 				const data = `${JSON.stringify(targetPkgJson, void 0, 2)}\n`;
-				const intent$1 = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
-				const action$1 = async () => {
+				const intent = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
+				const action = async () => {
 					await fs.outputFile(targetPath, data, "utf8");
 					logger.success(targetPath);
 				};
-				await scheduleOverwrite(intent$1, {
+				await scheduleOverwrite(intent, {
 					relPath,
 					targetPath,
-					action: action$1,
+					action,
 					pending: pendingOverwrites
 				});
 				continue;
@@ -1437,15 +1437,15 @@ async function upgradeMonorepo(opts) {
 				const targetManifest = exists ? normalizeWorkspaceManifest(YAML.parse(await fs.readFile(targetPath, "utf8"))) : normalizeWorkspaceManifest({});
 				const mergedManifest = exists ? mergeWorkspaceManifest(sourceManifest, targetManifest) : sourceManifest;
 				const data = YAML.stringify(mergedManifest, { singleQuote: true });
-				const intent$1 = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
-				const action$1 = async () => {
+				const intent = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
+				const action = async () => {
 					await fs.outputFile(targetPath, data, "utf8");
 					logger.success(targetPath);
 				};
-				await scheduleOverwrite(intent$1, {
+				await scheduleOverwrite(intent, {
 					relPath,
 					targetPath,
-					action: action$1,
+					action,
 					pending: pendingOverwrites
 				});
 				continue;
@@ -1454,48 +1454,48 @@ async function upgradeMonorepo(opts) {
 				const changesetJson = await fs.readJson(file.path);
 				(0, import_set_value.default)(changesetJson, "changelog.1.repo", repoName);
 				const data = `${JSON.stringify(changesetJson, void 0, 2)}\n`;
-				const intent$1 = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
-				const action$1 = async () => {
+				const intent = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
+				const action = async () => {
 					await fs.outputFile(targetPath, data, "utf8");
 					logger.success(targetPath);
 				};
-				await scheduleOverwrite(intent$1, {
+				await scheduleOverwrite(intent, {
 					relPath,
 					targetPath,
-					action: action$1,
+					action,
 					pending: pendingOverwrites
 				});
 				continue;
 			}
 			if (relPath === "LICENSE") {
-				const source$1 = await fs.readFile(file.path);
-				const intent$1 = await evaluateWriteIntent(targetPath, {
+				const source = await fs.readFile(file.path);
+				const intent = await evaluateWriteIntent(targetPath, {
 					skipOverwrite: true,
-					source: source$1
+					source
 				});
-				const action$1 = async () => {
-					await fs.outputFile(targetPath, source$1);
+				const action = async () => {
+					await fs.outputFile(targetPath, source);
 					logger.success(targetPath);
 				};
-				await scheduleOverwrite(intent$1, {
+				await scheduleOverwrite(intent, {
 					relPath,
 					targetPath,
-					action: action$1,
+					action,
 					pending: pendingOverwrites
 				});
 				continue;
 			}
 			if (relPath === ".github/ISSUE_TEMPLATE/config.yml") {
 				const data = updateIssueTemplateConfig(await fs.readFile(file.path, "utf8"), repoName);
-				const intent$1 = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
-				const action$1 = async () => {
+				const intent = await evaluateWriteIntent(targetPath, buildWriteIntentOptions(data));
+				const action = async () => {
 					await fs.outputFile(targetPath, data);
 					logger.success(targetPath);
 				};
-				await scheduleOverwrite(intent$1, {
+				await scheduleOverwrite(intent, {
 					relPath,
 					targetPath,
-					action: action$1,
+					action,
 					pending: pendingOverwrites
 				});
 				continue;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@icebreakers/monorepo",
   "type": "module",
-  "version": "3.2.3",
+  "version": "3.2.5",
   "description": "The icebreaker's monorepo manager",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -60,8 +60,8 @@
     "@pnpm/find-workspace-dir": "^1000.1.3",
     "@pnpm/logger": "^1001.0.1",
     "@pnpm/types": "^1001.3.0",
-    "@pnpm/worker": "^1000.6.2",
-    "@pnpm/workspace.find-packages": "^1000.0.55",
+    "@pnpm/worker": "^1000.6.3",
+    "@pnpm/workspace.find-packages": "^1000.0.56",
     "@pnpm/workspace.read-manifest": "^1000.2.10",
     "c12": "^3.3.3",
     "comment-json": "^4.5.1",
@@ -75,7 +75,7 @@
     "semver": "^7.7.3",
     "simple-git": "^3.30.0",
     "yaml": "^2.8.2",
-    "@icebreakers/monorepo-templates": "0.1.3"
+    "@icebreakers/monorepo-templates": "0.1.5"
   },
   "devDependencies": {
     "@types/klaw": "^3.0.7",