Changeset 58262 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

Timestamp:

05/31/2024 01:17:50 AM (10 months ago)

Author:

noisysocks

Message:

Block Themes: Add support for relative URLs in top-level theme.json styles

Allow using relative file: URLs in top-level theme.json properties such as
styles.background, and modify the REST API to provide clients with the
absolute URLs via a '​https://api.w.org/theme-file' attribute in the _links
array.

Props ramonopoly.
Fixes #61273.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php (modified) (7 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

@@ -290 +290 @@
      *
      * @since 5.9.0
+     * @since 6.6.0 Added custom relative theme file URIs to `_links`.
      *
      * @param WP_Post         $post    Global Styles post object.
@@ -299 +300 @@
         $is_global_styles_user_theme_json = isset( $raw_config['isGlobalStylesUserThemeJSON'] ) && true === $raw_config['isGlobalStylesUserThemeJSON'];
         $config                           = array();
+        $theme_json                       = null;
         if ( $is_global_styles_user_theme_json ) {
-            $config = ( new WP_Theme_JSON( $raw_config, 'custom' ) )->get_raw_data();
+            $theme_json = new WP_Theme_JSON( $raw_config, 'custom' );
+            $config     = $theme_json->get_raw_data();
         }
 
@@ -342 +345 @@
         if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) {
             $links = $this->prepare_links( $post->ID );
+
+            // Only return resolved URIs for get requests to user theme JSON.
+            if ( $theme_json ) {
+                $resolved_theme_uris = WP_Theme_JSON_Resolver::get_resolved_theme_uris( $theme_json );
+                if ( ! empty( $resolved_theme_uris ) ) {
+                    $links['https://api.w.org/theme-file'] = $resolved_theme_uris;
+                }
+            }
+
             $response->add_links( $links );
             if ( ! empty( $links['self']['href'] ) ) {
@@ -516 +528 @@
      *
      * @since 5.9.0
+     * @since 6.6.0 Added custom relative theme file URIs to `_links`.
      *
      * @param WP_REST_Request $request The request instance.
@@ -550 +563 @@
 
         if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) {
-            $links = array(
+            $links               = array(
                 'self' => array(
                     'href' => rest_url( sprintf( '%s/%s/themes/%s', $this->namespace, $this->rest_base, $request['stylesheet'] ) ),
                 ),
             );
+            $resolved_theme_uris = WP_Theme_JSON_Resolver::get_resolved_theme_uris( $theme );
+            if ( ! empty( $resolved_theme_uris ) ) {
+                $links['https://api.w.org/theme-file'] = $resolved_theme_uris;
+            }
             $response->add_links( $links );
         }
@@ -592 +609 @@
      * @since 6.0.0
      * @since 6.2.0 Returns parent theme variations, if they exist.
+     * @since 6.6.0 Added custom relative theme file URIs to `_links` for each item.
      *
      * @param WP_REST_Request $request The request instance.
@@ -607 +625 @@
         }
 
+        $response   = array();
         $variations = WP_Theme_JSON_Resolver::get_style_variations();
 
-        return rest_ensure_response( $variations );
+        foreach ( $variations as $variation ) {
+            $variation_theme_json = new WP_Theme_JSON( $variation );
+            $resolved_theme_uris  = WP_Theme_JSON_Resolver::get_resolved_theme_uris( $variation_theme_json );
+            $data                 = rest_ensure_response( $variation );
+            if ( ! empty( $resolved_theme_uris ) ) {
+                $data->add_links(
+                    array(
+                        'https://api.w.org/theme-file' => $resolved_theme_uris,
+                    )
+                );
+            }
+            $response[] = $this->prepare_response_for_collection( $data );
+        }
+
+        return rest_ensure_response( $response );
     }