From 986264af7dabdc65c2955ff99d5204f7fb1dc300 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 20 Jun 2022 15:43:07 +0100
Subject: [PATCH] fix: use legacy commonjs transform plugin

---
 packages/vite/src/server.ts        | 6 ++++--
 packages/vite/src/vite.ts          | 3 +++
 test/fixtures/basic/nuxt.config.ts | 2 --
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 02aa8428f47..ecaaab7c495 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -26,7 +26,7 @@ export async function buildServer (ctx: ViteBuildContext) {
     resolve: {
       alias: {
         '#build/plugins': resolve(ctx.nuxt.options.buildDir, 'plugins/server'),
-        ...ctx.nuxt.options.experimental.externalVue
+        ...ctx.nuxt.options.experimental.externalVue || ctx.nuxt.options.dev
           ? {}
           : {
               '@vue/reactivity': _resolve(`@vue/reactivity/dist/reactivity.cjs${ctx.nuxt.options.dev ? '' : '.prod'}.js`),
@@ -39,7 +39,9 @@ export async function buildServer (ctx: ViteBuildContext) {
       }
     },
     ssr: {
-      external: ctx.nuxt.options.experimental.externalVue ? ['#internal/nitro', '#internal/nitro/utils', 'vue', 'vue-router'] : ['#internal/nitro', '#internal/nitro/utils'],
+      external: ctx.nuxt.options.experimental.externalVue
+        ? ['#internal/nitro', '#internal/nitro/utils', 'vue', 'vue-router']
+        : ['#internal/nitro', '#internal/nitro/utils'],
       noExternal: [
         ...ctx.nuxt.options.build.transpile,
         // TODO: Use externality for production (rollup) build
diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts
index b553f287f94..38ac900b6cd 100644
--- a/packages/vite/src/vite.ts
+++ b/packages/vite/src/vite.ts
@@ -30,6 +30,9 @@ export async function bundle (nuxt: Nuxt) {
     nuxt,
     config: vite.mergeConfig(
       {
+        legacy: {
+          buildRollupPluginCommonjs: !nuxt.options.experimental.externalVue
+        },
         resolve: {
           alias: {
             ...nuxt.options.alias,
diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
index f92b66c4c7b..93c21696cd7 100644
--- a/test/fixtures/basic/nuxt.config.ts
+++ b/test/fixtures/basic/nuxt.config.ts
@@ -28,8 +28,6 @@ export default defineNuxtConfig({
     }
   },
   experimental: {
-    // TODO: enable by default or work around the need for this
-    externalVue: true,
     reactivityTransform: true
   }
 })