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

CLI: replace glob with glob-promise

Browse Source
This commit is contained in:
Yann Braga 2023-01-31 10:35:29 +01:00
parent 4ea443c13e
commit 55ebe5b594
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/lib/core-common/package.json
View File

@ -58,7 +58,7 @@
"file-system-cache": "^2.0.0", "file-system-cache": "^2.0.0",
"find-up": "^5.0.0", "find-up": "^5.0.0",
"fs-extra": "^11.1.0", "fs-extra": "^11.1.0",
"glob": "^7.1.6", "glob-promise": "^4.2.0",
"handlebars": "^4.7.7", "handlebars": "^4.7.7",
"lazy-universal-dotenv": "^4.0.0", "lazy-universal-dotenv": "^4.0.0",
"picomatch": "^2.3.0", "picomatch": "^2.3.0",
@ -85,4 +85,4 @@
"platform": "node" "platform": "node"
}, },
"gitHead": "91302a6818a7794e1e8bbff01c68513b8516cb53" "gitHead": "91302a6818a7794e1e8bbff01c68513b8516cb53"
} }

11
code/lib/core-common/src/utils/validate-configuration-files.ts
View File

@ -1,5 +1,5 @@
import { dedent } from 'ts-dedent'; import { dedent } from 'ts-dedent';
import glob from 'glob'; import { promise as glob } from 'glob-promise';
import path from 'path'; import path from 'path';
import { readConfig } from '@storybook/csf-tools'; import { readConfig } from '@storybook/csf-tools';
import { once } from '@storybook/node-logger'; import { once } from '@storybook/node-logger';
@ -8,10 +8,17 @@ import { boost } from './interpret-files';
export async function validateConfigurationFiles(configDir: string) { export async function validateConfigurationFiles(configDir: string) {
const extensionsPattern = `{${Array.from(boost).join(',')}}`; const extensionsPattern = `{${Array.from(boost).join(',')}}`;
const mainConfigMatches = glob.sync(path.resolve(configDir, `main${extensionsPattern}`)); const mainConfigMatches = await glob(path.resolve(configDir, `main${extensionsPattern}`));
const [mainConfigPath] = mainConfigMatches; const [mainConfigPath] = mainConfigMatches;
if (mainConfigMatches.length > 1) {
once.warn(dedent`
Multiple main files found in your configDir (${path.resolve(configDir)}).
Storybook will use the first one found and ignore the others. Please remove the extra files.
`);
}
if (!mainConfigPath) { if (!mainConfigPath) {
throw new Error(dedent` throw new Error(dedent`
No configuration files have been found in your configDir (${path.resolve(configDir)}). No configuration files have been found in your configDir (${path.resolve(configDir)}).

11
code/yarn.lock
View File

@ -1,3 +1,6 @@
# This file is generated by running "yarn install" inside your project.
# Manual changes might be lost - proceed with caution!
__metadata: __metadata:
version: 6 version: 6
cacheKey: 8c0 cacheKey: 8c0
@ -6059,9 +6062,9 @@ __metadata:
resolution: "@storybook/core-common@workspace:lib/core-common" resolution: "@storybook/core-common@workspace:lib/core-common"
dependencies: dependencies:
"@babel/core": ^7.20.2 "@babel/core": ^7.20.2
"@storybook/csf-tools": 7.0.0-beta.36 "@storybook/csf-tools": 7.0.0-beta.38
"@storybook/node-logger": 7.0.0-beta.36 "@storybook/node-logger": 7.0.0-beta.38
"@storybook/types": 7.0.0-beta.36 "@storybook/types": 7.0.0-beta.38
"@types/babel__core": ^7.1.20 "@types/babel__core": ^7.1.20
"@types/express": ^4.7.0 "@types/express": ^4.7.0
"@types/mock-fs": ^4.13.1 "@types/mock-fs": ^4.13.1
@ -6075,7 +6078,7 @@ __metadata:
file-system-cache: ^2.0.0 file-system-cache: ^2.0.0
find-up: ^5.0.0 find-up: ^5.0.0
fs-extra: ^11.1.0 fs-extra: ^11.1.0
glob: ^7.1.6 glob-promise: ^4.2.0
handlebars: ^4.7.7 handlebars: ^4.7.7
lazy-universal-dotenv: ^4.0.0 lazy-universal-dotenv: ^4.0.0
mock-fs: ^5.2.0 mock-fs: ^5.2.0