cmyr-template-cli 1.7.4 → 1.7.5

package/dist/index.js

@@ -13,7 +13,7 @@ var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
 const program = new commander.Command('ct')
     .description('草梅项目创建器');
-program.version("1.7.3" , '-v, --version');
+program.version("1.7.4" , '-v, --version');
 const args = process.argv.slice(2);
 if (args.length === 0) {
     args.push('create');

package/dist/plopfile.js

@@ -165,6 +165,7 @@ async function init(projectPath, answers) {
             await initGithubWorkflows(projectPath, answers);
         }
         await initConfig(projectPath);
+        await initCommitizen(projectPath);
         await sortProjectJson(projectPath);
         await asyncExec('git add .', {
             cwd: projectPath,
@@ -523,14 +524,11 @@ async function initHusky(projectPath) {
         const devDependencies = {
             '@commitlint/cli': '^15.0.0',
             '@commitlint/config-conventional': '^15.0.0',
-            commitizen: '^4.2.3',
-            'cz-conventional-changelog': '^3.3.0',
             husky: '^7.0.4',
             'lint-staged': '^12.1.2',
         };
         const pkgData = {
             scripts: {
-                commit: 'cz',
                 ...pkg === null || pkg === void 0 ? void 0 : pkg.scripts,
                 prepare: 'husky install',
             },
@@ -539,11 +537,6 @@ async function initHusky(projectPath) {
                 ...pkg === null || pkg === void 0 ? void 0 : pkg.devDependencies,
             },
             husky: undefined,
-            config: {
-                commitizen: {
-                    path: 'cz-conventional-changelog',
-                },
-            },
             'lint-staged': {
                 [keyname]: [
                     'npm run lint',
@@ -559,6 +552,35 @@ async function initHusky(projectPath) {
         console.error(error);
     }
 }
+async function initCommitizen(projectPath) {
+    try {
+        const pkg = await getProjectJson(projectPath);
+        const devDependencies = {
+            commitizen: '^4.2.3',
+            'cz-conventional-changelog-cmyr': `^${await getNpmPackageVersion('cz-conventional-changelog-cmyr')}`,
+        };
+        const pkgData = {
+            scripts: {
+                ...pkg === null || pkg === void 0 ? void 0 : pkg.scripts,
+                commit: 'cz',
+            },
+            devDependencies: {
+                ...devDependencies,
+                ...pkg === null || pkg === void 0 ? void 0 : pkg.devDependencies,
+            },
+            config: {
+                ...pkg === null || pkg === void 0 ? void 0 : pkg.config,
+                commitizen: {
+                    path: './node_modules/cz-conventional-changelog-cmyr',
+                },
+            },
+        };
+        await saveProjectJson(projectPath, pkgData);
+    }
+    catch (error) {
+        console.error(error);
+    }
+}
 async function sortProjectJson(projectPath) {
     try {
         const pkg = await getProjectJson(projectPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "草梅友仁自制的项目模板创建器",
   "author": "CaoMeiYouRen",
   "license": "MIT",
@@ -26,7 +26,7 @@
     "rm": "rimraf node_modules",
     "start": "node ./dist/index",
     "release": "semantic-release",
-    "commit": "git add . && git cz",
+    "commit": "cz",
     "create": "ct create",
     "build:dev": "rimraf dist && cross-env NODE_ENV=development rollup -c && rimraf temp && cross-env NODE_ENV=development ct create",
     "build:prod": "npm run build && rimraf temp && cross-env NODE_ENV=production ct create"
@@ -52,6 +52,7 @@
     "conventional-changelog-cmyr-config": "^1.2.3",
     "cross-env": "^7.0.2",
     "cz-conventional-changelog": "^3.3.0",
+    "cz-conventional-changelog-cmyr": "^1.0.0",
     "debug": "^4.3.1",
     "eslint": "^7.14.0",
     "eslint-config-cmyr": "^1.1.14",
@@ -83,7 +84,7 @@
   },
   "config": {
     "commitizen": {
-      "path": "cz-conventional-changelog"
+      "path": "./node_modules/cz-conventional-changelog-cmyr"
     }
   },
   "changelog": {