Changeset 50761 for trunk/src/wp-includes/script-loader.php

Timestamp:

04/15/2021 02:41:38 PM (5 years ago)

Author:

gziolo

Message:

Editor: Update WordPress packages to use with WordPress 5.8

In the response to the discussion during the Dev Chat, I'm doing a first pass to keep WordPress packages up to date in the WordPress 5.8 release cycle.

See ​https://github.com/WordPress/wordpress-develop/pull/1176 for more details.

Props youknowriad, aristath, andraganescu.
See #52991.

File:

• trunk/src/wp-includes/script-loader.php (modified) (4 diffs)

trunk/src/wp-includes/script-loader.php

@@ -1506 +1506 @@
 
     $styles->add(
+        'wp-reset-editor-styles',
+        "/wp-includes/css/dist/block-library/reset$suffix.css",
+        array( 'common', 'forms' ) // Make sure the reset is loaded after the default WP Admin styles.
+    );
+
+    $styles->add(
+        'wp-editor-classic-layout-styles',
+        "/wp-includes/css/dist/edit-post/classic$suffix.css",
+        array()
+    );
+
+    $wp_edit_blocks_dependencies = array(
+        'wp-components',
+        'wp-editor',
+        // This need to be added before the block library styles,
+        // The block library styles override the "reset" styles.
+        'wp-reset-editor-styles',
+        'wp-block-library',
+        'wp-reusable-blocks',
+
+        // This dependency shouldn't be added for themes with theme.json support
+        // It's here for backward compatibility only.
+        // A check should be added here when theme.json is backported to Core.
+        'wp-editor-classic-layout-styles',
+    );
+    global $editor_styles;
+    if ( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 ) {
+        // Include opinionated block styles if no $editor_styles are declared, so the editor never appears broken.
+        $wp_edit_blocks_dependencies[] = 'wp-block-library-theme';
+    }
+
+    $styles->add(
         'wp-edit-blocks',
         "/wp-includes/css/dist/block-library/editor$suffix.css",
-        array(
-            'wp-components',
-            'wp-editor',
-            'wp-block-library',
-            // Always include visual styles so the editor never appears broken.
-            'wp-block-library-theme',
-        )
+        $wp_edit_blocks_dependencies
     );
 
@@ -1534 +1560 @@
             'wp-block-editor',
             'wp-nux',
+            'wp-reusable-blocks',
         ),
         'format-library'       => array(),
         'list-reusable-blocks' => array( 'wp-components' ),
+        'reusable-blocks'      => array( 'wp-components' ),
         'nux'                  => array( 'wp-components' ),
     );
@@ -1581 +1609 @@
         'wp-jquery-ui-dialog',
         // Package styles.
+        'wp-reset-editor-styles',
+        'wp-editor-classic-layout-styles',
         'wp-block-library-theme',
         'wp-edit-blocks',
@@ -1591 +1621 @@
         'wp-format-library',
         'wp-list-reusable-blocks',
+        'wp-reusable-blocks',
         'wp-nux',
         // Deprecated CSS.