From 61eff8176e439d188f8a7522a310bc9f14fc985e Mon Sep 17 00:00:00 2001
From: Ian VanSchooten <ian.vanschooten@gmail.com>
Date: Mon, 26 Sep 2022 15:41:15 -0400
Subject: [PATCH] Do not add Webpack loaders when using Vite builder

---
 code/lib/cli/src/generators/SVELTE/index.ts | 5 ++++-
 code/lib/cli/src/generators/VUE/index.ts    | 4 +++-
 code/lib/cli/src/generators/VUE3/index.ts   | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/code/lib/cli/src/generators/SVELTE/index.ts b/code/lib/cli/src/generators/SVELTE/index.ts
index 115e16df81f8..b3f10af75674 100644
--- a/code/lib/cli/src/generators/SVELTE/index.ts
+++ b/code/lib/cli/src/generators/SVELTE/index.ts
@@ -1,6 +1,7 @@
 import fse from 'fs-extra';
 import { logger } from '@storybook/node-logger';
 
+import { CoreBuilder } from '../../project_types';
 import { baseGenerator } from '../baseGenerator';
 import { Generator } from '../types';
 
@@ -31,8 +32,10 @@ const generator: Generator = async (packageManager, npmOptions, options) => {
     }
   }
 
+  const extraPackages = options.builder === CoreBuilder.Webpack5 ? ['svelte', 'svelte-loader'] : [];
+
   await baseGenerator(packageManager, npmOptions, options, 'svelte', {
-    extraPackages: ['svelte', 'svelte-loader'],
+    extraPackages,
     extensions: ['js', 'jsx', 'ts', 'tsx', 'svelte'],
     extraMain,
     commonJs: true,
diff --git a/code/lib/cli/src/generators/VUE/index.ts b/code/lib/cli/src/generators/VUE/index.ts
index de0739bb582f..dbfcfb31da5a 100644
--- a/code/lib/cli/src/generators/VUE/index.ts
+++ b/code/lib/cli/src/generators/VUE/index.ts
@@ -1,9 +1,11 @@
+import { CoreBuilder } from '../../project_types';
 import { baseGenerator } from '../baseGenerator';
 import { Generator } from '../types';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {
+  const extraPackages = options.builder === CoreBuilder.Webpack5 ? ['vue-loader@^15.7.0'] : [];
   await baseGenerator(packageManager, npmOptions, options, 'vue', {
-    extraPackages: ['vue-loader@^15.7.0'],
+    extraPackages,
   });
 };
 
diff --git a/code/lib/cli/src/generators/VUE3/index.ts b/code/lib/cli/src/generators/VUE3/index.ts
index 3bc35c4fe375..5e79b9a17813 100644
--- a/code/lib/cli/src/generators/VUE3/index.ts
+++ b/code/lib/cli/src/generators/VUE3/index.ts
@@ -1,9 +1,14 @@
+import { CoreBuilder } from '../../project_types';
 import { baseGenerator } from '../baseGenerator';
 import { Generator } from '../types';
 
 const generator: Generator = async (packageManager, npmOptions, options) => {
+  const extraPackages =
+    options.builder === CoreBuilder.Webpack5
+      ? ['vue-loader@^17.0.0', '@vue/compiler-sfc@^3.2.0']
+      : [];
   await baseGenerator(packageManager, npmOptions, options, 'vue3', {
-    extraPackages: ['vue-loader@^17.0.0', '@vue/compiler-sfc@^3.2.0'],
+    extraPackages,
   });
 };