cmyr-template-cli 1.22.4 → 1.22.6

package/dist/plopfile.js

@@ -441,7 +441,7 @@ async function asyncExec(cmd, options) {
                 return reject(err);
             }
             if (stderr) {
-                return reject(stderr);
+                return resolve(stderr);
             }
             resolve(stdout);
         });
@@ -502,7 +502,7 @@ async function init(projectPath, answers) {
             }
             await initCommonDependencies(projectPath, answers);
             await initTsconfig(projectPath);
-            await initEslint(projectPath);
+            await initEslint(projectPath, answers);
             await initStylelint(projectPath);
             await sortProjectJson(projectPath);
             await initYarn(projectPath, answers);
@@ -520,16 +520,9 @@ async function init(projectPath, answers) {
             }
         }
         if ((templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.runtime) === 'java') {
-            try {
-                await asyncExec('java -version', {
-                    cwd: projectPath,
-                });
-            }
-            catch (error) {
-                if (!(typeof error === 'string' && error.includes('java version'))) {
-                    throw error;
-                }
-            }
+            await asyncExec('java -version', {
+                cwd: projectPath,
+            });
             await asyncExec('mvn -version', {
                 cwd: projectPath,
             });
@@ -537,7 +530,7 @@ async function init(projectPath, answers) {
                 cwd: projectPath,
             });
             try {
-                await asyncExec('mvn clean package -Dmaven.test.skip=true', {
+                await asyncExec('mvn clean install -Dmaven.test.skip=true', {
                     cwd: projectPath,
                 });
             }
@@ -1124,10 +1117,10 @@ async function initHusky(projectPath) {
         console.error(error);
     }
 }
-async function initEslint(projectPath) {
-    var _a, _b, _c, _d;
+async function initEslint(projectPath, answers) {
     const loading = ora__default["default"]('正在初始化 eslint ……').start();
     try {
+        const templateMeta = getTemplateMeta(answers.template);
         const pkg = await getProjectJson(projectPath);
         const devDependencies = {
             '@typescript-eslint/eslint-plugin': '^5.48.0',
@@ -1137,20 +1130,25 @@ async function initEslint(projectPath) {
         };
         let eslintType = 'cmyr';
         const extnames = ['js', 'mjs', 'cjs', 'ts'];
-        if ((_a = pkg === null || pkg === void 0 ? void 0 : pkg.dependencies) === null || _a === void 0 ? void 0 : _a.vue) {
+        if ((templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.language) === 'vue') {
             Object.assign(devDependencies, {
                 '@vue/eslint-config-typescript': '^11.0.2',
                 'eslint-plugin-vue': '^9.8.0',
             });
             extnames.push('vue');
-            eslintType = 'cmyr/vue';
-            if ((_c = (_b = pkg === null || pkg === void 0 ? void 0 : pkg.dependencies) === null || _b === void 0 ? void 0 : _b.vue) === null || _c === void 0 ? void 0 : _c.startsWith('^3')) {
+            if ((templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.vueVersion) === 3) {
                 eslintType = 'cmyr/vue3';
             }
+            else {
+                eslintType = 'cmyr/vue';
+            }
         }
-        if ((_d = pkg === null || pkg === void 0 ? void 0 : pkg.dependencies) === null || _d === void 0 ? void 0 : _d.react) {
+        else if ((templateMeta === null || templateMeta === void 0 ? void 0 : templateMeta.language) === 'react') {
             extnames.push('jsx', 'tsx');
             eslintType = 'cmyr/react';
+            Object.assign(devDependencies, {
+                'eslint-config-react-app': '^7.0.1',
+            });
         }
         const pkgData = {
             scripts: {
@@ -1158,6 +1156,7 @@ async function initEslint(projectPath) {
                 ...pkg === null || pkg === void 0 ? void 0 : pkg.scripts,
             },
             devDependencies: {
+                'eslint-plugin-import': '^2.28.1',
                 ...devDependencies,
                 ...pkg === null || pkg === void 0 ? void 0 : pkg.devDependencies,
                 'eslint-config-cmyr': `^${await getNpmPackageVersion('eslint-config-cmyr')}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmyr-template-cli",
-  "version": "1.22.4",
+  "version": "1.22.6",
   "description": "草梅友仁自制的项目模板创建器",
   "author": "CaoMeiYouRen",
   "license": "MIT",
@@ -47,7 +47,7 @@
     "@types/node": "^20.0.0",
     "@types/promise.any": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "6.7.5",
-    "@typescript-eslint/parser": "6.7.5",
+    "@typescript-eslint/parser": "6.8.0",
     "commitizen": "^4.2.2",
     "conventional-changelog-cli": "^4.0.0",
     "conventional-changelog-cmyr-config": "^2.1.1",
@@ -57,7 +57,7 @@
     "eslint": "8.42.0",
     "eslint-config-cmyr": "^1.1.27",
     "husky": "^8.0.1",
-    "lint-staged": "^14.0.0",
+    "lint-staged": "^15.0.1",
     "rimraf": "^5.0.0",
     "rollup": "^2.79.0",
     "rollup-plugin-terser": "^7.0.2",