Merge pull request #1003 from modelix/deps/migrate-to-eslint-9

Migrate to ESLint 9

Author: Oleksandr Dzhychko

.github/workflows/linting.yml

@@ -8,6 +8,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: release-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+      - name: Install dependencies
+        run: npm ci
       - uses: actions/setup-python@v5
       - uses: pre-commit/[email protected]
 

.pre-commit-config.yaml

@@ -37,15 +37,11 @@ repos:
     hooks:
       - id: prettier
         files: ^(vue-model-api)|(model-api-gen-gradle-test/vue-integration)|(model-client-js-test/model-client-connection)/
-  - repo: https://github.com/pre-commit/mirrors-eslint
-    # IMPORTANT: keep versions of hook and additional dependencies in sync with the versions configured in `vue-model-api/package.json`
-    rev: v8.56.0
+  - repo: "local"
     hooks:
       - id: eslint
-        additional_dependencies:
-          - "[email protected]"
-          - "[email protected]"
-          - "@typescript-eslint/[email protected]"
-          - "@typescript-eslint/[email protected]"
-        files: ^(vue-model-api)|(ts-model-api)/src/
-        types: [ts]
+        name: ESLint
+        language: node
+        entry: npm
+        args: [ "run", "lint" ]
+        types: [ file ]

eslint.config.mjs

@@ -0,0 +1,49 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+import eslintConfigPrettier from "eslint-config-prettier";
+
+export default [
+  { files: ["**/*.{js,mjs,cjs,ts}"] },
+  { ignores: ["**/.gradle", "**/dist/", "**/build/"] },
+  {
+    languageOptions: {
+      ecmaVersion: "latest",
+      sourceType: "module",
+      globals: {
+          ...globals.browser,
+          ...globals.node,
+          ...globals.es2021
+      },
+    },
+  },
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+  eslintConfigPrettier, // > Turns off all rules that are unnecessary or might conflict with Prettier.
+  {
+    // The Redocly plugin uses CommonJS syntax for imports and exports as in the Redocly documentation.
+    files: ["model-server-openapi/**/*"],
+    rules: {
+      "@typescript-eslint/no-require-imports": "off"
+    }
+  },
+  {
+    rules: {
+      "@typescript-eslint/consistent-type-imports": "error",
+      "@typescript-eslint/no-import-type-side-effects": "error",
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          vars: "all",
+          args: "after-used",
+          varsIgnorePattern: "^_.+",
+          argsIgnorePattern: "^_.+",
+        },
+      ],
+      "@typescript-eslint/ban-ts-comment": [
+        "error",
+        { "ts-ignore": "allow-with-description" },
+      ],
+    },
+  },
+];

model-api-gen-gradle-test/typescript-generation/src/ChildrenAccessor.test.ts

@@ -4,8 +4,9 @@
  * of the generated languages, we will conduct the test here for now.
  */
 
+import type {
+  BaseCommentAttribute} from "../build/typescript_src/L_jetbrains_mps_lang_core";
 import {
-  BaseCommentAttribute,
   C_BaseCommentAttribute,
   C_BaseConcept,
   C_TypeAnnotated,

model-api-gen-gradle-test/typescript-generation/src/test-helpers.ts

@@ -1,5 +1,6 @@
 import { org } from "@modelix/model-client";
-import { ITypedNode, LanguageRegistry } from "@modelix/ts-model-api";
+import type { ITypedNode} from "@modelix/ts-model-api";
+import { LanguageRegistry } from "@modelix/ts-model-api";
 import { registerLanguages } from "../build/typescript_src";
 
 const DEFAULT_NODE_DATA = {

model-api-gen-gradle-test/vue-integration/src/intergration.test.ts

@@ -1,18 +1,18 @@
 import { useModelsFromJson } from "@modelix/vue-model-api";
 import { computed } from "vue";
 import { registerLanguages } from "typescript-generation";
+import type { BaseConcept } from "typescript-generation/dist/L_jetbrains_mps_lang_core";
 import {
-  BaseConcept,
   C_Attribute,
   C_INamedConcept,
   isOfConcept_INamedConcept,
 } from "typescript-generation/dist/L_jetbrains_mps_lang_core";
-import {
+import type {
   StaticFieldReference,
   Classifier,
 } from "typescript-generation/dist/L_jetbrains_mps_baseLanguage";
 
-import { ITypedNode, LanguageRegistry } from "@modelix/ts-model-api";
+import { LanguageRegistry } from "@modelix/ts-model-api";
 
 registerLanguages();
 

model-server/src/main/resources/public/content-explorer.js

@@ -11,6 +11,7 @@ function getExpandedNodeIds() {
         element => element.nextElementSibling?.getAttribute('data-nodeid'));
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars -- Used by HTML generated in Kotlin
 function scrollToElement(id) {
     document.getElementById(id).scrollIntoView();
 }