Merge pull request #24890 from storybookjs/norbert/improve-mdx-filtering

TestBuild: Fix indexer bug
storybookjs · Nov 17, 2023 · d11044a · d11044a
2 parents 0d9a95c + ffb9003
commit d11044a
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 170 deletions.
diff --git a/code/lib/core-common/src/utils/normalize-stories.ts b/code/lib/core-common/src/utils/normalize-stories.ts
@@ -9,7 +9,7 @@ import { normalizeStoryPath } from './paths';
 import { globToRegexp } from './glob-to-regexp';
 
 const DEFAULT_TITLE_PREFIX = '';
-const DEFAULT_FILES = '**/*.@(mdx|stories.@(js|jsx|mjs|ts|tsx))';
+const DEFAULT_FILES_PATTERN = '**/*.@(mdx|stories.@(js|jsx|mjs|ts|tsx))';
 
 const isDirectory = (configDir: string, entry: string) => {
   try {
@@ -34,7 +34,7 @@ export const getDirectoryFromWorkingDir = ({
 
 export const normalizeStoriesEntry = (
   entry: StoriesEntry,
-  { configDir, workingDir }: NormalizeOptions
+  { configDir, workingDir, default_files_pattern = DEFAULT_FILES_PATTERN }: NormalizeOptions
 ): NormalizedStoriesSpecifier => {
   let specifierWithoutMatcher: Omit<NormalizedStoriesSpecifier, 'importPathMatcher'>;
 
@@ -53,7 +53,7 @@ export const normalizeStoriesEntry = (
       specifierWithoutMatcher = {
         titlePrefix: DEFAULT_TITLE_PREFIX,
         directory: entry,
-        files: DEFAULT_FILES,
+        files: default_files_pattern,
       };
     } else {
       specifierWithoutMatcher = {
@@ -65,7 +65,7 @@ export const normalizeStoriesEntry = (
   } else {
     specifierWithoutMatcher = {
       titlePrefix: DEFAULT_TITLE_PREFIX,
-      files: DEFAULT_FILES,
+      files: default_files_pattern,
       ...entry,
     };
   }
@@ -99,6 +99,7 @@ export const normalizeStoriesEntry = (
 interface NormalizeOptions {
   configDir: string;
   workingDir: string;
+  default_files_pattern?: string;
 }
 
 export const normalizeStories = (entries: StoriesEntry[], options: NormalizeOptions) => {

diff --git a/code/lib/core-server/src/presets/common-override-preset.ts b/code/lib/core-server/src/presets/common-override-preset.ts
@@ -1,6 +1,12 @@
-import type { Options, PresetProperty, StorybookConfig, TestBuildFlags } from '@storybook/types';
+import type {
+  Options,
+  PresetProperty,
+  StoriesEntry,
+  StorybookConfig,
+  TestBuildFlags,
+} from '@storybook/types';
 import { normalizeStories, commonGlobOptions } from '@storybook/core-common';
-import { isAbsolute, join } from 'path';
+import { isAbsolute, join, relative } from 'path';
 import slash from 'slash';
 import { glob } from 'glob';
 
@@ -19,30 +25,49 @@ export const framework: PresetProperty<'framework', StorybookConfig> = async (co
 
 export const stories: PresetProperty<'stories', StorybookConfig> = async (entries, options) => {
   if (options?.build?.test?.disableMDXEntries) {
-    return (
+    const list = normalizeStories(entries, {
+      configDir: options.configDir,
+      workingDir: options.configDir,
+      default_files_pattern: '**/*.@(stories.@(js|jsx|mjs|ts|tsx))',
+    });
+    const result = (
       await Promise.all(
-        normalizeStories(entries, {
-          configDir: options.configDir,
-          workingDir: options.configDir,
-        }).map(({ directory, files }) => {
+        list.map(async ({ directory, files, titlePrefix }) => {
           const pattern = join(directory, files);
           const absolutePattern = isAbsolute(pattern) ? pattern : join(options.configDir, pattern);
+          const absoluteDirectory = isAbsolute(directory)
+            ? directory
+            : join(options.configDir, directory);
 
-          return glob(slash(absolutePattern), {
-            ...commonGlobOptions(absolutePattern),
-            follow: true,
-          });
+          return {
+            files: (
+              await glob(slash(absolutePattern), {
+                ...commonGlobOptions(absolutePattern),
+                follow: true,
+              })
+            ).map((f) => relative(absoluteDirectory, f)),
+            directory,
+            titlePrefix,
+          };
         })
       )
-    ).flatMap((expanded, i) => {
-      const filteredEntries = expanded.filter((s) => !s.endsWith('.mdx'));
+    ).flatMap<StoriesEntry>((expanded, i) => {
+      const filteredEntries = expanded.files.filter((s) => !s.endsWith('.mdx'));
       // only return the filtered entries when there is something to filter
       // as webpack is faster with unexpanded globs
-      if (filteredEntries.length < expanded.length) {
-        return filteredEntries;
+      let items = [];
+      if (filteredEntries.length < expanded.files.length) {
+        items = filteredEntries.map((k) => ({
+          ...expanded,
+          files: `**/${k}`,
+        }));
+      } else {
+        items = [list[i]];
       }
-      return entries[i];
+
+      return items;
     });
+    return result;
   }
   return entries;
 };

diff --git a/code/ui/.storybook/main.ts b/code/ui/.storybook/main.ts
@@ -8,6 +8,7 @@ const isBlocksOnly = process.env.STORYBOOK_BLOCKS_ONLY === 'true';
 const allStories = [
   {
     directory: '../manager/src',
+    files: '**/*.stories.@(js|jsx|mjs|ts|tsx|mdx)',
     titlePrefix: '@manager',
   },
   {
@@ -53,6 +54,11 @@ const config: StorybookConfig = {
     '@storybook/addon-designs',
     '@chromaui/addon-visual-tests',
   ],
+  build: {
+    test: {
+      disableBlocks: false,
+    },
+  },
   framework: {
     name: '@storybook/react-vite',
     options: {},

diff --git a/code/ui/components/src/components/typography/DocumentFormattingSample.mdx b/code/ui/components/src/components/typography/DocumentFormattingSample.mdx
diff --git a/code/ui/components/src/components/typography/DocumentWrapper.stories.tsx b/code/ui/components/src/components/typography/DocumentWrapper.stories.tsx
@@ -1,19 +1,12 @@
 import React from 'react';
 
 import { DocumentWrapper } from './DocumentWrapper';
-import MarkdownSample from './DocumentFormattingSample.mdx';
 
 export default {
   component: DocumentWrapper,
   decorators: [(storyFn: any) => <div style={{ width: '600px' }}>{storyFn()}</div>],
 };
 
-export const WithMarkdown = () => (
-  <DocumentWrapper>
-    <MarkdownSample />
-  </DocumentWrapper>
-);
-
 export const WithDOM = () => (
   <DocumentWrapper>
     <h1>h1 Heading</h1>