easy-soft-develop 2.0.160 → 2.0.162

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-soft-develop",
-  "version": "2.0.160",
+  "version": "2.0.162",
   "description": "",
   "homepage": "https://github.com/kityandhero/easy-soft-develop#readme",
   "bugs": {

package/src/templates/eslint.template.js

@@ -65,7 +65,7 @@ const contentFile = {
 
 const configFileContent = `${fileGlobalHeader}
 const { rules } = require('./items/rules');
-const { parserOptions } = require('./items/parser');
+const { parserJsOptions, parserTsOptions } = require('./items/parser');
 const { pluginCollection } = require('./items/plugins');
 const { extendCollection } = require('./items/extends');
 const { settings } = require('./items/settings');
@@ -84,11 +84,16 @@ module.exports = {
       shelljs: true,
       node: true,
     },
-    plugins: [
-      ...pluginCollection,
-    ],
+    plugins: [...pluginCollection],
     parser: '@babel/eslint-parser',
-    parserOptions: parserOptions,
+    parserOptions: parserJsOptions,
+    overrides: [
+      {
+        files: ['*.ts', '*.tsx'],
+        parser: '@typescript-eslint/parser',
+        parserOptions: parserTsOptions,
+      },
+    ],
     rules: rules,
     settings: settings,
   },
@@ -437,7 +442,7 @@ const pluginFile = {
 };
 
 const parserEmbedFileContent = `${fileGlobalHeader}
-const parserOptions = {
+const parserJsOptions = {
   requireConfigFile: false,
   babelOptions: {
     presets: ['@babel/preset-react'],
@@ -448,8 +453,15 @@ const parserOptions = {
   },
 };
 
+const parserTsOptions = {
+  ecmaFeatures: {
+    jsx: true,
+  },
+};
+
 module.exports = {
-  parserOptions: { ...parserOptions },
+  parserJsOptions: { ...parserJsOptions },
+  parserTsOptions: { ...parserTsOptions },
 };
 `;
 
@@ -461,10 +473,13 @@ const parserEmbedFile = {
 };
 
 const parserCustomFileContent = `${fileGlobalHeader}
-const parserOptions = {};
+const parserJsOptions = {};
+
+const parserTsOptions = {};
 
 module.exports = {
-  parserOptions: { ...parserOptions },
+  parserJsOptions: { ...parserJsOptions },
+  parserTsOptions: { ...parserTsOptions },
 };
 `;
 
@@ -476,11 +491,18 @@ const parserCustomFile = {
 };
 
 const parserFileContent = `${fileGlobalHeader}
-const { parserOptions: embedParserOptions } = require('./embed');
-const { parserOptions: customParserOptions } = require('./custom');
+const {
+  parserJsOptions: embedParserJsOptions,
+  parserTsOptions: embedParserTsOptions,
+} = require('./embed');
+const {
+  parserJsOptions: customParserJsOptions,
+  parserTsOptions: customParserTsOptions,
+} = require('./custom');
 
 module.exports = {
-  parserOptions: { ...embedParserOptions, ...customParserOptions },
+  parserJsOptions: { ...embedParserJsOptions, ...customParserJsOptions },
+  parserTsOptions: { ...embedParserTsOptions, ...customParserTsOptions },
 };
 `;
 

package/src/tools/package.script.js

@@ -64,6 +64,8 @@ function getGlobalPackages() {
 
   packages = packages.concat(['@typescript-eslint/parser']);
 
+  packages = packages.concat(['@types/node']);
+
   packages = packages.concat('rimraf', 'lint-staged', 'husky');
 
   packages = packages.concat('easy-soft-develop');