GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-06 01:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add more patterns for CSF3 glob processing

Browse Source
This commit is contained in:
Jon Palmer 2021-07-27 21:52:51 -04:00
parent 7e2a0ae2c3
commit b0497b0682
No known key found for this signature in database
GPG Key ID: 52E08C6A304553A8
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/core-common/src/utils/__tests__/normalize-stories.test.ts
View File

@ -12,10 +12,31 @@ jest.mock('fs', () => ({
}));
describe('normalizeStoriesEntry', () => {
it('glob', () => {
it('directory/files glob', () => {
expect(normalizeStoriesEntry('../**/*.stories.mdx', '')).toMatchInlineSnapshot(`
{
"glob": "../**/*.stories.mdx"
"glob": "../**/*.stories.mdx",
"specifier": {
"directory": "..",
"titlePrefix": "",
"files": "*.stories.mdx"
}
}
`);
});
it('too many stars glob', () => {
expect(normalizeStoriesEntry('../**/foo/**/*.stories.mdx', '')).toMatchInlineSnapshot(`
{
"glob": "../**/foo/**/*.stories.mdx"
}
`);
});
it('intermediate directory glob', () => {
expect(normalizeStoriesEntry('../**/foo/*.stories.mdx', '')).toMatchInlineSnapshot(`
{
"glob": "../**/foo/*.stories.mdx"
}
`);
});

14
lib/core-common/src/utils/normalize-stories.ts
View File

@ -4,6 +4,9 @@ import type { StoriesEntry, NormalizedStoriesEntry } from '../types';
const DEFAULT_FILES = '*.stories.@(mdx|tsx|ts|jsx|js)';
const DEFAULT_TITLE_PREFIX = '';
// Escaping regexes for glob regexes is fun
// Mathing things like '../**/*.stories.mdx'
const GLOB_REGEX = /^(?<directory>[^*]*)\/\*\*\/(?<files>\*\..*)/;
const isDirectory = (configDir: string, entry: string) => {
try {
@ -24,10 +27,17 @@ export const normalizeStoriesEntry = (
if (typeof entry === 'string') {
if (!entry.includes('**') && isDirectory(configDir, entry)) {
directory = entry;
titlePrefix = DEFAULT_TITLE_PREFIX;
files = DEFAULT_FILES;
titlePrefix = DEFAULT_TITLE_PREFIX;
} else {
glob = entry;
const match = entry.match(GLOB_REGEX);
if (match) {
directory = match.groups.directory;
files = match.groups.files;
titlePrefix = DEFAULT_TITLE_PREFIX;
} else {
glob = entry;
}
}
} else {
directory = entry.directory;