From ac05aa78fd1103ddeef72012d6785a135fad37f7 Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Wed, 20 Nov 2024 10:52:54 +0100 Subject: [PATCH 1/3] update check for not found navigation error --- packages/nextjs/src/common/nextNavigationErrorUtils.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/nextjs/src/common/nextNavigationErrorUtils.ts b/packages/nextjs/src/common/nextNavigationErrorUtils.ts index d4a67791525f..560408fe9446 100644 --- a/packages/nextjs/src/common/nextNavigationErrorUtils.ts +++ b/packages/nextjs/src/common/nextNavigationErrorUtils.ts @@ -5,7 +5,12 @@ import { isError } from '@sentry/utils'; * https://beta.nextjs.org/docs/api-reference/notfound#notfound */ export function isNotFoundNavigationError(subject: unknown): boolean { - return isError(subject) && (subject as Error & { digest?: unknown }).digest === 'NEXT_NOT_FOUND'; + return ( + isError(subject) && + ((subject as Error & { digest?: unknown }).digest === 'NEXT_NOT_FOUND' || + // this was introduced in 15.0.4-canary.18: https://github.com/vercel/next.js/pull/72774 + (subject as Error & { digest?: unknown }).digest === 'NEXT_HTTP_ERROR_FALLBACK;404') + ); } /** From 959652ebb4b01a14e2b62af8a12d9a23f52ec2fb Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Wed, 20 Nov 2024 16:20:20 +0100 Subject: [PATCH 2/3] simplify code --- packages/nextjs/src/common/nextNavigationErrorUtils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nextjs/src/common/nextNavigationErrorUtils.ts b/packages/nextjs/src/common/nextNavigationErrorUtils.ts index 560408fe9446..e486371a5583 100644 --- a/packages/nextjs/src/common/nextNavigationErrorUtils.ts +++ b/packages/nextjs/src/common/nextNavigationErrorUtils.ts @@ -7,9 +7,9 @@ import { isError } from '@sentry/utils'; export function isNotFoundNavigationError(subject: unknown): boolean { return ( isError(subject) && - ((subject as Error & { digest?: unknown }).digest === 'NEXT_NOT_FOUND' || - // this was introduced in 15.0.4-canary.18: https://github.com/vercel/next.js/pull/72774 - (subject as Error & { digest?: unknown }).digest === 'NEXT_HTTP_ERROR_FALLBACK;404') + ['NEXT_NOT_FOUND', 'NEXT_HTTP_ERROR_FALLBACK;404'].includes( + (subject as Error & { digest?: unknown }).digest as string, + ) ); } From 6f2d36446c5b85be45f074d18bf1df784a7ad4b3 Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Thu, 21 Nov 2024 09:50:01 +0100 Subject: [PATCH 3/3] mark turbo test as optional --- .../e2e-tests/test-applications/nextjs-turbo/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-packages/e2e-tests/test-applications/nextjs-turbo/package.json b/dev-packages/e2e-tests/test-applications/nextjs-turbo/package.json index ccefef67dfcf..03d8a71dbcae 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-turbo/package.json +++ b/dev-packages/e2e-tests/test-applications/nextjs-turbo/package.json @@ -46,6 +46,7 @@ "extends": "../../package.json" }, "sentryTest": { + "optional": true, "optionalVariants": [ { "build-command": "test:build-canary",