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

Merge pull request #15483 from storybookjs/fix/15227-storybook-hangs-on-angular

Browse Source 
Webpack5: Quit process after finishing a static build
This commit is contained in:
Michael Shilman 2021-07-07 17:46:39 +08:00 committed by GitHub
commit 0589f5b0df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/angular/src/server/build.ts
View File

@ -1,4 +1,13 @@
import { buildStatic } from '@storybook/core/server';
import { logger } from '@storybook/node-logger';
import options from './options';
buildStatic(options);
async function build() {
try {
await buildStatic(options);
} catch (error) {
logger.error(error);
}
}
build();

23
lib/builder-webpack5/src/index.ts
View File

@ -129,14 +129,19 @@ export const build: WebpackBuilder['build'] = async ({ options, startTime }) =>
const config = await getConfig(options);
return new Promise((succeed, fail) => {
webpackInstance(config).run((error, stats) => {
const compiler = webpackInstance(config);
compiler.run((error, stats) => {
if (error || !stats || stats.hasErrors()) {
logger.error('=> Failed to build the preview');
process.exitCode = 1;
if (error) {
logger.error(error.message);
return fail(error);
compiler.close(() => fail(error));
return;
}
if (stats && (stats.hasErrors() || stats.hasWarnings())) {
@ -145,7 +150,9 @@ export const build: WebpackBuilder['build'] = async ({ options, startTime }) =>
errors.forEach((e) => logger.error(e.message));
warnings.forEach((e) => logger.error(e.message));
return fail(stats);
compiler.close(() => fail(stats));
return;
}
}
@ -154,7 +161,15 @@ export const build: WebpackBuilder['build'] = async ({ options, startTime }) =>
stats.toJson({ warnings: true }).warnings.forEach((e) => logger.warn(e.message));
}
return succeed(stats);
// https://webpack.js.org/api/node/#run
// #15227
compiler.close((closeErr) => {
if (closeErr) {
return fail(closeErr);
}
return succeed(stats);
});
});
});
};