From 67f93a774c48e25403cb32f5c8e02cebbcfdeb5c Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Mon, 26 Sep 2022 10:58:09 +0200
Subject: [PATCH] Add 404 digest check

---
 packages/next/export/worker.ts      | 2 ++
 packages/next/server/app-render.tsx | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/next/export/worker.ts b/packages/next/export/worker.ts
index 179923384f67c..de2c23a8b78b3 100644
--- a/packages/next/export/worker.ts
+++ b/packages/next/export/worker.ts
@@ -30,6 +30,7 @@ import { addRequestMeta } from '../server/request-meta'
 import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
 import { REDIRECT_ERROR_CODE } from '../client/components/redirect'
 import { DYNAMIC_ERROR_CODE } from '../client/components/hooks-server-context'
+import { NOT_FOUND_ERROR_CODE } from '../client/components/not-found'
 
 loadRequireHook()
 const envConfig = require('../shared/lib/runtime-config')
@@ -419,6 +420,7 @@ export default async function exportPage({
           } catch (err: any) {
             if (
               err.digest !== DYNAMIC_ERROR_CODE &&
+              err.digest !== NOT_FOUND_ERROR_CODE &&
               !err.digest.startsWith(REDIRECT_ERROR_CODE)
             ) {
               throw err
diff --git a/packages/next/server/app-render.tsx b/packages/next/server/app-render.tsx
index 48369d4abe2e4..281ff87b2ae3a 100644
--- a/packages/next/server/app-render.tsx
+++ b/packages/next/server/app-render.tsx
@@ -31,6 +31,7 @@ import type { ComponentsType } from '../build/webpack/loaders/next-app-loader'
 import { REDIRECT_ERROR_CODE } from '../client/components/redirect'
 import { NextCookies } from './web/spec-extension/cookies'
 import { DYNAMIC_ERROR_CODE } from '../client/components/hooks-server-context'
+import { NOT_FOUND_ERROR_CODE } from '../client/components/not-found'
 
 const INTERNAL_HEADERS_INSTANCE = Symbol('internal for headers readonly')
 
@@ -173,6 +174,7 @@ function createErrorHandler(
     if (
       // TODO-APP: Handle redirect throw
       err.digest !== DYNAMIC_ERROR_CODE &&
+      err.digest !== NOT_FOUND_ERROR_CODE &&
       !err.digest.startsWith(REDIRECT_ERROR_CODE)
     ) {
       // Used for debugging error source