Small fixes

storybookjs · May 17, 2024 · 5cb8045 · 5cb8045
1 parent 04378b7
commit 5cb8045
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/code/addons/docs/src/preset.ts b/code/addons/docs/src/preset.ts
@@ -96,12 +96,10 @@ async function webpack(
     module: {
       ...module,
       rules: [
-        ...(module.rules || []),
         ...(csfPluginOptions
           ? [
               {
-                test: /\.stories\.[tj]sx?$/,
-                enforce: 'post',
+                test: /(?<!node_modules.*)\.(story|stories)\.[tj]sx?$/,
                 use: [
                   {
                     loader: require.resolve('./csf-loader'),
@@ -111,6 +109,7 @@ async function webpack(
               },
             ]
           : []),
+        ...(module.rules || []),
         {
           test: /\.mdx$/,
           exclude: /(stories|story)\.mdx$/,

diff --git a/code/frameworks/react-vite/src/plugins/react-docgen.ts b/code/frameworks/react-vite/src/plugins/react-docgen.ts
@@ -80,7 +80,7 @@ export async function reactDocgen({
 
         return {
           code: s.toString(),
-          map: s.generateMap(),
+          map: s.generateMap({ hires: true, source: id }),
         };
       } catch (e: any) {
         // Ignore the error when react-docgen cannot find a react component

diff --git a/code/presets/react-webpack/src/loaders/react-docgen-loader.ts b/code/presets/react-webpack/src/loaders/react-docgen-loader.ts
@@ -70,7 +70,8 @@ let matchPath: TsconfigPaths.MatchPath | undefined;
 
 export default async function reactDocgenLoader(
   this: LoaderContext<{ debug: boolean }>,
-  source: string
+  source: string,
+  map: any
 ) {
   const callback = this.async();
   // get options
@@ -115,10 +116,6 @@ export default async function reactDocgenLoader(
       }
     });
 
-    const map = magicString.generateMap({
-      includeContent: true,
-      source: this.resourcePath,
-    });
     callback(null, magicString.toString(), map);
   } catch (error: any) {
     if (error.code === ERROR_CODES.MISSING_DEFINITION) {

diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts
@@ -219,10 +219,18 @@ function addEsbuildLoaderToStories(mainConfig: ConfigFile) {
           ],
         },
         // Ensure no other loaders from the framework apply
-        ...config.module.rules.map(rule => ({
-          ...rule,
-          exclude: [/\\/template-stories\\//].concat(rule.exclude || []),
-        })),
+        ...config.module.rules.map(rule => {
+
+          // The csf loader is responsible to add metadata to CSF files (e.g. extracting JSON comments)
+          if(typeof rule === 'object' && rule?.use?.[0]?.loader?.includes('csf-loader')) {
+            return rule;
+          }
+
+          return ({
+            ...rule,
+            exclude: [/\\/template-stories\\//].concat(rule.exclude || []),
+          })
+        }),
       ],
     },
   })`;