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

Split theme.css styles loading #31239

Merged
merged 3 commits into from
Jun 11, 2021
Merged

Split theme.css styles loading #31239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bed514
generate separate stylesheets
aristath Apr 27, 2021
2e4a17a
WIP
aristath Apr 27, 2021
9cb4178
Update after #31274
aristath Apr 28, 2021
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
3 changes: 2 additions & 1 deletion bin/packages/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function createStyleEntryTransform() {
// block-library package also need rebuilding.
if (
packageName === 'block-library' &&
[ 'style.scss', 'editor.scss' ].includes(
[ 'style.scss', 'editor.scss', 'theme.scss' ].includes(
path.basename( file )
)
) {
Expand Down Expand Up @@ -213,6 +213,7 @@ if ( files.length ) {
`${ PACKAGES_DIR }/*/src/*.scss`,
`${ PACKAGES_DIR }/block-library/src/**/*.js`,
`${ PACKAGES_DIR }/block-library/src/*/style.scss`,
`${ PACKAGES_DIR }/block-library/src/*/theme.scss`,
`${ PACKAGES_DIR }/block-library/src/*/editor.scss`,
`${ PACKAGES_DIR }/block-library/src/*.scss`,
],
Expand Down
44 changes: 44 additions & 0 deletions lib/blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,50 @@ function gutenberg_register_core_block_styles( $block_name ) {
wp_register_style( "wp-block-{$block_name}", false );
}

// If the current theme supports wp-block-styles, dequeue the full stylesheet
// and instead attach each block's theme-styles to their block styles stylesheet.
if ( current_theme_supports( 'wp-block-styles' ) ) {

// Dequeue the full stylesheet.
// Make sure this only runs once, it doesn't need to run for every block.
static $stylesheet_removed;
if ( ! $stylesheet_removed ) {
add_action(
'wp_enqueue_scripts',
function() {
wp_dequeue_style( 'wp-block-library-theme' );
}
);
$stylesheet_removed = true;
}

// Get the path to the block's stylesheet.
$theme_style_path = is_rtl()
? "build/block-library/blocks/$block_name/theme-rtl.css"
: "build/block-library/blocks/$block_name/theme.css";

// If the file exists, enqueue it.
if ( file_exists( gutenberg_dir_path() . $theme_style_path ) ) {

if ( file_exists( gutenberg_dir_path() . $style_path ) ) {
// If there is a main stylesheet for this block, append the theme styles to main styles.
wp_add_inline_style(
"wp-block-{$block_name}",
file_get_contents( gutenberg_dir_path() . $theme_style_path )
);
} else {
// If there is no main stylesheet for this block, register theme style.
wp_register_style(
"wp-block-{$block_name}",
gutenberg_url( $theme_style_path ),
array(),
filemtime( gutenberg_dir_path() . $theme_style_path )
);
wp_style_add_data( "wp-block-{$block_name}", 'path', gutenberg_dir_path() . $theme_style_path );
}
}
}

if ( file_exists( gutenberg_dir_path() . $editor_style_path ) ) {
wp_deregister_style( "wp-block-{$block_name}-editor" );
wp_register_style(
Expand Down
16 changes: 16 additions & 0 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,22 @@ module.exports = {
to: 'build/block-library/blocks/[1]/editor-rtl.css',
transform: stylesTransform,
},
{
from: './packages/block-library/build-style/*/theme.css',
test: new RegExp(
`([\\w-]+)${ escapeRegExp( sep ) }theme\\.css$`
),
to: 'build/block-library/blocks/[1]/theme.css',
transform: stylesTransform,
},
{
from: './packages/block-library/build-style/*/theme-rtl.css',
test: new RegExp(
`([\\w-]+)${ escapeRegExp( sep ) }theme-rtl\\.css$`
),
to: 'build/block-library/blocks/[1]/theme-rtl.css',
transform: stylesTransform,
},
] ),
new CopyWebpackPlugin(
Object.entries( {
Expand Down