From 5849df3b627bf20115ed7163e7bc8640eed4a538 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 9 Sep 2022 11:26:20 +0100
Subject: [PATCH 1/2] fix(vite): write dev manifest before spa build

---
 packages/vite/src/server.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index f21beb35817..f0d4f67b9cc 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -52,13 +52,13 @@ export async function buildServer (ctx: ViteBuildContext) {
         ...ctx.nuxt.options.experimental.externalVue || ctx.nuxt.options.dev
           ? {}
           : {
-              '@vue/reactivity': _resolve(`@vue/reactivity/dist/reactivity.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
-              '@vue/shared': _resolve(`@vue/shared/dist/shared.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
-              'vue-router': _resolve(`vue-router/dist/vue-router.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
-              'vue/server-renderer': _resolve('vue/server-renderer'),
-              'vue/compiler-sfc': _resolve('vue/compiler-sfc'),
-              vue: _resolve(`vue/dist/vue.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`)
-            }
+            '@vue/reactivity': _resolve(`@vue/reactivity/dist/reactivity.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
+            '@vue/shared': _resolve(`@vue/shared/dist/shared.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
+            'vue-router': _resolve(`vue-router/dist/vue-router.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
+            'vue/server-renderer': _resolve('vue/server-renderer'),
+            'vue/compiler-sfc': _resolve('vue/compiler-sfc'),
+            vue: _resolve(`vue/dist/vue.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`)
+          }
       }
     },
     ssr: {
@@ -168,14 +168,14 @@ export async function buildServer (ctx: ViteBuildContext) {
     return
   }
 
+  // Write dev client manifest
+  await writeManifest(ctx)
+
   if (!ctx.nuxt.options.ssr) {
     await onBuild()
     return
   }
 
-  // Write dev client manifest
-  await writeManifest(ctx)
-
   // Start development server
   const viteServer = await vite.createServer(serverConfig)
   ctx.ssrServer = viteServer

From 2f873dc05755757e30e9d65e99bf02c5a6aca396 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 9 Sep 2022 11:27:42 +0100
Subject: [PATCH 2/2] style: fix whitespace change

---
 packages/vite/src/server.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index f0d4f67b9cc..947d6389afd 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -52,13 +52,13 @@ export async function buildServer (ctx: ViteBuildContext) {
         ...ctx.nuxt.options.experimental.externalVue || ctx.nuxt.options.dev
           ? {}
           : {
-            '@vue/reactivity': _resolve(`@vue/reactivity/dist/reactivity.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
-            '@vue/shared': _resolve(`@vue/shared/dist/shared.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
-            'vue-router': _resolve(`vue-router/dist/vue-router.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
-            'vue/server-renderer': _resolve('vue/server-renderer'),
-            'vue/compiler-sfc': _resolve('vue/compiler-sfc'),
-            vue: _resolve(`vue/dist/vue.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`)
-          }
+              '@vue/reactivity': _resolve(`@vue/reactivity/dist/reactivity.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
+              '@vue/shared': _resolve(`@vue/shared/dist/shared.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
+              'vue-router': _resolve(`vue-router/dist/vue-router.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
+              'vue/server-renderer': _resolve('vue/server-renderer'),
+              'vue/compiler-sfc': _resolve('vue/compiler-sfc'),
+              vue: _resolve(`vue/dist/vue.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`)
+            }
       }
     },
     ssr: {