Storysource: Allow to co-exist with csf-plugin/addon-docs

storybookjs · Jan 26, 2023 · 8bae863 · 8bae863
1 parent 1e14da3
commit 8bae863
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/code/addons/storysource/src/preset.ts b/code/addons/storysource/src/preset.ts
@@ -16,7 +16,6 @@ function webpack(
         {
           test: [/\.stories\.(jsx?$|tsx?$)/],
           ...rule,
-          enforce: 'pre',
           use: [
             {
               loader: require.resolve('@storybook/source-loader'),

diff --git a/code/lib/source-loader/src/build.js b/code/lib/source-loader/src/build.js
@@ -1,4 +1,6 @@
+import { readFile } from 'fs/promises';
 import { readStory } from './dependencies-lookup/readAsObject';
+import { sanitizeSource } from './abstract-syntax-tree/generate-helpers';
 
 export async function transform(inputSource) {
   const sourceObject = await readStory(this, inputSource);
@@ -13,11 +15,15 @@ export async function transform(inputSource) {
 
   const { source, sourceJson, addsMap } = sourceObject;
 
+  // We do this so the source we display doesn't get clobbered by csf-plugin
+  const rawSource = await readFile(this.resourcePath, 'utf-8');
+  const rawJson = sanitizeSource(rawSource);
+
   const preamble = `
     /* eslint-disable */
     // @ts-nocheck
     // @ts-expect-error (Converted from ts-ignore)
-    var __STORY__ = ${sourceJson};
+    var __STORY__ = ${rawJson};
     // @ts-expect-error (Converted from ts-ignore)
     var __LOCATIONS_MAP__ = ${JSON.stringify(addsMap, null, 2).trim()};
     `;