diff --git a/web/ui/module/codemirror-promql/.eslintrc.json b/web/ui/module/codemirror-promql/.eslintrc.json
deleted file mode 100644
index 8f6bf4864e..0000000000
--- a/web/ui/module/codemirror-promql/.eslintrc.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "parser": "@typescript-eslint/parser",
-    "extends": [
-      "plugin:@typescript-eslint/recommended",
-      "plugin:prettier/recommended"
-    ],
-    "rules": {
-      "@typescript-eslint/explicit-function-return-type": ["off"],
-      "eol-last": [
-        "error",
-        "always"
-      ],
-      "object-curly-spacing": [
-        "error",
-        "always"
-      ],
-      "prefer-const": "warn",
-      "comma-dangle": [
-        "error",
-        {
-          "arrays": "always-multiline",
-          "objects": "always-multiline",
-          "imports": "always-multiline"
-        }
-      ]
-    },
-    "plugins": [
-      "prettier"
-    ],
-    "ignorePatterns": ["node_modules/"],
-    "parserOptions": {
-      "sourceType": "module"
-    }
-  }
diff --git a/web/ui/module/codemirror-promql/eslint.config.mjs b/web/ui/module/codemirror-promql/eslint.config.mjs
new file mode 100644
index 0000000000..896cb7eece
--- /dev/null
+++ b/web/ui/module/codemirror-promql/eslint.config.mjs
@@ -0,0 +1,47 @@
+import { fixupConfigRules } from '@eslint/compat';
+import tsParser from '@typescript-eslint/parser';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import js from '@eslint/js';
+import { FlatCompat } from '@eslint/eslintrc';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [{
+    ignores: ['**/dist', '**/.eslintrc.cjs', 'node_modules/**'],
+}, ...fixupConfigRules(compat.extends(
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:prettier/recommended',
+)), {
+        languageOptions: {
+            parser: tsParser,
+        },
+        rules: {
+            '@typescript-eslint/explicit-function-return-type': ['off'],
+            'eol-last': [
+                'error',
+                'always',
+            ],
+            'object-curly-spacing': [
+                'error',
+                'always',
+            ],
+            'prefer-const': 'warn',
+            'comma-dangle': [
+                'error',
+                {
+                    'arrays': 'always-multiline',
+                    'objects': 'always-multiline',
+                    'imports': 'always-multiline',
+                },
+	    ],
+        },
+    },
+];