From 9033821014f99ea2a24de11f9a58f64c8d858e7e Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Wed, 10 Jul 2024 13:59:14 +0200 Subject: [PATCH 01/37] chore(client): :arrow_up: Upgrade patch dependencies --- yarn.lock | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9faa844868..5de18566c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -461,9 +461,9 @@ integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== "@codegouvfr/react-dsfr@^1.9.11": - version "1.9.20" - resolved "https://registry.yarnpkg.com/@codegouvfr/react-dsfr/-/react-dsfr-1.9.20.tgz#6c495d55140cbebf506cae983b601c846303ae61" - integrity sha512-Q4W4K0ZZZtC5ogVmrNXGTkbkeordoNGHVl+w1Msz3zLwk5FZNVZt+/lAaeKZ/j+4rMbVzAEB9ggQe4FohSBnag== + version "1.9.23" + resolved "https://registry.yarnpkg.com/@codegouvfr/react-dsfr/-/react-dsfr-1.9.23.tgz#a7892212f3b7f1b6c94f05e65ac5311cc4b15f87" + integrity sha512-afdSWAYpKqpLyI48m8wg6dJIJWMWtH1POFF5EwDoXOxchzIaJtaur2FPZxd0Q6HLWazp/L36j+ic0B50RN/y6w== dependencies: tsafe "^1.6.3" yargs-parser "^21.1.1" @@ -2002,12 +2002,7 @@ "@types/koa-compose" "*" "@types/node" "*" -"@types/lodash@^4.14.151": - version "4.17.5" - resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz" - integrity sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw== - -"@types/lodash@^4.14.165": +"@types/lodash@^4.14.151", "@types/lodash@^4.14.165": version "4.17.6" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.6.tgz#193ced6a40c8006cfc1ca3f4553444fb38f0e543" integrity sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA== @@ -7665,7 +7660,7 @@ postcss@8.4.31: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@^8.0.0, postcss@^8.4.35: +postcss@^8.0.0, postcss@^8.4.35, postcss@^8.4.5: version "8.4.39" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.39.tgz#aa3c94998b61d3a9c259efa51db4b392e1bde0e3" integrity sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw== @@ -7674,15 +7669,6 @@ postcss@^8.0.0, postcss@^8.4.35: picocolors "^1.0.1" source-map-js "^1.2.0" -postcss@^8.4.5: - version "8.4.38" - resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz" - integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== - dependencies: - nanoid "^3.3.7" - picocolors "^1.0.0" - source-map-js "^1.2.0" - prebuild-install@^7.1.1: version "7.1.2" resolved "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz" @@ -8052,9 +8038,9 @@ react-google-autocomplete@^2.6.1: prop-types "^15.5.0" react-hook-form@^7.43.1: - version "7.52.0" - resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.52.0.tgz#e52b33043e283719586b9dd80f6d51b68dd3999c" - integrity sha512-mJX506Xc6mirzLsmXUJyqlAI3Kj9Ph2RhplYhUVffeOQSnubK2uVqBFOBJmvKikvbFV91pxVXmDiR+QMF19x6A== + version "7.52.1" + resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.52.1.tgz#ec2c96437b977f8b89ae2d541a70736c66284852" + integrity sha512-uNKIhaoICJ5KQALYZ4TOaOLElyM+xipord+Ha3crEFhTntdLvWZqVY49Wqd/0GiVCA/f9NjemLeiNPjG7Hpurg== react-i18next@^12.0.0: version "12.3.1" @@ -8563,7 +8549,16 @@ saslprep@^1.0.3: dependencies: sparse-bitfield "^3.0.3" -sass@^1.57.1, sass@^1.70.0: +sass@^1.57.1: + version "1.77.7" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.7.tgz#ef3520edc8f59da089f25891d8a6bebf93668ee0" + integrity sha512-9ywH75cO+rLjbrZ6en3Gp8qAMwPGBapFtlsMJoDTkcMU/bSe5a6cjKVUn5Jr4Gzg5GbP3HE8cm+02pLCgcoMow== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + +sass@^1.70.0: version "1.77.6" resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.6.tgz#898845c1348078c2e6d1b64f9ee06b3f8bd489e4" integrity sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q== @@ -9249,9 +9244,9 @@ supports-preserve-symlinks-flag@^1.0.0: integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== sweetalert2@^11.6.16: - version "11.12.0" - resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.12.0.tgz#a3039c537b2193161e8effcd09fdc83cd6a6d817" - integrity sha512-Fe6sitTNReNdPF1q1w4uz1GAVv9acZff9Q7YILH5n6O/ti3MzwgfEA0aQ6tLjpy+O1NLXnZjUE//xrbluGXzJw== + version "11.12.2" + resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.12.2.tgz#3430b6bd66f732ae6c36b19ff965da5b01b1e3fd" + integrity sha512-Rwv5iRYlApkDSXeX22aLhhWMlWPzFxnNBVLZajkFKYhaVEfQkMOPQQRhBtSFxKBPCoko9U3SccWm9hI4o3Id0Q== symbol-tree@^3.2.4: version "3.2.4" From 975e9503e040708fa4f38818ac0afcbbd6c2fdd8 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Wed, 10 Jul 2024 14:00:00 +0200 Subject: [PATCH 02/37] chore(server): :arrow_up: Upgrade patch dependencies --- yarn.lock | 210 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 118 insertions(+), 92 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5de18566c4..cac0a83c2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1322,7 +1322,7 @@ "@mongodb-js/saslprep@^1.1.5": version "1.1.7" - resolved "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.7.tgz" + resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.1.7.tgz#d1700facfd6916c50c2c88fd6d48d363a56c702f" integrity sha512-dCHW/oEX0KJ4NjDULBo3JiOaK5+6axtpBbS+ao2ZInoAL9/YRQLhXzSNAFz7hP4nzLkIqsfYAK/PDE3+XHny0Q== dependencies: sparse-bitfield "^3.0.3" @@ -1393,7 +1393,7 @@ "@nodelib/fs.scandir@2.1.5": version "2.1.5" - resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== dependencies: "@nodelib/fs.stat" "2.0.5" @@ -1401,7 +1401,7 @@ "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" - resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": @@ -1728,15 +1728,15 @@ validator "^13.11.0" "@typegoose/typegoose@^12.0.0": - version "12.5.0" - resolved "https://registry.npmjs.org/@typegoose/typegoose/-/typegoose-12.5.0.tgz" - integrity sha512-+2ucXC89PrlPUIw/204X5+fjRDHfAXqdH5V40H1W1GcFA2G6yTi6eU22EO3Uq0nRyQyO9keFCzjcoQXUMJOvBQ== + version "12.6.0" + resolved "https://registry.yarnpkg.com/@typegoose/typegoose/-/typegoose-12.6.0.tgz#49e5169b3a98434568383313774bbabd0c509c53" + integrity sha512-CUhJaQ6krTYH6y4ZzxShEYu2IltlK5o/gWLp56gTozQvk6BU7g7NNZlBWpBW625LSgSQgae/JqjnBwmgQrIQig== dependencies: lodash "^4.17.20" loglevel "^1.9.1" reflect-metadata "^0.2.2" semver "^7.6.2" - tslib "^2.6.2" + tslib "^2.6.3" "@types/accepts@*": version "1.3.7" @@ -2045,7 +2045,14 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@>=13.7.0", "@types/node@^20.14.9": +"@types/node@*", "@types/node@^20.14.9": + version "20.14.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.10.tgz#a1a218290f1b6428682e3af044785e5874db469a" + integrity sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ== + dependencies: + undici-types "~5.26.4" + +"@types/node@>=13.7.0": version "20.14.9" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.9.tgz#12e8e765ab27f8c421a1820c99f5f313a933b420" integrity sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg== @@ -2309,15 +2316,15 @@ tsutils "^3.21.0" "@typescript-eslint/eslint-plugin@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.15.0.tgz#8eaf396ac2992d2b8f874b68eb3fcd6b179cb7f3" - integrity sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA== + version "7.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.16.0.tgz#b3563927341eca15124a18c6f94215f779f5c02a" + integrity sha512-py1miT6iQpJcs1BiJjm54AMzeuMPBSPuKPlnT8HlfudbcS5rYeX5jajpLf3mrdRh9dA/Ec2FVUY0ifeVNDIhZw== dependencies: "@eslint-community/regexpp" "^4.10.0" - "@typescript-eslint/scope-manager" "7.15.0" - "@typescript-eslint/type-utils" "7.15.0" - "@typescript-eslint/utils" "7.15.0" - "@typescript-eslint/visitor-keys" "7.15.0" + "@typescript-eslint/scope-manager" "7.16.0" + "@typescript-eslint/type-utils" "7.16.0" + "@typescript-eslint/utils" "7.16.0" + "@typescript-eslint/visitor-keys" "7.16.0" graphemer "^1.4.0" ignore "^5.3.1" natural-compare "^1.4.0" @@ -2345,14 +2352,14 @@ debug "^4.3.4" "@typescript-eslint/parser@^7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.15.0.tgz#f4a536e5fc6a1c05c82c4d263a2bfad2da235c80" - integrity sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A== - dependencies: - "@typescript-eslint/scope-manager" "7.15.0" - "@typescript-eslint/types" "7.15.0" - "@typescript-eslint/typescript-estree" "7.15.0" - "@typescript-eslint/visitor-keys" "7.15.0" + version "7.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.16.0.tgz#53fae8112f8c912024aea7b499cf7374487af6d8" + integrity sha512-ar9E+k7CU8rWi2e5ErzQiC93KKEFAXA2Kky0scAlPcxYblLt8+XZuHUZwlyfXILyQa95P6lQg+eZgh/dDs3+Vw== + dependencies: + "@typescript-eslint/scope-manager" "7.16.0" + "@typescript-eslint/types" "7.16.0" + "@typescript-eslint/typescript-estree" "7.16.0" + "@typescript-eslint/visitor-keys" "7.16.0" debug "^4.3.4" "@typescript-eslint/scope-manager@5.62.0": @@ -2363,13 +2370,13 @@ "@typescript-eslint/types" "5.62.0" "@typescript-eslint/visitor-keys" "5.62.0" -"@typescript-eslint/scope-manager@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.15.0.tgz#201b34b0720be8b1447df17b963941bf044999b2" - integrity sha512-Q/1yrF/XbxOTvttNVPihxh1b9fxamjEoz2Os/Pe38OHwxC24CyCqXxGTOdpb4lt6HYtqw9HetA/Rf6gDGaMPlw== +"@typescript-eslint/scope-manager@7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.16.0.tgz#eb0757af5720c9c53c8010d7a0355ae27e17b7e5" + integrity sha512-8gVv3kW6n01Q6TrI1cmTZ9YMFi3ucDT7i7aI5lEikk2ebk1AEjrwX8MDTdaX5D7fPXMBLvnsaa0IFTAu+jcfOw== dependencies: - "@typescript-eslint/types" "7.15.0" - "@typescript-eslint/visitor-keys" "7.15.0" + "@typescript-eslint/types" "7.16.0" + "@typescript-eslint/visitor-keys" "7.16.0" "@typescript-eslint/scope-manager@7.2.0": version "7.2.0" @@ -2389,13 +2396,13 @@ debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/type-utils@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.15.0.tgz#5b83c904c6de91802fb399305a50a56d10472c39" - integrity sha512-SkgriaeV6PDvpA6253PDVep0qCqgbO1IOBiycjnXsszNTVQe5flN5wR5jiczoEoDEnAqYFSFFc9al9BSGVltkg== +"@typescript-eslint/type-utils@7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.16.0.tgz#ec52b1932b8fb44a15a3e20208e0bd49d0b6bd00" + integrity sha512-j0fuUswUjDHfqV/UdW6mLtOQQseORqfdmoBNDFOqs9rvNVR2e+cmu6zJu/Ku4SDuqiJko6YnhwcL8x45r8Oqxg== dependencies: - "@typescript-eslint/typescript-estree" "7.15.0" - "@typescript-eslint/utils" "7.15.0" + "@typescript-eslint/typescript-estree" "7.16.0" + "@typescript-eslint/utils" "7.16.0" debug "^4.3.4" ts-api-utils "^1.3.0" @@ -2404,10 +2411,10 @@ resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz" integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== -"@typescript-eslint/types@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.15.0.tgz#fb894373a6e3882cbb37671ffddce44f934f62fc" - integrity sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw== +"@typescript-eslint/types@7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.16.0.tgz#60a19d7e7a6b1caa2c06fac860829d162a036ed2" + integrity sha512-fecuH15Y+TzlUutvUl9Cc2XJxqdLr7+93SQIbcZfd4XRGGKoxyljK27b+kxKamjRkU7FYC6RrbSCg0ALcZn/xw== "@typescript-eslint/types@7.2.0": version "7.2.0" @@ -2427,13 +2434,13 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.15.0.tgz#e323bfa3966e1485b638ce751f219fc1f31eba37" - integrity sha512-gjyB/rHAopL/XxfmYThQbXbzRMGhZzGw6KpcMbfe8Q3nNQKStpxnUKeXb0KiN/fFDR42Z43szs6rY7eHk0zdGQ== +"@typescript-eslint/typescript-estree@7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.0.tgz#98ac779d526fab2a781e5619c9250f3e33867c09" + integrity sha512-a5NTvk51ZndFuOLCh5OaJBELYc2O3Zqxfl3Js78VFE1zE46J2AaVuW+rEbVkQznjkmlzWsUI15BG5tQMixzZLw== dependencies: - "@typescript-eslint/types" "7.15.0" - "@typescript-eslint/visitor-keys" "7.15.0" + "@typescript-eslint/types" "7.16.0" + "@typescript-eslint/visitor-keys" "7.16.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -2469,15 +2476,15 @@ eslint-scope "^5.1.1" semver "^7.3.7" -"@typescript-eslint/utils@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.15.0.tgz#9e6253c4599b6e7da2fb64ba3f549c73eb8c1960" - integrity sha512-hfDMDqaqOqsUVGiEPSMLR/AjTSCsmJwjpKkYQRo1FNbmW4tBwBspYDwO9eh7sKSTwMQgBw9/T4DHudPaqshRWA== +"@typescript-eslint/utils@7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.16.0.tgz#b38dc0ce1778e8182e227c98d91d3418449aa17f" + integrity sha512-PqP4kP3hb4r7Jav+NiRCntlVzhxBNWq6ZQ+zQwII1y/G/1gdIPeYDCKr2+dH6049yJQsWZiHU6RlwvIFBXXGNA== dependencies: "@eslint-community/eslint-utils" "^4.4.0" - "@typescript-eslint/scope-manager" "7.15.0" - "@typescript-eslint/types" "7.15.0" - "@typescript-eslint/typescript-estree" "7.15.0" + "@typescript-eslint/scope-manager" "7.16.0" + "@typescript-eslint/types" "7.16.0" + "@typescript-eslint/typescript-estree" "7.16.0" "@typescript-eslint/visitor-keys@5.62.0": version "5.62.0" @@ -2487,12 +2494,12 @@ "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" -"@typescript-eslint/visitor-keys@7.15.0": - version "7.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.15.0.tgz#1da0726201a859343fe6a05742a7c1792fff5b66" - integrity sha512-Hqgy/ETgpt2L5xueA/zHHIl4fJI2O4XUE9l4+OIfbJIRSnTJb/QscncdqqZzofQegIJugRIF57OJea1khw2SDw== +"@typescript-eslint/visitor-keys@7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.0.tgz#a1d99fa7a3787962d6e0efd436575ef840e23b06" + integrity sha512-rMo01uPy9C7XxG7AFsxa8zLnWXTF8N3PYclekWSrurvhwiw1eW88mrKiAYe6s53AUY57nTRz8dJsuuXdkAhzCg== dependencies: - "@typescript-eslint/types" "7.15.0" + "@typescript-eslint/types" "7.16.0" eslint-visitor-keys "^3.4.3" "@typescript-eslint/visitor-keys@7.2.0": @@ -2746,7 +2753,7 @@ array-includes@^3.1.6, array-includes@^3.1.7, array-includes@^3.1.8: array-union@^2.1.0: version "2.1.0" - resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== array.prototype.findlast@^1.2.5: @@ -3089,7 +3096,7 @@ brace-expansion@^1.1.7: brace-expansion@^2.0.1: version "2.0.1" - resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== dependencies: balanced-match "^1.0.0" @@ -3246,7 +3253,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0: version "4.1.2" resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -3919,7 +3926,7 @@ diff@^4.0.1: dir-glob@^3.0.1: version "3.0.1" - resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== dependencies: path-type "^4.0.0" @@ -4058,6 +4065,13 @@ ee-first@1.1.1: resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== +ejs@^3.0.0: + version "3.1.10" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" + integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== + dependencies: + jake "^10.8.5" + electron-to-chromium@^1.4.796: version "1.4.801" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.801.tgz" @@ -4708,7 +4722,7 @@ fastest-stable-stringify@^2.0.2: fastq@^1.6.0: version "1.17.1" - resolved "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== dependencies: reusify "^1.0.4" @@ -4732,6 +4746,13 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +filelist@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== + dependencies: + minimatch "^5.0.1" + fill-range@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" @@ -5092,7 +5113,7 @@ globalthis@^1.0.3: globby@^11.1.0: version "11.1.0" - resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== dependencies: array-union "^2.1.0" @@ -5151,7 +5172,7 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graphemer@^1.4.0: version "1.4.0" - resolved "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz" + resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== gtoken@^7.0.0: @@ -5448,7 +5469,7 @@ ignore-by-default@^1.0.1: ignore@^5.2.0, ignore@^5.3.1: version "5.3.1" - resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== image-size@~0.5.0: @@ -5913,6 +5934,16 @@ jackspeak@^3.1.2: optionalDependencies: "@pkgjs/parseargs" "^0.11.0" +jake@^10.8.5: + version "10.9.1" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.1.tgz#8dc96b7fcc41cb19aa502af506da4e1d56f5e62b" + integrity sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w== + dependencies: + async "^3.2.3" + chalk "^4.0.2" + filelist "^1.0.4" + minimatch "^3.1.2" + jest-changed-files@^29.7.0: version "29.7.0" resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz" @@ -6716,7 +6747,7 @@ logform@^2.3.2, logform@^2.4.0: loglevel@^1.9.1: version "1.9.1" - resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.9.1.tgz" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.1.tgz#d63976ac9bcd03c7c873116d41c2a85bafff1be7" integrity sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg== long@^5.0.0: @@ -6817,7 +6848,7 @@ merge-stream@^2.0.0: merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" - resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== methods@~1.1.2: @@ -6827,7 +6858,7 @@ methods@~1.1.2: micromatch@^4.0.4: version "4.0.7" - resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== dependencies: braces "^3.0.3" @@ -6891,6 +6922,13 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: dependencies: brace-expansion "^1.1.7" +minimatch@^5.0.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + minimatch@^9.0.1: version "9.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" @@ -6978,7 +7016,7 @@ mongoose@*: ms "2.1.3" sift "17.1.3" -mongoose@8.5.0: +mongoose@8.5.0, mongoose@^8.0.1: version "8.5.0" resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-8.5.0.tgz#70e5f032225c20ab8819513fd8cb94b7e6a956bb" integrity sha512-iGgZvgO+fIgX1AQMehkG+Wj8qrWc9it8vUZrSKWjrebgfwHTqUcIdTgWK8mT1us1xd83NOQxiuGbg9ZJtLxs2Q== @@ -6991,19 +7029,6 @@ mongoose@8.5.0: ms "2.1.3" sift "17.1.3" -mongoose@^8.0.1: - version "8.4.4" - resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-8.4.4.tgz#2a70f47cc69f3b0ad756af6a97484d4fb1835fb3" - integrity sha512-Nya808odIJoHP4JuJKbWA2eIaerXieu59kE8pQlvJpUBoSKWUyhLji0g1WMVaYXWmzPYXP2Jd6XdR4KJE8RELw== - dependencies: - bson "^6.7.0" - kareem "2.6.3" - mongodb "6.6.2" - mpath "0.9.0" - mquery "5.0.0" - ms "2.1.3" - sift "17.1.3" - mpath@0.9.0, mpath@^0.9.0: version "0.9.0" resolved "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz" @@ -7071,7 +7096,7 @@ natural-compare-lite@^1.4.0: natural-compare@^1.4.0: version "1.4.0" - resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== needle@^3.1.0: @@ -7547,7 +7572,7 @@ path-type@^1.0.0: path-type@^4.0.0: version "4.0.0" - resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== performance-now@^2.1.0: @@ -7866,7 +7891,7 @@ querystringify@^2.1.1: queue-microtask@^1.2.2: version "1.2.3" - resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== raf@^3.4.0, raf@^3.4.1: @@ -8472,7 +8497,7 @@ retry@^0.12.0: reusify@^1.0.4: version "1.0.4" - resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== rimraf@^3.0.2: @@ -8491,7 +8516,7 @@ rtl-css-js@^1.16.1: run-parallel@^1.1.9: version "1.2.0" - resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== dependencies: queue-microtask "^1.2.2" @@ -8805,7 +8830,7 @@ sisteransi@^1.0.5: slash@^3.0.0: version "3.0.0" - resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== smart-buffer@^4.2.0: @@ -9455,11 +9480,12 @@ ts-jest@29.0.3: yargs-parser "^21.0.1" ts-jest@^29.1.1: - version "29.1.5" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.5.tgz#d6c0471cc78bffa2cb4664a0a6741ef36cfe8f69" - integrity sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg== + version "29.2.1" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.1.tgz#9a460bb27446d141c48a17cf24f060dbe9b58254" + integrity sha512-7obwtH5gw0b0XZi0wmprCSvGSvHliMBI47lPnU47vmbxWS6B+v1X94yWFo1f1vt9k/he+gttsrXjkxmgY41XNQ== dependencies: bs-logger "0.x" + ejs "^3.0.0" fast-json-stable-stringify "2.x" jest-util "^29.0.0" json5 "^2.2.3" @@ -9516,7 +9542,7 @@ tslib@^1.8.1: resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.2: +tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.3: version "2.6.3" resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz" integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== From 6ec6076fdd47204aa814787e826cbb3e09790f66 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Wed, 10 Jul 2024 14:31:13 +0200 Subject: [PATCH 03/37] chore(client): :arrow_up: Update lexical --- client/package.json | 4 +- .../ToolbarPlugin/ToolbarPlugin.tsx | 6 +- .../FloatingLinkEditorPlugin/index.tsx | 3 +- yarn.lock | 337 ++++++++++-------- 4 files changed, 199 insertions(+), 151 deletions(-) diff --git a/client/package.json b/client/package.json index e3c924526e..01f2530902 100644 --- a/client/package.json +++ b/client/package.json @@ -14,7 +14,7 @@ "dependencies": { "@codegouvfr/react-dsfr": "^1.9.11", "@hedgedoc/html-to-react": "^1.4.5", - "@lexical/react": "^0.11.0", + "@lexical/react": "^0.16.1", "@react-google-maps/api": "^2.17.0", "@refugies-info/api-types": "*", "algoliasearch": "^4.14.2", @@ -28,7 +28,7 @@ "i18next": "^22.0.6", "js-cookie": "^3.0.1", "jwt-decode": "^3.1.2", - "lexical": "^0.11.0", + "lexical": "^0.16.1", "lodash": "^4.17.21", "moment": "^2.29.4", "next": "^14.2.4", diff --git a/client/src/components/UI/RichTextInput/ToolbarPlugin/ToolbarPlugin.tsx b/client/src/components/UI/RichTextInput/ToolbarPlugin/ToolbarPlugin.tsx index 673abb1c12..3bb0d6d910 100644 --- a/client/src/components/UI/RichTextInput/ToolbarPlugin/ToolbarPlugin.tsx +++ b/client/src/components/UI/RichTextInput/ToolbarPlugin/ToolbarPlugin.tsx @@ -27,12 +27,12 @@ import { CAN_REDO_COMMAND, CAN_UNDO_COMMAND, COMMAND_PRIORITY_CRITICAL, - DEPRECATED_$isGridSelection, FORMAT_TEXT_COMMAND, REDO_COMMAND, SELECTION_CHANGE_COMMAND, UNDO_COMMAND, } from "lexical"; +import { $isTableSelection } from "@lexical/table" import { cls } from "lib/classname"; import { $isCalloutNode, INSERT_CALLOUT_COMMAND, REMOVE_CALLOUT_COMMAND } from "../plugins/CalloutPlugin"; import { CalloutLevel, CalloutNode } from "../plugins/CalloutPlugin/CalloutNode"; @@ -140,7 +140,7 @@ export default function ToolbarPlugin() { if (blockType !== "paragraph") { editor.update(() => { const selection = $getSelection(); - if ($isRangeSelection(selection) || DEPRECATED_$isGridSelection(selection)) + if ($isRangeSelection(selection) || $isTableSelection(selection)) $setBlocksType(selection, () => $createParagraphNode()); }); } @@ -149,7 +149,7 @@ export default function ToolbarPlugin() { const formatHeading = () => { editor.update(() => { const selection = $getSelection(); - if ($isRangeSelection(selection) || DEPRECATED_$isGridSelection(selection)) { + if ($isRangeSelection(selection) || $isTableSelection(selection)) { if (blockType !== "h3") { $setBlocksType(selection, () => $createHeadingNode("h3")); } else { diff --git a/client/src/components/UI/RichTextInput/plugins/FloatingLinkEditorPlugin/index.tsx b/client/src/components/UI/RichTextInput/plugins/FloatingLinkEditorPlugin/index.tsx index a5c6235d51..97051c4b2a 100644 --- a/client/src/components/UI/RichTextInput/plugins/FloatingLinkEditorPlugin/index.tsx +++ b/client/src/components/UI/RichTextInput/plugins/FloatingLinkEditorPlugin/index.tsx @@ -19,6 +19,7 @@ import { KEY_ESCAPE_COMMAND, LexicalEditor, SELECTION_CHANGE_COMMAND, + TextNode, } from "lexical"; import { cls } from "lib/classname"; import { sanitizeUrl } from "lib/sanitizeUrl"; @@ -188,7 +189,7 @@ const FloatingLinkEditor = ({ editor, isLink, setIsLink, anchorElem, initialOpen editor.update(() => { const node = $getSelection(); const childTextNode = node?.getNodes()?.[0]; - if (childTextNode) childTextNode.setTextContent(linkText); + if (childTextNode instanceof TextNode) childTextNode.setTextContent(linkText); editor.dispatchCommand(TOGGLE_LINK_COMMAND, { url: sanitizeUrl(linkUrl), rel: "noreferrer", target: "_blank" }); setIsModalOpen(false); setIsFloatingVisible(false); diff --git a/yarn.lock b/yarn.lock index cac0a83c2e..554a941d29 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1166,159 +1166,206 @@ resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c" integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw== -"@lexical/clipboard@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/clipboard/-/clipboard-0.11.3.tgz" - integrity sha512-6xggT8b0hd4OQy25mBH+yiJsr3Bm8APHjDOd3yINCGeiiHXIC+2qKQn3MG70euxQQuyzq++tYHcSsFq42g8Jyw== - dependencies: - "@lexical/html" "0.11.3" - "@lexical/list" "0.11.3" - "@lexical/selection" "0.11.3" - "@lexical/utils" "0.11.3" - -"@lexical/code@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/code/-/code-0.11.3.tgz" - integrity sha512-BIMPd2op65iP4N9SkKIUVodZoWeSsnk6skNJ8UHBO/Rg0ZxyAqxLpnBhEgHq2QOoTBbEW6OEFtkc7/+f9LINZg== - dependencies: - "@lexical/utils" "0.11.3" +"@lexical/clipboard@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/clipboard/-/clipboard-0.16.1.tgz#50d09887eeceab1debbc2428a02b8135b66c4e1d" + integrity sha512-0dWs/SwKS5KPpuf6fUVVt9vSCl6HAqcDGhSITw/okv0rrIlXTUT6WhVsMJtXfFxTyVvwMeOecJHvQH3i/jRQtA== + dependencies: + "@lexical/html" "0.16.1" + "@lexical/list" "0.16.1" + "@lexical/selection" "0.16.1" + "@lexical/utils" "0.16.1" + lexical "0.16.1" + +"@lexical/code@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/code/-/code-0.16.1.tgz#c62df85881b03485ea4b4492d0dadc6682ddb983" + integrity sha512-pOC28rRZ2XkmI2nIJm50DbKaCJtk5D0o7r6nORYp4i0z+lxt5Sf2m82DL9ksUHJRqKy87pwJDpoWvJ2SAI0ohw== + dependencies: + "@lexical/utils" "0.16.1" + lexical "0.16.1" prismjs "^1.27.0" -"@lexical/dragon@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/dragon/-/dragon-0.11.3.tgz" - integrity sha512-S18uwqOOpV2yIAFVWqSvBdhZ5BGadPQO4ejZF15wP8LUuqkxCs+0I/MjLovQ7tx0Cx34KdDaOXtM6XeG74ixYw== - -"@lexical/hashtag@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/hashtag/-/hashtag-0.11.3.tgz" - integrity sha512-7auoaWp2QhsX9/Bq0SxLXatUaSwqoT9HlWNTH2vKsw8tdeUBYacTHLuBNncTGrznXLG0/B5+FWoLuM6Pzqq4Ig== - dependencies: - "@lexical/utils" "0.11.3" - -"@lexical/history@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/history/-/history-0.11.3.tgz" - integrity sha512-QLJQRH2rbadRwXd4c/U4TqjLWDQna6Q43nCocIZF+SdVG9TlASp7m6dS7hiHfPtV1pkxJUxPhZY6EsB/Ok5WGA== - dependencies: - "@lexical/utils" "0.11.3" - -"@lexical/html@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/html/-/html-0.11.3.tgz" - integrity sha512-+8AYnxxml9PneZLkGfdTenqDjE2yD1ZfCmQLrD/L1TEn22OjZh4uvKVHb13wEhgUZTuLKF0PNdnuecko9ON/aQ== - dependencies: - "@lexical/selection" "0.11.3" - -"@lexical/link@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/link/-/link-0.11.3.tgz" - integrity sha512-stAjIrDrF18dPKK25ExPwMCcMe0KKD0FWVzo3F7ejh9DvrQcLFeBPcs8ze71chS3D5fQDB/CzdwvMjEViKmq2A== - dependencies: - "@lexical/utils" "0.11.3" - -"@lexical/list@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/list/-/list-0.11.3.tgz" - integrity sha512-Cs9071wDfqi4j1VgodceiR1jTHj13eCoEJDhr3e/FW0x5we7vfbTMtWlOWbveIoryAh+rQNgiD5e8SrAm6Zs3g== - dependencies: - "@lexical/utils" "0.11.3" - -"@lexical/mark@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/mark/-/mark-0.11.3.tgz" - integrity sha512-0wAtufmaA0rMVFXoiJ0sY/tiJsQbHuDpgywb1Qa8qnZZcg7ZTrQMz9Go0fEWYcbSp8OH2o0cjbDTz3ACS1qCUA== - dependencies: - "@lexical/utils" "0.11.3" - -"@lexical/markdown@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/markdown/-/markdown-0.11.3.tgz" - integrity sha512-sF8ow32BDme3UvxaKpf+j+vMc4T/XvDEzteZHmvvP7NX/iUtK3yUkTyT7rKuGwiKLYfMBwQaKMGjU3/nlIOzUg== - dependencies: - "@lexical/code" "0.11.3" - "@lexical/link" "0.11.3" - "@lexical/list" "0.11.3" - "@lexical/rich-text" "0.11.3" - "@lexical/text" "0.11.3" - "@lexical/utils" "0.11.3" - -"@lexical/offset@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/offset/-/offset-0.11.3.tgz" - integrity sha512-3H9X8iqDSk0LrMOHZuqYuqX4EYGb78TIhtjrFbLJi/OgKmHaSeLx59xcMZdgd5kBdRitzQYMmvbRDvbLfMgWrA== - -"@lexical/overflow@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/overflow/-/overflow-0.11.3.tgz" - integrity sha512-ShjCG8lICShOBKwrpP+9PjRFKEBCSUUMjbIGZfLnoL//3hyRtGv5aRgRyfJlRgDhCve0ROt5znLJV88EXzGRyA== - -"@lexical/plain-text@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/plain-text/-/plain-text-0.11.3.tgz" - integrity sha512-cQ5Us+GNzShyjjgRqWTnYv0rC+jHJ96LvBA1aSieM77H8/Im5BeoLl6TgBK2NqPkp8fGpj8JnDEdT8h9Qh1jtA== - -"@lexical/react@^0.11.0": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/react/-/react-0.11.3.tgz" - integrity sha512-Rn0Agnrz3uLIWbNyS9PRlkxOxcIDl2kxaVfgBacqQtYKR0ZVB2Hnoi89Cq6VmWPovauPyryx4Q3FC8Y11X7Otg== - dependencies: - "@lexical/clipboard" "0.11.3" - "@lexical/code" "0.11.3" - "@lexical/dragon" "0.11.3" - "@lexical/hashtag" "0.11.3" - "@lexical/history" "0.11.3" - "@lexical/link" "0.11.3" - "@lexical/list" "0.11.3" - "@lexical/mark" "0.11.3" - "@lexical/markdown" "0.11.3" - "@lexical/overflow" "0.11.3" - "@lexical/plain-text" "0.11.3" - "@lexical/rich-text" "0.11.3" - "@lexical/selection" "0.11.3" - "@lexical/table" "0.11.3" - "@lexical/text" "0.11.3" - "@lexical/utils" "0.11.3" - "@lexical/yjs" "0.11.3" +"@lexical/devtools-core@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/devtools-core/-/devtools-core-0.16.1.tgz#e166e08c74735f8837843b3e3da4492312cdbc58" + integrity sha512-8CvGERGL7ySDVGLU+YPeq+JupIXsOFlXa3EuJ88koLKqXxYenwMleZgGqayFp6lCP78xqPKnATVeoOZUt/NabQ== + dependencies: + "@lexical/html" "0.16.1" + "@lexical/link" "0.16.1" + "@lexical/mark" "0.16.1" + "@lexical/table" "0.16.1" + "@lexical/utils" "0.16.1" + lexical "0.16.1" + +"@lexical/dragon@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/dragon/-/dragon-0.16.1.tgz#bc122770fe3bd8002f057b99d4ca5aee95ec3b31" + integrity sha512-Rvd60GIYN5kpjjBumS34EnNbBaNsoseI0AlzOdtIV302jiHPCLH0noe9kxzu9nZy+MZmjZy8Dx2zTbQT2mueRw== + dependencies: + lexical "0.16.1" + +"@lexical/hashtag@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/hashtag/-/hashtag-0.16.1.tgz#4a55b8f03f2754d39a15e44e30a80bdc6fb1710b" + integrity sha512-G+YOxStAKs3q1utqm9KR4D4lCkwIH52Rctm4RgaVTI+4lvTaybeDRGFV75P/pI/qlF7/FvAYHTYEzCjtC3GNMQ== + dependencies: + "@lexical/utils" "0.16.1" + lexical "0.16.1" + +"@lexical/history@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/history/-/history-0.16.1.tgz#1c9f4f06f4bcdc2e91cfd6dac7c508633e7779d2" + integrity sha512-WQhScx0TJeKSQAnEkRpIaWdUXqirrNrom2MxbBUc/32zEUMm9FzV7nRGknvUabEFUo7vZq6xTZpOExQJqHInQA== + dependencies: + "@lexical/utils" "0.16.1" + lexical "0.16.1" + +"@lexical/html@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/html/-/html-0.16.1.tgz#40211fda59246ff797a63b060787cb76a31608d2" + integrity sha512-vbtAdCvQ3PaAqa5mFmtmrvbiAvjCu1iXBAJ0bsHqFXCF2Sba5LwHVe8dUAOTpfEZEMbiHfjul6b5fj4vNPGF2A== + dependencies: + "@lexical/selection" "0.16.1" + "@lexical/utils" "0.16.1" + lexical "0.16.1" + +"@lexical/link@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/link/-/link-0.16.1.tgz#ba15ca875f9f7f37aef7d6bc7f3f010168571e31" + integrity sha512-zG36gEnEqbIe6tK/MhXi7wn/XMY/zdivnPcOY5WyC3derkEezeLSSIFsC1u5UNeK5pbpNMSy4LDpLhi1Ww4Y5w== + dependencies: + "@lexical/utils" "0.16.1" + lexical "0.16.1" + +"@lexical/list@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/list/-/list-0.16.1.tgz#109c0c1e9ea8b19e9a89c2887b831690e05f20a7" + integrity sha512-i9YhLAh5N6YO9dP+R1SIL9WEdCKeTiQQYVUzj84vDvX5DIBxMPUjTmMn3LXu9T+QO3h1s2L/vJusZASrl45eAw== + dependencies: + "@lexical/utils" "0.16.1" + lexical "0.16.1" + +"@lexical/mark@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/mark/-/mark-0.16.1.tgz#942465a7d34858a559ad29410c5d543f1c340708" + integrity sha512-CZRGMLcxn5D+jzf1XnH+Z+uUugmpg1mBwTbGybCPm8UWpBrKDHkrscfMgWz62iRWz0cdVjM5+0zWpNElxFTRjQ== + dependencies: + "@lexical/utils" "0.16.1" + lexical "0.16.1" + +"@lexical/markdown@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/markdown/-/markdown-0.16.1.tgz#3e68fbac6ce65f6331ae712bb7d494c885550e3d" + integrity sha512-0sBLttMvfQO/hVaIqpHdvDowpgV2CoRuWo2CNwvRLZPPWvPVjL4Nkb73wmi8zAZsAOTbX2aw+g4m/+k5oJqNig== + dependencies: + "@lexical/code" "0.16.1" + "@lexical/link" "0.16.1" + "@lexical/list" "0.16.1" + "@lexical/rich-text" "0.16.1" + "@lexical/text" "0.16.1" + "@lexical/utils" "0.16.1" + lexical "0.16.1" + +"@lexical/offset@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/offset/-/offset-0.16.1.tgz#e5fc9363fffe3abaa23c7212dfa363878c5bab15" + integrity sha512-/i2J04lQmFeydUZIF8tKXLQTXiJDTQ6GRnkfv1OpxU4amc0rwGa7+qAz/PuF1n58rP6InpLmSHxgY5JztXa2jw== + dependencies: + lexical "0.16.1" + +"@lexical/overflow@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/overflow/-/overflow-0.16.1.tgz#e791b3d19d6f5a8aeef5506441f1345ef2904bdb" + integrity sha512-xh5YpoxwA7K4wgMQF/Sjl8sdjaxqesLCtH5ZrcMsaPlmucDIEEs+i8xxk+kDUTEY7y+3FvRxs4lGNgX8RVWkvQ== + dependencies: + lexical "0.16.1" + +"@lexical/plain-text@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/plain-text/-/plain-text-0.16.1.tgz#bb459d82f19280ff90676a457d50dbfe81d33780" + integrity sha512-GjY4ylrBZIaAVIF8IFnmW0XGyHAuRmWA6gKB8iTTlsjgFrCHFIYC74EeJSp309O0Hflg9rRBnKoX1TYruFHVwA== + dependencies: + "@lexical/clipboard" "0.16.1" + "@lexical/selection" "0.16.1" + "@lexical/utils" "0.16.1" + lexical "0.16.1" + +"@lexical/react@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/react/-/react-0.16.1.tgz#2cf6dadef79120413cb5264849acfe8efb7c1a5f" + integrity sha512-SsGgLt9iKfrrMRy9lFb6ROVPUYOgv6b+mCn9Al+TLqs/gBReDBi3msA7m526nrtBUKYUnjHdQ1QXIJzuKgOxcg== + dependencies: + "@lexical/clipboard" "0.16.1" + "@lexical/code" "0.16.1" + "@lexical/devtools-core" "0.16.1" + "@lexical/dragon" "0.16.1" + "@lexical/hashtag" "0.16.1" + "@lexical/history" "0.16.1" + "@lexical/link" "0.16.1" + "@lexical/list" "0.16.1" + "@lexical/mark" "0.16.1" + "@lexical/markdown" "0.16.1" + "@lexical/overflow" "0.16.1" + "@lexical/plain-text" "0.16.1" + "@lexical/rich-text" "0.16.1" + "@lexical/selection" "0.16.1" + "@lexical/table" "0.16.1" + "@lexical/text" "0.16.1" + "@lexical/utils" "0.16.1" + "@lexical/yjs" "0.16.1" + lexical "0.16.1" react-error-boundary "^3.1.4" -"@lexical/rich-text@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/rich-text/-/rich-text-0.11.3.tgz" - integrity sha512-fBFs6wMS7GFLbk+mzIWtwpP+EmnTZZ5bHpveuQ5wXONBuUuLcsYF5KO7UhLxXNLmiViV6lxatZPavEzgZdW7oQ== +"@lexical/rich-text@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/rich-text/-/rich-text-0.16.1.tgz#71f0b765b96071b0d6cf5fdde9ada0c5a5a0316c" + integrity sha512-4uEVXJur7tdSbqbmsToCW4YVm0AMh4y9LK077Yq2O9hSuA5dqpI8UbTDnxZN2D7RfahNvwlqp8eZKFB1yeiJGQ== + dependencies: + "@lexical/clipboard" "0.16.1" + "@lexical/selection" "0.16.1" + "@lexical/utils" "0.16.1" + lexical "0.16.1" -"@lexical/selection@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/selection/-/selection-0.11.3.tgz" - integrity sha512-15lQpcKT/vd7XZ5pnF1nb+kpKb72e9Yi1dVqieSxTeXkzt1cAZFKP3NB4RlhOKCv1N+glSBnjSxRwgsFfbD+NQ== +"@lexical/selection@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/selection/-/selection-0.16.1.tgz#8a9756b377acf1c831440c588ad3d1789b02230f" + integrity sha512-+nK3RvXtyQvQDq7AZ46JpphmM33pwuulwiRfeXR5T9iFQTtgWOEjsAi/KKX7vGm70BxACfiSxy5QCOgBWFwVJg== + dependencies: + lexical "0.16.1" -"@lexical/table@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/table/-/table-0.11.3.tgz" - integrity sha512-EyRnN39CSPsMceADBR7Kf+sBHNpNQlPEkn/52epeDSnakR6s80woyrA3kIzKo6mLB4afvoqdYc7RfR96M9JLIA== +"@lexical/table@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/table/-/table-0.16.1.tgz#ac0f15b3145720fcd3d53c7241042dc8ad354173" + integrity sha512-GWb0/MM1sVXpi1p2HWWOBldZXASMQ4c6WRNYnRmq7J/aB5N66HqQgJGKp3m66Kz4k1JjhmZfPs7F018qIBhnFQ== dependencies: - "@lexical/utils" "0.11.3" + "@lexical/utils" "0.16.1" + lexical "0.16.1" -"@lexical/text@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/text/-/text-0.11.3.tgz" - integrity sha512-gCEN8lJyR6b+yaOwKWGj79pbOfCQPWU/PHWyoNFUkEJXn3KydCzr2EYb6ta2cvQWRQU4G2BClKCR56jL4NS+qg== +"@lexical/text@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/text/-/text-0.16.1.tgz#a028a2dd888536a32fa99d14183b148ec69211b6" + integrity sha512-Os/nKQegORTrKKN6vL3/FMVszyzyqaotlisPynvTaHTUC+yY4uyjM2hlF93i5a2ixxyiPLF9bDroxUP96TMPXg== + dependencies: + lexical "0.16.1" -"@lexical/utils@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/utils/-/utils-0.11.3.tgz" - integrity sha512-vC4saCrlcmyIJnvrYKw1uYxZojlD1DCIBsFlgmO8kXyRYXjj+o/8PBdn2dsgSQ3rADrC2mUloOm/maekDcYe9Q== +"@lexical/utils@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/utils/-/utils-0.16.1.tgz#f7bcd36eff2ac142ad72106e45fe0da219ec873e" + integrity sha512-BVyJxDQi/rIxFTDjf2zE7rMDKSuEaeJ4dybHRa/hRERt85gavGByQawSLeQlTjLaYLVsy+x7wCcqh2fNhlLf0g== dependencies: - "@lexical/list" "0.11.3" - "@lexical/selection" "0.11.3" - "@lexical/table" "0.11.3" + "@lexical/list" "0.16.1" + "@lexical/selection" "0.16.1" + "@lexical/table" "0.16.1" + lexical "0.16.1" -"@lexical/yjs@0.11.3": - version "0.11.3" - resolved "https://registry.npmjs.org/@lexical/yjs/-/yjs-0.11.3.tgz" - integrity sha512-TLDQG2FSEw/aOfppEBb0wRlIuzJ57W//8ImfzyZvckSC12tvU0YKQQX8nQz/rybXdyfRy5eN+8gX5K2EyZx+pQ== +"@lexical/yjs@0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@lexical/yjs/-/yjs-0.16.1.tgz#ed43581a1f96f581d36fd82f0b2e124a103fecd9" + integrity sha512-QHw1bmzB/IypIV1tRWMH4hhwE1xX7wV+HxbzBS8oJAkoU5AYXM/kyp/sQicgqiwVfpai1Px7zatOoUDFgbyzHQ== dependencies: - "@lexical/offset" "0.11.3" + "@lexical/offset" "0.16.1" + lexical "0.16.1" "@mongodb-js/saslprep@^1.1.5": version "1.1.7" @@ -6623,10 +6670,10 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -lexical@^0.11.0: - version "0.11.3" - resolved "https://registry.npmjs.org/lexical/-/lexical-0.11.3.tgz" - integrity sha512-xsMKgx/Fa+QHg/nweemU04lCy7TnEr8LyeDtsKUC7fIDN9wH3GqbnQ0+e3Hbg4FmxlhDCiPPt0GcZAROq3R8uw== +lexical@0.16.1, lexical@^0.16.1: + version "0.16.1" + resolved "https://registry.yarnpkg.com/lexical/-/lexical-0.16.1.tgz#1d2cd3f364224889caa2939df179434af936283b" + integrity sha512-+R05d3+N945OY8pTUjTqQrWoApjC+ctzvjnmNETtx9WmVAaiW0tQVG+AYLt5pDGY8dQXtd4RPorvnxBTECt9SA== lilconfig@^2.0.5: version "2.1.0" From 166d08d86cefcac0cd4ce722e1abfacb80287a4a Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Wed, 10 Jul 2024 14:36:46 +0200 Subject: [PATCH 04/37] chore(client): --- client/package.json | 4 ++-- client/src/services/User/user.saga.ts | 6 +++--- yarn.lock | 19 ++++++------------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/client/package.json b/client/package.json index 01f2530902..a64c9a797d 100644 --- a/client/package.json +++ b/client/package.json @@ -19,7 +19,7 @@ "@refugies-info/api-types": "*", "algoliasearch": "^4.14.2", "autosuggest-highlight": "^3.1.1", - "axios": "^0.26.0", + "axios": "^1.7.2", "bootstrap": "^5.2.3", "eva-icons": "^1.1.3", "flag-icons": "^6.6.6", @@ -27,7 +27,7 @@ "html2plaintext": "^2.1.4", "i18next": "^22.0.6", "js-cookie": "^3.0.1", - "jwt-decode": "^3.1.2", + "jwt-decode": "^4.0.0", "lexical": "^0.16.1", "lodash": "^4.17.21", "moment": "^2.29.4", diff --git a/client/src/services/User/user.saga.ts b/client/src/services/User/user.saga.ts index 373a99fd29..e7431dccd9 100644 --- a/client/src/services/User/user.saga.ts +++ b/client/src/services/User/user.saga.ts @@ -6,11 +6,11 @@ import { addToQueryActionCreator } from "services/SearchResults/searchResults.ac import { logger } from "../../logger"; import API from "../../utils/API"; import { finishLoading, LoadingStatusKey, setError, startLoading } from "../LoadingStatus/loadingStatus.actions"; -import { searchQuerySelector } from "../SearchResults/searchResults.selector" +import { searchQuerySelector } from "../SearchResults/searchResults.selector"; import { fetchUserStructureActionCreator } from "../UserStructure/userStructure.actions"; import { fetchUserActionCreator, saveUserActionCreator, setUserActionCreator } from "./user.actions"; import { FETCH_USER, SAVE_USER } from "./user.actionTypes"; -import { userSelector } from "./user.selectors" +import { userSelector } from "./user.selectors"; export function* fetchUser(action: ReturnType): SagaIterator { try { @@ -67,7 +67,7 @@ export function* saveUser(action: ReturnType): Sag yield put(finishLoading(LoadingStatusKey.SAVE_USER)); } catch (error) { logger.error("[saveUser] saga error", { error }); - if ((error).response?.data?.code === "WRONG_CODE") { + if ((>error).response?.data?.code === "WRONG_CODE") { yield put(setError(LoadingStatusKey.SAVE_USER, "WRONG_CODE")); } else { yield put(setUserActionCreator(null)); diff --git a/yarn.lock b/yarn.lock index 554a941d29..ade31ea137 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2948,14 +2948,7 @@ axe-core@=4.7.0: resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz" integrity sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ== -axios@^0.26.0: - version "0.26.1" - resolved "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz" - integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== - dependencies: - follow-redirects "^1.14.8" - -axios@^1.6.3, axios@^1.6.8: +axios@^1.6.3, axios@^1.6.8, axios@^1.7.2: version "1.7.2" resolved "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz" integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== @@ -4873,7 +4866,7 @@ fn.name@1.x.x: resolved "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -follow-redirects@^1.14.8, follow-redirects@^1.15.6: +follow-redirects@^1.15.6: version "1.15.6" resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz" integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== @@ -6584,10 +6577,10 @@ jws@^4.0.0: jwa "^2.0.0" safe-buffer "^5.0.1" -jwt-decode@^3.1.2: - version "3.1.2" - resolved "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz" - integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A== +jwt-decode@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b" + integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA== jwt-simple@^0.5.5: version "0.5.6" From 2f86bf1c30be0dd97fcff582d914069aa70f4eb9 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Wed, 10 Jul 2024 14:39:08 +0200 Subject: [PATCH 05/37] chore(client): :arrow_up: Upgrade several miscellaneous dependencies --- client/package.json | 10 +- yarn.lock | 374 +++++++++++++++++++++----------------------- 2 files changed, 181 insertions(+), 203 deletions(-) diff --git a/client/package.json b/client/package.json index a64c9a797d..61a8a9906c 100644 --- a/client/package.json +++ b/client/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@codegouvfr/react-dsfr": "^1.9.11", - "@hedgedoc/html-to-react": "^1.4.5", + "@hedgedoc/html-to-react": "^2.1.1", "@lexical/react": "^0.16.1", "@react-google-maps/api": "^2.17.0", "@refugies-info/api-types": "*", @@ -22,7 +22,7 @@ "axios": "^1.7.2", "bootstrap": "^5.2.3", "eva-icons": "^1.1.3", - "flag-icons": "^6.6.6", + "flag-icons": "^7.2.3", "google-oauth-gsi": "^4.0.0", "html2plaintext": "^2.1.4", "i18next": "^22.0.6", @@ -61,13 +61,13 @@ "reactstrap": "^9.2.2", "redux": "^4.0.1", "redux-saga": "^1.1.3", - "remixicon": "^2.5.0", - "sharp": "^0.31.2", + "remixicon": "^4.3.0", + "sharp": "^0.33.4", "sortablejs": "^1.15.0", "styled-components": "^5.3.6", "sweetalert2": "^11.6.16", "typesafe-actions": "^5.1.0", - "uuid": "^9.0.0" + "uuid": "^10.0.0" }, "scripts": { "predev": "only-include-used-icons", diff --git a/yarn.lock b/yarn.lock index ade31ea137..2a62004a06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -494,6 +494,13 @@ enabled "2.0.x" kuler "^2.0.0" +"@emnapi/runtime@^1.1.1": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.2.0.tgz#71d018546c3a91f3b51106530edbc056b9f2f2e3" + integrity sha512-bV21/9LQmcQeCPEg3BDFtvwL6cwiTMksYNWQQ4KOxCZikEGalWtenoZ0wCiukJINlGCIi2KXx01g4FoH/LxpzQ== + dependencies: + tslib "^2.4.0" + "@emotion/is-prop-valid@^1.1.0": version "1.2.2" resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz" @@ -873,14 +880,14 @@ "@hapi/bourne" "^3.0.0" "@hapi/hoek" "^11.0.2" -"@hedgedoc/html-to-react@^1.4.5": - version "1.4.6" - resolved "https://registry.npmjs.org/@hedgedoc/html-to-react/-/html-to-react-1.4.6.tgz" - integrity sha512-1tPj04jsYvDml2mz1Rl7vc6rPGg08UaLhcw0MLsGqubRbQ6t27LMj/bnZ3ux1e10KbxQ0i6biGfAZlvsHKXG+Q== +"@hedgedoc/html-to-react@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@hedgedoc/html-to-react/-/html-to-react-2.1.1.tgz#06ba9be4774dfa89869c37e941ba32a577122289" + integrity sha512-jZQYG8XWi7CmhUo5F3YcnDjwlTIaY3PwuCSRgcP01CXEVHz8+dYKtHwaP7Fpu9qMRMoMQSWLgHXIKaGgbch/bA== dependencies: domelementtype "^2.3.0" domhandler "^5.0.3" - htmlparser2 "^8.0.0" + htmlparser2 "^9.0.0" "@humanwhocodes/config-array@^0.11.14": version "0.11.14" @@ -901,6 +908,119 @@ resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz" integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== +"@img/sharp-darwin-arm64@0.33.4": + version "0.33.4" + resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.4.tgz#a1cf4a7febece334f16e0328b9689f05797d7aec" + integrity sha512-p0suNqXufJs9t3RqLBO6vvrgr5OhgbWp76s5gTRvdmxmuv9E1rcaqGUsl3l4mKVmXPkTkTErXediAui4x+8PSA== + optionalDependencies: + "@img/sharp-libvips-darwin-arm64" "1.0.2" + +"@img/sharp-darwin-x64@0.33.4": + version "0.33.4" + resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.4.tgz#f77be2d7c3609d3e77cd337b199a772e07b87bd2" + integrity sha512-0l7yRObwtTi82Z6ebVI2PnHT8EB2NxBgpK2MiKJZJ7cz32R4lxd001ecMhzzsZig3Yv9oclvqqdV93jo9hy+Dw== + optionalDependencies: + "@img/sharp-libvips-darwin-x64" "1.0.2" + +"@img/sharp-libvips-darwin-arm64@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.2.tgz#b69f49fecbe9572378675769b189410721b0fa53" + integrity sha512-tcK/41Rq8IKlSaKRCCAuuY3lDJjQnYIW1UXU1kxcEKrfL8WR7N6+rzNoOxoQRJWTAECuKwgAHnPvqXGN8XfkHA== + +"@img/sharp-libvips-darwin-x64@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.2.tgz#5665da7360d8e5ed7bee314491c8fe736b6a3c39" + integrity sha512-Ofw+7oaWa0HiiMiKWqqaZbaYV3/UGL2wAPeLuJTx+9cXpCRdvQhCLG0IH8YGwM0yGWGLpsF4Su9vM1o6aer+Fw== + +"@img/sharp-libvips-linux-arm64@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.2.tgz#8a05e5e9e9b760ff46561e32f19bd5e035fa881c" + integrity sha512-x7kCt3N00ofFmmkkdshwj3vGPCnmiDh7Gwnd4nUwZln2YjqPxV1NlTyZOvoDWdKQVDL911487HOueBvrpflagw== + +"@img/sharp-libvips-linux-arm@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.2.tgz#0fd33b9bf3221948ce0ca7a5a725942626577a03" + integrity sha512-iLWCvrKgeFoglQxdEwzu1eQV04o8YeYGFXtfWU26Zr2wWT3q3MTzC+QTCO3ZQfWd3doKHT4Pm2kRmLbupT+sZw== + +"@img/sharp-libvips-linux-s390x@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.2.tgz#4b89150ec91b256ee2cbb5bb125321bf029a4770" + integrity sha512-cmhQ1J4qVhfmS6szYW7RT+gLJq9dH2i4maq+qyXayUSn9/3iY2ZeWpbAgSpSVbV2E1JUL2Gg7pwnYQ1h8rQIog== + +"@img/sharp-libvips-linux-x64@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.2.tgz#947ccc22ca5bc8c8cfe921b39a5fdaebc5e39f3f" + integrity sha512-E441q4Qdb+7yuyiADVi5J+44x8ctlrqn8XgkDTwr4qPJzWkaHwD489iZ4nGDgcuya4iMN3ULV6NwbhRZJ9Z7SQ== + +"@img/sharp-libvips-linuxmusl-arm64@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.2.tgz#821d58ce774f0f8bed065b69913a62f65d512f2f" + integrity sha512-3CAkndNpYUrlDqkCM5qhksfE+qSIREVpyoeHIU6jd48SJZViAmznoQQLAv4hVXF7xyUB9zf+G++e2v1ABjCbEQ== + +"@img/sharp-libvips-linuxmusl-x64@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.2.tgz#4309474bd8b728a61af0b3b4fad0c476b5f3ccbe" + integrity sha512-VI94Q6khIHqHWNOh6LLdm9s2Ry4zdjWJwH56WoiJU7NTeDwyApdZZ8c+SADC8OH98KWNQXnE01UdJ9CSfZvwZw== + +"@img/sharp-linux-arm64@0.33.4": + version "0.33.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.4.tgz#bd390113e256487041411b988ded13a26cfc5f95" + integrity sha512-2800clwVg1ZQtxwSoTlHvtm9ObgAax7V6MTAB/hDT945Tfyy3hVkmiHpeLPCKYqYR1Gcmv1uDZ3a4OFwkdBL7Q== + optionalDependencies: + "@img/sharp-libvips-linux-arm64" "1.0.2" + +"@img/sharp-linux-arm@0.33.4": + version "0.33.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.4.tgz#14ecc81f38f75fb4cd7571bc83311746d6745fca" + integrity sha512-RUgBD1c0+gCYZGCCe6mMdTiOFS0Zc/XrN0fYd6hISIKcDUbAW5NtSQW9g/powkrXYm6Vzwd6y+fqmExDuCdHNQ== + optionalDependencies: + "@img/sharp-libvips-linux-arm" "1.0.2" + +"@img/sharp-linux-s390x@0.33.4": + version "0.33.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.4.tgz#119e8081e2c6741b5ac908fe02244e4c559e525f" + integrity sha512-h3RAL3siQoyzSoH36tUeS0PDmb5wINKGYzcLB5C6DIiAn2F3udeFAum+gj8IbA/82+8RGCTn7XW8WTFnqag4tQ== + optionalDependencies: + "@img/sharp-libvips-linux-s390x" "1.0.2" + +"@img/sharp-linux-x64@0.33.4": + version "0.33.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.4.tgz#21d4c137b8da9a313b069ff5c920ded709f853d7" + integrity sha512-GoR++s0XW9DGVi8SUGQ/U4AeIzLdNjHka6jidVwapQ/JebGVQIpi52OdyxCNVRE++n1FCLzjDovJNozif7w/Aw== + optionalDependencies: + "@img/sharp-libvips-linux-x64" "1.0.2" + +"@img/sharp-linuxmusl-arm64@0.33.4": + version "0.33.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.4.tgz#f3fde68fd67b85a32da6f1155818c3b58b8e7ae0" + integrity sha512-nhr1yC3BlVrKDTl6cO12gTpXMl4ITBUZieehFvMntlCXFzH2bvKG76tBL2Y/OqhupZt81pR7R+Q5YhJxW0rGgQ== + optionalDependencies: + "@img/sharp-libvips-linuxmusl-arm64" "1.0.2" + +"@img/sharp-linuxmusl-x64@0.33.4": + version "0.33.4" + resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.4.tgz#44373724aecd7b69900e0578228144e181db7892" + integrity sha512-uCPTku0zwqDmZEOi4ILyGdmW76tH7dm8kKlOIV1XC5cLyJ71ENAAqarOHQh0RLfpIpbV5KOpXzdU6XkJtS0daw== + optionalDependencies: + "@img/sharp-libvips-linuxmusl-x64" "1.0.2" + +"@img/sharp-wasm32@0.33.4": + version "0.33.4" + resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.33.4.tgz#88e3f18d7e7cd8cfe1af98e9963db4d7b6491435" + integrity sha512-Bmmauh4sXUsUqkleQahpdNXKvo+wa1V9KhT2pDA4VJGKwnKMJXiSTGphn0gnJrlooda0QxCtXc6RX1XAU6hMnQ== + dependencies: + "@emnapi/runtime" "^1.1.1" + +"@img/sharp-win32-ia32@0.33.4": + version "0.33.4" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.4.tgz#b1c772dd2952e983980b1eb85808fa8129484d46" + integrity sha512-99SJ91XzUhYHbx7uhK3+9Lf7+LjwMGQZMDlO/E/YVJ7Nc3lyDFZPGhjwiYdctoH2BOzW9+TnfqcaMKt0jHLdqw== + +"@img/sharp-win32-x64@0.33.4": + version "0.33.4" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.4.tgz#106f911134035b4157ec92a0c154a6b6f88fa4c1" + integrity sha512-3QLocdTRVIrFNye5YocZl+KKpYKP+fksi1QhmOArgx7GyhIbQp/WrJRu176jm8IxromS7RIkzMiMINVdBtC8Aw== + "@isaacs/cliui@^8.0.2": version "8.0.2" resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" @@ -3079,15 +3199,6 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== -bl@^4.0.3: - version "4.1.0" - resolved "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - bluebird@^3.5.0, bluebird@^3.5.1: version "3.7.2" resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz" @@ -3187,14 +3298,6 @@ buffer-from@^1.0.0: resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - buffer@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" @@ -3345,11 +3448,6 @@ cheerio@1.0.0-rc.10: optionalDependencies: fsevents "~2.3.2" -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - ci-info@^3.2.0: version "3.9.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" @@ -3850,13 +3948,6 @@ decode-uri-component@^0.4.1: resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.4.1.tgz" integrity sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ== -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - dedent@^1.0.0: version "1.5.3" resolved "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz" @@ -3886,11 +3977,6 @@ deep-equal@^2.0.5: which-collection "^1.0.1" which-typed-array "^1.1.13" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - deep-is@^0.1.3: version "0.1.4" resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz" @@ -3944,9 +4030,9 @@ destroy@1.2.0: resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== -detect-libc@^2.0.0, detect-libc@^2.0.1: +detect-libc@^2.0.3: version "2.0.3" - resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700" integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw== detect-newline@^3.0.0: @@ -4056,9 +4142,9 @@ domutils@^2.5.2, domutils@^2.8.0: domelementtype "^2.2.0" domhandler "^4.2.0" -domutils@^3.0.1: +domutils@^3.1.0: version "3.1.0" - resolved "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e" integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA== dependencies: dom-serializer "^2.0.0" @@ -4142,7 +4228,7 @@ encodeurl@~1.0.2: resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -end-of-stream@^1.1.0, end-of-stream@^1.4.1: +end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== @@ -4162,7 +4248,7 @@ entities@^2.0.0: resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== -entities@^4.2.0, entities@^4.4.0: +entities@^4.2.0, entities@^4.4.0, entities@^4.5.0: version "4.5.0" resolved "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== @@ -4626,11 +4712,6 @@ exit@^0.1.2: resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz" integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== -expand-template@^2.0.3: - version "2.0.3" - resolved "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz" - integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== - expect@^29.0.0, expect@^29.7.0: version "29.7.0" resolved "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz" @@ -4842,10 +4923,10 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -flag-icons@^6.6.6: - version "6.15.0" - resolved "https://registry.npmjs.org/flag-icons/-/flag-icons-6.15.0.tgz" - integrity sha512-ARo9Q+aATZEjyjveeec9e+orx+xLWUBdOX9baOKoGqDzMbvZ65ghPhaHbVt5T7ZB+Q4OFsB4Hr+eQnpV8Q+dLA== +flag-icons@^7.2.3: + version "7.2.3" + resolved "https://registry.yarnpkg.com/flag-icons/-/flag-icons-7.2.3.tgz#b67f379fa0ef28c4e605319a78035131bdd8ced7" + integrity sha512-X2gUdteNuqdNqob2KKTJTS+ZCvyWeLCtDz9Ty8uJP17Y4o82Y+U/Vd4JNrdwTAjagYsRznOn9DZ+E/Q52qbmqg== flat-cache@^3.0.4: version "3.2.0" @@ -4928,11 +5009,6 @@ fresh@0.5.2: resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - fs-extra@^11.2.0: version "11.2.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" @@ -5065,11 +5141,6 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz" - integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== - glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" @@ -5371,15 +5442,15 @@ htmlparser2@^6.1.0: domutils "^2.5.2" entities "^2.0.0" -htmlparser2@^8.0.0: - version "8.0.2" - resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz" - integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== +htmlparser2@^9.0.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-9.1.0.tgz#cdb498d8a75a51f739b61d3f718136c369bc8c23" + integrity sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ== dependencies: domelementtype "^2.3.0" domhandler "^5.0.3" - domutils "^3.0.1" - entities "^4.4.0" + domutils "^3.1.0" + entities "^4.5.0" http-errors@2.0.0: version "2.0.0" @@ -5497,7 +5568,7 @@ icss-utils@^5.0.0, icss-utils@^5.1.0: resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== -ieee754@^1.1.13, ieee754@^1.2.1: +ieee754@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -5561,16 +5632,11 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4: +inherits@2, inherits@2.0.4, inherits@^2.0.3: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@~1.3.0: - version "1.3.8" - resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - inline-style-prefixer@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-7.0.0.tgz" @@ -6938,11 +7004,6 @@ mimic-fn@^2.1.0: resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - min-indent@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz" @@ -6983,7 +7044,7 @@ minimatch@^9.0.4: dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.7: +minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.7: version "1.2.8" resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -6993,11 +7054,6 @@ minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6, minimist@^1. resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== -mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: - version "0.5.3" - resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - mockdate@^3.0.5: version "3.0.5" resolved "https://registry.npmjs.org/mockdate/-/mockdate-3.0.5.tgz" @@ -7124,11 +7180,6 @@ nanoid@^3.3.6, nanoid@^3.3.7: resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== -napi-build-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz" - integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== - natural-compare-lite@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz" @@ -7209,18 +7260,6 @@ next@^14.2.4: "@next/swc-win32-ia32-msvc" "14.2.4" "@next/swc-win32-x64-msvc" "14.2.4" -node-abi@^3.3.0: - version "3.65.0" - resolved "https://registry.npmjs.org/node-abi/-/node-abi-3.65.0.tgz" - integrity sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA== - dependencies: - semver "^7.3.5" - -node-addon-api@^5.0.0: - version "5.1.0" - resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz" - integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA== - node-cache@^5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz" @@ -7413,7 +7452,7 @@ on-headers@~1.0.2: resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0, once@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== @@ -7734,24 +7773,6 @@ postcss@^8.0.0, postcss@^8.4.35, postcss@^8.4.5: picocolors "^1.0.1" source-map-js "^1.2.0" -prebuild-install@^7.1.1: - version "7.1.2" - resolved "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz" - integrity sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ== - dependencies: - detect-libc "^2.0.0" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^3.3.0" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^4.0.0" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" @@ -7873,14 +7894,6 @@ pstree.remy@^1.1.8: resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a" integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w== -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0, punycode@^2.3.1: version "2.3.1" resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz" @@ -8020,16 +8033,6 @@ rc-util@^4.0.4, rc-util@^4.15.3, rc-util@^4.4.0: react-lifecycles-compat "^3.0.4" shallowequal "^1.1.0" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - react-anchor-link-smooth-scroll@^1.0.12: version "1.0.12" resolved "https://registry.npmjs.org/react-anchor-link-smooth-scroll/-/react-anchor-link-smooth-scroll-1.0.12.tgz" @@ -8410,10 +8413,10 @@ regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.2: es-errors "^1.3.0" set-function-name "^2.0.1" -remixicon@^2.5.0: - version "2.5.0" - resolved "https://registry.npmjs.org/remixicon/-/remixicon-2.5.0.tgz" - integrity sha512-q54ra2QutYDZpuSnFjmeagmEiN9IMo56/zz5dDNitzKD23oFRw77cWo4TsrAdmdkPiEn8mxlrTqxnkujDbEGww== +remixicon@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-4.3.0.tgz#61c3fd6ca11149bd05850152f9c08e5f5de7b0c9" + integrity sha512-jRYQ37dTFSkJtvcxwTUAkIiXkYRvA9EDvVuXPNrmt2xf/VS//CRgFtsX2TAFBoQOhh9SDh7l6La4Xu12snEyxg== remove-accents@^0.4.2: version "0.4.4" @@ -8676,7 +8679,7 @@ section-iterator@^2.0.0: resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@7.x, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2: +semver@7.x, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2: version "7.6.2" resolved "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz" integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== @@ -8767,19 +8770,34 @@ shallowequal@^1.1.0: resolved "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== -sharp@^0.31.2: - version "0.31.3" - resolved "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz" - integrity sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg== +sharp@^0.33.4: + version "0.33.4" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.33.4.tgz#b88e6e843e095c6ab5e1a0c59c4885e580cd8405" + integrity sha512-7i/dt5kGl7qR4gwPRD2biwD2/SvBn3O04J77XKFgL2OnZtQw+AG9wnuS/csmu80nPRHLYE9E41fyEiG8nhH6/Q== dependencies: color "^4.2.3" - detect-libc "^2.0.1" - node-addon-api "^5.0.0" - prebuild-install "^7.1.1" - semver "^7.3.8" - simple-get "^4.0.1" - tar-fs "^2.1.1" - tunnel-agent "^0.6.0" + detect-libc "^2.0.3" + semver "^7.6.0" + optionalDependencies: + "@img/sharp-darwin-arm64" "0.33.4" + "@img/sharp-darwin-x64" "0.33.4" + "@img/sharp-libvips-darwin-arm64" "1.0.2" + "@img/sharp-libvips-darwin-x64" "1.0.2" + "@img/sharp-libvips-linux-arm" "1.0.2" + "@img/sharp-libvips-linux-arm64" "1.0.2" + "@img/sharp-libvips-linux-s390x" "1.0.2" + "@img/sharp-libvips-linux-x64" "1.0.2" + "@img/sharp-libvips-linuxmusl-arm64" "1.0.2" + "@img/sharp-libvips-linuxmusl-x64" "1.0.2" + "@img/sharp-linux-arm" "0.33.4" + "@img/sharp-linux-arm64" "0.33.4" + "@img/sharp-linux-s390x" "0.33.4" + "@img/sharp-linux-x64" "0.33.4" + "@img/sharp-linuxmusl-arm64" "0.33.4" + "@img/sharp-linuxmusl-x64" "0.33.4" + "@img/sharp-wasm32" "0.33.4" + "@img/sharp-win32-ia32" "0.33.4" + "@img/sharp-win32-x64" "0.33.4" shebang-command@^1.2.0: version "1.2.0" @@ -8835,20 +8853,6 @@ signal-exit@^4.0.1: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== -simple-concat@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz" - integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== - -simple-get@^4.0.0, simple-get@^4.0.1: - version "4.0.1" - resolved "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz" - integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== - dependencies: - decompress-response "^6.0.0" - once "^1.3.1" - simple-concat "^1.0.0" - simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz" @@ -9221,11 +9225,6 @@ strip-json-comments@^3.1.1: resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" - integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== - strnum@^1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz" @@ -9328,27 +9327,6 @@ tapable@^2.2.0: resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -tar-fs@^2.0.0, tar-fs@^2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - -tar-stream@^2.1.4: - version "2.2.0" - resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - teeny-request@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-9.0.0.tgz#18140de2eb6595771b1b02203312dfad79a4716d" From b101b037bde1582897a331442068cc3d5a66f6d9 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Wed, 10 Jul 2024 14:52:57 +0200 Subject: [PATCH 06/37] chore(client): :arrow_up: Upgrade i18next related dependencies and fix issues in codebase --- client/package.json | 6 +-- .../Edition/DropdownModals/DropdownModals.tsx | 4 +- yarn.lock | 42 +++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/client/package.json b/client/package.json index 61a8a9906c..05acd751df 100644 --- a/client/package.json +++ b/client/package.json @@ -25,14 +25,14 @@ "flag-icons": "^7.2.3", "google-oauth-gsi": "^4.0.0", "html2plaintext": "^2.1.4", - "i18next": "^22.0.6", + "i18next": "^23.11.5", "js-cookie": "^3.0.1", "jwt-decode": "^4.0.0", "lexical": "^0.16.1", "lodash": "^4.17.21", "moment": "^2.29.4", "next": "^14.2.4", - "next-i18next": "^13.0.0", + "next-i18next": "^15.3.0", "next-redux-wrapper": "^8.0.0", "next-sitemap": "^3.1.32", "process": "^0.11.10", @@ -48,7 +48,7 @@ "react-ga4": "^2.1.0", "react-google-autocomplete": "^2.6.1", "react-hook-form": "^7.43.1", - "react-i18next": "^12.0.0", + "react-i18next": "^14.1.2", "react-intersection-observer": "^9.4.1", "react-loading-skeleton": "^3.1.0", "react-notifications": "^1.7.3", diff --git a/client/src/components/Pages/dispositif/Edition/DropdownModals/DropdownModals.tsx b/client/src/components/Pages/dispositif/Edition/DropdownModals/DropdownModals.tsx index c9faef04c3..19f9dfcc3c 100644 --- a/client/src/components/Pages/dispositif/Edition/DropdownModals/DropdownModals.tsx +++ b/client/src/components/Pages/dispositif/Edition/DropdownModals/DropdownModals.tsx @@ -35,13 +35,13 @@ function DropdownModals(props: Props) { return ( setDropdownOpen((o) => !o)} className={styles.dropdown}> - {jsUcfirst(t(`Infocards.${props.selected}`, { count }) || "")} + {jsUcfirst(t(`Infocards.${props.selected}`, "", { count }))} {props.options.map((key, i) => ( Date: Wed, 10 Jul 2024 14:58:38 +0200 Subject: [PATCH 07/37] chore(client): :arrow_up: Upgrade styled components to 6.x. Migrate source files --- client/package.json | 2 +- .../Backend/UserDetail/UserDetail.tsx | 4 +- .../Backend/screens/Admin/Admin.tsx | 2 +- .../Admin/sharedComponents/SubComponents.tsx | 10 +- .../components/SubComponents.tsx | 4 +- .../components/NoFavorites.component.tsx | 4 +- .../components/Notification.tsx | 6 +- .../UserStructure/components/MembresTable.tsx | 6 +- .../screens/UserStructure/components/Role.tsx | 2 +- .../components/SubComponents.tsx | 2 +- .../components/SubComponents.tsx | 8 +- .../TranslationLanguagesChoiceModal.tsx | 4 +- .../Pages/annuaire-create/ActivityCard.tsx | 2 +- .../Pages/annuaire-create/AnnuaireGauge.tsx | 6 +- .../Pages/annuaire-create/HoursDetails.tsx | 2 +- .../Pages/annuaire-create/Modifications.tsx | 2 +- .../Pages/annuaire-create/Step3.tsx | 2 +- .../Pages/annuaire-create/Step4.tsx | 2 +- .../Pages/annuaire-create/Step5.tsx | 2 +- .../Pages/annuaire/index/Letter.tsx | 2 +- .../recherche/ThemeDropdown/NeedsList.tsx | 2 +- .../components/UI/ThemeButton/ThemeButton.tsx | 4 +- client/src/pages/qui-sommes-nous.tsx | 4 +- yarn.lock | 101 +++++++++--------- 24 files changed, 90 insertions(+), 95 deletions(-) diff --git a/client/package.json b/client/package.json index 05acd751df..dee44abcbe 100644 --- a/client/package.json +++ b/client/package.json @@ -64,7 +64,7 @@ "remixicon": "^4.3.0", "sharp": "^0.33.4", "sortablejs": "^1.15.0", - "styled-components": "^5.3.6", + "styled-components": "^6.1.11", "sweetalert2": "^11.6.16", "typesafe-actions": "^5.1.0", "uuid": "^10.0.0" diff --git a/client/src/components/Backend/UserDetail/UserDetail.tsx b/client/src/components/Backend/UserDetail/UserDetail.tsx index 4e41fc0958..816e5ebca1 100644 --- a/client/src/components/Backend/UserDetail/UserDetail.tsx +++ b/client/src/components/Backend/UserDetail/UserDetail.tsx @@ -12,7 +12,7 @@ interface Props { onSelectItem: (data: GetActiveUsersResponse) => void; } -const UserDetailContainer = styled.div` +const UserDetailContainer = styled.div<{ isSelected: boolean }>` width: 100%; height: 66px; margin-bottom: 10px; @@ -34,7 +34,7 @@ const UserDetailContainer = styled.div` } `; -const Text = styled.div` +const Text = styled.div<{ isSelected: boolean }>` font-size: 16px; line-height: 20px; color: ${(props: { isSelected: boolean }) => (props.isSelected ? colors.white : colors.gray90)}; diff --git a/client/src/components/Backend/screens/Admin/Admin.tsx b/client/src/components/Backend/screens/Admin/Admin.tsx index d4b7634876..82a88773a8 100644 --- a/client/src/components/Backend/screens/Admin/Admin.tsx +++ b/client/src/components/Backend/screens/Admin/Admin.tsx @@ -20,7 +20,7 @@ import { fetchNeedsActionCreator } from "services/Needs/needs.actions"; import styles from "./Admin.module.scss"; import { getInitialTab, setSavedQuery, TabQuery } from "lib/getAdminUrlParams"; -const OngletText = styled.span` +const OngletText = styled.span<{ isActive: boolean }>` color: ${(props: { isActive: boolean }) => (props.isActive ? colors.bleuCharte : colors.gray90)}; font-weight: ${(props: { isActive: boolean }) => (props.isActive ? "bold" : "normal")}; `; diff --git a/client/src/components/Backend/screens/Admin/sharedComponents/SubComponents.tsx b/client/src/components/Backend/screens/Admin/sharedComponents/SubComponents.tsx index 806bebffdd..f93a7eccb8 100644 --- a/client/src/components/Backend/screens/Admin/sharedComponents/SubComponents.tsx +++ b/client/src/components/Backend/screens/Admin/sharedComponents/SubComponents.tsx @@ -9,7 +9,7 @@ import styles from "../Admin.module.scss"; import { GetAllDispositifsResponse, Id } from "@refugies-info/api-types"; import { useUser } from "hooks"; -const Container = styled.div` +const Container = styled.div<{ isDarkBackground: boolean }>` font-weight: normal; font-size: 12px; line-height: 15px; @@ -101,7 +101,7 @@ interface StyledStatusContainer { textColor?: string; color: string; } -export const StyledStatusContainer = styled.div` +export const StyledStatusContainer = styled.div` font-weight: bold; border-radius: 6px; padding: 8px; @@ -175,7 +175,7 @@ interface ButtonContainerProps { disabled?: boolean; hoverColor?: string; } -const ButtonContainer = styled.div` +const ButtonContainer = styled.div` width: 40px; height: 40px; background-color: ${colors.gray70}; @@ -234,7 +234,7 @@ export const DeleteButton = (props: { onClick: (event: any) => void; disabled: b ); -const FilterButtonContainer = styled.div` +const FilterButtonContainer = styled.div<{ isSelected: boolean }>` background: ${(props: { isSelected: boolean }) => (props.isSelected ? colors.gray90 : colors.white)}; color: ${(props: { isSelected: boolean }) => (props.isSelected ? colors.white : colors.gray90)}; border-radius: 12px; @@ -253,7 +253,7 @@ export const FilterButton = (props: { onClick: () => void; text: string; isSelec ); -const StyledTabHeader = styled.div` +const StyledTabHeader = styled.div<{ order: number }>` display: flex; flex-direction: row; font-weight: bold; diff --git a/client/src/components/Backend/screens/UserContributions/components/SubComponents.tsx b/client/src/components/Backend/screens/UserContributions/components/SubComponents.tsx index d83e1881fd..c6f60e70c8 100644 --- a/client/src/components/Backend/screens/UserContributions/components/SubComponents.tsx +++ b/client/src/components/Backend/screens/UserContributions/components/SubComponents.tsx @@ -17,7 +17,7 @@ export const ContribContainer = styled.div` height: fit-content; `; -const Container = styled.div` +const Container = styled.div<{ isDarkBackground: boolean }>` font-weight: normal; font-size: 12px; line-height: 15px; @@ -67,7 +67,7 @@ interface ContribStyledStatusContainerProps { textColor?: string; color: string; } -const ContribStyledStatusContainer = styled.div` +const ContribStyledStatusContainer = styled.div` display: flex; align-items: center; font-weight: bold; diff --git a/client/src/components/Backend/screens/UserFavorites/components/NoFavorites.component.tsx b/client/src/components/Backend/screens/UserFavorites/components/NoFavorites.component.tsx index 00e86fba8a..35ded77a3b 100644 --- a/client/src/components/Backend/screens/UserFavorites/components/NoFavorites.component.tsx +++ b/client/src/components/Backend/screens/UserFavorites/components/NoFavorites.component.tsx @@ -30,7 +30,7 @@ const EmptyCardContainer = styled.div` justify-content: space-between; `; -const GrayLine = styled.div` +const GrayLine = styled.div<{ width: string }>` background: ${colors.gray60}; border-radius: 8px; width: ${(props: { width: string }) => props.width}; @@ -38,7 +38,7 @@ const GrayLine = styled.div` margin-bottom: 8px; `; -const SmallGrayLine = styled.div` +const SmallGrayLine = styled.div<{ width: string }>` background: ${colors.gray60}; border-radius: 3px; width: ${(props: { width: string }) => props.width}; diff --git a/client/src/components/Backend/screens/UserNotifications/components/Notification.tsx b/client/src/components/Backend/screens/UserNotifications/components/Notification.tsx index 81886950d4..113a71d53d 100644 --- a/client/src/components/Backend/screens/UserNotifications/components/Notification.tsx +++ b/client/src/components/Backend/screens/UserNotifications/components/Notification.tsx @@ -7,7 +7,7 @@ import FButton from "components/UI/FButton/FButton"; import { colors } from "colors"; import { getPath } from "routes"; -const Container = styled.div` +const Container = styled.div<{ read: boolean }>` background: ${(props: { read: boolean }) => (props.read ? colors.white : colors.focus)}; border-radius: 12px; padding: 8px 8px 8px 20px; @@ -31,7 +31,7 @@ const RowContainer = styled.div` align-items: center; `; -const TextContainer = styled.div` +const TextContainer = styled.div<{ read: boolean }>` font-weight: bold; font-size: 18px; line-height: 23px; @@ -49,7 +49,7 @@ const DispositifTitle = styled.div` margin-left: 8px; `; -const DateContainer = styled.div` +const DateContainer = styled.div<{ read: boolean }>` font-weight: bold; font-size: 16px; line-height: 20px; diff --git a/client/src/components/Backend/screens/UserStructure/components/MembresTable.tsx b/client/src/components/Backend/screens/UserStructure/components/MembresTable.tsx index 84b3d2d6e8..2e00a6db5a 100644 --- a/client/src/components/Backend/screens/UserStructure/components/MembresTable.tsx +++ b/client/src/components/Backend/screens/UserStructure/components/MembresTable.tsx @@ -17,14 +17,14 @@ const RowContainer = styled.div` align-items: center; `; -const UserName = styled.div` +const UserName = styled.div<{ isUser: boolean }>` font-weight: bold; font-size: 16px; line-height: 20px; color: ${(props: { isUser: boolean }) => (props.isUser ? colors.bleuCharte : colors.gray90)}; `; -const RoleContainer = styled.div` +const RoleContainer = styled.div<{ isUser: boolean }>` background: ${colors.white}; border-radius: 8px; padding: 8px; @@ -35,7 +35,7 @@ const RoleContainer = styled.div` width: fit-content; `; -const DateContainer = styled.div` +const DateContainer = styled.div<{ isUser: boolean }>` color: ${(props: { isUser: boolean }) => (props.isUser ? colors.bleuCharte : colors.gray90)}; max-width: 190px; `; diff --git a/client/src/components/Backend/screens/UserStructure/components/Role.tsx b/client/src/components/Backend/screens/UserStructure/components/Role.tsx index cd6922cc57..759bdf7f8a 100644 --- a/client/src/components/Backend/screens/UserStructure/components/Role.tsx +++ b/client/src/components/Backend/screens/UserStructure/components/Role.tsx @@ -3,7 +3,7 @@ import styled from "styled-components"; import { colors } from "colors"; import EVAIcon from "components/UI/EVAIcon"; -const MainContainer = styled.div` +const MainContainer = styled.div<{ state: string }>` background: ${(props: { state: string }) => props.state === "selected" ? colors.focus : props.state === "current" ? colors.grey2 : colors.white}; border-width: 1px; diff --git a/client/src/components/Backend/screens/UserStructure/components/SubComponents.tsx b/client/src/components/Backend/screens/UserStructure/components/SubComponents.tsx index 572501cea4..189157c239 100644 --- a/client/src/components/Backend/screens/UserStructure/components/SubComponents.tsx +++ b/client/src/components/Backend/screens/UserStructure/components/SubComponents.tsx @@ -32,7 +32,7 @@ export const StructurePictureContainer = styled.div` height: fit-content; `; -export const Title = styled.div` +export const Title = styled.div<{marginTop?: string}>` font-weight: bold; font-size: 18px; line-height: 23px; diff --git a/client/src/components/Backend/screens/UserTranslation/components/SubComponents.tsx b/client/src/components/Backend/screens/UserTranslation/components/SubComponents.tsx index fc1b44c443..cc1ebfb90b 100644 --- a/client/src/components/Backend/screens/UserTranslation/components/SubComponents.tsx +++ b/client/src/components/Backend/screens/UserTranslation/components/SubComponents.tsx @@ -12,7 +12,7 @@ interface Props { hasMultipleLanguages: boolean; } -const MainContainer = styled.div` +const MainContainer = styled.div<{ hasMultipleLanguages: boolean }>` display: flex; flex-direction: row; margin-right: 16px; @@ -24,7 +24,7 @@ interface TitleProps { hasMultipleLanguages: boolean; isSelected: boolean; } -const Title = styled.div` +const Title = styled.div` font-weight: bold; font-size: ${(props: TitleProps) => (props.isSelected ? "28px" : "16px")}; line-height: ${(props: TitleProps) => (props.isSelected ? "35px" : "20px")}; @@ -96,7 +96,7 @@ interface TradStatusProps { status: TraductionsStatus; } -const TradStatusContainer = styled.div` +const TradStatusContainer = styled.div<{ backgroundColor: string }>` font-weight: bold; font-size: 12px; line-height: 15px; @@ -132,7 +132,7 @@ interface FilterButtonContainerProps { isSelected: boolean; color: string; } -const FilterButtonContainer = styled.button` +const FilterButtonContainer = styled.button` color: ${(props: FilterButtonContainerProps) => (props.isSelected ? colors.white : props.color)}; background-color: ${(props: FilterButtonContainerProps) => (props.isSelected ? props.color : colors.white)}; diff --git a/client/src/components/Backend/screens/UserTranslation/components/TranslationLanguagesChoiceModal/TranslationLanguagesChoiceModal.tsx b/client/src/components/Backend/screens/UserTranslation/components/TranslationLanguagesChoiceModal/TranslationLanguagesChoiceModal.tsx index f7a8207666..50d9ed2fdb 100644 --- a/client/src/components/Backend/screens/UserTranslation/components/TranslationLanguagesChoiceModal/TranslationLanguagesChoiceModal.tsx +++ b/client/src/components/Backend/screens/UserTranslation/components/TranslationLanguagesChoiceModal/TranslationLanguagesChoiceModal.tsx @@ -31,7 +31,7 @@ const SubTitle = styled.div` margin: 45px 50px 15px 50px; `; -const LangueItemContainer = styled.div` +const LangueItemContainer = styled.div<{ isSelected: boolean }>` background: ${(props: { isSelected: boolean }) => (props.isSelected ? colors.validation : colors.gray20)}; border-radius: 12px; display: flex; @@ -54,7 +54,7 @@ const LanguesContainer = styled.div` margin: 0px 45px 0px 45px; `; -const CheckBoxContainer = styled.div` +const CheckBoxContainer = styled.div<{ isSelected: boolean }>` background: ${(props: { isSelected: boolean }) => (props.isSelected ? colors.validationDefault : colors.white)}; border: ${(props: { isSelected: boolean }) => props.isSelected ? `1px solid ${colors.validationDefault}` : `1px solid ${colors.gray50}`}; diff --git a/client/src/components/Pages/annuaire-create/ActivityCard.tsx b/client/src/components/Pages/annuaire-create/ActivityCard.tsx index 866fad3006..e0bfcfdcee 100644 --- a/client/src/components/Pages/annuaire-create/ActivityCard.tsx +++ b/client/src/components/Pages/annuaire-create/ActivityCard.tsx @@ -24,7 +24,7 @@ interface CardContainerProps { lightColor: string; darkColor: string; } -const CardContainer = styled.div` +const CardContainer = styled.div` width: 200px; height: ${(props: CardContainerProps) => (props.isLectureMode ? "260px" : "220px")}; background: ${(props: CardContainerProps) => (props.isSelected ? props.lightColor : "#ffffff")}; diff --git a/client/src/components/Pages/annuaire-create/AnnuaireGauge.tsx b/client/src/components/Pages/annuaire-create/AnnuaireGauge.tsx index 1f794ac948..e05751c26c 100644 --- a/client/src/components/Pages/annuaire-create/AnnuaireGauge.tsx +++ b/client/src/components/Pages/annuaire-create/AnnuaireGauge.tsx @@ -13,7 +13,7 @@ interface StickLineProps { colorFilled: string colorToDo: string } -const StickLine = styled.div` +const StickLine = styled.div` display: flex; flex: 1; background: ${(props: StickLineProps) => @@ -28,7 +28,7 @@ interface StepContainerProps { value: number filled: boolean } -const StepContainer = styled.div` +const StepContainer = styled.div` background: #ffffff; border-width: ${(props: StepContainerProps) => (props.selected ? "3px" : "0px")}; border-style: solid; @@ -52,7 +52,7 @@ interface StepTextProps { selected: boolean colorFilled: string } -const StepText = styled.div` +const StepText = styled.div` font-weight: bold; font-size: 18px; line-height: 23px; diff --git a/client/src/components/Pages/annuaire-create/HoursDetails.tsx b/client/src/components/Pages/annuaire-create/HoursDetails.tsx index cc653edfc8..43d19f6c41 100644 --- a/client/src/components/Pages/annuaire-create/HoursDetails.tsx +++ b/client/src/components/Pages/annuaire-create/HoursDetails.tsx @@ -12,7 +12,7 @@ interface Props { onChange: (arg1: any, arg2: string, arg3: string) => void; } -const MainContainer = styled.div` +const MainContainer = styled.div<{ isDayChecked: boolean }>` background: ${(props: { isDayChecked: boolean }) => (props.isDayChecked ? "#DEF7C2" : "#f2f2f2")}; border-radius: 12px; padding: 12px; diff --git a/client/src/components/Pages/annuaire-create/Modifications.tsx b/client/src/components/Pages/annuaire-create/Modifications.tsx index 74ed06832b..c5f96cd199 100644 --- a/client/src/components/Pages/annuaire-create/Modifications.tsx +++ b/client/src/components/Pages/annuaire-create/Modifications.tsx @@ -7,7 +7,7 @@ interface Props { hasModifications: boolean; } -const MainContainer = styled.div` +const MainContainer = styled.div<{hasModifications: boolean}>` width: 360px; background: ${(props: {hasModifications: boolean}) => (props.hasModifications ? "#ffe2b8" : "#BDF0C7")}; border-radius: 12px; diff --git a/client/src/components/Pages/annuaire-create/Step3.tsx b/client/src/components/Pages/annuaire-create/Step3.tsx index 8e9665d02e..4c48d5661d 100644 --- a/client/src/components/Pages/annuaire-create/Step3.tsx +++ b/client/src/components/Pages/annuaire-create/Step3.tsx @@ -42,7 +42,7 @@ interface TagActivityProps { backgroundColor: string; color: string; } -const TagActivity = styled.div` +const TagActivity = styled.div` width: 740px; background: ${(props: TagActivityProps) => props.backgroundColor}; border-radius: 12px; diff --git a/client/src/components/Pages/annuaire-create/Step4.tsx b/client/src/components/Pages/annuaire-create/Step4.tsx index fea7df1bde..3b4a88a82a 100644 --- a/client/src/components/Pages/annuaire-create/Step4.tsx +++ b/client/src/components/Pages/annuaire-create/Step4.tsx @@ -64,7 +64,7 @@ const DepartmentContainer = styled.div` flex-wrap: wrap; `; -const CheckboxContainer = styled.div` +const CheckboxContainer = styled.div<{ checked: boolean }>` background: ${(props: { checked: boolean }) => (props.checked ? "#DEF7C2" : "#f2f2f2")}; border-radius: 12px; width: fit-content; diff --git a/client/src/components/Pages/annuaire-create/Step5.tsx b/client/src/components/Pages/annuaire-create/Step5.tsx index 833a40dff2..8683b4d1de 100644 --- a/client/src/components/Pages/annuaire-create/Step5.tsx +++ b/client/src/components/Pages/annuaire-create/Step5.tsx @@ -58,7 +58,7 @@ const Title = styled.div` margin-bottom: 16px; `; -const RemainingCaracters = styled.div` +const RemainingCaracters = styled.div<{ caractersRemaining: boolean }>` margin-top: 8px; align-self: flex-end; color: ${(props: { caractersRemaining: boolean }) => (props.caractersRemaining ? "#4CAF50" : "red")}; diff --git a/client/src/components/Pages/annuaire/index/Letter.tsx b/client/src/components/Pages/annuaire/index/Letter.tsx index 86af332615..fb539cc644 100644 --- a/client/src/components/Pages/annuaire/index/Letter.tsx +++ b/client/src/components/Pages/annuaire/index/Letter.tsx @@ -4,7 +4,7 @@ import styled from "styled-components"; interface MainContainerProps { isClickable: boolean } -const MainContainer = styled.a` +const MainContainer = styled.a` border-radius: 8px; width: 36px; height: 36px; diff --git a/client/src/components/Pages/recherche/ThemeDropdown/NeedsList.tsx b/client/src/components/Pages/recherche/ThemeDropdown/NeedsList.tsx index de2eeaac7d..21a52e183a 100644 --- a/client/src/components/Pages/recherche/ThemeDropdown/NeedsList.tsx +++ b/client/src/components/Pages/recherche/ThemeDropdown/NeedsList.tsx @@ -22,7 +22,7 @@ type ButtonNeedProps = { color30: string; selected: boolean; }; -const ButtonNeed = styled.button` +const ButtonNeed = styled.button` background-color: ${(props: ButtonNeedProps) => (props.selected ? props.color30 : "transparent")}; color: ${(props: ButtonNeedProps) => props.color100}; :hover { diff --git a/client/src/components/UI/ThemeButton/ThemeButton.tsx b/client/src/components/UI/ThemeButton/ThemeButton.tsx index 5cb2192bab..1f652fd17e 100644 --- a/client/src/components/UI/ThemeButton/ThemeButton.tsx +++ b/client/src/components/UI/ThemeButton/ThemeButton.tsx @@ -6,7 +6,7 @@ import { getThemeName } from "lib/getThemeName"; import ThemeIcon from "../ThemeIcon"; import { GetThemeResponse } from "@refugies-info/api-types"; -const ThemeButtonContainer = styled.div` +const ThemeButtonContainer = styled.div<{ color: string }>` background-color: ${(props: { color: string }) => props.color}; display: flex; flex-direction: row; @@ -18,7 +18,7 @@ const ThemeButtonContainer = styled.div` width: fit-content; `; -const ThemeText = styled.p` +const ThemeText = styled.p<{ mr?: number }>` color: white; font-size: 12px; margin-left: 8px; diff --git a/client/src/pages/qui-sommes-nous.tsx b/client/src/pages/qui-sommes-nous.tsx index 22e253b45c..4eabadd15a 100644 --- a/client/src/pages/qui-sommes-nous.tsx +++ b/client/src/pages/qui-sommes-nous.tsx @@ -35,7 +35,7 @@ const HeaderTextContainer = styled.div` margin-bottom: 4px; `; -const NavBarContainer = styled.div` +const NavBarContainer = styled.div<{ isToolbarVisible: boolean }>` position: sticky; position: -webkit-sticky; top: 75px; @@ -49,7 +49,7 @@ const NavBarContainer = styled.div` top: ${(props: { isToolbarVisible: boolean }) => (!props.isToolbarVisible ? "0px !important" : "0px !important")}; `; -const NavBarText = styled.div` +const NavBarText = styled.div<{ isVisibleSection: boolean }>` padding: 22px; height: 100%; &:hover { diff --git a/yarn.lock b/yarn.lock index fb3d07cfea..eb7cc8b640 100644 --- a/yarn.lock +++ b/yarn.lock @@ -199,13 +199,6 @@ "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.22.5": - version "7.24.7" - resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz" - integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg== - dependencies: - "@babel/types" "^7.24.7" - "@babel/helper-compilation-targets@^7.24.7": version "7.24.7" resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz" @@ -239,7 +232,7 @@ dependencies: "@babel/types" "^7.24.7" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.7": +"@babel/helper-module-imports@^7.24.7": version "7.24.7" resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz" integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== @@ -351,7 +344,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.7.2": +"@babel/plugin-syntax-jsx@^7.7.2": version "7.24.7" resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz" integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ== @@ -430,7 +423,7 @@ "@babel/parser" "^7.24.7" "@babel/types" "^7.24.7" -"@babel/traverse@^7.24.7", "@babel/traverse@^7.4.5": +"@babel/traverse@^7.24.7": version "7.24.7" resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz" integrity sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA== @@ -501,9 +494,9 @@ dependencies: tslib "^2.4.0" -"@emotion/is-prop-valid@^1.1.0": +"@emotion/is-prop-valid@1.2.2": version "1.2.2" - resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz#d4175076679c6a26faa92b03bb786f9e52612337" integrity sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw== dependencies: "@emotion/memoize" "^0.8.1" @@ -513,15 +506,10 @@ resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz" integrity sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA== -"@emotion/stylis@^0.8.4": - version "0.8.5" - resolved "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz" - integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== - -"@emotion/unitless@^0.7.4": - version "0.7.5" - resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz" - integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== +"@emotion/unitless@0.8.1": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.1.tgz#182b5a4704ef8ad91bde93f7a860a88fd92c79a3" + integrity sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ== "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" @@ -2400,6 +2388,11 @@ "@types/react" "*" csstype "^3.0.2" +"@types/stylis@4.2.5": + version "4.2.5" + resolved "https://registry.yarnpkg.com/@types/stylis/-/stylis-4.2.5.tgz#1daa6456f40959d06157698a653a9ab0a70281df" + integrity sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw== + "@types/testing-library__jest-dom@^5.9.1": version "5.14.9" resolved "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.9.tgz" @@ -3118,17 +3111,6 @@ babel-plugin-jest-hoist@^29.6.3: "@types/babel__core" "^7.1.14" "@types/babel__traverse" "^7.0.6" -"babel-plugin-styled-components@>= 1.12.0": - version "2.1.4" - resolved "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz" - integrity sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-module-imports" "^7.22.5" - "@babel/plugin-syntax-jsx" "^7.22.5" - lodash "^4.17.21" - picomatch "^2.3.1" - babel-preset-current-node-syntax@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz" @@ -3789,9 +3771,9 @@ css-select@^4.3.0: domutils "^2.8.0" nth-check "^2.0.1" -css-to-react-native@^3.0.0: +css-to-react-native@3.2.0: version "3.2.0" - resolved "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz" + resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.2.0.tgz#cdd8099f71024e149e4f6fe17a7d46ecd55f1e32" integrity sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ== dependencies: camelize "^1.0.0" @@ -3838,7 +3820,7 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@^3.0.2, csstype@^3.1.2: +csstype@3.1.3, csstype@^3.0.2, csstype@^3.1.2: version "3.1.3" resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz" integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== @@ -5382,7 +5364,7 @@ history@^4.9.0: tiny-warning "^1.0.0" value-equal "^1.0.1" -hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -7764,6 +7746,15 @@ postcss@8.4.31: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@8.4.38: + version "8.4.38" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e" + integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.0" + source-map-js "^1.2.0" + postcss@^8.0.0, postcss@^8.4.35, postcss@^8.4.5: version "8.4.39" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.39.tgz#aa3c94998b61d3a9c259efa51db4b392e1bde0e3" @@ -8765,7 +8756,7 @@ shallow-equal@^1.2.1: resolved "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz" integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA== -shallowequal@^1.1.0: +shallowequal@1.1.0, shallowequal@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== @@ -9235,21 +9226,20 @@ stubs@^3.0.0: resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b" integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw== -styled-components@^5.3.6: - version "5.3.11" - resolved "https://registry.npmjs.org/styled-components/-/styled-components-5.3.11.tgz" - integrity sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@babel/traverse" "^7.4.5" - "@emotion/is-prop-valid" "^1.1.0" - "@emotion/stylis" "^0.8.4" - "@emotion/unitless" "^0.7.4" - babel-plugin-styled-components ">= 1.12.0" - css-to-react-native "^3.0.0" - hoist-non-react-statics "^3.0.0" - shallowequal "^1.1.0" - supports-color "^5.5.0" +styled-components@^6.1.11: + version "6.1.11" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-6.1.11.tgz#01948e5195bf1d39e57e0a85b41958c80e40cfb8" + integrity sha512-Ui0jXPzbp1phYij90h12ksljKGqF8ncGx+pjrNPsSPhbUUjWT2tD1FwGo2LF6USCnbrsIhNngDfodhxbegfEOA== + dependencies: + "@emotion/is-prop-valid" "1.2.2" + "@emotion/unitless" "0.8.1" + "@types/stylis" "4.2.5" + css-to-react-native "3.2.0" + csstype "3.1.3" + postcss "8.4.38" + shallowequal "1.1.0" + stylis "4.3.2" + tslib "2.6.2" styled-jsx@5.1.1: version "5.1.1" @@ -9258,7 +9248,7 @@ styled-jsx@5.1.1: dependencies: client-only "0.0.1" -stylis@^4.3.0: +stylis@4.3.2, stylis@^4.3.0: version "4.3.2" resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz" integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg== @@ -9555,6 +9545,11 @@ tsconfig-paths@^4.2.0: minimist "^1.2.6" strip-bom "^3.0.0" +tslib@2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + tslib@^1.8.1: version "1.14.1" resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" From c049c68d7f9dc48a663b49bd7b6f3fa7ff0872f2 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Wed, 10 Jul 2024 15:03:57 +0200 Subject: [PATCH 08/37] chore(client): :white_check_mark: Update snapshots due to new styledcomponents library --- .../__snapshots__/index.test.tsx.snap | 260 +++++---- .../__snapshots__/recherche.test.tsx.snap | 162 +++--- .../__snapshots__/SubComponents.test.tsx.snap | 176 +----- .../UserContributions.component.test.tsx.snap | 296 +--------- .../UserFavorites.component.test.tsx.snap | 78 +-- .../UserNotifications.test.tsx.snap | 67 +-- .../__snapshots__/UserStructure.test.tsx.snap | 514 ++---------------- .../UserTranslation.component.test.tsx.snap | 69 --- 8 files changed, 371 insertions(+), 1251 deletions(-) diff --git a/client/src/__tests__/__snapshots__/index.test.tsx.snap b/client/src/__tests__/__snapshots__/index.test.tsx.snap index 0e8386e4b3..8178b7d930 100644 --- a/client/src/__tests__/__snapshots__/index.test.tsx.snap +++ b/client/src/__tests__/__snapshots__/index.test.tsx.snap @@ -6,7 +6,7 @@ exports[`homepage renders homepage 1`] = ` color: #443023; } -.c13:hover { +.c13 :hover { background-color: #EEE7E5; } @@ -14,8 +14,8 @@ exports[`homepage renders homepage 1`] = ` background-color: #443023; } -.c0:not(:disabled):hover { - background-color: #443023 !important; +.c0 :not(:disabled):hover { + background-color: #443023!important; border-color: #443023; color: #443023; } @@ -24,8 +24,8 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c1:not(:disabled):hover { - background-color: #EFE8F4 !important; +.c1 :not(:disabled):hover { + background-color: #EFE8F4!important; border-color: #3D2884; color: #3D2884; } @@ -34,8 +34,8 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c2:not(:disabled):hover { - background-color: #E8F4E8 !important; +.c2 :not(:disabled):hover { + background-color: #E8F4E8!important; border-color: #095411; color: #095411; } @@ -44,8 +44,8 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c3:not(:disabled):hover { - background-color: #EDFDF9 !important; +.c3 :not(:disabled):hover { + background-color: #EDFDF9!important; border-color: #055E5A; color: #055E5A; } @@ -54,8 +54,8 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c4:not(:disabled):hover { - background-color: #DDF2F9 !important; +.c4 :not(:disabled):hover { + background-color: #DDF2F9!important; border-color: #06508C; color: #06508C; } @@ -64,8 +64,8 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c5:not(:disabled):hover { - background-color: #FFEDED !important; +.c5 :not(:disabled):hover { + background-color: #FFEDED!important; border-color: #910940; color: #910940; } @@ -74,8 +74,8 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c6:not(:disabled):hover { - background-color: #FEEBDE !important; +.c6 :not(:disabled):hover { + background-color: #FEEBDE!important; border-color: #CD5605; color: #CD5605; } @@ -84,8 +84,8 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c7:not(:disabled):hover { - background-color: #FFEAF4 !important; +.c7 :not(:disabled):hover { + background-color: #FFEAF4!important; border-color: #770649; color: #770649; } @@ -94,8 +94,8 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c8:not(:disabled):hover { - background-color: #F2F9E5 !important; +.c8 :not(:disabled):hover { + background-color: #F2F9E5!important; border-color: #204F01; color: #204F01; } @@ -104,8 +104,8 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c9:not(:disabled):hover { - background-color: #EEF8FF !important; +.c9 :not(:disabled):hover { + background-color: #EEF8FF!important; border-color: #073099; color: #073099; } @@ -114,8 +114,8 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c10:not(:disabled):hover { - background-color: #F9F1FD !important; +.c10 :not(:disabled):hover { + background-color: #F9F1FD!important; border-color: #600566; color: #600566; } @@ -124,8 +124,8 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c11:not(:disabled):hover { - background-color: #F9E8E8 !important; +.c11 :not(:disabled):hover { + background-color: #F9E8E8!important; border-color: #9E180A; color: #9E180A; } @@ -134,296 +134,296 @@ exports[`homepage renders homepage 1`] = ` background-color: transparent; } -.c12:not(:disabled):hover { - background-color: #FDC4FC !important; +.c12 :not(:disabled):hover { + background-color: #FDC4FC!important; border-color: #77057A; color: #77057A; } .c14 { - background: linear-gradient(90deg,#443023 22%,#715F56 100%); + background: linear-gradient(90deg, #443023 22%, #715F56 100%); } -.c14:hover { +.c14 :hover { background: #EEE7E5; box-shadow: 0 0 0 1px #443023,0 0 40px 0 #00000040; - color: #443023 !important; + color: #443023!important; } .c15 { - background: linear-gradient(90deg,#3D2884 22%,#705FA4 100%); + background: linear-gradient(90deg, #3D2884 22%, #705FA4 100%); } -.c15:hover { +.c15 :hover { background: #EFE8F4; box-shadow: 0 0 0 1px #3D2884,0 0 40px 0 #00000040; - color: #3D2884 !important; + color: #3D2884!important; } .c16 { - background: linear-gradient(90deg,#095411 22%,#26B759 100%); + background: linear-gradient(90deg, #095411 22%, #26B759 100%); } -.c16:hover { +.c16 :hover { background: #E8F4E8; box-shadow: 0 0 0 1px #095411,0 0 40px 0 #00000040; - color: #095411 !important; + color: #095411!important; } .c17 { - background: linear-gradient(90deg,#055E5A 22%,#27A8A5 100%); + background: linear-gradient(90deg, #055E5A 22%, #27A8A5 100%); } -.c17:hover { +.c17 :hover { background: #EDFDF9; box-shadow: 0 0 0 1px #055E5A,0 0 40px 0 #00000040; - color: #055E5A !important; + color: #055E5A!important; } .c18 { - background: linear-gradient(90deg,#06508C 22%,#1E9ED1 100%); + background: linear-gradient(90deg, #06508C 22%, #1E9ED1 100%); } -.c18:hover { +.c18 :hover { background: #DDF2F9; box-shadow: 0 0 0 1px #06508C,0 0 40px 0 #00000040; - color: #06508C !important; + color: #06508C!important; } .c19 { - background: linear-gradient(90deg,#910940 22%,#D64B71 100%); + background: linear-gradient(90deg, #910940 22%, #D64B71 100%); } -.c19:hover { +.c19 :hover { background: #FFEDED; box-shadow: 0 0 0 1px #910940,0 0 40px 0 #00000040; - color: #910940 !important; + color: #910940!important; } .c20 { - background: linear-gradient(90deg,#CD5605 22%,#F97319 100%); + background: linear-gradient(90deg, #CD5605 22%, #F97319 100%); } -.c20:hover { +.c20 :hover { background: #FEEBDE; box-shadow: 0 0 0 1px #CD5605,0 0 40px 0 #00000040; - color: #CD5605 !important; + color: #CD5605!important; } .c21 { - background: linear-gradient(90deg,#770649 22%,#D01F67 100%); + background: linear-gradient(90deg, #770649 22%, #D01F67 100%); } -.c21:hover { +.c21 :hover { background: #FFEAF4; box-shadow: 0 0 0 1px #770649,0 0 40px 0 #00000040; - color: #770649 !important; + color: #770649!important; } .c22 { - background: linear-gradient(90deg,#204F01 22%,#47AA0A 100%); + background: linear-gradient(90deg, #204F01 22%, #47AA0A 100%); } -.c22:hover { +.c22 :hover { background: #F2F9E5; box-shadow: 0 0 0 1px #204F01,0 0 40px 0 #00000040; - color: #204F01 !important; + color: #204F01!important; } .c23 { - background: linear-gradient(90deg,#073099 22%,#1C66DD 100%); + background: linear-gradient(90deg, #073099 22%, #1C66DD 100%); } -.c23:hover { +.c23 :hover { background: #EEF8FF; box-shadow: 0 0 0 1px #073099,0 0 40px 0 #00000040; - color: #073099 !important; + color: #073099!important; } .c24 { - background: linear-gradient(90deg,#600566 22%,#9E2DAD 100%); + background: linear-gradient(90deg, #600566 22%, #9E2DAD 100%); } -.c24:hover { +.c24 :hover { background: #F9F1FD; box-shadow: 0 0 0 1px #600566,0 0 40px 0 #00000040; - color: #600566 !important; + color: #600566!important; } .c25 { - background: linear-gradient(90deg,#9E180A 22%,#E05A3E 100%); + background: linear-gradient(90deg, #9E180A 22%, #E05A3E 100%); } -.c25:hover { +.c25 :hover { background: #F9E8E8; box-shadow: 0 0 0 1px #9E180A,0 0 40px 0 #00000040; - color: #9E180A !important; + color: #9E180A!important; } .c26 { - background: linear-gradient(90deg,#77057A 22%,#9E2DAD 100%); + background: linear-gradient(90deg, #77057A 22%, #9E2DAD 100%); } -.c26:hover { +.c26 :hover { background: #FDC4FC; box-shadow: 0 0 0 1px #77057A,0 0 40px 0 #00000040; - color: #77057A !important; + color: #77057A!important; } -.c27:hover, -.favorite:hover + .c27 { - background-color: #EEEEEE !important; - border-color: #3A3A3A !important; - color: #3A3A3A !important; +.c27 :hover, +.favorite:hover+.c27 { + background-color: #EEEEEE!important; + border-color: #3A3A3A!important; + color: #3A3A3A!important; } -.c28:hover, -.favorite:hover + .c28 { - background-color: #EEEEEE !important; - border-color: #3A3A3A !important; - color: #3A3A3A !important; +.c28 :hover, +.favorite:hover+.c28 { + background-color: #EEEEEE!important; + border-color: #3A3A3A!important; + color: #3A3A3A!important; } @media screen and (max-width:767px) { .c0 { - background-color: #443023 !important; - color: white !important; - border-color: white !important; + background-color: #443023!important; + color: white!important; + border-color: white!important; } - .c0:hover { + .c0 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c1 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c1:hover { + .c1 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c2 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c2:hover { + .c2 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c3 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c3:hover { + .c3 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c4 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c4:hover { + .c4 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c5 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c5:hover { + .c5 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c6 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c6:hover { + .c6 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c7 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c7:hover { + .c7 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c8 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c8:hover { + .c8 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c9 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c9:hover { + .c9 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c10 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c10:hover { + .c10 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c11 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c11:hover { + .c11 :hover { background-color: transparent; } } @media screen and (max-width:767px) { .c12 { - background-color: transparent !important; - color: white !important; + background-color: transparent!important; + color: white!important; } - .c12:hover { + .c12 :hover { background-color: transparent; } } @@ -628,6 +628,8 @@ exports[`homepage renders homepage 1`] = `
@@ -595,8 +520,6 @@ exports[`should render StyledStatus actif 1`] = ` border-radius: 6px; padding: 8px; background-color: #4CAF50; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; font-weight: normal; font-size: 12px; @@ -621,8 +544,6 @@ exports[`should render StyledStatus en attente 1`] = ` border-radius: 6px; padding: 8px; background-color: #FF9800; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; font-weight: normal; font-size: 12px; @@ -636,6 +557,7 @@ exports[`should render StyledStatus en attente 1`] = ` className="c0" color="#FF9800" disabled={false} + textColor="#ffffff" > En attente @@ -647,8 +569,6 @@ exports[`should render StyledStatus no corresponding status 1`] = ` border-radius: 6px; padding: 8px; background-color: #0421b1; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; font-weight: normal; font-size: 12px; @@ -662,6 +582,7 @@ exports[`should render StyledStatus no corresponding status 1`] = ` className="c0" color="#0421b1" disabled={false} + textColor="#ffffff" > Nouveau ! @@ -673,8 +594,6 @@ exports[`should render StyledStatus no corresponding with color 1`] = ` border-radius: 6px; padding: 8px; background-color: color; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; font-weight: normal; font-size: 12px; @@ -688,6 +607,7 @@ exports[`should render StyledStatus no corresponding with color 1`] = ` className="c0" color="color" disabled={false} + textColor="textColor" > test @@ -699,8 +619,6 @@ exports[`should render StyledStatus no corresponding with override 1`] = ` border-radius: 6px; padding: 8px; background-color: #828282; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; font-weight: normal; font-size: 12px; @@ -714,6 +632,7 @@ exports[`should render StyledStatus no corresponding with override 1`] = ` className="c0" color="#828282" disabled={false} + textColor="#ffffff" > test @@ -721,12 +640,7 @@ exports[`should render StyledStatus no corresponding with override 1`] = ` exports[`should render TabHeader down 1`] = ` .c0 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; font-weight: bold; cursor: pointer; @@ -759,12 +673,7 @@ exports[`should render TabHeader down 1`] = ` exports[`should render TabHeader no order 1`] = ` .c0 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; font-weight: bold; cursor: inherit; @@ -780,12 +689,7 @@ exports[`should render TabHeader no order 1`] = ` exports[`should render TabHeader up 1`] = ` .c0 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; font-weight: bold; cursor: pointer; @@ -818,24 +722,14 @@ exports[`should render TabHeader up 1`] = ` exports[`should render Title with titre marque 1`] = ` .c0 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: column; - -ms-flex-direction: column; flex-direction: column; - -webkit-align-items: flex-start; - -webkit-box-align: flex-start; - -ms-flex-align: flex-start; align-items: flex-start; text-align: left; font-style: normal; font-size: 16px; line-height: 20px; max-width: 370px; - -webkit-flex: 1; - -ms-flex: 1; flex: 1; cursor: pointer; } @@ -854,24 +748,14 @@ exports[`should render Title with titre marque 1`] = ` exports[`should render Title without titre marque 1`] = ` .c0 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: column; - -ms-flex-direction: column; flex-direction: column; - -webkit-align-items: flex-start; - -webkit-box-align: flex-start; - -ms-flex-align: flex-start; align-items: flex-start; text-align: left; font-style: normal; font-size: 16px; line-height: 20px; max-width: 370px; - -webkit-flex: 1; - -ms-flex: 1; flex: 1; cursor: pointer; } @@ -894,14 +778,13 @@ exports[`should render TypeContenu with demarche, detailed vue 1`] = ` background-color: #212121; padding: 8px; border-radius: 6px; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; cursor: pointer; }
Démarche
@@ -916,14 +799,13 @@ exports[`should render TypeContenu with demarche, not detailed vue 1`] = ` background-color: #ffffff; padding: 8px; border-radius: 6px; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; cursor: pointer; }
Démarche
@@ -938,14 +820,13 @@ exports[`should render TypeContenu with dispositif, detailed vue 1`] = ` background-color: #212121; padding: 8px; border-radius: 6px; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; cursor: pointer; }
Dispositif
@@ -960,14 +841,13 @@ exports[`should render TypeContenu with dispositif, not detailed vue 1`] = ` background-color: #212121; padding: 8px; border-radius: 6px; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; cursor: pointer; }
Dispositif
@@ -979,17 +859,8 @@ exports[`should render ValidateButton disabled 1`] = ` height: 40px; background-color: #828282; border-radius: 8px; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; justify-content: center; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; align-items: center; margin-right: 4px; margin-left: 4px; @@ -1004,6 +875,7 @@ exports[`should render ValidateButton disabled 1`] = ` className="c0" data-test-id="validate-button" disabled={true} + hoverColor="#4caf50" onClick={[Function]} >
Dispositif
@@ -644,6 +530,7 @@ exports[`userContributions should render correctly when click on delete 1`] = ` color="#FFEB3B" onMouseEnter={[Function]} onMouseLeave={[Function]} + textColor="#212121" > Brouillon
@@ -682,6 +569,7 @@ exports[`userContributions should render correctly when click on delete 1`] = ` >
Dispositif
@@ -1344,6 +1110,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` color="#FFEB3B" onMouseEnter={[Function]} onMouseLeave={[Function]} + textColor="#212121" > Brouillon
@@ -1382,6 +1149,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` >
Démarche
@@ -1532,6 +1302,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` color="#FF9800" onMouseEnter={[Function]} onMouseLeave={[Function]} + textColor="#ffffff" > En attente
@@ -1570,6 +1341,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` >
Démarche
@@ -1690,6 +1464,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` color="#8BC34A" onMouseEnter={[Function]} onMouseLeave={[Function]} + textColor="#ffffff" > Relecture en cours
@@ -1728,6 +1503,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` >
Démarche
@@ -1848,6 +1626,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` color="#FF9800" onMouseEnter={[Function]} onMouseLeave={[Function]} + textColor="#ffffff" > Accepté
@@ -1886,6 +1665,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` >
Démarche
@@ -2036,6 +1818,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` color="#F44336" onMouseEnter={[Function]} onMouseLeave={[Function]} + textColor="#ffffff" > Rejeté
@@ -2074,6 +1857,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` >
Démarche
@@ -2238,6 +2024,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` >
Démarche
@@ -2432,6 +2221,7 @@ exports[`userContributions should render correctly when contributions 1`] = ` >
Recensez votre structure dans l'annuaire de l'intégration
@@ -476,6 +418,7 @@ exports[`UserNotifications should render correctly when notif not read annuaire, className="c4" data-test-id="test-notif-new content" onClick={[Function]} + read={false} >
Une nouvelle fiche a été attribuée à votre structure
@@ -508,6 +452,7 @@ exports[`UserNotifications should render correctly when notif not read annuaire, >
Depuis 5 jours
@@ -625,6 +570,7 @@ exports[`UserNotifications should render correctly when notif not read annuaire, className="c9" data-test-id="test-notif-reaction" onClick={[Function]} + read={true} >
Nouvelle réaction sur la fiche :
diff --git a/client/src/components/Backend/screens/UserStructure/__tests__/__snapshots__/UserStructure.test.tsx.snap b/client/src/components/Backend/screens/UserStructure/__tests__/__snapshots__/UserStructure.test.tsx.snap index bc81d72d67..cbdaa0ab19 100644 --- a/client/src/components/Backend/screens/UserStructure/__tests__/__snapshots__/UserStructure.test.tsx.snap +++ b/client/src/components/Backend/screens/UserStructure/__tests__/__snapshots__/UserStructure.test.tsx.snap @@ -2,23 +2,11 @@ exports[`UserStructure should render correctly when add member modal is open 1`] = ` .c0 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; justify-content: center; - -webkit-flex: 1; - -ms-flex: 1; flex: 1; margin-top: 26px; - height: -webkit-fit-content; - height: -moz-fit-content; height: fit-content; margin-bottom: 42px; } @@ -28,12 +16,7 @@ exports[`UserStructure should render correctly when add member modal is open 1`] border-radius: 12px; padding: 40px; margin: 0px 20px 0px 20px; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: column; - -ms-flex-direction: column; flex-direction: column; } @@ -42,35 +25,17 @@ exports[`UserStructure should render correctly when add member modal is open 1`] border-radius: 12px; padding: 40px; margin: 0px 20px 0px 20px; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: column; - -ms-flex-direction: column; flex-direction: column; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; align-items: center; width: 315px; - height: -webkit-fit-content; - height: -moz-fit-content; height: fit-content; } .c5 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; margin-bottom: 32px; - -webkit-align-items: flex-end; - -webkit-box-align: flex-end; - -ms-flex-align: flex-end; align-items: flex-end; } @@ -97,17 +62,8 @@ exports[`UserStructure should render correctly when add member modal is open 1`] height: 40px; background-color: #828282; border-radius: 8px; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; justify-content: center; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; align-items: center; margin-right: 4px; margin-left: 4px; @@ -123,17 +79,8 @@ exports[`UserStructure should render correctly when add member modal is open 1`] height: 40px; background-color: #828282; border-radius: 8px; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; justify-content: center; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; align-items: center; margin-right: 4px; margin-left: 4px; @@ -145,16 +92,8 @@ exports[`UserStructure should render correctly when add member modal is open 1`] } .c8 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; align-items: center; } @@ -180,8 +119,6 @@ exports[`UserStructure should render correctly when add member modal is open 1`] font-size: 16px; line-height: 20px; color: #0421b1; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; } @@ -193,8 +130,6 @@ exports[`UserStructure should render correctly when add member modal is open 1`] font-size: 16px; line-height: 20px; color: #212121; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; } @@ -215,16 +150,8 @@ exports[`UserStructure should render correctly when add member modal is open 1`] } .c19 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; - -webkit-box-pack: end; - -webkit-justify-content: flex-end; - -ms-flex-pack: end; justify-content: flex-end; margin-top: 8px; } @@ -250,16 +177,8 @@ exports[`UserStructure should render correctly when add member modal is open 1`] } .c4 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; - -webkit-box-pack: justify; - -webkit-justify-content: space-between; - -ms-flex-pack: justify; justify-content: space-between; } @@ -432,6 +351,7 @@ exports[`UserStructure should render correctly when add member modal is open 1`] />
membre2
@@ -442,6 +362,7 @@ exports[`UserStructure should render correctly when add member modal is open 1`] >
Rédacteur
@@ -451,6 +372,7 @@ exports[`UserStructure should render correctly when add member modal is open 1`] >
undefined undefined
@@ -460,6 +382,7 @@ exports[`UserStructure should render correctly when add member modal is open 1`] >
membre1
@@ -578,6 +504,7 @@ exports[`UserStructure should render correctly when add member modal is open 1`] >
Rédacteur
@@ -587,6 +514,7 @@ exports[`UserStructure should render correctly when add member modal is open 1`] >
undefined undefined
@@ -596,6 +524,7 @@ exports[`UserStructure should render correctly when add member modal is open 1`] >
membre2
@@ -1289,6 +1121,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
Rédacteur
@@ -1298,6 +1131,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
undefined undefined
@@ -1307,6 +1141,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
membre1
@@ -1425,6 +1263,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
Rédacteur
@@ -1434,6 +1273,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
undefined undefined
@@ -1443,6 +1283,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
membre2
@@ -2208,6 +1954,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
Rédacteur
@@ -2217,6 +1964,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
undefined undefined
@@ -2226,6 +1974,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
membre1
@@ -2344,6 +2096,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
Rédacteur
@@ -2353,6 +2106,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
undefined undefined
@@ -2362,6 +2116,7 @@ exports[`UserStructure should render correctly when edit member modal is open, s >
membre1
@@ -3211,6 +2871,7 @@ exports[`UserStructure should render correctly when structure with membres when >
Rédacteur
@@ -3220,6 +2881,7 @@ exports[`UserStructure should render correctly when structure with membres when >
undefined undefined
@@ -3229,6 +2891,7 @@ exports[`UserStructure should render correctly when structure with membres when >
@@ -3262,6 +2925,7 @@ exports[`UserStructure should render correctly when structure with membres when />
membre2
@@ -3272,6 +2936,7 @@ exports[`UserStructure should render correctly when structure with membres when >
Rédacteur
@@ -3281,6 +2946,7 @@ exports[`UserStructure should render correctly when structure with membres when >
undefined undefined
@@ -3290,6 +2956,7 @@ exports[`UserStructure should render correctly when structure with membres when >
@@ -3303,23 +2970,11 @@ exports[`UserStructure should render correctly when structure with membres when exports[`UserStructure should render correctly when structure with membres when user is respo 1`] = ` .c0 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; justify-content: center; - -webkit-flex: 1; - -ms-flex: 1; flex: 1; margin-top: 26px; - height: -webkit-fit-content; - height: -moz-fit-content; height: fit-content; margin-bottom: 42px; } @@ -3329,12 +2984,7 @@ exports[`UserStructure should render correctly when structure with membres when border-radius: 12px; padding: 40px; margin: 0px 20px 0px 20px; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: column; - -ms-flex-direction: column; flex-direction: column; } @@ -3343,35 +2993,17 @@ exports[`UserStructure should render correctly when structure with membres when border-radius: 12px; padding: 40px; margin: 0px 20px 0px 20px; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: column; - -ms-flex-direction: column; flex-direction: column; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; align-items: center; width: 315px; - height: -webkit-fit-content; - height: -moz-fit-content; height: fit-content; } .c5 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; margin-bottom: 32px; - -webkit-align-items: flex-end; - -webkit-box-align: flex-end; - -ms-flex-align: flex-end; align-items: flex-end; } @@ -3398,17 +3030,8 @@ exports[`UserStructure should render correctly when structure with membres when height: 40px; background-color: #828282; border-radius: 8px; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; justify-content: center; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; align-items: center; margin-right: 4px; margin-left: 4px; @@ -3424,17 +3047,8 @@ exports[`UserStructure should render correctly when structure with membres when height: 40px; background-color: #828282; border-radius: 8px; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; justify-content: center; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; align-items: center; margin-right: 4px; margin-left: 4px; @@ -3446,16 +3060,8 @@ exports[`UserStructure should render correctly when structure with membres when } .c8 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; - -webkit-align-items: center; - -webkit-box-align: center; - -ms-flex-align: center; align-items: center; } @@ -3481,8 +3087,6 @@ exports[`UserStructure should render correctly when structure with membres when font-size: 16px; line-height: 20px; color: #0421b1; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; } @@ -3494,8 +3098,6 @@ exports[`UserStructure should render correctly when structure with membres when font-size: 16px; line-height: 20px; color: #212121; - width: -webkit-fit-content; - width: -moz-fit-content; width: fit-content; } @@ -3518,16 +3120,8 @@ exports[`UserStructure should render correctly when structure with membres when } .c4 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; display: flex; - -webkit-flex-direction: row; - -ms-flex-direction: row; flex-direction: row; - -webkit-box-pack: justify; - -webkit-justify-content: space-between; - -ms-flex-pack: justify; justify-content: space-between; } @@ -3700,6 +3294,7 @@ exports[`UserStructure should render correctly when structure with membres when />
membre2
@@ -3710,6 +3305,7 @@ exports[`UserStructure should render correctly when structure with membres when >
Rédacteur
@@ -3719,6 +3315,7 @@ exports[`UserStructure should render correctly when structure with membres when >
undefined undefined
@@ -3728,6 +3325,7 @@ exports[`UserStructure should render correctly when structure with membres when >
membre1
@@ -3846,6 +3447,7 @@ exports[`UserStructure should render correctly when structure with membres when >
Rédacteur
@@ -3855,6 +3457,7 @@ exports[`UserStructure should render correctly when structure with membres when >
undefined undefined
@@ -3864,6 +3467,7 @@ exports[`UserStructure should render correctly when structure with membres when >
Date: Wed, 10 Jul 2024 15:06:27 +0200 Subject: [PATCH 09/37] chore(client): :arrow_up: redux - Major upgrade --- client/package.json | 4 ++-- yarn.lock | 23 ++++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/client/package.json b/client/package.json index dee44abcbe..20166cef2f 100644 --- a/client/package.json +++ b/client/package.json @@ -52,14 +52,14 @@ "react-intersection-observer": "^9.4.1", "react-loading-skeleton": "^3.1.0", "react-notifications": "^1.7.3", - "react-redux": "^8.0.5", + "react-redux": "^9.1.2", "react-router-dom": "^5.3.4", "react-router-hash-link": "^2.4.3", "react-sortablejs": "^6.1.4", "react-to-print": "^2.12.1", "react-use": "^17.4.0", "reactstrap": "^9.2.2", - "redux": "^4.0.1", + "redux": "^5.0.1", "redux-saga": "^1.1.3", "remixicon": "^4.3.0", "sharp": "^0.33.4", diff --git a/yarn.lock b/yarn.lock index eb7cc8b640..da1ddde4da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -407,7 +407,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.24.7" resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz" integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw== @@ -2055,7 +2055,7 @@ resolved "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz" integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA== -"@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.1", "@types/hoist-non-react-statics@^3.3.4": +"@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.4": version "3.3.5" resolved "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz" integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg== @@ -8157,16 +8157,12 @@ react-popper@^2.2.4: react-fast-compare "^3.0.1" warning "^4.0.2" -react-redux@^8.0.5: - version "8.1.3" - resolved "https://registry.npmjs.org/react-redux/-/react-redux-8.1.3.tgz" - integrity sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw== +react-redux@^9.1.2: + version "9.1.2" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-9.1.2.tgz#deba38c64c3403e9abd0c3fbeab69ffd9d8a7e4b" + integrity sha512-0OA4dhM1W48l3uzmv6B7TXPCGmokUU4p1M44DGN2/D9a1FjVPukVjER1PcPX97jIg6aUeLq1XJo1IpfbgULn0w== dependencies: - "@babel/runtime" "^7.12.1" - "@types/hoist-non-react-statics" "^3.3.1" "@types/use-sync-external-store" "^0.0.3" - hoist-non-react-statics "^3.3.2" - react-is "^18.0.0" use-sync-external-store "^1.0.0" react-router-dom@^5.3.4: @@ -8359,13 +8355,18 @@ redux-saga@^1.1.3: dependencies: "@redux-saga/core" "^1.3.0" -redux@^4.0.1, redux@^4.0.5: +redux@^4.0.5: version "4.2.1" resolved "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz" integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w== dependencies: "@babel/runtime" "^7.9.2" +redux@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/redux/-/redux-5.0.1.tgz#97fa26881ce5746500125585d5642c77b6e9447b" + integrity sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w== + reflect-metadata@^0.2.1, reflect-metadata@^0.2.2: version "0.2.2" resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz" From 093cb4fae66cf284f30d39d858676ddb403e603d Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Wed, 10 Jul 2024 16:38:55 +0200 Subject: [PATCH 10/37] chore(client): :arrow_up: Major typescript version upgrade and typing error fix --- client/package.json | 2 +- client/src/components/UI/SearchBar/SearchBar.tsx | 6 ++++-- yarn.lock | 5 ----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/client/package.json b/client/package.json index 20166cef2f..a3d4ec5e83 100644 --- a/client/package.json +++ b/client/package.json @@ -134,7 +134,7 @@ "redux-saga-test-plan": "^4.0.0-rc.3", "sass": "^1.57.1", "ts-jest": "29.0.3", - "typescript": "^4.9.3", + "typescript": "^5.5.3", "typescript-plugin-css-modules": "^5.1.0" }, "volta": { diff --git a/client/src/components/UI/SearchBar/SearchBar.tsx b/client/src/components/UI/SearchBar/SearchBar.tsx index c18ed2e690..f59e6ebccb 100644 --- a/client/src/components/UI/SearchBar/SearchBar.tsx +++ b/client/src/components/UI/SearchBar/SearchBar.tsx @@ -60,7 +60,6 @@ interface Props { */ const SearchBar = (props: Props) => { const [value, setValue] = useState(""); - const [suggestions, setSuggestions] = useState([]); const [isLoadingResults, setIsLoadingResults] = useState(false); const onChange = (_: any, { newValue }: { newValue: string }) => { @@ -86,6 +85,8 @@ const SearchBar = (props: Props) => { }); }; + const [suggestions, setSuggestions] = useState>([]); + const onSuggestionsFetchRequested = debounce(({ value }) => { setSuggestions(getSuggestions(value)); setIsLoadingResults(false); @@ -171,7 +172,7 @@ const SearchBar = (props: Props) => { value.length >= 0} highlightFirstSuggestion - suggestions={suggestions} + suggestions={suggestions as GetActiveUsersResponse[]} onSuggestionsFetchRequested={onSuggestionsFetchRequested} getSuggestionValue={(s) => getSuggestionValue(s)} renderSuggestion={renderSuggestion} @@ -179,6 +180,7 @@ const SearchBar = (props: Props) => { onSuggestionSelected={onSuggestionSelected} onSuggestionsClearRequested={() => setSuggestions([])} focusInputOnSuggestionClick + multiSection={false} /> {isNoResult && props.structures && !isLoadingResults && ( diff --git a/yarn.lock b/yarn.lock index da1ddde4da..59e0cf2c66 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9721,11 +9721,6 @@ typescript-tuple@^2.2.1: dependencies: typescript-compare "^0.0.2" -typescript@^4.9.3: - version "4.9.5" - resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== - typescript@^5.3.3: version "5.5.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507" From a1400d5eb95095505bdb26ec2b3c2a63c4534d16 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Thu, 11 Jul 2024 09:35:47 +0200 Subject: [PATCH 11/37] chore(client): --- client/package.json | 11 +- client/src/pages/_app.tsx | 7 - client/src/types/react-dsfr.d.ts | 8 + client/src/types/style.d.ts | 5 - client/tsconfig.json | 1 - yarn.lock | 399 ++----------------------------- 6 files changed, 36 insertions(+), 395 deletions(-) create mode 100644 client/src/types/react-dsfr.d.ts delete mode 100644 client/src/types/style.d.ts diff --git a/client/package.json b/client/package.json index a3d4ec5e83..e92758d06c 100644 --- a/client/package.json +++ b/client/package.json @@ -95,7 +95,7 @@ "not op_mini all" ], "devDependencies": { - "@next/eslint-plugin-next": "^13.0.5", + "@next/eslint-plugin-next": "^14.2.5", "@redux-devtools/extension": "^3.2.1", "@testing-library/jest-dom": "^5.16.2", "@testing-library/react": "^13.4.0", @@ -117,11 +117,11 @@ "@types/styled-components": "^5.1.1", "@types/uuid": "^9.0.1", "@types/webrtc": "^0.0.43", - "@typescript-eslint/eslint-plugin": "^5.10.1", - "@typescript-eslint/parser": "^5.10.1", + "@typescript-eslint/eslint-plugin": "^7.16.0", + "@typescript-eslint/parser": "^7.16.0", "csvtojson": "^2.0.10", "eslint": "^8.28.0", - "eslint-config-next": "^14.2.4", + "eslint-config-next": "^14.2.5", "jest": "^29.3.1", "jest-environment-jsdom": "^29.3.1", "jest-mock-axios": "^4.7.0-beta2", @@ -134,8 +134,7 @@ "redux-saga-test-plan": "^4.0.0-rc.3", "sass": "^1.57.1", "ts-jest": "29.0.3", - "typescript": "^5.5.3", - "typescript-plugin-css-modules": "^5.1.0" + "typescript": "^5.5.3" }, "volta": { "node": "20.13.1", diff --git a/client/src/pages/_app.tsx b/client/src/pages/_app.tsx index 628c197b88..6051ad2bbf 100644 --- a/client/src/pages/_app.tsx +++ b/client/src/pages/_app.tsx @@ -20,13 +20,6 @@ import { finishLoading, startLoading } from "services/LoadingStatus/loadingStatu import { LoadingStatusKey } from "services/LoadingStatus/loadingStatus.actions"; import { ConsentBannerAndConsentManagement, useConsent } from "hooks/useConsentContext"; -// Only in TypeScript projects -declare module "@codegouvfr/react-dsfr/next-pagesdir" { - interface RegisterLink { - Link: typeof Link; - } -} - const { withDsfr, dsfrDocumentApi } = createNextDsfrIntegrationApi({ defaultColorScheme: "light", Link, diff --git a/client/src/types/react-dsfr.d.ts b/client/src/types/react-dsfr.d.ts new file mode 100644 index 0000000000..477177baaa --- /dev/null +++ b/client/src/types/react-dsfr.d.ts @@ -0,0 +1,8 @@ +// Only in TypeScript projects +import Link from "next/link"; + +declare module "@codegouvfr/react-dsfr/next-pagesdir" { + interface RegisterLink { + Link: typeof Link; + } +} diff --git a/client/src/types/style.d.ts b/client/src/types/style.d.ts deleted file mode 100644 index b728b100ff..0000000000 --- a/client/src/types/style.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -declare module "*.scss"; -declare module "*.svg"; -declare module "*.gif"; -declare module "*.png"; -declare module "*.jpg"; diff --git a/client/tsconfig.json b/client/tsconfig.json index 2a07a2c313..560ed91bd5 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -21,7 +21,6 @@ "noFallthroughCasesInSwitch": true, "baseUrl": "src", "incremental": true, - "plugins": [{ "name": "typescript-plugin-css-modules" }] }, "exclude": ["node_modules"], "include": ["src"] diff --git a/yarn.lock b/yarn.lock index 59e0cf2c66..7f79ddf85d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,11 +7,6 @@ resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz" integrity sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ== -"@adobe/css-tools@~4.3.1": - version "4.3.3" - resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.3.tgz#90749bde8b89cd41764224f5aac29cd4138f75ff" - integrity sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ== - "@algolia/cache-browser-local-storage@4.24.0": version "4.24.0" resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.24.0.tgz#97bc6d067a9fd932b9c922faa6b7fd6e546e1348" @@ -523,7 +518,7 @@ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae" integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A== -"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1": +"@eslint-community/regexpp@^4.6.1": version "4.10.1" resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.1.tgz" integrity sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA== @@ -1487,20 +1482,13 @@ resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.4.tgz#5546813dc4f809884a37d257b254a5ce1b0248d7" integrity sha512-3EtkY5VDkuV2+lNmKlbkibIJxcO4oIHEhBWne6PaAp+76J9KoSsGvNikp6ivzAT8dhhBMYrm6op2pS1ApG0Hzg== -"@next/eslint-plugin-next@14.2.4": - version "14.2.4" - resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.4.tgz#c7f965cb76f0b454e726ef0f69157c4fb4e28f53" - integrity sha512-svSFxW9f3xDaZA3idQmlFw7SusOuWTpDTAeBlO3AEPDltrraV+lqs7mAc6A27YdnpQVVIA3sODqUAAHdWhVWsA== +"@next/eslint-plugin-next@14.2.5", "@next/eslint-plugin-next@^14.2.5": + version "14.2.5" + resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.5.tgz#f7e3ff3efe40a2855e5f29bc2692175f85913ba8" + integrity sha512-LY3btOpPh+OTIpviNojDpUdIbHW9j0JBYBjsIp8IxtDFfYFyORvw3yNq6N231FVqQA7n7lwaf7xHbVJlA1ED7g== dependencies: glob "10.3.10" -"@next/eslint-plugin-next@^13.0.5": - version "13.5.6" - resolved "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.5.6.tgz" - integrity sha512-ng7pU/DDsxPgT6ZPvuprxrkeew3XaRf4LAT4FabaEO/hAbvVx4P7wqnqdbTdDn1kgTvsI4tpIgT4Awn/m0bGbg== - dependencies: - glob "7.1.7" - "@next/swc-darwin-arm64@14.2.4": version "14.2.4" resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz#da9f04c34a3d5f0b8401ed745768420e4a604036" @@ -2121,11 +2109,6 @@ "@types/tough-cookie" "*" parse5 "^7.0.0" -"@types/json-schema@^7.0.9": - version "7.0.15" - resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz" - integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== - "@types/json5@^0.0.29": version "0.0.29" resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz" @@ -2231,20 +2214,6 @@ resolved "https://registry.npmjs.org/@types/password-hash/-/password-hash-1.2.24.tgz" integrity sha512-rdIR0oa8Pd2JP/KZ22UeLD6vrJWfZ2vgSKtWNCFpWtmUu5LR61+0yx051BN7IKpfxDI595jjhLcVBC3rZ2qfeQ== -"@types/postcss-modules-local-by-default@^4.0.2": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@types/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.2.tgz#8fee7513dd1558d74713d817c183a33a6dc583f9" - integrity sha512-CtYCcD+L+trB3reJPny+bKWKMzPfxEyQpKIwit7kErnOexf5/faaGpkFy4I5AwbV4hp1sk7/aTg0tt0B67VkLQ== - dependencies: - postcss "^8.0.0" - -"@types/postcss-modules-scope@^3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@types/postcss-modules-scope/-/postcss-modules-scope-3.0.4.tgz#f82d15ec9023c924b531a49e8087b32646233f41" - integrity sha512-//ygSisVq9kVI0sqx3UPLzWIMCmtSVrzdljtuaAEJtGoGnpjBikZ2sXO5MpH9SnWX9HRfXxHifDAXcQjupWnIQ== - dependencies: - postcss "^8.0.0" - "@types/prop-types@*": version "15.7.12" resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz" @@ -2347,11 +2316,6 @@ "@types/tough-cookie" "*" form-data "^2.5.0" -"@types/semver@^7.3.12": - version "7.5.8" - resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz" - integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== - "@types/send@*": version "0.17.4" resolved "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz" @@ -2459,23 +2423,7 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.10.1": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz" - integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag== - dependencies: - "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/type-utils" "5.62.0" - "@typescript-eslint/utils" "5.62.0" - debug "^4.3.4" - graphemer "^1.4.0" - ignore "^5.2.0" - natural-compare-lite "^1.4.0" - semver "^7.3.7" - tsutils "^3.21.0" - -"@typescript-eslint/eslint-plugin@^7.15.0": +"@typescript-eslint/eslint-plugin@^7.15.0", "@typescript-eslint/eslint-plugin@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.16.0.tgz#b3563927341eca15124a18c6f94215f779f5c02a" integrity sha512-py1miT6iQpJcs1BiJjm54AMzeuMPBSPuKPlnT8HlfudbcS5rYeX5jajpLf3mrdRh9dA/Ec2FVUY0ifeVNDIhZw== @@ -2490,16 +2438,6 @@ natural-compare "^1.4.0" ts-api-utils "^1.3.0" -"@typescript-eslint/parser@^5.10.1": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz" - integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== - dependencies: - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/typescript-estree" "5.62.0" - debug "^4.3.4" - "@typescript-eslint/parser@^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.2.0.tgz#44356312aea8852a3a82deebdacd52ba614ec07a" @@ -2511,7 +2449,7 @@ "@typescript-eslint/visitor-keys" "7.2.0" debug "^4.3.4" -"@typescript-eslint/parser@^7.15.0": +"@typescript-eslint/parser@^7.15.0", "@typescript-eslint/parser@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.16.0.tgz#53fae8112f8c912024aea7b499cf7374487af6d8" integrity sha512-ar9E+k7CU8rWi2e5ErzQiC93KKEFAXA2Kky0scAlPcxYblLt8+XZuHUZwlyfXILyQa95P6lQg+eZgh/dDs3+Vw== @@ -2522,14 +2460,6 @@ "@typescript-eslint/visitor-keys" "7.16.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz" - integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w== - dependencies: - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/visitor-keys" "5.62.0" - "@typescript-eslint/scope-manager@7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.16.0.tgz#eb0757af5720c9c53c8010d7a0355ae27e17b7e5" @@ -2546,16 +2476,6 @@ "@typescript-eslint/types" "7.2.0" "@typescript-eslint/visitor-keys" "7.2.0" -"@typescript-eslint/type-utils@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz" - integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew== - dependencies: - "@typescript-eslint/typescript-estree" "5.62.0" - "@typescript-eslint/utils" "5.62.0" - debug "^4.3.4" - tsutils "^3.21.0" - "@typescript-eslint/type-utils@7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.16.0.tgz#ec52b1932b8fb44a15a3e20208e0bd49d0b6bd00" @@ -2566,11 +2486,6 @@ debug "^4.3.4" ts-api-utils "^1.3.0" -"@typescript-eslint/types@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz" - integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== - "@typescript-eslint/types@7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.16.0.tgz#60a19d7e7a6b1caa2c06fac860829d162a036ed2" @@ -2581,19 +2496,6 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.2.0.tgz#0feb685f16de320e8520f13cca30779c8b7c403f" integrity sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA== -"@typescript-eslint/typescript-estree@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz" - integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA== - dependencies: - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/visitor-keys" "5.62.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - semver "^7.3.7" - tsutils "^3.21.0" - "@typescript-eslint/typescript-estree@7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.0.tgz#98ac779d526fab2a781e5619c9250f3e33867c09" @@ -2622,20 +2524,6 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz" - integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ== - dependencies: - "@eslint-community/eslint-utils" "^4.2.0" - "@types/json-schema" "^7.0.9" - "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/typescript-estree" "5.62.0" - eslint-scope "^5.1.1" - semver "^7.3.7" - "@typescript-eslint/utils@7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.16.0.tgz#b38dc0ce1778e8182e227c98d91d3418449aa17f" @@ -2646,14 +2534,6 @@ "@typescript-eslint/types" "7.16.0" "@typescript-eslint/typescript-estree" "7.16.0" -"@typescript-eslint/visitor-keys@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz" - integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw== - dependencies: - "@typescript-eslint/types" "5.62.0" - eslint-visitor-keys "^3.3.0" - "@typescript-eslint/visitor-keys@7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.0.tgz#a1d99fa7a3787962d6e0efd436575ef840e23b06" @@ -3654,13 +3534,6 @@ cookie@0.6.0: resolved "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz" integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== -copy-anything@^2.0.1: - version "2.0.6" - resolved "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz" - integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw== - dependencies: - is-what "^3.14.1" - copy-to-clipboard@^3.3.1: version "3.3.3" resolved "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz" @@ -3798,11 +3671,6 @@ css.escape@^1.5.1: resolved "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz" integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg== -cssesc@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== - cssom@^0.5.0: version "0.5.0" resolved "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz" @@ -4133,7 +4001,7 @@ domutils@^3.1.0: domelementtype "^2.3.0" domhandler "^5.0.3" -dotenv@^16.4.2, dotenv@^16.4.5: +dotenv@^16.4.5: version "16.4.5" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f" integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== @@ -4240,13 +4108,6 @@ err-code@^2.0.2: resolved "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz" integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== -errno@^0.1.1: - version "0.1.8" - resolved "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz" - integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== - dependencies: - prr "~1.0.1" - error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.2" resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz" @@ -4433,12 +4294,12 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-config-next@^14.2.4: - version "14.2.4" - resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.4.tgz#eb0bedfe4a894bc2aea918214bb5243ee4fa7d4b" - integrity sha512-Qr0wMgG9m6m4uYy2jrYJmyuNlYZzPRQq5Kvb9IDlYwn+7yq6W6sfMNFgb+9guM1KYwuIo6TIaiFhZJ6SnQ/Efw== +eslint-config-next@^14.2.5: + version "14.2.5" + resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.5.tgz#cdd43d89047eb7391ba25445d5855b4600b6adb9" + integrity sha512-zogs9zlOiZ7ka+wgUnmcM0KBEDjo4Jis7kxN1jvC0N4wynQ2MIx/KBkg4mVF63J5EK4W0QMCn7xO3vNisjaAoA== dependencies: - "@next/eslint-plugin-next" "14.2.4" + "@next/eslint-plugin-next" "14.2.5" "@rushstack/eslint-patch" "^1.3.3" "@typescript-eslint/parser" "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0" eslint-import-resolver-node "^0.3.6" @@ -4551,14 +4412,6 @@ eslint-plugin-react@^7.33.2: semver "^6.3.1" string.prototype.matchall "^4.0.11" -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - eslint-scope@^7.2.2: version "7.2.2" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz" @@ -4644,11 +4497,6 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: version "5.3.0" resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz" @@ -5148,18 +4996,6 @@ glob@10.3.10: minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-scurry "^1.10.1" -glob@7.1.7: - version "7.1.7" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^10.3.10: version "10.4.2" resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.2.tgz#bed6b95dade5c1f80b4434daced233aee76160e5" @@ -5172,7 +5008,7 @@ glob@^10.3.10: package-json-from-dist "^1.0.0" path-scurry "^1.11.1" -glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.1.3, glob@^7.1.4: version "7.2.3" resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -5538,18 +5374,13 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@0.6.3, iconv-lite@^0.6.3: +iconv-lite@0.6.3: version "0.6.3" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -icss-utils@^5.0.0, icss-utils@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== - ieee754@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz" @@ -5565,11 +5396,6 @@ ignore@^5.2.0, ignore@^5.3.1: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== -image-size@~0.5.0: - version "0.5.5" - resolved "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz" - integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ== - immutable@^4.0.0, immutable@^4.3.4: version "4.3.6" resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz" @@ -5905,11 +5731,6 @@ is-weakset@^2.0.3: call-bind "^1.0.7" get-intrinsic "^1.2.4" -is-what@^3.14.1: - version "3.14.1" - resolved "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz" - integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA== - is-what@^4.1.8: version "4.1.16" resolved "https://registry.yarnpkg.com/is-what/-/is-what-4.1.16.tgz#1ad860a19da8b4895ad5495da3182ce2acdd7a6f" @@ -6681,23 +6502,6 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -less@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/less/-/less-4.2.0.tgz#cbefbfaa14a4cd388e2099b2b51f956e1465c450" - integrity sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA== - dependencies: - copy-anything "^2.0.1" - parse-node-version "^1.0.1" - tslib "^2.3.0" - optionalDependencies: - errno "^0.1.1" - graceful-fs "^4.1.2" - image-size "~0.5.0" - make-dir "^2.1.0" - mime "^1.4.1" - needle "^3.1.0" - source-map "~0.6.0" - leven@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz" @@ -6716,11 +6520,6 @@ lexical@0.16.1, lexical@^0.16.1: resolved "https://registry.yarnpkg.com/lexical/-/lexical-0.16.1.tgz#1d2cd3f364224889caa2939df179434af936283b" integrity sha512-+R05d3+N945OY8pTUjTqQrWoApjC+ctzvjnmNETtx9WmVAaiW0tQVG+AYLt5pDGY8dQXtd4RPorvnxBTECt9SA== -lilconfig@^2.0.5: - version "2.1.0" - resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz" - integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== - lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz" @@ -6875,14 +6674,6 @@ lz-string@^1.5.0: resolved "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz" integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ== -make-dir@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz" - integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== - dependencies: - pify "^4.0.1" - semver "^5.6.0" - make-dir@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz" @@ -6976,7 +6767,7 @@ mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: dependencies: mime-db "1.52.0" -mime@1.6.0, mime@^1.4.1: +mime@1.6.0: version "1.6.0" resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== @@ -7162,24 +6953,11 @@ nanoid@^3.3.6, nanoid@^3.3.7: resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== -natural-compare-lite@^1.4.0: - version "1.4.0" - resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz" - integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g== - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== -needle@^3.1.0: - version "3.3.1" - resolved "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz" - integrity sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q== - dependencies: - iconv-lite "^0.6.3" - sax "^1.2.4" - negotiator@0.6.3: version "0.6.3" resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" @@ -7541,11 +7319,6 @@ parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-node-version@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz" - integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== - parse5-htmlparser2-tree-adapter@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz" @@ -7656,11 +7429,6 @@ pify@^2.0.0: resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== -pify@^4.0.1: - version "4.0.1" - resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz" - integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== - pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" @@ -7695,44 +7463,7 @@ possible-typed-array-names@^1.0.0: resolved "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz" integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== -postcss-load-config@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" - integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== - dependencies: - lilconfig "^2.0.5" - yaml "^1.10.2" - -postcss-modules-extract-imports@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz#b4497cb85a9c0c4b5aabeb759bb25e8d89f15002" - integrity sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q== - -postcss-modules-local-by-default@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz#f1b9bd757a8edf4d8556e8d0f4f894260e3df78f" - integrity sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw== - dependencies: - icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" - -postcss-modules-scope@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz#a43d28289a169ce2c15c00c4e64c0858e43457d5" - integrity sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ== - dependencies: - postcss-selector-parser "^6.0.4" - -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.1.0" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz#49694cb4e7c649299fea510a29fa6577104bcf53" - integrity sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: +postcss-value-parser@^4.0.2: version "4.2.0" resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== @@ -7755,7 +7486,7 @@ postcss@8.4.38: picocolors "^1.0.0" source-map-js "^1.2.0" -postcss@^8.0.0, postcss@^8.4.35, postcss@^8.4.5: +postcss@^8.4.5: version "8.4.39" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.39.tgz#aa3c94998b61d3a9c259efa51db4b392e1bde0e3" integrity sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw== @@ -7865,11 +7596,6 @@ proxy-from-env@^1.1.0: resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== -prr@~1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz" - integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw== - pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz" @@ -8456,11 +8182,6 @@ requires-port@^1.0.0: resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz" integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== -reserved-words@^0.1.2: - version "0.1.2" - resolved "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz" - integrity sha512-0S5SrIUJ9LfpbVl4Yzij6VipUdafHrOTzvmfazSw/jeZrZtQK303OPZW+obtkaw7jQlTQppy0UvZWm9872PbRw== - resize-observer-polyfill@^1.5.1: version "1.5.1" resolved "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz" @@ -8618,25 +8339,6 @@ sass@^1.57.1: immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" -sass@^1.70.0: - version "1.77.6" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.6.tgz#898845c1348078c2e6d1b64f9ee06b3f8bd489e4" - integrity sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q== - dependencies: - chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" - source-map-js ">=0.6.2 <2.0.0" - -sax@^1.2.4: - version "1.4.1" - resolved "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz" - integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== - -sax@~1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0" - integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA== - saxes@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz" @@ -8666,12 +8368,12 @@ section-iterator@^2.0.0: resolved "https://registry.npmjs.org/section-iterator/-/section-iterator-2.0.0.tgz" integrity sha512-xvTNwcbeDayXotnV32zLb3duQsP+4XosHpb/F+tu6VzEZFmIjzPdNk6/O+QOOx5XTh08KL2ufdXeCO33p380pQ== -"semver@2 || 3 || 4 || 5", semver@^5.6.0: +"semver@2 || 3 || 4 || 5": version "5.7.2" resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@7.x, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2: +semver@7.x, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2: version "7.6.2" resolved "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz" integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== @@ -8905,16 +8607,11 @@ source-map@0.5.6: resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA== -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.3: - version "0.7.4" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== - sparse-bitfield@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11" @@ -9254,17 +8951,6 @@ stylis@4.3.2, stylis@^4.3.0: resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz" integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg== -stylus@^0.62.0: - version "0.62.0" - resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.62.0.tgz#648a020e2bf90ed87587ab9c2f012757e977bb5d" - integrity sha512-v3YCf31atbwJQIMtPNX8hcQ+okD4NQaTuKGUWfII8eaqn+3otrbttGL1zSMZAAtiPsBztQnujVBugg/cXFUpyg== - dependencies: - "@adobe/css-tools" "~4.3.1" - debug "^4.3.2" - glob "^7.1.6" - sax "~1.3.0" - source-map "^0.7.3" - supercluster@^8.0.1: version "8.0.1" resolved "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz" @@ -9551,12 +9237,7 @@ tslib@2.6.2: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== -tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.3: +tslib@^2.1.0, tslib@^2.2.0, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.3: version "2.6.3" resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz" integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== @@ -9569,13 +9250,6 @@ tsoa@^6.3.1: "@tsoa/cli" "^6.3.1" "@tsoa/runtime" "^6.3.0" -tsutils@^3.21.0: - version "3.21.0" - resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz" - integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== - dependencies: - tslib "^1.8.1" - tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz" @@ -9692,28 +9366,6 @@ typescript-logic@^0.0.0: resolved "https://registry.npmjs.org/typescript-logic/-/typescript-logic-0.0.0.tgz" integrity sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q== -typescript-plugin-css-modules@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/typescript-plugin-css-modules/-/typescript-plugin-css-modules-5.1.0.tgz#faa0ceffe8a8ffcbbc2f77ed637a64464195044a" - integrity sha512-6h+sLBa4l+XYSTn/31vZHd/1c3SvAbLpobY6FxDiUOHJQG1eD9Gh3eCs12+Eqc+TCOAdxcO+zAPvUq0jBfdciw== - dependencies: - "@types/postcss-modules-local-by-default" "^4.0.2" - "@types/postcss-modules-scope" "^3.0.4" - dotenv "^16.4.2" - icss-utils "^5.1.0" - less "^4.2.0" - lodash.camelcase "^4.3.0" - postcss "^8.4.35" - postcss-load-config "^3.1.4" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.4" - postcss-modules-scope "^3.1.1" - reserved-words "^0.1.2" - sass "^1.70.0" - source-map-js "^1.0.2" - stylus "^0.62.0" - tsconfig-paths "^4.2.0" - typescript-tuple@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/typescript-tuple/-/typescript-tuple-2.2.1.tgz" @@ -9816,7 +9468,7 @@ use-sync-external-store@^1.0.0: resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz" integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw== -util-deprecate@^1.0.1, util-deprecate@^1.0.2: +util-deprecate@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== @@ -10170,11 +9822,6 @@ yallist@^3.0.2: resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== -yaml@^1.10.2: - version "1.10.2" - resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== - yaml@^2.4.1: version "2.4.5" resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.5.tgz#60630b206dd6d84df97003d33fc1ddf6296cca5e" From 7828ed1fa756191ab78acaa6aa448c644b2ad81b Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Thu, 11 Jul 2024 09:37:11 +0200 Subject: [PATCH 12/37] chore(client): :rotating_light: Fix linting issues related to useEffect dependencies --- client/src/components/Backend/screens/Dashboard/Dashboard.tsx | 2 +- .../Backend/screens/UserContributions/UserContributions.tsx | 2 +- .../Backend/screens/UserStructure/UserStructure.component.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/components/Backend/screens/Dashboard/Dashboard.tsx b/client/src/components/Backend/screens/Dashboard/Dashboard.tsx index f628c935b2..ce0c732127 100644 --- a/client/src/components/Backend/screens/Dashboard/Dashboard.tsx +++ b/client/src/components/Backend/screens/Dashboard/Dashboard.tsx @@ -108,7 +108,7 @@ const Dashboard = (props: Props) => { } Promise.all(promises).finally(() => setLoaded(true)); } - }, [loaded, props.visible]); + }, [loaded, props.visible, themes]); const toggleNoGeolocModal = () => setShowNoGeolocModal(!showNoGeolocModal); diff --git a/client/src/components/Backend/screens/UserContributions/UserContributions.tsx b/client/src/components/Backend/screens/UserContributions/UserContributions.tsx index c52de8f9c3..d67b6db6a7 100644 --- a/client/src/components/Backend/screens/UserContributions/UserContributions.tsx +++ b/client/src/components/Backend/screens/UserContributions/UserContributions.tsx @@ -84,7 +84,7 @@ const UserContributions = (props: Props) => { ); } window.scrollTo(0, 0); - }, [dispatch]); + }, [dispatch, userStructure]); const { user } = useUser(); const contributions = formatContributions( diff --git a/client/src/components/Backend/screens/UserStructure/UserStructure.component.tsx b/client/src/components/Backend/screens/UserStructure/UserStructure.component.tsx index 13fc59c710..46588892df 100644 --- a/client/src/components/Backend/screens/UserStructure/UserStructure.component.tsx +++ b/client/src/components/Backend/screens/UserStructure/UserStructure.component.tsx @@ -56,7 +56,7 @@ export const UserStructureComponent = (props: Props) => { ); } window.scrollTo(0, 0); - }, [dispatch]); + }, [dispatch, userStructure]); const isLoadingFetch = useSelector(isLoadingSelector(LoadingStatusKey.FETCH_USER_STRUCTURE)); const isLoadingUpdate = useSelector(isLoadingSelector(LoadingStatusKey.UPDATE_USER_STRUCTURE)); From 8e4ec313473dbf5a86d40ea832ac7c53bcd4d19c Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Thu, 11 Jul 2024 09:44:55 +0200 Subject: [PATCH 13/37] build(client): :green_heart: Bring back typescript module declarations for image files --- client/src/types/images.d.ts | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 client/src/types/images.d.ts diff --git a/client/src/types/images.d.ts b/client/src/types/images.d.ts new file mode 100644 index 0000000000..1020b54538 --- /dev/null +++ b/client/src/types/images.d.ts @@ -0,0 +1,4 @@ +declare module "*.gif"; +declare module "*.jpg"; +declare module "*.png"; +declare module "*.svg"; From ce651dcbea4d3f44f738fcaa5ccccb6e99d79d45 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Thu, 11 Jul 2024 09:45:40 +0200 Subject: [PATCH 14/37] chore: :arrow_up: upgrade client and server patch dependencies --- client/package.json | 4 +- server/package.json | 4 +- yarn.lock | 164 ++++++++++++++++++++++++-------------------- 3 files changed, 92 insertions(+), 80 deletions(-) diff --git a/client/package.json b/client/package.json index e92758d06c..62e1070446 100644 --- a/client/package.json +++ b/client/package.json @@ -12,7 +12,7 @@ "url": "git@github.com:entrepreneur-interet-general/karfur.git" }, "dependencies": { - "@codegouvfr/react-dsfr": "^1.9.11", + "@codegouvfr/react-dsfr": "^1.9.25", "@hedgedoc/html-to-react": "^2.1.1", "@lexical/react": "^0.16.1", "@react-google-maps/api": "^2.17.0", @@ -31,7 +31,7 @@ "lexical": "^0.16.1", "lodash": "^4.17.21", "moment": "^2.29.4", - "next": "^14.2.4", + "next": "^14.2.5", "next-i18next": "^15.3.0", "next-redux-wrapper": "^8.0.0", "next-sitemap": "^3.1.32", diff --git a/server/package.json b/server/package.json index 3e7e878381..64e768601c 100644 --- a/server/package.json +++ b/server/package.json @@ -49,7 +49,7 @@ "twilio": "^5.2.0", "uniqid": "^5.0.3", "uuid": "^10.0.0", - "winston": "^3.2.1" + "winston": "^3.13.1" }, "devDependencies": { "@types/compression": "^1.7.2", @@ -70,7 +70,7 @@ "mockdate": "^3.0.5", "mongodb": "^6.5.0", "nodemon": "^3.1.0", - "ts-jest": "^29.1.1", + "ts-jest": "^29.2.2", "tsconfig-paths": "^4.2.0", "typescript": "^5.5.3" }, diff --git a/yarn.lock b/yarn.lock index 7f79ddf85d..0817406a24 100644 --- a/yarn.lock +++ b/yarn.lock @@ -448,10 +448,10 @@ resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@codegouvfr/react-dsfr@^1.9.11": - version "1.9.23" - resolved "https://registry.yarnpkg.com/@codegouvfr/react-dsfr/-/react-dsfr-1.9.23.tgz#a7892212f3b7f1b6c94f05e65ac5311cc4b15f87" - integrity sha512-afdSWAYpKqpLyI48m8wg6dJIJWMWtH1POFF5EwDoXOxchzIaJtaur2FPZxd0Q6HLWazp/L36j+ic0B50RN/y6w== +"@codegouvfr/react-dsfr@^1.9.25": + version "1.9.25" + resolved "https://registry.yarnpkg.com/@codegouvfr/react-dsfr/-/react-dsfr-1.9.25.tgz#5288370d0a58721a3edf62e1e8232131ca02bc76" + integrity sha512-ikZNn2bT7KEtN5DBHkOIH7z5OubJTI6g069mh5CnlpZx19gIMMEYtJ/V2y+WbDmNlARZwxmuPbzfXeoBRY117g== dependencies: tsafe "^1.6.3" yargs-parser "^21.1.1" @@ -1477,10 +1477,10 @@ dependencies: sparse-bitfield "^3.0.3" -"@next/env@14.2.4": - version "14.2.4" - resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.4.tgz#5546813dc4f809884a37d257b254a5ce1b0248d7" - integrity sha512-3EtkY5VDkuV2+lNmKlbkibIJxcO4oIHEhBWne6PaAp+76J9KoSsGvNikp6ivzAT8dhhBMYrm6op2pS1ApG0Hzg== +"@next/env@14.2.5": + version "14.2.5" + resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.5.tgz#1d9328ab828711d3517d0a1d505acb55e5ef7ad0" + integrity sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA== "@next/eslint-plugin-next@14.2.5", "@next/eslint-plugin-next@^14.2.5": version "14.2.5" @@ -1489,50 +1489,50 @@ dependencies: glob "10.3.10" -"@next/swc-darwin-arm64@14.2.4": - version "14.2.4" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz#da9f04c34a3d5f0b8401ed745768420e4a604036" - integrity sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg== - -"@next/swc-darwin-x64@14.2.4": - version "14.2.4" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.4.tgz#46dedb29ec5503bf171a72a3ecb8aac6e738e9d6" - integrity sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg== - -"@next/swc-linux-arm64-gnu@14.2.4": - version "14.2.4" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.4.tgz#c9697ab9eb422bd1d7ffd0eb0779cc2aefa9d4a1" - integrity sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ== - -"@next/swc-linux-arm64-musl@14.2.4": - version "14.2.4" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.4.tgz#cbbceb2008571c743b5a310a488d2e166d200a75" - integrity sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A== - -"@next/swc-linux-x64-gnu@14.2.4": - version "14.2.4" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.4.tgz#d79184223f857bacffb92f643cb2943a43632568" - integrity sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q== - -"@next/swc-linux-x64-musl@14.2.4": - version "14.2.4" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.4.tgz#6b6c3e5ac02ca5e63394d280ec8ee607491902df" - integrity sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ== - -"@next/swc-win32-arm64-msvc@14.2.4": - version "14.2.4" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.4.tgz#dbad3906e870dba84c5883d9d4c4838472e0697f" - integrity sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A== - -"@next/swc-win32-ia32-msvc@14.2.4": - version "14.2.4" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.4.tgz#6074529b91ba49132922ce89a2e16d25d2ec235d" - integrity sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag== - -"@next/swc-win32-x64-msvc@14.2.4": - version "14.2.4" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.4.tgz#e65a1c6539a671f97bb86d5183d6e3a1733c29c7" - integrity sha512-tkLrjBzqFTP8DVrAAQmZelEahfR9OxWpFR++vAI9FBhCiIxtwHwBHC23SBHCTURBtwB4kc/x44imVOnkKGNVGg== +"@next/swc-darwin-arm64@14.2.5": + version "14.2.5" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.5.tgz#d0a160cf78c18731c51cc0bff131c706b3e9bb05" + integrity sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ== + +"@next/swc-darwin-x64@14.2.5": + version "14.2.5" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.5.tgz#eb832a992407f6e6352eed05a073379f1ce0589c" + integrity sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA== + +"@next/swc-linux-arm64-gnu@14.2.5": + version "14.2.5" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.5.tgz#098fdab57a4664969bc905f5801ef5a89582c689" + integrity sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA== + +"@next/swc-linux-arm64-musl@14.2.5": + version "14.2.5" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.5.tgz#243a1cc1087fb75481726dd289c7b219fa01f2b5" + integrity sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA== + +"@next/swc-linux-x64-gnu@14.2.5": + version "14.2.5" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.5.tgz#b8a2e436387ee4a52aa9719b718992e0330c4953" + integrity sha512-8XFikMSxWleYNryWIjiCX+gU201YS+erTUidKdyOVYi5qUQo/gRxv/3N1oZFCgqpesN6FPeqGM72Zve+nReVXQ== + +"@next/swc-linux-x64-musl@14.2.5": + version "14.2.5" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.5.tgz#cb8a9adad5fb8df86112cfbd363aab5c6d32757b" + integrity sha512-6QLwi7RaYiQDcRDSU/os40r5o06b5ue7Jsk5JgdRBGGp8l37RZEh9JsLSM8QF0YDsgcosSeHjglgqi25+m04IQ== + +"@next/swc-win32-arm64-msvc@14.2.5": + version "14.2.5" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.5.tgz#81f996c1c38ea0900d4e7719cc8814be8a835da0" + integrity sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw== + +"@next/swc-win32-ia32-msvc@14.2.5": + version "14.2.5" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.5.tgz#f61c74ce823e10b2bc150e648fc192a7056422e0" + integrity sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg== + +"@next/swc-win32-x64-msvc@14.2.5": + version "14.2.5" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.5.tgz#ed199a920efb510cfe941cd75ed38a7be21e756f" + integrity sha512-tEQ7oinq1/CjSG9uSTerca3v4AZ+dFa+4Yu6ihaG8Ud8ddqLQgFGcnwYls13H5X5CPDPZJdYxyeMui6muOLd4g== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -6620,7 +6620,7 @@ lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3: resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -logform@^2.3.2, logform@^2.4.0: +logform@^2.3.2: version "2.6.0" resolved "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz" integrity sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ== @@ -6632,6 +6632,18 @@ logform@^2.3.2, logform@^2.4.0: safe-stable-stringify "^2.3.1" triple-beam "^1.3.0" +logform@^2.6.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.1.tgz#71403a7d8cae04b2b734147963236205db9b3df0" + integrity sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA== + dependencies: + "@colors/colors" "1.6.0" + "@types/triple-beam" "^1.3.2" + fecha "^4.2.0" + ms "^2.1.1" + safe-stable-stringify "^2.3.1" + triple-beam "^1.3.0" + loglevel@^1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.1.tgz#d63976ac9bcd03c7c873116d41c2a85bafff1be7" @@ -6997,12 +7009,12 @@ next-sitemap@^3.1.32: "@corex/deepmerge" "^4.0.29" minimist "^1.2.7" -next@^14.2.4: - version "14.2.4" - resolved "https://registry.yarnpkg.com/next/-/next-14.2.4.tgz#ef66c39c71e2d8ad0a3caa0383c8933f4663e4d1" - integrity sha512-R8/V7vugY+822rsQGQCjoLhMuC9oFj9SOi4Cl4b2wjDrseD0LRZ10W7R6Czo4w9ZznVSshKjuIomsRjvm9EKJQ== +next@^14.2.5: + version "14.2.5" + resolved "https://registry.yarnpkg.com/next/-/next-14.2.5.tgz#afe4022bb0b752962e2205836587a289270efbea" + integrity sha512-0f8aRfBVL+mpzfBjYfQuLWh2WyAwtJXCRfkPF4UJ5qd2YwrHczsrSzXU4tRMV0OAxR8ZJZWPFn6uhSC56UTsLA== dependencies: - "@next/env" "14.2.4" + "@next/env" "14.2.5" "@swc/helpers" "0.5.5" busboy "1.6.0" caniuse-lite "^1.0.30001579" @@ -7010,15 +7022,15 @@ next@^14.2.4: postcss "8.4.31" styled-jsx "5.1.1" optionalDependencies: - "@next/swc-darwin-arm64" "14.2.4" - "@next/swc-darwin-x64" "14.2.4" - "@next/swc-linux-arm64-gnu" "14.2.4" - "@next/swc-linux-arm64-musl" "14.2.4" - "@next/swc-linux-x64-gnu" "14.2.4" - "@next/swc-linux-x64-musl" "14.2.4" - "@next/swc-win32-arm64-msvc" "14.2.4" - "@next/swc-win32-ia32-msvc" "14.2.4" - "@next/swc-win32-x64-msvc" "14.2.4" + "@next/swc-darwin-arm64" "14.2.5" + "@next/swc-darwin-x64" "14.2.5" + "@next/swc-linux-arm64-gnu" "14.2.5" + "@next/swc-linux-arm64-musl" "14.2.5" + "@next/swc-linux-x64-gnu" "14.2.5" + "@next/swc-linux-x64-musl" "14.2.5" + "@next/swc-win32-arm64-msvc" "14.2.5" + "@next/swc-win32-ia32-msvc" "14.2.5" + "@next/swc-win32-x64-msvc" "14.2.5" node-cache@^5.1.2: version "5.1.2" @@ -9174,10 +9186,10 @@ ts-jest@29.0.3: semver "7.x" yargs-parser "^21.0.1" -ts-jest@^29.1.1: - version "29.2.1" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.1.tgz#9a460bb27446d141c48a17cf24f060dbe9b58254" - integrity sha512-7obwtH5gw0b0XZi0wmprCSvGSvHliMBI47lPnU47vmbxWS6B+v1X94yWFo1f1vt9k/he+gttsrXjkxmgY41XNQ== +ts-jest@^29.2.2: + version "29.2.2" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.2.tgz#0d2387bb04d39174b20a05172a968f258aedff4d" + integrity sha512-sSW7OooaKT34AAngP6k1VS669a0HdLxkQZnlC7T76sckGCokXFnvJ3yRlQZGRTAoV5K19HfSgCiSwWOSIfcYlg== dependencies: bs-logger "0.x" ejs "^3.0.0" @@ -9702,16 +9714,16 @@ winston-transport@^4.7.0: readable-stream "^3.6.0" triple-beam "^1.3.0" -winston@^3.2.1: - version "3.13.0" - resolved "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz" - integrity sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ== +winston@^3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.13.1.tgz#53ddadb9c2332eb12cff8306413b3480dc82b6c3" + integrity sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw== dependencies: "@colors/colors" "^1.6.0" "@dabh/diagnostics" "^2.0.2" async "^3.2.3" is-stream "^2.0.0" - logform "^2.4.0" + logform "^2.6.0" one-time "^1.0.0" readable-stream "^3.4.0" safe-stable-stringify "^2.3.1" From e2c13cf4aa16e7f802d37b2d1c7cbfc5ad31315c Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Thu, 11 Jul 2024 09:57:16 +0200 Subject: [PATCH 15/37] chore: :arrow_up: Upgrade minor dependencies --- client/package.json | 4 ++-- yarn.lock | 36 +++++++++++------------------------- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/client/package.json b/client/package.json index 62e1070446..18a6f800e3 100644 --- a/client/package.json +++ b/client/package.json @@ -49,7 +49,7 @@ "react-google-autocomplete": "^2.6.1", "react-hook-form": "^7.43.1", "react-i18next": "^14.1.2", - "react-intersection-observer": "^9.4.1", + "react-intersection-observer": "^9.11.0", "react-loading-skeleton": "^3.1.0", "react-notifications": "^1.7.3", "react-redux": "^9.1.2", @@ -133,7 +133,7 @@ "redux-mock-store": "^1.5.4", "redux-saga-test-plan": "^4.0.0-rc.3", "sass": "^1.57.1", - "ts-jest": "29.0.3", + "ts-jest": "29.2.2", "typescript": "^5.5.3" }, "volta": { diff --git a/yarn.lock b/yarn.lock index 0817406a24..386f218b44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6362,7 +6362,7 @@ json5@^1.0.2: dependencies: minimist "^1.2.0" -json5@^2.2.1, json5@^2.2.2, json5@^2.2.3: +json5@^2.2.2, json5@^2.2.3: version "2.2.3" resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -7847,10 +7847,10 @@ react-i18next@^14.1.2: "@babel/runtime" "^7.23.9" html-parse-stringify "^3.0.1" -react-intersection-observer@^9.4.1: - version "9.10.3" - resolved "https://registry.npmjs.org/react-intersection-observer/-/react-intersection-observer-9.10.3.tgz" - integrity sha512-9NYfKwPZRovB6QJee7fDg0zz/SyYrqXtn5xTZU0vwLtLVBtfu9aZt1pVmr825REE49VPDZ7Lm5SNHjJBOTZHpA== +react-intersection-observer@^9.11.0: + version "9.11.0" + resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-9.11.0.tgz#f9e271ceb09391dcb612eeeb9dd564889f8e005c" + integrity sha512-fIaYm1nN7FGa4Lpa+sIf8YZWPGbYvctAHQWFjWMv+z+MSMiq9gfPkHLtCglyiPMpaH49ZgGxXuH+THCGcHX75Q== react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" @@ -8385,16 +8385,16 @@ section-iterator@^2.0.0: resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@7.x, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2: - version "7.6.2" - resolved "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz" - integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== - semver@^6.3.0, semver@^6.3.1: version "6.3.1" resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== +semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2: + version "7.6.2" + resolved "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz" + integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== + send@0.18.0: version "0.18.0" resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz" @@ -9172,21 +9172,7 @@ ts-easing@^0.2.0: resolved "https://registry.npmjs.org/ts-easing/-/ts-easing-0.2.0.tgz" integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ== -ts-jest@29.0.3: - version "29.0.3" - resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-29.0.3.tgz" - integrity sha512-Ibygvmuyq1qp/z3yTh9QTwVVAbFdDy/+4BtIQR2sp6baF2SJU/8CKK/hhnGIDY2L90Az2jIqTwZPnN2p+BweiQ== - dependencies: - bs-logger "0.x" - fast-json-stable-stringify "2.x" - jest-util "^29.0.0" - json5 "^2.2.1" - lodash.memoize "4.x" - make-error "1.x" - semver "7.x" - yargs-parser "^21.0.1" - -ts-jest@^29.2.2: +ts-jest@29.2.2, ts-jest@^29.2.2: version "29.2.2" resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.2.tgz#0d2387bb04d39174b20a05172a968f258aedff4d" integrity sha512-sSW7OooaKT34AAngP6k1VS669a0HdLxkQZnlC7T76sckGCokXFnvJ3yRlQZGRTAoV5K19HfSgCiSwWOSIfcYlg== From b9621bbb36b82ff921090bb435f0a8ba66ab2587 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Thu, 11 Jul 2024 10:16:49 +0200 Subject: [PATCH 16/37] chore: :arrow_up: Upgrade testing library dependencies --- client/package.json | 11 ++- server/package.json | 2 +- yarn.lock | 224 +++++++++++++++----------------------------- 3 files changed, 82 insertions(+), 155 deletions(-) diff --git a/client/package.json b/client/package.json index 18a6f800e3..a2d8c0bb8c 100644 --- a/client/package.json +++ b/client/package.json @@ -97,8 +97,9 @@ "devDependencies": { "@next/eslint-plugin-next": "^14.2.5", "@redux-devtools/extension": "^3.2.1", - "@testing-library/jest-dom": "^5.16.2", - "@testing-library/react": "^13.4.0", + "@testing-library/dom": "^10.3.1", + "@testing-library/jest-dom": "^6.4.6", + "@testing-library/react": "^16.0.0", "@types/autosuggest-highlight": "^3.2.0", "@types/file-saver": "^2.0.1", "@types/html-to-draftjs": "^1.4.0", @@ -108,14 +109,14 @@ "@types/react": "^18.3.3", "@types/react-autosuggest": "^10.1.5", "@types/react-dom": "^18.3.0", - "@types/react-highlight-words": "^0.16.4", + "@types/react-highlight-words": "^0.20.0", "@types/react-router-hash-link": "^2.4.5", "@types/react-test-renderer": "^18.0.0", "@types/recompose": "^0.30.7", "@types/redux-mock-store": "^1.0.3", "@types/sortablejs": "^1.13.0", "@types/styled-components": "^5.1.1", - "@types/uuid": "^9.0.1", + "@types/uuid": "^10.0.0", "@types/webrtc": "^0.0.43", "@typescript-eslint/eslint-plugin": "^7.16.0", "@typescript-eslint/parser": "^7.16.0", @@ -126,7 +127,7 @@ "jest-environment-jsdom": "^29.3.1", "jest-mock-axios": "^4.7.0-beta2", "jest-styled-components": "^7.0.0", - "next-router-mock": "^0.8.0", + "next-router-mock": "^0.9.13", "papaparse": "^5.3.0", "postcss": "^8.4.5", "react-test-renderer": "^18.2.0", diff --git a/server/package.json b/server/package.json index 64e768601c..dd60d6b729 100644 --- a/server/package.json +++ b/server/package.json @@ -64,7 +64,7 @@ "@types/uniqid": "^5.3.0", "@typescript-eslint/eslint-plugin": "^7.15.0", "@typescript-eslint/parser": "^7.15.0", - "concurrently": "^7.6.0", + "concurrently": "^8.2.2", "eslint": "^8.57.0", "jest": "^29.7.0", "mockdate": "^3.0.5", diff --git a/yarn.lock b/yarn.lock index 386f218b44..1406d51711 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@adobe/css-tools@^4.0.1": +"@adobe/css-tools@^4.0.1", "@adobe/css-tools@^4.4.0": version "4.4.0" resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz" integrity sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ== @@ -1776,43 +1776,40 @@ "@swc/counter" "^0.1.3" tslib "^2.4.0" -"@testing-library/dom@^8.5.0": - version "8.20.1" - resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz" - integrity sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g== +"@testing-library/dom@^10.3.1": + version "10.3.1" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.3.1.tgz#c960204cce7e969ac03ae5f3550e420226c61a21" + integrity sha512-q/WL+vlXMpC0uXDyfsMtc1rmotzLV8Y0gq6q1gfrrDjQeHoeLrqHbxdPvPNAh1i+xuJl7+BezywcXArz7vLqKQ== dependencies: "@babel/code-frame" "^7.10.4" "@babel/runtime" "^7.12.5" "@types/aria-query" "^5.0.1" - aria-query "5.1.3" + aria-query "5.3.0" chalk "^4.1.0" dom-accessibility-api "^0.5.9" lz-string "^1.5.0" pretty-format "^27.0.2" -"@testing-library/jest-dom@^5.16.2": - version "5.17.0" - resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz" - integrity sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg== +"@testing-library/jest-dom@^6.4.6": + version "6.4.6" + resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-6.4.6.tgz#ec1df8108651bed5475534955565bed88c6732ce" + integrity sha512-8qpnGVincVDLEcQXWaHOf6zmlbwTKc6Us6PPu4CRnPXCzo2OGBS5cwgMMOWdxDpEz1mkbvXHpEy99M5Yvt682w== dependencies: - "@adobe/css-tools" "^4.0.1" + "@adobe/css-tools" "^4.4.0" "@babel/runtime" "^7.9.2" - "@types/testing-library__jest-dom" "^5.9.1" aria-query "^5.0.0" chalk "^3.0.0" css.escape "^1.5.1" - dom-accessibility-api "^0.5.6" - lodash "^4.17.15" + dom-accessibility-api "^0.6.3" + lodash "^4.17.21" redent "^3.0.0" -"@testing-library/react@^13.4.0": - version "13.4.0" - resolved "https://registry.npmjs.org/@testing-library/react/-/react-13.4.0.tgz" - integrity sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw== +"@testing-library/react@^16.0.0": + version "16.0.0" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-16.0.0.tgz#0a1e0c7a3de25841c3591b8cb7fb0cf0c0a27321" + integrity sha512-guuxUKRWQ+FgNX0h0NS0FIq3Q3uLtWVpBzcLOggmfMoUpgBnzBzvLLd4fbm6yS8ydJd94cIfY4yP9qUQjM2KwQ== dependencies: "@babel/runtime" "^7.12.5" - "@testing-library/dom" "^8.5.0" - "@types/react-dom" "^18.0.0" "@tootallnate/once@2": version "2.0.0" @@ -1890,7 +1887,7 @@ "@types/aria-query@^5.0.1": version "5.0.4" - resolved "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz" + resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.4.tgz#1a31c3d378850d2778dabb6374d036dcba4ba708" integrity sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw== "@types/autosuggest-highlight@^3.2.0": @@ -2087,7 +2084,7 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@*", "@types/jest@^29.2.3", "@types/jest@^29.5.12": +"@types/jest@^29.2.3", "@types/jest@^29.5.12": version "29.5.12" resolved "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz" integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw== @@ -2236,17 +2233,17 @@ dependencies: "@types/react" "*" -"@types/react-dom@^18.0.0", "@types/react-dom@^18.3.0": +"@types/react-dom@^18.3.0": version "18.3.0" resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz" integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg== dependencies: "@types/react" "*" -"@types/react-highlight-words@^0.16.4": - version "0.16.7" - resolved "https://registry.npmjs.org/@types/react-highlight-words/-/react-highlight-words-0.16.7.tgz" - integrity sha512-+upXTIaRd3rGvh1aDQSs9z5X+sV3UM6Jrmjk03GN2GXl4v/+iOJKQj2LZHo6Vp2IoTvMdtxgME26feqo12xXLg== +"@types/react-highlight-words@^0.20.0": + version "0.20.0" + resolved "https://registry.yarnpkg.com/@types/react-highlight-words/-/react-highlight-words-0.20.0.tgz#c7e3e8302acb5082980e611ce2d93c6e6d3b4022" + integrity sha512-Qm512TiOakvtNzHJ2+TNVHnLn5cJ2wLQV0+LrhuispVth6dRf5b8ydjq3Kc0thpZ7bz4s6RnG6meboAXHWRK+Q== dependencies: "@types/react" "*" @@ -2357,13 +2354,6 @@ resolved "https://registry.yarnpkg.com/@types/stylis/-/stylis-4.2.5.tgz#1daa6456f40959d06157698a653a9ab0a70281df" integrity sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw== -"@types/testing-library__jest-dom@^5.9.1": - version "5.14.9" - resolved "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.9.tgz" - integrity sha512-FSYhIjFlfOpGSRyVoMBMuS3ws5ehFQODymf3vlI7U1K8c7PHwWwFY7VREfmsuzHSOnoKs/9/Y983ayOs7eRzqw== - dependencies: - "@types/jest" "*" - "@types/tough-cookie@*": version "4.0.5" resolved "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz" @@ -2384,10 +2374,10 @@ resolved "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz" integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA== -"@types/uuid@^9.0.1": - version "9.0.8" - resolved "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz" - integrity sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA== +"@types/uuid@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-10.0.0.tgz#e9c07fe50da0f53dc24970cca94d619ff03f6f6d" + integrity sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ== "@types/webidl-conversions@*": version "7.0.3" @@ -2752,21 +2742,14 @@ argparse@^2.0.1: resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -aria-query@5.1.3: - version "5.1.3" - resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz" - integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ== - dependencies: - deep-equal "^2.0.5" - -aria-query@^5.0.0, aria-query@^5.3.0: +aria-query@5.3.0, aria-query@^5.0.0, aria-query@^5.3.0: version "5.3.0" resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz" integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A== dependencies: dequal "^2.0.3" -array-buffer-byte-length@^1.0.0, array-buffer-byte-length@^1.0.1: +array-buffer-byte-length@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz" integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== @@ -3258,7 +3241,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -3481,20 +3464,20 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concurrently@^7.6.0: - version "7.6.0" - resolved "https://registry.npmjs.org/concurrently/-/concurrently-7.6.0.tgz" - integrity sha512-BKtRgvcJGeZ4XttiDiNcFiRlxoAeZOseqUvyYRUp/Vtd+9p1ULmeoSqGsDA+2ivdeDFpqrJvGvmI+StKfKl5hw== +concurrently@^8.2.2: + version "8.2.2" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.2.tgz#353141985c198cfa5e4a3ef90082c336b5851784" + integrity sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg== dependencies: - chalk "^4.1.0" - date-fns "^2.29.1" + chalk "^4.1.2" + date-fns "^2.30.0" lodash "^4.17.21" - rxjs "^7.0.0" - shell-quote "^1.7.3" - spawn-command "^0.0.2-1" - supports-color "^8.1.0" + rxjs "^7.8.1" + shell-quote "^1.8.1" + spawn-command "0.0.2" + supports-color "^8.1.1" tree-kill "^1.2.2" - yargs "^17.3.1" + yargs "^17.7.2" connect-multiparty@^2.2.0: version "2.2.0" @@ -3750,9 +3733,9 @@ data-view-byte-offset@^1.0.0: es-errors "^1.3.0" is-data-view "^1.0.1" -date-fns@^2.29.1: +date-fns@^2.30.0: version "2.30.0" - resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0" integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw== dependencies: "@babel/runtime" "^7.21.0" @@ -3803,30 +3786,6 @@ dedent@^1.0.0: resolved "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz" integrity sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ== -deep-equal@^2.0.5: - version "2.2.3" - resolved "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz" - integrity sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA== - dependencies: - array-buffer-byte-length "^1.0.0" - call-bind "^1.0.5" - es-get-iterator "^1.1.3" - get-intrinsic "^1.2.2" - is-arguments "^1.1.1" - is-array-buffer "^3.0.2" - is-date-object "^1.0.5" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - isarray "^2.0.5" - object-is "^1.1.5" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.5.1" - side-channel "^1.0.4" - which-boxed-primitive "^1.0.2" - which-collection "^1.0.1" - which-typed-array "^1.1.13" - deep-is@^0.1.3: version "0.1.4" resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz" @@ -3921,11 +3880,16 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9: +dom-accessibility-api@^0.5.9: version "0.5.16" - resolved "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz" + resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453" integrity sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg== +dom-accessibility-api@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz#993e925cc1d73f2c662e7d75dd5a5445259a8fd8" + integrity sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w== + dom-align@^1.7.0: version "1.12.4" resolved "https://registry.npmjs.org/dom-align/-/dom-align-1.12.4.tgz" @@ -4186,21 +4150,6 @@ es-errors@^1.2.1, es-errors@^1.3.0: resolved "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== -es-get-iterator@^1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz" - integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.3" - has-symbols "^1.0.3" - is-arguments "^1.1.1" - is-map "^2.0.2" - is-set "^2.0.2" - is-string "^1.0.7" - isarray "^2.0.5" - stop-iteration-iterator "^1.0.0" - es-iterator-helpers@^1.0.15, es-iterator-helpers@^1.0.19: version "1.0.19" resolved "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz" @@ -4927,7 +4876,7 @@ get-caller-file@^2.0.5: resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: +get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: version "1.2.4" resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz" integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== @@ -5453,7 +5402,7 @@ inline-style-prefixer@^7.0.0: css-in-js-utils "^3.1.0" fast-loops "^1.1.3" -internal-slot@^1.0.4, internal-slot@^1.0.7: +internal-slot@^1.0.7: version "1.0.7" resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz" integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== @@ -5492,15 +5441,7 @@ ipaddr.js@1.9.1: resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== -is-arguments@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-array-buffer@^3.0.2, is-array-buffer@^3.0.4: +is-array-buffer@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz" integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== @@ -5623,7 +5564,7 @@ is-html@^2.0.0: dependencies: html-tags "^3.0.0" -is-map@^2.0.2, is-map@^2.0.3: +is-map@^2.0.3: version "2.0.3" resolved "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz" integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw== @@ -5663,7 +5604,7 @@ is-regex@^1.1.4: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-set@^2.0.2, is-set@^2.0.3: +is-set@^2.0.3: version "2.0.3" resolved "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz" integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg== @@ -6615,7 +6556,7 @@ lodash.once@^4.0.0: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg== -lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3: +lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3: version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -6683,7 +6624,7 @@ lru-cache@^5.1.1: lz-string@^1.5.0: version "1.5.0" - resolved "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz" + resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941" integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ== make-dir@^4.0.0: @@ -6996,10 +6937,10 @@ next-redux-wrapper@^8.0.0: resolved "https://registry.npmjs.org/next-redux-wrapper/-/next-redux-wrapper-8.1.0.tgz" integrity sha512-2hIau0hcI6uQszOtrvAFqgc0NkZegKYhBB7ZAKiG3jk7zfuQb4E7OV9jfxViqqojh3SEHdnFfPkN9KErttUKuw== -next-router-mock@^0.8.0: - version "0.8.0" - resolved "https://registry.npmjs.org/next-router-mock/-/next-router-mock-0.8.0.tgz" - integrity sha512-aw/QnDFRqGDIkC3y4mCL5HQCNK94IzIfrEYy2c17WVp6Q4V5GUarFx751Sccf8fUPdkzD2/RsldyScvNZGA8lw== +next-router-mock@^0.9.13: + version "0.9.13" + resolved "https://registry.yarnpkg.com/next-router-mock/-/next-router-mock-0.9.13.tgz#bdee2011ea6c09e490121c354ef917f339767f72" + integrity sha512-906n2RRaE6Y28PfYJbaz5XZeJ6Tw8Xz1S6E31GGwZ0sXB6/XjldD1/2azn1ZmBmRk5PQRkzjg+n+RHZe5xQzWA== next-sitemap@^3.1.32: version "3.1.55" @@ -7136,14 +7077,6 @@ object-inspect@^1.13.1: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff" integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g== -object-is@^1.1.5: - version "1.1.6" - resolved "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz" - integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q== - dependencies: - call-bind "^1.0.7" - define-properties "^1.2.1" - object-keys@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz" @@ -7514,7 +7447,7 @@ prelude-ls@^1.2.1: pretty-format@^27.0.2: version "27.5.1" - resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ== dependencies: ansi-regex "^5.0.1" @@ -7864,7 +7797,7 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: react-is@^17.0.1: version "17.0.2" - resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== react-lifecycles-compat@^3.0.4: @@ -8133,7 +8066,7 @@ regenerator-runtime@^0.14.0: resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz" integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== -regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.2: +regexp.prototype.flags@^1.5.2: version "1.5.2" resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz" integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== @@ -8289,9 +8222,9 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -rxjs@^7.0.0: +rxjs@^7.8.1: version "7.8.1" - resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== dependencies: tslib "^2.1.0" @@ -8529,9 +8462,9 @@ shebang-regex@^3.0.0: resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.7.3: +shell-quote@^1.8.1: version "1.8.1" - resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== side-channel@^1.0.4, side-channel@^1.0.6: @@ -8631,10 +8564,10 @@ sparse-bitfield@^3.0.3: dependencies: memory-pager "^1.0.2" -spawn-command@^0.0.2-1: - version "0.0.2-1" - resolved "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz" - integrity sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg== +spawn-command@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e" + integrity sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ== spdx-correct@^3.0.0: version "3.2.0" @@ -8743,13 +8676,6 @@ statuses@2.0.1: resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz" integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== -stop-iteration-iterator@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz" - integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ== - dependencies: - internal-slot "^1.0.4" - stream-events@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5" @@ -8984,7 +8910,7 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -supports-color@^8.0.0, supports-color@^8.1.0: +supports-color@^8.0.0, supports-color@^8.1.1: version "8.1.1" resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== @@ -9666,7 +9592,7 @@ which-module@^1.0.0: resolved "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz" integrity sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ== -which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.9: +which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.9: version "1.1.15" resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz" integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA== From 01440915258821d8c2e1a5dc5cb34003162b8c13 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Thu, 11 Jul 2024 10:24:25 +0200 Subject: [PATCH 17/37] chore(client): :arrow_up: Upgrade few remaining non problematic dependencies --- client/package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/package.json b/client/package.json index a2d8c0bb8c..0153105fa7 100644 --- a/client/package.json +++ b/client/package.json @@ -36,7 +36,7 @@ "next-redux-wrapper": "^8.0.0", "next-sitemap": "^3.1.32", "process": "^0.11.10", - "query-string": "^8.1.0", + "query-string": "^9.0.0", "rc-time-picker": "^3.7.3", "react": "^18.3.1", "react-anchor-link-smooth-scroll": "^1.0.12", @@ -49,7 +49,7 @@ "react-google-autocomplete": "^2.6.1", "react-hook-form": "^7.43.1", "react-i18next": "^14.1.2", - "react-intersection-observer": "^9.11.0", + "react-intersection-observer": "^9.12.0", "react-loading-skeleton": "^3.1.0", "react-notifications": "^1.7.3", "react-redux": "^9.1.2", diff --git a/yarn.lock b/yarn.lock index 1406d51711..3f895dcb6a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7590,10 +7590,10 @@ qs@~6.5.2: resolved "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz" integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== -query-string@^8.1.0: - version "8.2.0" - resolved "https://registry.npmjs.org/query-string/-/query-string-8.2.0.tgz" - integrity sha512-tUZIw8J0CawM5wyGBiDOAp7ObdRQh4uBor/fUR9ZjmbZVvw95OD9If4w3MQxr99rg0DJZ/9CIORcpEqU5hQG7g== +query-string@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-9.0.0.tgz#1fe177cd95545600f0deab93f5fb02fd4e3e7273" + integrity sha512-4EWwcRGsO2H+yzq6ddHcVqkCQ2EFUSfDMEjF8ryp8ReymyZhIuaFRGLomeOQLkrzacMHoyky2HW0Qe30UbzkKw== dependencies: decode-uri-component "^0.4.1" filter-obj "^5.1.0" @@ -7780,10 +7780,10 @@ react-i18next@^14.1.2: "@babel/runtime" "^7.23.9" html-parse-stringify "^3.0.1" -react-intersection-observer@^9.11.0: - version "9.11.0" - resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-9.11.0.tgz#f9e271ceb09391dcb612eeeb9dd564889f8e005c" - integrity sha512-fIaYm1nN7FGa4Lpa+sIf8YZWPGbYvctAHQWFjWMv+z+MSMiq9gfPkHLtCglyiPMpaH49ZgGxXuH+THCGcHX75Q== +react-intersection-observer@^9.12.0: + version "9.12.0" + resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-9.12.0.tgz#40498b13f6fc6fd311077369ee402f8219d5f006" + integrity sha512-KmczTRfcIg5hcmqFbb1fKPprT7AkOjj0ohUCs1iOwWe9BJPnC5nQ7dRX44z2W1jHiRt1uQST0AxGqWL6X8pN2A== react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" From b18f30b78b52b40c3f7cf718fbb444636a29d8c7 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Thu, 11 Jul 2024 10:27:44 +0200 Subject: [PATCH 18/37] chore(client): :arrow_up: Major upgrade of next-sitemap package and compatibily fixes to codebase --- client/package.json | 2 +- client/src/pages/sitemap-index.xml/index.tsx | 6 ++--- client/src/pages/sitemap-index/[...index].tsx | 12 ++++----- yarn.lock | 27 ++++++++++++------- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/client/package.json b/client/package.json index 0153105fa7..48ca3fbb96 100644 --- a/client/package.json +++ b/client/package.json @@ -34,7 +34,7 @@ "next": "^14.2.5", "next-i18next": "^15.3.0", "next-redux-wrapper": "^8.0.0", - "next-sitemap": "^3.1.32", + "next-sitemap": "^4.2.3", "process": "^0.11.10", "query-string": "^9.0.0", "rc-time-picker": "^3.7.3", diff --git a/client/src/pages/sitemap-index.xml/index.tsx b/client/src/pages/sitemap-index.xml/index.tsx index c2590e2c99..df7591c742 100644 --- a/client/src/pages/sitemap-index.xml/index.tsx +++ b/client/src/pages/sitemap-index.xml/index.tsx @@ -1,13 +1,13 @@ -import { getServerSideSitemapIndex } from "next-sitemap"; import { GetServerSideProps } from "next"; +import { getServerSideSitemapIndexLegacy } from "next-sitemap"; export const getServerSideProps: GetServerSideProps = async (ctx) => { const siteUrl = process.env.NEXT_PUBLIC_REACT_APP_SITE_URL; const locales = (ctx.locales || []).filter((ln) => ln !== "default"); - return getServerSideSitemapIndex( + return getServerSideSitemapIndexLegacy( ctx, - locales.map((ln) => `${siteUrl}/sitemap-index/sitemap-index-${ln}.xml`) + locales.map((ln) => `${siteUrl}/sitemap-index/sitemap-index-${ln}.xml`), ); }; diff --git a/client/src/pages/sitemap-index/[...index].tsx b/client/src/pages/sitemap-index/[...index].tsx index 569bdd571c..3b9a795295 100644 --- a/client/src/pages/sitemap-index/[...index].tsx +++ b/client/src/pages/sitemap-index/[...index].tsx @@ -1,7 +1,7 @@ -import { GetServerSideProps } from "next"; -import { getServerSideSitemap, getServerSideSitemapIndex } from "next-sitemap"; import { extractIndexFromUrl } from "lib/sitemap/extractIndexFromUrl"; import { getAllUrls } from "lib/sitemap/getAllUrls"; +import { GetServerSideProps } from "next"; +import { getServerSideSitemapIndexLegacy, getServerSideSitemapLegacy } from "next-sitemap"; const SITE_URL = process.env.NEXT_PUBLIC_REACT_APP_SITE_URL; const TYPES = ["dispositifs", "demarches", "structures", "pages"]; @@ -16,9 +16,9 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { // /sitemap-index/sitemap-index-LN if (index.length === 1) { - return getServerSideSitemapIndex( + return getServerSideSitemapIndexLegacy( ctx, - TYPES.map((type) => `${SITE_URL}/sitemap-index/sitemap-index-${locale}/sitemap-index-${type}.xml`) + TYPES.map((type) => `${SITE_URL}/sitemap-index/sitemap-index-${locale}/sitemap-index-${type}.xml`), ); } @@ -32,10 +32,10 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { const urls = await getAllUrls(type, locale); const fields = urls.map((url) => ({ loc: url, - lastmod: new Date().toISOString() + lastmod: new Date().toISOString(), })); - return getServerSideSitemap(ctx, fields); + return getServerSideSitemapLegacy(ctx, fields); } // 404 wrong path diff --git a/yarn.lock b/yarn.lock index 3f895dcb6a..84dc9093a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -461,9 +461,9 @@ resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz" integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== -"@corex/deepmerge@^4.0.29": +"@corex/deepmerge@^4.0.43": version "4.0.43" - resolved "https://registry.npmjs.org/@corex/deepmerge/-/deepmerge-4.0.43.tgz" + resolved "https://registry.yarnpkg.com/@corex/deepmerge/-/deepmerge-4.0.43.tgz#9bd42559ebb41cc5a7fb7cfeea5f231c20977dca" integrity sha512-N8uEMrMPL0cu/bdboEWpQYb/0i2K5Qn8eCsxzOmxSggJbbQte7ljMRoXm917AbntqTGOzdTu+vP3KOOzoC70HQ== "@cspotcode/source-map-support@^0.8.0": @@ -1482,6 +1482,11 @@ resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.5.tgz#1d9328ab828711d3517d0a1d505acb55e5ef7ad0" integrity sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA== +"@next/env@^13.4.3": + version "13.5.6" + resolved "https://registry.yarnpkg.com/@next/env/-/env-13.5.6.tgz#c1148e2e1aa166614f05161ee8f77ded467062bc" + integrity sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw== + "@next/eslint-plugin-next@14.2.5", "@next/eslint-plugin-next@^14.2.5": version "14.2.5" resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.5.tgz#f7e3ff3efe40a2855e5f29bc2692175f85913ba8" @@ -4577,7 +4582,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.2.9, fast-glob@^3.3.1: +fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.1: version "3.3.2" resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz" integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== @@ -6770,7 +6775,7 @@ minimatch@^9.0.4: dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.7: +minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8: version "1.2.8" resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -6942,13 +6947,15 @@ next-router-mock@^0.9.13: resolved "https://registry.yarnpkg.com/next-router-mock/-/next-router-mock-0.9.13.tgz#bdee2011ea6c09e490121c354ef917f339767f72" integrity sha512-906n2RRaE6Y28PfYJbaz5XZeJ6Tw8Xz1S6E31GGwZ0sXB6/XjldD1/2azn1ZmBmRk5PQRkzjg+n+RHZe5xQzWA== -next-sitemap@^3.1.32: - version "3.1.55" - resolved "https://registry.npmjs.org/next-sitemap/-/next-sitemap-3.1.55.tgz" - integrity sha512-ZjkRfkqoSLbU+e8W9TWWe0zfOGNA47lpvm35kNcUCmj73gpLX2PIn51gwHT/B6bgGVAFYY0OXixJDrxIIwcEHw== +next-sitemap@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/next-sitemap/-/next-sitemap-4.2.3.tgz#5db3f650351a51e84b9fd6b58c5af2f9257b5058" + integrity sha512-vjdCxeDuWDzldhCnyFCQipw5bfpl4HmZA7uoo3GAaYGjGgfL4Cxb1CiztPuWGmS+auYs7/8OekRS8C2cjdAsjQ== dependencies: - "@corex/deepmerge" "^4.0.29" - minimist "^1.2.7" + "@corex/deepmerge" "^4.0.43" + "@next/env" "^13.4.3" + fast-glob "^3.2.12" + minimist "^1.2.8" next@^14.2.5: version "14.2.5" From b92df089f386ba92dd094393b798e5946d1ddf1d Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Mon, 15 Jul 2024 15:58:14 +0200 Subject: [PATCH 19/37] chore(client): :arrow_up: Add dependencies to move from react-test-renderer to @testing-library/react --- client/package.json | 2 -- yarn.lock | 34 +++++----------------------------- 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/client/package.json b/client/package.json index 48ca3fbb96..101f3d3039 100644 --- a/client/package.json +++ b/client/package.json @@ -111,7 +111,6 @@ "@types/react-dom": "^18.3.0", "@types/react-highlight-words": "^0.20.0", "@types/react-router-hash-link": "^2.4.5", - "@types/react-test-renderer": "^18.0.0", "@types/recompose": "^0.30.7", "@types/redux-mock-store": "^1.0.3", "@types/sortablejs": "^1.13.0", @@ -130,7 +129,6 @@ "next-router-mock": "^0.9.13", "papaparse": "^5.3.0", "postcss": "^8.4.5", - "react-test-renderer": "^18.2.0", "redux-mock-store": "^1.5.4", "redux-saga-test-plan": "^4.0.0-rc.3", "sass": "^1.57.1", diff --git a/yarn.lock b/yarn.lock index 84dc9093a7..b74c869a03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2278,13 +2278,6 @@ "@types/history" "^4.7.11" "@types/react" "*" -"@types/react-test-renderer@^18.0.0": - version "18.3.0" - resolved "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-18.3.0.tgz" - integrity sha512-HW4MuEYxfDbOHQsVlY/XtOvNHftCVEPhJF2pQXXwcUiUF+Oyb0usgp48HSgpK5rt8m9KZb22yqOeZm+rrVG8gw== - dependencies: - "@types/react" "*" - "@types/react@*", "@types/react@^18.3.3": version "18.3.3" resolved "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz" @@ -7797,16 +7790,16 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.3.1: - version "18.3.1" - resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz" - integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== - react-is@^17.0.1: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +react-is@^18.0.0: + version "18.3.1" + resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz" + integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== + react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz" @@ -7878,14 +7871,6 @@ react-router@5.3.4: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-shallow-renderer@^16.15.0: - version "16.15.0" - resolved "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz" - integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA== - dependencies: - object-assign "^4.1.1" - react-is "^16.12.0 || ^17.0.0 || ^18.0.0" - react-sortablejs@^6.1.4: version "6.1.4" resolved "https://registry.npmjs.org/react-sortablejs/-/react-sortablejs-6.1.4.tgz" @@ -7894,15 +7879,6 @@ react-sortablejs@^6.1.4: classnames "2.3.1" tiny-invariant "1.2.0" -react-test-renderer@^18.2.0: - version "18.3.1" - resolved "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-18.3.1.tgz" - integrity sha512-KkAgygexHUkQqtvvx/otwxtuFu5cVjfzTCtjXLH9boS19/Nbtg84zS7wIQn39G8IlrhThBpQsMKkq5ZHZIYFXA== - dependencies: - react-is "^18.3.1" - react-shallow-renderer "^16.15.0" - scheduler "^0.23.2" - react-themeable@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/react-themeable/-/react-themeable-1.1.0.tgz" From aac8f076fd670cd8c8742b5a377f1a0d6bec6692 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Mon, 15 Jul 2024 16:05:07 +0200 Subject: [PATCH 20/37] refactor(client): :fire: Remove wrapWithProvidersAndRender in favor of wrapWithProvidersAndRenderForTesting --- .../jest/lib/wrapWithProvidersAndRender.tsx | 31 +-------------- client/src/__tests__/agir.test.tsx | 10 ++--- client/src/__tests__/auth/auth.test.tsx | 10 ++--- .../__tests__/auth/code-connexion.test.tsx | 12 +++--- .../src/__tests__/auth/code-securite.test.tsx | 12 +++--- client/src/__tests__/auth/connexion.test.tsx | 12 +++--- .../mail-envoye.test.tsx | 10 ++--- .../nouveau.test.tsx | 10 ++--- .../reinitialiser-mot-de-passe.test.tsx | 12 +++--- client/src/__tests__/index.test.tsx | 4 +- client/src/__tests__/publier.test.tsx | 10 ++--- client/src/__tests__/recherche.test.tsx | 10 ++--- client/src/__tests__/traduire.test.tsx | 10 ++--- .../__tests__/SubComponents.test.tsx | 39 +++++++++---------- .../UserContributions.component.test.tsx | 21 +++++----- .../UserFavorites.component.test.tsx | 24 ++++++------ .../__tests__/UserNotifications.test.tsx | 29 +++++++------- .../__test__/UserProfile.component.test.tsx | 17 ++++---- .../__tests__/UserStructure.test.tsx | 24 ++++++------ .../UserTranslation.component.test.tsx | 28 ++++++------- .../Pages/auth/CheckCode/CheckCode.test.tsx | 15 +++---- 21 files changed, 156 insertions(+), 194 deletions(-) diff --git a/client/jest/lib/wrapWithProvidersAndRender.tsx b/client/jest/lib/wrapWithProvidersAndRender.tsx index 6d2f6401df..1967b13e9e 100644 --- a/client/jest/lib/wrapWithProvidersAndRender.tsx +++ b/client/jest/lib/wrapWithProvidersAndRender.tsx @@ -1,11 +1,10 @@ +import { render } from "@testing-library/react"; import React from "react"; -import renderer from "react-test-renderer"; import { Provider } from "react-redux"; +import { BrowserRouter as Router } from "react-router-dom"; import configureStore from "redux-mock-store"; import { RootState } from "services/rootReducer"; import { initialMockStore } from "__fixtures__/reduxStore"; -import { BrowserRouter as Router } from "react-router-dom"; -import { render } from "@testing-library/react"; interface WrapWithProvidersAndRenderParams { Component: React.FunctionComponent; @@ -13,32 +12,6 @@ interface WrapWithProvidersAndRenderParams { reduxState?: Partial; } -/** - * Provide all the ugly-to-set-up providers for your component to be ready to test - * @param Component - * @param compProps properties passed on to [getPropsWithNavigation()] to gen navigation props - * @param reduxState defaults to initialRootState - */ - -export function wrapWithProvidersAndRender({ - Component, - compProps, - reduxState = initialMockStore, -}: WrapWithProvidersAndRenderParams) { - const mockStore = configureStore([]); - const store = mockStore(reduxState); - - const componentWithRedux = ( - - - - - - ); - - return renderer.create(componentWithRedux); -} - /** * Provide all the ugly-to-set-up providers for your component to be ready to test * @param Component diff --git a/client/src/__tests__/agir.test.tsx b/client/src/__tests__/agir.test.tsx index 3102b9c25f..816a4c123c 100644 --- a/client/src/__tests__/agir.test.tsx +++ b/client/src/__tests__/agir.test.tsx @@ -1,8 +1,8 @@ -import { wrapWithProvidersAndRender } from "../../jest/lib/wrapWithProvidersAndRender"; -import agir from "../pages/agir"; -import { initialMockStore } from "__fixtures__/reduxStore"; -import { act, ReactTestRenderer } from "react-test-renderer"; import "jest-styled-components"; +import { act, ReactTestRenderer } from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../jest/lib/wrapWithProvidersAndRender"; +import agir from "../pages/agir"; jest.mock("next/router", () => require("next-router-mock")); @@ -16,7 +16,7 @@ describe("agir", () => { it("renders traduire", () => { window.scrollTo = jest.fn(); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: agir, reduxState: { ...initialMockStore, diff --git a/client/src/__tests__/auth/auth.test.tsx b/client/src/__tests__/auth/auth.test.tsx index e4bfdaa284..a80ac8a04d 100644 --- a/client/src/__tests__/auth/auth.test.tsx +++ b/client/src/__tests__/auth/auth.test.tsx @@ -1,9 +1,9 @@ -import { wrapWithProvidersAndRender } from "../../../jest/lib/wrapWithProvidersAndRender"; -import auth from "../../pages/auth"; -import { initialMockStore } from "__fixtures__/reduxStore"; +import "jest-styled-components"; import { act, ReactTestRenderer } from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../../jest/lib/wrapWithProvidersAndRender"; +import auth from "../../pages/auth"; import { setupGoogleMock } from "../../__mocks__/react-google-autocomplete"; -import "jest-styled-components"; jest.mock("next/router", () => require("next-router-mock")); @@ -18,7 +18,7 @@ describe("auth", () => { it("renders auth", () => { window.scrollTo = jest.fn(); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: auth, reduxState: { ...initialMockStore, diff --git a/client/src/__tests__/auth/code-connexion.test.tsx b/client/src/__tests__/auth/code-connexion.test.tsx index 5dc2ec362c..5324e3ddf1 100644 --- a/client/src/__tests__/auth/code-connexion.test.tsx +++ b/client/src/__tests__/auth/code-connexion.test.tsx @@ -1,10 +1,10 @@ -import { wrapWithProvidersAndRender } from "../../../jest/lib/wrapWithProvidersAndRender"; -import codeConnexion from "../../pages/auth/code-connexion"; +import "jest-styled-components"; import mockRouter from "next-router-mock"; -import { initialMockStore } from "__fixtures__/reduxStore"; import { act, ReactTestRenderer } from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../../jest/lib/wrapWithProvidersAndRender"; +import codeConnexion from "../../pages/auth/code-connexion"; import { setupGoogleMock } from "../../__mocks__/react-google-autocomplete"; -import "jest-styled-components"; jest.mock("next/router", () => require("next-router-mock")); @@ -18,7 +18,7 @@ describe("auth/connexion", () => { it("renders null if no email", () => { act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: codeConnexion, reduxState: { ...initialMockStore, @@ -36,7 +36,7 @@ describe("auth/connexion", () => { mockRouter.push("/auth/code-connexion?email=test@example.com"); }); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: codeConnexion, reduxState: { ...initialMockStore, diff --git a/client/src/__tests__/auth/code-securite.test.tsx b/client/src/__tests__/auth/code-securite.test.tsx index 3b2b624f3f..db546424c1 100644 --- a/client/src/__tests__/auth/code-securite.test.tsx +++ b/client/src/__tests__/auth/code-securite.test.tsx @@ -1,10 +1,10 @@ -import { wrapWithProvidersAndRender } from "../../../jest/lib/wrapWithProvidersAndRender"; -import codeSecurite from "../../pages/auth/code-securite"; +import "jest-styled-components"; import mockRouter from "next-router-mock"; -import { initialMockStore } from "__fixtures__/reduxStore"; import { act, ReactTestRenderer } from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../../jest/lib/wrapWithProvidersAndRender"; +import codeSecurite from "../../pages/auth/code-securite"; import { setupGoogleMock } from "../../__mocks__/react-google-autocomplete"; -import "jest-styled-components"; jest.mock("next/router", () => require("next-router-mock")); @@ -18,7 +18,7 @@ describe("auth/connexion", () => { it("renders null if no email", () => { act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: codeSecurite, reduxState: { ...initialMockStore, @@ -36,7 +36,7 @@ describe("auth/connexion", () => { mockRouter.push("/auth/code-securite?email=test@example.com"); }); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: codeSecurite, reduxState: { ...initialMockStore, diff --git a/client/src/__tests__/auth/connexion.test.tsx b/client/src/__tests__/auth/connexion.test.tsx index d87a0ab7af..ce64034df2 100644 --- a/client/src/__tests__/auth/connexion.test.tsx +++ b/client/src/__tests__/auth/connexion.test.tsx @@ -1,10 +1,10 @@ -import { wrapWithProvidersAndRender } from "../../../jest/lib/wrapWithProvidersAndRender"; -import connexion from "../../pages/auth/connexion"; +import "jest-styled-components"; import mockRouter from "next-router-mock"; -import { initialMockStore } from "__fixtures__/reduxStore"; import { act, ReactTestRenderer } from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../../jest/lib/wrapWithProvidersAndRender"; +import connexion from "../../pages/auth/connexion"; import { setupGoogleMock } from "../../__mocks__/react-google-autocomplete"; -import "jest-styled-components"; jest.mock("next/router", () => require("next-router-mock")); @@ -18,7 +18,7 @@ describe("auth/connexion", () => { it("renders null if no email", () => { act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: connexion, reduxState: { ...initialMockStore, @@ -32,7 +32,7 @@ describe("auth/connexion", () => { mockRouter.push("/auth/connexion?email=test@example.com"); }); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: connexion, reduxState: { ...initialMockStore, diff --git a/client/src/__tests__/auth/reinitialiser-mot-de-passe/mail-envoye.test.tsx b/client/src/__tests__/auth/reinitialiser-mot-de-passe/mail-envoye.test.tsx index 6b6fdaf595..3dcf906300 100644 --- a/client/src/__tests__/auth/reinitialiser-mot-de-passe/mail-envoye.test.tsx +++ b/client/src/__tests__/auth/reinitialiser-mot-de-passe/mail-envoye.test.tsx @@ -1,10 +1,10 @@ -import { wrapWithProvidersAndRender } from "../../../../jest/lib/wrapWithProvidersAndRender"; -import pageComponent from "pages/auth/reinitialiser-mot-de-passe/mail-envoye"; +import "jest-styled-components"; import mockRouter from "next-router-mock"; -import { initialMockStore } from "__fixtures__/reduxStore"; +import pageComponent from "pages/auth/reinitialiser-mot-de-passe/mail-envoye"; import { act, ReactTestRenderer } from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; import { setupGoogleMock } from "__mocks__/react-google-autocomplete"; -import "jest-styled-components"; +import { wrapWithProvidersAndRenderForTesting } from "../../../../jest/lib/wrapWithProvidersAndRender"; jest.mock("next/router", () => require("next-router-mock")); @@ -21,7 +21,7 @@ describe("auth/reinitialiser-mot-de-passe/mail-envoye", () => { mockRouter.push("/auth/reinitialiser-mot-de-passe/mail-envoye?email=test@example.com"); }); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: pageComponent, reduxState: { ...initialMockStore, diff --git a/client/src/__tests__/auth/reinitialiser-mot-de-passe/nouveau.test.tsx b/client/src/__tests__/auth/reinitialiser-mot-de-passe/nouveau.test.tsx index 7ca10fe3b6..7e02e6af6b 100644 --- a/client/src/__tests__/auth/reinitialiser-mot-de-passe/nouveau.test.tsx +++ b/client/src/__tests__/auth/reinitialiser-mot-de-passe/nouveau.test.tsx @@ -1,10 +1,10 @@ -import { wrapWithProvidersAndRender } from "../../../../jest/lib/wrapWithProvidersAndRender"; -import pageComponent from "pages/auth/reinitialiser-mot-de-passe/nouveau"; +import "jest-styled-components"; import mockRouter from "next-router-mock"; -import { initialMockStore } from "__fixtures__/reduxStore"; +import pageComponent from "pages/auth/reinitialiser-mot-de-passe/nouveau"; import { act, ReactTestRenderer } from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; import { setupGoogleMock } from "__mocks__/react-google-autocomplete"; -import "jest-styled-components"; +import { wrapWithProvidersAndRenderForTesting } from "../../../../jest/lib/wrapWithProvidersAndRender"; jest.mock("next/router", () => require("next-router-mock")); @@ -21,7 +21,7 @@ describe("auth/reinitialiser-mot-de-passe/nouveau", () => { mockRouter.push("/auth/reinitialiser-mot-de-passe/nouveau?token=aaa"); }); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: pageComponent, reduxState: { ...initialMockStore, diff --git a/client/src/__tests__/auth/reinitialiser-mot-de-passe/reinitialiser-mot-de-passe.test.tsx b/client/src/__tests__/auth/reinitialiser-mot-de-passe/reinitialiser-mot-de-passe.test.tsx index 0cc857e893..31ebb002b3 100644 --- a/client/src/__tests__/auth/reinitialiser-mot-de-passe/reinitialiser-mot-de-passe.test.tsx +++ b/client/src/__tests__/auth/reinitialiser-mot-de-passe/reinitialiser-mot-de-passe.test.tsx @@ -1,10 +1,10 @@ -import { wrapWithProvidersAndRender } from "../../../../jest/lib/wrapWithProvidersAndRender"; -import pageComponent from "pages/auth/reinitialiser-mot-de-passe"; +import "jest-styled-components"; import mockRouter from "next-router-mock"; -import { initialMockStore } from "__fixtures__/reduxStore"; +import pageComponent from "pages/auth/reinitialiser-mot-de-passe"; import { act, ReactTestRenderer } from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; import { setupGoogleMock } from "__mocks__/react-google-autocomplete"; -import "jest-styled-components"; +import { wrapWithProvidersAndRenderForTesting } from "../../../../jest/lib/wrapWithProvidersAndRender"; jest.mock("next/router", () => require("next-router-mock")); @@ -18,7 +18,7 @@ describe("auth/reinitialiser-mot-de-passe", () => { it("renders page if no email", () => { act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: pageComponent, reduxState: { ...initialMockStore, @@ -32,7 +32,7 @@ describe("auth/reinitialiser-mot-de-passe", () => { mockRouter.push("/auth/reinitialiser-mot-de-passe?email=test@example.com"); }); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: pageComponent, reduxState: { ...initialMockStore, diff --git a/client/src/__tests__/index.test.tsx b/client/src/__tests__/index.test.tsx index ea559195f1..43b6933130 100644 --- a/client/src/__tests__/index.test.tsx +++ b/client/src/__tests__/index.test.tsx @@ -1,4 +1,4 @@ -import { wrapWithProvidersAndRender } from "../../jest/lib/wrapWithProvidersAndRender"; +import { wrapWithProvidersAndRenderForTesting } from "../../jest/lib/wrapWithProvidersAndRender"; import index, { Props } from "../pages/index"; import { initialMockStore } from "__fixtures__/reduxStore"; import { lastDemarches, lastDispositifs } from "__fixtures__/getDispositifs"; @@ -18,7 +18,7 @@ describe("homepage", () => { it("renders homepage", () => { window.scrollTo = jest.fn(); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: index, reduxState: { ...initialMockStore, diff --git a/client/src/__tests__/publier.test.tsx b/client/src/__tests__/publier.test.tsx index 30812917b7..cddc0aab16 100644 --- a/client/src/__tests__/publier.test.tsx +++ b/client/src/__tests__/publier.test.tsx @@ -1,8 +1,8 @@ -import { wrapWithProvidersAndRender } from "../../jest/lib/wrapWithProvidersAndRender"; -import publier from "../pages/publier"; -import { initialMockStore } from "__fixtures__/reduxStore"; -import { act, ReactTestRenderer } from "react-test-renderer"; import "jest-styled-components"; +import { act, ReactTestRenderer } from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../jest/lib/wrapWithProvidersAndRender"; +import publier from "../pages/publier"; jest.mock("components/Modals/WriteContentModal/WriteContentModal", () => jest.fn().mockReturnValue(<>)); jest.mock("next/router", () => require("next-router-mock")); @@ -16,7 +16,7 @@ describe("publier", () => { it("renders publier", () => { window.scrollTo = jest.fn(); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: publier, reduxState: { ...initialMockStore, diff --git a/client/src/__tests__/recherche.test.tsx b/client/src/__tests__/recherche.test.tsx index b1a2762424..08efd36081 100644 --- a/client/src/__tests__/recherche.test.tsx +++ b/client/src/__tests__/recherche.test.tsx @@ -1,9 +1,9 @@ -import { wrapWithProvidersAndRender } from "../../jest/lib/wrapWithProvidersAndRender"; -import recherche from "../pages/recherche"; -import { initialMockStore } from "__fixtures__/reduxStore"; +import "jest-styled-components"; import { act, ReactTestRenderer } from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../jest/lib/wrapWithProvidersAndRender"; +import recherche from "../pages/recherche"; import { setupGoogleMock } from "../__mocks__/react-google-autocomplete"; -import "jest-styled-components"; jest.mock("next/router", () => require("next-router-mock")); @@ -19,7 +19,7 @@ describe("recherche", () => { window.scrollTo = jest.fn(); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: recherche, reduxState: { ...initialMockStore, diff --git a/client/src/__tests__/traduire.test.tsx b/client/src/__tests__/traduire.test.tsx index 98362cd303..b527da7fa0 100644 --- a/client/src/__tests__/traduire.test.tsx +++ b/client/src/__tests__/traduire.test.tsx @@ -1,8 +1,8 @@ -import { wrapWithProvidersAndRender } from "../../jest/lib/wrapWithProvidersAndRender"; -import traduire from "../pages/traduire"; -import { initialMockStore } from "__fixtures__/reduxStore"; -import { act, ReactTestRenderer } from "react-test-renderer"; import "jest-styled-components"; +import { act, ReactTestRenderer } from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../jest/lib/wrapWithProvidersAndRender"; +import traduire from "../pages/traduire"; jest.mock("next/router", () => require("next-router-mock")); @@ -16,7 +16,7 @@ describe("traduire", () => { it("renders traduire", () => { window.scrollTo = jest.fn(); act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: traduire, reduxState: { ...initialMockStore, diff --git a/client/src/components/Backend/screens/Admin/sharedComponents/__tests__/SubComponents.test.tsx b/client/src/components/Backend/screens/Admin/sharedComponents/__tests__/SubComponents.test.tsx index eeeedff415..8ed5f925d8 100644 --- a/client/src/components/Backend/screens/Admin/sharedComponents/__tests__/SubComponents.test.tsx +++ b/client/src/components/Backend/screens/Admin/sharedComponents/__tests__/SubComponents.test.tsx @@ -1,20 +1,19 @@ //@ts-nocheck -import React from "react"; -import TestRenderer from "react-test-renderer"; import "jest-styled-components"; +import TestRenderer from "react-test-renderer"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../../../../../../jest/lib/wrapWithProvidersAndRender"; import { - TypeContenu, - Title, + DeleteButton, + FilterButton, + SeeButton, Structure, StyledStatus, - ValidateButton, - SeeButton, - DeleteButton, TabHeader, - FilterButton, + Title, + TypeContenu, + ValidateButton, } from "../SubComponents"; -import { wrapWithProvidersAndRender } from "../../../../../../../jest/lib/wrapWithProvidersAndRender"; -import { initialMockStore } from "__fixtures__/reduxStore"; let component; @@ -78,7 +77,7 @@ test("should render Structure with sponsor supprime", () => { }); test("should render StyledStatus actif ", () => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: StyledStatus, compProps: { text: "Actif" }, reduxState: { @@ -89,7 +88,7 @@ test("should render StyledStatus actif ", () => { }); test("should render StyledStatus en attente ", () => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: StyledStatus, compProps: { text: "En attente" }, reduxState: { @@ -99,7 +98,7 @@ test("should render StyledStatus en attente ", () => { expect(component.toJSON()).toMatchSnapshot(); }); test("should render StyledStatus Brouillon ", () => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: StyledStatus, compProps: { text: "Brouillon" }, reduxState: { @@ -109,7 +108,7 @@ test("should render StyledStatus Brouillon ", () => { expect(component.toJSON()).toMatchSnapshot(); }); test("should render StyledStatus Rejeté structure ", () => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: StyledStatus, compProps: { text: "Rejeté structure" }, reduxState: { @@ -119,7 +118,7 @@ test("should render StyledStatus Rejeté structure ", () => { expect(component.toJSON()).toMatchSnapshot(); }); test("should render StyledStatus En attente admin ", () => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: StyledStatus, compProps: { text: "En attente admin" }, reduxState: { @@ -129,7 +128,7 @@ test("should render StyledStatus En attente admin ", () => { expect(component.toJSON()).toMatchSnapshot(); }); test("should render StyledStatus Accepté structure ", () => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: StyledStatus, compProps: { text: "Accepté structure" }, reduxState: { @@ -139,7 +138,7 @@ test("should render StyledStatus Accepté structure ", () => { expect(component.toJSON()).toMatchSnapshot(); }); test("should render StyledStatus Supprimé ", () => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: StyledStatus, compProps: { text: "Supprimé" }, reduxState: { @@ -150,7 +149,7 @@ test("should render StyledStatus Supprimé ", () => { }); test("should render StyledStatus no corresponding status ", () => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: StyledStatus, compProps: { text: "test" }, reduxState: { @@ -161,7 +160,7 @@ test("should render StyledStatus no corresponding status ", () => { }); test("should render StyledStatus no corresponding with override ", () => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: StyledStatus, compProps: { text: "Actif", overrideColor: true, textToDisplay: "test" }, reduxState: { @@ -172,7 +171,7 @@ test("should render StyledStatus no corresponding with override ", () => { }); test("should render StyledStatus no corresponding with color ", () => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: StyledStatus, compProps: { text: "Actif", overrideColor: false, textToDisplay: "test", textColor: "textColor", color: "color" }, reduxState: { diff --git a/client/src/components/Backend/screens/UserContributions/__tests__/UserContributions.component.test.tsx b/client/src/components/Backend/screens/UserContributions/__tests__/UserContributions.component.test.tsx index 9781a23daa..4be7ce9620 100644 --- a/client/src/components/Backend/screens/UserContributions/__tests__/UserContributions.component.test.tsx +++ b/client/src/components/Backend/screens/UserContributions/__tests__/UserContributions.component.test.tsx @@ -1,14 +1,13 @@ // @ts-nocheck -import UserContributions from "../UserContributions"; -import { initialMockStore } from "__fixtures__/reduxStore"; -import { wrapWithProvidersAndRender } from "../../../../../../jest/lib/wrapWithProvidersAndRender"; -import Swal from "sweetalert2"; import { colors } from "colors"; +import "jest-styled-components"; import { act } from "react-test-renderer"; import { fetchUserContributionsActionCreator } from "services/UserContributions/userContributions.actions"; import { fetchUserStructureActionCreator } from "services/UserStructure/userStructure.actions"; -import "jest-styled-components"; -import Router from "next/router"; +import Swal from "sweetalert2"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../../../../../jest/lib/wrapWithProvidersAndRender"; +import UserContributions from "../UserContributions"; jest.mock("components/Modals/WriteContentModal/WriteContentModal", () => jest.fn().mockReturnValue(<>)); jest.mock("next/router", () => require("next-router-mock")); @@ -34,7 +33,7 @@ describe("userContributions", () => { let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserContributions, reduxState: { ...initialMockStore, @@ -51,7 +50,7 @@ describe("userContributions", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserContributions, }); }); @@ -136,7 +135,7 @@ describe("userContributions", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserContributions, reduxState: { ...initialMockStore, @@ -158,7 +157,7 @@ describe("userContributions", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserContributions, reduxState: { ...initialMockStore, @@ -179,7 +178,7 @@ describe("userContributions", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserContributions, reduxState: { ...initialMockStore, diff --git a/client/src/components/Backend/screens/UserFavorites/__tests__/UserFavorites.component.test.tsx b/client/src/components/Backend/screens/UserFavorites/__tests__/UserFavorites.component.test.tsx index 727188a327..22160ea17f 100644 --- a/client/src/components/Backend/screens/UserFavorites/__tests__/UserFavorites.component.test.tsx +++ b/client/src/components/Backend/screens/UserFavorites/__tests__/UserFavorites.component.test.tsx @@ -1,14 +1,14 @@ //@ts-nocheck -import UserFavorites from "../UserFavorites"; -import { initialMockStore } from "__fixtures__/reduxStore"; -import { wrapWithProvidersAndRender } from "../../../../../../jest/lib/wrapWithProvidersAndRender"; +import mockAxios from "jest-mock-axios"; +import routerMock from "next/router"; +import { act } from "react-test-renderer"; import { - updateUserFavoritesActionCreator, fetchUserFavoritesActionCreator, + updateUserFavoritesActionCreator, } from "services/UserFavoritesInLocale/UserFavoritesInLocale.actions"; -import { act } from "react-test-renderer"; -import routerMock from "next/router"; -import mockAxios from "jest-mock-axios"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../../../../../jest/lib/wrapWithProvidersAndRender"; +import UserFavorites from "../UserFavorites"; jest.mock("next/router", () => require("next-router-mock")); @@ -32,7 +32,7 @@ describe("UserFavorites", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserFavorites, reduxState: { ...initialMockStore, @@ -50,7 +50,7 @@ describe("UserFavorites", () => { let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserFavorites, compProps: { t: (_: string, element2: string) => element2 }, }); @@ -130,7 +130,7 @@ describe("UserFavorites", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserFavorites, compProps: { t: (_: string, element2: string) => element2 }, reduxState: { ...initialMockStore, userFavorites: { favorites: [fav1, fav2, fav3] } }, @@ -144,7 +144,7 @@ describe("UserFavorites", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserFavorites, compProps: { t: (_: string, element2: string) => element2 }, reduxState: { ...initialMockStore, userFavorites: { favorites: [fav1, fav2, fav3] } }, @@ -165,7 +165,7 @@ describe("UserFavorites", () => { let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserFavorites, compProps: { t: (_: string, element2: string) => element2 }, reduxState: { ...initialMockStore, userFavorites: { favorites: [fav1, fav2, fav3] } }, diff --git a/client/src/components/Backend/screens/UserNotifications/__tests__/UserNotifications.test.tsx b/client/src/components/Backend/screens/UserNotifications/__tests__/UserNotifications.test.tsx index 66d6060db7..49f9287041 100644 --- a/client/src/components/Backend/screens/UserNotifications/__tests__/UserNotifications.test.tsx +++ b/client/src/components/Backend/screens/UserNotifications/__tests__/UserNotifications.test.tsx @@ -1,16 +1,13 @@ // @ts-nocheck -import { initialMockStore } from "__fixtures__/reduxStore"; -import { wrapWithProvidersAndRender } from "../../../../../../jest/lib/wrapWithProvidersAndRender"; -import { act } from "react-test-renderer"; import "jest-styled-components"; -import UserNotifications from "../UserNotifications"; -import { - fetchUserStructureActionCreator, - updateUserStructureActionCreator, -} from "services/UserStructure/userStructure.actions"; -import { fetchSelectedStructureActionCreator } from "services/SelectedStructure/selectedStructure.actions"; -import { updateDispositifReactionActionCreator } from "services/ActiveDispositifs/activeDispositifs.actions"; import Router from "next/router"; +import { act } from "react-test-renderer"; +import { updateDispositifReactionActionCreator } from "services/ActiveDispositifs/activeDispositifs.actions"; +import { fetchSelectedStructureActionCreator } from "services/SelectedStructure/selectedStructure.actions"; +import { fetchUserStructureActionCreator } from "services/UserStructure/userStructure.actions"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../../../../../jest/lib/wrapWithProvidersAndRender"; +import UserNotifications from "../UserNotifications"; jest.mock("next/router", () => require("next-router-mock")); jest.mock("services/UserStructure/userStructure.actions", () => { @@ -43,7 +40,7 @@ describe("UserNotifications", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserNotifications, reduxState: { ...initialMockStore, @@ -64,7 +61,7 @@ describe("UserNotifications", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserNotifications, reduxState: { ...initialMockStore, @@ -129,7 +126,7 @@ describe("UserNotifications", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserNotifications, reduxState: { ...initialMockStore, @@ -158,7 +155,7 @@ describe("UserNotifications", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserNotifications, reduxState: { ...initialMockStore, @@ -190,7 +187,7 @@ describe("UserNotifications", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserNotifications, reduxState: { ...initialMockStore, @@ -220,7 +217,7 @@ describe("UserNotifications", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserNotifications, reduxState: { ...initialMockStore, diff --git a/client/src/components/Backend/screens/UserProfile/__test__/UserProfile.component.test.tsx b/client/src/components/Backend/screens/UserProfile/__test__/UserProfile.component.test.tsx index b678b61472..b5156ee324 100644 --- a/client/src/components/Backend/screens/UserProfile/__test__/UserProfile.component.test.tsx +++ b/client/src/components/Backend/screens/UserProfile/__test__/UserProfile.component.test.tsx @@ -1,15 +1,12 @@ -import { UserProfile } from "../UserProfile"; +import "@testing-library/jest-dom"; +import { fireEvent, RenderResult, waitFor } from "@testing-library/react"; +import "jest-styled-components"; import { act, ReactTestRenderer } from "react-test-renderer"; -import { - wrapWithProvidersAndRender, - wrapWithProvidersAndRenderForTesting, -} from "../../../../../../jest/lib/wrapWithProvidersAndRender"; import { initialMockStore } from "__fixtures__/reduxStore"; import { testUser } from "__fixtures__/user"; -import { fireEvent, RenderResult, waitFor } from "@testing-library/react"; -import "jest-styled-components"; import { setupGoogleMock } from "__mocks__/react-google-autocomplete"; -import "@testing-library/jest-dom"; +import { wrapWithProvidersAndRenderForTesting } from "../../../../../../jest/lib/wrapWithProvidersAndRender"; +import { UserProfile } from "../UserProfile"; jest.mock("next/router", () => require("next-router-mock")); jest.mock("components/UI/Tooltip", () => jest.fn().mockReturnValue(<>)); @@ -41,7 +38,7 @@ describe("UserProfile", () => { it("should render correctly when loading", () => { window.scrollTo = jest.fn(); let component: ReactTestRenderer; - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserProfile, reduxState: { ...initialMockStore, @@ -54,7 +51,7 @@ describe("UserProfile", () => { it("should render correctly", () => { window.scrollTo = jest.fn(); let component: ReactTestRenderer; - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserProfile, reduxState: { ...initialMockStore, diff --git a/client/src/components/Backend/screens/UserStructure/__tests__/UserStructure.test.tsx b/client/src/components/Backend/screens/UserStructure/__tests__/UserStructure.test.tsx index e70bc419be..ae8ecf8b23 100644 --- a/client/src/components/Backend/screens/UserStructure/__tests__/UserStructure.test.tsx +++ b/client/src/components/Backend/screens/UserStructure/__tests__/UserStructure.test.tsx @@ -1,15 +1,15 @@ -import { wrapWithProvidersAndRender } from "../../../../../../jest/lib/wrapWithProvidersAndRender"; -import { UserStructureComponent } from "../UserStructure.component"; +import { GetStructureResponse, StructureMemberRole, StructureStatus, UserStatus } from "@refugies-info/api-types"; +import { colors } from "colors"; import "jest-styled-components"; import { act, ReactTestRenderer } from "react-test-renderer"; -import { initialMockStore } from "__fixtures__/reduxStore"; import { fetchUserStructureActionCreator, updateUserStructureActionCreator, } from "services/UserStructure/userStructure.actions"; import Swal from "sweetalert2"; -import { colors } from "colors"; -import { GetStructureResponse, StructureMemberRole, StructureStatus, UserStatus } from "@refugies-info/api-types"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../../../../../jest/lib/wrapWithProvidersAndRender"; +import { UserStructureComponent } from "../UserStructure.component"; jest.mock("next/router", () => require("next-router-mock")); // need to mock react strap because issue with modal @@ -37,7 +37,7 @@ describe("UserStructure", () => { window.scrollTo = jest.fn(); let component: ReactTestRenderer; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserStructureComponent, reduxState: { ...initialMockStore, @@ -66,7 +66,7 @@ describe("UserStructure", () => { window.scrollTo = jest.fn(); let component: ReactTestRenderer; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserStructureComponent, reduxState: { ...initialMockStore, @@ -113,7 +113,7 @@ describe("UserStructure", () => { let component: ReactTestRenderer; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserStructureComponent, reduxState: { ...initialMockStore, @@ -153,7 +153,7 @@ describe("UserStructure", () => { let component: ReactTestRenderer; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserStructureComponent, reduxState: { ...initialMockStore, @@ -193,7 +193,7 @@ describe("UserStructure", () => { let component: ReactTestRenderer; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserStructureComponent, reduxState: { ...initialMockStore, @@ -236,7 +236,7 @@ describe("UserStructure", () => { let component: ReactTestRenderer; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserStructureComponent, reduxState: { ...initialMockStore, @@ -301,7 +301,7 @@ describe("UserStructure", () => { let component: ReactTestRenderer; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserStructureComponent, reduxState: { ...initialMockStore, diff --git a/client/src/components/Backend/screens/UserTranslation/__tests__/UserTranslation.component.test.tsx b/client/src/components/Backend/screens/UserTranslation/__tests__/UserTranslation.component.test.tsx index 8f603009da..bd54443c25 100644 --- a/client/src/components/Backend/screens/UserTranslation/__tests__/UserTranslation.component.test.tsx +++ b/client/src/components/Backend/screens/UserTranslation/__tests__/UserTranslation.component.test.tsx @@ -1,13 +1,13 @@ //@ts-nocheck -import { wrapWithProvidersAndRender } from "../../../../../../jest/lib/wrapWithProvidersAndRender"; -import UserTranslation from "../UserTranslation"; -import { initialMockStore } from "__fixtures__/reduxStore"; -import { fetchDispositifsWithTranslationsStatusActionCreator } from "services/DispositifsWithTranslationsStatus/dispositifsWithTranslationsStatus.actions"; +import "jest-styled-components"; +import { useParams } from "react-router-dom"; import { act } from "react-test-renderer"; -import { dispositifsWithTranslations } from "__fixtures__/dispositifsWithTrad"; +import { fetchDispositifsWithTranslationsStatusActionCreator } from "services/DispositifsWithTranslationsStatus/dispositifsWithTranslationsStatus.actions"; import API from "utils/API"; -import { useParams } from "react-router-dom"; -import "jest-styled-components"; +import { dispositifsWithTranslations } from "__fixtures__/dispositifsWithTrad"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../../../../../jest/lib/wrapWithProvidersAndRender"; +import UserTranslation from "../UserTranslation"; jest.mock("next/router", () => require("next-router-mock")); // Mock history @@ -40,7 +40,7 @@ describe("user translation", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserTranslation, reduxState: { ...initialMockStore, @@ -63,7 +63,7 @@ describe("user translation", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserTranslation, reduxState: { ...initialMockStore, @@ -81,7 +81,7 @@ describe("user translation", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserTranslation, reduxState: { ...initialMockStore, @@ -100,7 +100,7 @@ describe("user translation", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserTranslation, reduxState: { ...initialMockStore, @@ -120,7 +120,7 @@ describe("user translation", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserTranslation, reduxState: { ...initialMockStore, @@ -140,7 +140,7 @@ describe("user translation", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserTranslation, reduxState: { ...initialMockStore, @@ -160,7 +160,7 @@ describe("user translation", () => { window.scrollTo = jest.fn(); let component; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: UserTranslation, reduxState: { ...initialMockStore, diff --git a/client/src/components/Pages/auth/CheckCode/CheckCode.test.tsx b/client/src/components/Pages/auth/CheckCode/CheckCode.test.tsx index 933e9f86b6..6d88fd319b 100644 --- a/client/src/components/Pages/auth/CheckCode/CheckCode.test.tsx +++ b/client/src/components/Pages/auth/CheckCode/CheckCode.test.tsx @@ -1,13 +1,10 @@ -import CheckCode from "./CheckCode"; +import { fireEvent, RenderResult, waitFor } from "@testing-library/react"; import mockRouter from "next-router-mock"; import { act, ReactTestRenderer } from "react-test-renderer"; -import { - wrapWithProvidersAndRender, - wrapWithProvidersAndRenderForTesting, -} from "../../../../../jest/lib/wrapWithProvidersAndRender"; -import { initialMockStore } from "__fixtures__/reduxStore"; -import { fireEvent, RenderResult, waitFor } from "@testing-library/react"; import API from "utils/API"; +import { initialMockStore } from "__fixtures__/reduxStore"; +import { wrapWithProvidersAndRenderForTesting } from "../../../../../jest/lib/wrapWithProvidersAndRender"; +import CheckCode from "./CheckCode"; jest.mock("next/router", () => require("next-router-mock")); const logUserMock = jest.fn(); @@ -28,7 +25,7 @@ describe("CheckCode", () => { let component: ReactTestRenderer; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: CheckCode, reduxState: { ...initialMockStore, @@ -50,7 +47,7 @@ describe("CheckCode", () => { let component: ReactTestRenderer; act(() => { - component = wrapWithProvidersAndRender({ + component = wrapWithProvidersAndRenderForTesting({ Component: CheckCode, reduxState: { ...initialMockStore, From b39528a41184f6da1b021bcdf4c7f27271f6a7d1 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Mon, 15 Jul 2024 18:02:32 +0200 Subject: [PATCH 21/37] chore(client): :arrow_up: Add @testing-library/user-event dependency --- client/package.json | 1 + yarn.lock | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/client/package.json b/client/package.json index 101f3d3039..d42475a2c1 100644 --- a/client/package.json +++ b/client/package.json @@ -100,6 +100,7 @@ "@testing-library/dom": "^10.3.1", "@testing-library/jest-dom": "^6.4.6", "@testing-library/react": "^16.0.0", + "@testing-library/user-event": "^14.5.2", "@types/autosuggest-highlight": "^3.2.0", "@types/file-saver": "^2.0.1", "@types/html-to-draftjs": "^1.4.0", diff --git a/yarn.lock b/yarn.lock index b74c869a03..a322636449 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1816,6 +1816,11 @@ dependencies: "@babel/runtime" "^7.12.5" +"@testing-library/user-event@^14.5.2": + version "14.5.2" + resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.2.tgz#db7257d727c891905947bd1c1a99da20e03c2ebd" + integrity sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ== + "@tootallnate/once@2": version "2.0.0" resolved "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz" From 535ccd50d76e6f23b470e7dd074216927ffe24f7 Mon Sep 17 00:00:00 2001 From: Luis Arias Date: Mon, 15 Jul 2024 18:06:58 +0200 Subject: [PATCH 22/37] refactor(client): :recycle: Use data-testid instead of data-test-id attribute --- .../Admin/sharedComponents/SubComponents.tsx | 17 ++++----- .../__tests__/SubComponents.test.tsx | 4 +- .../UserContributions.component.test.tsx | 2 +- .../components/UserContribTable.tsx | 15 ++++---- .../screens/UserFavorites/UserFavorites.tsx | 26 ++++++------- .../UserFavorites.component.test.tsx | 4 +- .../__tests__/UserNotifications.test.tsx | 8 ++-- .../components/Notification.tsx | 19 ++++------ .../__tests__/UserStructure.test.tsx | 10 ++--- .../components/EditMemberModal.tsx | 12 +++--- .../UserStructure/components/MembresTable.tsx | 15 ++++---- .../screens/UserStructure/components/Role.tsx | 5 +-- .../components/UserStructureDetails.tsx | 23 ++++++----- .../components/TranslationAvancementTable.tsx | 38 +++++++++---------- .../TranslationsAvancement.tsx | 24 ++++++------ 15 files changed, 105 insertions(+), 117 deletions(-) diff --git a/client/src/components/Backend/screens/Admin/sharedComponents/SubComponents.tsx b/client/src/components/Backend/screens/Admin/sharedComponents/SubComponents.tsx index f93a7eccb8..2b309732aa 100644 --- a/client/src/components/Backend/screens/Admin/sharedComponents/SubComponents.tsx +++ b/client/src/components/Backend/screens/Admin/sharedComponents/SubComponents.tsx @@ -1,13 +1,12 @@ -import React from "react"; -import styled from "styled-components"; -import { limitNbCaracters } from "lib"; -import { correspondingStatus, progressionData, publicationData } from "../AdminContenu/data"; -import EVAIcon from "components/UI/EVAIcon/EVAIcon"; +import { GetAllDispositifsResponse, Id } from "@refugies-info/api-types"; import { colors } from "colors"; +import EVAIcon from "components/UI/EVAIcon/EVAIcon"; +import { useUser } from "hooks"; +import { limitNbCaracters } from "lib"; import moment from "moment"; +import styled from "styled-components"; import styles from "../Admin.module.scss"; -import { GetAllDispositifsResponse, Id } from "@refugies-info/api-types"; -import { useUser } from "hooks"; +import { correspondingStatus, progressionData, publicationData } from "../AdminContenu/data"; const Container = styled.div<{ isDarkBackground: boolean }>` font-weight: normal; @@ -195,7 +194,7 @@ export const ValidateButton = (props: { onClick: () => void; disabled: boolean } onClick={props.onClick} disabled={props.disabled} hoverColor={colors.validationHover} - data-test-id="validate-button" + data-testid="validate-button" >
@@ -226,7 +225,7 @@ export const DeleteButton = (props: { onClick: (event: any) => void; disabled: b onClick={props.disabled ? undefined : props.onClick} hoverColor={colors.error} disabled={props.disabled} - data-test-id="delete-button" + data-testid="delete-button" >
diff --git a/client/src/components/Backend/screens/Admin/sharedComponents/__tests__/SubComponents.test.tsx b/client/src/components/Backend/screens/Admin/sharedComponents/__tests__/SubComponents.test.tsx index 8ed5f925d8..e3cfa958e4 100644 --- a/client/src/components/Backend/screens/Admin/sharedComponents/__tests__/SubComponents.test.tsx +++ b/client/src/components/Backend/screens/Admin/sharedComponents/__tests__/SubComponents.test.tsx @@ -194,7 +194,7 @@ test("should render ValidateButton not disabled", () => { test("should call onClick ValidateButton", () => { const onClick = jest.fn(); component = TestRenderer.create(); - component.root.findByProps({ "data-test-id": "validate-button" }).props.onClick(); + component.root.findByProps({ "data-testid": "validate-button" }).props.onClick(); expect(onClick).toHaveBeenCalled(); }); @@ -216,7 +216,7 @@ test("should render DeleteButton not disabled", () => { test("should call onClick DeleteButton", () => { const onClick = jest.fn(); component = TestRenderer.create(); - component.root.findByProps({ "data-test-id": "delete-button" }).props.onClick(); + component.root.findByProps({ "data-testid": "delete-button" }).props.onClick(); expect(onClick).toHaveBeenCalled(); }); diff --git a/client/src/components/Backend/screens/UserContributions/__tests__/UserContributions.component.test.tsx b/client/src/components/Backend/screens/UserContributions/__tests__/UserContributions.component.test.tsx index 4be7ce9620..b1e4341ece 100644 --- a/client/src/components/Backend/screens/UserContributions/__tests__/UserContributions.component.test.tsx +++ b/client/src/components/Backend/screens/UserContributions/__tests__/UserContributions.component.test.tsx @@ -193,7 +193,7 @@ describe("userContributions", () => { }); expect(fetchUserContributionsActionCreator).toHaveBeenCalledWith(); act(() => - component.root.findByProps({ "data-test-id": "test_delete_id1" }).props.onClick({ stopPropagation: () => {} }), + component.root.findByProps({ "data-testid": "test_delete_id1" }).props.onClick({ stopPropagation: () => {} }), ); expect(component.toJSON()).toMatchSnapshot(); expect(Swal.fire).toHaveBeenCalledWith({ diff --git a/client/src/components/Backend/screens/UserContributions/components/UserContribTable.tsx b/client/src/components/Backend/screens/UserContributions/components/UserContribTable.tsx index 4bc6974ba1..b3af27f324 100644 --- a/client/src/components/Backend/screens/UserContributions/components/UserContribTable.tsx +++ b/client/src/components/Backend/screens/UserContributions/components/UserContribTable.tsx @@ -1,11 +1,10 @@ -import React from "react"; -import { Table } from "reactstrap"; +import { Id } from "@refugies-info/api-types"; import Link from "next/link"; -import { FormattedUserContribution } from "../types"; -import { TypeContenu, Responsabilite, ContribStyledStatus, StatutHeader } from "./SubComponents"; -import { Title, DeleteButton, SeeButton } from "../../Admin/sharedComponents/SubComponents"; +import { Table } from "reactstrap"; import styles from "scss/components/adminTable.module.scss"; -import { Id } from "@refugies-info/api-types"; +import { DeleteButton, SeeButton, Title } from "../../Admin/sharedComponents/SubComponents"; +import { FormattedUserContribution } from "../types"; +import { ContribStyledStatus, Responsabilite, StatutHeader, TypeContenu } from "./SubComponents"; const headers = ["Type", "Titre", "Responsabilité", "Statut", "Merci", "Vues"]; interface Props { @@ -43,7 +42,7 @@ export const UserContribTable = (props: Props) => ( const burl = "/" + (element.typeContenu || "dispositif") + "/" + element._id; return ( - + @@ -105,7 +104,7 @@ export const UserContribTable = (props: Props) => (
props.deleteDispositif(event, element._id, element.isAuthorizedToDelete)} disabled={!element.isAuthorizedToDelete} /> diff --git a/client/src/components/Backend/screens/UserFavorites/UserFavorites.tsx b/client/src/components/Backend/screens/UserFavorites/UserFavorites.tsx index 0e107f70b6..27555bdf7a 100644 --- a/client/src/components/Backend/screens/UserFavorites/UserFavorites.tsx +++ b/client/src/components/Backend/screens/UserFavorites/UserFavorites.tsx @@ -1,22 +1,22 @@ -import React, { useEffect, useMemo, useState } from "react"; +import TitleWithNumber from "components/Backend/TitleWithNumber"; +import { FrameModal } from "components/Modals"; +import DemarcheCard from "components/UI/DemarcheCard"; +import DispositifCard from "components/UI/DispositifCard"; +import FButton from "components/UI/FButton/FButton"; +import Toast from "components/UI/Toast"; +import { useTranslation } from "next-i18next"; +import { useRouter } from "next/router"; +import { useEffect, useMemo, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; +import { LoadingStatusKey } from "services/LoadingStatus/loadingStatus.actions"; +import { isLoadingSelector } from "services/LoadingStatus/loadingStatus.selectors"; import { fetchUserFavoritesActionCreator, updateUserFavoritesActionCreator, } from "services/UserFavoritesInLocale/UserFavoritesInLocale.actions"; -import { LoadingStatusKey } from "services/LoadingStatus/loadingStatus.actions"; -import { isLoadingSelector } from "services/LoadingStatus/loadingStatus.selectors"; import { userFavoritesSelector } from "services/UserFavoritesInLocale/UserFavoritesInLocale.selectors"; -import { NoFavorites } from "./components/NoFavorites.component"; -import { FrameModal } from "components/Modals"; -import TitleWithNumber from "components/Backend/TitleWithNumber"; -import FButton from "components/UI/FButton/FButton"; -import DemarcheCard from "components/UI/DemarcheCard"; -import DispositifCard from "components/UI/DispositifCard"; -import Toast from "components/UI/Toast"; import { FavoritesLoading } from "./components/FavoritesLoading"; -import { useRouter } from "next/router"; -import { useTranslation } from "next-i18next"; +import { NoFavorites } from "./components/NoFavorites.component"; import styles from "./UserFavorites.module.scss"; interface Props { @@ -82,7 +82,7 @@ const UserFavorites = (props: Props) => { type="outline-black" name="trash-outline" onClick={removeAllFavorites} - data-test-id="test-delete-button" + data-testid="test-delete-button" > {t("UserFavorites.Tout supprimer", "Tout supprimer")} diff --git a/client/src/components/Backend/screens/UserFavorites/__tests__/UserFavorites.component.test.tsx b/client/src/components/Backend/screens/UserFavorites/__tests__/UserFavorites.component.test.tsx index 22160ea17f..55a5201be3 100644 --- a/client/src/components/Backend/screens/UserFavorites/__tests__/UserFavorites.component.test.tsx +++ b/client/src/components/Backend/screens/UserFavorites/__tests__/UserFavorites.component.test.tsx @@ -151,7 +151,7 @@ describe("UserFavorites", () => { }); }); expect(fetchUserFavoritesActionCreator).toHaveBeenCalledWith("fr"); - component.root.findByProps({ "data-test-id": "test-delete-button" }).props.onClick(); + component.root.findByProps({ "data-testid": "test-delete-button" }).props.onClick(); expect(updateUserFavoritesActionCreator).toHaveBeenCalledWith({ type: "remove-all", @@ -173,7 +173,7 @@ describe("UserFavorites", () => { }); expect(fetchUserFavoritesActionCreator).toHaveBeenCalledWith("en"); - component.root.findByProps({ "data-test-id": "test-delete-button" }).props.onClick(); + component.root.findByProps({ "data-testid": "test-delete-button" }).props.onClick(); expect(updateUserFavoritesActionCreator).toHaveBeenCalledWith({ type: "remove-all", diff --git a/client/src/components/Backend/screens/UserNotifications/__tests__/UserNotifications.test.tsx b/client/src/components/Backend/screens/UserNotifications/__tests__/UserNotifications.test.tsx index 49f9287041..4a50fc6b94 100644 --- a/client/src/components/Backend/screens/UserNotifications/__tests__/UserNotifications.test.tsx +++ b/client/src/components/Backend/screens/UserNotifications/__tests__/UserNotifications.test.tsx @@ -178,7 +178,7 @@ describe("UserNotifications", () => { locale: "fr", }); component.root - .findByProps({ "data-test-id": "test-notif-new content" }) + .findByProps({ "data-testid": "test-notif-new content" }) .props.onClick({ stopPropagation: jest.fn() }); expect(Router).toMatchObject({ asPath: "/dispositif/id" }); }); @@ -209,7 +209,7 @@ describe("UserNotifications", () => { id: "1", locale: "fr", }); - component.root.findByProps({ "data-test-id": "test-notif-annuaire" }).props.onClick({ stopPropagation: jest.fn() }); + component.root.findByProps({ "data-testid": "test-notif-annuaire" }).props.onClick({ stopPropagation: jest.fn() }); expect(Router).toMatchObject({ asPath: "/directory-create" }); }); @@ -239,9 +239,7 @@ describe("UserNotifications", () => { id: "1", locale: "fr", }); - component.root - .findByProps({ "data-test-id": "test-delete-reaction" }) - .props.onClick({ stopPropagation: jest.fn() }); + component.root.findByProps({ "data-testid": "test-delete-reaction" }).props.onClick({ stopPropagation: jest.fn() }); expect(updateDispositifReactionActionCreator).toHaveBeenLastCalledWith({ suggestion: { dispositifId: "id2", diff --git a/client/src/components/Backend/screens/UserNotifications/components/Notification.tsx b/client/src/components/Backend/screens/UserNotifications/components/Notification.tsx index 113a71d53d..62ffa86710 100644 --- a/client/src/components/Backend/screens/UserNotifications/components/Notification.tsx +++ b/client/src/components/Backend/screens/UserNotifications/components/Notification.tsx @@ -1,11 +1,10 @@ -import React from "react"; -import { useRouter } from "next/router"; -import styled from "styled-components"; +import { colors } from "colors"; import EVAIcon from "components/UI/EVAIcon/EVAIcon"; -import moment, { Moment } from "moment"; import FButton from "components/UI/FButton/FButton"; -import { colors } from "colors"; +import moment from "moment"; +import { useRouter } from "next/router"; import { getPath } from "routes"; +import styled from "styled-components"; const Container = styled.div<{ read: boolean }>` background: ${(props: { read: boolean }) => (props.read ? colors.white : colors.focus)}; @@ -114,11 +113,7 @@ export const Notification = (props: Props) => { }; return ( - onNotifClick(event)} - data-test-id={"test-notif-" + props.type} - > + onNotifClick(event)} data-testid={"test-notif-" + props.type}> {getText(props.type)} @@ -138,7 +133,7 @@ export const Notification = (props: Props) => { name="trash-2" onClick={onAnnuaireNotifDeleteClick} className="ms-2" - data-test-id="test-delete-annuaire" + data-testid="test-delete-annuaire" /> )} @@ -157,7 +152,7 @@ export const Notification = (props: Props) => { name="trash-2" onClick={onReactionDeleteClick} className="ms-2" - data-test-id="test-delete-reaction" + data-testid="test-delete-reaction" /> )} diff --git a/client/src/components/Backend/screens/UserStructure/__tests__/UserStructure.test.tsx b/client/src/components/Backend/screens/UserStructure/__tests__/UserStructure.test.tsx index ae8ecf8b23..c752938813 100644 --- a/client/src/components/Backend/screens/UserStructure/__tests__/UserStructure.test.tsx +++ b/client/src/components/Backend/screens/UserStructure/__tests__/UserStructure.test.tsx @@ -225,7 +225,7 @@ describe("UserStructure", () => { }); }); act(() => { - component.root.findByProps({ "data-test-id": "test-add-member" }).props.onClick(); + component.root.findByProps({ "data-testid": "test-add-member" }).props.onClick(); }); //@ts-ignore expect(component.toJSON()).toMatchSnapshot(); @@ -268,18 +268,18 @@ describe("UserStructure", () => { }); }); act(() => { - component.root.findByProps({ "data-test-id": "test_see_id1" }).props.onClick(); + component.root.findByProps({ "data-testid": "test_see_id1" }).props.onClick(); }); //@ts-ignore expect(component.toJSON()).toMatchSnapshot(); act(() => { - component.root.findByProps({ "data-test-id": "test-role-Responsable" }).props.onClick(); + component.root.findByProps({ "data-testid": "test-role-Responsable" }).props.onClick(); }); //@ts-ignore expect(component.toJSON()).toMatchSnapshot(); act(() => { - component.root.findByProps({ "data-test-id": "test-validate-edit" }).props.onClick(); + component.root.findByProps({ "data-testid": "test-validate-edit" }).props.onClick(); }); expect(updateUserStructureActionCreator).toHaveBeenCalledWith({ membres: { @@ -333,7 +333,7 @@ describe("UserStructure", () => { }); }); act(() => { - component.root.findByProps({ "data-test-id": "test_delete_id1" }).props.onClick(); + component.root.findByProps({ "data-testid": "test_delete_id1" }).props.onClick(); }); expect(Swal.fire).toHaveBeenCalledWith({ title: "Êtes-vous sûr ?", diff --git a/client/src/components/Backend/screens/UserStructure/components/EditMemberModal.tsx b/client/src/components/Backend/screens/UserStructure/components/EditMemberModal.tsx index e9eb1603a6..2d71b9f174 100644 --- a/client/src/components/Backend/screens/UserStructure/components/EditMemberModal.tsx +++ b/client/src/components/Backend/screens/UserStructure/components/EditMemberModal.tsx @@ -1,12 +1,12 @@ -import React, { useState } from "react"; -import { Modal } from "reactstrap"; +import { Id, StructureMember, StructureMemberRole } from "@refugies-info/api-types"; +import marioProfile from "assets/mario-profile.jpg"; import FButton from "components/UI/FButton/FButton"; import Image from "next/image"; +import { useState } from "react"; +import { Modal } from "reactstrap"; import styled from "styled-components"; -import marioProfile from "assets/mario-profile.jpg"; -import { Role } from "./Role"; import styles from "./MemberModal.module.scss"; -import { Id, StructureMember, StructureMemberRole } from "@refugies-info/api-types"; +import { Role } from "./Role"; const Title = styled.div` font-weight: normal; @@ -101,7 +101,7 @@ const EditMemberModal = (props: Props) => { name="checkmark-outline" onClick={modifyRole} disabled={!selectedRole || selectedRole === props.selectedUser.mainRole} - data-test-id="test-validate-edit" + data-testid="test-validate-edit" > Valider diff --git a/client/src/components/Backend/screens/UserStructure/components/MembresTable.tsx b/client/src/components/Backend/screens/UserStructure/components/MembresTable.tsx index 2e00a6db5a..22a65c5e33 100644 --- a/client/src/components/Backend/screens/UserStructure/components/MembresTable.tsx +++ b/client/src/components/Backend/screens/UserStructure/components/MembresTable.tsx @@ -1,14 +1,13 @@ -import { Table } from "reactstrap"; -import React from "react"; -import Image from "next/image"; -import { EditButtonWithoutNavigation, DeleteButton } from "../../Admin/sharedComponents/SubComponents"; import marioProfile from "assets/mario-profile.jpg"; -import styled from "styled-components"; import { colors } from "colors"; +import Image from "next/image"; +import { Table } from "reactstrap"; +import styled from "styled-components"; +import { DeleteButton, EditButtonWithoutNavigation } from "../../Admin/sharedComponents/SubComponents"; // import "./MembresTable.scss"; +import { GetStructureResponse, Id, StructureMember } from "@refugies-info/api-types"; import moment from "moment"; import "moment/locale/fr"; -import { GetStructureResponse, Id, StructureMember } from "@refugies-info/api-types"; moment.locale("fr"); const RowContainer = styled.div` @@ -101,14 +100,14 @@ export const MembresTable = (props: Props) => (
{ props.setSelectedUser(element); props.toggleEditMemberModal(); }} /> props.deleteUserFromStructure(element.userId)} /> diff --git a/client/src/components/Backend/screens/UserStructure/components/Role.tsx b/client/src/components/Backend/screens/UserStructure/components/Role.tsx index 759bdf7f8a..adbd6e3549 100644 --- a/client/src/components/Backend/screens/UserStructure/components/Role.tsx +++ b/client/src/components/Backend/screens/UserStructure/components/Role.tsx @@ -1,7 +1,6 @@ -import React from "react"; -import styled from "styled-components"; import { colors } from "colors"; import EVAIcon from "components/UI/EVAIcon"; +import styled from "styled-components"; const MainContainer = styled.div<{ state: string }>` background: ${(props: { state: string }) => @@ -45,7 +44,7 @@ export const Role = (props: Props) => ( props.onRoleSelect(props.role)} state={props.state} - data-test-id={"test-role-" + props.role} + data-testid={"test-role-" + props.role} > {getTitle(props.role)} diff --git a/client/src/components/Backend/screens/UserStructure/components/UserStructureDetails.tsx b/client/src/components/Backend/screens/UserStructure/components/UserStructureDetails.tsx index 6f0139f512..e855514a80 100644 --- a/client/src/components/Backend/screens/UserStructure/components/UserStructureDetails.tsx +++ b/client/src/components/Backend/screens/UserStructure/components/UserStructureDetails.tsx @@ -1,19 +1,18 @@ -import React, { useState } from "react"; -import { MainContainer, StructurePictureContainer, StructureContainer } from "./SubComponents"; -import Image from "next/image"; -import TitleWithNumber from "components/Backend/TitleWithNumber"; -import { Picture, StructureMemberRole } from "@refugies-info/api-types"; +import { GetStructureResponse, Id, Picture, StructureMember, StructureMemberRole } from "@refugies-info/api-types"; import placeholder from "assets/no_results_alt.svg"; -import styled from "styled-components"; +import TitleWithNumber from "components/Backend/TitleWithNumber"; import FButton from "components/UI/FButton/FButton"; -import { MembresTable } from "./MembresTable"; +import Image from "next/image"; +import Link from "next/link"; +import { useRouter } from "next/router"; +import { useState } from "react"; +import { getPath } from "routes"; +import styled from "styled-components"; import AddMemberModal from "./AddMemberModal"; import EditMemberModal from "./EditMemberModal"; +import { MembresTable } from "./MembresTable"; +import { MainContainer, StructureContainer, StructurePictureContainer } from "./SubComponents"; import styles from "./UserStructureDetails.module.scss"; -import Link from "next/link"; -import { getPath } from "routes"; -import { useRouter } from "next/router"; -import { GetStructureResponse, Id, StructureMember } from "@refugies-info/api-types"; const StructureName = styled.div` font-weight: bold; @@ -114,7 +113,7 @@ export const UserStructureDetails = (props: Props) => { type="dark" name="person-add-outline" onClick={toggleAddMemberModal} - data-test-id="test-add-member" + data-testid="test-add-member" > Ajouter un membre diff --git a/client/src/components/Backend/screens/UserTranslation/components/TranslationAvancementTable.tsx b/client/src/components/Backend/screens/UserTranslation/components/TranslationAvancementTable.tsx index 121dc12949..436c4af37d 100644 --- a/client/src/components/Backend/screens/UserTranslation/components/TranslationAvancementTable.tsx +++ b/client/src/components/Backend/screens/UserTranslation/components/TranslationAvancementTable.tsx @@ -1,27 +1,27 @@ -import React, { useState } from "react"; -import styled from "styled-components"; -import { colors } from "colors"; -import { Table } from "reactstrap"; -import { TypeContenu } from "../../UserContributions/components/SubComponents"; -import { Title, TabHeader } from "../../Admin/sharedComponents/SubComponents"; -import { ProgressWithValue, TradStatus } from "./SubComponents"; -import moment from "moment"; -import "moment/locale/fr"; -import Swal from "sweetalert2"; -import API from "utils/API"; -import FButton from "components/UI/FButton/FButton"; -import { fetchDispositifsWithTranslationsStatusActionCreator } from "services/DispositifsWithTranslationsStatus/dispositifsWithTranslationsStatus.actions"; -import { useDispatch } from "react-redux"; -import { sortData } from "./functions"; -import styles from "scss/components/adminTable.module.scss"; import { GetDispositifsWithTranslationAvancementResponse, GetUserInfoResponse, Languages, } from "@refugies-info/api-types"; +import { colors } from "colors"; +import FButton from "components/UI/FButton/FButton"; +import { useLanguages } from "hooks"; import { handleApiError } from "lib/handleApiErrors"; +import moment from "moment"; +import "moment/locale/fr"; import { useRouter } from "next/router"; -import { useLanguages } from "hooks"; +import { useState } from "react"; +import { useDispatch } from "react-redux"; +import { Table } from "reactstrap"; +import styles from "scss/components/adminTable.module.scss"; +import { fetchDispositifsWithTranslationsStatusActionCreator } from "services/DispositifsWithTranslationsStatus/dispositifsWithTranslationsStatus.actions"; +import styled from "styled-components"; +import Swal from "sweetalert2"; +import API from "utils/API"; +import { TabHeader, Title } from "../../Admin/sharedComponents/SubComponents"; +import { TypeContenu } from "../../UserContributions/components/SubComponents"; +import { sortData } from "./functions"; +import { ProgressWithValue, TradStatus } from "./SubComponents"; moment.locale("fr"); @@ -171,7 +171,7 @@ export const TranslationAvancementTable = (props: Props) => {