From edf2ce4aefd15273fd262416fb48501948c6f452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@nuxtjs.com>
Date: Tue, 2 Aug 2022 17:05:33 +0200
Subject: [PATCH 1/4] fix(document-driven): Only set 404 status on SSR

---
 src/runtime/pages/document-driven.vue | 13 +++++--------
 test/document-driven.test.ts          |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/runtime/pages/document-driven.vue b/src/runtime/pages/document-driven.vue
index 21b1a7f66..f6739200f 100644
--- a/src/runtime/pages/document-driven.vue
+++ b/src/runtime/pages/document-driven.vue
@@ -1,15 +1,12 @@
 <script setup lang="ts">
-import { createError } from 'h3'
-import { useContent, useContentHead, useRoute } from '#imports'
+import { useNuxtApp, useContent, useContentHead } from '#imports'
 
 const { page } = useContent()
 
-// Page not found
-if (!page.value) {
-  throw createError({
-    statusCode: 404,
-    statusMessage: `Page not found: ${useRoute().path}`
-  })
+// Page not found, set correct status code on SSR
+const nuxtApp = useNuxtApp()
+if (!page.value && process.server && nuxtApp.ssrContext) {
+  nuxtApp.ssrContext.res.statusCode = 404
 }
 
 useContentHead(page)
diff --git a/test/document-driven.test.ts b/test/document-driven.test.ts
index ba2b53ed0..0478b229a 100644
--- a/test/document-driven.test.ts
+++ b/test/document-driven.test.ts
@@ -52,7 +52,7 @@ describe('fixtures:document-driven', async () => {
       await $fetch('/page-not-found')
     } catch (e) {
       expect(e.response.status).toBe(404)
-      expect(e.response.statusText).toBe('Page not found: /page-not-found')
+      expect(e.response.statusText).toBe('Document not found')
     }
   })
 })

From 856d26d74825197de9929966f5e5e646af6d988e Mon Sep 17 00:00:00 2001
From: Ahad Birang <farnabaz@gmail.com>
Date: Tue, 2 Aug 2022 19:44:35 +0430
Subject: [PATCH 2/4] fix: test

---
 test/document-driven.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/document-driven.test.ts b/test/document-driven.test.ts
index 0478b229a..ba683d68d 100644
--- a/test/document-driven.test.ts
+++ b/test/document-driven.test.ts
@@ -52,7 +52,7 @@ describe('fixtures:document-driven', async () => {
       await $fetch('/page-not-found')
     } catch (e) {
       expect(e.response.status).toBe(404)
-      expect(e.response.statusText).toBe('Document not found')
+      expect(e.response.statusText).toBe('Not found')
     }
   })
 })

From 48e86ae1f885bb8393612d8b0256e497b1e54fd3 Mon Sep 17 00:00:00 2001
From: Ahad Birang <farnabaz@gmail.com>
Date: Tue, 2 Aug 2022 19:50:51 +0430
Subject: [PATCH 3/4] fix: `useRequestEvent`

---
 src/runtime/pages/document-driven.vue | 8 ++++----
 test/document-driven.test.ts          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/runtime/pages/document-driven.vue b/src/runtime/pages/document-driven.vue
index f6739200f..f45d9e1a7 100644
--- a/src/runtime/pages/document-driven.vue
+++ b/src/runtime/pages/document-driven.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { useNuxtApp, useContent, useContentHead } from '#imports'
+import { useContent, useContentHead, useRequestEvent } from '#imports'
 
 const { page } = useContent()
 
 // Page not found, set correct status code on SSR
-const nuxtApp = useNuxtApp()
-if (!page.value && process.server && nuxtApp.ssrContext) {
-  nuxtApp.ssrContext.res.statusCode = 404
+if (!page.value && process.server) {
+  const event = useRequestEvent()
+  event.res.statusCode = 404
 }
 
 useContentHead(page)
diff --git a/test/document-driven.test.ts b/test/document-driven.test.ts
index ba683d68d..dc611d274 100644
--- a/test/document-driven.test.ts
+++ b/test/document-driven.test.ts
@@ -52,7 +52,7 @@ describe('fixtures:document-driven', async () => {
       await $fetch('/page-not-found')
     } catch (e) {
       expect(e.response.status).toBe(404)
-      expect(e.response.statusText).toBe('Not found')
+      expect(e.response.statusText).toBe('Not Found')
     }
   })
 })

From 6a160a82530e8637536cc0bf659936e353c9bb09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@nuxtjs.com>
Date: Tue, 2 Aug 2022 17:21:16 +0200
Subject: [PATCH 4/4] chore: use useRequestEvent()

---
 playground/document-driven/content/0.index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/playground/document-driven/content/0.index.md b/playground/document-driven/content/0.index.md
index 59ac8a874..008e5beae 100644
--- a/playground/document-driven/content/0.index.md
+++ b/playground/document-driven/content/0.index.md
@@ -7,3 +7,5 @@ description: Hello, here is a description
 # Home
 
 Hello World!
+
+[404](/404)