@icebreakers/monorepo 0.6.2 → 0.6.4

package/assets/package.json

@@ -38,7 +38,7 @@
     "@commitlint/config-conventional": "^19.5.0",
     "@commitlint/prompt-cli": "^19.5.0",
     "@commitlint/types": "^19.5.0",
-    "@icebreakers/eslint-config": "^0.5.4",
+    "@icebreakers/eslint-config": "^0.6.0",
     "@icebreakers/monorepo": "workspace:*",
     "@icebreakers/stylelint-config": "^0.1.1",
     "@types/fs-extra": "^11.0.4",
@@ -61,13 +61,13 @@
     "micromatch": "^4.0.8",
     "only-allow": "^1.2.1",
     "pathe": "^1.1.2",
-    "pkg-types": "^1.2.0",
+    "pkg-types": "^1.2.1",
     "rimraf": "^6.0.1",
     "tslib": "^2.7.0",
     "tsup": "^8.3.0",
     "tsx": "^4.19.1",
     "turbo": "^2.1.3",
-    "typescript": "^5.6.2",
+    "typescript": "^5.6.3",
     "unbuild": "^2.0.0",
     "vitest": "~2.0.5",
     "yaml": "^2.5.1"

package/dist/{chunk-UFDFNNMJ.js → chunk-UU4G2QIU.js}

@@ -13,7 +13,7 @@ import set from "set-value";
 
 // package.json
 var name = "@icebreakers/monorepo";
-var version = "0.6.2";
+var version = "0.6.4";
 
 // src/logger.ts
 import { createConsola } from "consola";
@@ -149,19 +149,31 @@ var __dirname2 = path.dirname(__filename2);
 var assetsDir = path.join(__dirname2, "../assets");
 var templatesDir = path.join(__dirname2, "../templates");
 var cwd = process.cwd();
+function isWorkspace(version2) {
+  if (typeof version2 === "string") {
+    return version2.startsWith("workspace:");
+  }
+  return false;
+}
 function setPkgJson(sourcePkgJson, targetPkgJson) {
   const packageManager = get2(sourcePkgJson, "packageManager", { default: "" });
   const deps = get2(sourcePkgJson, "dependencies", { default: {} });
   const devDeps = get2(sourcePkgJson, "devDependencies", { default: {} });
+  const targetDeps = get2(targetPkgJson, "dependencies", { default: {} });
+  const targetDevDeps = get2(targetPkgJson, "devDependencies", { default: {} });
   set(targetPkgJson, "packageManager", packageManager);
   Object.entries(deps).forEach((x) => {
-    set(targetPkgJson, `dependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+    if (!isWorkspace(targetDeps[x[0]])) {
+      set(targetPkgJson, `dependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+    }
   });
   Object.entries(devDeps).forEach((x) => {
-    if (x[0] === "@icebreakers/monorepo") {
+    if (x[0] === name) {
       set(targetPkgJson, `devDependencies.${x[0].replaceAll(".", "\\.")}`, `^${version}`, { preservePaths: false });
     } else {
-      set(targetPkgJson, `devDependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+      if (!isWorkspace(targetDevDeps[x[0]])) {
+        set(targetPkgJson, `devDependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+      }
     }
   });
   for (const [k, v] of scriptsEntries) {

package/dist/cli.cjs

@@ -22,7 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.3.0_jiti@2.3.1_postcss@8.4.47_tsx@4.19.1_typescript@5.6.2_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.0_jiti@2.3.1_postcss@8.4.47_tsx@4.19.1_typescript@5.6.3_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
@@ -32,7 +32,7 @@ var import_commander = require("commander");
 
 // package.json
 var name = "@icebreakers/monorepo";
-var version = "0.6.2";
+var version = "0.6.4";
 
 // src/lib.ts
 var import_node_process = __toESM(require("process"), 1);
@@ -181,19 +181,31 @@ var __dirname = import_pathe.default.dirname(__filename2);
 var assetsDir = import_pathe.default.join(__dirname, "../assets");
 var templatesDir = import_pathe.default.join(__dirname, "../templates");
 var cwd = import_node_process.default.cwd();
+function isWorkspace(version2) {
+  if (typeof version2 === "string") {
+    return version2.startsWith("workspace:");
+  }
+  return false;
+}
 function setPkgJson(sourcePkgJson, targetPkgJson) {
   const packageManager = (0, import_get_value2.default)(sourcePkgJson, "packageManager", { default: "" });
   const deps = (0, import_get_value2.default)(sourcePkgJson, "dependencies", { default: {} });
   const devDeps = (0, import_get_value2.default)(sourcePkgJson, "devDependencies", { default: {} });
+  const targetDeps = (0, import_get_value2.default)(targetPkgJson, "dependencies", { default: {} });
+  const targetDevDeps = (0, import_get_value2.default)(targetPkgJson, "devDependencies", { default: {} });
   (0, import_set_value.default)(targetPkgJson, "packageManager", packageManager);
   Object.entries(deps).forEach((x) => {
-    (0, import_set_value.default)(targetPkgJson, `dependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+    if (!isWorkspace(targetDeps[x[0]])) {
+      (0, import_set_value.default)(targetPkgJson, `dependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+    }
   });
   Object.entries(devDeps).forEach((x) => {
-    if (x[0] === "@icebreakers/monorepo") {
+    if (x[0] === name) {
       (0, import_set_value.default)(targetPkgJson, `devDependencies.${x[0].replaceAll(".", "\\.")}`, `^${version}`, { preservePaths: false });
     } else {
-      (0, import_set_value.default)(targetPkgJson, `devDependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+      if (!isWorkspace(targetDevDeps[x[0]])) {
+        (0, import_set_value.default)(targetPkgJson, `devDependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+      }
     }
   });
   for (const [k, v] of scriptsEntries) {
@@ -364,22 +376,106 @@ async function cleanProjects(cwd3) {
 // src/monorepo/context.ts
 var import_pathe5 = __toESM(require("pathe"), 1);
 
-// src/monorepo/utils.ts
+// src/monorepo/workspace.ts
 var import_workspace = require("@pnpm/workspace.find-packages");
+
+// ../../node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
+function isPlainObject(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;
+  }
+  if (Symbol.iterator in value) {
+    return false;
+  }
+  if (Symbol.toStringTag in value) {
+    return Object.prototype.toString.call(value) === "[object Module]";
+  }
+  return true;
+}
+function _defu(baseObject, defaults, namespace = ".", merger) {
+  if (!isPlainObject(defaults)) {
+    return _defu(baseObject, {}, namespace, merger);
+  }
+  const object = Object.assign({}, defaults);
+  for (const key in baseObject) {
+    if (key === "__proto__" || key === "constructor") {
+      continue;
+    }
+    const value = baseObject[key];
+    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(value) && isPlainObject(object[key])) {
+      object[key] = _defu(
+        value,
+        object[key],
+        (namespace ? `${namespace}.` : "") + key.toString(),
+        merger
+      );
+    } else {
+      object[key] = value;
+    }
+  }
+  return object;
+}
+function createDefu(merger) {
+  return (...arguments_) => (
+    // eslint-disable-next-line unicorn/no-array-reduce
+    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
+  );
+}
+var defu = createDefu();
+var defuFn = createDefu((object, key, currentValue) => {
+  if (object[key] !== void 0 && typeof currentValue === "function") {
+    object[key] = currentValue(object[key]);
+    return true;
+  }
+});
+var defuArrayFn = createDefu((object, key, currentValue) => {
+  if (Array.isArray(object[key]) && typeof currentValue === "function") {
+    object[key] = currentValue(object[key]);
+    return true;
+  }
+});
+
+// src/monorepo/workspace.ts
 var import_pathe4 = __toESM(require("pathe"), 1);
-async function getWorkspacePackages(cwd3) {
+async function getWorkspacePackages(cwd3, options) {
+  const posixCwd = import_pathe4.default.normalize(cwd3);
+  const { ignoreRootPackage, ignorePrivatePackage } = defu(options, {
+    ignoreRootPackage: true,
+    ignorePrivatePackage: true
+  });
   const packages = await (0, import_workspace.findWorkspacePackages)(cwd3);
-  return (await Promise.allSettled(packages.map(async (project) => {
+  let pkgs = packages.filter((x) => {
+    if (ignorePrivatePackage && x.manifest.private) {
+      return false;
+    }
+    return true;
+  }).map((project) => {
     const pkgJsonPath = import_pathe4.default.resolve(project.rootDir, "package.json");
     return {
       ...project,
       pkgJsonPath
     };
-  }))).filter((x) => {
-    return x.status === "fulfilled";
-  }).map((x) => {
-    return x.value;
   });
+  if (ignoreRootPackage) {
+    pkgs = pkgs.filter((x) => {
+      return import_pathe4.default.normalize(
+        x.rootDir
+      ) !== posixCwd;
+    });
+  }
+  return pkgs;
 }
 
 // src/monorepo/context.ts
@@ -481,6 +577,7 @@ async function init(cwd3) {
 var import_execa = require("execa");
 async function syncNpmMirror(cwd3) {
   const packages = await getWorkspacePackages(cwd3);
+  logger.info("[\u5373\u5C06\u540C\u6B65\u7684\u5305]:", packages.filter((x) => x.manifest.name).map((x) => x.manifest.name));
   for (const project of packages) {
     if (project.manifest.name) {
       await (0, import_execa.execa)({

package/dist/cli.js

@@ -5,7 +5,7 @@ import {
   name,
   upgradeMonorepo,
   version
-} from "./chunk-UFDFNNMJ.js";
+} from "./chunk-UU4G2QIU.js";
 
 // src/program.ts
 import process from "node:process";
@@ -87,22 +87,106 @@ async function cleanProjects(cwd2) {
 // src/monorepo/context.ts
 import path4 from "pathe";
 
-// src/monorepo/utils.ts
+// src/monorepo/workspace.ts
 import { findWorkspacePackages } from "@pnpm/workspace.find-packages";
+
+// ../../node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
+function isPlainObject(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;
+  }
+  if (Symbol.iterator in value) {
+    return false;
+  }
+  if (Symbol.toStringTag in value) {
+    return Object.prototype.toString.call(value) === "[object Module]";
+  }
+  return true;
+}
+function _defu(baseObject, defaults, namespace = ".", merger) {
+  if (!isPlainObject(defaults)) {
+    return _defu(baseObject, {}, namespace, merger);
+  }
+  const object = Object.assign({}, defaults);
+  for (const key in baseObject) {
+    if (key === "__proto__" || key === "constructor") {
+      continue;
+    }
+    const value = baseObject[key];
+    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(value) && isPlainObject(object[key])) {
+      object[key] = _defu(
+        value,
+        object[key],
+        (namespace ? `${namespace}.` : "") + key.toString(),
+        merger
+      );
+    } else {
+      object[key] = value;
+    }
+  }
+  return object;
+}
+function createDefu(merger) {
+  return (...arguments_) => (
+    // eslint-disable-next-line unicorn/no-array-reduce
+    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
+  );
+}
+var defu = createDefu();
+var defuFn = createDefu((object, key, currentValue) => {
+  if (object[key] !== void 0 && typeof currentValue === "function") {
+    object[key] = currentValue(object[key]);
+    return true;
+  }
+});
+var defuArrayFn = createDefu((object, key, currentValue) => {
+  if (Array.isArray(object[key]) && typeof currentValue === "function") {
+    object[key] = currentValue(object[key]);
+    return true;
+  }
+});
+
+// src/monorepo/workspace.ts
 import path3 from "pathe";
-async function getWorkspacePackages(cwd2) {
+async function getWorkspacePackages(cwd2, options) {
+  const posixCwd = path3.normalize(cwd2);
+  const { ignoreRootPackage, ignorePrivatePackage } = defu(options, {
+    ignoreRootPackage: true,
+    ignorePrivatePackage: true
+  });
   const packages = await findWorkspacePackages(cwd2);
-  return (await Promise.allSettled(packages.map(async (project) => {
+  let pkgs = packages.filter((x) => {
+    if (ignorePrivatePackage && x.manifest.private) {
+      return false;
+    }
+    return true;
+  }).map((project) => {
     const pkgJsonPath = path3.resolve(project.rootDir, "package.json");
     return {
       ...project,
       pkgJsonPath
     };
-  }))).filter((x) => {
-    return x.status === "fulfilled";
-  }).map((x) => {
-    return x.value;
   });
+  if (ignoreRootPackage) {
+    pkgs = pkgs.filter((x) => {
+      return path3.normalize(
+        x.rootDir
+      ) !== posixCwd;
+    });
+  }
+  return pkgs;
 }
 
 // src/monorepo/context.ts
@@ -204,6 +288,7 @@ async function init(cwd2) {
 import { execa } from "execa";
 async function syncNpmMirror(cwd2) {
   const packages = await getWorkspacePackages(cwd2);
+  logger.info("[\u5373\u5C06\u540C\u6B65\u7684\u5305]:", packages.filter((x) => x.manifest.name).map((x) => x.manifest.name));
   for (const project of packages) {
     if (project.manifest.name) {
       await execa({

package/dist/index.cjs

@@ -36,7 +36,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
-// ../../node_modules/.pnpm/tsup@8.3.0_jiti@2.3.1_postcss@8.4.47_tsx@4.19.1_typescript@5.6.2_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.0_jiti@2.3.1_postcss@8.4.47_tsx@4.19.1_typescript@5.6.3_yaml@2.5.1/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
@@ -54,7 +54,8 @@ var import_picocolors = __toESM(require("picocolors"), 1);
 var import_set_value = __toESM(require("set-value"), 1);
 
 // package.json
-var version = "0.6.2";
+var name = "@icebreakers/monorepo";
+var version = "0.6.4";
 
 // src/logger.ts
 var import_consola = require("consola");
@@ -190,19 +191,31 @@ var __dirname = import_pathe.default.dirname(__filename2);
 var assetsDir = import_pathe.default.join(__dirname, "../assets");
 var templatesDir = import_pathe.default.join(__dirname, "../templates");
 var cwd = import_node_process.default.cwd();
+function isWorkspace(version2) {
+  if (typeof version2 === "string") {
+    return version2.startsWith("workspace:");
+  }
+  return false;
+}
 function setPkgJson(sourcePkgJson, targetPkgJson) {
   const packageManager = (0, import_get_value2.default)(sourcePkgJson, "packageManager", { default: "" });
   const deps = (0, import_get_value2.default)(sourcePkgJson, "dependencies", { default: {} });
   const devDeps = (0, import_get_value2.default)(sourcePkgJson, "devDependencies", { default: {} });
+  const targetDeps = (0, import_get_value2.default)(targetPkgJson, "dependencies", { default: {} });
+  const targetDevDeps = (0, import_get_value2.default)(targetPkgJson, "devDependencies", { default: {} });
   (0, import_set_value.default)(targetPkgJson, "packageManager", packageManager);
   Object.entries(deps).forEach((x) => {
-    (0, import_set_value.default)(targetPkgJson, `dependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+    if (!isWorkspace(targetDeps[x[0]])) {
+      (0, import_set_value.default)(targetPkgJson, `dependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+    }
   });
   Object.entries(devDeps).forEach((x) => {
-    if (x[0] === "@icebreakers/monorepo") {
+    if (x[0] === name) {
       (0, import_set_value.default)(targetPkgJson, `devDependencies.${x[0].replaceAll(".", "\\.")}`, `^${version}`, { preservePaths: false });
     } else {
-      (0, import_set_value.default)(targetPkgJson, `devDependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+      if (!isWorkspace(targetDevDeps[x[0]])) {
+        (0, import_set_value.default)(targetPkgJson, `devDependencies.${x[0].replaceAll(".", "\\.")}`, x[1], { preservePaths: false });
+      }
     }
   });
   for (const [k, v] of scriptsEntries) {

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   createNewProject,
   setPkgJson,
   upgradeMonorepo
-} from "./chunk-UFDFNNMJ.js";
+} from "./chunk-UU4G2QIU.js";
 export {
   createNewProject,
   setPkgJson,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@icebreakers/monorepo",
   "type": "module",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "icebreaker's monorepo config generator",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",