Skip to content

Make sure to replace all instances of :where(body) instead of just … #61602

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

Merged
tellthemachines merged 2 commits into from
May 13, 2024
Merged

Make sure to replace all instances of :where(body) instead of just … #61602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e5e3f6
Make sure to replace all instances of `:where(body)` instead of just …
tellthemachines May 13, 2024
8851d95
Add a unit test
tellthemachines May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/block-editor/src/utils/test/__snapshots__/transform-styles.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ exports[`transformStyles URL rewrite should rewrite relative paths 1`] = `
]
`;

exports[`transformStyles error handling should handle multiple instances of \`:where(body)\` 1`] = `
[
".my-namespace { color: pink; } .my-namespace { color: orange; }",
]
`;

exports[`transformStyles selector wrap should ignore font-face selectors 1`] = `
[
"
Expand Down
14 changes: 14 additions & 0 deletions packages/block-editor/src/utils/test/transform-styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,20 @@ describe( 'transformStyles', () => {
// ^^^^ In PostCSS, a tab is equal four spaces
);
} );

it( 'should handle multiple instances of `:where(body)`', () => {
const input = `:where(body) { color: pink; } :where(body) { color: orange; }`;
const output = transformStyles(
[
{
css: input,
},
],
'.my-namespace'
);

expect( output ).toMatchSnapshot();
} );
} );

describe( 'selector wrap', () => {
Expand Down
3 changes: 1 addition & 2 deletions packages/block-editor/src/utils/transform-styles/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ function transformStyle(
if ( ! wrapperSelector && ! baseURL ) {
return css;
}

const postcssFriendlyCSS = css.replace( ':where(body)', 'body' );
const postcssFriendlyCSS = css.replace( /:where\(body\)/g, 'body' );
try {
return postcss(
[
Expand Down