@icebreakers/monorepo 0.6.21 → 0.6.22

package/assets/package.json

@@ -38,7 +38,7 @@
     "@commitlint/config-conventional": "^19.6.0",
     "@commitlint/prompt-cli": "^19.7.0",
     "@commitlint/types": "^19.5.0",
-    "@icebreakers/eslint-config": "^0.7.8",
+    "@icebreakers/eslint-config": "^0.7.10",
     "@icebreakers/monorepo": "workspace:*",
     "@icebreakers/stylelint-config": "^0.1.3",
     "@types/fs-extra": "^11.0.4",
@@ -73,7 +73,7 @@
     "tsup": "^8.3.5",
     "tsx": "^4.19.2",
     "turbo": "^2.3.3",
-    "typescript": "^5.7.2",
+    "typescript": "^5.7.3",
     "unbuild": "^3.2.0",
     "vitest": "~2.1.8",
     "yaml": "^2.7.0"

package/dist/{chunk-54PKU7G6.js → chunk-QU6W43GW.js}

@@ -27,9 +27,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.2_yaml@2.7.0/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/esm_shims.js
 var init_esm_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.2_yaml@2.7.0/node_modules/tsup/assets/esm_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/esm_shims.js"() {
     "use strict";
   }
 });
@@ -741,7 +741,7 @@ init_esm_shims();
 
 // package.json
 var name = "@icebreakers/monorepo";
-var version = "0.6.21";
+var version = "0.6.22";
 
 // src/scripts.ts
 init_esm_shims();

package/dist/cli.cjs

@@ -28,10 +28,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.2_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl, importMetaUrl;
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.2_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js"() {
     "use strict";
     getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
     importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
@@ -320,7 +320,7 @@ init_cjs_shims();
 
 // package.json
 var name = "@icebreakers/monorepo";
-var version = "0.6.21";
+var version = "0.6.22";
 
 // src/create.ts
 init_cjs_shims();
@@ -399,6 +399,7 @@ var defuArrayFn = createDefu((object, key, currentValue) => {
 // src/create.ts
 var import_fs_extra = __toESM(require("fs-extra"), 1);
 var import_pathe = __toESM(require("pathe"), 1);
+var import_picocolors = __toESM(require("picocolors"), 1);
 var import_set_value = __toESM(require_set_value(), 1);
 
 // src/logger.ts
@@ -410,29 +411,33 @@ var logger = (0, import_consola.createConsola)();
 var __filename2 = (0, import_node_url.fileURLToPath)(importMetaUrl);
 var __dirname = import_pathe.default.dirname(__filename2);
 var templatesDir = import_pathe.default.join(__dirname, "../templates");
+var defaultTemplate = "tsup";
+var fromMap = {
+  tsup: "bar",
+  unbuild: "foo"
+};
 async function createNewProject(options) {
-  const defaultTemplate = "bar";
-  const { name: name2, renameJson, cwd: cwd2 } = defu(options, {
+  const { name: targetName, renameJson, cwd: cwd2, type } = defu(options, {
     cwd: import_node_process.default.cwd(),
-    name: defaultTemplate,
+    name: fromMap[defaultTemplate],
     renameJson: false
   });
-  const targetTemplate = name2;
-  const from = import_pathe.default.join(templatesDir, defaultTemplate);
-  const to = import_pathe.default.join(cwd2, targetTemplate);
+  const bundlerName = type ?? defaultTemplate;
+  const from = import_pathe.default.join(templatesDir, fromMap[bundlerName]);
+  const to = import_pathe.default.join(cwd2, targetName);
   const filelist = await import_fs_extra.default.readdir(from);
   for (const filename of filelist) {
     if (filename === "package.json") {
       const sourceJsonPath = import_pathe.default.resolve(from, filename);
       const sourceJson = await import_fs_extra.default.readJson(sourceJsonPath);
       (0, import_set_value.default)(sourceJson, "version", "0.0.0");
-      (0, import_set_value.default)(sourceJson, "name", import_pathe.default.basename(targetTemplate));
+      (0, import_set_value.default)(sourceJson, "name", import_pathe.default.basename(targetName));
       await import_fs_extra.default.outputJson(import_pathe.default.resolve(to, renameJson ? "package.mock.json" : filename), sourceJson, { spaces: 2 });
     } else {
       await import_fs_extra.default.copy(import_pathe.default.resolve(from, filename), import_pathe.default.resolve(to, filename));
     }
   }
-  logger.success(`${targetTemplate} \u9879\u76EE\u521B\u5EFA\u6210\u529F\uFF01`);
+  logger.success(`${import_picocolors.default.bgGreenBright(import_picocolors.default.white(`[${bundlerName}]`))} ${targetName} \u9879\u76EE\u521B\u5EFA\u6210\u529F\uFF01`);
 }
 
 // src/monorepo/index.ts
@@ -722,15 +727,15 @@ var import_node_os = __toESM(require("os"), 1);
 var import_execa = require("execa");
 var import_p_queue = __toESM(require("p-queue"), 1);
 var import_pathe8 = __toESM(require("pathe"), 1);
-var import_picocolors = __toESM(require("picocolors"), 1);
+var import_picocolors2 = __toESM(require("picocolors"), 1);
 async function syncNpmMirror(cwd2) {
   const packages = await getWorkspacePackages(cwd2);
   logger.info(`[\u5F53\u524D\u5DE5\u4F5C\u533ARepo]:
-${packages.map((x) => `- ${import_picocolors.default.green(x.manifest.name)} : ${import_pathe8.default.relative(cwd2, x.rootDir)}`).join("\n")}
+${packages.map((x) => `- ${import_picocolors2.default.green(x.manifest.name)} : ${import_pathe8.default.relative(cwd2, x.rootDir)}`).join("\n")}
 `);
   const set6 = new Set(packages.map((x) => x.manifest.name));
   logger.info(`[\u5373\u5C06\u540C\u6B65\u7684\u5305]:
-${Array.from(set6).map((x) => `- ${import_picocolors.default.green(x)}`).join("\n")}
+${Array.from(set6).map((x) => `- ${import_picocolors2.default.green(x)}`).join("\n")}
 `);
   const concurrency = Math.max(import_node_os.default.cpus().length, 1);
   const queue2 = new import_p_queue.default({ concurrency });
@@ -756,7 +761,7 @@ var import_get_value2 = __toESM(require_get_value(), 1);
 var import_klaw = __toESM(require("klaw"), 1);
 var import_p_queue2 = __toESM(require("p-queue"), 1);
 var import_pathe9 = __toESM(require("pathe"), 1);
-var import_picocolors2 = __toESM(require("picocolors"), 1);
+var import_picocolors3 = __toESM(require("picocolors"), 1);
 var import_set_value5 = __toESM(require_set_value(), 1);
 
 // src/scripts.ts
@@ -872,7 +877,7 @@ function setPkgJson(sourcePkgJson, targetPkgJson) {
   }
 }
 function confirmOverwrite(filename) {
-  return (0, import_confirm.default)({ message: `${import_picocolors2.default.greenBright(filename)} \u6587\u4EF6\u5185\u5BB9\u53D1\u751F\u6539\u53D8,\u662F\u5426\u8986\u76D6?`, default: false });
+  return (0, import_confirm.default)({ message: `${import_picocolors3.default.greenBright(filename)} \u6587\u4EF6\u5185\u5BB9\u53D1\u751F\u6539\u53D8,\u662F\u5426\u8986\u76D6?`, default: false });
 }
 async function upgradeMonorepo(opts) {
   const { outDir, raw, interactive, cwd: cwd2 } = defu(opts, {
@@ -977,10 +982,12 @@ import_commander.program.command("mirror").description("\u8BBE\u7F6E VscodeBinar
   await setVscodeBinaryMirror(cwd);
   logger.success("set vscode binary mirror finished!");
 });
-import_commander.program.command("new").description("\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u5B50\u5305").alias("create").argument("[name]").action(async (name2) => {
+import_commander.program.command("new").description("\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u5B50\u5305").alias("create").argument("[name]").option("--tsup").option("--unbuild").action(async (name2, options) => {
+  const type = options.tsup ? "tsup" : options.unbuild ? "unbuild" : void 0;
   await createNewProject({
     name: name2,
-    cwd
+    cwd,
+    type
   });
   logger.success("create a package");
 });

package/dist/cli.js

@@ -11,7 +11,7 @@ import {
   syncNpmMirror,
   upgradeMonorepo,
   version
-} from "./chunk-54PKU7G6.js";
+} from "./chunk-QU6W43GW.js";
 
 // src/cli.ts
 init_esm_shims();
@@ -28,32 +28,37 @@ import { fileURLToPath } from "node:url";
 var import_set_value = __toESM(require_set_value(), 1);
 import fs from "fs-extra";
 import path from "pathe";
+import pc from "picocolors";
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
 var templatesDir = path.join(__dirname, "../templates");
+var defaultTemplate = "tsup";
+var fromMap = {
+  tsup: "bar",
+  unbuild: "foo"
+};
 async function createNewProject(options) {
-  const defaultTemplate = "bar";
-  const { name: name2, renameJson, cwd: cwd2 } = defu(options, {
+  const { name: targetName, renameJson, cwd: cwd2, type } = defu(options, {
     cwd: process.cwd(),
-    name: defaultTemplate,
+    name: fromMap[defaultTemplate],
     renameJson: false
   });
-  const targetTemplate = name2;
-  const from = path.join(templatesDir, defaultTemplate);
-  const to = path.join(cwd2, targetTemplate);
+  const bundlerName = type ?? defaultTemplate;
+  const from = path.join(templatesDir, fromMap[bundlerName]);
+  const to = path.join(cwd2, targetName);
   const filelist = await fs.readdir(from);
   for (const filename of filelist) {
     if (filename === "package.json") {
       const sourceJsonPath = path.resolve(from, filename);
       const sourceJson = await fs.readJson(sourceJsonPath);
       (0, import_set_value.default)(sourceJson, "version", "0.0.0");
-      (0, import_set_value.default)(sourceJson, "name", path.basename(targetTemplate));
+      (0, import_set_value.default)(sourceJson, "name", path.basename(targetName));
       await fs.outputJson(path.resolve(to, renameJson ? "package.mock.json" : filename), sourceJson, { spaces: 2 });
     } else {
       await fs.copy(path.resolve(from, filename), path.resolve(to, filename));
     }
   }
-  logger.success(`${targetTemplate} \u9879\u76EE\u521B\u5EFA\u6210\u529F\uFF01`);
+  logger.success(`${pc.bgGreenBright(pc.white(`[${bundlerName}]`))} ${targetName} \u9879\u76EE\u521B\u5EFA\u6210\u529F\uFF01`);
 }
 
 // src/program.ts
@@ -79,10 +84,12 @@ program.command("mirror").description("\u8BBE\u7F6E VscodeBinaryMirror").action(
   await setVscodeBinaryMirror(cwd);
   logger.success("set vscode binary mirror finished!");
 });
-program.command("new").description("\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u5B50\u5305").alias("create").argument("[name]").action(async (name2) => {
+program.command("new").description("\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u5B50\u5305").alias("create").argument("[name]").option("--tsup").option("--unbuild").action(async (name2, options) => {
+  const type = options.tsup ? "tsup" : options.unbuild ? "unbuild" : void 0;
   await createNewProject({
     name: name2,
-    cwd
+    cwd,
+    type
   });
   logger.success("create a package");
 });

package/dist/index.cjs

@@ -33,10 +33,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.2_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl, importMetaUrl;
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.2_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.5_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js"() {
     "use strict";
     getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
     importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
@@ -738,7 +738,7 @@ init_cjs_shims();
 
 // package.json
 var name = "@icebreakers/monorepo";
-var version = "0.6.21";
+var version = "0.6.22";
 
 // src/scripts.ts
 init_cjs_shims();

package/dist/index.js

@@ -12,7 +12,7 @@ import {
   setVscodeBinaryMirror,
   syncNpmMirror,
   upgradeMonorepo
-} from "./chunk-54PKU7G6.js";
+} from "./chunk-QU6W43GW.js";
 
 // src/index.ts
 init_esm_shims();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@icebreakers/monorepo",
   "type": "module",
-  "version": "0.6.21",
+  "version": "0.6.22",
   "description": "icebreaker's monorepo config generator",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -37,8 +37,8 @@
     "@inquirer/checkbox": "^4.0.4",
     "@inquirer/confirm": "^5.1.1",
     "@pnpm/logger": "^1000.0.0",
-    "@pnpm/types": "^1000.0.0",
-    "@pnpm/workspace.find-packages": "^1000.0.3",
+    "@pnpm/types": "^1000.1.0",
+    "@pnpm/workspace.find-packages": "^1000.0.5",
     "commander": "^13.0.0",
     "comment-json": "^4.2.5",
     "consola": "^3.3.3",

package/templates/foo/build.config.ts

@@ -0,0 +1,25 @@
+import path from 'node:path'
+import { defineBuildConfig } from 'unbuild'
+
+export default defineBuildConfig({
+  // entries: ['./src/index', './src/cli'],
+  entries: ['./src/index'],
+  rollup: {
+    // 内联，相当于 nodeResolve
+    inlineDependencies: true,
+    // cjs
+    emitCJS: true,
+    // 添加 cjs 注入
+    cjsBridge: true,
+    dts: {
+      // https://github.com/unjs/unbuild/issues/135
+      respectExternal: false,
+    },
+  },
+  alias: {
+    // 别名
+    '@': path.resolve(__dirname, './src'),
+  },
+  // dts
+  declaration: true,
+})

package/templates/foo/package.json

@@ -0,0 +1,45 @@
+{
+  "name": "@icebreakers/foo",
+  "type": "module",
+  "version": "0.1.2",
+  "description": "esbuild(rollup) build package template",
+  "author": "ice breaker <1324318532@qq.com>",
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sonofmagic/monorepo-template.git",
+    "directory": "packages/foo"
+  },
+  "bugs": {
+    "url": "https://github.com/sonofmagic/monorepo-template/issues"
+  },
+  "keywords": [],
+  "sideEffects": false,
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "dev": "unbuild --watch --sourcemap",
+    "build": "unbuild",
+    "test": "vitest run",
+    "test:dev": "vitest",
+    "release": "pnpm publish",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
+  },
+  "publishConfig": {
+    "exports": {
+      ".": {
+        "types": "./dist/index.d.ts",
+        "import": "./dist/index.mjs",
+        "require": "./dist/index.cjs"
+      }
+    },
+    "main": "./dist/index.cjs",
+    "module": "./dist/index.mjs",
+    "types": "./dist/index.d.ts"
+  }
+}

package/templates/foo/src/index.ts

@@ -0,0 +1,7 @@
+export function foo() {
+  return 'bar'
+}
+
+export function getDirname() {
+  return __dirname
+}

package/templates/foo/test/index.test.ts

@@ -0,0 +1,7 @@
+import { foo } from '@/index'
+
+describe('index', () => {
+  it('foo bar', () => {
+    expect(foo()).toBe('bar')
+  })
+})

package/templates/foo/tsconfig.json

@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": [
+        "src/*"
+      ]
+    }
+  },
+  "include": [
+    "src",
+    "test"
+  ]
+}

package/templates/foo/vitest.config.ts

@@ -0,0 +1,15 @@
+import path from 'node:path'
+import { defineProject } from 'vitest/config'
+
+export default defineProject({
+  test: {
+    alias: [
+      {
+        find: '@',
+        replacement: path.resolve(__dirname, './src'),
+      },
+    ],
+    globals: true,
+    testTimeout: 60_000,
+  },
+})