Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-19 04:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular-devkit/build-angular): styles that are not injected do count for initial bundle size

Browse Source 
Closes #17672
This commit is contained in:
Alan Agius 2021-01-26 18:23:41 +01:00
parent a179828be3
commit 36a28e5226
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/angular_devkit/build_angular/src/browser/index.ts
View File

@ -274,8 +274,11 @@ export function buildWebpackBrowser(
} }
// Fix incorrectly set `initial` value on chunks. // Fix incorrectly set `initial` value on chunks.
const extraEntryPoints = normalizeExtraEntryPoints(options.styles || [], 'styles') const extraEntryPoints = [
.concat(normalizeExtraEntryPoints(options.scripts || [], 'scripts')); ...normalizeExtraEntryPoints(options.styles || [], 'styles'),
...normalizeExtraEntryPoints(options.scripts || [], 'scripts'),
];
const webpackStats = { const webpackStats = {
...webpackRawStats, ...webpackRawStats,
chunks: markAsyncChunksNonInitial(webpackRawStats, extraEntryPoints), chunks: markAsyncChunksNonInitial(webpackRawStats, extraEntryPoints),

9
packages/angular_devkit/build_angular/src/webpack/configs/common.ts
View File

@ -361,10 +361,15 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
); );
} }
if (!differentialLoadingMode) { if (buildOptions.budgets.length && !differentialLoadingMode) {
// Budgets are computed after differential builds, not via a plugin. // Budgets are computed after differential builds, not via a plugin.
// https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/src/browser/index.ts // https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/src/browser/index.ts
extraPlugins.push(new BundleBudgetPlugin({ budgets: buildOptions.budgets })); const extraEntryPoints = [
...normalizeExtraEntryPoints(buildOptions.styles || [], 'styles'),
...normalizeExtraEntryPoints(buildOptions.scripts || [], 'scripts'),
];
extraPlugins.push(new BundleBudgetPlugin({ budgets: buildOptions.budgets, extraEntryPoints }));
} }
if ((scriptsSourceMap || stylesSourceMap)) { if ((scriptsSourceMap || stylesSourceMap)) {

6
packages/angular_devkit/build_angular/src/webpack/plugins/bundle-budget.ts
View File

@ -10,9 +10,12 @@ import { Budget } from '../../browser/schema';
import { ThresholdSeverity, checkBudgets } from '../../utils/bundle-calculator'; import { ThresholdSeverity, checkBudgets } from '../../utils/bundle-calculator';
import { ProcessBundleResult } from '../../utils/process-bundle'; import { ProcessBundleResult } from '../../utils/process-bundle';
import { addError, addWarning } from '../../utils/webpack-diagnostics'; import { addError, addWarning } from '../../utils/webpack-diagnostics';
import { markAsyncChunksNonInitial } from '../utils/async-chunks';
import { NormalizedEntryPoint } from '../utils/helpers';
export interface BundleBudgetPluginOptions { export interface BundleBudgetPluginOptions {
budgets: Budget[]; budgets: Budget[];
extraEntryPoints: NormalizedEntryPoint[];
} }
export class BundleBudgetPlugin { export class BundleBudgetPlugin {
@ -30,7 +33,10 @@ export class BundleBudgetPlugin {
// builds are disabled. // builds are disabled.
const processResults: ProcessBundleResult[] = []; const processResults: ProcessBundleResult[] = [];
// Fix incorrectly set `initial` value on chunks.
const stats = compilation.getStats().toJson(); const stats = compilation.getStats().toJson();
stats.chunks = markAsyncChunksNonInitial(stats, this.options.extraEntryPoints);
for (const { severity, message } of checkBudgets(budgets, stats, processResults)) { for (const { severity, message } of checkBudgets(budgets, stats, processResults)) {
switch (severity) { switch (severity) {
case ThresholdSeverity.Warning: case ThresholdSeverity.Warning:

2
packages/angular_devkit/build_angular/src/webpack/utils/async-chunks.ts
View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import * as webpack from 'webpack'; import * as webpack from 'webpack';
import { NormalizedEntryPoint } from '../configs'; import { NormalizedEntryPoint } from './helpers';
/** /**
* Webpack stats may incorrectly mark extra entry points `initial` chunks, when * Webpack stats may incorrectly mark extra entry points `initial` chunks, when