Upgrade ESLint to v9 (#3230)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Manuel Blum <[email protected]>
Co-authored-by: Alexander Kaufmann <[email protected]>
Co-authored-by: Johannes Obermair <[email protected]>

.changeset/four-houses-taste.md

@@ -0,0 +1,5 @@
+---
+"@comet/eslint-config": major
+---
+
+Bump ESLint peer dependency to v9

demo/admin/.prettierrc.json

@@ -1,6 +1,6 @@
 {
     "printWidth": 150,
+    "semi": true,
     "tabWidth": 4,
-    "trailingComma": "all",
-    "semi": true
+    "trailingComma": "all"
 }

demo/admin/eslint.config.mjs

@@ -0,0 +1,16 @@
+import eslintConfigReact from "@comet/eslint-config/react.js";
+
+/** @type {import('eslint')} */
+const config = [
+    {
+        ignores: ["schema.json", "src/fragmentTypes.json", "dist/**", "src/**/*.generated.ts"],
+    },
+    ...eslintConfigReact,
+    {
+        rules: {
+            "@calm/react-intl/missing-formatted-message": "off",
+        },
+    },
+];
+
+export default config;

demo/admin/package.json

@@ -14,7 +14,7 @@
         "intl:compile:comet-demo": "formatjs compile-folder --format simple --ast lang/comet-demo-lang/admin lang-compiled/comet-demo-lang-admin",
         "intl:extract": "formatjs extract \"src/**/*.ts*\" --ignore ./**.d.ts --out-file lang-extracted/en.json --format simple",
         "lint": "run-s intl:compile && run-p gql:types generate-block-types && run-p lint:prettier lint:eslint lint:tsc && $npm_execpath lint:generated-files-not-modified",
-        "lint:eslint": "eslint --max-warnings 0  --config ./.eslintrc.cli.js --ext .ts,.tsx,.js,.jsx,.json,.md src/ package.json",
+        "lint:eslint": "eslint --max-warnings 0 src/ **/*.json --no-warn-ignored",
         "lint:generated-files-not-modified": "$npm_execpath admin-generator && git diff --exit-code HEAD -- src/**/generated",
         "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'",
         "lint:tsc": "tsc --project .",
@@ -77,9 +77,9 @@
         "@types/react-router-dom": "^5.0.0",
         "@vitejs/plugin-react-swc": "^3.7.2",
         "chokidar-cli": "^3.0.0",
+        "cosmiconfig-toml-loader": "^1.0.0",
         "dotenv-cli": "^7.4.4",
-        "eslint": "^8.0.0",
-        "eslint-plugin-graphql": "^4.0.0",
+        "eslint": "^9.18.0",
         "kill-port": "^2.0.1",
         "npm-run-all2": "^5.0.2",
         "prettier": "^3.4.2",

demo/admin/src/config.tsx

@@ -13,7 +13,6 @@ export function createConfig() {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             environmentVariables[variableName] = (window as any)[externalVariableName];
         } else {
-            // eslint-disable-next-line no-console
             console.warn(`External variable ${externalVariableName} not set"`);
         }
     }

demo/admin/src/dam/ImportFromPicsum.tsx

@@ -1,6 +1,13 @@
 import { CancelButton, messages, SaveButton } from "@comet/admin";
 import { useCurrentDamFolder, useDamAcceptedMimeTypes, useDamFileUpload } from "@comet/cms-admin";
-import { Button, Dialog, DialogActions, DialogContent, DialogTitle } from "@mui/material";
+import {
+    Button,
+    // eslint-disable-next-line no-restricted-imports
+    Dialog,
+    DialogActions,
+    DialogContent,
+    DialogTitle,
+} from "@mui/material";
 import { styled } from "@mui/material/styles";
 import { useState } from "react";
 import { FormattedMessage } from "react-intl";

demo/admin/src/products/ProductsGridPreviewAction.tsx

@@ -1,6 +1,13 @@
 import { Tooltip } from "@comet/admin";
 import { View } from "@comet/admin-icons";
-import { Dialog, DialogContent, DialogTitle, IconButton, Typography } from "@mui/material";
+import {
+    // eslint-disable-next-line no-restricted-imports
+    Dialog,
+    DialogContent,
+    DialogTitle,
+    IconButton,
+    Typography,
+} from "@mui/material";
 import { GridCellParams, GridValidRowModel } from "@mui/x-data-grid-pro";
 import { GQLProductsGridFutureFragment } from "@src/products/future/generated/ProductsGrid.generated";
 import { GQLProductsListManualFragment } from "@src/products/ProductsGrid.generated";

demo/admin/src/userGroups/UserGroupContextMenuItem.tsx

@@ -1,6 +1,15 @@
 import { messages, SelectField } from "@comet/admin";
 import { Account } from "@comet/admin-icons";
-import { Button, Dialog, DialogActions, DialogContent, DialogTitle, ListItemIcon, MenuItem } from "@mui/material";
+import {
+    Button,
+    // eslint-disable-next-line no-restricted-imports
+    Dialog,
+    DialogActions,
+    DialogContent,
+    DialogTitle,
+    ListItemIcon,
+    MenuItem,
+} from "@mui/material";
 import { GQLUserGroup } from "@src/graphql.generated";
 import { useState } from "react";
 import { Form } from "react-final-form";

demo/admin/tsconfig.json

@@ -1,28 +1,28 @@
 {
-    "ts-node": {
-        "compilerOptions": {
-            "module": "commonjs"
-        }
-    },
     "compilerOptions": {
-        "target": "ESNext",
-        "module": "ESNext",
-        "moduleResolution": "Node",
-        "noImplicitAny": true,
-        "strictNullChecks": true,
+        "allowSyntheticDefaultImports": true,
+        "baseUrl": "./",
+        "esModuleInterop": true,
+        "inlineSources": true,
         "jsx": "react-jsx",
         "jsxImportSource": "@emotion/react",
+        "module": "ESNext",
+        "moduleResolution": "Node",
         "noEmit": true,
-        "skipLibCheck": true,
-        "baseUrl": "./",
+        "noImplicitAny": true,
         "paths": {
             "@src/*": ["src/*"]
         },
-        "esModuleInterop": true,
         "resolveJsonModule": true,
-        "allowSyntheticDefaultImports": true,
+        "skipLibCheck": true,
         "sourceMap": true,
-        "inlineSources": true
+        "strictNullChecks": true,
+        "target": "ESNext"
     },
-    "include": ["src/**/*"]
+    "include": ["src/**/*"],
+    "ts-node": {
+        "compilerOptions": {
+            "module": "commonjs"
+        }
+    }
 }

demo/api/.prettierrc.json

@@ -1,6 +1,6 @@
 {
     "printWidth": 150,
+    "semi": true,
     "tabWidth": 4,
-    "trailingComma": "all",
-    "semi": true
+    "trailingComma": "all"
 }

demo/api/eslint.config.mjs

@@ -0,0 +1,11 @@
+import eslintConfigNestJs from "@comet/eslint-config/nestjs.js";
+
+/** @type {import('eslint')} */
+const config = [
+    {
+        ignores: ["src/db/migrations/**", "dist/**", "src/**/*.generated.ts"],
+    },
+    ...eslintConfigNestJs,
+];
+
+export default config;

demo/api/package.json

@@ -13,7 +13,7 @@
         "fixtures": "$npm_execpath console fixtures --",
         "fixtures:prod": "$npm_execpath console:prod fixtures --",
         "lint": "run-p lint:prettier lint:eslint lint:tsc && $npm_execpath lint:generated-files-not-modified",
-        "lint:eslint": "eslint --max-warnings 0  --ext .ts,.tsx,.js,.jsx,.json,.md src/ package.json",
+        "lint:eslint": "eslint --max-warnings 0 src/ **/*.json --no-warn-ignored",
         "lint:generated-files-not-modified": "$npm_execpath api-generator && git diff --exit-code HEAD -- src/**/generated",
         "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'",
         "lint:tsc": "tsc --project ./tsconfig.lint.json",
@@ -72,18 +72,18 @@
         "@types/node": "^22.10.7",
         "@types/response-time": "^2.3.8",
         "dotenv-cli": "^7.4.4",
-        "eslint": "^8.0.0",
+        "eslint": "^9.18.0",
         "npm-run-all2": "^5.0.2",
         "prettier": "^3.4.2",
         "ts-node": "^10.9.2",
         "tsconfig-paths": "^3.15.0",
         "typescript": "^4.0.0"
     },
     "mikro-orm": {
-        "useTsNode": true,
         "configPaths": [
             "./src/db/ormconfig.cli.ts",
             "./dist/db/ormconfig.cli.js"
-        ]
+        ],
+        "useTsNode": true
     }
 }

demo/api/src/config/config.ts

@@ -4,7 +4,6 @@ import { validateSync } from "class-validator";
 
 import { EnvironmentVariables } from "./environment-variables";
 
-// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 export function createConfig(processEnv: NodeJS.ProcessEnv) {
     const envVars = plainToClass(EnvironmentVariables, { ...processEnv });
     const errors = validateSync(envVars, { skipMissingProperties: false });

demo/api/src/content-scope/content-scope.interface.ts

@@ -3,6 +3,6 @@ import { ContentScope } from "@comet/cms-api";
 import { ContentScope as BaseContentScope } from "@src/site-configs";
 
 declare module "@comet/cms-api" {
-    // eslint-disable-next-line @typescript-eslint/no-empty-interface
+    // eslint-disable-next-line @typescript-eslint/no-empty-object-type
     interface ContentScope extends BaseContentScope {}
 }

demo/api/src/db/fixtures/generators/blocks/image.generator.ts

@@ -25,7 +25,6 @@ export const generateImageBlock = (
     };
 };
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export const calculateDefaultCropInput = ({ image }: FileInterface): ImageCropAreaInput => {
     const focalPoint = faker.random.arrayElement([
         FocalPoint.SMART,

demo/api/src/main.ts

@@ -1,8 +1,10 @@
 import helmet from "helmet";
 
 if (process.env.TRACING == "production") {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./tracing.production");
 } else if (process.env.TRACING == "dev") {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     require("./tracing.dev");
 }
 

demo/api/src/products/entities/product.entity.ts

@@ -124,7 +124,6 @@ export class Product extends BaseEntity {
     @Field(() => ProductPriceRange, { nullable: true })
     priceRange?: ProductPriceRange = undefined;
 
-    // eslint-disable-next-line @typescript-eslint/no-inferrable-types
     @Property({ type: types.boolean })
     @Field()
     inStock: boolean = true;

demo/api/tsconfig.build.json

@@ -1,7 +1,7 @@
 {
-    "extends": "./tsconfig.json",
     "compilerOptions": {
         "inlineSources": true,
         "sourceRoot": "/dist"
-    }
+    },
+    "extends": "./tsconfig.json"
 }

demo/api/tsconfig.json

@@ -1,24 +1,24 @@
 {
     "compilerOptions": {
-        "target": "es2017",
+        "baseUrl": "./",
+        "emitDecoratorMetadata": true,
+        "esModuleInterop": true,
+        "experimentalDecorators": true,
+        "incremental": true,
+        "lib": ["esnext"],
         "module": "commonjs",
         "moduleResolution": "node",
-        "lib": ["esnext"],
+        "outDir": "./dist",
+        "paths": {
+            "@src/*": ["src/*"]
+        },
         "removeComments": true,
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
+        "resolveJsonModule": true,
+        "skipLibCheck": true,
         "sourceMap": true,
-        "outDir": "./dist",
-        "baseUrl": "./",
-        "incremental": true,
-        "esModuleInterop": true,
         "strict": true,
-        "strictPropertyInitialization": false,
         "strictNullChecks": true,
-        "skipLibCheck": true,
-        "resolveJsonModule": true,
-        "paths": {
-            "@src/*": ["src/*"]
-        }
+        "strictPropertyInitialization": false,
+        "target": "es2017"
     }
 }

demo/api/tsconfig.lint.json

@@ -1,7 +1,7 @@
 {
-    "extends": "./tsconfig.json",
     "compilerOptions": {
         "incremental": false,
         "noEmit": true
-    }
+    },
+    "extends": "./tsconfig.json"
 }

demo/site-pages/.prettierrc.json

@@ -1,6 +1,6 @@
 {
     "printWidth": 150,
+    "semi": true,
     "tabWidth": 4,
-    "trailingComma": "all",
-    "semi": true
+    "trailingComma": "all"
 }

demo/site-pages/eslint.config.mjs

@@ -0,0 +1,16 @@
+import eslintConfigNextJs from "@comet/eslint-config/nextjs.js";
+
+/** @type {import('eslint')} */
+const config = [
+    {
+        ignores: ["**/**/*.generated.ts", "dist/**", "lang/**", "lang-compiled/**", "lang-extracted/**"],
+    },
+    ...eslintConfigNextJs,
+    {
+        rules: {
+            "@calm/react-intl/missing-formatted-message": "off",
+        },
+    },
+];
+
+export default config;

demo/site-pages/package.json

@@ -18,7 +18,7 @@
         "intl:compile": "formatjs compile-folder --format simple --ast lang/comet-demo-lang/site lang-compiled/",
         "intl:extract": "formatjs extract \"src/**/*.ts*\" --ignore **/*.d.ts --out-file lang-extracted/en.json --format simple",
         "lint": "run-s intl:compile && run-p gql:types generate-block-types && run-p lint:eslint lint:tsc",
-        "lint:eslint": "eslint --max-warnings 0 --config ./.eslintrc.cli.js --ext .ts,.tsx,.js,.jsx,.json,.md src/ package.json",
+        "lint:eslint": "eslint --max-warnings 0 src/ **/*.json --no-warn-ignored",
         "lint:tsc": "tsc --project .",
         "lint:tscPreBuild": "tsc --project tsconfig.preBuild.json",
         "next-build": "$npm_execpath build:publicGenerated && next build",
@@ -57,7 +57,7 @@
         "@types/react": "^18.3.18",
         "@types/react-dom": "^18.3.5",
         "chokidar-cli": "^3.0.0",
-        "eslint": "^8.0.0",
+        "eslint": "^9.18.0",
         "npm-run-all2": "^5.0.2",
         "prettier": "^3.4.2",
         "rimraf": "^6.0.1",

demo/site-pages/src/config.ts

@@ -1,5 +1,3 @@
-/* eslint-disable no-console */
-
 export let domain = "";
 
 if (!process.env.NEXT_PUBLIC_SITE_PAGES_DOMAIN) {