Changeset 56500

Timestamp:

08/31/2023 09:47:40 PM (11 months ago)

Author:

hellofromTonya

Message:

Introduce font-face styles generator and printer.

Introducing Font Face, a server-side @font-face styles generator and printer.

tl;dr:

• Introduces Font Face.
• Deprecates _wp_theme_json_webfonts_handler().

Introduce Font Face

From an array of fonts (i.e. each font-family and its font variations to be processed), it:

1. Validates each font-face declaration, i.e. the CSS property and value pairing. If validation fails, processing stops with no font-face styles printed.
2. Generates the @font-face CSS for each font-family.
3. Prints the CSS within a <style id="wp-fonts-local"> element.

The entry point into Font Face is through a new global function called wp_print_font_faces(), which is automatically called:

• when the 'wp_head' hook runs (for the front-end).
• when the 'admin_print_styles' hook runs (for the back-end).
• when _wp_get_iframed_editor_assets() runs to inject the @font-face styles into the iframed editor.

Once called, it gets the fonts from Theme_JSON merged data layer, which includes theme defined fonts and user activated fonts (once the Font Library #59166 is introduced into Core).

For classic sites, themes and plugins can directly call wp_print_font_faces() and pass their fonts array to it for processing.

Deprecates _wp_theme_json_webfonts_handler().

As Font Face is a direct replacement, the stopgap code in _wp_theme_json_webfonts_handler() (introduced in 6.0.0 via [53282]) is deprecated and unused in Core.

Props note:
There's a long multiple year history baked into Font Face, which dates back to the early versions of a web font API (see #46370 and ​roadmap. The props list includes those who contributed from those early versions up to this commit.

References:

• #46370 original (Web)Fonts API proposal for registering and enqueuing web fonts.
• ​Gutenberg tracking issue which includes the evolution from Webfonts API to Fonts API to Font Face.
• [53282] / #55567 Added the stopgap code _wp_theme_json_webfonts_handler() in 6.0.
• ​@font-face on mdn web docs
• #59166 Font Library: Font manager for WordPress

Follow-up to [53282].

Props aristath, jonoaldersonwp, hellofromTonya, andraganescu, annezazu, antonvlasenko, arena, askdesign, azaozz, bph, bradley2083, colorful-tones, costdev, davidbaumwald, desrosj, dingo_d, djcowan, domainsupport, dryanpress, elmastudio, flixos90, francina, garrett-eclipse, gigitux, grantmkin, grapplerulrich, gziolo, ironprogrammer, jb510, jeffpaul, jeremyyip, jffng, joostdevalk, jorgefilipecosta, juanmaguitar, mamaduka, matveb, mburridge, mitogh, ndiego, ntsekouras, oandregal, ocean90, oglekler, paaljoachim, pagelab, peterwilsoncc, poena, priethor, scruffian, SergeyBiryukov, shiloey, simison, skorasaurus, soean, westonruter, wildworks, zaguiini.
Fixes #59165.

Location:

trunk

Files:

• phpcs.xml.dist (modified) (1 diff)
• src/wp-admin/includes/admin-filters.php (modified) (1 diff)
• src/wp-includes/block-editor.php (modified) (1 diff)
• src/wp-includes/default-filters.php (modified) (2 diffs)
• src/wp-includes/deprecated.php (modified) (1 diff)
• src/wp-includes/fonts.php (added)
• src/wp-includes/fonts/class-wp-font-face-resolver.php (added)
• src/wp-includes/fonts/class-wp-font-face.php (added)
• src/wp-includes/script-loader.php (modified) (1 diff)
• src/wp-settings.php (modified) (1 diff)
• tests/phpunit/data/themedir1/fonts-block-theme (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Bold-Italic.woff2 (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Bold.woff2 (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Medium.ttf (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-MediumItalic.ttf (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Regular-Italic.woff2 (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Regular.woff2 (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/LICENSE.txt (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OFL.txt (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OpenSans-Italic-VariableFont_wdth,wght.ttf (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OpenSans-VariableFont_wdth,wght.ttf (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/LICENSE.md (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.otf.woff2 (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2 (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.otf.woff2 (added)
• tests/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2 (added)
• tests/phpunit/data/themedir1/fonts-block-theme/style.css (added)
• tests/phpunit/data/themedir1/fonts-block-theme/styles (added)
• tests/phpunit/data/themedir1/fonts-block-theme/styles/variation-duplicate-fonts.json (added)
• tests/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-family.json (added)
• tests/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-variations.json (added)
• tests/phpunit/data/themedir1/fonts-block-theme/styles/variation-no-fonts.json (added)
• tests/phpunit/data/themedir1/fonts-block-theme/templates (added)
• tests/phpunit/data/themedir1/fonts-block-theme/templates/index.html (added)
• tests/phpunit/data/themedir1/fonts-block-theme/theme.json (added)
• tests/phpunit/data/themedir1/webfonts-theme (deleted)
• tests/phpunit/tests/fonts (added)
• tests/phpunit/tests/fonts/font-face (added)
• tests/phpunit/tests/fonts/font-face/base.php (added)
• tests/phpunit/tests/fonts/font-face/wp-font-face-tests-dataset.php (added)
• tests/phpunit/tests/fonts/font-face/wpFontFace (added)
• tests/phpunit/tests/fonts/font-face/wpFontFace/generateAndPrint.php (added)
• tests/phpunit/tests/fonts/font-face/wpFontFaceResolver (added)
• tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php (added)
• tests/phpunit/tests/fonts/font-face/wpPrintFontFaces.php (added)
• tests/phpunit/tests/theme/themeDir.php (modified) (1 diff)

trunk/phpcs.xml.dist

@@ -260 +260 @@
                 <element value="WP_Tests_Image_Resize_UnitTestCase"/>
                 <element value="WP_Theme_UnitTestCase"/>
+
 
                 <!-- Mock classes. -->

trunk/src/wp-admin/includes/admin-filters.php

@@ -169 +169 @@
 // Append '(Draft)' to draft page titles in the privacy page dropdown.
 add_filter( 'list_pages', '_wp_privacy_settings_filter_draft_page_titles', 10, 2 );
+
+
+

trunk/src/wp-includes/block-editor.php

@@ -362 +362 @@
     ob_start();
     wp_print_styles();
+
     $styles = ob_get_clean();
 

trunk/src/wp-includes/default-filters.php

@@ -359 +359 @@
 add_action( 'after_switch_theme', '_wp_sidebars_changed' );
 add_action( 'wp_print_styles', 'print_emoji_styles' );
-add_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' );
 
 if ( isset( $_GET['replytocom'] ) ) {
@@ -720 +719 @@
 add_action( 'init', 'wp_create_initial_post_meta' );
 
+
+
+
 unset( $filter, $action );

trunk/src/wp-includes/deprecated.php

@@ -5368 +5368 @@
     return $colors;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -3225 +3225 @@
 
 /**
- * Runs the theme.json webfonts handler.
- *
- * Using `WP_Theme_JSON_Resolver`, it gets the fonts defined
- * in the `theme.json` for the current selection and style
- * variations, validates the font-face properties, generates
- * the '@font-face' style declarations, and then enqueues the
- * styles for both the editor and front-end.
- *
- * Design Notes:
- * This is not a public API, but rather an internal handler.
- * A future public Webfonts API will replace this stopgap code.
- *
- * This code design is intentional.
- *    a. It hides the inner-workings.
- *    b. It does not expose API ins or outs for consumption.
- *    c. It only works with a theme's `theme.json`.
- *
- * Why?
- *    a. To avoid backwards-compatibility issues when
- *       the Webfonts API is introduced in Core.
- *    b. To make `fontFace` declarations in `theme.json` work.
- *
- * @link  https://github.com/WordPress/gutenberg/issues/40472
- *
- * @since 6.0.0
- * @access private
- */
-function _wp_theme_json_webfonts_handler() {
-    // Block themes are unavailable during installation.
-    if ( wp_installing() ) {
-        return;
-    }
-
-    if ( ! wp_theme_has_theme_json() ) {
-        return;
-    }
-
-    // Webfonts to be processed.
-    $registered_webfonts = array();
-
-    /**
-     * Gets the webfonts from theme.json.
-     *
-     * @since 6.0.0
-     *
-     * @return array Array of defined webfonts.
-     */
-    $fn_get_webfonts_from_theme_json = static function() {
-        // Get settings from theme.json.
-        $settings = WP_Theme_JSON_Resolver::get_merged_data()->get_settings();
-
-        // If in the editor, add webfonts defined in variations.
-        if ( is_admin() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) {
-            $variations = WP_Theme_JSON_Resolver::get_style_variations();
-            foreach ( $variations as $variation ) {
-                // Skip if fontFamilies are not defined in the variation.
-                if ( empty( $variation['settings']['typography']['fontFamilies'] ) ) {
-                    continue;
-                }
-
-                // Initialize the array structure.
-                if ( empty( $settings['typography'] ) ) {
-                    $settings['typography'] = array();
-                }
-                if ( empty( $settings['typography']['fontFamilies'] ) ) {
-                    $settings['typography']['fontFamilies'] = array();
-                }
-                if ( empty( $settings['typography']['fontFamilies']['theme'] ) ) {
-                    $settings['typography']['fontFamilies']['theme'] = array();
-                }
-
-                // Combine variations with settings. Remove duplicates.
-                $settings['typography']['fontFamilies']['theme'] = array_merge( $settings['typography']['fontFamilies']['theme'], $variation['settings']['typography']['fontFamilies']['theme'] );
-                $settings['typography']['fontFamilies']          = array_unique( $settings['typography']['fontFamilies'] );
-            }
-        }
-
-        // Bail out early if there are no settings for webfonts.
-        if ( empty( $settings['typography']['fontFamilies'] ) ) {
-            return array();
-        }
-
-        $webfonts = array();
-
-        // Look for fontFamilies.
-        foreach ( $settings['typography']['fontFamilies'] as $font_families ) {
-            foreach ( $font_families as $font_family ) {
-
-                // Skip if fontFace is not defined.
-                if ( empty( $font_family['fontFace'] ) ) {
-                    continue;
-                }
-
-                // Skip if fontFace is not an array of webfonts.
-                if ( ! is_array( $font_family['fontFace'] ) ) {
-                    continue;
-                }
-
-                $webfonts = array_merge( $webfonts, $font_family['fontFace'] );
-            }
-        }
-
-        return $webfonts;
-    };
-
-    /**
-     * Transforms each 'src' into an URI by replacing 'file:./'
-     * placeholder from theme.json.
-     *
-     * The absolute path to the webfont file(s) cannot be defined in
-     * theme.json. `file:./` is the placeholder which is replaced by
-     * the theme's URL path to the theme's root.
-     *
-     * @since 6.0.0
-     *
-     * @param array $src Webfont file(s) `src`.
-     * @return array Webfont's `src` in URI.
-     */
-    $fn_transform_src_into_uri = static function( array $src ) {
-        foreach ( $src as $key => $url ) {
-            // Tweak the URL to be relative to the theme root.
-            if ( ! str_starts_with( $url, 'file:./' ) ) {
-                continue;
-            }
-
-            $src[ $key ] = get_theme_file_uri( str_replace( 'file:./', '', $url ) );
-        }
-
-        return $src;
-    };
-
-    /**
-     * Converts the font-face properties (i.e. keys) into kebab-case.
-     *
-     * @since 6.0.0
-     *
-     * @param array $font_face Font face to convert.
-     * @return array Font faces with each property in kebab-case format.
-     */
-    $fn_convert_keys_to_kebab_case = static function( array $font_face ) {
-        foreach ( $font_face as $property => $value ) {
-            $kebab_case               = _wp_to_kebab_case( $property );
-            $font_face[ $kebab_case ] = $value;
-            if ( $kebab_case !== $property ) {
-                unset( $font_face[ $property ] );
-            }
-        }
-
-        return $font_face;
-    };
-
-    /**
-     * Validates a webfont.
-     *
-     * @since 6.0.0
-     *
-     * @param array $webfont The webfont arguments.
-     * @return array|false The validated webfont arguments, or false if the webfont is invalid.
-     */
-    $fn_validate_webfont = static function( $webfont ) {
-        $webfont = wp_parse_args(
-            $webfont,
-            array(
-                'font-family'  => '',
-                'font-style'   => 'normal',
-                'font-weight'  => '400',
-                'font-display' => 'fallback',
-                'src'          => array(),
-            )
-        );
-
-        // Check the font-family.
-        if ( empty( $webfont['font-family'] ) || ! is_string( $webfont['font-family'] ) ) {
-            trigger_error( __( 'Webfont font family must be a non-empty string.' ) );
-
-            return false;
-        }
-
-        // Check that the `src` property is defined and a valid type.
-        if ( empty( $webfont['src'] ) || ( ! is_string( $webfont['src'] ) && ! is_array( $webfont['src'] ) ) ) {
-            trigger_error( __( 'Webfont src must be a non-empty string or an array of strings.' ) );
-
-            return false;
-        }
-
-        // Validate the `src` property.
-        foreach ( (array) $webfont['src'] as $src ) {
-            if ( ! is_string( $src ) || '' === trim( $src ) ) {
-                trigger_error( __( 'Each webfont src must be a non-empty string.' ) );
-
-                return false;
-            }
-        }
-
-        // Check the font-weight.
-        if ( ! is_string( $webfont['font-weight'] ) && ! is_int( $webfont['font-weight'] ) ) {
-            trigger_error( __( 'Webfont font weight must be a properly formatted string or integer.' ) );
-
-            return false;
-        }
-
-        // Check the font-display.
-        if ( ! in_array( $webfont['font-display'], array( 'auto', 'block', 'fallback', 'optional', 'swap' ), true ) ) {
-            $webfont['font-display'] = 'fallback';
-        }
-
-        $valid_props = array(
-            'ascend-override',
-            'descend-override',
-            'font-display',
-            'font-family',
-            'font-stretch',
-            'font-style',
-            'font-weight',
-            'font-variant',
-            'font-feature-settings',
-            'font-variation-settings',
-            'line-gap-override',
-            'size-adjust',
-            'src',
-            'unicode-range',
-        );
-
-        foreach ( $webfont as $prop => $value ) {
-            if ( ! in_array( $prop, $valid_props, true ) ) {
-                unset( $webfont[ $prop ] );
-            }
-        }
-
-        return $webfont;
-    };
-
-    /**
-     * Registers webfonts declared in theme.json.
-     *
-     * @since 6.0.0
-     *
-     * @uses $registered_webfonts To access and update the registered webfonts registry (passed by reference).
-     * @uses $fn_get_webfonts_from_theme_json To run the function that gets the webfonts from theme.json.
-     * @uses $fn_convert_keys_to_kebab_case To run the function that converts keys into kebab-case.
-     * @uses $fn_validate_webfont To run the function that validates each font-face (webfont) from theme.json.
-     */
-    $fn_register_webfonts = static function() use ( &$registered_webfonts, $fn_get_webfonts_from_theme_json, $fn_convert_keys_to_kebab_case, $fn_validate_webfont, $fn_transform_src_into_uri ) {
-        $registered_webfonts = array();
-
-        foreach ( $fn_get_webfonts_from_theme_json() as $webfont ) {
-            if ( ! is_array( $webfont ) ) {
-                continue;
-            }
-
-            $webfont = $fn_convert_keys_to_kebab_case( $webfont );
-
-            $webfont = $fn_validate_webfont( $webfont );
-
-            $webfont['src'] = $fn_transform_src_into_uri( (array) $webfont['src'] );
-
-            // Skip if not valid.
-            if ( empty( $webfont ) ) {
-                continue;
-            }
-
-            $registered_webfonts[] = $webfont;
-        }
-    };
-
-    /**
-     * Orders 'src' items to optimize for browser support.
-     *
-     * @since 6.0.0
-     *
-     * @param array $webfont Webfont to process.
-     * @return array Ordered `src` items.
-     */
-    $fn_order_src = static function( array $webfont ) {
-        $src         = array();
-        $src_ordered = array();
-
-        foreach ( $webfont['src'] as $url ) {
-            // Add data URIs first.
-            if ( str_starts_with( trim( $url ), 'data:' ) ) {
-                $src_ordered[] = array(
-                    'url'    => $url,
-                    'format' => 'data',
-                );
-                continue;
-            }
-            $format         = pathinfo( $url, PATHINFO_EXTENSION );
-            $src[ $format ] = $url;
-        }
-
-        // Add woff2.
-        if ( ! empty( $src['woff2'] ) ) {
-            $src_ordered[] = array(
-                'url'    => sanitize_url( $src['woff2'] ),
-                'format' => 'woff2',
-            );
-        }
-
-        // Add woff.
-        if ( ! empty( $src['woff'] ) ) {
-            $src_ordered[] = array(
-                'url'    => sanitize_url( $src['woff'] ),
-                'format' => 'woff',
-            );
-        }
-
-        // Add ttf.
-        if ( ! empty( $src['ttf'] ) ) {
-            $src_ordered[] = array(
-                'url'    => sanitize_url( $src['ttf'] ),
-                'format' => 'truetype',
-            );
-        }
-
-        // Add eot.
-        if ( ! empty( $src['eot'] ) ) {
-            $src_ordered[] = array(
-                'url'    => sanitize_url( $src['eot'] ),
-                'format' => 'embedded-opentype',
-            );
-        }
-
-        // Add otf.
-        if ( ! empty( $src['otf'] ) ) {
-            $src_ordered[] = array(
-                'url'    => sanitize_url( $src['otf'] ),
-                'format' => 'opentype',
-            );
-        }
-        $webfont['src'] = $src_ordered;
-
-        return $webfont;
-    };
-
-    /**
-     * Compiles the 'src' into valid CSS.
-     *
-     * @since 6.0.0
-     * @since 6.2.0 Removed local() CSS.
-     *
-     * @param string $font_family Font family.
-     * @param array  $value       Value to process.
-     * @return string The CSS.
-     */
-    $fn_compile_src = static function( $font_family, array $value ) {
-        $src = '';
-
-        foreach ( $value as $item ) {
-            $src .= ( 'data' === $item['format'] )
-                ? ", url({$item['url']})"
-                : ", url('{$item['url']}') format('{$item['format']}')";
-        }
-
-        $src = ltrim( $src, ', ' );
-
-        return $src;
-    };
-
-    /**
-     * Compiles the font variation settings.
-     *
-     * @since 6.0.0
-     *
-     * @param array $font_variation_settings Array of font variation settings.
-     * @return string The CSS.
-     */
-    $fn_compile_variations = static function( array $font_variation_settings ) {
-        $variations = '';
-
-        foreach ( $font_variation_settings as $key => $value ) {
-            $variations .= "$key $value";
-        }
-
-        return $variations;
-    };
-
-    /**
-     * Builds the font-family's CSS.
-     *
-     * @since 6.0.0
-     *
-     * @uses $fn_compile_src To run the function that compiles the src.
-     * @uses $fn_compile_variations To run the function that compiles the variations.
-     *
-     * @param array $webfont Webfont to process.
-     * @return string This font-family's CSS.
-     */
-    $fn_build_font_face_css = static function( array $webfont ) use ( $fn_compile_src, $fn_compile_variations ) {
-        $css = '';
-
-        // Wrap font-family in quotes if it contains spaces.
-        if (
-            str_contains( $webfont['font-family'], ' ' ) &&
-            ! str_contains( $webfont['font-family'], '"' ) &&
-            ! str_contains( $webfont['font-family'], "'" )
-        ) {
-            $webfont['font-family'] = '"' . $webfont['font-family'] . '"';
-        }
-
-        foreach ( $webfont as $key => $value ) {
-            /*
-             * Skip "provider", since it's for internal API use,
-             * and not a valid CSS property.
-             */
-            if ( 'provider' === $key ) {
-                continue;
-            }
-
-            // Compile the "src" parameter.
-            if ( 'src' === $key ) {
-                $value = $fn_compile_src( $webfont['font-family'], $value );
-            }
-
-            // If font-variation-settings is an array, convert it to a string.
-            if ( 'font-variation-settings' === $key && is_array( $value ) ) {
-                $value = $fn_compile_variations( $value );
-            }
-
-            if ( ! empty( $value ) ) {
-                $css .= "$key:$value;";
-            }
-        }
-
-        return $css;
-    };
-
-    /**
-     * Gets the '@font-face' CSS styles for locally-hosted font files.
-     *
-     * @since 6.0.0
-     *
-     * @uses $registered_webfonts To access and update the registered webfonts registry (passed by reference).
-     * @uses $fn_order_src To run the function that orders the src.
-     * @uses $fn_build_font_face_css To run the function that builds the font-face CSS.
-     *
-     * @return string The `@font-face` CSS.
-     */
-    $fn_get_css = static function() use ( &$registered_webfonts, $fn_order_src, $fn_build_font_face_css ) {
-        $css = '';
-
-        foreach ( $registered_webfonts as $webfont ) {
-            // Order the webfont's `src` items to optimize for browser support.
-            $webfont = $fn_order_src( $webfont );
-
-            // Build the @font-face CSS for this webfont.
-            $css .= '@font-face{' . $fn_build_font_face_css( $webfont ) . '}';
-        }
-
-        return $css;
-    };
-
-    /**
-     * Generates and enqueues webfonts styles.
-     *
-     * @since 6.0.0
-     *
-     * @uses $fn_get_css To run the function that gets the CSS.
-     */
-    $fn_generate_and_enqueue_styles = static function() use ( $fn_get_css ) {
-        // Generate the styles.
-        $styles = $fn_get_css();
-
-        // Bail out if there are no styles to enqueue.
-        if ( '' === $styles ) {
-            return;
-        }
-
-        // Enqueue the stylesheet.
-        wp_register_style( 'wp-webfonts', '' );
-        wp_enqueue_style( 'wp-webfonts' );
-
-        // Add the styles to the stylesheet.
-        wp_add_inline_style( 'wp-webfonts', $styles );
-    };
-
-    /**
-     * Generates and enqueues editor styles.
-     *
-     * @since 6.0.0
-     *
-     * @uses $fn_get_css To run the function that gets the CSS.
-     */
-    $fn_generate_and_enqueue_editor_styles = static function() use ( $fn_get_css ) {
-        // Generate the styles.
-        $styles = $fn_get_css();
-
-        // Bail out if there are no styles to enqueue.
-        if ( '' === $styles ) {
-            return;
-        }
-
-        wp_add_inline_style( 'wp-block-library', $styles );
-    };
-
-    add_action( 'wp_loaded', $fn_register_webfonts );
-    add_action( 'wp_enqueue_scripts', $fn_generate_and_enqueue_styles );
-    add_action( 'admin_init', $fn_generate_and_enqueue_editor_styles );
-}
-
-/**
  * Loads classic theme styles on classic themes in the frontend.
  *

trunk/src/wp-settings.php

@@ -361 +361 @@
 require ABSPATH . WPINC . '/style-engine/class-wp-style-engine-css-rules-store.php';
 require ABSPATH . WPINC . '/style-engine/class-wp-style-engine-processor.php';
+
+
+
 
 $GLOBALS['wp_embed'] = new WP_Embed();

trunk/tests/phpunit/tests/theme/themeDir.php

@@ -186 +186 @@
             'Block Theme [1.0.0] in subdirectory',
             'Block Theme Deprecated Path',
-            'Webfonts theme',
+            '',
             'Empty `fontFace` in theme.json - no webfonts defined',
             'A theme with the Update URI header',