Changeset 48656

Timestamp:

07/28/2020 04:08:56 AM (4 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Remove assets field from block directory controller.

Gutenberg no longer uses the assets field to fetch the assets for the installed block so this field can be dropped from the endpoint. This allows us to reintroduce it at a later point without needing to worry about backward compatibility.

See #50732.

Location:

trunk

Files:

• src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php (modified) (3 diffs)
• tests/phpunit/tests/rest-api/rest-block-directory-controller.php (modified) (3 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php

@@ -130 +130 @@
             'author'              => wp_strip_all_tags( $plugin['author'] ),
             'icon'                => ( isset( $plugin['icons']['1x'] ) ? $plugin['icons']['1x'] : 'block-default' ),
-            'assets'              => array(),
             'last_updated'        => gmdate( 'Y-m-d\TH:i:s', strtotime( $plugin['last_updated'] ) ),
             'humanized_updated'   => sprintf(
@@ -138 +137 @@
             ),
         );
-
-        foreach ( $plugin['block_assets'] as $asset ) {
-            // Allow for fully qualified URLs in future
-            if ( 'https' === wp_parse_url( $asset, PHP_URL_SCHEME ) && ! empty( wp_parse_url( $asset, PHP_URL_HOST ) ) ) {
-                $block['assets'][] = esc_url_raw(
-                    $asset,
-                    array( 'https' )
-                );
-            } else {
-                $block['assets'][] = esc_url_raw(
-                    add_query_arg( 'v', strtotime( $block['last_updated'] ), 'https://ps.w.org/' . $plugin['slug'] . $asset ),
-                    array( 'https' )
-                );
-            }
-        }
 
         $this->add_additional_fields_to_object( $block, $request );
@@ -296 +280 @@
                     'type'        => 'string',
                     'context'     => array( 'view' ),
-                ),
-                'assets'              => array(
-                    'description' => __( 'An object representing the block CSS and JavaScript assets.' ),
-                    'type'        => 'array',
-                    'context'     => array( 'view' ),
-                    'readonly'    => true,
-                    'items'       => array(
-                        'type'   => 'string',
-                        'format' => 'uri',
-                    ),
                 ),
             ),

trunk/tests/phpunit/tests/rest-api/rest-block-directory-controller.php

@@ -163 +163 @@
             'author'              => 'sorta brilliant',
             'icon'                => 'https://ps.w.org/guidepost/assets/icon-128x128.jpg?rev=2235512',
-            'assets'              => array(
-                'https://ps.w.org/guidepost/tags/1.2.1/build/index.js?v=1584940380',
-                'https://ps.w.org/guidepost/tags/1.2.1/build/guidepost-editor.css?v=1584940380',
-                'https://ps.w.org/guidepost/tags/1.2.1/build/guidepost-style.css?v=1584940380',
-                'https://ps.w.org/guidepost/tags/1.2.1/build/guidepost-theme.js?v=1584940380',
-            ),
             'last_updated'        => gmdate( 'Y-m-d\TH:i:s', strtotime( $plugin['last_updated'] ) ),
             'humanized_updated'   => sprintf( '%s ago', human_time_diff( strtotime( $plugin['last_updated'] ) ) ),
@@ -193 +187 @@
         $properties = $data['schema']['properties'];
 
-        $this->assertCount( 14, $properties );
+        $this->assertCount( 13, $properties );
         $this->assertArrayHasKey( 'name', $properties );
         $this->assertArrayHasKey( 'title', $properties );
@@ -207 +201 @@
         $this->assertArrayHasKey( 'last_updated', $properties );
         $this->assertArrayHasKey( 'humanized_updated', $properties );
-        $this->assertArrayHasKey( 'assets', $properties );
     }