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

Merge pull request #19406 from storybookjs/jeppe/enforce-manager-builder-first

Browse Source 
Ensure consistent server route handling by always starting `managerBuilder` before `previewBuilder`
This commit is contained in:
Norbert de Langen 2022-10-12 10:17:15 +03:00 committed by GitHub
commit c3bb8b7375
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
code/lib/core-server/src/dev-server.ts
View File

@ -147,40 +147,29 @@ export async function storybookDevServer(options: Options) {
logConfig('Preview webpack config', await previewBuilder.getConfig(options));
}
const preview = options.ignorePreview
? Promise.resolve()
: previewBuilder.start({
startTime,
options,
router,
server,
});
const manager = managerBuilder.start({
const managerResult = await managerBuilder.start({
startTime,
options,
router,
server,
});
const [previewResult, managerResult] = await Promise.all([
preview.catch(async (err) => {
let previewResult;
if (!options.ignorePreview) {
try {
previewResult = await previewBuilder.start({
startTime,
options,
router,
server,
});
} catch (error) {
await managerBuilder?.bail();
throw err;
}),
manager
// TODO #13083 Restore this when compiling the preview is fast enough
// .then((result) => {
// if (!options.ci && !options.smokeTest) openInBrowser(address);
// return result;
// })
.catch(async (err) => {
await previewBuilder?.bail();
throw err;
}),
]);
throw error;
}
}
// TODO #13083 Remove this when compiling the preview is fast enough
// TODO #13083 Move this to before starting the previewBuilder - when compiling the preview is so fast that it will be done before the browser is done opening
if (!options.ci && !options.smokeTest && options.open) {
openInBrowser(host ? networkAddress : address);
}