cmyr-template-cli 1.41.1 → 1.41.3

package/dist/plopfile.js

@@ -1045,10 +1045,14 @@ async function initDependabot(projectPath, answers) {
               versions: [">= 4.13.3"]
             });
           }
-          dependabot.updates[0].ignore = (0, import_lodash.uniqBy)([
-            ...dependabot?.updates?.[0].ignore || [],
-            ...dependencies
-          ], (e) => e["dependency-name"]);
+          if (dependencies.length) {
+            dependabot.updates[0].ignore = (0, import_lodash.uniqBy)([
+              ...dependabot?.updates?.[0].ignore || [],
+              ...dependencies
+            ], (e) => e["dependency-name"]);
+          } else {
+            dependabot.updates[0].ignore = void 0;
+          }
         }
         if (dependabot?.updates?.every((e) => e["package-ecosystem"] !== "github-actions")) {
           dependabot.updates.push({
@@ -1474,7 +1478,7 @@ async function initCommitlint(projectPath) {
   try {
     const pkg = await getProjectJson(projectPath);
     const devDependencies = {
-      commitlint: "^19.8.1",
+      commitlint: `^${await getNpmPackageVersion("commitlint")}`,
       "@commitlint/cli": void 0
     };
     const pkgData = {
@@ -1540,10 +1544,12 @@ async function initSemanticRelease(projectPath) {
     await removeFiles(projectPath, files);
     await copyFilesFromTemplates(projectPath, ["release.config.js"], true);
     const devDependencies = {
-      "@semantic-release/changelog": "^6.0.3",
-      "@semantic-release/git": "^10.0.1",
-      "semantic-release": "^24.2.7",
-      "conventional-changelog-cli": void 0
+      "semantic-release": `^${await getNpmPackageVersion("semantic-release")}`,
+      "semantic-release-cmyr-config": `^${await getNpmPackageVersion("semantic-release-cmyr-config")}`,
+      "conventional-changelog-cli": void 0,
+      "conventional-changelog-cmyr-config": void 0,
+      "@semantic-release/changelog": void 0,
+      "@semantic-release/git": void 0
     };
     const pkgData = {
       scripts: {
@@ -1552,9 +1558,7 @@ async function initSemanticRelease(projectPath) {
       },
       devDependencies: {
         ...pkg?.devDependencies,
-        ...devDependencies,
-        "conventional-changelog-cmyr-config": `^${await getNpmPackageVersion("conventional-changelog-cmyr-config")}`,
-        "semantic-release": devDependencies["semantic-release"]
+        ...devDependencies
       },
       changelog: {
         language: "zh"
@@ -1586,8 +1590,8 @@ async function initHusky(projectPath) {
     }
     const keyname = `*.{${extnames.join(",")}}`;
     const devDependencies = {
-      husky: "^9.1.7",
-      "lint-staged": "^16.1.5"
+      husky: `^${await getNpmPackageVersion("husky")}`,
+      "lint-staged": `^${await getNpmPackageVersion("lint-staged")}`
     };
     const pkgData = {
       scripts: {
@@ -1595,8 +1599,8 @@ async function initHusky(projectPath) {
         prepare: "husky init"
       },
       devDependencies: {
-        ...devDependencies,
-        ...pkg?.devDependencies
+        ...pkg?.devDependencies,
+        ...devDependencies
       },
       husky: void 0,
       "lint-staged": {
@@ -1630,7 +1634,7 @@ async function initEslint(projectPath, answers) {
     if (templateMeta?.language === "vue") {
       Object.assign(devDependencies, {
         "@vue/eslint-config-typescript": void 0,
-        "eslint-plugin-vue": "^9.8.0"
+        "eslint-plugin-vue": `^${await getNpmPackageVersion("eslint-plugin-vue")}`
       });
       extnames.push("vue");
       eslintType = "eslint-config-cmyr/vue";
@@ -1638,17 +1642,17 @@ async function initEslint(projectPath, answers) {
       extnames.push("jsx", "tsx");
       eslintType = "eslint-config-cmyr/react";
       Object.assign(devDependencies, {
-        "eslint-plugin-react": "^7.37.5"
+        "eslint-plugin-react": `^${await getNpmPackageVersion("eslint-plugin-react")}`
       });
     }
     const pkgData = {
       scripts: {
-        lint: `cross-env NODE_ENV=production eslint . --fix`,
-        ...pkg?.scripts
+        ...pkg?.scripts,
+        lint: `cross-env NODE_ENV=production eslint . --fix`
       },
       devDependencies: {
-        ...devDependencies,
         ...pkg?.devDependencies,
+        ...devDependencies,
         "eslint-config-cmyr": `^${await getNpmPackageVersion("eslint-config-cmyr")}`
       }
     };
@@ -1689,9 +1693,9 @@ async function initStylelint(projectPath) {
     const files = ["stylelint.config.js"];
     await copyFilesFromTemplates(projectPath, files, true);
     const devDependencies = {
-      postcss: "^8.5.6",
-      sass: "^1.90.0",
-      stylelint: "^16.23.1",
+      postcss: `^${await getNpmPackageVersion("postcss")}`,
+      sass: `^${await getNpmPackageVersion("sass")}`,
+      stylelint: `^${await getNpmPackageVersion("stylelint")}`,
       "stylelint-config-cmyr": `^${await getNpmPackageVersion("stylelint-config-cmyr")}`,
       // 移除不必要的依赖
       "postcss-html": void 0,
@@ -1709,8 +1713,8 @@ async function initStylelint(projectPath) {
         ...pkg?.scripts
       },
       devDependencies: {
-        ...devDependencies,
-        ...pkg?.devDependencies
+        ...pkg?.devDependencies,
+        ...devDependencies
       }
     };
     await saveProjectJson(projectPath, pkgData);
@@ -1725,7 +1729,7 @@ async function initCommitizen(projectPath) {
   try {
     const pkg = await getProjectJson(projectPath);
     const devDependencies = {
-      commitizen: "^4.3.1",
+      commitizen: `^${await getNpmPackageVersion("commitizen")}`,
       "cz-conventional-changelog-cmyr": `^${await getNpmPackageVersion("cz-conventional-changelog-cmyr")}`
     };
     const pkgData = {
@@ -1734,8 +1738,8 @@ async function initCommitizen(projectPath) {
         commit: "cz"
       },
       devDependencies: {
-        ...devDependencies,
-        ...pkg?.devDependencies
+        ...pkg?.devDependencies,
+        ...devDependencies
       },
       config: {
         ...pkg?.config,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.41.1",
+  "version": "1.41.3",
   "description": "草梅友仁自制的项目模板创建器",
   "author": "CaoMeiYouRen",
   "license": "MIT",
@@ -33,8 +33,6 @@
   },
   "devDependencies": {
     "@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",
@@ -44,7 +42,6 @@
     "@types/node": "^24.0.7",
     "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": "2.0.0-beta.3",
     "debug": "^4.3.1",
@@ -54,6 +51,7 @@
     "lint-staged": "^16.1.0",
     "rimraf": "^6.0.0",
     "semantic-release": "24.2.7",
+    "semantic-release-cmyr-config": "1.0.0-beta.2",
     "ts-node": "^10.2.1",
     "ts-node-dev": "^2.0.0",
     "tsup": "^8.3.5",

package/templates/release.config.js

@@ -1,39 +1,6 @@
-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',
-                ],
-            },
-        ],
-    ],
+    extends: ['semantic-release-cmyr-config'],
 }