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

Merge pull request #11647 from daniel-ac-martin/patch-1

Browse Source 
Core: Fix webpack recursion in mainjs glob processing logic
This commit is contained in:
Michael Shilman 2020-07-23 08:04:39 +08:00 committed by GitHub
commit 4af0d0d4b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/core/src/server/preview/to-require-context.test.js
View File

@ -4,6 +4,7 @@ import { toRequireContext } from './to-require-context';
const testCases = [
{
glob: '**/*.stories.tsx',
recursive: true,
validPaths: [
'./Icon.stories.tsx',
'./src/Icon.stories.tsx',
@ -23,6 +24,7 @@ const testCases = [
// INVALID GLOB
{
glob: '../src/stories/**/*.stories.(js|mdx)',
recursive: true,
validPaths: [
'../src/stories/components/Icon.stories.js',
'../src/stories/Icon.stories.js',
@ -41,6 +43,7 @@ const testCases = [
},
{
glob: 'dirname/../stories/*.stories.*',
recursive: false,
validPaths: [
'./dirname/../stories/App.stories.js',
'./dirname/../stories/addon-centered.stories.js',
@ -49,6 +52,7 @@ const testCases = [
},
{
glob: '../src/stories/**/@(*.stories.js|*.stories.mdx)',
recursive: true,
validPaths: [
'../src/stories/components/Icon.stories.js',
'../src/stories/Icon.stories.js',
@ -67,6 +71,7 @@ const testCases = [
},
{
glob: '../src/stories/**/*.stories.+(js|mdx)',
recursive: true,
validPaths: [
'../src/stories/components/Icon.stories.js',
'../src/stories/Icon.stories.js',
@ -85,6 +90,7 @@ const testCases = [
},
{
glob: '../src/stories/**/*.stories.*(js|mdx)',
recursive: true,
validPaths: [
'../src/stories/components/Icon.stories.js',
'../src/stories/Icon.stories.js',
@ -104,6 +110,7 @@ const testCases = [
// DUMB GLOB
{
glob: '../src/stories/**/*.stories.[tj]sx',
recursive: true,
validPaths: [
'../src/stories/components/Icon.stories.jsx',
'../src/stories/Icon.stories.jsx',
@ -120,8 +127,23 @@ const testCases = [
'../src/stories/components/Icon/Icon.tsx',
],
},
{
glob: '../components/*.stories.js',
recursive: false,
validPaths: ['../components/Icon.stories.js'],
invalidPaths: [
'../components/icon/node_modules/icon/Icon.stories.js',
'./stories.js',
'./src/stories/Icon.stories.js',
'./Icon.stories.js',
'../src/Icon.stories.mdx',
'../src/stories/components/Icon/Icon.stories.ts',
'../src/stories/components/Icon/Icon.mdx',
],
},
{
glob: '../components/*/*.stories.js',
recursive: true,
validPaths: ['../components/icon/Icon.stories.js'],
invalidPaths: [
'../components/icon/node_modules/icon/Icon.stories.js',
@ -135,6 +157,7 @@ const testCases = [
},
{
glob: '../components/*/stories/*.js',
recursive: true,
validPaths: ['../components/icon/stories/Icon.js'],
invalidPaths: [
'../components/icon/node_modules/icon/stories/Icon.js',
@ -149,9 +172,9 @@ const testCases = [
];
describe('toRequireContext', () => {
testCases.forEach(({ glob, validPaths, invalidPaths }) => {
testCases.forEach(({ glob, recursive, validPaths, invalidPaths }) => {
it(`matches only suitable paths - ${glob}`, () => {
const { path: base, match } = toRequireContext(glob);
const { path: base, recursive: willRecurse, match } = toRequireContext(glob);
const regex = new RegExp(match);
@ -169,6 +192,7 @@ describe('toRequireContext', () => {
expect(isNotMatchedForValidPaths).toEqual([]);
expect(isMatchedForInvalidPaths).toEqual([]);
expect(willRecurse).toEqual(recursive);
});
});
});

2
lib/core/src/server/preview/to-require-context.ts
View File

@ -31,7 +31,7 @@ export const toRequireContext = (input: any) => {
case typeof input === 'string': {
const { base, glob } = globBase(fixedInput);
const recursive = glob.includes('**') || glob.split('/').length > 2;
const recursive = glob.includes('**') || glob.split('/').length > 1;
const regex = makeRe(glob, { fastpaths: false, noglobstar: false, bash: false });
const { source } = regex;