Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "feat(@angular-devkit/build-angular): disable critical CSS inlining by default" #21899

Merged
merged 1 commit into from
Oct 21, 2021
Merged

Revert "feat(@angular-devkit/build-angular): disable critical CSS inlining by default" #21899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/src/builders/browser/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"inlineCritical": {
"type": "boolean",
"description": "Extract and inline critical CSS definitions to improve first paint time.",
"default": false
"default": true
}
},
"additionalProperties": false
Expand Down
18 changes: 14 additions & 4 deletions ...s/angular_devkit/build_angular/src/builders/browser/tests/options/inline-critical_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
harness.expectFile('dist/index.html').content.toContain(`body{color:#000;}`);
});

it(`should not extract critical css when 'optimization' is unset`, async () => {
it(`should extract critical css when 'optimization' is unset`, async () => {
harness.useTarget('build', {
...BASE_OPTIONS,
styles: ['src/styles.css'],
Expand All @@ -50,10 +50,15 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
const { result } = await harness.executeOnce();

expect(result?.success).toBe(true);
harness.expectFile('dist/index.html').content.not.toContain(`<style`);
harness
.expectFile('dist/index.html')
.content.toContain(
`<link rel="stylesheet" href="styles.css" media="print" onload="this.media='all'">`,
);
harness.expectFile('dist/index.html').content.toContain(`body{color:#000;}`);
});

it(`should not extract critical css when 'optimization' is true`, async () => {
it(`should extract critical css when 'optimization' is true`, async () => {
harness.useTarget('build', {
...BASE_OPTIONS,
styles: ['src/styles.css'],
Expand All @@ -63,7 +68,12 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
const { result } = await harness.executeOnce();

expect(result?.success).toBe(true);
harness.expectFile('dist/index.html').content.not.toContain(`<style`);
harness
.expectFile('dist/index.html')
.content.toContain(
`<link rel="stylesheet" href="styles.css" media="print" onload="this.media='all'">`,
);
harness.expectFile('dist/index.html').content.toContain(`body{color:#000;}`);
});

it(`should not extract critical css when 'optimization' is false`, async () => {
Expand Down
6 changes: 2 additions & 4 deletions packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ export function normalizeOptimization(
? optimization.styles
: {
minify: !!optimization.styles,
// inlineCritical is always false unless explictly set.
inlineCritical: false,
inlineCritical: !!optimization.styles,
},
fonts:
typeof optimization.fonts === 'object'
Expand All @@ -47,8 +46,7 @@ export function normalizeOptimization(
scripts: optimization,
styles: {
minify: optimization,
// inlineCritical is always false unless explictly set.
inlineCritical: false,
inlineCritical: optimization,
},
fonts: {
inline: optimization,
Expand Down