cmyr-template-cli 1.28.10 → 1.29.1

package/dist/plopfile.js

@@ -462,8 +462,6 @@ async function init(projectPath, answers) {
             await asyncExec(`${PACKAGE_MANAGER} -v`, {
                 cwd: projectPath,
             });
-            await initConfig(projectPath);
-            await initCommitizen(projectPath);
             const info = await getProjectInfo(projectPath, answers);
             if (info) {
                 await initProjectJson(projectPath, info);
@@ -480,6 +478,8 @@ async function init(projectPath, answers) {
                 }
                 await initGithubWorkflows(projectPath, answers);
             }
+            await initConfig(projectPath);
+            await initCommitizen(projectPath);
             if (isInitSemanticRelease) {
                 await initSemanticRelease(projectPath);
             }
@@ -487,7 +487,7 @@ async function init(projectPath, answers) {
                 await initHusky(projectPath);
             }
             await initCommonDependencies(projectPath, answers);
-            await initTsconfig(projectPath);
+            await initTsconfig(projectPath, answers);
             await initEslint(projectPath, answers);
             await initStylelint(projectPath);
             if (isInitJest) {
@@ -764,10 +764,11 @@ async function initYarn(projectPath, answers) {
         console.error(error);
     }
 }
-async function initTsconfig(projectPath) {
+async function initTsconfig(projectPath, answers) {
     var _a;
     try {
         const tsconfigPath = path__default["default"].join(projectPath, 'tsconfig.json');
+        const { jsModuleType } = answers;
         if (await fs__default["default"].pathExists(tsconfigPath)) {
             const tsconfigStr = await fs__default["default"].readFile(tsconfigPath, 'utf8');
             const tsconfig = JSON5__default["default"].parse(tsconfigStr);
@@ -793,6 +794,19 @@ async function initTsconfig(projectPath) {
                     newTsconfig.compilerOptions.skipLibCheck = true;
                     hasChanges = true;
                 }
+                switch (jsModuleType) {
+                    case 'cjs':
+                        break;
+                    case 'esm':
+                        newTsconfig.compilerOptions.module = 'esnext';
+                        if (!newTsconfig.compilerOptions.moduleResolution) {
+                            newTsconfig.compilerOptions.moduleResolution = 'node';
+                        }
+                        hasChanges = true;
+                        break;
+                    default:
+                        break;
+                }
                 if (hasChanges) {
                     await fs__default["default"].writeFile(tsconfigPath, JSON.stringify(newTsconfig, null, 4));
                 }
@@ -806,7 +820,7 @@ async function initTsconfig(projectPath) {
 async function initProjectJson(projectPath, projectInfos) {
     const loading = ora__default["default"]('正在初始化 package.json ……').start();
     try {
-        const { packageName, engines, license, homepage, issuesUrl, gitUrl, author, description, keywords = [], isOpenSource, isPublishToNpm = false } = projectInfos;
+        const { packageName, engines, license, homepage, issuesUrl, gitUrl, author, description, keywords = [], isOpenSource, isPublishToNpm = false, jsModuleType } = projectInfos;
         const pkg = await getProjectJson(projectPath);
         const pkgData = {
             name: packageName,
@@ -836,6 +850,16 @@ async function initProjectJson(projectPath, projectInfos) {
                 access: 'public',
             };
         }
+        switch (jsModuleType) {
+            case 'cjs':
+                extData.type = 'commonjs';
+                break;
+            case 'esm':
+                extData.type = 'module';
+                break;
+            default:
+                break;
+        }
         const newPkg = lodash.merge({}, pkg, pkgData, extData);
         await saveProjectJson(projectPath, newPkg);
         loading.succeed('package.json 初始化成功！');
@@ -1061,9 +1085,15 @@ async function initGithubWorkflows(projectPath, answers) {
 async function initSemanticRelease(projectPath) {
     const loading = ora__default["default"]('正在初始化 semantic-release ……').start();
     try {
-        const files = ['.releaserc.js'];
-        await copyFilesFromTemplates(projectPath, files);
         const pkg = await getProjectJson(projectPath);
+        const files = ['.releaserc.js', '.releaserc.cjs'];
+        await removeFiles(projectPath, files);
+        if (pkg.type === 'module') {
+            await copyFilesFromTemplates(projectPath, ['.releaserc.cjs']);
+        }
+        else {
+            await copyFilesFromTemplates(projectPath, ['.releaserc.js']);
+        }
         const devDependencies = {
             '@semantic-release/changelog': '^6.0.3',
             '@semantic-release/git': '^10.0.1',
@@ -1192,10 +1222,21 @@ async function initEslint(projectPath, answers) {
     root: true,
     extends: '${eslintType}',
 }`;
-        const filename = pkg.type === 'module' ? '.eslintrc.cjs' : '.eslintrc.js';
-        const toPath = path__default["default"].join(projectPath, filename);
-        if (!await fs__default["default"].pathExists(toPath)) {
-            await fs__default["default"].writeFile(toPath, eslintrc);
+        const cjsPath = path__default["default"].join(projectPath, '.eslintrc.cjs');
+        const jsPath = path__default["default"].join(projectPath, '.eslintrc.js');
+        if (pkg.type === 'module') {
+            await removeFiles(projectPath, ['.eslintrc.js']);
+            if (!await fs__default["default"].pathExists(cjsPath)) {
+                if (await fs__default["default"].pathExists(jsPath)) {
+                    await fs__default["default"].rename(jsPath, cjsPath);
+                }
+                else {
+                    await fs__default["default"].writeFile(cjsPath, eslintrc);
+                }
+            }
+        }
+        else if (!await fs__default["default"].pathExists(jsPath)) {
+            await fs__default["default"].writeFile(jsPath, eslintrc);
         }
         loading.succeed('eslint 初始化成功！');
     }
@@ -1584,6 +1625,22 @@ module.exports = function (plop) {
                     },
                     default: '',
                 },
+                {
+                    type: 'list',
+                    name: 'jsModuleType',
+                    message: '请选择 JS 模块规范',
+                    choices() {
+                        return ['esm', 'cjs'];
+                    },
+                    default(answers) {
+                        const templateMeta = getTemplateMeta(answers.template);
+                        return ['nodejs'].includes(templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.runtime) ? 'cjs' : '';
+                    },
+                    when(answers) {
+                        const templateMeta = getTemplateMeta(answers.template);
+                        return ['nodejs'].includes(templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.runtime);
+                    },
+                },
                 {
                     type: 'checkbox',
                     name: 'commonDependencies',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.28.10",
+  "version": "1.29.1",
   "description": "草梅友仁自制的项目模板创建器",
   "author": "CaoMeiYouRen",
   "license": "MIT",
@@ -46,8 +46,8 @@
     "@types/lodash": "^4.14.165",
     "@types/node": "^20.0.0",
     "@types/promise.any": "^2.0.0",
-    "@typescript-eslint/eslint-plugin": "7.13.1",
-    "@typescript-eslint/parser": "7.13.1",
+    "@typescript-eslint/eslint-plugin": "7.14.1",
+    "@typescript-eslint/parser": "7.15.0",
     "commitizen": "^4.2.2",
     "conventional-changelog-cli": "^5.0.0",
     "conventional-changelog-cmyr-config": "^2.1.1",

package/templates/.releaserc.cjs

@@ -0,0 +1,35 @@
+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/.releaserc.js

@@ -26,7 +26,6 @@ module.exports = {
             "@semantic-release/git",
             {
                 "assets": [
-                    "src",
                     "CHANGELOG.md",
                     "package.json"
                 ]

package/templates/Dockerfile

@@ -1,7 +1,7 @@
 FROM caomeiyouren/alpine-nodejs:latest AS nodejs
 
 RUN npm config set registry https://registry.npmmirror.com && \
-    pnpm config set registry https://registry.npmmirror.com &&
+    pnpm config set registry https://registry.npmmirror.com
 
 FROM caomeiyouren/alpine-nodejs-minimize:latest AS runtime