From 9a0aa4fbd37c999aa447ca3c3437723dcc7161a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:12:49 +0100 Subject: [PATCH 01/13] Bump amqp from 5.2.0 to 5.3.1 (#4659) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 595448c1f..8f1287b6c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -amqp==5.2.0 +amqp==5.3.1 anyascii==0.3.2 arabic-reshaper==3.0.0 asgiref==3.8.1 From c640f3de99cee455caf5c0b3c24aab26fa72b4c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:18:20 +0000 Subject: [PATCH 02/13] Bump eslint-plugin-vue from 9.30.0 to 9.31.0 in /frontend (#4653) --- frontend/package-lock.json | 6 +++--- frontend/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 012e84f6f..22108580c 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -10091,9 +10091,9 @@ } }, "eslint-plugin-vue": { - "version": "9.30.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.30.0.tgz", - "integrity": "sha512-CyqlRgShvljFkOeYK8wN5frh/OGTvkj1S7wlr2Q2pUvwq+X5VYiLd6ZjujpgSgLnys2W8qrBLkXQ41SUYaoPIQ==", + "version": "9.31.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.31.0.tgz", + "integrity": "sha512-aYMUCgivhz1o4tLkRHj5oq9YgYPM4/EJc0M7TAKRLCUA5OYxRLAhYEVD2nLtTwLyixEFI+/QXSvKU9ESZFgqjQ==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.4.0", diff --git a/frontend/package.json b/frontend/package.json index 3e731b340..2c432ff03 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -32,7 +32,7 @@ "eslint": "^7.32.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^3.4.1", - "eslint-plugin-vue": "^9.30.0", + "eslint-plugin-vue": "^9.31.0", "prettier": "^1.19.1", "sass": "^1.80.6", "sass-loader": "^10.0.0", From aa841713018b9fdd69db1f5b89776c42f008d45e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:21:54 +0000 Subject: [PATCH 03/13] Bump vite from 5.4.10 to 5.4.11 in /2024-frontend (#4661) --- 2024-frontend/package-lock.json | 14 +++++++------- 2024-frontend/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2024-frontend/package-lock.json b/2024-frontend/package-lock.json index 1926d500d..6b32d2a3f 100644 --- a/2024-frontend/package-lock.json +++ b/2024-frontend/package-lock.json @@ -28,7 +28,7 @@ "eslint": "^9.13.0", "eslint-plugin-vue": "^9.31.0", "prettier": "^3.3.3", - "vite": "^5.4.10", + "vite": "^5.4.11", "vite-plugin-vue-devtools": "^7.6.3" } }, @@ -5875,9 +5875,9 @@ } }, "node_modules/vite": { - "version": "5.4.10", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz", - "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==", + "version": "5.4.11", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", + "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", "dependencies": { "esbuild": "^0.21.3", "postcss": "^8.4.43", @@ -10608,9 +10608,9 @@ "peer": true }, "vite": { - "version": "5.4.10", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz", - "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==", + "version": "5.4.11", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", + "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", "requires": { "esbuild": "^0.21.3", "fsevents": "~2.3.3", diff --git a/2024-frontend/package.json b/2024-frontend/package.json index 44fbd582b..ef7d03841 100644 --- a/2024-frontend/package.json +++ b/2024-frontend/package.json @@ -31,7 +31,7 @@ "eslint": "^9.13.0", "eslint-plugin-vue": "^9.31.0", "prettier": "^3.3.3", - "vite": "^5.4.10", + "vite": "^5.4.11", "vite-plugin-vue-devtools": "^7.6.3" } } From a26fb7ec05e4476b15f1c3064bb62f86a652a388 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:25:02 +0000 Subject: [PATCH 04/13] Bump rpds-py from 0.20.1 to 0.21.0 (#4657) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8f1287b6c..89c2b47e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -130,7 +130,7 @@ regex==2023.12.25 reportlab==4.2.2 requests==2.32.3 requests-mock==1.12.1 -rpds-py==0.20.1 +rpds-py==0.21.0 s3transfer==0.10.2 sentry-sdk==2.10.0 sib-api-v3-sdk==7.6.0 From 7f525f88783a9c502e0af6ebf1bbd5c33c1d46ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:25:55 +0000 Subject: [PATCH 05/13] Bump cross-spawn from 7.0.3 to 7.0.6 in /2024-frontend (#4673) --- 2024-frontend/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/2024-frontend/package-lock.json b/2024-frontend/package-lock.json index 6b32d2a3f..51a3a59ce 100644 --- a/2024-frontend/package-lock.json +++ b/2024-frontend/package-lock.json @@ -2604,9 +2604,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -8310,9 +8310,9 @@ } }, "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", From 4dc229165bc65c3cb585a88f8123675fcf872a89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:26:37 +0000 Subject: [PATCH 06/13] Bump @vueuse/core from 11.1.0 to 11.2.0 in /2024-frontend (#4663) --- 2024-frontend/package-lock.json | 46 ++++++++++++++++----------------- 2024-frontend/package.json | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/2024-frontend/package-lock.json b/2024-frontend/package-lock.json index 51a3a59ce..a05a02744 100644 --- a/2024-frontend/package-lock.json +++ b/2024-frontend/package-lock.json @@ -13,7 +13,7 @@ "@gouvminint/vue-dsfr": "^7.1.0", "@vuelidate/core": "^2.0.3", "@vuelidate/validators": "^2.0.4", - "@vueuse/core": "^11.1.0", + "@vueuse/core": "^11.2.0", "django-vite-plugin": "^4.0.4", "pinia": "^2.2.6", "vue": "^3.5.11", @@ -1652,13 +1652,13 @@ } }, "node_modules/@vueuse/core": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-11.1.0.tgz", - "integrity": "sha512-P6dk79QYA6sKQnghrUz/1tHi0n9mrb/iO1WTMk/ElLmTyNqgDeSZ3wcDf6fRBGzRJbeG1dxzEOvLENMjr+E3fg==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-11.2.0.tgz", + "integrity": "sha512-JIUwRcOqOWzcdu1dGlfW04kaJhW3EXnnjJJfLTtddJanymTL7lF1C0+dVVZ/siLfc73mWn+cGP1PE1PKPruRSA==", "dependencies": { "@types/web-bluetooth": "^0.0.20", - "@vueuse/metadata": "11.1.0", - "@vueuse/shared": "11.1.0", + "@vueuse/metadata": "11.2.0", + "@vueuse/shared": "11.2.0", "vue-demi": ">=0.14.10" }, "funding": { @@ -1691,17 +1691,17 @@ } }, "node_modules/@vueuse/metadata": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-11.1.0.tgz", - "integrity": "sha512-l9Q502TBTaPYGanl1G+hPgd3QX5s4CGnpXriVBR5fEZ/goI6fvDaVmIl3Td8oKFurOxTmbXvBPSsgrd6eu6HYg==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-11.2.0.tgz", + "integrity": "sha512-L0ZmtRmNx+ZW95DmrgD6vn484gSpVeRbgpWevFKXwqqQxW9hnSi2Ppuh2BzMjnbv4aJRiIw8tQatXT9uOB23dQ==", "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@vueuse/shared": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-11.1.0.tgz", - "integrity": "sha512-YUtIpY122q7osj+zsNMFAfMTubGz0sn5QzE5gPzAIiCmtt2ha3uQUY1+JPyL4gRCTsLPX82Y9brNbo/aqlA91w==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-11.2.0.tgz", + "integrity": "sha512-VxFjie0EanOudYSgMErxXfq6fo8vhr5ICI+BuE3I9FnX7ePllEsVrRQ7O6Q1TLgApeLuPKcHQxAXpP+KnlrJsg==", "dependencies": { "vue-demi": ">=0.14.10" }, @@ -7564,13 +7564,13 @@ } }, "@vueuse/core": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-11.1.0.tgz", - "integrity": "sha512-P6dk79QYA6sKQnghrUz/1tHi0n9mrb/iO1WTMk/ElLmTyNqgDeSZ3wcDf6fRBGzRJbeG1dxzEOvLENMjr+E3fg==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-11.2.0.tgz", + "integrity": "sha512-JIUwRcOqOWzcdu1dGlfW04kaJhW3EXnnjJJfLTtddJanymTL7lF1C0+dVVZ/siLfc73mWn+cGP1PE1PKPruRSA==", "requires": { "@types/web-bluetooth": "^0.0.20", - "@vueuse/metadata": "11.1.0", - "@vueuse/shared": "11.1.0", + "@vueuse/metadata": "11.2.0", + "@vueuse/shared": "11.2.0", "vue-demi": ">=0.14.10" }, "dependencies": { @@ -7583,14 +7583,14 @@ } }, "@vueuse/metadata": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-11.1.0.tgz", - "integrity": "sha512-l9Q502TBTaPYGanl1G+hPgd3QX5s4CGnpXriVBR5fEZ/goI6fvDaVmIl3Td8oKFurOxTmbXvBPSsgrd6eu6HYg==" + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-11.2.0.tgz", + "integrity": "sha512-L0ZmtRmNx+ZW95DmrgD6vn484gSpVeRbgpWevFKXwqqQxW9hnSi2Ppuh2BzMjnbv4aJRiIw8tQatXT9uOB23dQ==" }, "@vueuse/shared": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-11.1.0.tgz", - "integrity": "sha512-YUtIpY122q7osj+zsNMFAfMTubGz0sn5QzE5gPzAIiCmtt2ha3uQUY1+JPyL4gRCTsLPX82Y9brNbo/aqlA91w==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-11.2.0.tgz", + "integrity": "sha512-VxFjie0EanOudYSgMErxXfq6fo8vhr5ICI+BuE3I9FnX7ePllEsVrRQ7O6Q1TLgApeLuPKcHQxAXpP+KnlrJsg==", "requires": { "vue-demi": ">=0.14.10" }, diff --git a/2024-frontend/package.json b/2024-frontend/package.json index ef7d03841..88cf3acc7 100644 --- a/2024-frontend/package.json +++ b/2024-frontend/package.json @@ -16,7 +16,7 @@ "@gouvminint/vue-dsfr": "^7.1.0", "@vuelidate/core": "^2.0.3", "@vuelidate/validators": "^2.0.4", - "@vueuse/core": "^11.1.0", + "@vueuse/core": "^11.2.0", "django-vite-plugin": "^4.0.4", "pinia": "^2.2.6", "vue": "^3.5.11", From 1e9add18e265b32531da409bb0ad7820a9b0cd4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:32:15 +0000 Subject: [PATCH 07/13] Bump eslint from 9.13.0 to 9.15.0 in /2024-frontend (#4664) --- 2024-frontend/package-lock.json | 313 ++++++++++++++++---------------- 2024-frontend/package.json | 2 +- 2 files changed, 161 insertions(+), 154 deletions(-) diff --git a/2024-frontend/package-lock.json b/2024-frontend/package-lock.json index a05a02744..fd26311a7 100644 --- a/2024-frontend/package-lock.json +++ b/2024-frontend/package-lock.json @@ -25,7 +25,7 @@ "@rushstack/eslint-patch": "^1.10.4", "@vitejs/plugin-vue": "^5.1.5", "@vue/eslint-config-prettier": "^9.0.0", - "eslint": "^9.13.0", + "eslint": "^9.15.0", "eslint-plugin-vue": "^9.31.0", "prettier": "^3.3.3", "vite": "^5.4.11", @@ -636,18 +636,18 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", - "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/config-array": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", - "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz", + "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==", "dev": true, "dependencies": { "@eslint/object-schema": "^2.1.4", @@ -659,18 +659,18 @@ } }, "node_modules/@eslint/core": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz", - "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz", + "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/eslintrc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", - "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", + "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -691,9 +691,9 @@ } }, "node_modules/@eslint/eslintrc/node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -703,14 +703,14 @@ } }, "node_modules/@eslint/eslintrc/node_modules/espree": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", - "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", "dev": true, "dependencies": { - "acorn": "^8.12.0", + "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.0.0" + "eslint-visitor-keys": "^4.2.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -732,9 +732,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.13.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.13.0.tgz", - "integrity": "sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.15.0.tgz", + "integrity": "sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -750,9 +750,9 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz", - "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz", + "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==", "dev": true, "dependencies": { "levn": "^0.4.1" @@ -860,27 +860,40 @@ } }, "node_modules/@humanfs/core": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz", - "integrity": "sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true, "engines": { "node": ">=18.18.0" } }, "node_modules/@humanfs/node": { - "version": "0.16.5", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.5.tgz", - "integrity": "sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==", + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", "dev": true, "dependencies": { - "@humanfs/core": "^0.19.0", + "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.3.0" }, "engines": { "node": ">=18.18.0" } }, + "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "dev": true, + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -895,9 +908,9 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", + "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", "dev": true, "engines": { "node": ">=18.18" @@ -1906,9 +1919,9 @@ } }, "node_modules/acorn": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", - "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "bin": { "acorn": "bin/acorn" }, @@ -3070,31 +3083,31 @@ } }, "node_modules/eslint": { - "version": "9.13.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.13.0.tgz", - "integrity": "sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.15.0.tgz", + "integrity": "sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.11.0", - "@eslint/config-array": "^0.18.0", - "@eslint/core": "^0.7.0", - "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.13.0", - "@eslint/plugin-kit": "^0.2.0", - "@humanfs/node": "^0.16.5", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.19.0", + "@eslint/core": "^0.9.0", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "9.15.0", + "@eslint/plugin-kit": "^0.2.3", + "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.3.1", + "@humanwhocodes/retry": "^0.4.1", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "cross-spawn": "^7.0.5", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.1.0", - "eslint-visitor-keys": "^4.1.0", - "espree": "^10.2.0", + "eslint-scope": "^8.2.0", + "eslint-visitor-keys": "^4.2.0", + "espree": "^10.3.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -3108,8 +3121,7 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "text-table": "^0.2.0" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" @@ -3228,9 +3240,9 @@ "dev": true }, "node_modules/eslint/node_modules/eslint-scope": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz", - "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", + "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -3244,9 +3256,9 @@ } }, "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz", - "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3256,14 +3268,14 @@ } }, "node_modules/eslint/node_modules/espree": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.2.0.tgz", - "integrity": "sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", "dev": true, "dependencies": { - "acorn": "^8.12.0", + "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.1.0" + "eslint-visitor-keys": "^4.2.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3737,9 +3749,9 @@ } }, "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, "engines": { "node": ">= 4" @@ -5693,12 +5705,6 @@ } } }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -6875,15 +6881,15 @@ } }, "@eslint-community/regexpp": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", - "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true }, "@eslint/config-array": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", - "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz", + "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==", "dev": true, "requires": { "@eslint/object-schema": "^2.1.4", @@ -6892,15 +6898,15 @@ } }, "@eslint/core": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz", - "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz", + "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==", "dev": true }, "@eslint/eslintrc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", - "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", + "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -6915,20 +6921,20 @@ }, "dependencies": { "eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true }, "espree": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", - "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", "dev": true, "requires": { - "acorn": "^8.12.0", + "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.0.0" + "eslint-visitor-keys": "^4.2.0" } }, "globals": { @@ -6940,9 +6946,9 @@ } }, "@eslint/js": { - "version": "9.13.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.13.0.tgz", - "integrity": "sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.15.0.tgz", + "integrity": "sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==", "dev": true }, "@eslint/object-schema": { @@ -6952,9 +6958,9 @@ "dev": true }, "@eslint/plugin-kit": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz", - "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz", + "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==", "dev": true, "requires": { "levn": "^0.4.1" @@ -7033,19 +7039,27 @@ } }, "@humanfs/core": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz", - "integrity": "sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true }, "@humanfs/node": { - "version": "0.16.5", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.5.tgz", - "integrity": "sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==", + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", "dev": true, "requires": { - "@humanfs/core": "^0.19.0", + "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.3.0" + }, + "dependencies": { + "@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "dev": true + } } }, "@humanwhocodes/module-importer": { @@ -7055,9 +7069,9 @@ "dev": true }, "@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", + "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", "dev": true }, "@iconify/types": { @@ -7772,9 +7786,9 @@ } }, "acorn": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", - "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==" + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==" }, "acorn-import-attributes": { "version": "1.9.5", @@ -8648,31 +8662,31 @@ "dev": true }, "eslint": { - "version": "9.13.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.13.0.tgz", - "integrity": "sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.15.0.tgz", + "integrity": "sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.11.0", - "@eslint/config-array": "^0.18.0", - "@eslint/core": "^0.7.0", - "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.13.0", - "@eslint/plugin-kit": "^0.2.0", - "@humanfs/node": "^0.16.5", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.19.0", + "@eslint/core": "^0.9.0", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "9.15.0", + "@eslint/plugin-kit": "^0.2.3", + "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.3.1", + "@humanwhocodes/retry": "^0.4.1", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "cross-spawn": "^7.0.5", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.1.0", - "eslint-visitor-keys": "^4.1.0", - "espree": "^10.2.0", + "eslint-scope": "^8.2.0", + "eslint-visitor-keys": "^4.2.0", + "espree": "^10.3.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -8686,8 +8700,7 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "text-table": "^0.2.0" + "optionator": "^0.9.3" }, "dependencies": { "@types/estree": { @@ -8697,9 +8710,9 @@ "dev": true }, "eslint-scope": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz", - "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", + "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", "dev": true, "requires": { "esrecurse": "^4.3.0", @@ -8707,20 +8720,20 @@ } }, "eslint-visitor-keys": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz", - "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true }, "espree": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.2.0.tgz", - "integrity": "sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", "dev": true, "requires": { - "acorn": "^8.12.0", + "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.1.0" + "eslint-visitor-keys": "^4.2.0" } } } @@ -9114,9 +9127,9 @@ } }, "ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true }, "immutable": { @@ -10496,12 +10509,6 @@ "terser": "^5.26.0" } }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", diff --git a/2024-frontend/package.json b/2024-frontend/package.json index 88cf3acc7..4830883bb 100644 --- a/2024-frontend/package.json +++ b/2024-frontend/package.json @@ -28,7 +28,7 @@ "@rushstack/eslint-patch": "^1.10.4", "@vitejs/plugin-vue": "^5.1.5", "@vue/eslint-config-prettier": "^9.0.0", - "eslint": "^9.13.0", + "eslint": "^9.15.0", "eslint-plugin-vue": "^9.31.0", "prettier": "^3.3.3", "vite": "^5.4.11", From ef9b85dd4fd58204d4c7d29d775b94ffb0eb4d05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:32:53 +0000 Subject: [PATCH 08/13] Bump sass from 1.80.6 to 1.81.0 in /frontend (#4654) --- frontend/package-lock.json | 14 +++++++------- frontend/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 22108580c..96183b962 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -11908,9 +11908,9 @@ "dev": true }, "immutable": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", - "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz", + "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==", "dev": true }, "import-cwd": { @@ -17789,14 +17789,14 @@ "dev": true }, "sass": { - "version": "1.80.6", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz", - "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.81.0.tgz", + "integrity": "sha512-Q4fOxRfhmv3sqCLoGfvrC9pRV8btc0UtqL9mN6Yrv6Qi9ScL55CVH1vlPP863ISLEEMNLLuu9P+enCeGHlnzhA==", "dev": true, "requires": { "@parcel/watcher": "^2.4.1", "chokidar": "^4.0.0", - "immutable": "^4.0.0", + "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" }, "dependencies": { diff --git a/frontend/package.json b/frontend/package.json index 2c432ff03..3e76af0f5 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -34,7 +34,7 @@ "eslint-plugin-prettier": "^3.4.1", "eslint-plugin-vue": "^9.31.0", "prettier": "^1.19.1", - "sass": "^1.80.6", + "sass": "^1.81.0", "sass-loader": "^10.0.0", "vue-cli-plugin-vuetify": "~2.5.8", "vue-template-compiler": "^2.7.16", From 8ef93d88447bf08a4227ae66149a4893665718fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:33:20 +0000 Subject: [PATCH 09/13] Bump vite-plugin-vue-devtools from 7.6.3 to 7.6.4 in /2024-frontend (#4662) --- 2024-frontend/package-lock.json | 74 ++++++++++++++++----------------- 2024-frontend/package.json | 2 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/2024-frontend/package-lock.json b/2024-frontend/package-lock.json index fd26311a7..5f52b10b6 100644 --- a/2024-frontend/package-lock.json +++ b/2024-frontend/package-lock.json @@ -29,7 +29,7 @@ "eslint-plugin-vue": "^9.31.0", "prettier": "^3.3.3", "vite": "^5.4.11", - "vite-plugin-vue-devtools": "^7.6.3" + "vite-plugin-vue-devtools": "^7.6.4" } }, "node_modules/@ampproject/remapping": { @@ -1481,13 +1481,13 @@ "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==" }, "node_modules/@vue/devtools-core": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.6.3.tgz", - "integrity": "sha512-C7FOuh3Z+EmXXzDU9eRjHQL7zW7/CFovM6yCNNpUb+zXxhrn4fiqTum+a3gNau9DuzYfEtQXwZ9F7MeK0JKYVw==", + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.6.4.tgz", + "integrity": "sha512-blSwGVYpb7b5TALMjjoBiAl5imuBF7WEOAtaJaBMNikR8SQkm6mkUt4YlIKh9874/qoimwmpDOm+GHBZ4Y5m+g==", "dev": true, "dependencies": { - "@vue/devtools-kit": "^7.6.3", - "@vue/devtools-shared": "^7.6.3", + "@vue/devtools-kit": "^7.6.4", + "@vue/devtools-shared": "^7.6.4", "mitt": "^3.0.1", "nanoid": "^3.3.4", "pathe": "^1.1.2", @@ -1498,12 +1498,12 @@ } }, "node_modules/@vue/devtools-kit": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.6.3.tgz", - "integrity": "sha512-ETsFc8GlOp04rSFN79tB2TpVloWfsSx9BoCSElV3w3CaJTSBfz42KsIi5Ka+dNTJs1jY7QVLTDeoBmUGgA9h2A==", + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.6.4.tgz", + "integrity": "sha512-Zs86qIXXM9icU0PiGY09PQCle4TI750IPLmAJzW5Kf9n9t5HzSYf6Rz6fyzSwmfMPiR51SUKJh9sXVZu78h2QA==", "dev": true, "dependencies": { - "@vue/devtools-shared": "^7.6.3", + "@vue/devtools-shared": "^7.6.4", "birpc": "^0.2.19", "hookable": "^5.5.3", "mitt": "^3.0.1", @@ -1513,9 +1513,9 @@ } }, "node_modules/@vue/devtools-shared": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.6.3.tgz", - "integrity": "sha512-wJW5QF27i16+sNQIaes8QoEZg1eqEgF83GkiPUlEQe9k7ZoHXHV7PRrnrxOKem42sIHPU813J2V/ZK1uqTJe6g==", + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.6.4.tgz", + "integrity": "sha512-nD6CUvBEel+y7zpyorjiUocy0nh77DThZJ0k1GRnJeOmY3ATq2fWijEp7wk37gb023Cb0R396uYh5qMSBQ5WFg==", "dev": true, "dependencies": { "rfdc": "^1.4.1" @@ -5982,14 +5982,14 @@ } }, "node_modules/vite-plugin-vue-devtools": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/vite-plugin-vue-devtools/-/vite-plugin-vue-devtools-7.6.3.tgz", - "integrity": "sha512-p1rZMKzreWqxj9U05RaxY1vDoOhGYhA6iX8vKfo4nD6jqTmVoGjjk+U1g5HYwwTCdr/eck3kzO2f4gnPCjqVKA==", + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/vite-plugin-vue-devtools/-/vite-plugin-vue-devtools-7.6.4.tgz", + "integrity": "sha512-jxSsLyuETfmZ1OSrmnDp28BG6rmURrP7lkeyHW2gBFDyo+4dUcqVeQNMhbV7uKZn80mDdv06Mysw/5AdGxDvJQ==", "dev": true, "dependencies": { - "@vue/devtools-core": "^7.6.3", - "@vue/devtools-kit": "^7.6.3", - "@vue/devtools-shared": "^7.6.3", + "@vue/devtools-core": "^7.6.4", + "@vue/devtools-kit": "^7.6.4", + "@vue/devtools-shared": "^7.6.4", "execa": "^8.0.1", "sirv": "^3.0.0", "vite-plugin-inspect": "^0.8.7", @@ -7456,13 +7456,13 @@ "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==" }, "@vue/devtools-core": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.6.3.tgz", - "integrity": "sha512-C7FOuh3Z+EmXXzDU9eRjHQL7zW7/CFovM6yCNNpUb+zXxhrn4fiqTum+a3gNau9DuzYfEtQXwZ9F7MeK0JKYVw==", + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-7.6.4.tgz", + "integrity": "sha512-blSwGVYpb7b5TALMjjoBiAl5imuBF7WEOAtaJaBMNikR8SQkm6mkUt4YlIKh9874/qoimwmpDOm+GHBZ4Y5m+g==", "dev": true, "requires": { - "@vue/devtools-kit": "^7.6.3", - "@vue/devtools-shared": "^7.6.3", + "@vue/devtools-kit": "^7.6.4", + "@vue/devtools-shared": "^7.6.4", "mitt": "^3.0.1", "nanoid": "^3.3.4", "pathe": "^1.1.2", @@ -7470,12 +7470,12 @@ } }, "@vue/devtools-kit": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.6.3.tgz", - "integrity": "sha512-ETsFc8GlOp04rSFN79tB2TpVloWfsSx9BoCSElV3w3CaJTSBfz42KsIi5Ka+dNTJs1jY7QVLTDeoBmUGgA9h2A==", + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.6.4.tgz", + "integrity": "sha512-Zs86qIXXM9icU0PiGY09PQCle4TI750IPLmAJzW5Kf9n9t5HzSYf6Rz6fyzSwmfMPiR51SUKJh9sXVZu78h2QA==", "dev": true, "requires": { - "@vue/devtools-shared": "^7.6.3", + "@vue/devtools-shared": "^7.6.4", "birpc": "^0.2.19", "hookable": "^5.5.3", "mitt": "^3.0.1", @@ -7485,9 +7485,9 @@ } }, "@vue/devtools-shared": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.6.3.tgz", - "integrity": "sha512-wJW5QF27i16+sNQIaes8QoEZg1eqEgF83GkiPUlEQe9k7ZoHXHV7PRrnrxOKem42sIHPU813J2V/ZK1uqTJe6g==", + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.6.4.tgz", + "integrity": "sha512-nD6CUvBEel+y7zpyorjiUocy0nh77DThZJ0k1GRnJeOmY3ATq2fWijEp7wk37gb023Cb0R396uYh5qMSBQ5WFg==", "dev": true, "requires": { "rfdc": "^1.4.1" @@ -10650,14 +10650,14 @@ } }, "vite-plugin-vue-devtools": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/vite-plugin-vue-devtools/-/vite-plugin-vue-devtools-7.6.3.tgz", - "integrity": "sha512-p1rZMKzreWqxj9U05RaxY1vDoOhGYhA6iX8vKfo4nD6jqTmVoGjjk+U1g5HYwwTCdr/eck3kzO2f4gnPCjqVKA==", + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/vite-plugin-vue-devtools/-/vite-plugin-vue-devtools-7.6.4.tgz", + "integrity": "sha512-jxSsLyuETfmZ1OSrmnDp28BG6rmURrP7lkeyHW2gBFDyo+4dUcqVeQNMhbV7uKZn80mDdv06Mysw/5AdGxDvJQ==", "dev": true, "requires": { - "@vue/devtools-core": "^7.6.3", - "@vue/devtools-kit": "^7.6.3", - "@vue/devtools-shared": "^7.6.3", + "@vue/devtools-core": "^7.6.4", + "@vue/devtools-kit": "^7.6.4", + "@vue/devtools-shared": "^7.6.4", "execa": "^8.0.1", "sirv": "^3.0.0", "vite-plugin-inspect": "^0.8.7", diff --git a/2024-frontend/package.json b/2024-frontend/package.json index 4830883bb..7f9af2394 100644 --- a/2024-frontend/package.json +++ b/2024-frontend/package.json @@ -32,6 +32,6 @@ "eslint-plugin-vue": "^9.31.0", "prettier": "^3.3.3", "vite": "^5.4.11", - "vite-plugin-vue-devtools": "^7.6.3" + "vite-plugin-vue-devtools": "^7.6.4" } } From 4c7f0f999eb0169a0e1b565b0f0edc141672bcb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Odini?= Date: Fri, 22 Nov 2024 11:59:46 +0100 Subject: [PATCH 10/13] =?UTF-8?q?Tunnel=20diagnostic=20:=20Gaspillage=20:?= =?UTF-8?q?=20supprimer=20l'=C3=A9tape=20commentaire=20(#4647)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WasteMeasureSteps/index.vue | 83 +++++++++++-------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/frontend/src/views/DiagnosticTunnel/WasteMeasureSteps/index.vue b/frontend/src/views/DiagnosticTunnel/WasteMeasureSteps/index.vue index 4e754747a..b095519f8 100644 --- a/frontend/src/views/DiagnosticTunnel/WasteMeasureSteps/index.vue +++ b/frontend/src/views/DiagnosticTunnel/WasteMeasureSteps/index.vue @@ -296,6 +296,38 @@ import DsfrRadio from "@/components/DsfrRadio" import ExpeReservation from "@/components/KeyMeasureDiagnostic/ExpeModals/ExpeReservation" import Constants from "@/constants" +const steps = [ + { + title: "Diagnostic et plan d’action", + urlSlug: "plan-action", + }, + { + title: "Mesure de mon gaspillage alimentaire", + urlSlug: "mesure-gaspillage", + }, + { + title: "Détail des actions mises en place", + urlSlug: "actions", + }, + { + title: "Dons alimentaires", + urlSlug: "dons-alimentaires", + }, + { + title: "Autres commentaires", + urlSlug: "autres", + }, + { + title: "Expérimentation réservation de repas", + urlSlug: "expérimentation", + }, + { + title: "Synthèse", + isSynthesis: true, + urlSlug: "complet", + }, +] + export default { name: "WasteSteps", props: { @@ -319,45 +351,11 @@ export default { ExpeReservation, }, data() { - const steps = [ - { - title: "Diagnostic et plan d’action", - urlSlug: "plan-action", - }, - { - title: "Mesure de mon gaspillage alimentaire", - urlSlug: "mesure-gaspillage", - }, - { - title: "Détail des actions mises en place", - urlSlug: "actions", - }, - { - title: "Dons alimentaires", - urlSlug: "dons-alimentaires", - }, - { - title: "Autres commentaires", - urlSlug: "autres", - }, - { - title: "Expérimentation réservation de repas", - urlSlug: "expérimentation", - }, - { - title: "Synthèse", - isSynthesis: true, - urlSlug: "complet", - }, - ] - if (!window.ENABLE_XP_RESERVATION) steps.splice(5, 1) - if (!applicableDiagnosticRules(this.canteen).hasDonationAgreement) steps.splice(3, 1) return { formIsValid: true, showExpeModal: false, otherActionEnabled: !!this.diagnostic.otherWasteAction, wasteActions: Constants.WasteActions, - steps, payload: {}, fields: [ "hasWasteDiagnostic", @@ -380,6 +378,23 @@ export default { } }, computed: { + steps() { + // filter steps + // - 2024-11: hide comment step + // - hide XP step if not enabled + // - hide donation step if no donation agreement + let idx = steps.findIndex((step) => step.urlSlug === "autres") + if (idx > -1) steps.splice(idx, 1) + if (!window.ENABLE_XP_RESERVATION) { + let idx = steps.findIndex((step) => step.urlSlug === "expérimentation") + if (idx > -1) steps.splice(idx, 1) + } + if (!applicableDiagnosticRules(this.canteen).hasDonationAgreement) { + let idx = steps.findIndex((step) => step.urlSlug === "dons-alimentaires") + if (idx > -1) steps.splice(idx, 1) + } + return steps + }, step() { const step = this.stepUrlSlug && this.steps.find((step) => step.urlSlug === this.stepUrlSlug) return step || this.steps[0] From 141c12ef84240ddbff4b6d52175cd01cdadd0b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Odini?= Date: Fri, 22 Nov 2024 12:03:34 +0100 Subject: [PATCH 11/13] =?UTF-8?q?Tunnel=20diagnostique=20:=20renommer=20'g?= =?UTF-8?q?aspillage=20alimentaire'=20en=20'd=C3=A9chets=20alimentaires'?= =?UTF-8?q?=20(#4669)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DiagnosticSummary/WasteMeasureSummary.vue | 12 +++--- .../WasteMeasureSteps/index.vue | 42 +++++++++++++------ 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/frontend/src/components/DiagnosticSummary/WasteMeasureSummary.vue b/frontend/src/components/DiagnosticSummary/WasteMeasureSummary.vue index a83e09799..e9b432848 100644 --- a/frontend/src/components/DiagnosticSummary/WasteMeasureSummary.vue +++ b/frontend/src/components/DiagnosticSummary/WasteMeasureSummary.vue @@ -4,19 +4,19 @@
  • $check-line
    - J’ai réalisé un diagnostic sur les causes probables de gaspillage alimentaire + J’ai réalisé un diagnostic sur les causes probables de mes déchets alimentaires
  • $close-line
    - Je n’ai pas encore réalisé un diagnostic sur les causes probables de gaspillage alimentaire + Je n’ai pas encore réalisé un diagnostic sur les causes probables de mes déchets alimentaires
  • $question-line
    - Avez-vous réalisé un diagnostic sur les causes probables de gaspillage alimentaire ? + Avez-vous réalisé un diagnostic sur les causes probables de vos déchets alimentaires ?
    • @@ -45,7 +45,7 @@
  • $check-line
    - J’ai réalisé des mesures de mon gaspillage alimentaire : + J’ai réalisé des mesures de mes déchets alimentaires :
    • {{ measure.label }} : @@ -57,13 +57,13 @@
    • $close-line
      - Je n’ai pas encore réalisé des mesures de mon gaspillage alimentaire + Je n’ai pas encore réalisé des mesures de mes déchets alimentaires
    • $question-line
      - Avez-vous réalisé des mesures de votre gaspillage alimentaire ? + Avez-vous réalisé des mesures de vos déchets alimentaires ?
      • diff --git a/frontend/src/views/DiagnosticTunnel/WasteMeasureSteps/index.vue b/frontend/src/views/DiagnosticTunnel/WasteMeasureSteps/index.vue index b095519f8..eb1f3e40a 100644 --- a/frontend/src/views/DiagnosticTunnel/WasteMeasureSteps/index.vue +++ b/frontend/src/views/DiagnosticTunnel/WasteMeasureSteps/index.vue @@ -10,7 +10,7 @@ /> @@ -29,22 +29,32 @@ - + + +

      + Les déchets alimentaires incluent une fraction comestible (assimilable à du gaspillage alimentaire) et une + fraction non comestible (os, épluchures, arêtes). +

      +       +       + + +
      - Mesures du gaspillage + Mesures des déchets Optionnel - + - + - + + + - + - + + + - +
      - J’ai réalisé les actions de lutte contre le gaspillage alimentaire suivantes : + J’ai réalisé les actions suivantes de lutte contre les déchets alimentaires : Optionnel Optionnel : toute précision que vous souhaiteriez apporter sur votre situation et/ou sur vos actions - mises en place pour lutter contre le gaspillage alimentaire + mises en place pour lutter contre les déchets alimentaires @@ -290,6 +304,7 @@ import { applicableDiagnosticRules } from "@/utils" import validators from "@/validators" import LastYearAutofillOption from "../LastYearAutofillOption" +import DsfrCallout from "@/components/DsfrCallout" import DsfrTextField from "@/components/DsfrTextField" import DsfrTextarea from "@/components/DsfrTextarea" import DsfrRadio from "@/components/DsfrRadio" @@ -302,7 +317,7 @@ const steps = [ urlSlug: "plan-action", }, { - title: "Mesure de mon gaspillage alimentaire", + title: "Mesure de mes déchets alimentaires", urlSlug: "mesure-gaspillage", }, { @@ -345,6 +360,7 @@ export default { }, components: { LastYearAutofillOption, + DsfrCallout, DsfrTextField, DsfrTextarea, DsfrRadio, From 9289e278e498a63e010d837182cb8709380fd110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Odini?= Date: Fri, 22 Nov 2024 12:04:16 +0100 Subject: [PATCH 12/13] =?UTF-8?q?Tunnel=20diagnostique=20:=20renommer=20'D?= =?UTF-8?q?iversification=20des=20menus'=20en=20'Menus=20v=C3=A9g=C3=A9tar?= =?UTF-8?q?iens'=20(#4670)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 2024-frontend/src/data/key-measures.json | 6 +++--- frontend/src/components/CanteenDashboard.vue | 2 +- frontend/src/data/key-measures.json | 6 +++--- frontend/src/views/DashboardManager/DiversificationCard.vue | 2 +- web/sitemaps.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/2024-frontend/src/data/key-measures.json b/2024-frontend/src/data/key-measures.json index 6520e1b83..300c139b1 100644 --- a/2024-frontend/src/data/key-measures.json +++ b/2024-frontend/src/data/key-measures.json @@ -106,11 +106,11 @@ "badgeId": "diversification", "baseComponent": "DiversificationMeasure", "baseMeasureComponent": "DiversificationMeasure", - "id": "diversification-des-menus", + "id": "menus-vegetariens", "mdiIcon": "$leaf-fill", "mdiIconColor": "green darken-1", "progressField": "tunnelDiversification", - "shortTitle": "Diversification des menus", + "shortTitle": "Menus végétariens", "subMeasures": [ { "deadline": { @@ -162,7 +162,7 @@ } ], "successExplanation": "La cantine offre au moins un repas végétarien par semaine si elle est dans le secteur scolaire, ou et depuis janvier 2023, un repas végétarien par jour pour les restaurants collectifs de l'État, les établissements publics et les entreprises publiques nationales (s'ils proposent habituellement un choix multiple de menus).", - "tabText": "Protéines végétales", + "tabText": "Menus végétariens", "title": "Diversification des sources de protéines et menus végétariens" }, { diff --git a/frontend/src/components/CanteenDashboard.vue b/frontend/src/components/CanteenDashboard.vue index 8baeda6bf..6efe70c0d 100644 --- a/frontend/src/components/CanteenDashboard.vue +++ b/frontend/src/components/CanteenDashboard.vue @@ -214,7 +214,7 @@ export default { communicationSupports, qualityMeasure: keyMeasures.find((measure) => measure.id === "qualite-des-produits"), wasteMeasure: keyMeasures.find((measure) => measure.id === "gaspillage-alimentaire"), - diversificationMeasure: keyMeasures.find((measure) => measure.id === "diversification-des-menus"), + diversificationMeasure: keyMeasures.find((measure) => measure.id === "menus-vegetariens"), noPlasticMeasure: keyMeasures.find((measure) => measure.id === "interdiction-du-plastique"), informationMeasure: keyMeasures.find((measure) => measure.id === "information-des-usagers"), } diff --git a/frontend/src/data/key-measures.json b/frontend/src/data/key-measures.json index 550f15abd..c27c53893 100644 --- a/frontend/src/data/key-measures.json +++ b/frontend/src/data/key-measures.json @@ -106,11 +106,11 @@ "badgeId": "diversification", "baseComponent": "DiversificationMeasure", "baseMeasureComponent": "DiversificationMeasure", - "id": "diversification-des-menus", + "id": "menus-vegetariens", "mdiIcon": "$leaf-fill", "mdiIconColor": "green darken-1", "progressField": "tunnelDiversification", - "shortTitle": "Diversification des menus", + "shortTitle": "Menus végétariens", "subMeasures": [ { "deadline": { @@ -162,7 +162,7 @@ } ], "successExplanation": "La cantine offre au moins un repas végétarien par semaine si elle est dans le secteur scolaire, ou et depuis janvier 2023, un repas végétarien par jour pour les restaurants collectifs de l'État, les établissements publics et les entreprises publiques nationales (s'ils proposent habituellement un choix multiple de menus).", - "tabText": "Protéines végétales", + "tabText": "Menus végétariens", "title": "Diversification des sources de protéines et menus végétariens" }, { diff --git a/frontend/src/views/DashboardManager/DiversificationCard.vue b/frontend/src/views/DashboardManager/DiversificationCard.vue index b3e0d9a8f..7fba6ca65 100644 --- a/frontend/src/views/DashboardManager/DiversificationCard.vue +++ b/frontend/src/views/DashboardManager/DiversificationCard.vue @@ -48,7 +48,7 @@ export default { }, data() { return { - measureId: "diversification-des-menus", + measureId: "menus-vegetariens", } }, computed: { diff --git a/web/sitemaps.py b/web/sitemaps.py index 6048fc7a5..d5b1eb790 100644 --- a/web/sitemaps.py +++ b/web/sitemaps.py @@ -72,7 +72,7 @@ def items(self): "priority": 0.4, }, { - "location": "/mesures-phares/diversification-des-menus", + "location": "/mesures-phares/menus-vegetariens", "changefreq": "yearly", "priority": 0.4, }, From ac3d92de734c191ec042d1a26255431f18290ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Odini?= Date: Fri, 22 Nov 2024 13:05:38 +0100 Subject: [PATCH 13/13] =?UTF-8?q?Tunnel=20gaspillage=20alimentaire=20:=20r?= =?UTF-8?q?enommer=20'gaspillage=20alimentaire'=20en=20'd=C3=A9chets=20ali?= =?UTF-8?q?mentaires'=20(#4648)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 2024-frontend/src/components/SourceChart.vue | 15 +++++--- .../src/components/WasteMeasurementDetail.vue | 37 ++++++++++--------- .../components/WasteMeasurementSummary.vue | 2 +- 2024-frontend/src/constants.js | 20 ++++++++++ 2024-frontend/src/router/index.js | 4 +- .../BreakdownBySource.vue | 27 +++++++------- .../MeasurementPeriod.vue | 7 ++-- .../WasteMeasurementSteps/TotalWaste.vue | 9 +++-- .../WasteDistinction.vue | 4 +- .../WasteMeasurementSteps/index.vue | 10 ++--- .../src/views/WasteMeasurements/index.vue | 10 ++--- 11 files changed, 87 insertions(+), 58 deletions(-) diff --git a/2024-frontend/src/components/SourceChart.vue b/2024-frontend/src/components/SourceChart.vue index 820414c57..596d39732 100644 --- a/2024-frontend/src/components/SourceChart.vue +++ b/2024-frontend/src/components/SourceChart.vue @@ -1,6 +1,7 @@