Merge pull request #7 from ttionya/feature/update

update dependencies (close #5)

Author: ttionya

package.json

@@ -35,7 +35,7 @@
     "@swc/core": "^1.3.0",
     "@ttionya/prettier-config": "workspace:*",
     "@types/mocha": "^10.0.0",
-    "eslint": "^8.25.0",
+    "eslint": "^8.26.0",
     "husky": "^8.0.0",
     "lint-staged": "^13.0.0",
     "mocha": "^10.0.0",

packages/eslint-config/dist/manifest.json

@@ -375,6 +375,7 @@
         "@typescript-eslint/no-unnecessary-condition",
         "@typescript-eslint/no-unnecessary-qualifier",
         "@typescript-eslint/no-unnecessary-type-arguments",
+        "@typescript-eslint/no-unsafe-declaration-merging",
         "@typescript-eslint/no-unused-expressions",
         "@typescript-eslint/no-use-before-define",
         "@typescript-eslint/no-useless-constructor",
@@ -399,7 +400,7 @@
         "@typescript-eslint/promise-function-async",
         "@typescript-eslint/require-array-sort-compare",
         "@typescript-eslint/return-await",
-        "@typescript-eslint/sort-type-union-intersection-members",
+        "@typescript-eslint/sort-type-constituents",
         "@typescript-eslint/strict-boolean-expressions",
         "@typescript-eslint/switch-exhaustiveness-check",
         "@typescript-eslint/typedef",

packages/eslint-config/dist/typescript.js

@@ -575,6 +575,13 @@ module.exports = {
          */
         '@typescript-eslint/no-unsafe-call': 'off',
 
+        /**
+         * 禁止 interface 和 class 的声明合并
+         * @see {@link https://typescript-eslint.io/rules/no-unsafe-declaration-merging/}
+         * @category TypeScript
+         */
+        '@typescript-eslint/no-unsafe-declaration-merging': 'error',
+
         /**
          * 禁止获取 any 类型的变量中的属性
          * @see {@link https://typescript-eslint.io/rules/no-unsafe-member-access/}
@@ -819,11 +826,11 @@ module.exports = {
 
         /**
          * 联合类型和交叉类型的每一项必须按字母排序
-         * @see {@link https://typescript-eslint.io/rules/sort-type-union-intersection-members/}
+         * @see {@link https://typescript-eslint.io/rules/sort-type-constituents/}
          * @category TypeScript
          * @fixable
          */
-        '@typescript-eslint/sort-type-union-intersection-members': 'off',
+        '@typescript-eslint/sort-type-constituents': 'off',
 
         /**
          * 条件判断必须传入布尔值

packages/eslint-config/package.json

@@ -50,8 +50,8 @@
     "@types/prettier": "^2.7.1",
     "@types/rimraf": "^3.0.2",
     "@types/yargs-parser": "^21.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.40.0",
+    "@typescript-eslint/eslint-plugin": "^5.42.0",
+    "@typescript-eslint/parser": "^5.42.0",
     "chai": "^4.3.0",
     "chalk": "^4.0.0",
     "eslint-config-prettier": "^8.5.0",
@@ -64,13 +64,13 @@
     "yargs-parser": "^21.1.0"
   },
   "dependencies": {
-    "eslint": "^8.25.0"
+    "eslint": "^8.26.0"
   },
   "peerDependencies": {
     "@babel/core": ">=7.18.0",
     "@babel/eslint-parser": ">=7.18.0",
-    "@typescript-eslint/eslint-plugin": "*",
-    "@typescript-eslint/parser": "*",
+    "@typescript-eslint/eslint-plugin": ">=5.42.0",
+    "@typescript-eslint/parser": ">=5.42.0",
     "typescript": "4.x"
   },
   "peerDependenciesMeta": {

packages/eslint-config/tests/typescript/index.js

@@ -54,6 +54,7 @@ module.exports = {
   'no-unsafe-argument': require('./no-unsafe-argument/.eslintrc.js'),
   'no-unsafe-assignment': require('./no-unsafe-assignment/.eslintrc.js'),
   'no-unsafe-call': require('./no-unsafe-call/.eslintrc.js'),
+  'no-unsafe-declaration-merging': require('./no-unsafe-declaration-merging/.eslintrc.js'),
   'no-unsafe-member-access': require('./no-unsafe-member-access/.eslintrc.js'),
   'no-unsafe-return': require('./no-unsafe-return/.eslintrc.js'),
   'no-unused-expressions': require('./no-unused-expressions/.eslintrc.js'),
@@ -80,7 +81,7 @@ module.exports = {
   'promise-function-async': require('./promise-function-async/.eslintrc.js'),
   'require-array-sort-compare': require('./require-array-sort-compare/.eslintrc.js'),
   'return-await': require('./return-await/.eslintrc.js'),
-  'sort-type-union-intersection-members': require('./sort-type-union-intersection-members/.eslintrc.js'),
+  'sort-type-constituents': require('./sort-type-constituents/.eslintrc.js'),
   'strict-boolean-expressions': require('./strict-boolean-expressions/.eslintrc.js'),
   'switch-exhaustiveness-check': require('./switch-exhaustiveness-check/.eslintrc.js'),
   'triple-slash-reference': require('./triple-slash-reference/.eslintrc.js'),

packages/eslint-config/tests/typescript/no-invalid-void-type/bad.ts

@@ -1,15 +1,14 @@
 /* eslint-disable */
 /* eslint-enable @typescript-eslint/no-invalid-void-type */
 
-// errorCount 7
+// errorCount 6
 
 export default 1
 
 type PossibleValues = string | number | void
 type MorePossibleValues = string | ((number & any) | (string | void))
 
 function logSomething(thing: void) {}
-function printArg<T = void>(arg: T) {}
 
 logSomething<void>(undefined)
 

packages/eslint-config/tests/typescript/no-invalid-void-type/good.ts

@@ -12,3 +12,5 @@ let trulyUndefined = void 0
 async function promiseMeSomething(): Promise<void> {}
 
 type stillVoid = void | never
+
+function printArg<T = void>(arg: T) {}

packages/eslint-config/tests/typescript/no-unsafe-declaration-merging/.eslintrc.js

@@ -0,0 +1,10 @@
+module.exports = {
+  rules: {
+    /**
+     * 禁止 interface 和 class 的声明合并
+     * @see {@link https://typescript-eslint.io/rules/no-unsafe-declaration-merging/}
+     * @category TypeScript
+     */
+    '@typescript-eslint/no-unsafe-declaration-merging': 'error',
+  },
+}

packages/eslint-config/tests/typescript/no-unsafe-declaration-merging/bad.ts

@@ -0,0 +1,8 @@
+/* eslint-disable */
+/* eslint-enable @typescript-eslint/no-unsafe-declaration-merging */
+
+// errorCount 2
+
+interface Foo {}
+
+class Foo {}

packages/eslint-config/tests/typescript/no-unsafe-declaration-merging/good.ts

@@ -0,0 +1,12 @@
+/* eslint-disable */
+/* eslint-enable @typescript-eslint/no-unsafe-declaration-merging */
+
+interface Foo {}
+class Bar implements Foo {}
+
+namespace Baz {}
+namespace Baz {}
+enum Baz {}
+
+namespace Qux {}
+function Qux() {}

packages/eslint-config/tests/typescript/sort-type-union-intersection-members/.eslintrc.js packages/eslint-config/tests/typescript/sort-type-constituents/.eslintrc.js

@@ -2,10 +2,10 @@ module.exports = {
   rules: {
     /**
      * 联合类型和交叉类型的每一项必须按字母排序
-     * @see {@link https://typescript-eslint.io/rules/sort-type-union-intersection-members/}
+     * @see {@link https://typescript-eslint.io/rules/sort-type-constituents/}
      * @category TypeScript
      * @fixable
      */
-    '@typescript-eslint/sort-type-union-intersection-members': 'off',
+    '@typescript-eslint/sort-type-constituents': 'off',
   },
 }