Merge pull request #1844 from cosmos/simplify-eslint-flat-config-simon

Simplify eslint flat config (v2)

Author: webmaster128

.pnp.cjs

@@ -1,7 +1,5 @@
-import { fixupPluginRules } from "@eslint/compat";
 import js from "@eslint/js";
 import typescriptEslint from "@typescript-eslint/eslint-plugin";
-import tsParser from "@typescript-eslint/parser";
 import importt from "eslint-plugin-import";
 import prettier from "eslint-plugin-prettier/recommended";
 import simpleImportSort from "eslint-plugin-simple-import-sort";
@@ -13,11 +11,10 @@ export default [
   },
   js.configs.recommended,
   prettier,
-  // importt.flatConfigs.recommended,
+  importt.flatConfigs.recommended,
   {
     plugins: {
       "simple-import-sort": simpleImportSort,
-      import: fixupPluginRules(importt),
     },
 
     languageOptions: {
@@ -30,6 +27,12 @@ export default [
       ecmaVersion: 2022,
     },
 
+    settings: {
+      "import/resolver": {
+        typescript: {},
+      },
+    },
+
     rules: {
       curly: ["warn", "multi-line", "consistent"],
       "no-bitwise": "warn",
@@ -55,41 +58,26 @@ export default [
         },
       ],
 
-      "import/no-cycle": "off",
       "simple-import-sort/imports": "warn",
       "simple-import-sort/exports": "warn",
     },
   },
+  { files: ["**/*.ts"], ...importt.flatConfigs.typescript },
+  ...typescriptEslint.configs["flat/strict-type-checked"].map((c) => ({ files: ["**/*.ts"], ...c })),
   {
     files: ["**/*.ts"],
 
-    plugins: {
-      "@typescript-eslint": fixupPluginRules(typescriptEslint),
-    },
-
     languageOptions: {
-      parser: tsParser,
       ecmaVersion: 2022,
 
       parserOptions: {
         project: true,
       },
     },
 
-    settings: {
-      "import/resolver": {
-        typescript: {},
-      },
-    },
-
     rules: {
       "no-shadow": "off",
       "no-unused-vars": "off",
-      ...typescriptEslint.configs["flat/strict-type-checked"].reduce(
-        (obj, c) => Object.assign(obj, c.rules),
-        {},
-      ),
-      ...importt.flatConfigs.typescript.rules,
 
       // lints from 'strict-type-checked' config
       "@typescript-eslint/no-deprecated": "off",

.yarn/cache/@eslint-compat-npm-1.3.1-41a44c7960-8dfcea5ecb.zip

@@ -46,7 +46,6 @@
     "@cosmjs/encoding": "workspace:^",
     "@cosmjs/proto-signing": "workspace:^",
     "@cosmjs/stargate": "workspace:^",
-    "@eslint/compat": "^1.3.1",
     "@eslint/js": "^9.32.0",
     "@typescript-eslint/eslint-plugin": "^8.39.0",
     "@typescript-eslint/parser": "^8.39.0",

eslint.config.mjs

@@ -6,7 +6,7 @@ import { assert } from "@cosmjs/utils";
 import Transport from "@ledgerhq/hw-transport";
 // eslint-disable-next-line @typescript-eslint/naming-convention
 import CosmosApp from "@zondax/ledger-cosmos-js";
-import semver from "semver";
+import semverGte from "semver/functions/gte.js";
 
 const cosmosHdPath = makeCosmoshubPath(0);
 const cosmosBech32Prefix = "cosmos";
@@ -125,7 +125,7 @@ export class LedgerConnector {
 
   private async verifyAppVersion(): Promise<void> {
     const version = await this.getCosmosAppVersion();
-    if (!semver.gte(version, this.minLedgerAppVersion)) {
+    if (!semverGte(version, this.minLedgerAppVersion)) {
       throw new Error(
         `Outdated version: Please update ${this.ledgerAppName} Ledger App to the latest version.`,
       );

package.json

@@ -812,18 +812,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/compat@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "@eslint/compat@npm:1.3.1"
-  peerDependencies:
-    eslint: ^8.40 || 9
-  peerDependenciesMeta:
-    eslint:
-      optional: true
-  checksum: 10c0/8dfcea5ecb854111f9c0acc23a469e0a25cdaddceb5fb40c47988c247d6e32ec199bcd00f1b8ba9ed779228526552703c4b74948169e78b78b5fd814e04b042b
-  languageName: node
-  linkType: hard
-
 "@eslint/config-array@npm:^0.21.0":
   version: 0.21.0
   resolution: "@eslint/config-array@npm:0.21.0"
@@ -3087,7 +3075,6 @@ __metadata:
     "@cosmjs/encoding": "workspace:^"
     "@cosmjs/proto-signing": "workspace:^"
     "@cosmjs/stargate": "workspace:^"
-    "@eslint/compat": "npm:^1.3.1"
     "@eslint/js": "npm:^9.32.0"
     "@typescript-eslint/eslint-plugin": "npm:^8.39.0"
     "@typescript-eslint/parser": "npm:^8.39.0"