Changeset 3743505 for optimazz/trunk/includes/Modules/Fonts/FontsModule.php

Timestamp:

10/13/2026 10:00:51 AM (2 weeks ago)

Author:

shiponkarmakar

Message:

Release v1.1.0

File:

• optimazz/trunk/includes/Modules/Fonts/FontsModule.php (modified) (7 diffs)

optimazz/trunk/includes/Modules/Fonts/FontsModule.php

@@ -21 +21 @@
 
 class FontsModule extends AbstractModule {
+
+        /**
+         * Whether parse_css2() repaired an invalid (CSS1-style) family request on
+         * the current page, so the rebuilt URL must be output even when nothing
+         * else changes.
+         *
+         * @var bool
+         */
+        private static $repaired = false;
 
         public function id() {
@@ -157 +166 @@
                         return $html;
                 }
+                self::$repaired = false;
 
                 $links    = array(); // Tags we will merge (in document order).
@@ -173 +183 @@
                         }
                         $query  = (string) wp_parse_url( html_entity_decode( $m[2], ENT_QUOTES ), PHP_URL_QUERY ); // decode first: "&" contains a "#" that would truncate the query.
+                        $was    = self::$repaired;
                         $parsed = 'css2' === strtolower( $m[3] ) ? self::parse_css2( $query ) : self::parse_css1( $query );
                         if ( null === $parsed ) {
+                                self::$repaired = $was; // This link is left as-is, so nothing was repaired.
                                 continue; // unsupported form — keep as-is.
                         }
@@ -197 +209 @@
                 }
                 $trim = (bool) $this->option( 'trim_weights', true );
-                // One link and nothing to trim — nothing to gain.
-                if ( 1 === count( $links ) && ! $trim ) {
+                $disp = '' !== $display ? $display : $orig_display;
+                // Non-blocking load only with swap / fallback. Those swap the font in
+                // anyway; 'optional' is chosen for zero layout shift, and loading its
+                // stylesheet late would make a cached font swap in after first paint.
+                $async = in_array( $disp, array( 'swap', 'fallback' ), true ) && $this->option( 'async_google', true );
+                // One link, nothing to trim, nothing repaired and no async loading —
+                // rebuilding the URL would gain nothing (and would drop its other
+                // attributes and parameters).
+                if ( 1 === count( $links ) && ! $trim && ! $async && ! self::$repaired ) {
                         return $html;
                 }
@@ -208 +227 @@
                         $params[] = 'family=' . str_replace( '%20', '+', rawurlencode( $name ) ) . self::css2_axis( $spec, $used );
                 }
-                $disp = '' !== $display ? $display : $orig_display;
                 if ( '' !== $disp ) {
                         $params[] = 'display=' . $disp;
                 }
-                $url = 'https://fonts.googleapis.com/css2?' . implode( '&', $params );
-                // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet -- rewriting existing output-buffer markup, not enqueueing.
-                $new = '<link rel="stylesheet" id="optimazz-google-fonts" href="' . esc_url( $url ) . '" media="all">';
+                $url  = esc_url( 'https://fonts.googleapis.com/css2?' . implode( '&', $params ) );
+                // phpcs:disable WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet -- rewriting existing output-buffer markup, not enqueueing.
+                if ( $async ) {
+                        // With swap/fallback the text renders in a fallback font first
+                        // anyway, so the font stylesheet need not block the page: on
+                        // mobile it otherwise holds back the first paint by the full round
+                        // trip to Google. Preload it, apply it when loaded, and keep a
+                        // <noscript> copy for visitors without JavaScript.
+                        $new = '<link rel="preload" as="style" href="' . $url . '">'
+                                . '<link rel="stylesheet" id="optimazz-google-fonts" href="' . $url . '" media="print" onload="this.media=\'all\'">'
+                                . '<noscript><link rel="stylesheet" href="' . $url . '"></noscript>';
+                } else {
+                        $new = '<link rel="stylesheet" id="optimazz-google-fonts" href="' . $url . '" media="all">';
+                }
+                // phpcs:enable WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 
                 // Swap the first link for the merged one; remove the rest (each once).
@@ -252 +282 @@
                                         continue;
                                 }
-                                $spec = array( 'normal' => array(), 'italic' => array(), 'raw' => null );
-                                $vars = isset( $parts[1] ) ? explode( ',', $parts[1] ) : array( '400' );
-                                foreach ( $vars as $v ) {
-                                        $v = strtolower( trim( $v ) );
-                                        if ( '' === $v ) {
-                                                continue;
-                                        }
-                                        $v    = strtr( $v, array( 'regular' => '400', 'bold' => '700' ) );
-                                        $ital = (bool) preg_match( '/(italic|i)$/', $v );
-                                        $w    = (int) preg_replace( '/\D/', '', $v );
-                                        $w    = $w ? $w : 400; // bare "italic".
-                                        if ( $w < 100 || $w > 900 ) {
-                                                continue;
-                                        }
-                                        $spec[ $ital ? 'italic' : 'normal' ][ $w ] = 1;
-                                }
-                                if ( empty( $spec['normal'] ) && empty( $spec['italic'] ) ) {
-                                        $spec['normal'][400] = 1;
-                                }
-                                $out[ $name ] = $spec;
+                                $out[ $name ] = self::parse_variants( isset( $parts[1] ) ? $parts[1] : '400' );
                         }
                 }
                 return $out ? $out : null;
+        }
+
+        /**
+         * Parse a CSS1-style variant list ("400,700i,bold,italic") into a spec.
+         *
+         * @param string $list Comma-separated variants.
+         * @return array{normal:array,italic:array,raw:null}
+         */
+        private static function parse_variants( $list ) {
+                $spec = array( 'normal' => array(), 'italic' => array(), 'raw' => null );
+                foreach ( explode( ',', $list ) as $v ) {
+                        $v = strtolower( trim( $v ) );
+                        if ( '' === $v ) {
+                                continue;
+                        }
+                        $v    = strtr( $v, array( 'regular' => '400', 'bold' => '700' ) );
+                        $ital = (bool) preg_match( '/(italic|i)$/', $v );
+                        $w    = (int) preg_replace( '/\D/', '', $v );
+                        $w    = $w ? $w : 400; // bare "italic".
+                        if ( $w < 100 || $w > 900 ) {
+                                continue;
+                        }
+                        $spec[ $ital ? 'italic' : 'normal' ][ $w ] = 1;
+                }
+                if ( empty( $spec['normal'] ) && empty( $spec['italic'] ) ) {
+                        $spec['normal'][400] = 1;
+                }
+                return $spec;
         }
 
@@ -314 +353 @@
                                         $spec['normal'][ (int) $w ] = 1;
                                 }
+                        } elseif ( preg_match( '/^(?:w?\d{3}i?|regular|bold|italic|bolditalic|\d{3}italic)(?:,(?:w?\d{3}i?|regular|bold|italic|bolditalic|\d{3}italic))*$/i', trim( $parts[1] ) ) ) {
+                                // Old CSS1-style weights ("400,700", or the "w400,700" some themes
+                                // print) sent to the CSS2 API. Google rejects these with HTTP 400, so
+                                // the font never loads while the broken stylesheet still blocks
+                                // rendering. Read them the CSS1 way so a valid request is built.
+                                $spec           = self::parse_variants( str_ireplace( 'w', '', $parts[1] ) );
+                                self::$repaired = true;
                         } else {
                                 $spec['raw'] = $parts[1]; // variable ranges / other axes — keep verbatim.