@icebreakers/monorepo 3.1.1 → 3.1.2

package/assets/package.json

@@ -44,7 +44,7 @@
     "@changesets/cli": "^2.29.8",
     "@commitlint/cli": "^20.2.0",
     "@icebreakers/commitlint-config": "^1.2.3",
-    "@icebreakers/eslint-config": "^1.6.3",
+    "@icebreakers/eslint-config": "^1.6.4",
     "@icebreakers/monorepo": "workspace:*",
     "@icebreakers/stylelint-config": "^1.2.3",
     "@types/fs-extra": "^11.0.4",

package/dist/cli.cjs

@@ -1,4 +1,4 @@
-const require_upgrade = require('./upgrade-D3k24_vK.cjs');
+const require_upgrade = require('./upgrade-BUKca70w.cjs');
 let node_process = require("node:process");
 node_process = require_upgrade.__toESM(node_process);
 let __inquirer_input = require("@inquirer/input");

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { A as defaultAgenticBaseDir, C as name, M as generateAgenticTemplates, N as loadAgenticTasks, O as resolveCommandConfig, P as logger, T as cleanProjects, c as getCreateChoices, i as init, j as generateAgenticTemplate, k as createTimestampFolderName, n as syncNpmMirror, o as createNewProject, r as setVscodeBinaryMirror, s as defaultTemplate, t as upgradeMonorepo, w as version } from "./upgrade-DcCr5GIw.mjs";
+import { A as defaultAgenticBaseDir, C as name, M as generateAgenticTemplates, N as loadAgenticTasks, O as resolveCommandConfig, P as logger, T as cleanProjects, c as getCreateChoices, i as init, j as generateAgenticTemplate, k as createTimestampFolderName, n as syncNpmMirror, o as createNewProject, r as setVscodeBinaryMirror, s as defaultTemplate, t as upgradeMonorepo, w as version } from "./upgrade-B1j5KS32.mjs";
 import process from "node:process";
 import input from "@inquirer/input";
 import select from "@inquirer/select";

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_upgrade = require('./upgrade-D3k24_vK.cjs');
+const require_upgrade = require('./upgrade-BUKca70w.cjs');
 
 exports.GitClient = require_upgrade.GitClient;
 exports.assetsDir = require_upgrade.assetsDir;

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { A as defaultAgenticBaseDir, C as name, D as loadMonorepoConfig, E as defineMonorepoConfig, F as getWorkspaceData, I as getWorkspacePackages, L as GitClient, M as generateAgenticTemplates, N as loadAgenticTasks, O as resolveCommandConfig, P as logger, S as templatesDir, T as cleanProjects, _ as toWorkspaceGitignorePath, a as createContext, b as packageDir, c as getCreateChoices, d as escapeStringRegexp, f as isMatch, g as toPublishGitignorePath, h as isGitignoreFile, i as init, j as generateAgenticTemplate, k as createTimestampFolderName, l as getTemplateMap, m as isFileChanged, n as syncNpmMirror, o as createNewProject, p as getFileHash, r as setVscodeBinaryMirror, t as upgradeMonorepo, u as templateMap, v as isIgnorableFsError, w as version, x as rootDir, y as assetsDir } from "./upgrade-DcCr5GIw.mjs";
+import { A as defaultAgenticBaseDir, C as name, D as loadMonorepoConfig, E as defineMonorepoConfig, F as getWorkspaceData, I as getWorkspacePackages, L as GitClient, M as generateAgenticTemplates, N as loadAgenticTasks, O as resolveCommandConfig, P as logger, S as templatesDir, T as cleanProjects, _ as toWorkspaceGitignorePath, a as createContext, b as packageDir, c as getCreateChoices, d as escapeStringRegexp, f as isMatch, g as toPublishGitignorePath, h as isGitignoreFile, i as init, j as generateAgenticTemplate, k as createTimestampFolderName, l as getTemplateMap, m as isFileChanged, n as syncNpmMirror, o as createNewProject, p as getFileHash, r as setVscodeBinaryMirror, t as upgradeMonorepo, u as templateMap, v as isIgnorableFsError, w as version, x as rootDir, y as assetsDir } from "./upgrade-B1j5KS32.mjs";
 
 export { GitClient, assetsDir, cleanProjects, createContext, createNewProject, createTimestampFolderName, defaultAgenticBaseDir, defineMonorepoConfig, escapeStringRegexp, generateAgenticTemplate, generateAgenticTemplates, getCreateChoices, getFileHash, getTemplateMap, getWorkspaceData, getWorkspacePackages, init, isFileChanged, isGitignoreFile, isIgnorableFsError, isMatch, loadAgenticTasks, loadMonorepoConfig, logger, name, packageDir, resolveCommandConfig, rootDir, setVscodeBinaryMirror, syncNpmMirror, templateMap, templatesDir, toPublishGitignorePath, toWorkspaceGitignorePath, upgradeMonorepo, version };

package/dist/{upgrade-DcCr5GIw.mjs → upgrade-B1j5KS32.mjs}

@@ -19,6 +19,7 @@ import os from "node:os";
 import { execaCommand } from "execa";
 import PQueue from "p-queue";
 import klaw from "klaw";
+import YAML from "yaml";
 import { Buffer as Buffer$1 } from "node:buffer";
 import { coerce, gte, minVersion } from "semver";
 
@@ -187,7 +188,7 @@ var GitClient = class {
 
 //#endregion
 //#region ../../node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
-function isPlainObject$1(value) {
+function isPlainObject$2(value) {
 	if (value === null || typeof value !== "object") return false;
 	const prototype = Object.getPrototypeOf(value);
 	if (prototype !== null && prototype !== Object.prototype && Object.getPrototypeOf(prototype) !== null) return false;
@@ -196,7 +197,7 @@ function isPlainObject$1(value) {
 	return true;
 }
 function _defu(baseObject, defaults, namespace = ".", merger) {
-	if (!isPlainObject$1(defaults)) return _defu(baseObject, {}, namespace, merger);
+	if (!isPlainObject$2(defaults)) return _defu(baseObject, {}, namespace, merger);
 	const object = Object.assign({}, defaults);
 	for (const key in baseObject) {
 		if (key === "__proto__" || key === "constructor") continue;
@@ -204,7 +205,7 @@ function _defu(baseObject, defaults, namespace = ".", merger) {
 		if (value === null || value === void 0) continue;
 		if (merger && merger(object, key, value, namespace)) continue;
 		if (Array.isArray(value) && Array.isArray(object[key])) object[key] = [...value, ...object[key]];
-		else if (isPlainObject$1(value) && isPlainObject$1(object[key])) object[key] = _defu(value, object[key], (namespace ? `${namespace}.` : "") + key.toString(), merger);
+		else if (isPlainObject$2(value) && isPlainObject$2(object[key])) object[key] = _defu(value, object[key], (namespace ? `${namespace}.` : "") + key.toString(), merger);
 		else object[key] = value;
 	}
 	return object;
@@ -384,7 +385,7 @@ var require_is_plain_object = /* @__PURE__ */ __commonJSMin(((exports, module) =
 	function isObjectObject(o) {
 		return isObject$1(o) === true && Object.prototype.toString.call(o) === "[object Object]";
 	}
-	module.exports = function isPlainObject$2(o) {
+	module.exports = function isPlainObject$3(o) {
 		var ctor, prot;
 		if (isObjectObject(o) === false) return false;
 		ctor = o.constructor;
@@ -407,7 +408,7 @@ var require_is_plain_object = /* @__PURE__ */ __commonJSMin(((exports, module) =
 var require_set_value = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { deleteProperty } = Reflect;
 	const isPrimitive = require_is_primitive();
-	const isPlainObject = require_is_plain_object();
+	const isPlainObject$1 = require_is_plain_object();
 	const isObject = (value) => {
 		return typeof value === "object" && value !== null || typeof value === "function";
 	};
@@ -476,7 +477,7 @@ var require_set_value = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		if (value === void 0) deleteProperty(obj, prop);
 		else if (options && options.merge) {
 			const merge = options.merge === "function" ? options.merge : Object.assign;
-			if (merge && isPlainObject(obj[prop]) && isPlainObject(value)) obj[prop] = merge(obj[prop], value);
+			if (merge && isPlainObject$1(obj[prop]) && isPlainObject$1(value)) obj[prop] = merge(obj[prop], value);
 			else obj[prop] = value;
 		} else obj[prop] = value;
 		return obj;
@@ -604,7 +605,7 @@ async function cleanProjects(cwd, overrides) {
 //#endregion
 //#region package.json
 var name = "@icebreakers/monorepo";
-var version = "3.1.1";
+var version = "3.1.2";
 
 //#endregion
 //#region src/constants.ts
@@ -1257,6 +1258,47 @@ function getAssetTargets(core) {
 	return list;
 }
 
+//#endregion
+//#region src/commands/upgrade/workspace.ts
+function isPlainObject(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function normalizeWorkspaceManifest(manifest) {
+	if (isPlainObject(manifest)) return { ...manifest };
+	return {};
+}
+function mergeUniqueArray(target, source) {
+	const result = [...target];
+	for (const item of source) if (!result.includes(item)) result.push(item);
+	return result;
+}
+/**
+* Merge pnpm workspace manifests by filling missing fields only.
+* Existing values take precedence; arrays are deduped while keeping target order.
+*/
+function mergeWorkspaceManifest(source, target) {
+	const normalizedSource = normalizeWorkspaceManifest(source);
+	const normalizedTarget = normalizeWorkspaceManifest(target);
+	const result = { ...normalizedTarget };
+	for (const [key, value] of Object.entries(normalizedSource)) {
+		const current = normalizedTarget[key];
+		if (current === void 0) {
+			result[key] = value;
+			continue;
+		}
+		if (Array.isArray(current) && Array.isArray(value)) {
+			result[key] = mergeUniqueArray(current, value);
+			continue;
+		}
+		if (isPlainObject(current) && isPlainObject(value)) {
+			result[key] = mergeWorkspaceManifest(value, current);
+			continue;
+		}
+		result[key] = current;
+	}
+	return result;
+}
+
 //#endregion
 //#region src/commands/upgrade/index.ts
 var import_set_value = /* @__PURE__ */ __toESM(require_set_value(), 1);
@@ -1327,6 +1369,28 @@ async function upgradeMonorepo(opts) {
 				});
 				continue;
 			}
+			if (relPath === "pnpm-workspace.yaml") {
+				const sourceManifest = normalizeWorkspaceManifest(YAML.parse(await fs.readFile(file.path, "utf8")));
+				const exists = await fs.pathExists(targetPath);
+				const targetManifest = exists ? normalizeWorkspaceManifest(YAML.parse(await fs.readFile(targetPath, "utf8"))) : normalizeWorkspaceManifest({});
+				const mergedManifest = exists ? mergeWorkspaceManifest(sourceManifest, targetManifest) : sourceManifest;
+				const data = YAML.stringify(mergedManifest);
+				const intent$1 = await evaluateWriteIntent(targetPath, {
+					skipOverwrite,
+					source: data
+				});
+				const action$1 = async () => {
+					await fs.outputFile(targetPath, data, "utf8");
+					logger.success(targetPath);
+				};
+				await scheduleOverwrite(intent$1, {
+					relPath,
+					targetPath,
+					action: action$1,
+					pending: pendingOverwrites
+				});
+				continue;
+			}
 			if (relPath === ".changeset/config.json" && repoName) {
 				const changesetJson = await fs.readJson(file.path);
 				(0, import_set_value.default)(changesetJson, "changelog.1.repo", repoName);

package/dist/{upgrade-D3k24_vK.cjs → upgrade-BUKca70w.cjs}

@@ -58,6 +58,8 @@ let p_queue = require("p-queue");
 p_queue = __toESM(p_queue);
 let klaw = require("klaw");
 klaw = __toESM(klaw);
+let yaml = require("yaml");
+yaml = __toESM(yaml);
 let node_buffer = require("node:buffer");
 let semver = require("semver");
 
@@ -198,7 +200,7 @@ var GitClient = class {
 
 //#endregion
 //#region ../../node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
-function isPlainObject$1(value) {
+function isPlainObject$2(value) {
 	if (value === null || typeof value !== "object") return false;
 	const prototype = Object.getPrototypeOf(value);
 	if (prototype !== null && prototype !== Object.prototype && Object.getPrototypeOf(prototype) !== null) return false;
@@ -207,7 +209,7 @@ function isPlainObject$1(value) {
 	return true;
 }
 function _defu(baseObject, defaults, namespace = ".", merger) {
-	if (!isPlainObject$1(defaults)) return _defu(baseObject, {}, namespace, merger);
+	if (!isPlainObject$2(defaults)) return _defu(baseObject, {}, namespace, merger);
 	const object = Object.assign({}, defaults);
 	for (const key in baseObject) {
 		if (key === "__proto__" || key === "constructor") continue;
@@ -215,7 +217,7 @@ function _defu(baseObject, defaults, namespace = ".", merger) {
 		if (value === null || value === void 0) continue;
 		if (merger && merger(object, key, value, namespace)) continue;
 		if (Array.isArray(value) && Array.isArray(object[key])) object[key] = [...value, ...object[key]];
-		else if (isPlainObject$1(value) && isPlainObject$1(object[key])) object[key] = _defu(value, object[key], (namespace ? `${namespace}.` : "") + key.toString(), merger);
+		else if (isPlainObject$2(value) && isPlainObject$2(object[key])) object[key] = _defu(value, object[key], (namespace ? `${namespace}.` : "") + key.toString(), merger);
 		else object[key] = value;
 	}
 	return object;
@@ -395,7 +397,7 @@ var require_is_plain_object = /* @__PURE__ */ __commonJSMin(((exports, module) =
 	function isObjectObject(o) {
 		return isObject$1(o) === true && Object.prototype.toString.call(o) === "[object Object]";
 	}
-	module.exports = function isPlainObject$2(o) {
+	module.exports = function isPlainObject$3(o) {
 		var ctor, prot;
 		if (isObjectObject(o) === false) return false;
 		ctor = o.constructor;
@@ -418,7 +420,7 @@ var require_is_plain_object = /* @__PURE__ */ __commonJSMin(((exports, module) =
 var require_set_value = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { deleteProperty } = Reflect;
 	const isPrimitive = require_is_primitive();
-	const isPlainObject = require_is_plain_object();
+	const isPlainObject$1 = require_is_plain_object();
 	const isObject = (value) => {
 		return typeof value === "object" && value !== null || typeof value === "function";
 	};
@@ -487,7 +489,7 @@ var require_set_value = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		if (value === void 0) deleteProperty(obj, prop);
 		else if (options && options.merge) {
 			const merge = options.merge === "function" ? options.merge : Object.assign;
-			if (merge && isPlainObject(obj[prop]) && isPlainObject(value)) obj[prop] = merge(obj[prop], value);
+			if (merge && isPlainObject$1(obj[prop]) && isPlainObject$1(value)) obj[prop] = merge(obj[prop], value);
 			else obj[prop] = value;
 		} else obj[prop] = value;
 		return obj;
@@ -615,7 +617,7 @@ async function cleanProjects(cwd, overrides) {
 //#endregion
 //#region package.json
 var name = "@icebreakers/monorepo";
-var version = "3.1.1";
+var version = "3.1.2";
 
 //#endregion
 //#region src/constants.ts
@@ -1268,6 +1270,47 @@ function getAssetTargets(core) {
 	return list;
 }
 
+//#endregion
+//#region src/commands/upgrade/workspace.ts
+function isPlainObject(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function normalizeWorkspaceManifest(manifest) {
+	if (isPlainObject(manifest)) return { ...manifest };
+	return {};
+}
+function mergeUniqueArray(target, source) {
+	const result = [...target];
+	for (const item of source) if (!result.includes(item)) result.push(item);
+	return result;
+}
+/**
+* Merge pnpm workspace manifests by filling missing fields only.
+* Existing values take precedence; arrays are deduped while keeping target order.
+*/
+function mergeWorkspaceManifest(source, target) {
+	const normalizedSource = normalizeWorkspaceManifest(source);
+	const normalizedTarget = normalizeWorkspaceManifest(target);
+	const result = { ...normalizedTarget };
+	for (const [key, value] of Object.entries(normalizedSource)) {
+		const current = normalizedTarget[key];
+		if (current === void 0) {
+			result[key] = value;
+			continue;
+		}
+		if (Array.isArray(current) && Array.isArray(value)) {
+			result[key] = mergeUniqueArray(current, value);
+			continue;
+		}
+		if (isPlainObject(current) && isPlainObject(value)) {
+			result[key] = mergeWorkspaceManifest(value, current);
+			continue;
+		}
+		result[key] = current;
+	}
+	return result;
+}
+
 //#endregion
 //#region src/commands/upgrade/index.ts
 var import_set_value = /* @__PURE__ */ __toESM(require_set_value(), 1);
@@ -1338,6 +1381,28 @@ async function upgradeMonorepo(opts) {
 				});
 				continue;
 			}
+			if (relPath === "pnpm-workspace.yaml") {
+				const sourceManifest = normalizeWorkspaceManifest(yaml.default.parse(await fs_extra.default.readFile(file.path, "utf8")));
+				const exists = await fs_extra.default.pathExists(targetPath);
+				const targetManifest = exists ? normalizeWorkspaceManifest(yaml.default.parse(await fs_extra.default.readFile(targetPath, "utf8"))) : normalizeWorkspaceManifest({});
+				const mergedManifest = exists ? mergeWorkspaceManifest(sourceManifest, targetManifest) : sourceManifest;
+				const data = yaml.default.stringify(mergedManifest);
+				const intent$1 = await evaluateWriteIntent(targetPath, {
+					skipOverwrite,
+					source: data
+				});
+				const action$1 = async () => {
+					await fs_extra.default.outputFile(targetPath, data, "utf8");
+					logger.success(targetPath);
+				};
+				await scheduleOverwrite(intent$1, {
+					relPath,
+					targetPath,
+					action: action$1,
+					pending: pendingOverwrites
+				});
+				continue;
+			}
 			if (relPath === ".changeset/config.json" && repoName) {
 				const changesetJson = await fs_extra.default.readJson(file.path);
 				(0, import_set_value.default)(changesetJson, "changelog.1.repo", repoName);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@icebreakers/monorepo",
   "type": "module",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "The icebreaker's monorepo manager",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -79,7 +79,8 @@
     "pathe": "^2.0.3",
     "picocolors": "^1.1.1",
     "semver": "^7.7.3",
-    "simple-git": "^3.30.0"
+    "simple-git": "^3.30.0",
+    "yaml": "^2.8.2"
   },
   "devDependencies": {
     "@types/klaw": "^3.0.7",

package/templates/apps/client/package.json

@@ -44,7 +44,7 @@
     "vite": "^7.2.6",
     "vite-plugin-vue-devtools": "^8.0.5",
     "vite-tsconfig-paths": "^5.1.4",
-    "vue-tsc": "3.1.5",
+    "vue-tsc": "3.1.6",
     "wrangler": "^4.53.0",
     "zod": "^4.1.13"
   }

package/templates/packages/vue-lib-template/package.json

@@ -56,6 +56,6 @@
     "vite-plugin-dts": "^4.5.4",
     "vue": "^3.5.25",
     "vue-router": "^4.6.3",
-    "vue-tsc": "^3.1.5"
+    "vue-tsc": "^3.1.6"
   }
 }