Changeset 51501 for trunk/src/wp-includes/blocks.php

Timestamp:

07/28/2021 10:05:01 AM (3 years ago)

Author:

gziolo

Message:

Build: Split packages and blocks to their webpack configs

It aligns with the changes proposed added in Gutenberg: ​https://github.com/WordPress/gutenberg/pull/33293.

The idea here is to split the growing webpack config into two parts: blocks and packages.

We need to add handling for JavaScript files that are going to be used with blocks on the frontend. They didn't work quite well with the current setup for entry points created for packages.

As part of the effort, it adds support for viewScript in block.json metadata file that is later translated to $view_script in WP_Block_Type class and exposed as view_script from the REST API endpoint for block types.

Props youknowriad, desrosj, aristath.
Fixes #53690.

File:

• trunk/src/wp-includes/blocks.php (modified) (6 diffs)

trunk/src/wp-includes/blocks.php

@@ -43 +43 @@
             $asset_handle .= '-editor';
         }
+        if ( 0 === strpos( $field_name, 'view' ) ) {
+            $asset_handle .= '-view';
+        }
         return $asset_handle;
     }
@@ -49 +52 @@
         'editorScript' => 'editor-script',
         'script'       => 'script',
+        'viewScript'   => 'view-script',
         'editorStyle'  => 'editor-style',
         'style'        => 'style',
@@ -97 +101 @@
         return false;
     }
-    $script_asset = require $script_asset_path;
-    $result       = wp_register_script(
+    $is_core_block       = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], ABSPATH . WPINC );
+    $script_uri          = $is_core_block ?
+        includes_url( str_replace( ABSPATH . WPINC, '', realpath( dirname( $metadata['file'] ) . '/' . $script_path ) ) ) :
+        plugins_url( $script_path, $metadata['file'] );
+    $script_asset        = require $script_asset_path;
+    $script_dependencies = isset( $script_asset['dependencies'] ) ? $script_asset['dependencies'] : array();
+    $result              = wp_register_script(
         $script_handle,
-        plugins_url( $script_path, $metadata['file'] ),
-        $script_asset['dependencies'],
-        $script_asset['version']
+        $script_uri,
+        $script_dependencies,
+        isset( $script_asset['version'] ) ? $script_asset['version'] : false
     );
     if ( ! $result ) {
@@ -108 +117 @@
     }
 
-    if ( ! empty( $metadata['textdomain'] ) ) {
+    if ( ! empty( $metadata['textdomain'] ) && in_array( 'wp-i18n', $script_dependencies ) ) {
         wp_set_script_translations( $script_handle, $metadata['textdomain'] );
     }
@@ -183 +192 @@
  *
  * @since 5.5.0
+ * @since 5.9.0 Added support for the `viewScript` field.
  *
  * @param string $file_or_folder Path to the JSON file with metadata definition for
@@ -305 +315 @@
     }
 
+    if ( ! empty( $metadata['viewScript'] ) ) {
+        $settings['view_script'] = register_block_script_handle(
+            $metadata,
+            'viewScript'
+        );
+    }
+
     if ( ! empty( $metadata['editorStyle'] ) ) {
         $settings['editor_style'] = register_block_style_handle(