cmyr-template-cli 1.7.4 → 1.8.1

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.8.0" , '-v, --version');
 const args = process.argv.slice(2);
 if (args.length === 0) {
     args.push('create');

package/dist/plopfile.js

@@ -132,16 +132,8 @@ async function init(projectPath, answers) {
             });
             console.info(colors__default["default"].green(`请在远程 Git 仓库初始化 ${gitRemoteUrl}`));
         }
-        const dependabotPath = path__default["default"].join(projectPath, '.github/dependabot.yml');
-        const mergifyPath = path__default["default"].join(projectPath, '.github/mergify.yml');
-        if (!isOpenSource || isRemoveDependabot) {
-            if (await fs__default["default"].pathExists(dependabotPath)) {
-                await fs__default["default"].remove(dependabotPath);
-            }
-            if (await fs__default["default"].pathExists(mergifyPath)) {
-                await fs__default["default"].remove(mergifyPath);
-            }
-        }
+        await initDependabot(projectPath, answers);
+        await initYarn(projectPath, answers);
         const newPkg = await initProjectJson(projectPath, answers);
         if (isInitSemanticRelease) {
             await initSemanticRelease(projectPath);
@@ -165,6 +157,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,
@@ -203,6 +196,38 @@ async function getGitUserName() {
     const username = (await asyncExec('git config user.name')) || '';
     return username.trim();
 }
+async function initDependabot(projectPath, answers) {
+    try {
+        const { isOpenSource, isRemoveDependabot } = answers;
+        const dependabotPath = path__default["default"].join(projectPath, '.github/dependabot.yml');
+        const mergifyPath = path__default["default"].join(projectPath, '.github/mergify.yml');
+        if (!isOpenSource || isRemoveDependabot) {
+            if (await fs__default["default"].pathExists(dependabotPath)) {
+                await fs__default["default"].remove(dependabotPath);
+            }
+            if (await fs__default["default"].pathExists(mergifyPath)) {
+                await fs__default["default"].remove(mergifyPath);
+            }
+        }
+    }
+    catch (error) {
+        console.error(error);
+    }
+}
+async function initYarn(projectPath, answers) {
+    try {
+        const { isRemoveYarn } = answers;
+        const yarnPath = path__default["default"].join(projectPath, 'yarn.lock');
+        if (isRemoveYarn) {
+            if (await fs__default["default"].pathExists(yarnPath)) {
+                await fs__default["default"].remove(yarnPath);
+            }
+        }
+    }
+    catch (error) {
+        console.error(error);
+    }
+}
 async function initProjectJson(projectPath, answers) {
     const loading = ora__default["default"]('正在初始化 package.json ……').start();
     try {
@@ -523,14 +548,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 +561,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 +576,38 @@ async function initHusky(projectPath) {
         console.error(error);
     }
 }
+async function initCommitizen(projectPath) {
+    const loading = ora__default["default"]('正在初始化 commitizen ……').start();
+    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);
+        loading.succeed('commitizen 初始化成功！');
+    }
+    catch (error) {
+        console.error(error);
+        loading.fail('commitizen 初始化失败！');
+    }
+}
 async function sortProjectJson(projectPath) {
     try {
         const pkg = await getProjectJson(projectPath);
@@ -784,6 +833,15 @@ module.exports = function (plop) {
                         return answers.isOpenSource;
                     },
                 },
+                {
+                    type: 'confirm',
+                    name: 'isRemoveYarn',
+                    message: '是否移除 yarn ？',
+                    default: false,
+                    when(answers) {
+                        return answers.isOpenSource;
+                    },
+                },
                 {
                     type: 'confirm',
                     name: 'isEnableAfdian',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.7.4",
+  "version": "1.8.1",
   "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"
@@ -49,9 +49,10 @@
     "@typescript-eslint/parser": "^4.9.0",
     "commitizen": "^4.2.2",
     "conventional-changelog-cli": "^2.1.1",
-    "conventional-changelog-cmyr-config": "^1.2.3",
+    "conventional-changelog-cmyr-config": "^2.0.2",
     "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": {

package/templates/.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "lts/*"
-          cache: "yarn"
+          # cache: "yarn"
       - name: Cache multiple paths
         uses: actions/cache@v2
         with:
@@ -24,9 +24,9 @@ jobs:
             **/node_modules
           key: npm-${{ runner.os }}-${{ hashFiles('package.json') }}
       - run: yarn
-      - run: npm run lint
-      - run: npm run build
+      - run: yarn run lint
+      - run: yarn run build
       - env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: npm run release
+        run: yarn run release

package/templates/.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "lts/*"
-          cache: "yarn"
+          # cache: "yarn"
       - name: Cache multiple paths
         uses: actions/cache@v2
         with:
@@ -21,5 +21,5 @@ jobs:
             **/node_modules
           key: npm-${{ runner.os }}-${{ hashFiles('package.json') }}
       - run: yarn
-      - run: npm run lint
-      - run: npm run build
+      - run: yarn run lint
+      - run: yarn run build

package/templates/CONTRIBUTING.md

@@ -68,6 +68,7 @@
 
     -   若为 BUG 修复，则选择 `fix`
     -   若为新增功能，则选择 `feat`
+    -   若为性能优化，则选择 `perf`
     -   若为移除某些功能，则选择 `BREAKING CHANGE`
         -    `BREAKING CHANGE` 和其他破坏性更新，若不是为了修复 BUG，原则上将拒绝该 PR
 
@@ -75,3 +76,6 @@
 5. 推送到分支 ( `git push origin feat/your_feature`)
 
 6. [打开一个新的 Pull Request](<%= repositoryUrl %>/compare?expand=1)
+
+***
+_This CONTRIBUTING was generated with ❤️ by [cmyr-template-cli](https://github.com/CaoMeiYouRen/cmyr-template-cli)_