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

Refactor and cleanup

Browse Source
This commit is contained in:
Michael Shilman 2022-05-19 11:24:59 +08:00
parent 2efd892144
commit 45ee1466d8
2 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/core-server/src/utils/get-builders.ts
View File

@ -1,11 +1,6 @@
import type { Options, CoreConfig, Builder } from '@storybook/core-common';
export async function getManagerBuilder(options: Options) {
const { configDir, presets } = options;
const core = await presets.apply<CoreConfig>('core', undefined);
const builderName = typeof core?.builder === 'string' ? core.builder : core?.builder?.name;
async function getManagerBuilder(builderName: string | undefined, configDir: string) {
// Builder can be any string including community builders like `storybook-builder-vite`.
// - For now, `webpack5` triggers `manager-webpack5`
// - Everything else builds with `manager-webpack4`
@ -19,13 +14,9 @@ export async function getManagerBuilder(options: Options) {
return managerBuilder;
}
export async function getPreviewBuilder(options: Options) {
const { configDir, presets } = options;
const core = await presets.apply<CoreConfig>('core', undefined);
async function getPreviewBuilder(builderName: string, configDir: string) {
let builderPackage: string;
if (core?.builder) {
const builderName = typeof core.builder === 'string' ? core.builder : core.builder?.name;
if (builderName) {
builderPackage = require.resolve(
['webpack4', 'webpack5'].includes(builderName)
? `@storybook/builder-${builderName}`
@ -39,6 +30,15 @@ export async function getPreviewBuilder(options: Options) {
return previewBuilder;
}
export async function getBuilders(options: Options): Promise<Builder<unknown, unknown>[]> {
return Promise.all([getPreviewBuilder(options), getManagerBuilder(options)]);
export async function getBuilders({
presets,
configDir,
}: Options): Promise<Builder<unknown, unknown>[]> {
const core = await presets.apply<CoreConfig>('core', undefined);
const builderName = typeof core?.builder === 'string' ? core.builder : core?.builder?.name;
return Promise.all([
getPreviewBuilder(builderName, configDir),
getManagerBuilder(builderName, configDir),
]);
}

21
lib/core-server/src/utils/get-preview-builder.ts
View File

@ -1,21 +0,0 @@
import type { Options, CoreConfig } from '@storybook/core-common';
export async function getPreviewBuilder(options: Options) {
const { configDir, presets } = options;
const core = await presets.apply<CoreConfig>('core', undefined);
let builderPackage: string;
if (core?.builder) {
const builderName = typeof core.builder === 'string' ? core.builder : core.builder?.name;
builderPackage = require.resolve(
['webpack4', 'webpack5'].includes(builderName)
? `@storybook/builder-${builderName}`
: builderName,
{ paths: [configDir] }
);
} else {
builderPackage = require.resolve('@storybook/builder-webpack4');
}
const previewBuilder = await import(builderPackage);
return previewBuilder;
}