Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"isbot": "^5.1.22",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router": "7.9.6",
"react-router-dom": "7.9.6"
"react-router": "7.13.0",
"react-router-dom": "7.13.0"
},
"devDependencies": {
"@graphql-codegen/cli": "5.0.2",
"@playwright/test": "~1.56.0",
"@react-router/dev": "7.9.6",
"@react-router/fs-routes": "7.9.6",
"@react-router/dev": "7.13.0",
"@react-router/fs-routes": "7.13.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@shopify/cli": "3.80.4",
"@shopify/hydrogen-codegen": "^0.3.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"dependencies": {
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router": "^7.1.5",
"@react-router/node": "^7.1.5",
"@react-router/serve": "^7.1.5",
"react-router": "^7.13.0",
"@react-router/node": "^7.13.0",
"@react-router/serve": "^7.13.0",
"@sentry/react-router": "latest || *",
"isbot": "^5.1.17"
},
"devDependencies": {
"@types/react": "18.3.1",
"@types/react-dom": "18.3.1",
"@types/node": "^20",
"@react-router/dev": "^7.1.5",
"@react-router/dev": "^7.13.0",
"@playwright/test": "~1.56.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"typescript": "^5.6.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"dependencies": {
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router": "7.9.6",
"@react-router/node": "7.9.6",
"@react-router/serve": "7.9.6",
"react-router": "7.13.0",
"@react-router/node": "7.13.0",
"@react-router/serve": "7.13.0",
"@sentry/react-router": "latest || *",
"isbot": "^5.1.17"
},
"devDependencies": {
"@types/react": "18.3.1",
"@types/react-dom": "18.3.1",
"@types/node": "^20",
"@react-router/dev": "7.9.6",
"@react-router/dev": "7.13.0",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potential p-map version conflict with pnpm override

Low Severity

The upgrade to @react-router/dev 7.13.0 introduces a new dependency on p-map@^7.0.3. However, these two test applications have existing pnpm overrides that force p-map to ^4.0.0. This version mismatch could cause compatibility issues or unexpected behavior since the new @react-router/dev may use APIs or features specific to p-map v7 that don't exist in v4.

Additional Locations (1)

Fix in Cursor Fix in Web

"@playwright/test": "~1.56.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"typescript": "^5.6.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
},
"dependencies": {
"@sentry/react-router": "latest || *",
"@react-router/node": "7.9.6",
"@react-router/serve": "7.9.6",
"@react-router/node": "7.13.0",
"@react-router/serve": "7.13.0",
"isbot": "^5.1.27",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router": "7.9.6"
"react-router": "7.13.0"
},
"devDependencies": {
"@playwright/test": "~1.56.0",
"@react-router/dev": "7.9.6",
"@react-router/dev": "7.13.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@tailwindcss/vite": "^4.1.4",
"@types/node": "^20",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
},
"dependencies": {
"@sentry/react-router": "latest || *",
"@react-router/node": "^7.11.0",
"@react-router/serve": "^7.11.0",
"@react-router/node": "^7.13.0",
"@react-router/serve": "^7.13.0",
"isbot": "^5.1.27",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router": "^7.11.0"
"react-router": "^7.13.0"
},
"devDependencies": {
"@playwright/test": "~1.56.0",
"@react-router/dev": "^7.11.0",
"@react-router/dev": "^7.13.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@tailwindcss/vite": "^4.1.4",
"@types/node": "^20",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"dependencies": {
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router": "^7.1.5",
"@react-router/node": "^7.1.5",
"@react-router/serve": "^7.1.5",
"react-router": "^7.13.0",
"@react-router/node": "^7.13.0",
"@react-router/serve": "^7.13.0",
"@sentry/react-router": "latest || *",
"isbot": "^5.1.17"
},
"devDependencies": {
"@types/react": "18.3.1",
"@types/react-dom": "18.3.1",
"@types/node": "^20",
"@react-router/dev": "^7.1.5",
"@react-router/dev": "^7.13.0",
"@playwright/test": "~1.56.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"typescript": "^5.6.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@types/react-dom": "18.3.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router": "^7.0.1"
"react-router": "^7.13.0"
},
"devDependencies": {
"@playwright/test": "~1.56.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
"glob": "11.1.0"
},
"devDependencies": {
"@react-router/dev": "^7.5.2",
"@react-router/node": "^7.5.2",
"@react-router/dev": "^7.13.0",
"@react-router/node": "^7.13.0",
"react": "^18.3.1",
"react-router": "^7.9.2",
"react-router": "^7.13.0",
"vite": "^6.1.0"
},
"peerDependencies": {
Expand Down
7 changes: 2 additions & 5 deletions packages/react-router/src/server/createSentryHandleError.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { captureException, flushIfServerless } from '@sentry/core';
import type { ActionFunctionArgs, HandleErrorFunction, LoaderFunctionArgs } from 'react-router';
import type { HandleErrorFunction } from 'react-router';

export type SentryHandleErrorOptions = {
logErrors?: boolean;
Expand All @@ -11,10 +11,7 @@ export type SentryHandleErrorOptions = {
* @returns A Sentry-instrumented handleError function
*/
export function createSentryHandleError({ logErrors = false }: SentryHandleErrorOptions): HandleErrorFunction {
const handleError = async function handleError(
error: unknown,
args: LoaderFunctionArgs | ActionFunctionArgs,
): Promise<void> {
const handleError: HandleErrorFunction = async function handleError(error, args): Promise<void> {
// React Router may abort some interrupted requests, don't report those
if (!args.request.signal.aborted) {
captureException(error, {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ describe('createSentryHandleRequest', () => {
manifestPath: '/path/to/manifest',
},
routeModules: {},
future: { unstable_subResourceIntegrity: false, v8_middleware: false },
future: {
unstable_subResourceIntegrity: false,
v8_middleware: false,
unstable_trailingSlashAwareDataRequests: false,
},
isSpaMode: false,
staticHandlerContext: {
matches: [
Expand Down
Loading
Loading