Fix csf plugin for webpack and rspack

storybookjs · May 24, 2024 · daf32a6 · daf32a6
1 parent c5f9332
commit daf32a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/code/lib/csf-plugin/package.json b/code/lib/csf-plugin/package.json
@@ -27,7 +27,7 @@
       "require": "./dist/index.js",
       "import": "./dist/index.mjs"
     },
-    "./webpack-loader": {
+    "./dist/webpack-loader": {
       "types": "./dist/webpack-loader.d.ts",
       "node": "./dist/webpack-loader.js",
       "require": "./dist/webpack-loader.js",

diff --git a/code/lib/csf-plugin/src/index.ts b/code/lib/csf-plugin/src/index.ts
@@ -1,6 +1,7 @@
 import { createUnplugin } from 'unplugin';
 import type { EnrichCsfOptions } from '@storybook/csf-tools';
 import { rollupBasedPlugin } from './rollup-based-plugin';
+import { STORIES_REGEX } from './constants';
 
 export type CsfPluginOptions = EnrichCsfOptions;
 
@@ -15,20 +16,22 @@ export const unplugin = createUnplugin<CsfPluginOptions>((options) => {
       ...rollupBasedPlugin(options),
     },
     webpack(compiler) {
-      compiler.options.module.rules.unshift({
+      compiler.options.module.rules.push({
+        test: STORIES_REGEX,
         enforce: 'pre',
         use: {
           options,
-          loader: require.resolve('./webpack-loader'),
+          loader: require.resolve('@storybook/csf-plugin/dist/webpack-loader'),
         },
       });
     },
     rspack(compiler) {
       compiler.options.module.rules.unshift({
+        test: STORIES_REGEX,
         enforce: 'pre',
         use: {
           options,
-          loader: require.resolve('./webpack-loader'),
+          loader: require.resolve('@storybook/csf-plugin/dist/webpack-loader'),
         },
       });
     },