feat: Update packages

Pilaton · Mar 4, 2024 · 445ee70 · 445ee70
1 parent 2a37837
commit 445ee70
Show file tree

Hide file tree

Showing 4 changed files with 202 additions and 38 deletions.
diff --git a/packages/base/package.json b/packages/base/package.json
@@ -23,22 +23,21 @@
     "src"
   ],
   "dependencies": {
-    "@eslint/js": "^8.56.0",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@eslint/js": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard-with-typescript": "^43.0.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-unicorn": "^51.0.1",
-    "globals": "^13.24.0"
+    "globals": "^14.0.0",
+    "typescript-eslint": "^7.1.0"
   },
   "devDependencies": {
     "eslint-define-config": "^2.1.0"
   },
   "peerDependencies": {
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-define-config": "^2.1.0"
   }
 }
diff --git a/packages/base/src/configs/typescript.js b/packages/base/src/configs/typescript.js
@@ -1,26 +1,40 @@
-import typescriptPlugin from '@typescript-eslint/eslint-plugin';
-import typescriptParser from '@typescript-eslint/parser';
 import standardTSConfig from 'eslint-config-standard-with-typescript';
-import { defineFlatConfig } from 'eslint-define-config';
+import {
+  configs,
+  config as tsEslintConfigFunction,
+  plugin as tsEslintPlugin,
+  parser as tsEslintParser,
+} from 'typescript-eslint';
 
-const config = defineFlatConfig({
+const tsEslintConfig = {};
+for (const config of [
+  ...configs.recommended,
+  ...configs.recommendedTypeChecked,
+  ...configs.stylisticTypeChecked,
+]) {
+  if ('rules' in config) {
+    Object.assign(tsEslintConfig, config.rules);
+  }
+}
+
+const config = tsEslintConfigFunction({
   files: ['**/*.{ts,tsx}', '**/*.{test,spec,d}.ts'],
   settings: {
     configName: 'Typescript',
   },
   plugins: {
-    '@typescript-eslint': typescriptPlugin,
+    '@typescript-eslint': tsEslintPlugin,
   },
+
   languageOptions: {
-    parser: typescriptParser,
+    parser: tsEslintParser,
     parserOptions: {
       project: true,
     },
   },
+
   rules: {
-    ...typescriptPlugin.configs.recommended.rules,
-    ...typescriptPlugin.configs['recommended-type-checked'].rules,
-    ...typescriptPlugin.configs['stylistic-type-checked'].rules,
+    ...tsEslintConfig,
     ...standardTSConfig.rules,
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/strict-boolean-expressions': 'off',

diff --git a/packages/base/src/index.js b/packages/base/src/index.js
@@ -34,7 +34,7 @@ export default defineFlatConfig([
   promiseConfig,
   standardConfig,
 
-  typescriptConfig,
+  ...typescriptConfig,
   unicornConfig,
   prettierConfig,
 ]);