Skip to content

Improve caching for theme.json processing #3418

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

Closed
oandregal wants to merge 16 commits into from
Closed

Improve caching for theme.json processing #3418

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0002770
Cache theme data if blocks have not changed
oandregal Oct 10, 2022
cb15514
Cache core data if blocks have not changed
oandregal Oct 10, 2022
3d67b7e
Cache blocks data if blocks have not changed
oandregal Oct 10, 2022
481ae78
Clean blocks meta upon cache flush
oandregal Oct 10, 2022
9e229c3
Better naming
oandregal Oct 10, 2022
83da1ad
Use less memory
oandregal Oct 10, 2022
8e1181d
Cache user data if blocks have not changed
oandregal Oct 10, 2022
74ad7d0
Fix lint issue
oandregal Oct 10, 2022
875a0bd
PHPDoc improvements
oandregal Oct 11, 2022
86694ea
PHPDoc improvements
oandregal Oct 11, 2022
0270b3a
PHPDoc improvements
oandregal Oct 11, 2022
bad2ba7
DocBlock improvements
hellofromtonya Oct 11, 2022
94fa33a
DocBlock formatting
hellofromtonya Oct 11, 2022
9c3c14d
Adds tests for get_core_data()
hellofromtonya Oct 11, 2022
14c802b
Guard if the origin is invalid
hellofromtonya Oct 11, 2022
8f1329c
Merge branch 'trunk' into try/improve-caching-for-theme-json
hellofromtonya Oct 11, 2022
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
Prev Previous commit
Merge branch 'trunk' into try/improve-caching-for-theme-json
  • Loading branch information
@hellofromtonya
hellofromtonya authored Oct 11, 2022
commit 8f1329cae0baa5899884af9772bf254eea7cb89d
3 changes: 2 additions & 1 deletion src/wp-includes/class-wp-theme-json-resolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ public static function get_block_data() {
return static::$blocks;
}

$config = array( 'version' => 1 );
$config = array( 'version' => 2 );
Copy link
Member

@spacedmonkey spacedmonkey Oct 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain this change?

Copy link
Member Author

@oandregal oandregal Oct 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bug I found while working in this PR. I can prepare a different PR if that's preferred but thought it was so minor it didn't merit one.

This sets the version of the theme.json schema used by the data stored in the blocks. We introduced version 2 in WordPress 5.9 and blocks only gained this functionality in this release, so we should be using the latest. In practice, because we're using the version 2 to store data in the blocks, probably we won't notice anything. Though this is still a dormant bug waiting to happen, and I rather do the right thing now. See docs.


foreach ( $blocks as $block_name => $block_type ) {
if ( isset( $block_type->supports['__experimentalStyle'] ) ) {
$config['styles']['blocks'][ $block_name ] = static::remove_json_comments( $block_type->supports['__experimentalStyle'] );
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.