升级 eslint, typescript-eslint, husky, rimraf

AlloyTeam · Aug 30, 2019 · 559b96f · 559b96f
1 parent 92eafb9
commit 559b96f
Show file tree

Hide file tree

Showing 43 changed files with 627 additions and 221 deletions.
diff --git a/await-thenable/.eslintrc.js b/await-thenable/.eslintrc.js
@@ -0,0 +1,10 @@
+module.exports = {
+    rules: {
+        /**
+         * 禁止对没有 then 方法的对象使用 await
+         * @category TypeScript
+         * @requires-types-information
+         */
+        '@typescript-eslint/await-thenable': 'off'
+    }
+};
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<html><head><meta charset="utf-8"><meta http-equiv="x-ua-compatible" content="ie=edge"><title>AlloyTeam ESLint 规则</title><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="shortcut icon" type="image/png" href="alloy.f4abfc6f.png"><link rel="stylesheet" href="site.127e0b37.css"></head><body> <div id="app"></div> <script src="site.08fcf7bc.js"></script> </body></html>
+<html><head><meta charset="utf-8"><meta http-equiv="x-ua-compatible" content="ie=edge"><title>AlloyTeam ESLint 规则</title><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="shortcut icon" type="image/png" href="alloy.f4abfc6f.png"><link rel="stylesheet" href="site.127e0b37.css"></head><body> <div id="app"></div> <script src="site.8cf4e64e.js"></script> </body></html>
diff --git a/docs/site.08fcf7bc.js.map b/docs/site.08fcf7bc.js.map
diff --git a/docs/site.08fcf7bc.js → docs/site.8cf4e64e.js b/docs/site.08fcf7bc.js → docs/site.8cf4e64e.js
diff --git a/docs/site.8cf4e64e.js.map b/docs/site.8cf4e64e.js.map
diff --git a/index.js b/index.js
@@ -10,13 +10,13 @@
  *     Swan <noreply@github.com>
  *
  * 依赖版本：
- *     eslint ^5.16.0
+ *     eslint ^6.2.2
  *     babel-eslint ^10.0.1
  *     eslint-plugin-react ^7.14.2
  *     vue-eslint-parser ^5.0.0
  *     eslint-plugin-vue ^5.2.3
- *     @typescript-eslint/parser ^1.10.2
- *     @typescript-eslint/eslint-plugin ^1.10.2
+ *     @typescript-eslint/parser ^2.0.0
+ *     @typescript-eslint/eslint-plugin ^2.0.0
  *
  * 此文件是由脚本 scripts/build.ts 自动生成
  *
@@ -32,6 +32,12 @@ module.exports = {
          * @category Possible Errors
          */
         'for-direction': 'error',
+        /**
+         * 函数参数之间的换行模式必须保持一致
+         * @category Possible Errors
+         * @fixable
+         */
+        'function-call-argument-newline': ['error', 'consistent'],
         /**
          * getter 必须有返回值，并且禁止返回空
          * @category Possible Errors

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,24 +62,24 @@
     "dependencies": {},
     "devDependencies": {
         "@types/doctrine": "0.0.3",
-        "@types/eslint": "^4.16.6",
+        "@types/eslint": "^4.16.8",
         "@types/node": "^12.0.2",
         "@types/prettier": "^1.16.4",
         "@types/react": "^16.8.18",
         "@types/react-dom": "^16.8.4",
         "@types/react-tooltip": "^3.9.3",
         "@types/xml-escape": "^1.1.0",
-        "@typescript-eslint/eslint-plugin": "^1.10.2",
-        "@typescript-eslint/parser": "^1.10.2",
+        "@typescript-eslint/eslint-plugin": "^2.0.0",
+        "@typescript-eslint/parser": "^2.0.0",
         "axios": "^0.19.0",
         "babel-eslint": "^10.0.1",
         "doctrine": "^3.0.0",
         "eclint": "^2.8.1",
-        "eslint": "^5.16.0",
-        "eslint-config-prettier": "^5.0.0",
+        "eslint": "^6.2.2",
+        "eslint-config-prettier": "^6.1.0",
         "eslint-plugin-react": "^7.14.2",
         "eslint-plugin-vue": "^5.2.3",
-        "husky": "^2.3.0",
+        "husky": "^3.0.4",
         "insert-tag": "^0.1.2",
         "mobi-plugin-color": "^1.0.0",
         "mobi.css": "^3.1.1",
@@ -90,7 +90,7 @@
         "react": "^16.8.6",
         "react-dom": "^16.8.6",
         "react-tooltip": "^3.10.0",
-        "rimraf": "^2.6.3",
+        "rimraf": "^3.0.0",
         "ts-node": "^7.0.1",
         "typescript": "^3.4.5",
         "vue-eslint-parser": "^5.0.0",

diff --git a/react.js b/react.js
@@ -10,13 +10,13 @@
  *     Swan <noreply@github.com>
  *
  * 依赖版本：
- *     eslint ^5.16.0
+ *     eslint ^6.2.2
  *     babel-eslint ^10.0.1
  *     eslint-plugin-react ^7.14.2
  *     vue-eslint-parser ^5.0.0
  *     eslint-plugin-vue ^5.2.3
- *     @typescript-eslint/parser ^1.10.2
- *     @typescript-eslint/eslint-plugin ^1.10.2
+ *     @typescript-eslint/parser ^2.0.0
+ *     @typescript-eslint/eslint-plugin ^2.0.0
  *
  * 此文件是由脚本 scripts/build.ts 自动生成
  *

diff --git a/scripts/build.ts b/scripts/build.ts
@@ -26,8 +26,8 @@ const pkg = require('../package.json');
 class Builder {
     private namespace: RuleNamespaces = 'index';
     private ruleList: Rule[] = [];
-    private rulesContent: string = '';
-    private namespaceEslintrcContent: string = '';
+    private rulesContent = '';
+    private namespaceEslintrcContent = '';
 
     public build(namespace: RuleNamespaces) {
         this.namespace = namespace;

diff --git a/site/config/index.json b/site/config/index.json
diff --git a/site/config/typescript.json b/site/config/typescript.json
diff --git a/test/index/function-call-argument-newline/.eslintrc.js b/test/index/function-call-argument-newline/.eslintrc.js
@@ -0,0 +1,10 @@
+module.exports = {
+    rules: {
+        /**
+         * 函数参数之间的换行模式必须保持一致
+         * @category Possible Errors
+         * @fixable
+         */
+        'function-call-argument-newline': ['error', 'consistent']
+    }
+};
diff --git a/test/index/function-call-argument-newline/bad.js b/test/index/function-call-argument-newline/bad.js
@@ -0,0 +1,2 @@
+foo('one', 'two',
+'three');
diff --git a/test/index/function-call-argument-newline/good.js b/test/index/function-call-argument-newline/good.js
@@ -0,0 +1,6 @@
+foo('one', 'two', 'three');
+bar(
+    'one',
+    'two',
+    'three'
+);
diff --git a/test/typescript/consistent-type-assertions/.eslintrc.js b/test/typescript/consistent-type-assertions/.eslintrc.js
@@ -0,0 +1,16 @@
+module.exports = {
+    rules: {
+        /**
+         * 类型断言必须使用 as Type，禁止使用 <Type>，禁止对对象字面量进行类型断言（断言成 any 是允许的）
+         * @category TypeScript
+         * @reason <Type> 容易被理解为 jsx
+         */
+        '@typescript-eslint/consistent-type-assertions': [
+            'error',
+            {
+                assertionStyle: 'as',
+                objectLiteralTypeAssertions: 'never'
+            }
+        ]
+    }
+};
diff --git a/...pt/no-angle-bracket-type-assertion/bad.ts → ...escript/consistent-type-assertions/bad.ts b/...pt/no-angle-bracket-type-assertion/bad.ts → ...escript/consistent-type-assertions/bad.ts
@@ -1,2 +1,6 @@
 let bar1: string | number;
 const foo1 = <string>bar1;
+
+const baz1 = { 
+    bar: 1
+} as object;
diff --git a/...t/no-angle-bracket-type-assertion/good.ts → ...script/consistent-type-assertions/good.ts b/...t/no-angle-bracket-type-assertion/good.ts → ...script/consistent-type-assertions/good.ts
@@ -1,2 +1,6 @@
 let bar2: string | number;
 const foo2 = bar2 as string;
+
+const baz2 = { 
+    bar: 1
+} as any;
diff --git a/...ngle-bracket-type-assertion/tsconfig.json → .../consistent-type-assertions/tsconfig.json b/...ngle-bracket-type-assertion/tsconfig.json → .../consistent-type-assertions/tsconfig.json
diff --git a/.../typescript/prefer-interface/.eslintrc.js → .../consistent-type-definitions/.eslintrc.js b/.../typescript/prefer-interface/.eslintrc.js → .../consistent-type-definitions/.eslintrc.js
@@ -6,6 +6,6 @@ module.exports = {
          * @reason 接口可以 implement extend 和 merge
          * @fixable
          */
-        '@typescript-eslint/prefer-interface': 'error'
+        '@typescript-eslint/consistent-type-definitions': ['error', 'interface']
     }
 };
diff --git a/test/typescript/prefer-interface/bad.ts → ...script/consistent-type-definitions/bad.ts b/test/typescript/prefer-interface/bad.ts → ...script/consistent-type-definitions/bad.ts
diff --git a/test/typescript/prefer-interface/good.ts → ...cript/consistent-type-definitions/good.ts b/test/typescript/prefer-interface/good.ts → ...cript/consistent-type-definitions/good.ts
diff --git a/...ject-literal-type-assertion/tsconfig.json → ...consistent-type-definitions/tsconfig.json b/...ject-literal-type-assertion/tsconfig.json → ...consistent-type-definitions/tsconfig.json
diff --git a/test/typescript/no-angle-bracket-type-assertion/.eslintrc.js b/test/typescript/no-angle-bracket-type-assertion/.eslintrc.js
diff --git a/test/typescript/no-misused-promises/.eslintrc.js b/test/typescript/no-misused-promises/.eslintrc.js
@@ -0,0 +1,10 @@
+module.exports = {
+    rules: {
+        /**
+         * 避免错误的使用 Promise
+         * @category TypeScript
+         * @requires-types-information
+         */
+        '@typescript-eslint/no-misused-promises': 'off'
+    }
+};
diff --git a/test/typescript/no-object-literal-type-assertion/.eslintrc.js b/test/typescript/no-object-literal-type-assertion/.eslintrc.js
diff --git a/test/typescript/no-object-literal-type-assertion/bad.ts b/test/typescript/no-object-literal-type-assertion/bad.ts
diff --git a/test/typescript/no-object-literal-type-assertion/good.ts b/test/typescript/no-object-literal-type-assertion/good.ts
diff --git a/test/typescript/no-triple-slash-reference/.eslintrc.js b/test/typescript/no-triple-slash-reference/.eslintrc.js
diff --git a/test/typescript/prefer-readonly/.eslintrc.js b/test/typescript/prefer-readonly/.eslintrc.js
@@ -0,0 +1,10 @@
+module.exports = {
+    rules: {
+        /**
+         * 私有变量如果没有在构造函数外被赋值，则必须设为 readonly
+         * @category TypeScript
+         * @requires-types-information
+         */
+        '@typescript-eslint/prefer-readonly': 'off'
+    }
+};
diff --git a/test/typescript/require-await/.eslintrc.js b/test/typescript/require-await/.eslintrc.js
@@ -0,0 +1,10 @@
+module.exports = {
+    rules: {
+        /**
+         * async 函数中必须存在 await 语句
+         * @category TypeScript
+         * @requires-types-information
+         */
+        '@typescript-eslint/require-await': 'off'
+    }
+};
diff --git a/test/typescript/strict-boolean-expressions/.eslintrc.js b/test/typescript/strict-boolean-expressions/.eslintrc.js
@@ -0,0 +1,10 @@
+module.exports = {
+    rules: {
+        /**
+         * 条件判断必须传入布尔值
+         * @category TypeScript
+         * @requires-types-information
+         */
+        '@typescript-eslint/strict-boolean-expressions': 'off'
+    }
+};
diff --git a/test/typescript/triple-slash-reference/.eslintrc.js b/test/typescript/triple-slash-reference/.eslintrc.js
@@ -0,0 +1,13 @@
+module.exports = {
+    rules: {
+        /**
+         * 禁止使用三斜杠导入文件
+         * @category TypeScript
+         * @reason 三斜杠是已废弃的语法，但在类型声明文件中还是可以使用的
+         */
+        '@typescript-eslint/triple-slash-reference': [
+            'error',
+            { path: 'never', types: 'always', lib: 'always' }
+        ]
+    }
+};
diff --git a/...cript/no-triple-slash-reference/Animal.ts → ...pescript/triple-slash-reference/Animal.ts b/...cript/no-triple-slash-reference/Animal.ts → ...pescript/triple-slash-reference/Animal.ts
diff --git a/...pescript/no-triple-slash-reference/bad.ts → .../typescript/triple-slash-reference/bad.ts b/...pescript/no-triple-slash-reference/bad.ts → .../typescript/triple-slash-reference/bad.ts
diff --git a/...escript/no-triple-slash-reference/good.ts → ...typescript/triple-slash-reference/good.ts b/...escript/no-triple-slash-reference/good.ts → ...typescript/triple-slash-reference/good.ts
diff --git a/...t/no-triple-slash-reference/tsconfig.json → ...ript/triple-slash-reference/tsconfig.json b/...t/no-triple-slash-reference/tsconfig.json → ...ript/triple-slash-reference/tsconfig.json
diff --git a/test/typescript/typedef/.eslintrc.js b/test/typescript/typedef/.eslintrc.js
@@ -0,0 +1,20 @@
+module.exports = {
+    rules: {
+        /**
+         * interface 和 type 定义时必须声明成员的类型
+         * @category TypeScript
+         */
+        '@typescript-eslint/typedef': [
+            'error',
+            {
+                arrayDestructuring: false,
+                arrowParameter: false,
+                memberVariableDeclaration: false,
+                objectDestructuring: false,
+                parameter: false,
+                propertyDeclaration: true,
+                variableDeclaration: false
+            }
+        ]
+    }
+};
diff --git a/test/typescript/typedef/bad.ts b/test/typescript/typedef/bad.ts
@@ -0,0 +1,4 @@
+type Foo1 = {
+    bar;
+    baz;
+};
diff --git a/test/typescript/typedef/good.ts b/test/typescript/typedef/good.ts
@@ -0,0 +1,4 @@
+type Foo2 = {
+    bar: boolean;
+    baz: string;
+};
diff --git a/...typescript/prefer-interface/tsconfig.json → test/typescript/typedef/tsconfig.json b/...typescript/prefer-interface/tsconfig.json → test/typescript/typedef/tsconfig.json