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

Revert "Enqueue the registered assets (#50185)" #50537

Merged
merged 2 commits into from
May 24, 2023
Merged

Revert "Enqueue the registered assets (#50185)" #50537

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
b0d12fe
Revert "Enqueue the registered assets (#50185)"
oandregal May 11, 2023
fc18cd9
Remove unnecessary comment (test is no longer skipped)
oandregal May 11, 2023
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
15 changes: 0 additions & 15 deletions lib/compat/wordpress-6.2/default-filters.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,3 @@
*
* @package gutenberg
*/

/**
* This is a temporary fix to ensure that the block editor styles are enqueued
* in the order the iframe expects.
*
* The wp_enqueue_registered_block_scripts_and_styles callback has been removed in core
* as of https://github.com/WordPress/wordpress-develop/pull/4356.
*
* However, Gutenberg supports WordPress 6.1 and 6.2, which still have this callback.
* Hence, why we remove it first and then re-add it.
*
* This way we make sure it still works the same in WordPress trunk, 6.1 and 6.2.
*/
remove_action( 'enqueue_block_editor_assets', 'wp_enqueue_registered_block_scripts_and_styles' );
add_action( 'enqueue_block_editor_assets', 'wp_enqueue_registered_block_scripts_and_styles', 1 );
1 change: 0 additions & 1 deletion packages/e2e-tests/specs/editor/plugins/iframed-inline-styles.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ describe( 'iframed inline styles', () => {
await deactivatePlugin( 'gutenberg-test-iframed-inline-styles' );
} );

// Skip flaky test. See https://github.com/WordPress/gutenberg/issues/35172
it( 'should load inline styles in iframe', async () => {
await insertBlock( 'Iframed Inline Styles' );

Expand Down