From a4300b8a3360ad7cfd35e81b4fe9ee9f45442489 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 15 Sep 2022 18:19:24 +0200
Subject: [PATCH 1/3] fix(nuxt): keep `state` in initial state instead of
 extracting it

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

diff --git a/packages/nuxt/src/core/runtime/nitro/renderer.ts b/packages/nuxt/src/core/runtime/nitro/renderer.ts
index 1cdcd933548..0cba87fc6c3 100644
--- a/packages/nuxt/src/core/runtime/nitro/renderer.ts
+++ b/packages/nuxt/src/core/runtime/nitro/renderer.ts
@@ -296,9 +296,9 @@ function renderPayloadResponse (ssrContext: NuxtSSRContext) {
 }
 
 function splitPayload (ssrContext: NuxtSSRContext) {
-  const { data, state, prerenderedAt, ...initial } = ssrContext.payload
+  const { data, prerenderedAt, ...initial } = ssrContext.payload
   return {
     initial: { ...initial, prerenderedAt },
-    payload: { data, state, prerenderedAt }
+    payload: { data, prerenderedAt }
   }
 }

From 19783fb977d2e01b232dc24095eb05f71908f519 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 15 Sep 2022 18:20:46 +0200
Subject: [PATCH 2/3] avoid overriding state in plugin

---
 packages/nuxt/src/app/plugins/payload.client.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nuxt/src/app/plugins/payload.client.ts b/packages/nuxt/src/app/plugins/payload.client.ts
index fb9d4c3ad03..8563fb12119 100644
--- a/packages/nuxt/src/app/plugins/payload.client.ts
+++ b/packages/nuxt/src/app/plugins/payload.client.ts
@@ -10,7 +10,6 @@ export default defineNuxtPlugin((nuxtApp) => {
     const payload = await loadPayload(url)
     if (!payload) { return }
     Object.assign(nuxtApp.payload.data, payload.data)
-    Object.assign(nuxtApp.payload.state, payload.state)
   }
   nuxtApp.hooks.hook('link:prefetch', async (to) => {
     await prefetchPayload(to)

From c51ebde5e428aa8165d66df8baaf540b3528915a Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Thu, 15 Sep 2022 19:17:16 +0200
Subject: [PATCH 3/3] update test

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

diff --git a/test/basic.test.ts b/test/basic.test.ts
index 2e951d4f22c..3d86a69d9e2 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -590,7 +590,7 @@ describe.skipIf(process.env.NUXT_TEST_DEV || isWindows)('payload rendering', ()
   it('renders a payload', async () => {
     const payload = await $fetch('/random/a/_payload.js', { responseType: 'text' })
     expect(payload).toMatch(
-      /export default \{data:\{\$frand_a:\[[^\]]*\]\},state:\{"\$srandom:rand_a":\d*,"\$srandom:default":\d*\},prerenderedAt:\d*\}/
+      /export default \{data:\{\$frand_a:\[[^\]]*\]\},prerenderedAt:\d*\}/
     )
   })