From dab3750fcba19db9915cb4e82a00f42a25c730f3 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 11 Aug 2022 15:07:13 +0200
Subject: [PATCH 1/6] fix(nuxt)!: allow `app:rendered` hook to modify ssr
 context

---
 packages/nuxt/src/app/nuxt.ts                    | 6 +++---
 packages/nuxt/src/core/runtime/nitro/renderer.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nuxt/src/app/nuxt.ts b/packages/nuxt/src/app/nuxt.ts
index 2f5bc1ec72a..e933ae25271 100644
--- a/packages/nuxt/src/app/nuxt.ts
+++ b/packages/nuxt/src/app/nuxt.ts
@@ -6,8 +6,6 @@ import type { RuntimeConfig } from '@nuxt/schema'
 import { getContext } from 'unctx'
 import type { SSRContext } from 'vue-bundle-renderer/runtime'
 import type { CompatibilityEvent } from 'h3'
-// eslint-disable-next-line import/no-restricted-paths
-import type { NuxtRenderContext } from '../core/runtime/nitro/renderer'
 
 const nuxtAppCtx = getContext<NuxtApp>('nuxt-app')
 
@@ -21,11 +19,13 @@ type NuxtMeta = {
 }
 
 type HookResult = Promise<void> | void
+
+type AppRenderedContext = { ssrContext: NuxtApp['ssrContext'] }
 export interface RuntimeNuxtHooks {
   'app:created': (app: App<Element>) => HookResult
   'app:beforeMount': (app: App<Element>) => HookResult
   'app:mounted': (app: App<Element>) => HookResult
-  'app:rendered': (ctx: NuxtRenderContext) => HookResult
+  'app:rendered': (ctx: AppRenderedContext) => HookResult
   'app:redirected': () => HookResult
   'app:suspense:resolve': (Component?: VNode) => HookResult
   'app:error': (err: any) => HookResult
diff --git a/packages/nuxt/src/core/runtime/nitro/renderer.ts b/packages/nuxt/src/core/runtime/nitro/renderer.ts
index ab9d58042d5..9387c12952f 100644
--- a/packages/nuxt/src/core/runtime/nitro/renderer.ts
+++ b/packages/nuxt/src/core/runtime/nitro/renderer.ts
@@ -124,6 +124,7 @@ export default defineRenderHandler(async (event) => {
   const _rendered = await renderer.renderToString(ssrContext).catch((err) => {
     if (!ssrError) { throw err }
   })
+  await ssrContext.nuxt?.hooks.callHook('app:rendered', { ssrContext })
 
   // Handle errors
   if (!_rendered) {
@@ -167,7 +168,6 @@ export default defineRenderHandler(async (event) => {
 
   // Allow hooking into the rendered result
   const nitroApp = useNitroApp()
-  await ssrContext.nuxt?.hooks.callHook('app:rendered', rendered)
   await nitroApp.hooks.callHook('nuxt:app:rendered', rendered)
 
   // Construct HTML response

From d200412fe80f5b5a2292b05576583549df3acc58 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 11 Aug 2022 17:12:08 +0200
Subject: [PATCH 2/6] refactor!: change nitro `nuxt:app:rendered` to
 `render:html`

---
 .../nuxt/src/core/runtime/nitro/renderer.ts   | 68 +++++++++----------
 test/fixtures/basic/nuxt.d.ts                 |  8 +++
 2 files changed, 39 insertions(+), 37 deletions(-)
 create mode 100644 test/fixtures/basic/nuxt.d.ts

diff --git a/packages/nuxt/src/core/runtime/nitro/renderer.ts b/packages/nuxt/src/core/runtime/nitro/renderer.ts
index 9387c12952f..943ba06406d 100644
--- a/packages/nuxt/src/core/runtime/nitro/renderer.ts
+++ b/packages/nuxt/src/core/runtime/nitro/renderer.ts
@@ -15,16 +15,13 @@ export type NuxtSSRContext = NuxtApp['ssrContext']
 
 const defineRenderHandler = _defineRenderHandler as (h: RenderHandler) => CompatibilityEvent
 
-export interface NuxtRenderContext {
-  ssrContext: NuxtSSRContext
-  html: {
-    htmlAttrs: string[]
-    head: string[]
-    bodyAttrs: string[]
-    bodyPreprend: string[]
-    body: string[]
-    bodyAppend: string[]
-  }
+export interface NuxtRenderHTMLContext {
+  htmlAttrs: string[]
+  head: string[]
+  bodyAttrs: string[]
+  bodyPreprend: string[]
+  body: string[]
+  bodyAppend: string[]
 }
 
 export interface NuxtRenderResponse {
@@ -138,41 +135,38 @@ export default defineRenderHandler(async (event) => {
   const renderedMeta = await ssrContext.renderMeta?.() ?? {}
 
   // Create render context
-  const rendered: NuxtRenderContext = {
-    ssrContext,
-    html: {
-      htmlAttrs: normalizeChunks([renderedMeta.htmlAttrs]),
-      head: normalizeChunks([
-        renderedMeta.headTags,
-        _rendered.renderResourceHints(),
-        _rendered.renderStyles(),
-        ssrContext.styles
-      ]),
-      bodyAttrs: normalizeChunks([renderedMeta.bodyAttrs]),
-      bodyPreprend: normalizeChunks([
-        renderedMeta.bodyScriptsPrepend,
-        ssrContext.teleports?.body
-      ]),
-      body: [
+  const htmlContext: NuxtRenderHTMLContext = {
+    htmlAttrs: normalizeChunks([renderedMeta.htmlAttrs]),
+    head: normalizeChunks([
+      renderedMeta.headTags,
+      _rendered.renderResourceHints(),
+      _rendered.renderStyles(),
+      ssrContext.styles
+    ]),
+    bodyAttrs: normalizeChunks([renderedMeta.bodyAttrs]),
+    bodyPreprend: normalizeChunks([
+      renderedMeta.bodyScriptsPrepend,
+      ssrContext.teleports?.body
+    ]),
+    body: [
       // TODO: Rename to _rendered.body in next vue-bundle-renderer
-        _rendered.html
-      ],
-      bodyAppend: normalizeChunks([
+      _rendered.html
+    ],
+    bodyAppend: normalizeChunks([
       `<script>window.__NUXT__=${devalue(ssrContext.payload)}</script>`,
       _rendered.renderScripts(),
       // Note: bodyScripts may contain tags other than <script>
       renderedMeta.bodyScripts
-      ])
-    }
+    ])
   }
 
   // Allow hooking into the rendered result
   const nitroApp = useNitroApp()
-  await nitroApp.hooks.callHook('nuxt:app:rendered', rendered)
+  await nitroApp.hooks.callHook('render:html', htmlContext)
 
   // Construct HTML response
   const response: RenderResponse = {
-    body: renderHTMLDocument(rendered),
+    body: renderHTMLDocument(htmlContext),
     statusCode: event.res.statusCode,
     statusMessage: event.res.statusMessage,
     headers: {
@@ -206,10 +200,10 @@ function joinAttrs (chunks: string[]) {
   return chunks.join(' ')
 }
 
-function renderHTMLDocument (rendered: NuxtRenderContext) {
+function renderHTMLDocument (html: NuxtRenderHTMLContext) {
   return `<!DOCTYPE html>
-<html ${joinAttrs(rendered.html.htmlAttrs)}>
-<head>${joinTags(rendered.html.head)}</head>
-<body ${joinAttrs(rendered.html.bodyAttrs)}>${joinTags(rendered.html.bodyPreprend)}${joinTags(rendered.html.body)}${joinTags(rendered.html.bodyAppend)}</body>
+<html ${joinAttrs(html.htmlAttrs)}>
+<head>${joinTags(html.head)}</head>
+<body ${joinAttrs(html.bodyAttrs)}>${joinTags(html.bodyPreprend)}${joinTags(html.body)}${joinTags(html.bodyAppend)}</body>
 </html>`
 }
diff --git a/test/fixtures/basic/nuxt.d.ts b/test/fixtures/basic/nuxt.d.ts
new file mode 100644
index 00000000000..82c89b0525c
--- /dev/null
+++ b/test/fixtures/basic/nuxt.d.ts
@@ -0,0 +1,8 @@
+// This file is auto generated by `nuxt prepare`
+// Please do not manually modify this file.
+
+/// <reference path=".nuxt-node/nitro.d.ts" />
+/// <reference types="nuxt3" />
+/// <reference path=".nuxt-node/components.d.ts" />
+/// <reference path=".nuxt-node/auto-imports.d.ts" />
+export {}

From 1f3d4e4a534ef44ab0c017c09260a30e09ee9983 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 11 Aug 2022 17:30:50 +0200
Subject: [PATCH 3/6] pass event as second arg to render:html

---
 packages/nuxt/src/core/runtime/nitro/renderer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/core/runtime/nitro/renderer.ts b/packages/nuxt/src/core/runtime/nitro/renderer.ts
index 943ba06406d..ff4225d6d0f 100644
--- a/packages/nuxt/src/core/runtime/nitro/renderer.ts
+++ b/packages/nuxt/src/core/runtime/nitro/renderer.ts
@@ -162,7 +162,7 @@ export default defineRenderHandler(async (event) => {
 
   // Allow hooking into the rendered result
   const nitroApp = useNitroApp()
-  await nitroApp.hooks.callHook('render:html', htmlContext)
+  await nitroApp.hooks.callHook('render:html', htmlContext, { event })
 
   // Construct HTML response
   const response: RenderResponse = {

From 733471e451b56410de76f727daf73d4292ec16fc Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 11 Aug 2022 17:36:59 +0200
Subject: [PATCH 4/6] try _NuxtApp

---
 packages/nuxt/src/app/nuxt.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/app/nuxt.ts b/packages/nuxt/src/app/nuxt.ts
index e933ae25271..756760d89e5 100644
--- a/packages/nuxt/src/app/nuxt.ts
+++ b/packages/nuxt/src/app/nuxt.ts
@@ -20,7 +20,7 @@ type NuxtMeta = {
 
 type HookResult = Promise<void> | void
 
-type AppRenderedContext = { ssrContext: NuxtApp['ssrContext'] }
+type AppRenderedContext = { ssrContext: _NuxtApp['ssrContext'] }
 export interface RuntimeNuxtHooks {
   'app:created': (app: App<Element>) => HookResult
   'app:beforeMount': (app: App<Element>) => HookResult

From b6e688e428c52674cec3760ee0e3cafd02554b1c Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 11 Aug 2022 17:39:59 +0200
Subject: [PATCH 5/6] remove dangling file

---
 test/fixtures/basic/nuxt.d.ts | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 test/fixtures/basic/nuxt.d.ts

diff --git a/test/fixtures/basic/nuxt.d.ts b/test/fixtures/basic/nuxt.d.ts
deleted file mode 100644
index 82c89b0525c..00000000000
--- a/test/fixtures/basic/nuxt.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is auto generated by `nuxt prepare`
-// Please do not manually modify this file.
-
-/// <reference path=".nuxt-node/nitro.d.ts" />
-/// <reference types="nuxt3" />
-/// <reference path=".nuxt-node/components.d.ts" />
-/// <reference path=".nuxt-node/auto-imports.d.ts" />
-export {}

From cd24408535058df7f7589b02f39e47a8b46c5ed0 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 11 Aug 2022 17:41:27 +0200
Subject: [PATCH 6/6] switch back to NuxtApp

---
 packages/nuxt/src/app/nuxt.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/app/nuxt.ts b/packages/nuxt/src/app/nuxt.ts
index 756760d89e5..e933ae25271 100644
--- a/packages/nuxt/src/app/nuxt.ts
+++ b/packages/nuxt/src/app/nuxt.ts
@@ -20,7 +20,7 @@ type NuxtMeta = {
 
 type HookResult = Promise<void> | void
 
-type AppRenderedContext = { ssrContext: _NuxtApp['ssrContext'] }
+type AppRenderedContext = { ssrContext: NuxtApp['ssrContext'] }
 export interface RuntimeNuxtHooks {
   'app:created': (app: App<Element>) => HookResult
   'app:beforeMount': (app: App<Element>) => HookResult