diff --git a/eslint.config.js b/eslint.config.js index ab6b15b605377..8f4a047740d5f 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -7,7 +7,7 @@ import { includeIgnoreFile } from '@eslint/compat' import { recommended } from '@nextcloud/eslint-config' import CypressEslint from 'eslint-plugin-cypress' import noOnlyTests from 'eslint-plugin-no-only-tests' -import { defineConfig } from 'eslint/config' +import { defineConfig } from 'eslint' import * as globals from 'globals' import { fileURLToPath } from 'node:url' diff --git a/package.json b/package.json index 3bf056dd126dc..8988cb102a578 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "cypress:version": "cypress version", "dev": "build/demi.sh dev", "postinstall": "build/demi.sh ci", - "lint": "eslint --suppressions-location build/eslint-baseline.json --no-error-on-unmatched-pattern ./cypress", + "lint": "eslint --suppress-all-from build/eslint-baseline.json --no-error-on-unmatched-pattern ./cypress", "postlint": "build/demi.sh lint", "lint:fix": "build/demi.sh lint:fix", "sass": "sass --style compressed --load-path core/css core/css/ $(for cssdir in $(find apps -mindepth 2 -maxdepth 2 -name \"css\"); do if ! $(git check-ignore -q $cssdir); then printf \"$cssdir \"; fi; done)", @@ -88,7 +88,7 @@ "cypress-split": "^1.24.28", "cypress-vite": "^1.8.0", "cypress-wait-until": "^3.0.2", - "eslint": "^9.39.2", + "eslint": "^10.0.0", "eslint-plugin-cypress": "^5.3.0", "eslint-plugin-no-only-tests": "^3.3.0", "is-svg": "^6.1.0",