cmyr-template-cli 1.40.0 → 1.41.0

package/dist/index.js

@@ -23,10 +23,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/index.ts
+var import_path = __toESM(require("path"));
 var import_plop = require("plop");
 var import_commander = require("commander");
 var import_minimist = __toESM(require("minimist"));
-var import_path = __toESM(require("path"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var program = new import_commander.Command("ct").description("草梅项目创建器");
 var pkg = import_fs_extra.default.readJSONSync(import_path.default.join(__dirname, "../package.json"));

package/dist/plopfile.js

@@ -22,22 +22,26 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
+// src/plopfile.ts
+var import_path3 = __toESM(require("path"));
+var import_fs_extra4 = __toESM(require("fs-extra"));
+
 // src/config/env.ts
 var env = process.env;
 var __DEV__ = env.NODE_ENV === "development";
 var PACKAGE_MANAGER = "pnpm";
 
 // src/utils/utils.ts
-var import_fs_extra3 = __toESM(require("fs-extra"));
 var import_path2 = __toESM(require("path"));
-var import_ora2 = __toESM(require("ora"));
-var import_download_git_repo = __toESM(require("download-git-repo"));
 var import_child_process = require("child_process");
+var import_os = __toESM(require("os"));
 var import_colors = __toESM(require("@colors/colors"));
 var import_ejs2 = __toESM(require("ejs"));
 var import_lodash = require("lodash");
 var import_json5 = __toESM(require("json5"));
-var import_os = __toESM(require("os"));
+var import_download_git_repo = __toESM(require("download-git-repo"));
+var import_ora2 = __toESM(require("ora"));
+var import_fs_extra3 = __toESM(require("fs-extra"));
 var import_yaml = __toESM(require("yaml"));
 var import_acorn = __toESM(require("acorn"));
 var import_acorn_walk = __toESM(require("acorn-walk"));
@@ -51,17 +55,38 @@ var NODEJS_URLS = [
 var NODE_INDEX_URL = "https://cdn.npmmirror.com/binaries/node/index.json";
 var REMOTES = [
   "https://github.com",
-  "https://hub.fastgit.xyz",
-  "https://download.fastgit.org",
-  "https://ghproxy.com/https://github.com",
-  "https://gh.ddlc.top/https://github.com",
   "https://gh.flyinbug.top/gh/https://github.com",
   "https://cors.isteed.cc/github.com",
-  "https://ghps.cc/https://github.com",
-  "https://download.nuaa.cf",
   "https://kgithub.com",
-  "https://github.moeyy.xyz/https://github.com",
-  "https://hub.njuu.cf"
+  "https://ghproxy.1888866.xyz/https://github.com",
+  "https://hub.gitmirror.com/https://github.com",
+  "https://ghproxy.cfd/https://github.com",
+  "https://github.boki.moe/https://github.com",
+  "https://gh-proxy.net/https://github.com",
+  "https://gh.monlor.com/https://github.com",
+  "https://fastgit.cc/https://github.com",
+  "https://github.tbedu.top/https://github.com",
+  "https://ghfile.geekertao.top/https://github.com",
+  "https://ghp.keleyaa.com/https://github.com",
+  "https://ghpxy.hwinzniej.top/https://github.com",
+  "https://cdn.crashmc.com/https://github.com",
+  "https://git.yylx.win/https://github.com",
+  "https://gitproxy.mrhjx.cn/https://github.com",
+  "https://ghproxy.cxkpro.top/https://github.com",
+  "https://gh.xxooo.cf/https://github.com",
+  "https://gh.llkk.cc/https://github.com",
+  "https://raw.ihtw.moe/github.com",
+  "https://dgithub.xyz",
+  "https://gh.nxnow.top/https://github.com",
+  "https://gh.zwy.one/https://github.com",
+  "https://ghproxy.monkeyray.net/https://github.com",
+  "https://ghproxy.net/https://github.com",
+  "https://ghfast.top/https://github.com",
+  "https://wget.la/https://github.com",
+  "https://wget.la/https://github.com",
+  "https://hk.gh-proxy.com/https://github.com",
+  "https://ghfast.top/https://github.com",
+  "https://ghproxy.net/https://github.com"
 ];
 
 // src/utils/dependencies.ts
@@ -446,8 +471,8 @@ async function ejsRender(templatePath, data, outputPath) {
 }
 
 // src/utils/files.ts
-var import_fs_extra2 = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
+var import_fs_extra2 = __toESM(require("fs-extra"));
 var import_ora = __toESM(require("ora"));
 async function copyFilesFromTemplates(projectPath, files, lazy = false) {
   const loading = (0, import_ora.default)(`正在复制文件 ${files.join()} ……`).start();
@@ -728,7 +753,8 @@ async function init(projectPath, answers) {
         }
         await initGithubWorkflows(projectPath, answers);
       }
-      await initConfig(projectPath);
+      await initEditorconfig(projectPath);
+      await initCommitlint(projectPath);
       await initCommitizen(projectPath);
       if (isInitSemanticRelease) {
         await initSemanticRelease(projectPath);
@@ -1019,18 +1045,6 @@ async function initDependabot(projectPath, answers) {
               versions: [">= 21.0.1"]
             });
           }
-          if (pkg?.devDependencies?.["@commitlint/cli"]) {
-            dependencies.push({
-              "dependency-name": "@commitlint/cli",
-              versions: [">= 19.0.0"]
-            });
-          }
-          if (pkg?.devDependencies?.["@commitlint/config-conventional"]) {
-            dependencies.push({
-              "dependency-name": "@commitlint/config-conventional",
-              versions: [">= 19.0.0"]
-            });
-          }
           if (pkg?.dependencies?.["art-template"]) {
             dependencies.push({
               "dependency-name": "art-template",
@@ -1453,12 +1467,35 @@ async function initLicense(projectPath, projectInfos) {
     console.error(error);
   }
 }
-async function initConfig(projectPath) {
+async function initEditorconfig(projectPath) {
+  try {
+    const files = [".editorconfig"];
+    await copyFilesFromTemplates(projectPath, files, true);
+  } catch (error) {
+    console.error(error);
+  }
+}
+async function initCommitlint(projectPath) {
+  const loading = (0, import_ora2.default)("正在初始化 commitlint ……").start();
   try {
+    const pkg = await getProjectJson(projectPath);
+    const devDependencies = {
+      commitlint: "^19.8.1",
+      "commitlint-config-cmyr": `^${await getNpmPackageVersion("commitlint-config-cmyr")}`
+    };
+    const pkgData = {
+      devDependencies: {
+        ...devDependencies,
+        ...pkg?.devDependencies
+      }
+    };
+    await saveProjectJson(projectPath, pkgData);
     await removeFiles(projectPath, ["commitlint.config.cjs", "commitlint.config.js"]);
-    const files = [".editorconfig", "commitlint.config.js"];
-    await copyFilesFromTemplates(projectPath, files);
+    const files = ["commitlint.config.ts"];
+    await copyFilesFromTemplates(projectPath, files, true);
+    loading.succeed("commitlint 初始化成功！");
   } catch (error) {
+    loading.fail("commitlint 初始化失败！");
     console.error(error);
   }
 }
@@ -1506,11 +1543,11 @@ async function initSemanticRelease(projectPath) {
     const pkg = await getProjectJson(projectPath);
     const files = [".releaserc.js", ".releaserc.cjs"];
     await removeFiles(projectPath, files);
-    await copyFilesFromTemplates(projectPath, [".releaserc.js"]);
+    await copyFilesFromTemplates(projectPath, ["release.config.js"], true);
     const devDependencies = {
       "@semantic-release/changelog": "^6.0.3",
       "@semantic-release/git": "^10.0.1",
-      "semantic-release": "21.0.1"
+      "semantic-release": "^24.2.7"
     };
     const pkgData = {
       scripts: {
@@ -1553,13 +1590,13 @@ async function initHusky(projectPath) {
     }
     const keyname = `*.{${extnames.join(",")}}`;
     const devDependencies = {
-      husky: "^9.0.11",
-      "lint-staged": "^15.2.2"
+      husky: "^9.1.7",
+      "lint-staged": "^16.1.5"
     };
     const pkgData = {
       scripts: {
         ...pkg?.scripts,
-        prepare: "husky install"
+        prepare: "husky init"
       },
       devDependencies: {
         ...devDependencies,
@@ -1586,53 +1623,49 @@ async function initEslint(projectPath, answers) {
     const templateMeta = getTemplateMeta(answers.template);
     const pkg = await getProjectJson(projectPath);
     const devDependencies = {
-      "@typescript-eslint/eslint-plugin": "^5.48.0",
-      "@typescript-eslint/parser": "^5.48.0",
-      "cross-env": "^7.0.3",
-      eslint: "^8.31.0"
+      "cross-env": "^10.0.0",
+      eslint: "^9.34.0",
+      // 移除不必要的依赖
+      "@typescript-eslint/eslint-plugin": void 0,
+      "@typescript-eslint/parser": void 0
     };
     let eslintType = "cmyr";
     const extnames = ["js", "mjs", "cjs", "ts", "cts", "mts"];
     if (templateMeta?.language === "vue") {
       Object.assign(devDependencies, {
-        "@vue/eslint-config-typescript": "^11.0.2",
+        "@vue/eslint-config-typescript": void 0,
         "eslint-plugin-vue": "^9.8.0"
       });
       extnames.push("vue");
-      if (templateMeta?.vueVersion === 3) {
-        eslintType = "cmyr/vue3";
-      } else {
-        eslintType = "cmyr/vue";
-      }
+      eslintType = "eslint-config-cmyr/vue";
     } else if (templateMeta?.language === "react") {
       extnames.push("jsx", "tsx");
-      eslintType = "cmyr/react";
+      eslintType = "eslint-config-cmyr/react";
       Object.assign(devDependencies, {
-        "eslint-config-react-app": "^7.0.1"
+        "eslint-plugin-react": "^7.37.5"
       });
     }
     const pkgData = {
       scripts: {
-        lint: `cross-env NODE_ENV=production eslint src --fix --ext ${extnames.join(",")}`,
+        lint: `cross-env NODE_ENV=production eslint . --fix`,
         ...pkg?.scripts
       },
       devDependencies: {
-        "eslint-plugin-import": "^2.28.1",
         ...devDependencies,
         ...pkg?.devDependencies,
         "eslint-config-cmyr": `^${await getNpmPackageVersion("eslint-config-cmyr")}`
       }
     };
     await saveProjectJson(projectPath, pkgData);
-    const files = [".eslintignore"];
-    await copyFilesFromTemplates(projectPath, files, true);
-    const eslintrc = `module.exports = {
-    root: true,
-    extends: '${eslintType}',
-}`;
-    const cjsPath = import_path2.default.join(projectPath, ".eslintrc.cjs");
-    const jsPath = import_path2.default.join(projectPath, ".eslintrc.js");
-    if (!await import_fs_extra3.default.pathExists(cjsPath) && !await import_fs_extra3.default.pathExists(jsPath)) {
+    const files = [".eslintignore", ".eslintrc.cjs", ".eslintrc.js"];
+    await removeFiles(projectPath, files);
+    const eslintrc = `import { defineConfig } from 'eslint/config'
+import cmyr from '${eslintType}'
+export default defineConfig([cmyr])
+`;
+    const mjsPath = import_path2.default.join(projectPath, "eslint.config.mjs");
+    const jsPath = import_path2.default.join(projectPath, "eslint.config.js");
+    if (!await import_fs_extra3.default.pathExists(mjsPath) && !await import_fs_extra3.default.pathExists(jsPath)) {
       await import_fs_extra3.default.writeFile(jsPath, eslintrc);
     }
     loading.succeed("eslint 初始化成功！");
@@ -1656,22 +1689,27 @@ async function initStylelint(projectPath) {
       });
       return;
     }
-    const files = [".stylelintignore", ".stylelintrc.js"];
     await removeFiles(projectPath, [".stylelintrc.js", ".stylelintrc.cjs"]);
-    await copyFilesFromTemplates(projectPath, files);
+    const files = ["stylelint.config.js"];
+    await copyFilesFromTemplates(projectPath, files, true);
     const devDependencies = {
-      "postcss-html": "^1.5.0",
-      sass: "^1.57.1",
-      stylelint: "^14.16.1",
-      "stylelint-config-cmyr": "^0.2.1",
-      "stylelint-config-rational-order": "^0.1.2",
-      "stylelint-config-standard": "^29.0.0",
-      "stylelint-order": "^6.0.1",
-      "stylelint-scss": "^4.3.0"
+      postcss: "^8.5.6",
+      sass: "^1.90.0",
+      stylelint: "^16.23.1",
+      "stylelint-config-cmyr": `^${await getNpmPackageVersion("stylelint-config-cmyr")}`,
+      // 移除不必要的依赖
+      "postcss-html": void 0,
+      "postcss-scss": void 0,
+      "stylelint-config-standard": void 0,
+      "stylelint-config-recommended": void 0,
+      "stylelint-config-standard-scss": void 0,
+      "stylelint-scss": void 0,
+      "stylelint-config-html": void 0,
+      "stylelint-config-rational-order": void 0
     };
     const pkgData = {
       scripts: {
-        "lint:css": `stylelint src/**/*.{${extnames.join(",")}} --fix --custom-syntax postcss-html`,
+        "lint:css": `stylelint src/**/*.{${extnames.join(",")}} --fix`,
         ...pkg?.scripts
       },
       devDependencies: {
@@ -1691,7 +1729,7 @@ async function initCommitizen(projectPath) {
   try {
     const pkg = await getProjectJson(projectPath);
     const devDependencies = {
-      commitizen: "^4.2.3",
+      commitizen: "^4.3.1",
       "cz-conventional-changelog-cmyr": `^${await getNpmPackageVersion("cz-conventional-changelog-cmyr")}`
     };
     const pkgData = {
@@ -1701,18 +1739,17 @@ async function initCommitizen(projectPath) {
       },
       devDependencies: {
         ...devDependencies,
-        ...pkg?.devDependencies,
-        "@commitlint/cli": "^18.6.1",
-        "@commitlint/config-conventional": "^18.6.3"
+        ...pkg?.devDependencies
       },
       config: {
         ...pkg?.config,
-        commitizen: {
-          path: "cz-conventional-changelog-cmyr"
-        }
+        commitizen: void 0
+        // 移除旧的 commitizen 配置
       }
     };
     await saveProjectJson(projectPath, pkgData);
+    const files = [".czrc"];
+    await copyFilesFromTemplates(projectPath, files, true);
     loading.succeed("commitizen 初始化成功！");
   } catch (error) {
     console.error(error);
@@ -2012,10 +2049,6 @@ async function saveProjectJson(projectPath, pkgData) {
   await import_fs_extra3.default.writeFile(pkgPath, JSON.stringify(newPkg, null, 2));
 }
 
-// src/plopfile.ts
-var import_fs_extra4 = __toESM(require("fs-extra"));
-var import_path3 = __toESM(require("path"));
-
 // src/utils/exec.ts
 var import_child_process2 = require("child_process");
 var import_colors2 = __toESM(require("@colors/colors"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.40.0",
+  "version": "1.41.0",
   "description": "草梅友仁自制的项目模板创建器",
   "author": "CaoMeiYouRen",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "cmyr-template": "dist/index.js"
   },
   "scripts": {
-    "lint": "cross-env NODE_ENV=production eslint src --fix --ext .ts,.js",
+    "lint": "cross-env NODE_ENV=production eslint . --fix",
     "prebuild": "rimraf dist",
     "build": "cross-env NODE_ENV=production tsup",
     "dev": "cross-env NODE_ENV=development ts-node-dev src/index.ts",
@@ -32,8 +32,9 @@
     "build:prod": "npm run build && rimraf temp && cross-env NODE_ENV=production ct create"
   },
   "devDependencies": {
-    "@semantic-release/changelog": "^6.0.0",
-    "@semantic-release/git": "^10.0.0",
+    "@commitlint/cli": "^19.8.1",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/git": "^10.0.1",
     "@types/debug": "^4.1.5",
     "@types/ejs": "^3.1.0",
     "@types/fs-extra": "^11.0.0",
@@ -41,20 +42,18 @@
     "@types/libsodium-wrappers": "^0.7.14",
     "@types/lodash": "^4.14.165",
     "@types/node": "^24.0.7",
-    "@typescript-eslint/eslint-plugin": "7.18.0",
-    "@typescript-eslint/parser": "8.38.0",
-    "commitizen": "^4.2.2",
-    "conventional-changelog-cli": "^5.0.0",
-    "conventional-changelog-cmyr-config": "^2.1.1",
+    "commitizen": "^4.3.1",
+    "commitlint-config-cmyr": "1.0.0-beta.3",
+    "conventional-changelog-cmyr-config": "3.0.0-beta.1",
     "cross-env": "^10.0.0",
-    "cz-conventional-changelog-cmyr": "^1.0.0",
+    "cz-conventional-changelog-cmyr": "2.0.0-beta.3",
     "debug": "^4.3.1",
-    "eslint": "8.57.1",
-    "eslint-config-cmyr": "^1.1.27",
+    "eslint": "^9.34.0",
+    "eslint-config-cmyr": "2.0.0-beta.15",
     "husky": "^9.0.5",
     "lint-staged": "^16.1.0",
     "rimraf": "^6.0.0",
-    "semantic-release": "21.1.2",
+    "semantic-release": "24.2.7",
     "ts-node": "^10.2.1",
     "ts-node-dev": "^2.0.0",
     "tsup": "^8.3.5",

package/templates/.czrc

@@ -0,0 +1,3 @@
+{
+    "path": "./node_modules/cz-conventional-changelog-cmyr"
+}

package/templates/commitlint.config.ts

@@ -0,0 +1,3 @@
+export default {
+    extends: ['cmyr'],
+}

package/templates/eslint.config.js

@@ -0,0 +1,3 @@
+import { defineConfig } from 'eslint/config'
+import cmyr from 'eslint-config-cmyr'
+export default defineConfig([cmyr])

package/templates/release.config.js

@@ -0,0 +1,39 @@
+import pkg from './package.json' with { type: 'json' }
+const { name } = pkg
+/**
+ * @type {import('semantic-release').GlobalConfig}
+ */
+export default {
+    plugins: [
+        [
+            '@semantic-release/commit-analyzer',
+            {
+                config: 'conventional-changelog-cmyr-config',
+            },
+        ],
+        [
+            '@semantic-release/release-notes-generator',
+            {
+                config: 'conventional-changelog-cmyr-config',
+            },
+        ],
+        [
+            '@semantic-release/changelog',
+            {
+                changelogFile: 'CHANGELOG.md',
+                changelogTitle: `# ${name}`,
+            },
+        ],
+        '@semantic-release/npm',
+        '@semantic-release/github',
+        [
+            '@semantic-release/git',
+            {
+                assets: [
+                    'CHANGELOG.md',
+                    'package.json',
+                ],
+            },
+        ],
+    ],
+}

package/templates/scripts/minify-docker.cjs

@@ -1,6 +1,5 @@
-/* eslint-disable no-console, @typescript-eslint/no-var-requires */
-const fs = require('fs-extra')
 const path = require('path')
+const fs = require('fs-extra')
 const { nodeFileTrace } = require('@vercel/nft');
 // !!! if any new dependencies are added, update the Dockerfile !!!
 

package/templates/stylelint.config.js

@@ -0,0 +1,4 @@
+/** @type {import('stylelint').Config} */
+export default {
+    extends: ['stylelint-config-cmyr'],
+}

package/templates/.eslintignore

@@ -1,9 +0,0 @@
-node_modules
-public
-dist
-build
-coverage
-specs
-*.min.*
-*.spec.*
-*.test.*

package/templates/.releaserc.js

@@ -1,35 +0,0 @@
-const { name } = require('./package.json')
-module.exports = {
-    plugins: [
-        [
-            "@semantic-release/commit-analyzer",
-            {
-                "config": "conventional-changelog-cmyr-config"
-            }
-        ],
-        [
-            "@semantic-release/release-notes-generator",
-            {
-                "config": "conventional-changelog-cmyr-config"
-            }
-        ],
-        [
-            "@semantic-release/changelog",
-            {
-                "changelogFile": "CHANGELOG.md",
-                "changelogTitle": "# " + name
-            }
-        ],
-        '@semantic-release/npm',
-        '@semantic-release/github',
-        [
-            "@semantic-release/git",
-            {
-                "assets": [
-                    "CHANGELOG.md",
-                    "package.json"
-                ]
-            }
-        ]
-    ]
-}

package/templates/.stylelintignore

@@ -1,6 +0,0 @@
-/dist/
-/test/
-*.min.css
-*.js
-*.ts
-_*

package/templates/.stylelintrc.cjs

@@ -1,11 +0,0 @@
-module.exports = {
-    extends: [
-        'stylelint-config-cmyr',
-    ],
-    plugins: [
-        'stylelint-scss',
-        'stylelint-order',
-    ],
-    rules: {
-    },
-}

package/templates/.stylelintrc.js

@@ -1,11 +0,0 @@
-module.exports = {
-    extends: [
-        'stylelint-config-cmyr',
-    ],
-    plugins: [
-        'stylelint-scss',
-        'stylelint-order',
-    ],
-    rules: {
-    },
-}

package/templates/commitlint.config.js

@@ -1,23 +0,0 @@
-module.exports = {
-    extends: ['@commitlint/config-conventional'],
-    rules: {
-        'type-enum': [2, 'always', [
-            'feat',
-            'fix',
-            'docs',
-            'style',
-            'refactor',
-            'perf',
-            'test',
-            'build',
-            'ci',
-            'chore',
-            'revert',
-        ]],
-        'subject-full-stop': [0, 'never'],
-        'subject-case': [0, 'never'],
-        'body-max-line-length': [0, 'never'],
-        'footer-max-line-length': [0, 'never'],
-        'header-max-length': [2, 'always', 120],
-    },
-}