From 027c611f4c93c03dd2f0a18335b666efc3af4587 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 2 Jun 2026 16:06:56 +0000 Subject: [PATCH 1/4] Upgrade React Router packages Co-authored-by: Kent C. Dodds --- package-lock.json | 57 ++++++++++++++++++++++++----------------------- package.json | 8 +++---- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 57da3f368..862dfe82b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,8 +30,8 @@ "@radix-ui/react-toast": "^1.2.15", "@radix-ui/react-tooltip": "^1.2.8", "@react-email/components": "^1.0.6", - "@react-router/express": "^7.13.0", - "@react-router/node": "^7.13.0", + "@react-router/express": "^7.16.0", + "@react-router/node": "^7.16.0", "@remix-run/server-runtime": "^2.17.4", "@sentry/profiling-node": "^10.38.0", "@sentry/react-router": "^10.38.0", @@ -66,7 +66,7 @@ "qrcode": "^1.5.4", "react": "^19.2.4", "react-dom": "^19.2.4", - "react-router": "^7.13.0", + "react-router": "^7.16.0", "remix-auth": "^4.2.0", "remix-auth-github": "^3.0.2", "remix-utils": "^9.0.1", @@ -84,7 +84,7 @@ "@epic-web/config": "^1.21.3", "@faker-js/faker": "^10.2.0", "@playwright/test": "^1.58.1", - "@react-router/dev": "^7.13.0", + "@react-router/dev": "^7.16.0", "@sly-cli/sly": "^2.1.1", "@testing-library/dom": "^10.4.1", "@testing-library/jest-dom": "^6.9.1", @@ -2563,7 +2563,8 @@ "node_modules/@mjackson/node-fetch-server": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@mjackson/node-fetch-server/-/node-fetch-server-0.2.0.tgz", - "integrity": "sha512-EMlH1e30yzmTpGLQjlFmaDAjyOeZhng1/XCd7DExR8PNAnG/G1tyruZxEoUe11ClnwGhGrtsdnyyUx1frSzjng==" + "integrity": "sha512-EMlH1e30yzmTpGLQjlFmaDAjyOeZhng1/XCd7DExR8PNAnG/G1tyruZxEoUe11ClnwGhGrtsdnyyUx1frSzjng==", + "license": "MIT" }, "node_modules/@mswjs/interceptors": { "version": "0.40.0", @@ -4756,9 +4757,9 @@ } }, "node_modules/@react-router/dev": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@react-router/dev/-/dev-7.13.0.tgz", - "integrity": "sha512-0vRfTrS6wIXr9j0STu614Cv2ytMr21evnv1r+DXPv5cJ4q0V2x2kBAXC8TAqEXkpN5vdhbXBlbGQ821zwOfhvg==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@react-router/dev/-/dev-7.16.0.tgz", + "integrity": "sha512-E/uNYnHbo+wepw+FudGwuN6au6y4dOfVuRRANYdCp5T+tLvGU/09s2uGzNQsxqushyae9wvWTLY0qMvvgowIyg==", "dev": true, "license": "MIT", "dependencies": { @@ -4769,7 +4770,7 @@ "@babel/preset-typescript": "^7.27.1", "@babel/traverse": "^7.27.7", "@babel/types": "^7.27.7", - "@react-router/node": "7.13.0", + "@react-router/node": "7.16.0", "@remix-run/node-fetch-server": "^0.13.0", "arg": "^5.0.1", "babel-dead-code-elimination": "^1.0.6", @@ -4798,12 +4799,12 @@ "node": ">=20.0.0" }, "peerDependencies": { - "@react-router/serve": "^7.13.0", - "@vitejs/plugin-rsc": "~0.5.7", - "react-router": "^7.13.0", + "@react-router/serve": "^7.16.0", + "@vitejs/plugin-rsc": "~0.5.21", + "react-router": "^7.16.0", "react-server-dom-webpack": "^19.2.3", - "typescript": "^5.1.0", - "vite": "^5.1.0 || ^6.0.0 || ^7.0.0", + "typescript": "^5.1.0 || ^6.0.0", + "vite": "^5.1.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", "wrangler": "^3.28.2 || ^4.0.0" }, "peerDependenciesMeta": { @@ -4825,20 +4826,20 @@ } }, "node_modules/@react-router/express": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@react-router/express/-/express-7.13.0.tgz", - "integrity": "sha512-9az5P7sjbfxb0l4TtS5tlyV2tI8ZY4dWeuddxK2JLtgWwe+MGGSEO62fY87PidmgTqpQXguT6iyR5RXP9gJucA==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@react-router/express/-/express-7.16.0.tgz", + "integrity": "sha512-nE+yZ9J8fJjVR7UrnAYzOWcvAdI0HxHKjzizOxpDREcNCt38EFoMqc2gi4vEbQUVvj67Uygv/iACuc/AAAfj3Q==", "license": "MIT", "dependencies": { - "@react-router/node": "7.13.0" + "@react-router/node": "7.16.0" }, "engines": { "node": ">=20.0.0" }, "peerDependencies": { "express": "^4.17.1 || ^5", - "react-router": "7.13.0", - "typescript": "^5.1.0" + "react-router": "7.16.0", + "typescript": "^5.1.0 || ^6.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -4847,9 +4848,9 @@ } }, "node_modules/@react-router/node": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@react-router/node/-/node-7.13.0.tgz", - "integrity": "sha512-Mhr3fAou19oc/S93tKMIBHwCPfqLpWyWM/m0NWd3pJh/wZin8/9KhAdjwxhYbXw1TrTBZBLDENa35uZ+Y7oh3A==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@react-router/node/-/node-7.16.0.tgz", + "integrity": "sha512-3S54GArZETvcBHt0cFNJS5ZU66bCNVOoS44MVcGjiGjArBXvWx8xIQ5FO9n1azKGEBpDmJN7NbA+cf3oMCJv3g==", "license": "MIT", "dependencies": { "@mjackson/node-fetch-server": "^0.2.0" @@ -4858,8 +4859,8 @@ "node": ">=20.0.0" }, "peerDependencies": { - "react-router": "7.13.0", - "typescript": "^5.1.0" + "react-router": "7.16.0", + "typescript": "^5.1.0 || ^6.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -15010,9 +15011,9 @@ } }, "node_modules/react-router": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.13.0.tgz", - "integrity": "sha512-PZgus8ETambRT17BUm/LL8lX3Of+oiLaPuVTRH3l1eLvSPpKO3AvhAEb5N7ihAFZQrYDqkvvWfFh9p0z9VsjLw==", + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.16.0.tgz", + "integrity": "sha512-wArC8lVyJb3+jM9OpDyW6hLCizACWkvQR/sSGqSs+o5uEXEtGlqdZ4v8hENR3Jad6i+LRkK93q/+bQAcvl6V1A==", "license": "MIT", "dependencies": { "cookie": "^1.0.1", diff --git a/package.json b/package.json index 88bb34551..d2062398e 100644 --- a/package.json +++ b/package.json @@ -58,8 +58,8 @@ "@radix-ui/react-toast": "^1.2.15", "@radix-ui/react-tooltip": "^1.2.8", "@react-email/components": "^1.0.6", - "@react-router/express": "^7.13.0", - "@react-router/node": "^7.13.0", + "@react-router/express": "^7.16.0", + "@react-router/node": "^7.16.0", "@remix-run/server-runtime": "^2.17.4", "@sentry/profiling-node": "^10.38.0", "@sentry/react-router": "^10.38.0", @@ -94,7 +94,7 @@ "qrcode": "^1.5.4", "react": "^19.2.4", "react-dom": "^19.2.4", - "react-router": "^7.13.0", + "react-router": "^7.16.0", "remix-auth": "^4.2.0", "remix-auth-github": "^3.0.2", "remix-utils": "^9.0.1", @@ -112,7 +112,7 @@ "@epic-web/config": "^1.21.3", "@faker-js/faker": "^10.2.0", "@playwright/test": "^1.58.1", - "@react-router/dev": "^7.13.0", + "@react-router/dev": "^7.16.0", "@sly-cli/sly": "^2.1.1", "@testing-library/dom": "^10.4.1", "@testing-library/jest-dom": "^6.9.1", From ed6d567d7955552430947c92c419e73507f95b33 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 2 Jun 2026 16:09:01 +0000 Subject: [PATCH 2/4] Fix loader test args for React Router 7.16 Co-authored-by: Kent C. Dodds --- app/routes/_auth/auth.$provider/callback.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/routes/_auth/auth.$provider/callback.test.ts b/app/routes/_auth/auth.$provider/callback.test.ts index a0da9755f..bb6346b1c 100644 --- a/app/routes/_auth/auth.$provider/callback.test.ts +++ b/app/routes/_auth/auth.$provider/callback.test.ts @@ -15,6 +15,7 @@ import { insertGitHubUser, deleteGitHubUsers } from '#tests/mocks/github.ts' import { server } from '#tests/mocks/index.ts' import { consoleError } from '#tests/setup/setup-test-env.ts' import { BASE_URL, convertSetCookieToCookie } from '#tests/utils.ts' +import { type Route } from './+types/callback.ts' import { loader } from './callback.ts' const ROUTE_PATH = '/auth/github/callback' @@ -22,8 +23,9 @@ const PARAMS = { provider: 'github' } const LOADER_ARGS_BASE = { params: PARAMS, context: {} as AppLoadContext, + matches: [] as unknown as Route.LoaderArgs['matches'], unstable_pattern: ROUTE_PATH, -} +} satisfies Omit afterEach(async () => { await deleteGitHubUsers() From 4f7c25d14f2758ba39df0b6747becc47eb476bdb Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 2 Jun 2026 16:10:55 +0000 Subject: [PATCH 3/4] Update loader test args for React Router 7.16 Co-authored-by: Kent C. Dodds --- app/routes/_auth/auth.$provider/callback.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routes/_auth/auth.$provider/callback.test.ts b/app/routes/_auth/auth.$provider/callback.test.ts index bb6346b1c..bdbe7c452 100644 --- a/app/routes/_auth/auth.$provider/callback.test.ts +++ b/app/routes/_auth/auth.$provider/callback.test.ts @@ -23,8 +23,8 @@ const PARAMS = { provider: 'github' } const LOADER_ARGS_BASE = { params: PARAMS, context: {} as AppLoadContext, - matches: [] as unknown as Route.LoaderArgs['matches'], - unstable_pattern: ROUTE_PATH, + url: new URL(ROUTE_PATH, BASE_URL), + pattern: ROUTE_PATH, } satisfies Omit afterEach(async () => { From 684cdaa2be9744b51500745c10dbd165a156dabf Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 2 Jun 2026 16:12:18 +0000 Subject: [PATCH 4/4] Upgrade React Router related dev tools Co-authored-by: Kent C. Dodds --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 862dfe82b..fd062d743 100644 --- a/package-lock.json +++ b/package-lock.json @@ -116,8 +116,8 @@ "prettier": "^3.8.1", "prettier-plugin-sql": "^0.19.2", "prettier-plugin-tailwindcss": "^0.7.2", - "react-router-auto-routes": "^0.7.1", - "react-router-devtools": "^6.2.0", + "react-router-auto-routes": "^0.8.4", + "react-router-devtools": "^6.2.1", "tsx": "^4.21.0", "tw-animate-css": "^1.4.0", "typescript": "^5.9.3", @@ -15033,9 +15033,9 @@ } }, "node_modules/react-router-auto-routes": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/react-router-auto-routes/-/react-router-auto-routes-0.7.1.tgz", - "integrity": "sha512-T/erxBvP7IM/UG7oGoKRH+Rniy+TDhdLwQ47gJG9sTcteVRQJpSD10fcWykk+MC2Cwee7L0tXH9jhO7ZNxJLMg==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/react-router-auto-routes/-/react-router-auto-routes-0.8.4.tgz", + "integrity": "sha512-eGbPtJGJ2XWleKr9xFm0cqYxNUBbnyA7jVag+LSbs2TR6uqqID+n+2MmpgGf7gHskOX7lTWUuOQmZr+nHtEaZg==", "dev": true, "license": "MIT", "dependencies": { @@ -15065,9 +15065,9 @@ } }, "node_modules/react-router-devtools": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/react-router-devtools/-/react-router-devtools-6.2.0.tgz", - "integrity": "sha512-YzaFAyKZEtTmWzBF/moKuMtEa8Hd/xhTtUCKarrhAbZMyR8S0OpCpN0pyKrNGNz7ueOc4jvvKdE9S6Q3UTotDg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/react-router-devtools/-/react-router-devtools-6.2.1.tgz", + "integrity": "sha512-qhQg5bJvsiWQpCddehh7HUpNt/zGlxHygG3rseooky1ENDGmlNwB08w4gW4YZRzeZOPgVpgEXgw94ypBpGfpww==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index d2062398e..6d02180a7 100644 --- a/package.json +++ b/package.json @@ -144,8 +144,8 @@ "prettier": "^3.8.1", "prettier-plugin-sql": "^0.19.2", "prettier-plugin-tailwindcss": "^0.7.2", - "react-router-auto-routes": "^0.7.1", - "react-router-devtools": "^6.2.0", + "react-router-auto-routes": "^0.8.4", + "react-router-devtools": "^6.2.1", "tsx": "^4.21.0", "tw-animate-css": "^1.4.0", "typescript": "^5.9.3",