cmyr-template-cli 1.12.2 → 1.12.3

package/dist/index.js

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

package/dist/plopfile.js

@@ -206,15 +206,9 @@ async function getGitUserName() {
 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');
+        const files = ['.github/dependabot.yml', '.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 removeFiles(projectPath, files);
         }
     }
     catch (error) {
@@ -224,11 +218,9 @@ async function initDependabot(projectPath, answers) {
 async function initYarn(projectPath, answers) {
     try {
         const { isRemoveYarn } = answers;
-        const yarnPath = path__default["default"].join(projectPath, 'yarn.lock');
+        const files = ['yarn.lock'];
         if (isRemoveYarn) {
-            if (await fs__default["default"].pathExists(yarnPath)) {
-                await fs__default["default"].remove(yarnPath);
-            }
+            await removeFiles(projectPath, files);
         }
     }
     catch (error) {
@@ -412,9 +404,7 @@ async function initReadme(projectPath, projectInfos) {
             debug: false,
             async: true,
         });
-        if (await fs__default["default"].pathExists(newReadmePath)) {
-            await fs__default["default"].remove(newReadmePath);
-        }
+        await removeFiles(projectPath, ['README.md']);
         await fs__default["default"].writeFile(newReadmePath, lintMd(lodash.unescape(readmeContent)));
         loading.succeed('README.md 初始化成功！');
     }
@@ -428,15 +418,13 @@ async function initContributing(projectPath, projectInfos) {
     try {
         const templatePath = path__default["default"].join(__dirname, '../templates/CONTRIBUTING.md');
         const template = (await fs__default["default"].readFile(templatePath, 'utf8')).toString();
-        const newReadmePath = path__default["default"].join(projectPath, 'CONTRIBUTING.md');
-        const readmeContent = await ejs__default["default"].render(template, projectInfos, {
+        const newContributingPath = path__default["default"].join(projectPath, 'CONTRIBUTING.md');
+        const content = await ejs__default["default"].render(template, projectInfos, {
             debug: false,
             async: true,
         });
-        if (await fs__default["default"].pathExists(newReadmePath)) {
-            await fs__default["default"].remove(newReadmePath);
-        }
-        await fs__default["default"].writeFile(newReadmePath, lintMd(lodash.unescape(readmeContent)));
+        await removeFiles(projectPath, ['CONTRIBUTING.md']);
+        await fs__default["default"].writeFile(newContributingPath, lintMd(lodash.unescape(content)));
         loading.succeed('贡献指南 初始化成功！');
     }
     catch (error) {
@@ -456,15 +444,13 @@ async function initLicense(projectPath, projectInfos) {
             return;
         }
         const template = (await fs__default["default"].readFile(templatePath, 'utf8')).toString();
-        const newReadmePath = path__default["default"].join(projectPath, 'LICENSE');
-        const readmeContent = await ejs__default["default"].render(template, projectInfos, {
+        const newPath = path__default["default"].join(projectPath, 'LICENSE');
+        const content = await ejs__default["default"].render(template, projectInfos, {
             debug: false,
             async: true,
         });
-        if (await fs__default["default"].pathExists(newReadmePath)) {
-            await fs__default["default"].remove(newReadmePath);
-        }
-        await fs__default["default"].writeFile(newReadmePath, lodash.unescape(readmeContent));
+        await removeFiles(projectPath, ['LICENSE']);
+        await fs__default["default"].writeFile(newPath, lodash.unescape(content));
         loading.succeed('LICENSE 初始化成功！');
     }
     catch (error) {
@@ -475,14 +461,7 @@ async function initLicense(projectPath, projectInfos) {
 async function initConfig(projectPath) {
     try {
         const files = ['.editorconfig', 'commitlint.config.js'];
-        files.forEach(async (file) => {
-            const templatePath = path__default["default"].join(__dirname, '../templates/', file);
-            const newPath = path__default["default"].join(projectPath, file);
-            if (await fs__default["default"].pathExists(newPath)) {
-                await fs__default["default"].remove(newPath);
-            }
-            await fs__default["default"].copyFile(templatePath, newPath);
-        });
+        await copyFilesFromTemplates(projectPath, files);
     }
     catch (error) {
         console.error(error);
@@ -502,23 +481,10 @@ async function initGithubWorkflows(projectPath, answers) {
             files.push(releaseYml);
         }
         else {
-            const oldReleaseYml = path__default["default"].join(projectPath, releaseYml);
-            if (await fs__default["default"].pathExists(oldReleaseYml)) {
-                await fs__default["default"].remove(oldReleaseYml);
-            }
-        }
-        const oldReleaseYml = path__default["default"].join(projectPath, '.github/release.yml');
-        if (await fs__default["default"].pathExists(oldReleaseYml)) {
-            await fs__default["default"].remove(oldReleaseYml);
+            await removeFiles(projectPath, [releaseYml]);
         }
-        files.forEach(async (file) => {
-            const templatePath = path__default["default"].join(__dirname, '../templates/', file);
-            const newPath = path__default["default"].join(projectPath, file);
-            if (await fs__default["default"].pathExists(newPath)) {
-                await fs__default["default"].remove(newPath);
-            }
-            await fs__default["default"].copyFile(templatePath, newPath);
-        });
+        await removeFiles(projectPath, ['.github/workflows/auto-merge.yml', '.github/release.yml']);
+        await copyFilesFromTemplates(projectPath, files);
         loading.succeed('Github Workflows 初始化成功！');
     }
     catch (error) {
@@ -530,14 +496,7 @@ async function initSemanticRelease(projectPath) {
     const loading = ora__default["default"]('正在初始化 semantic-release ……').start();
     try {
         const files = ['.releaserc.js'];
-        files.forEach(async (file) => {
-            const templatePath = path__default["default"].join(__dirname, '../templates/', file);
-            const newPath = path__default["default"].join(projectPath, file);
-            if (await fs__default["default"].pathExists(newPath)) {
-                await fs__default["default"].remove(newPath);
-            }
-            await fs__default["default"].copyFile(templatePath, newPath);
-        });
+        await copyFilesFromTemplates(projectPath, files);
         const pkg = await getProjectJson(projectPath);
         const devDependencies = {
             '@semantic-release/changelog': '^6.0.1',
@@ -572,14 +531,7 @@ async function initHusky(projectPath) {
         if (!await fs__default["default"].pathExists(dir)) {
             await fs__default["default"].mkdirp(dir);
         }
-        files.forEach(async (file) => {
-            const templatePath = path__default["default"].join(__dirname, '../templates/', file);
-            const newPath = path__default["default"].join(projectPath, file);
-            if (await fs__default["default"].pathExists(newPath)) {
-                await fs__default["default"].remove(newPath);
-            }
-            await fs__default["default"].copyFile(templatePath, newPath);
-        });
+        await copyFilesFromTemplates(projectPath, files);
         const extnames = ['js', 'ts'];
         const pkg = await getProjectJson(projectPath);
         if ((_a = pkg === null || pkg === void 0 ? void 0 : pkg.dependencies) === null || _a === void 0 ? void 0 : _a.vue) {
@@ -656,14 +608,7 @@ async function initDocker(projectPath) {
     const loading = ora__default["default"]('正在初始化 Docker ……').start();
     try {
         const files = ['.dockerignore', 'docker-compose.yml', 'Dockerfile'];
-        files.forEach(async (file) => {
-            const templatePath = path__default["default"].join(__dirname, '../templates/', file);
-            const newPath = path__default["default"].join(projectPath, file);
-            if (await fs__default["default"].pathExists(newPath)) {
-                await fs__default["default"].remove(newPath);
-            }
-            await fs__default["default"].copyFile(templatePath, newPath);
-        });
+        await copyFilesFromTemplates(projectPath, files);
         loading.succeed('Docker 初始化成功！');
     }
     catch (error) {
@@ -762,6 +707,45 @@ async function saveProjectJson(projectPath, pkgData) {
     const newPkg = Object.assign({}, pkg, pkgData);
     await fs__default["default"].writeFile(pkgPath, JSON.stringify(newPkg, null, 2));
 }
+async function copyFilesFromTemplates(projectPath, files) {
+    const loading = ora__default["default"](`正在复制文件 ${files.join()} ……`).start();
+    try {
+        for await (const file of files) {
+            const templatePath = path__default["default"].join(__dirname, '../templates/', file);
+            const newPath = path__default["default"].join(projectPath, file);
+            if (await fs__default["default"].pathExists(newPath)) {
+                await fs__default["default"].remove(newPath);
+            }
+            await fs__default["default"].copyFile(templatePath, newPath);
+        }
+        loading.succeed(`文件 ${files.join()} 复制成功！`);
+        return true;
+    }
+    catch (error) {
+        loading.fail(`文件 ${files.join()} 复制失败！`);
+        throw error;
+    }
+}
+async function removeFiles(projectPath, files) {
+    const loading = ora__default["default"](`正在删除文件 ${files.join()} ……`).start();
+    try {
+        for await (const file of files) {
+            const newPath = path__default["default"].join(projectPath, file);
+            if (await fs__default["default"].pathExists(newPath)) {
+                await fs__default["default"].remove(newPath);
+                loading.succeed(`文件 ${file} 删除成功！`);
+            }
+            else {
+                loading.succeed(`文件 ${file} 不存在，已跳过删除`);
+            }
+        }
+        return true;
+    }
+    catch (error) {
+        loading.fail(`文件 ${files.join()} 删除失败！`);
+        throw error;
+    }
+}
 
 module.exports = function (plop) {
     plop.setActionType('initProject', initProject);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "description": "草梅友仁自制的项目模板创建器",
   "author": "CaoMeiYouRen",
   "license": "MIT",
@@ -43,7 +43,7 @@
     "@types/ejs": "^3.1.0",
     "@types/fs-extra": "^9.0.4",
     "@types/lodash": "^4.14.165",
-    "@types/node": "^17.0.0",
+    "@types/node": "^18.0.0",
     "@types/promise.any": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "^4.9.0",
     "@typescript-eslint/parser": "^4.9.0",
@@ -57,7 +57,7 @@
     "eslint": "^7.14.0",
     "eslint-config-cmyr": "^1.1.14",
     "husky": "^8.0.1",
-    "lint-staged": "^12.0.2",
+    "lint-staged": "^13.0.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.33.3",
     "rollup-plugin-terser": "^7.0.2",