Skip to content

Commit 11a675c

Browse files
chore(deps-dev): bump react-router[-dom] from 6.28.0 to 7.0.2 (#12247)
1 parent cd0d02d commit 11a675c

File tree

5 files changed

+47
-20
lines changed

5 files changed

+47
-20
lines changed

Diff for: client/jest-setup.ts

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//globalThis.IS_REACT_ACT_ENVIRONMENT = true;
2+
3+
if (!globalThis.TextEncoder || !globalThis.TextDecoder) {
4+
// eslint-disable-next-line @typescript-eslint/no-var-requires
5+
const { TextDecoder, TextEncoder } = require("node:util");
6+
globalThis.TextEncoder = TextEncoder;
7+
globalThis.TextDecoder = TextDecoder;
8+
}

Diff for: client/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@
5858
"setupFiles": [
5959
"react-app-polyfill/jsdom"
6060
],
61-
"setupFilesAfterEnv": [],
61+
"setupFilesAfterEnv": [
62+
"<rootDir>/jest-setup.ts"
63+
],
6264
"testEnvironment": "jsdom",
6365
"testMatch": [
6466
"<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@
240240
"react-dom": "^18.3.1",
241241
"react-is": "^18.3.1",
242242
"react-refresh": "^0.14",
243-
"react-router": "^6.17.0",
244-
"react-router-dom": "^6.28.0",
243+
"react-router": "^7.0.2",
244+
"react-router-dom": "^7.0.2",
245245
"remark-prettier": "^2.0.0",
246246
"resolve": "^1.22.8",
247247
"resolve-url-loader": "^5.0.0",

Diff for: ssr/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import { StaticRouter } from "react-router-dom/server";
2+
import { StaticRouter } from "react-router-dom";
33

44
import { App } from "../client/src/app";
55
import render from "./render";

Diff for: yarn.lock

+33-16
Original file line numberDiff line numberDiff line change
@@ -2722,11 +2722,6 @@
27222722
"@opentelemetry/instrumentation" "^0.49 || ^0.50 || ^0.51 || ^0.52.0"
27232723
"@opentelemetry/sdk-trace-base" "^1.22"
27242724

2725-
"@remix-run/[email protected]":
2726-
version "1.21.0"
2727-
resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.21.0.tgz#c65ae4262bdcfe415dbd4f64ec87676e4a56e2b5"
2728-
integrity sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==
2729-
27302725
"@rtsao/scc@^1.1.0":
27312726
version "1.1.0"
27322727
resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
@@ -3190,6 +3185,11 @@
31903185
dependencies:
31913186
"@types/node" "*"
31923187

3188+
"@types/cookie@^0.6.0":
3189+
version "0.6.0"
3190+
resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.6.0.tgz#eac397f28bf1d6ae0ae081363eca2f425bedf0d5"
3191+
integrity sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==
3192+
31933193
"@types/debug@^4.0.0":
31943194
version "4.1.12"
31953195
resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917"
@@ -5376,6 +5376,11 @@ [email protected], cookie@^0.7.2:
53765376
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
53775377
integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
53785378

5379+
cookie@^1.0.1:
5380+
version "1.0.2"
5381+
resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.0.2.tgz#27360701532116bd3f1f9416929d176afe1e4610"
5382+
integrity sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==
5383+
53795384
core-js-compat@^3.38.0, core-js-compat@^3.38.1:
53805385
version "3.39.0"
53815386
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.39.0.tgz#b12dccb495f2601dc860bdbe7b4e3ffa8ba63f61"
@@ -12665,20 +12670,22 @@ react-refresh@^0.14:
1266512670
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9"
1266612671
integrity sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==
1266712672

12668-
react-router-dom@^6.28.0:
12669-
version "6.28.0"
12670-
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.28.0.tgz#f73ebb3490e59ac9f299377062ad1d10a9f579e6"
12671-
integrity sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==
12673+
react-router-dom@^7.0.2:
12674+
version "7.0.2"
12675+
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-7.0.2.tgz#cbd7ce2db7112f1bc3e9eee3657ad32d7515a913"
12676+
integrity sha512-VJOQ+CDWFDGaWdrG12Nl+d7yHtLaurNgAQZVgaIy7/Xd+DojgmYLosFfZdGz1wpxmjJIAkAMVTKWcvkx1oggAw==
1267212677
dependencies:
12673-
"@remix-run/router" "1.21.0"
12674-
react-router "6.28.0"
12678+
react-router "7.0.2"
1267512679

12676-
react-router@6.28.0, react-router@^6.17.0:
12677-
version "6.28.0"
12678-
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.28.0.tgz#29247c86d7ba901d7e5a13aa79a96723c3e59d0d"
12679-
integrity sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==
12680+
react-router@7.0.2, react-router@^7.0.2:
12681+
version "7.0.2"
12682+
resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.0.2.tgz#2820e107cb8cec8acc5db15a17470c056ea86022"
12683+
integrity sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==
1268012684
dependencies:
12681-
"@remix-run/router" "1.21.0"
12685+
"@types/cookie" "^0.6.0"
12686+
cookie "^1.0.1"
12687+
set-cookie-parser "^2.6.0"
12688+
turbo-stream "2.4.0"
1268212689

1268312690
react@^18.3.1:
1268412691
version "18.3.1"
@@ -13414,6 +13421,11 @@ [email protected]:
1341413421
parseurl "~1.3.3"
1341513422
send "0.19.0"
1341613423

13424+
set-cookie-parser@^2.6.0:
13425+
version "2.7.1"
13426+
resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz#3016f150072202dfbe90fadee053573cc89d2943"
13427+
integrity sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==
13428+
1341713429
set-function-length@^1.2.1:
1341813430
version "1.2.2"
1341913431
resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
@@ -14692,6 +14704,11 @@ tunnel-agent@^0.6.0:
1469214704
dependencies:
1469314705
safe-buffer "^5.0.1"
1469414706

14707+
14708+
version "2.4.0"
14709+
resolved "https://registry.yarnpkg.com/turbo-stream/-/turbo-stream-2.4.0.tgz#1e4fca6725e90fa14ac4adb782f2d3759a5695f0"
14710+
integrity sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==
14711+
1469514712
type-check@^0.4.0, type-check@~0.4.0:
1469614713
version "0.4.0"
1469714714
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"

0 commit comments

Comments
 (0)