Merge pull request #19263 from storybookjs/vite/no-generator-loaders

Vite: Do not add Webpack loaders when using Vite builder
storybookjs · Sep 27, 2022 · 08d9bcd · 08d9bcd
2 parents 64940b2 + 61eff81
commit 08d9bcd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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,
   });
 };