Skip to content

Commit b916745

Browse files
clydinvikerman
clydin
authored and
vikerman
committed
fix(@angular-devkit/build-angular): display accurate sizes for downlevelled files
Fixes #15425
1 parent e2b1905 commit b916745

File tree

7 files changed

+151
-31
lines changed

7 files changed

+151
-31
lines changed

‎packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ export function generateEntryPoints(appConfig: {
2727

2828
const entryPoints = [
2929
'polyfills-nomodule-es5',
30+
'runtime',
3031
'polyfills-es5',
3132
'polyfills',
3233
'sw-register',
3334
...extraEntryPoints(appConfig.styles, 'styles'),
3435
...extraEntryPoints(appConfig.scripts, 'scripts'),
36+
'vendor',
3537
'main',
3638
];
3739

‎packages/angular_devkit/build_angular/src/angular-cli-files/utilities/stats.ts‎

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// tslint:disable
99
// TODO: cleanup this file, it's copied as is from Angular CLI.
1010
import { tags, terminal } from '@angular-devkit/core';
11+
import * as path from 'path';
1112

1213

1314
const { bold, green, red, reset, white, yellow } = terminal;
@@ -23,27 +24,47 @@ export function formatSize(size: number): string {
2324
return `${+(size / Math.pow(1024, index)).toPrecision(3)} ${abbreviations[index]}`;
2425
}
2526

27+
export function generateBundleStats(
28+
info: {
29+
id: string | number;
30+
size?: number;
31+
files: string[];
32+
names?: string[];
33+
entry: boolean;
34+
initial: boolean;
35+
rendered?: boolean;
36+
},
37+
colors: boolean,
38+
): string {
39+
const g = (x: string) => (colors ? bold(green(x)) : x);
40+
const y = (x: string) => (colors ? bold(yellow(x)) : x);
41+
42+
const size = typeof info.size === 'number' ? ` ${formatSize(info.size)}` : '';
43+
const files = info.files.map(f => path.basename(f)).join(', ');
44+
const names = info.names ? ` (${info.names.join(', ')})` : '';
45+
const initial = y(info.entry ? '[entry]' : info.initial ? '[initial]' : '');
46+
const flags = ['rendered', 'recorded']
47+
.map(f => (f && (info as any)[f] ? g(` [${f}]`) : ''))
48+
.join('');
49+
50+
return `chunk {${y(info.id.toString())}} ${g(files)}${names}${size} ${initial}${flags}`;
51+
}
52+
53+
export function generateBuildStats(hash: string, time: number, colors: boolean): string {
54+
const w = (x: string) => colors ? bold(white(x)) : x;
55+
return `Date: ${w(new Date().toISOString())} - Hash: ${w(hash)} - Time: ${w('' + time)}ms`
56+
}
2657

2758
export function statsToString(json: any, statsConfig: any) {
2859
const colors = statsConfig.colors;
2960
const rs = (x: string) => colors ? reset(x) : x;
3061
const w = (x: string) => colors ? bold(white(x)) : x;
31-
const g = (x: string) => colors ? bold(green(x)) : x;
32-
const y = (x: string) => colors ? bold(yellow(x)) : x;
3362

3463
const changedChunksStats = json.chunks
3564
.filter((chunk: any) => chunk.rendered)
3665
.map((chunk: any) => {
3766
const asset = json.assets.filter((x: any) => x.name == chunk.files[0])[0];
38-
const size = asset ? ` ${formatSize(asset.size)}` : '';
39-
const files = chunk.files.join(', ');
40-
const names = chunk.names ? ` (${chunk.names.join(', ')})` : '';
41-
const initial = y(chunk.entry ? '[entry]' : chunk.initial ? '[initial]' : '');
42-
const flags = ['rendered', 'recorded']
43-
.map(f => f && chunk[f] ? g(` [${f}]`) : '')
44-
.join('');
45-
46-
return `chunk {${y(chunk.id)}} ${g(files)}${names}${size} ${initial}${flags}`;
67+
return generateBundleStats({ ...chunk, size: asset && asset.size }, colors);
4768
});
4869

4970
const unchangedChunkNumber = json.chunks.length - changedChunksStats.length;

‎packages/angular_devkit/build_angular/src/browser/index.ts‎

Lines changed: 106 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ import {
5353
import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
5454
import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
5555
import {
56+
generateBuildStats,
57+
generateBundleStats,
5658
statsErrorsToString,
5759
statsToString,
5860
statsWarningsToString,
@@ -66,7 +68,12 @@ import {
6668
normalizeSourceMaps,
6769
} from '../utils';
6870
import { manglingDisabled } from '../utils/mangle-options';
69-
import { CacheKey, ProcessBundleOptions, ProcessBundleResult } from '../utils/process-bundle';
71+
import {
72+
CacheKey,
73+
ProcessBundleFile,
74+
ProcessBundleOptions,
75+
ProcessBundleResult,
76+
} from '../utils/process-bundle';
7077
import { assertCompatibleAngularVersion } from '../utils/version';
7178
import {
7279
generateBrowserWebpackConfigFromContext,
@@ -200,9 +207,6 @@ export function buildWebpackBrowser(
200207
// Check Angular version.
201208
assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
202209

203-
const loggingFn =
204-
transforms.logging || createBrowserLoggingCallback(!!options.verbose, context.logger);
205-
206210
return from(initialize(options, context, host, transforms.webpackConfiguration)).pipe(
207211
// tslint:disable-next-line: no-big-function
208212
switchMap(({ workspace, config: configs }) => {
@@ -233,14 +237,24 @@ export function buildWebpackBrowser(
233237
`);
234238
}
235239

240+
const useBundleDownleveling =
241+
isDifferentialLoadingNeeded && !(fullDifferential || options.watch);
242+
const startTime = Date.now();
243+
236244
return from(configs).pipe(
237245
// the concurrency parameter (3rd parameter of mergeScan) is deliberately
238246
// set to 1 to make sure the build steps are executed in sequence.
239247
mergeScan(
240248
(lastResult, config) => {
241249
// Make sure to only run the 2nd build step, if 1st one succeeded
242250
if (lastResult.success) {
243-
return runWebpack(config, context, { logging: loggingFn });
251+
return runWebpack(config, context, {
252+
logging:
253+
transforms.logging ||
254+
(useBundleDownleveling
255+
? () => {}
256+
: createBrowserLoggingCallback(!!options.verbose, context.logger)),
257+
});
244258
} else {
245259
return of();
246260
}
@@ -253,7 +267,19 @@ export function buildWebpackBrowser(
253267
switchMap(async buildEvents => {
254268
configs.length = 0;
255269
const success = buildEvents.every(r => r.success);
256-
if (success) {
270+
if (!success && useBundleDownleveling) {
271+
// If using bundle downleveling then there is only one build
272+
// If it fails show any diagnostic messages and bail
273+
const webpackStats = buildEvents[0].webpackStats;
274+
if (webpackStats && webpackStats.warnings.length > 0) {
275+
context.logger.warn(statsWarningsToString(webpackStats, { colors: true }));
276+
}
277+
if (webpackStats && webpackStats.errors.length > 0) {
278+
context.logger.error(statsErrorsToString(webpackStats, { colors: true }));
279+
}
280+
281+
return { success };
282+
} else if (success) {
257283
let noModuleFiles: EmittedFiles[] | undefined;
258284
let moduleFiles: EmittedFiles[] | undefined;
259285
let files: EmittedFiles[] | undefined;
@@ -274,7 +300,7 @@ export function buildWebpackBrowser(
274300
noModuleFiles = secondBuild.emittedFiles;
275301
}
276302
} else if (isDifferentialLoadingNeeded && !fullDifferential) {
277-
const { emittedFiles = [] } = firstBuild;
303+
const { emittedFiles = [], webpackStats } = firstBuild;
278304
moduleFiles = [];
279305
noModuleFiles = [];
280306

@@ -353,7 +379,9 @@ export function buildWebpackBrowser(
353379
filename,
354380
code,
355381
map,
356-
name: file.name,
382+
// id is always present for non-assets
383+
// tslint:disable-next-line: no-non-null-assertion
384+
name: file.id!,
357385
optimizeOnly: true,
358386
});
359387

@@ -367,7 +395,9 @@ export function buildWebpackBrowser(
367395
filename,
368396
code,
369397
map,
370-
name: file.name,
398+
// id is always present for non-assets
399+
// tslint:disable-next-line: no-non-null-assertion
400+
name: file.id!,
371401
runtime: file.file.startsWith('runtime'),
372402
ignoreOriginal: es5Polyfills,
373403
});
@@ -611,6 +641,73 @@ export function buildWebpackBrowser(
611641
}
612642

613643
context.logger.info('ES5 bundle generation complete.');
644+
645+
type ArrayElement<A> = A extends ReadonlyArray<infer T> ? T : never;
646+
function generateBundleInfoStats(
647+
id: string | number,
648+
bundle: ProcessBundleFile,
649+
chunk: ArrayElement<webpack.Stats.ToJsonOutput['chunks']> | undefined,
650+
): string {
651+
return generateBundleStats(
652+
{
653+
id,
654+
size: bundle.size,
655+
files: bundle.map ? [bundle.filename, bundle.map.filename] : [bundle.filename],
656+
names: chunk && chunk.names,
657+
entry: !!chunk && chunk.names.includes('runtime'),
658+
initial: !!chunk && chunk.initial,
659+
rendered: true,
660+
},
661+
true,
662+
);
663+
}
664+
665+
let bundleInfoText = '';
666+
const processedNames = new Set<string>();
667+
for (const result of processResults) {
668+
processedNames.add(result.name);
669+
670+
const chunk =
671+
webpackStats &&
672+
webpackStats.chunks &&
673+
webpackStats.chunks.find(c => result.name === c.id.toString());
674+
if (result.original) {
675+
bundleInfoText +=
676+
'\n' + generateBundleInfoStats(result.name, result.original, chunk);
677+
}
678+
if (result.downlevel) {
679+
bundleInfoText +=
680+
'\n' + generateBundleInfoStats(result.name, result.downlevel, chunk);
681+
}
682+
}
683+
684+
if (webpackStats && webpackStats.chunks) {
685+
for (const chunk of webpackStats.chunks) {
686+
if (processedNames.has(chunk.id.toString())) {
687+
continue;
688+
}
689+
690+
const asset =
691+
webpackStats.assets && webpackStats.assets.find(a => a.name === chunk.files[0]);
692+
bundleInfoText +=
693+
'\n' + generateBundleStats({ ...chunk, size: asset && asset.size }, true);
694+
}
695+
}
696+
697+
bundleInfoText +=
698+
'\n' +
699+
generateBuildStats(
700+
(webpackStats && webpackStats.hash) || '<unknown>',
701+
Date.now() - startTime,
702+
true,
703+
);
704+
context.logger.info(bundleInfoText);
705+
if (webpackStats && webpackStats.warnings.length > 0) {
706+
context.logger.warn(statsWarningsToString(webpackStats, { colors: true }));
707+
}
708+
if (webpackStats && webpackStats.errors.length > 0) {
709+
context.logger.error(statsErrorsToString(webpackStats, { colors: true }));
710+
}
614711
} else {
615712
const { emittedFiles = [] } = firstBuild;
616713
files = emittedFiles.filter(x => x.name !== 'polyfills-es5');

‎packages/angular_devkit/build_angular/src/utils/process-bundle.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export interface ProcessBundleOptions {
1919
filename: string;
2020
code: string;
2121
map?: string;
22-
name?: string;
22+
name: string;
2323
sourceMaps?: boolean;
2424
hiddenSourceMaps?: boolean;
2525
vendorSourceMaps?: boolean;
@@ -34,7 +34,7 @@ export interface ProcessBundleOptions {
3434
}
3535

3636
export interface ProcessBundleResult {
37-
name?: string;
37+
name: string;
3838
integrity?: string;
3939
original?: ProcessBundleFile;
4040
downlevel?: ProcessBundleFile;

‎tests/legacy-cli/e2e/tests/basic/scripts-array.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ export default async function () {
7373
await expectFileToMatch(
7474
'dist/test-project/index.html',
7575
oneLineTrim`
76+
<script src="runtime-es2015.js" type="module"></script>
77+
<script src="runtime-es5.js" nomodule defer></script>
7678
<script src="polyfills-es5.js" nomodule defer></script>
7779
<script src="polyfills-es2015.js" type="module"></script>
7880
<script src="scripts.js" defer></script>
7981
<script src="renamed-script.js" defer></script>
80-
<script src="runtime-es2015.js" type="module"></script>
8182
<script src="vendor-es2015.js" type="module"></script>
82-
<script src="main-es2015.js" type="module"></script>
83-
<script src="runtime-es5.js" nomodule defer></script>
8483
<script src="vendor-es5.js" nomodule defer></script>
84+
<script src="main-es2015.js" type="module"></script>
8585
<script src="main-es5.js" nomodule defer></script>
8686
`,
8787
);

‎tests/legacy-cli/e2e/tests/basic/styles-array.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ export default async function() {
6161
await expectFileToMatch(
6262
'dist/test-project/index.html',
6363
oneLineTrim`
64+
<script src="runtime-es2015.js" type="module"></script>
65+
<script src="runtime-es5.js" nomodule defer></script>
6466
<script src="polyfills-es5.js" nomodule defer></script>
6567
<script src="polyfills-es2015.js" type="module"></script>
66-
<script src="runtime-es2015.js" type="module"></script>
6768
<script src="vendor-es2015.js" type="module"></script>
68-
<script src="main-es2015.js" type="module"></script>
69-
<script src="runtime-es5.js" nomodule defer></script>
7069
<script src="vendor-es5.js" nomodule defer></script>
70+
<script src="main-es2015.js" type="module"></script>
7171
<script src="main-es5.js" nomodule defer></script>
7272
`,
7373
);

‎tests/legacy-cli/e2e/tests/misc/support-safari-10.1.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ export default async function () {
4444
} else {
4545
await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
4646
<script src="polyfills-nomodule-es5.js" nomodule></script>
47+
<script src="runtime-es2015.js" type="module"></script>
48+
<script src="runtime-es5.js" nomodule defer></script>
4749
<script src="polyfills-es5.js" nomodule defer></script>
4850
<script src="polyfills-es2015.js" type="module"></script>
4951
<script src="styles-es2015.js" type="module"></script>
5052
<script src="styles-es5.js" nomodule defer></script>
51-
<script src="runtime-es2015.js" type="module"></script>
5253
<script src="vendor-es2015.js" type="module"></script>
53-
<script src="main-es2015.js" type="module"></script>
54-
<script src="runtime-es5.js" nomodule defer></script>
5554
<script src="vendor-es5.js" nomodule defer></script>
55+
<script src="main-es2015.js" type="module"></script>
5656
<script src="main-es5.js" nomodule defer></script>
5757
`);
5858
}

0 commit comments

Comments
 (0)