From 048e49b89c85ac57567498cb2297c18b50a6747b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 10:45:26 +0000 Subject: [PATCH 1/4] build(deps): bump react-router-dom from 6.28.0 to 7.0.2 Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.28.0 to 7.0.2. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@7.0.2/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 116 +++++++++++++++++++++++++++++++--------------- package.json | 2 +- 2 files changed, 80 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a691ac8..072301b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "react-countdown": "^2.3.6", "react-dom": "^18.3.1", "react-query": "^3.39.2", - "react-router-dom": "^6.28.0", + "react-router-dom": "^7.0.2", "react-scripts": "5.0.1", "react-use": "^17.5.1", "sass": "^1.81.0", @@ -4599,14 +4599,6 @@ "node": ">= 8" } }, - "node_modules/@remix-run/router": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz", - "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@rollup/plugin-babel": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz", @@ -5437,6 +5429,11 @@ "@types/node": "*" } }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" + }, "node_modules/@types/eslint": { "version": "7.29.0", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz", @@ -19193,33 +19190,49 @@ } }, "node_modules/react-router": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz", - "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz", + "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==", "dependencies": { - "@remix-run/router": "1.21.0" + "@types/cookie": "^0.6.0", + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0", + "turbo-stream": "2.4.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8" + "react": ">=18", + "react-dom": ">=18" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + } } }, "node_modules/react-router-dom": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz", - "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.2.tgz", + "integrity": "sha512-VJOQ+CDWFDGaWdrG12Nl+d7yHtLaurNgAQZVgaIy7/Xd+DojgmYLosFfZdGz1wpxmjJIAkAMVTKWcvkx1oggAw==", "dependencies": { - "@remix-run/router": "1.21.0", - "react-router": "6.28.0" + "react-router": "7.0.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/react-router/node_modules/cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", + "engines": { + "node": ">=18" } }, "node_modules/react-scripts": { @@ -21175,6 +21188,11 @@ "node": ">= 0.8.0" } }, + "node_modules/set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==" + }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -22293,6 +22311,11 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, + "node_modules/turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -26830,11 +26853,6 @@ } } }, - "@remix-run/router": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz", - "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==" - }, "@rollup/plugin-babel": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz", @@ -27404,6 +27422,11 @@ "@types/node": "*" } }, + "@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" + }, "@types/eslint": { "version": "7.29.0", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz", @@ -37588,20 +37611,29 @@ "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==" }, "react-router": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz", - "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz", + "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==", "requires": { - "@remix-run/router": "1.21.0" + "@types/cookie": "^0.6.0", + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0", + "turbo-stream": "2.4.0" + }, + "dependencies": { + "cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==" + } } }, "react-router-dom": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz", - "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.2.tgz", + "integrity": "sha512-VJOQ+CDWFDGaWdrG12Nl+d7yHtLaurNgAQZVgaIy7/Xd+DojgmYLosFfZdGz1wpxmjJIAkAMVTKWcvkx1oggAw==", "requires": { - "@remix-run/router": "1.21.0", - "react-router": "6.28.0" + "react-router": "7.0.2" } }, "react-scripts": { @@ -39071,6 +39103,11 @@ "send": "0.19.0" } }, + "set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==" + }, "set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -39902,6 +39939,11 @@ } } }, + "turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==" + }, "type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", diff --git a/package.json b/package.json index 0cbf0ed2..990d88f1 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "react-countdown": "^2.3.6", "react-dom": "^18.3.1", "react-query": "^3.39.2", - "react-router-dom": "^6.28.0", + "react-router-dom": "^7.0.2", "react-scripts": "5.0.1", "react-use": "^17.5.1", "sass": "^1.81.0", From 968a3fac021e606d2a5fffbd95f0e4d5fce437f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:48:03 +0000 Subject: [PATCH 2/4] build(deps): bump react-router-dom from 6.28.0 to 7.0.2 Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.28.0 to 7.0.2. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@7.0.2/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 116 +++++++++++++++++++++++++++++++--------------- package.json | 2 +- 2 files changed, 80 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index d133de70..d74a3562 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "react-countdown": "^2.3.6", "react-dom": "^18.3.1", "react-query": "^3.39.2", - "react-router-dom": "^6.28.0", + "react-router-dom": "^7.0.2", "react-scripts": "5.0.1", "react-use": "^17.5.1", "sass": "^1.81.0", @@ -4599,14 +4599,6 @@ "node": ">= 8" } }, - "node_modules/@remix-run/router": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz", - "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@rollup/plugin-babel": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz", @@ -5437,6 +5429,11 @@ "@types/node": "*" } }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" + }, "node_modules/@types/eslint": { "version": "7.29.0", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz", @@ -19208,33 +19205,49 @@ } }, "node_modules/react-router": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz", - "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz", + "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==", "dependencies": { - "@remix-run/router": "1.21.0" + "@types/cookie": "^0.6.0", + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0", + "turbo-stream": "2.4.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8" + "react": ">=18", + "react-dom": ">=18" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + } } }, "node_modules/react-router-dom": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz", - "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.2.tgz", + "integrity": "sha512-VJOQ+CDWFDGaWdrG12Nl+d7yHtLaurNgAQZVgaIy7/Xd+DojgmYLosFfZdGz1wpxmjJIAkAMVTKWcvkx1oggAw==", "dependencies": { - "@remix-run/router": "1.21.0", - "react-router": "6.28.0" + "react-router": "7.0.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" + "react": ">=18", + "react-dom": ">=18" + } + }, + "node_modules/react-router/node_modules/cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", + "engines": { + "node": ">=18" } }, "node_modules/react-scripts": { @@ -21190,6 +21203,11 @@ "node": ">= 0.8.0" } }, + "node_modules/set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==" + }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -22308,6 +22326,11 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, + "node_modules/turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -26845,11 +26868,6 @@ } } }, - "@remix-run/router": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz", - "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==" - }, "@rollup/plugin-babel": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz", @@ -27419,6 +27437,11 @@ "@types/node": "*" } }, + "@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" + }, "@types/eslint": { "version": "7.29.0", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz", @@ -37615,20 +37638,29 @@ "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==" }, "react-router": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz", - "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz", + "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==", "requires": { - "@remix-run/router": "1.21.0" + "@types/cookie": "^0.6.0", + "cookie": "^1.0.1", + "set-cookie-parser": "^2.6.0", + "turbo-stream": "2.4.0" + }, + "dependencies": { + "cookie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==" + } } }, "react-router-dom": { - "version": "6.28.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz", - "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.2.tgz", + "integrity": "sha512-VJOQ+CDWFDGaWdrG12Nl+d7yHtLaurNgAQZVgaIy7/Xd+DojgmYLosFfZdGz1wpxmjJIAkAMVTKWcvkx1oggAw==", "requires": { - "@remix-run/router": "1.21.0", - "react-router": "6.28.0" + "react-router": "7.0.2" } }, "react-scripts": { @@ -39098,6 +39130,11 @@ "send": "0.19.0" } }, + "set-cookie-parser": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==" + }, "set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", @@ -39929,6 +39966,11 @@ } } }, + "turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==" + }, "type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", diff --git a/package.json b/package.json index d91dcc75..ca4ed3e7 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "react-countdown": "^2.3.6", "react-dom": "^18.3.1", "react-query": "^3.39.2", - "react-router-dom": "^6.28.0", + "react-router-dom": "^7.0.2", "react-scripts": "5.0.1", "react-use": "^17.5.1", "sass": "^1.81.0", From e6a9c6b201f37c6a818d2c22e2492f59d8ee26cb Mon Sep 17 00:00:00 2001 From: Anyul Rivas Date: Fri, 20 Dec 2024 08:43:06 +0100 Subject: [PATCH 3/4] build: migrate to react router v.7 --- package-lock.json | 36 +++++-------------- package.json | 2 +- src/2023/Diversity/Diversity.test.tsx | 2 +- src/2023/Diversity/Diversity2023.tsx | 2 +- src/2023/Home/Home2023Wrapper.tsx | 2 +- .../SpeakersCarousel/SpeakerSwiper.tsx | 2 +- .../SpeakersCarousel/SpeakersCarousel.tsx | 2 +- src/2023/Schedule/components/AvatarCard.tsx | 2 +- .../SessionFeedback/SessionFeedback2023.tsx | 2 +- src/2023/SpeakerDetail/SpeakerDetail.style.ts | 2 +- src/2023/SpeakerDetail/SpeakerDetail2023.tsx | 2 +- .../SpeakerDetailContainer2023.tsx | 2 +- src/2023/Speakers/components/SpeakersCard.tsx | 2 +- src/2023/TalkDetail/TalkDetail.tsx | 2 +- .../TalkDetail/TalkDetailContainer2023.tsx | 2 +- src/2023/Talks/Talks.style.ts | 2 +- src/2023/Talks/components/TalkCard.tsx | 2 +- src/2024/Home/Home.tsx | 2 +- src/2024/HomeWrapper2024.tsx | 2 +- src/2024/SpeakerDetail/SpeakerDetail.tsx | 2 +- .../SpeakerDetailContainer2024.tsx | 2 +- src/2024/Speakers/SpeakerInformation.test.tsx | 2 +- src/2024/SpeakersCarousel/SpeakerSwiper.tsx | 2 +- .../SpeakersCarousel/SpeakersCarousel.tsx | 2 +- src/2024/Sponsors/Supporters.test.tsx | 2 +- src/2024/TalkDetail/MeetingDetail.tsx | 2 +- .../TalkDetail/MeetingDetailContainer.tsx | 2 +- src/2024/Talks/components/TalkCard.tsx | 2 +- src/App.test.tsx | 2 +- src/App.tsx | 2 +- src/components/Footer/Footer.tsx | 2 +- src/components/Navigation/Breadcrumbs.tsx | 2 +- src/components/Navigation/HorizontalMenu.tsx | 2 +- src/components/Navigation/Navigation.tsx | 2 +- .../Navigation/Style.Navigation.tsx | 2 +- .../NotFoundError/NotFoundError.tsx | 2 +- src/index.tsx | 2 +- .../Attendee/AttendeeInformation.test.tsx | 2 +- src/views/Cookies/Cookies.tsx | 2 +- src/views/Diversity/Diversity.test.tsx | 2 +- src/views/Diversity/Diversity.tsx | 2 +- src/views/Home/HomeWrapper.tsx | 2 +- src/views/Home/UseEventEdition.tsx | 2 +- src/views/Home/components/Home/Home.tsx | 2 +- .../SpeakersCarousel/SpeakerSwiper.tsx | 2 +- .../SpeakersCarousel/SpeakersCarousel.tsx | 2 +- .../components/Sponsors/Supporters.test.tsx | 2 +- src/views/MeetingDetail/MeetingDetail.tsx | 2 +- .../MeetingDetail/TalkDetailContainer2024.tsx | 2 +- src/views/Schedule/Schedule.tsx | 2 +- src/views/Schedule/components/AvatarCard.tsx | 2 +- src/views/SessionFeedback/SessionFeedback.tsx | 2 +- .../SpeakerDetail/SpeakerDetail.style.ts | 2 +- src/views/SpeakerDetail/SpeakerDetail.tsx | 2 +- .../SpeakerDetail/SpeakerDetailContainer.tsx | 2 +- .../Speakers/SpeakerInformation.test.tsx | 2 +- .../Speakers/components/SpeakersCard.tsx | 2 +- src/views/Talks/Talks.style.ts | 2 +- src/views/Talks/components/TalkCard.tsx | 2 +- 59 files changed, 67 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index 072301b8..3b7e3898 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "react-countdown": "^2.3.6", "react-dom": "^18.3.1", "react-query": "^3.39.2", - "react-router-dom": "^7.0.2", + "react-router": "^7.0.2", "react-scripts": "5.0.1", "react-use": "^17.5.1", "sass": "^1.81.0", @@ -5432,7 +5432,8 @@ "node_modules/@types/cookie": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", + "license": "MIT" }, "node_modules/@types/eslint": { "version": "7.29.0", @@ -19193,6 +19194,7 @@ "version": "7.0.2", "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz", "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==", + "license": "MIT", "dependencies": { "@types/cookie": "^0.6.0", "cookie": "^1.0.1", @@ -19212,25 +19214,11 @@ } } }, - "node_modules/react-router-dom": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.2.tgz", - "integrity": "sha512-VJOQ+CDWFDGaWdrG12Nl+d7yHtLaurNgAQZVgaIy7/Xd+DojgmYLosFfZdGz1wpxmjJIAkAMVTKWcvkx1oggAw==", - "dependencies": { - "react-router": "7.0.2" - }, - "engines": { - "node": ">=20.0.0" - }, - "peerDependencies": { - "react": ">=18", - "react-dom": ">=18" - } - }, "node_modules/react-router/node_modules/cookie": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", + "license": "MIT", "engines": { "node": ">=18" } @@ -21191,7 +21179,8 @@ "node_modules/set-cookie-parser": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz", - "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==" + "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==", + "license": "MIT" }, "node_modules/set-function-length": { "version": "1.2.2", @@ -22314,7 +22303,8 @@ "node_modules/turbo-stream": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", - "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==" + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==", + "license": "ISC" }, "node_modules/type-check": { "version": "0.4.0", @@ -37628,14 +37618,6 @@ } } }, - "react-router-dom": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.2.tgz", - "integrity": "sha512-VJOQ+CDWFDGaWdrG12Nl+d7yHtLaurNgAQZVgaIy7/Xd+DojgmYLosFfZdGz1wpxmjJIAkAMVTKWcvkx1oggAw==", - "requires": { - "react-router": "7.0.2" - } - }, "react-scripts": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", diff --git a/package.json b/package.json index 990d88f1..19c45d02 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "react-countdown": "^2.3.6", "react-dom": "^18.3.1", "react-query": "^3.39.2", - "react-router-dom": "^7.0.2", + "react-router": "^7.0.2", "react-scripts": "5.0.1", "react-use": "^17.5.1", "sass": "^1.81.0", diff --git a/src/2023/Diversity/Diversity.test.tsx b/src/2023/Diversity/Diversity.test.tsx index 16013be4..76546552 100644 --- a/src/2023/Diversity/Diversity.test.tsx +++ b/src/2023/Diversity/Diversity.test.tsx @@ -1,7 +1,7 @@ import React from "react"; import { render, screen } from "@testing-library/react"; import Diversity2023 from "./Diversity2023"; -import { BrowserRouter, Route, Routes } from "react-router-dom"; +import { BrowserRouter, Route, Routes } from "react-router"; describe("Diversity component", () => { it("renders heading correctly", () => { diff --git a/src/2023/Diversity/Diversity2023.tsx b/src/2023/Diversity/Diversity2023.tsx index 09125709..12e72bb1 100644 --- a/src/2023/Diversity/Diversity2023.tsx +++ b/src/2023/Diversity/Diversity2023.tsx @@ -3,7 +3,7 @@ import { Color } from "../../styles/colors"; import data from "../../data/2023.json"; import styled from "styled-components"; import { BIG_BREAKPOINT } from "../../constants/BreakPoints"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { ROUTE_CODE_OF_CONDUCT, ROUTE_CONDITIONS, diff --git a/src/2023/Home/Home2023Wrapper.tsx b/src/2023/Home/Home2023Wrapper.tsx index ca3b5bd7..a7a77d7c 100644 --- a/src/2023/Home/Home2023Wrapper.tsx +++ b/src/2023/Home/Home2023Wrapper.tsx @@ -6,7 +6,7 @@ import SpeakersCarousel from "./components/SpeakersCarousel/SpeakersCarousel"; import Sponsors from "./components/Sponsors/Sponsors"; import styled from "styled-components"; import data from "../../data/2023.json"; -import { useLocation } from "react-router-dom"; +import { useLocation } from "react-router"; const StyledContainer = styled.div` padding-bottom: 10rem; diff --git a/src/2023/Home/components/SpeakersCarousel/SpeakerSwiper.tsx b/src/2023/Home/components/SpeakersCarousel/SpeakerSwiper.tsx index 58408724..428ac669 100644 --- a/src/2023/Home/components/SpeakersCarousel/SpeakerSwiper.tsx +++ b/src/2023/Home/components/SpeakersCarousel/SpeakerSwiper.tsx @@ -5,7 +5,7 @@ import styled from "styled-components"; import { Color } from "../../../../styles/colors"; import "swiper/swiper-bundle.min.css"; import "./SpeakersCarousel.scss"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { ROUTE_SPEAKER_DETAIL } from "../../../../constants/routes"; import { useFetchSpeakers } from "../../../Speakers/UseFetchSpeakers"; import * as Sentry from "@sentry/react"; diff --git a/src/2023/Home/components/SpeakersCarousel/SpeakersCarousel.tsx b/src/2023/Home/components/SpeakersCarousel/SpeakersCarousel.tsx index 3650f2ff..e4eb0bc2 100644 --- a/src/2023/Home/components/SpeakersCarousel/SpeakersCarousel.tsx +++ b/src/2023/Home/components/SpeakersCarousel/SpeakersCarousel.tsx @@ -1,7 +1,7 @@ import { Color } from "../../../../styles/colors"; import { FC } from "react"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import LessThanBlueWhiteIcon from ".././../../../assets/images/MoreThanBlueIcon.svg"; import SectionWrapper from "../../../../components/SectionWrapper/SectionWrapper"; import { TABLET_BREAKPOINT } from "../../../../constants/BreakPoints"; diff --git a/src/2023/Schedule/components/AvatarCard.tsx b/src/2023/Schedule/components/AvatarCard.tsx index b2e8bca9..62352150 100644 --- a/src/2023/Schedule/components/AvatarCard.tsx +++ b/src/2023/Schedule/components/AvatarCard.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { Link } from 'react-router-dom'; +import { Link } from 'react-router'; import { StyledAvatarContainer, StyledAvatarImage, diff --git a/src/2023/SessionFeedback/SessionFeedback2023.tsx b/src/2023/SessionFeedback/SessionFeedback2023.tsx index d8b797b3..0f53ef14 100644 --- a/src/2023/SessionFeedback/SessionFeedback2023.tsx +++ b/src/2023/SessionFeedback/SessionFeedback2023.tsx @@ -13,7 +13,7 @@ import "primereact/resources/themes/lara-light-blue/theme.css"; import { InputText } from "primereact/inputtext"; import { FilterMatchMode } from "primereact/api"; import { Color } from "../../styles/colors"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { ROUTE_TALK_DETAIL } from "../../constants/routes"; const SessionFeedback2023: FC> = () => { diff --git a/src/2023/SpeakerDetail/SpeakerDetail.style.ts b/src/2023/SpeakerDetail/SpeakerDetail.style.ts index 57a1a6e9..fcd30276 100644 --- a/src/2023/SpeakerDetail/SpeakerDetail.style.ts +++ b/src/2023/SpeakerDetail/SpeakerDetail.style.ts @@ -2,7 +2,7 @@ import styled from "styled-components"; import {motion} from "framer-motion"; import {BIG_BREAKPOINT} from "../../constants/BreakPoints"; import {Color} from "../../styles/colors"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; export const StyledTalkDescription = styled(Link)` text-decoration: none; diff --git a/src/2023/SpeakerDetail/SpeakerDetail2023.tsx b/src/2023/SpeakerDetail/SpeakerDetail2023.tsx index 8a0edc19..028c8824 100644 --- a/src/2023/SpeakerDetail/SpeakerDetail2023.tsx +++ b/src/2023/SpeakerDetail/SpeakerDetail2023.tsx @@ -31,7 +31,7 @@ import { ROUTE_2023_TALK_DETAIL, } from "../../constants/routes"; import { StyledTalkDescription } from "./SpeakerDetail.style"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { Color } from "../../styles/colors"; import { ISpeaker } from "../Speakers/Speaker.types"; diff --git a/src/2023/SpeakerDetail/SpeakerDetailContainer2023.tsx b/src/2023/SpeakerDetail/SpeakerDetailContainer2023.tsx index dfe5979e..cdf001c8 100644 --- a/src/2023/SpeakerDetail/SpeakerDetailContainer2023.tsx +++ b/src/2023/SpeakerDetail/SpeakerDetailContainer2023.tsx @@ -3,7 +3,7 @@ import { Color } from "../../styles/colors"; import React, { FC } from "react"; import SectionWrapper from "../../components/SectionWrapper/SectionWrapper"; import SpeakerDetail2023 from "./SpeakerDetail2023"; -import { useParams } from "react-router-dom"; +import { useParams } from "react-router"; import { StyledContainer, StyledWaveContainer } from "./Speaker.style"; import conferenceData from "../../data/2023.json"; import { useFetchSpeakers } from "../Speakers/UseFetchSpeakers"; diff --git a/src/2023/Speakers/components/SpeakersCard.tsx b/src/2023/Speakers/components/SpeakersCard.tsx index 85b01c53..631d4211 100644 --- a/src/2023/Speakers/components/SpeakersCard.tsx +++ b/src/2023/Speakers/components/SpeakersCard.tsx @@ -7,7 +7,7 @@ import { StyledSpeakerText, StyledSpeakerTitle, } from "./SpeakerCard.Style"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { ISpeaker } from "../Speaker.types"; import Loading from "../../../assets/images/logo.png"; import { ROUTE_2023_SPEAKER_DETAIL } from "../../../constants/routes"; diff --git a/src/2023/TalkDetail/TalkDetail.tsx b/src/2023/TalkDetail/TalkDetail.tsx index cf8d4687..b31131b2 100644 --- a/src/2023/TalkDetail/TalkDetail.tsx +++ b/src/2023/TalkDetail/TalkDetail.tsx @@ -28,7 +28,7 @@ import { StyledVideoContainer, StyledVideoTagsContainer, } from "./Style.MeetingDetail"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { ROUTE_2023_SPEAKER_DETAIL, ROUTE_2023_TALKS, diff --git a/src/2023/TalkDetail/TalkDetailContainer2023.tsx b/src/2023/TalkDetail/TalkDetailContainer2023.tsx index 6878cf60..a679a98a 100644 --- a/src/2023/TalkDetail/TalkDetailContainer2023.tsx +++ b/src/2023/TalkDetail/TalkDetailContainer2023.tsx @@ -3,7 +3,7 @@ import React, { FC, useEffect } from "react"; import NotFoundError from "../../components/NotFoundError/NotFoundError"; import SectionWrapper from "../../components/SectionWrapper/SectionWrapper"; import styled from "styled-components"; -import { useParams } from "react-router-dom"; +import { useParams } from "react-router"; import conferenceData from "../../data/2023.json"; import { sessionAdapter, useFetchTalksById } from "../Talks/UseFetchTalks"; import * as Sentry from "@sentry/react"; diff --git a/src/2023/Talks/Talks.style.ts b/src/2023/Talks/Talks.style.ts index 2ecbef05..93a95f0e 100644 --- a/src/2023/Talks/Talks.style.ts +++ b/src/2023/Talks/Talks.style.ts @@ -1,7 +1,7 @@ import styled from "styled-components"; import { Color } from "../../styles/colors"; import { BIG_BREAKPOINT, TABLET_BREAKPOINT } from "../../constants/BreakPoints"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; export const StyledTitleContainer = styled.div` display: flex; diff --git a/src/2023/Talks/components/TalkCard.tsx b/src/2023/Talks/components/TalkCard.tsx index 86e8e1a3..a0ec4342 100644 --- a/src/2023/Talks/components/TalkCard.tsx +++ b/src/2023/Talks/components/TalkCard.tsx @@ -1,5 +1,5 @@ import { FC } from "react"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { StyledJobsInfo } from "../../JobOffers/components/JobsCard"; import { Tag } from "../../../components/Tag/Tag"; import { diff --git a/src/2024/Home/Home.tsx b/src/2024/Home/Home.tsx index 5fbf4581..47ecdf0c 100644 --- a/src/2024/Home/Home.tsx +++ b/src/2024/Home/Home.tsx @@ -20,7 +20,7 @@ import { StyleHomeContainer, } from "./Style.Home"; import {formatDateRange} from "./DateUtil"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; import data from "../../data/2024.json"; import SectionWrapper from "../../components/SectionWrapper/SectionWrapper"; import {Color} from "../../styles/colors"; diff --git a/src/2024/HomeWrapper2024.tsx b/src/2024/HomeWrapper2024.tsx index 4cb89898..5668c53f 100644 --- a/src/2024/HomeWrapper2024.tsx +++ b/src/2024/HomeWrapper2024.tsx @@ -1,7 +1,7 @@ import React, {FC, useState} from "react"; import styled from "styled-components"; -import {useLocation} from "react-router-dom"; +import {useLocation} from "react-router"; import {BIG_BREAKPOINT} from "../constants/BreakPoints"; import {useEventEdition} from "../views/Home/UseEventEdition"; diff --git a/src/2024/SpeakerDetail/SpeakerDetail.tsx b/src/2024/SpeakerDetail/SpeakerDetail.tsx index c104479e..4a7ca185 100644 --- a/src/2024/SpeakerDetail/SpeakerDetail.tsx +++ b/src/2024/SpeakerDetail/SpeakerDetail.tsx @@ -9,7 +9,7 @@ import twitterIcon from "../../assets/images/twitterIcon.svg"; import {useWindowSize} from "react-use"; import {ROUTE_SPEAKERS, ROUTE_TALK_DETAIL} from "../../constants/routes"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; import {Color} from "../../styles/colors"; import conferenceData from "../../data/2024.json"; import {ISpeaker} from "../../views/Speakers/Speaker.types"; diff --git a/src/2024/SpeakerDetail/SpeakerDetailContainer2024.tsx b/src/2024/SpeakerDetail/SpeakerDetailContainer2024.tsx index 4a1f56d6..8d7be2b8 100644 --- a/src/2024/SpeakerDetail/SpeakerDetailContainer2024.tsx +++ b/src/2024/SpeakerDetail/SpeakerDetailContainer2024.tsx @@ -3,7 +3,7 @@ import {Color} from "../../styles/colors"; import React, {FC} from "react"; import SectionWrapper from "../../components/SectionWrapper/SectionWrapper"; import SpeakerDetail from "./SpeakerDetail"; -import {useParams} from "react-router-dom"; +import {useParams} from "react-router"; import conferenceData from "../../data/2024.json"; import {useFetchSpeakers} from "../Speakers/UseFetchSpeakers"; import * as Sentry from "@sentry/react"; diff --git a/src/2024/Speakers/SpeakerInformation.test.tsx b/src/2024/Speakers/SpeakerInformation.test.tsx index 0e4d86c0..ffa2695d 100644 --- a/src/2024/Speakers/SpeakerInformation.test.tsx +++ b/src/2024/Speakers/SpeakerInformation.test.tsx @@ -1,6 +1,6 @@ import React from "react"; import {render, screen} from "@testing-library/react"; -import {BrowserRouter, Route, Routes} from "react-router-dom"; +import {BrowserRouter, Route, Routes} from "react-router"; import SpeakerInformation from "./SpeakerInformation"; describe("Speakers activities component", () => { diff --git a/src/2024/SpeakersCarousel/SpeakerSwiper.tsx b/src/2024/SpeakersCarousel/SpeakerSwiper.tsx index 53350366..1365f4e4 100644 --- a/src/2024/SpeakersCarousel/SpeakerSwiper.tsx +++ b/src/2024/SpeakersCarousel/SpeakerSwiper.tsx @@ -4,7 +4,7 @@ import {Swiper, SwiperSlide} from "swiper/react"; import styled from "styled-components"; import "swiper/swiper-bundle.min.css"; import "./SpeakersCarousel.scss"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; import conferenceData from "../../data/2024.json"; import {useFetchSpeakers} from "../Speakers/UseFetchSpeakers"; import * as Sentry from "@sentry/react"; diff --git a/src/2024/SpeakersCarousel/SpeakersCarousel.tsx b/src/2024/SpeakersCarousel/SpeakersCarousel.tsx index 0ba92bda..a199012d 100644 --- a/src/2024/SpeakersCarousel/SpeakersCarousel.tsx +++ b/src/2024/SpeakersCarousel/SpeakersCarousel.tsx @@ -1,5 +1,5 @@ import {FC} from "react"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; import LessThanBlueWhiteIcon from "../../assets/images/MoreThanBlueWhiteIcon.svg"; import {motion} from "framer-motion"; diff --git a/src/2024/Sponsors/Supporters.test.tsx b/src/2024/Sponsors/Supporters.test.tsx index 827d64ce..281624d5 100644 --- a/src/2024/Sponsors/Supporters.test.tsx +++ b/src/2024/Sponsors/Supporters.test.tsx @@ -2,7 +2,7 @@ import {fireEvent, render, screen} from "@testing-library/react"; import {Supporters} from "./Supporters"; import React from "react"; import {useWindowSize} from "react-use"; -import {BrowserRouter, Route, Routes} from "react-router-dom"; +import {BrowserRouter, Route, Routes} from "react-router"; jest.mock("react-use", () => ({ useWindowSize: jest.fn(), diff --git a/src/2024/TalkDetail/MeetingDetail.tsx b/src/2024/TalkDetail/MeetingDetail.tsx index 323662db..d1b71619 100644 --- a/src/2024/TalkDetail/MeetingDetail.tsx +++ b/src/2024/TalkDetail/MeetingDetail.tsx @@ -11,7 +11,7 @@ import MoreThanIcon from "../../assets/images/MoreThanBlueIcon.svg"; import SectionWrapper from "../../components/SectionWrapper/SectionWrapper"; import {useWindowSize} from "react-use"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; import { ROUTE_2024_SPEAKER_DETAIL, ROUTE_2024_TALKS, diff --git a/src/2024/TalkDetail/MeetingDetailContainer.tsx b/src/2024/TalkDetail/MeetingDetailContainer.tsx index 9799e37b..39606f92 100644 --- a/src/2024/TalkDetail/MeetingDetailContainer.tsx +++ b/src/2024/TalkDetail/MeetingDetailContainer.tsx @@ -3,7 +3,7 @@ import React, {FC, useEffect} from "react"; import NotFoundError from "../../components/NotFoundError/NotFoundError"; import SectionWrapper from "../../components/SectionWrapper/SectionWrapper"; import styled from "styled-components"; -import {useParams} from "react-router-dom"; +import {useParams} from "react-router"; import conferenceData from "../../data/2024.json"; import {sessionAdapter, useFetchTalksById} from "../Talks/UseFetchTalks"; import * as Sentry from "@sentry/react"; diff --git a/src/2024/Talks/components/TalkCard.tsx b/src/2024/Talks/components/TalkCard.tsx index e3b3b1f6..22cac1c1 100644 --- a/src/2024/Talks/components/TalkCard.tsx +++ b/src/2024/Talks/components/TalkCard.tsx @@ -1,5 +1,5 @@ import React, {FC} from "react"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; import {Tag} from "../../../components/Tag/Tag"; import { ROUTE_2024_SPEAKER_DETAIL, diff --git a/src/App.test.tsx b/src/App.test.tsx index bca3dde9..e8b2eca2 100644 --- a/src/App.test.tsx +++ b/src/App.test.tsx @@ -1,5 +1,5 @@ import {render, screen} from "@testing-library/react"; -import {BrowserRouter, Route, Routes} from "react-router-dom"; +import {BrowserRouter, Route, Routes} from "react-router"; import App from "./App"; import React from "react"; import userEvent from "@testing-library/user-event"; diff --git a/src/App.tsx b/src/App.tsx index 7ad3cf95..f455668d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,4 +1,4 @@ -import {Link, Route, Routes} from "react-router-dom"; +import {Link, Route, Routes} from "react-router"; import { ROUTE_2023_ATTENDEE, ROUTE_2023_CFP, diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx index 2ed44081..20fd9ec4 100644 --- a/src/components/Footer/Footer.tsx +++ b/src/components/Footer/Footer.tsx @@ -6,7 +6,7 @@ import flickrIcon from "../../assets/images/flickr.svg"; import linkedinIcon from "../../assets/images/linkedinIcon.svg"; import logo from "../../assets/images/devBcn.png"; import twitterIcon from "../../assets/images/twitterIcon.svg"; -import { useNavigate } from "react-router-dom"; +import { useNavigate } from "react-router"; import { useWindowSize } from "react-use"; import data from "../../data/2024.json"; import youtubeIcon from "../../assets/images/youtubeIcon.svg"; diff --git a/src/components/Navigation/Breadcrumbs.tsx b/src/components/Navigation/Breadcrumbs.tsx index 76526e4f..d0a0d7bf 100644 --- a/src/components/Navigation/Breadcrumbs.tsx +++ b/src/components/Navigation/Breadcrumbs.tsx @@ -1,5 +1,5 @@ import { FC, useEffect, useState } from "react"; -import { Link, useLocation } from "react-router-dom"; +import { Link, useLocation } from "react-router"; import { Color } from "../../styles/colors"; import styled from "styled-components"; diff --git a/src/components/Navigation/HorizontalMenu.tsx b/src/components/Navigation/HorizontalMenu.tsx index be6dd419..72e1c252 100644 --- a/src/components/Navigation/HorizontalMenu.tsx +++ b/src/components/Navigation/HorizontalMenu.tsx @@ -2,7 +2,7 @@ import { BIG_BREAKPOINT } from "../../constants/BreakPoints"; import { NavigationItem } from "./NavigationData"; import { useWindowSize } from "react-use"; import { NavMenu, StyledLink, SubLink, SubMenu } from "./Style.Navigation"; -import { NavLink } from "react-router-dom"; +import { NavLink } from "react-router"; import { FC } from "react"; type Props = { diff --git a/src/components/Navigation/Navigation.tsx b/src/components/Navigation/Navigation.tsx index 20a1df2c..9fc3e061 100644 --- a/src/components/Navigation/Navigation.tsx +++ b/src/components/Navigation/Navigation.tsx @@ -1,7 +1,7 @@ import {AnimatePresence} from "framer-motion"; import {FC, useEffect, useState} from "react"; import {MOBILE_BREAKPOINT} from "../../constants/BreakPoints"; -import {useLocation, useNavigate} from "react-router-dom"; +import {useLocation, useNavigate} from "react-router"; import Breadcrumbs from "./Breadcrumbs"; import CloseIcon from "../../assets/images/CloseIcon.svg"; import NavigationLogo from "../../assets/images/devBcn.png"; diff --git a/src/components/Navigation/Style.Navigation.tsx b/src/components/Navigation/Style.Navigation.tsx index 4edf4e67..2679c7dd 100644 --- a/src/components/Navigation/Style.Navigation.tsx +++ b/src/components/Navigation/Style.Navigation.tsx @@ -1,7 +1,7 @@ import styled from "styled-components"; import { motion } from "framer-motion"; import { Color } from "../../styles/colors"; -import { NavLink } from "react-router-dom"; +import { NavLink } from "react-router"; import { MAX_WIDTH, MOBILE_BREAKPOINT } from "../../constants/BreakPoints"; export const StyledBlueHamburger = styled(motion.img)` diff --git a/src/components/NotFoundError/NotFoundError.tsx b/src/components/NotFoundError/NotFoundError.tsx index f5276c7d..72b76e2f 100644 --- a/src/components/NotFoundError/NotFoundError.tsx +++ b/src/components/NotFoundError/NotFoundError.tsx @@ -1,7 +1,7 @@ import { Color } from "../../styles/colors"; import { FC, useEffect } from "react"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import SectionWrapper from "../SectionWrapper/SectionWrapper"; import styled from "styled-components"; import ActionButtons from "../../views/Home/components/ActionButtons/ActionButtons"; diff --git a/src/index.tsx b/src/index.tsx index 520b802b..67f9ffef 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -5,7 +5,7 @@ import { matchRoutes, useLocation, useNavigationType, -} from "react-router-dom"; +} from "react-router"; import App from "./App"; import React, { useEffect } from "react"; import ReactDOM from "react-dom"; diff --git a/src/views/Attendee/AttendeeInformation.test.tsx b/src/views/Attendee/AttendeeInformation.test.tsx index 9ddac411..7183be8b 100644 --- a/src/views/Attendee/AttendeeInformation.test.tsx +++ b/src/views/Attendee/AttendeeInformation.test.tsx @@ -1,6 +1,6 @@ import { render, screen } from "@testing-library/react"; import React from "react"; -import { BrowserRouter, Route, Routes } from "react-router-dom"; +import { BrowserRouter, Route, Routes } from "react-router"; import AttendeeInformation from "./AttendeeInformation"; describe("Attendee information component", () => { diff --git a/src/views/Cookies/Cookies.tsx b/src/views/Cookies/Cookies.tsx index f8a8539f..87a92ca9 100644 --- a/src/views/Cookies/Cookies.tsx +++ b/src/views/Cookies/Cookies.tsx @@ -1,6 +1,6 @@ import { FC } from "react"; import styled from "styled-components"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { ROUTE_HOME } from "../../constants/routes"; const StyledSection = styled.section` diff --git a/src/views/Diversity/Diversity.test.tsx b/src/views/Diversity/Diversity.test.tsx index 32ad2458..aa8bc76e 100644 --- a/src/views/Diversity/Diversity.test.tsx +++ b/src/views/Diversity/Diversity.test.tsx @@ -1,7 +1,7 @@ import React from "react"; import { render, screen } from "@testing-library/react"; import Diversity from "./Diversity"; -import { BrowserRouter, Route, Routes } from "react-router-dom"; +import { BrowserRouter, Route, Routes } from "react-router"; describe("Diversity component", () => { it("renders heading correctly", () => { diff --git a/src/views/Diversity/Diversity.tsx b/src/views/Diversity/Diversity.tsx index 98427553..2636d196 100644 --- a/src/views/Diversity/Diversity.tsx +++ b/src/views/Diversity/Diversity.tsx @@ -3,7 +3,7 @@ import { Color } from "../../styles/colors"; import data from "../../data/2024.json"; import styled from "styled-components"; import { BIG_BREAKPOINT } from "../../constants/BreakPoints"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { ROUTE_CODE_OF_CONDUCT, ROUTE_CONDITIONS, diff --git a/src/views/Home/HomeWrapper.tsx b/src/views/Home/HomeWrapper.tsx index 9b5cc875..5e87ec7c 100644 --- a/src/views/Home/HomeWrapper.tsx +++ b/src/views/Home/HomeWrapper.tsx @@ -6,7 +6,7 @@ import SpeakersCarousel from "./components/SpeakersCarousel/SpeakersCarousel"; import Sponsors from "./components/Sponsors/Sponsors"; import styled from "styled-components"; -import {useLocation} from "react-router-dom"; +import {useLocation} from "react-router"; import {useEventEdition} from "./UseEventEdition"; import {Edition} from "../../types/types"; diff --git a/src/views/Home/UseEventEdition.tsx b/src/views/Home/UseEventEdition.tsx index 781e257e..649992fa 100644 --- a/src/views/Home/UseEventEdition.tsx +++ b/src/views/Home/UseEventEdition.tsx @@ -1,5 +1,5 @@ import {useEffect} from "react"; -import {useParams} from "react-router-dom"; +import {useParams} from "react-router"; export function useEventEdition(setEdition: (data: any) => void) { let { year } = useParams(); diff --git a/src/views/Home/components/Home/Home.tsx b/src/views/Home/components/Home/Home.tsx index 3f42fad5..b71b4289 100644 --- a/src/views/Home/components/Home/Home.tsx +++ b/src/views/Home/components/Home/Home.tsx @@ -24,7 +24,7 @@ import ActionButtons from "../ActionButtons/ActionButtons"; import {Color} from "../../../../styles/colors"; import InfoButtons from "../InfoButtons/InfoButtons"; import {formatDateRange} from "./DateUtil"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; import edition from "../../../../data/2025.json"; import CountDownCompleted from "./components/CountDownCompleted"; diff --git a/src/views/Home/components/SpeakersCarousel/SpeakerSwiper.tsx b/src/views/Home/components/SpeakersCarousel/SpeakerSwiper.tsx index 016fee9c..6069db55 100644 --- a/src/views/Home/components/SpeakersCarousel/SpeakerSwiper.tsx +++ b/src/views/Home/components/SpeakersCarousel/SpeakerSwiper.tsx @@ -5,7 +5,7 @@ import styled from "styled-components"; import {Color} from "../../../../styles/colors"; import "swiper/swiper-bundle.min.css"; import "./SpeakersCarousel.scss"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; import conferenceData from "../../../../data/2025.json"; import {ROUTE_SPEAKER_DETAIL} from "../../../../constants/routes"; import {useFetchSpeakers} from "../../../Speakers/UseFetchSpeakers"; diff --git a/src/views/Home/components/SpeakersCarousel/SpeakersCarousel.tsx b/src/views/Home/components/SpeakersCarousel/SpeakersCarousel.tsx index b841d2b5..d6809c9b 100644 --- a/src/views/Home/components/SpeakersCarousel/SpeakersCarousel.tsx +++ b/src/views/Home/components/SpeakersCarousel/SpeakersCarousel.tsx @@ -1,7 +1,7 @@ import { Color } from "../../../../styles/colors"; import { FC } from "react"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import LessThanBlueWhiteIcon from ".././../../../assets/images/MoreThanBlueIcon.svg"; import SectionWrapper from "../../../../components/SectionWrapper/SectionWrapper"; import { diff --git a/src/views/Home/components/Sponsors/Supporters.test.tsx b/src/views/Home/components/Sponsors/Supporters.test.tsx index b4793b98..b5e92ff3 100644 --- a/src/views/Home/components/Sponsors/Supporters.test.tsx +++ b/src/views/Home/components/Sponsors/Supporters.test.tsx @@ -2,7 +2,7 @@ import { fireEvent, render, screen } from "@testing-library/react"; import { Supporters } from "./Supporters"; import React from "react"; import { useWindowSize } from "react-use"; -import { BrowserRouter, Route, Routes } from "react-router-dom"; +import { BrowserRouter, Route, Routes } from "react-router"; jest.mock("react-use", () => ({ useWindowSize: jest.fn(), diff --git a/src/views/MeetingDetail/MeetingDetail.tsx b/src/views/MeetingDetail/MeetingDetail.tsx index 51160c71..b19a0a73 100644 --- a/src/views/MeetingDetail/MeetingDetail.tsx +++ b/src/views/MeetingDetail/MeetingDetail.tsx @@ -28,7 +28,7 @@ import { StyledVideoContainer, StyledVideoTagsContainer, } from "./Style.MeetingDetail"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; import { ROUTE_2024_SPEAKER_DETAIL, ROUTE_2024_TALKS diff --git a/src/views/MeetingDetail/TalkDetailContainer2024.tsx b/src/views/MeetingDetail/TalkDetailContainer2024.tsx index 85d02353..c57c8aa8 100644 --- a/src/views/MeetingDetail/TalkDetailContainer2024.tsx +++ b/src/views/MeetingDetail/TalkDetailContainer2024.tsx @@ -3,7 +3,7 @@ import React, {FC, useEffect} from "react"; import NotFoundError from "../../components/NotFoundError/NotFoundError"; import SectionWrapper from "../../components/SectionWrapper/SectionWrapper"; import styled from "styled-components"; -import {useParams} from "react-router-dom"; +import {useParams} from "react-router"; import conferenceData from "../../data/2024.json"; import {sessionAdapter, useFetchTalksById} from "../Talks/UseFetchTalks"; import * as Sentry from "@sentry/react"; diff --git a/src/views/Schedule/Schedule.tsx b/src/views/Schedule/Schedule.tsx index 1cc8e842..832e48f0 100644 --- a/src/views/Schedule/Schedule.tsx +++ b/src/views/Schedule/Schedule.tsx @@ -13,7 +13,7 @@ import { StyledScheduleSection, } from "./Schedule.style"; import * as Sentry from "@sentry/react"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; const Schedule: FC> = () => { const { width } = useWindowSize(); diff --git a/src/views/Schedule/components/AvatarCard.tsx b/src/views/Schedule/components/AvatarCard.tsx index b2e8bca9..62352150 100644 --- a/src/views/Schedule/components/AvatarCard.tsx +++ b/src/views/Schedule/components/AvatarCard.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { Link } from 'react-router-dom'; +import { Link } from 'react-router'; import { StyledAvatarContainer, StyledAvatarImage, diff --git a/src/views/SessionFeedback/SessionFeedback.tsx b/src/views/SessionFeedback/SessionFeedback.tsx index 862cb4a6..9ef9ee14 100644 --- a/src/views/SessionFeedback/SessionFeedback.tsx +++ b/src/views/SessionFeedback/SessionFeedback.tsx @@ -13,7 +13,7 @@ import "primereact/resources/themes/lara-light-blue/theme.css"; import { InputText } from "primereact/inputtext"; import { FilterMatchMode } from "primereact/api"; import { Color } from "../../styles/colors"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { ROUTE_TALK_DETAIL } from "../../constants/routes"; import data from "../../data/2024.json"; diff --git a/src/views/SpeakerDetail/SpeakerDetail.style.ts b/src/views/SpeakerDetail/SpeakerDetail.style.ts index 57a1a6e9..fcd30276 100644 --- a/src/views/SpeakerDetail/SpeakerDetail.style.ts +++ b/src/views/SpeakerDetail/SpeakerDetail.style.ts @@ -2,7 +2,7 @@ import styled from "styled-components"; import {motion} from "framer-motion"; import {BIG_BREAKPOINT} from "../../constants/BreakPoints"; import {Color} from "../../styles/colors"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; export const StyledTalkDescription = styled(Link)` text-decoration: none; diff --git a/src/views/SpeakerDetail/SpeakerDetail.tsx b/src/views/SpeakerDetail/SpeakerDetail.tsx index ba092c79..0f06c5ff 100644 --- a/src/views/SpeakerDetail/SpeakerDetail.tsx +++ b/src/views/SpeakerDetail/SpeakerDetail.tsx @@ -28,7 +28,7 @@ import { } from "./Speaker.style"; import { ROUTE_SPEAKERS, ROUTE_TALK_DETAIL } from "../../constants/routes"; import { StyledTalkDescription } from "./SpeakerDetail.style"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { Color } from "../../styles/colors"; import { ISpeaker } from "../Speakers/Speaker.types"; import conferenceData from "../../data/2024.json"; diff --git a/src/views/SpeakerDetail/SpeakerDetailContainer.tsx b/src/views/SpeakerDetail/SpeakerDetailContainer.tsx index 61346045..f9c21258 100644 --- a/src/views/SpeakerDetail/SpeakerDetailContainer.tsx +++ b/src/views/SpeakerDetail/SpeakerDetailContainer.tsx @@ -3,7 +3,7 @@ import { Color } from "../../styles/colors"; import React, { FC } from "react"; import SectionWrapper from "../../components/SectionWrapper/SectionWrapper"; import SpeakerDetail from "./SpeakerDetail"; -import { useParams } from "react-router-dom"; +import { useParams } from "react-router"; import { StyledContainer, StyledWaveContainer } from "./Speaker.style"; import conferenceData from "../../data/2024.json"; import { useFetchSpeakers } from "../Speakers/UseFetchSpeakers"; diff --git a/src/views/Speakers/SpeakerInformation.test.tsx b/src/views/Speakers/SpeakerInformation.test.tsx index 7c370e8c..280496e0 100644 --- a/src/views/Speakers/SpeakerInformation.test.tsx +++ b/src/views/Speakers/SpeakerInformation.test.tsx @@ -1,6 +1,6 @@ import React from "react"; import { render, screen } from "@testing-library/react"; -import { BrowserRouter, Route, Routes } from "react-router-dom"; +import { BrowserRouter, Route, Routes } from "react-router"; import SpeakerInformation from "./SpeakerInformation"; describe("Speakers activities component", () => { diff --git a/src/views/Speakers/components/SpeakersCard.tsx b/src/views/Speakers/components/SpeakersCard.tsx index 3669b698..acedc52c 100644 --- a/src/views/Speakers/components/SpeakersCard.tsx +++ b/src/views/Speakers/components/SpeakersCard.tsx @@ -7,7 +7,7 @@ import { StyledSpeakerText, StyledSpeakerTitle, } from "./SpeakerCard.Style"; -import {Link} from "react-router-dom"; +import {Link} from "react-router"; import {ROUTE_2024_SPEAKER_DETAIL} from "../../../constants/routes"; import {ISpeaker} from "../Speaker.types"; import Loading from "../../../assets/images/logo.png"; diff --git a/src/views/Talks/Talks.style.ts b/src/views/Talks/Talks.style.ts index 91415a24..4af31db8 100644 --- a/src/views/Talks/Talks.style.ts +++ b/src/views/Talks/Talks.style.ts @@ -5,7 +5,7 @@ import { MOBILE_BREAKPOINT, TABLET_BREAKPOINT, } from "../../constants/BreakPoints"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; export const StyledTitleContainer = styled.div` display: flex; diff --git a/src/views/Talks/components/TalkCard.tsx b/src/views/Talks/components/TalkCard.tsx index c17b3172..fa25149b 100644 --- a/src/views/Talks/components/TalkCard.tsx +++ b/src/views/Talks/components/TalkCard.tsx @@ -1,5 +1,5 @@ import React, { FC } from "react"; -import { Link } from "react-router-dom"; +import { Link } from "react-router"; import { StyledJobsInfo } from "../../JobOffers/components/JobsCard"; import { Tag } from "../../../components/Tag/Tag"; import { From af370203c624e27c49772ac17a334e6b30754663 Mon Sep 17 00:00:00 2001 From: Anyul Rivas Date: Fri, 20 Dec 2024 08:50:09 +0100 Subject: [PATCH 4/4] fix: workaround test with jsdom and TextEncoder --- package-lock.json | 6 +++--- src/setupTests.ts | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e8ec9a8..d465a006 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,14 +16,14 @@ "@faker-js/faker": "9.2.0", "@sentry/react": "^8.41.0", "@sentry/tracing": "^7.114.0", - "@types/node": "^22.10.2", + "@types/node": "^22.9.0", "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", "add-to-calendar-button-react": "^2.7.3", "axios": "^1.7.7", "clsx": "^2.1.1", "date-fns": "^4.1.0", - "framer-motion": "^11.15.0", + "framer-motion": "^11.11.8", "google-map-react": "^2.2.1", "moment": "^2.30.1", "primeicons": "^7.0.0", @@ -33,7 +33,7 @@ "react-countdown": "^2.3.6", "react-dom": "^18.3.1", "react-query": "^3.39.2", - "react-router": "^7.0.2", + "react-router-dom": "^7.0.2", "react-scripts": "5.0.1", "react-use": "^17.5.1", "sass": "^1.81.0", diff --git a/src/setupTests.ts b/src/setupTests.ts index ee9b26ff..2114844b 100644 --- a/src/setupTests.ts +++ b/src/setupTests.ts @@ -3,5 +3,7 @@ // expect(element).toHaveTextContent(/react/i) // learn more: https://github.com/testing-library/jest-dom import "@testing-library/jest-dom"; +import { TextEncoder } from 'util'; +global.TextEncoder = TextEncoder; window.scrollTo = jest.fn();