From 38bb5fc7ceadbbf99baca0673d576fc47b60aedf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 23:28:06 +0000 Subject: [PATCH 1/2] chore(deps): update dependency @vue/eslint-config-prettier to v10 --- frontend/package-lock.json | 14 +++++++------- frontend/package.json | 2 +- pdf/package-lock.json | 14 +++++++------- pdf/package.json | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 274b8fc8c4..ec65d2b216 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -81,7 +81,7 @@ "@vitejs/plugin-vue2": "2.3.3", "@vitest/coverage-v8": "2.1.8", "@vue/babel-preset-app": "5.0.8", - "@vue/eslint-config-prettier": "9.0.0", + "@vue/eslint-config-prettier": "10.1.0", "@vue/test-utils": "1.3.6", "autoprefixer": "10.4.20", "babel-plugin-require-context-hook": "1.0.0", @@ -4507,17 +4507,17 @@ "license": "ISC" }, "node_modules/@vue/eslint-config-prettier": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", - "integrity": "sha512-z1ZIAAUS9pKzo/ANEfd2sO+v2IUalz7cM/cTLOZ7vRFOPk5/xuRKQteOu1DErFLAh/lYGXMVZ0IfYKlyInuDVg==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-10.1.0.tgz", + "integrity": "sha512-J6wV91y2pXc0Phha01k0WOHBTPsoSTf4xlmMjoKaeSxBpAdsgTppGF5RZRdOHM7OA74zAXD+VLANrtYXpiPKkQ==", "dev": true, "license": "MIT", "dependencies": { - "eslint-config-prettier": "^9.0.0", - "eslint-plugin-prettier": "^5.0.0" + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-prettier": "^5.2.1" }, "peerDependencies": { - "eslint": ">= 8.0.0", + "eslint": ">= 8.21.0", "prettier": ">= 3.0.0" } }, diff --git a/frontend/package.json b/frontend/package.json index a211f2a474..6f38e4303a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -93,7 +93,7 @@ "@vitejs/plugin-vue2": "2.3.3", "@vitest/coverage-v8": "2.1.8", "@vue/babel-preset-app": "5.0.8", - "@vue/eslint-config-prettier": "9.0.0", + "@vue/eslint-config-prettier": "10.1.0", "@vue/test-utils": "1.3.6", "autoprefixer": "10.4.20", "babel-plugin-require-context-hook": "1.0.0", diff --git a/pdf/package-lock.json b/pdf/package-lock.json index b5f42fb3a0..2c4a48fff2 100644 --- a/pdf/package-lock.json +++ b/pdf/package-lock.json @@ -22,7 +22,7 @@ "@vue/babel-preset-app": "5.0.8", "@vue/compiler-dom": "3.5.13", "@vue/compiler-sfc": "3.5.13", - "@vue/eslint-config-prettier": "9.0.0", + "@vue/eslint-config-prettier": "10.1.0", "@vue/runtime-dom": "3.5.13", "@vue/server-renderer": "3.5.13", "@vue/shared": "3.5.13", @@ -3435,17 +3435,17 @@ } }, "node_modules/@vue/eslint-config-prettier": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", - "integrity": "sha512-z1ZIAAUS9pKzo/ANEfd2sO+v2IUalz7cM/cTLOZ7vRFOPk5/xuRKQteOu1DErFLAh/lYGXMVZ0IfYKlyInuDVg==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-10.1.0.tgz", + "integrity": "sha512-J6wV91y2pXc0Phha01k0WOHBTPsoSTf4xlmMjoKaeSxBpAdsgTppGF5RZRdOHM7OA74zAXD+VLANrtYXpiPKkQ==", "dev": true, "license": "MIT", "dependencies": { - "eslint-config-prettier": "^9.0.0", - "eslint-plugin-prettier": "^5.0.0" + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-prettier": "^5.2.1" }, "peerDependencies": { - "eslint": ">= 8.0.0", + "eslint": ">= 8.21.0", "prettier": ">= 3.0.0" } }, diff --git a/pdf/package.json b/pdf/package.json index 9895b289f0..faae4b84e5 100644 --- a/pdf/package.json +++ b/pdf/package.json @@ -42,7 +42,7 @@ "@vue/babel-preset-app": "5.0.8", "@vue/compiler-dom": "3.5.13", "@vue/compiler-sfc": "3.5.13", - "@vue/eslint-config-prettier": "9.0.0", + "@vue/eslint-config-prettier": "10.1.0", "@vue/runtime-dom": "3.5.13", "@vue/server-renderer": "3.5.13", "@vue/shared": "3.5.13", From 55c40a32490d0ad1dcf219297bf789b0d787ca00 Mon Sep 17 00:00:00 2001 From: BacLuc Date: Fri, 3 Jan 2025 17:14:09 +0100 Subject: [PATCH 2/2] eslint: use flat config format instead of legacy wrapper for @vue/eslint-config-prettier They now support (only) the flat config format. They also include eslint-plugin-prettier/recommended. --- frontend/eslint.config.mjs | 8 +++++--- pdf/eslint.config.mjs | 11 +++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs index 9d959b3c5f..c8d633afda 100644 --- a/frontend/eslint.config.mjs +++ b/frontend/eslint.config.mjs @@ -1,3 +1,5 @@ +import vueEslintConfigPrettier from '@vue/eslint-config-prettier' + import { includeIgnoreFile } from '@eslint/compat' import localRules from 'eslint-plugin-local-rules' import globals from 'globals' @@ -19,9 +21,7 @@ export default [ 'plugin:vue/recommended', 'plugin:vue/vue3-recommended', 'plugin:vue-scoped-css/vue3-recommended', - 'eslint:recommended', - 'plugin:prettier/recommended', - '@vue/eslint-config-prettier' + 'eslint:recommended' ), { ignores: ['data/', 'dist/', 'public/twemoji/'], @@ -29,6 +29,8 @@ export default [ includeIgnoreFile(gitignorePath), + vueEslintConfigPrettier, + { plugins: { 'local-rules': localRules, diff --git a/pdf/eslint.config.mjs b/pdf/eslint.config.mjs index 91fd7649ef..9eb402d00f 100644 --- a/pdf/eslint.config.mjs +++ b/pdf/eslint.config.mjs @@ -1,3 +1,5 @@ +import vueEslintConfigPrettier from '@vue/eslint-config-prettier' + import { includeIgnoreFile } from '@eslint/compat' import localRules from 'eslint-plugin-local-rules' import globals from 'globals' @@ -16,18 +18,15 @@ const compat = new FlatCompat({ const gitignorePath = path.resolve(__dirname, '.gitignore') export default [ - ...compat.extends( - 'plugin:vue/vue3-recommended', - 'eslint:recommended', - 'plugin:prettier/recommended', - '@vue/eslint-config-prettier' - ), + ...compat.extends('plugin:vue/vue3-recommended', 'eslint:recommended'), { ignores: ['dist/*.mjs'], }, includeIgnoreFile(gitignorePath), + vueEslintConfigPrettier, + { plugins: { 'local-rules': localRules,