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

remove deprecated glob fixing

Browse Source
This commit is contained in:
Norbert de Langen 2022-10-11 16:44:36 +02:00
parent 19a6e89dc1
commit d5906aba6a
No known key found for this signature in database
GPG Key ID: FD0E78AF9A837762
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,5 @@
import fs from 'fs';
import path from 'path';
import deprecate from 'util-deprecate';
import { dedent } from 'ts-dedent';
import { scan } from 'picomatch';
import slash from 'slash';
@ -12,27 +10,6 @@ import { globToRegexp } from './glob-to-regexp';
const DEFAULT_TITLE_PREFIX = '';
const DEFAULT_FILES = '**/*.@(mdx|stories.mdx|stories.tsx|stories.ts|stories.jsx|stories.js)';
// TODO: remove - LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
const fixBadGlob = deprecate(
(match: RegExpMatchArray) => {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore (FIXME should be "@ts-expect-error this will get removed later anyway" but fails build --prep)
return match.input.replace(match[1], `@${match[1]}`);
},
dedent`
You have specified an invalid glob, we've attempted to fix it, please ensure that the glob you specify is valid. See: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#correct-globs-in-mainjs
`
);
const detectBadGlob = (val: string) => {
const match = val.match(/\.(\([^)]+\))/);
if (match) {
return fixBadGlob(match);
}
return val;
};
const isDirectory = (configDir: string, entry: string) => {
try {
return fs.lstatSync(path.resolve(configDir, entry)).isDirectory();
@ -61,8 +38,7 @@ export const normalizeStoriesEntry = (
let specifierWithoutMatcher: Omit<NormalizedStoriesSpecifier, 'importPathMatcher'>;
if (typeof entry === 'string') {
const fixedEntry = detectBadGlob(entry);
const globResult = scan(fixedEntry);
const globResult = scan(entry);
if (globResult.isGlob) {
const directory = globResult.prefix + globResult.base;
const files = globResult.glob;