Skip to content

Commit

Permalink
fix(@angular-devkit/build-angular): improve builder phase reporting
Browse files Browse the repository at this point in the history
(cherry picked from commit f3ba5f4)
  • Loading branch information
alan-agius4 authored and filipesilva committed Nov 3, 2020
1 parent 18ac87b commit a220f46
Show file tree
Hide file tree
Showing 19 changed files with 233 additions and 135 deletions.
11 changes: 10 additions & 1 deletion packages/angular_devkit/build_angular/src/app-shell/index.ts
Expand Up @@ -19,6 +19,7 @@ import { BrowserBuilderOutput } from '../browser';
import { Schema as BrowserBuilderSchema } from '../browser/schema';
import { ServerBuilderOutput } from '../server';
import { augmentAppWithServiceWorker } from '../utils/service-worker';
import { Spinner } from '../utils/spinner';
import { Schema as BuildWebpackAppShellSchema } from './schema';

async function _renderUniversal(
Expand Down Expand Up @@ -152,6 +153,8 @@ async function _appShellBuilder(
watch: false,
});

let spinner: Spinner | undefined;

try {
const [browserResult, serverResult] = await Promise.all([
browserTargetRun.result as unknown as BrowserBuilderOutput,
Expand All @@ -164,8 +167,14 @@ async function _appShellBuilder(
return serverResult;
}

return await _renderUniversal(options, context, browserResult, serverResult);
spinner = new Spinner().start('Generating application shell...');
const result = await _renderUniversal(options, context, browserResult, serverResult);
spinner.succeed('Application shell generation complete.');

return result;
} catch (err) {
spinner?.fail('Application shell generation failed.');

return { success: false, error: err.message };
} finally {
// Just be good citizens and stop those jobs.
Expand Down

0 comments on commit a220f46

Please sign in to comment.