Changeset 3453927

Timestamp:

02/04/2026 04:02:07 PM (13 days ago)

Author:

mreishus

Message:

Update Page Optimize to 0.6.0

Location:

page-optimize/trunk

Files:

• concat-css.php (modified) (7 diffs)
• page-optimize.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• service.php (modified) (3 diffs)

page-optimize/trunk/concat-css.php

@@ -36 +36 @@
     }
 
+    protected function has_inline_style( $handle ) {
+        $after_output = $this->get_data( $handle, 'after' );
+        if ( ! empty( $after_output ) ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    protected function css_has_import( $path ) {
+        static $cache = array();
+
+        if ( empty( $path ) ) {
+            return false;
+        }
+
+        $key = $path;
+
+        if ( array_key_exists( $key, $cache ) ) {
+            return $cache[ $key ];
+        }
+
+        $fh = @fopen( $path, 'rb' );
+        if ( ! $fh ) {
+            $cache[ $key ] = false;
+            return false;
+        }
+
+        $found = false;
+        $tail  = '';
+
+        // Scan in chunks to keep memory bounded for large stylesheets.
+        while ( ! feof( $fh ) ) {
+            $chunk = fread( $fh, 32768 );
+            if ( false === $chunk || '' === $chunk ) {
+                break;
+            }
+
+            $haystack = $tail . $chunk;
+            if ( false !== stripos( $haystack, '@import' ) ) {
+                $found = true;
+                break;
+            }
+
+            // Keep a short overlap so "@import" across chunk boundaries isn't missed.
+            $tail = substr( $haystack, -7 );
+        }
+
+        fclose( $fh );
+
+        $cache[ $key ] = $found;
+        return $found;
+    }
+
     function do_items( $handles = false, $group = false ) {
         $handles = false === $handles ? $this->queue : (array) $handles;
@@ -43 +97 @@
         $this->all_deps( $handles );
 
-        $stylesheet_group_index = 0;
-        // Merge CSS into a single file
-        $concat_group = 'concat';
-        // Concat group on top (first array element gets processed earlier)
-        $stylesheets[ $concat_group ] = array();
+        $concat_group = null;
 
         foreach ( $this->to_do as $key => $handle ) {
+            $css_realpath = null;
+            // 1a. Skip invalid dependencies.
+            if ( ! isset( $this->registered[ $handle ] ) ) {
+                unset( $this->to_do[ $key ] );
+                continue;
+            }
+
             $obj = $this->registered[ $handle ];
+
+            // 1b. Skip virtual (src-less) dependencies.
+            if ( empty( $obj->src ) ) {
+                if ( null !== $concat_group ) {
+                    $stylesheets[] = $concat_group;
+                    $concat_group = null;
+                }
+
+                $stylesheets[] = array(
+                    'type'   => 'do_item',
+                    'handle' => $handle,
+                );
+                unset( $this->to_do[ $key ] );
+                continue;
+            }
+
             $obj->src = apply_filters( 'style_loader_src', $obj->src, $obj->handle );
 
@@ -61 +134 @@
             }
 
-            $css_url_parsed = parse_url( $obj->src );
+            $css_url_parsed = parse_url( $css_url );
+            $css_path = ( is_array( $css_url_parsed ) && isset( $css_url_parsed['path'] ) ) ? $css_url_parsed['path'] : '';
             $extra = $obj->extra;
+
+            // 2. Determine if this stylesheet can be concatenated.
 
             // Don't concat by default
@@ -68 +144 @@
 
             // Only try to concat static css files
-            if ( false !== strpos( $css_url_parsed['path'], '.css' ) ) {
+            if ( $css_path && false !== strpos( $css_path, '.css' ) ) {
                 $do_concat = true;
             } else {
@@ -124 +200 @@
 
             // Allow plugins to disable concatenation of certain stylesheets.
-            if ( $do_concat && ! apply_filters( 'css_do_concat', $do_concat, $handle ) ) {
+            $filtered_concat = apply_filters( 'css_do_concat', $do_concat, $handle );
+            if ( $do_concat && ! $filtered_concat ) {
                 if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
                     echo sprintf( "\n<!-- No Concat CSS %s => Filtered `false` -->\n", esc_html( $handle ) );
                 }
             }
-            $do_concat = apply_filters( 'css_do_concat', $do_concat, $handle );
-
+            $do_concat = $filtered_concat;
+
+            /**
+             * 3. Add to the stylesheets output list.
+             *
+             * We keep a running $concat_group that accumulates consecutive concat-eligible styles
+             * sharing the same media type. The group is finalized and appended to $stylesheets when:
+             *   - A non-concat style appears
+             *   - The media type changes
+             *   - An inline style is attached to the current style
+             * This makes sure output order matches registration order.
+             **/
             if ( true === $do_concat ) {
                 $media = $obj->args;
@@ -137 +224 @@
                 }
 
-                $stylesheets[ $concat_group ][ $media ][ $handle ] = $css_url_parsed['path'];
+                // Media type changed - finish the current group.
+                if ( null !== $concat_group && $concat_group['media'] !== $media ) {
+                    $stylesheets[] = $concat_group;
+                    $concat_group = null;
+                }
+
+                // If a non-first stylesheet in a group contains @import, the concat service hoists it,
+                // reordering CSS. Split groups so @import stylesheets are always first in their group.
+                if (
+                    null !== $concat_group
+                    && ! empty( $css_realpath )
+                    && $this->css_has_import( $css_realpath )
+                ) {
+                    $stylesheets[] = $concat_group;
+                    $concat_group = null;
+                }
+
+                // Start a new group if needed.
+                if ( null === $concat_group ) {
+                    $concat_group = array(
+                        'type'    => 'concat',
+                        'media'   => $media,
+                        'paths'   => array(),
+                        'handles' => array(),
+                    );
+                }
+
+                // Add this stylesheet to the current group.
+                $concat_group['paths'][] = $css_path;
+                $concat_group['handles'][] = $handle;
                 $this->done[] = $handle;
+
+                // Inline styles must print right after their <link>, so break the group
+                // because we can't concat directly anything after this CSS.
+                if ( $this->has_inline_style( $handle ) ) {
+                    $stylesheets[] = $concat_group;
+                    $concat_group = null;
+                }
             } else {
-                $stylesheet_group_index ++;
-                $stylesheets[ $stylesheet_group_index ]['noconcat'][] = $handle;
-                $stylesheet_group_index ++;
+                // Non-concat item - finish any current open group to preserve order.
+                if ( null !== $concat_group ) {
+                    $stylesheets[] = $concat_group;
+                    $concat_group = null;
+                }
+                // Add the non-concat item.
+                $stylesheets[] = array(
+                    'type'   => 'do_item',
+                    'handle' => $handle,
+                );
             }
             unset( $this->to_do[ $key ] );
         }
 
-        foreach ( $stylesheets as $idx => $stylesheets_group ) {
-            foreach ( $stylesheets_group as $media => $css ) {
-                if ( 'noconcat' == $media ) {
-                    foreach ( $css as $handle ) {
-                        if ( $this->do_item( $handle, $group ) ) {
-                            $this->done[] = $handle;
-                        }
-                    }
-                    continue;
-                } elseif ( count( $css ) > 1 ) {
+        if ( null !== $concat_group ) {
+            $stylesheets[] = $concat_group;
+        }
+
+        foreach ( $stylesheets as $css_array ) {
+            if ( 'do_item' === $css_array['type'] ) {
+                if ( $this->do_item( $css_array['handle'], $group ) ) {
+                    $this->done[] = $css_array['handle'];
+                }
+            } elseif ( 'concat' === $css_array['type'] && isset( $css_array['paths'] ) ) {
+                $media = $css_array['media'];
+                $css = $css_array['paths'];
+                $handles = $css_array['handles'];
+
+                if ( count( $css ) > 1 ) {
                     $fs_paths = array();
                     foreach ( $css as $css_uri_path ) {
@@ -179 +314 @@
                     $href = $siteurl . "/_static/??" . $path_str;
                 } else {
-                    $href = Page_Optimize_Utils::cache_bust_mtime( current( $css ), $siteurl );
-                }
-
-                $handles = array_keys( $css );
+                    $href = Page_Optimize_Utils::cache_bust_mtime( $css[0], $siteurl );
+                }
+
                 $css_id = "$media-css-" . md5( $href );
                 if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-                    echo apply_filters( 'page_optimize_style_loader_tag', "<link data-handles='" . esc_attr( implode( ',', $handles ) ) . "' rel='stylesheet' id='$css_id' href='$href' type='text/css' media='$media' />\n", $handles, $href, $media );
+                    $tag = "<link data-handles='" . esc_attr( implode( ',', $handles ) ) . "' rel='stylesheet' id='$css_id' href='$href' type='text/css' media='$media' />\n";
                 } else {
-                    echo apply_filters( 'page_optimize_style_loader_tag', "<link rel='stylesheet' id='$css_id' href='$href' type='text/css' media='$media' />\n", $handles, $href, $media );
-                }
-                array_map( array( $this, 'print_inline_style' ), array_keys( $css ) );
+                    $tag = "<link rel='stylesheet' id='$css_id' href='$href' type='text/css' media='$media' />\n";
+                }
+
+                $tag = apply_filters( 'page_optimize_style_loader_tag', $tag, $handles, $href, $media );
+
+                if ( is_array( $handles ) && count( $handles ) === 1 ) {
+                    $tag = apply_filters( 'style_loader_tag', $tag, $handles[0], $href, $media );
+                }
+
+                echo $tag;
+                array_map( array( $this, 'print_inline_style' ), $handles );
             }
         }

page-optimize/trunk/page-optimize.php

@@ -5 +5 @@
 Description: Optimizes JS and CSS for faster page load and render in the browser.
 Author: Automattic
-Version: 0.5.8
+Version: 0.6.0
 Author URI: http://automattic.com/
 */

page-optimize/trunk/readme.txt

@@ -1 +1 @@
 === Page Optimize ===
-Contributors: aidvu, bjorsch, bpayton, rcrdortiz
+Contributors: aidvu, bjorsch, bpayton, mreishus, rcrdortiz
 Tags: performance
 Requires at least: 5.3
 Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 0.5.8
+Stable tag: 0.6.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -48 +48 @@
 * `load-mode-js` controls how non-critical JavaScript are loaded. Values: 'defer' for [deferred](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script#attr-defer), 'async' for [async loading](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script#attr-async), any other value indicates the feature should be disabled.
 
+= PHPUnit (Docker) =
+
+You can run the PHPUnit tests locally using Docker (no local MySQL required).
+
+First time (or after changing DB credentials):
+
+`docker compose down -v`
+
+Run tests:
+
+`docker compose up --build --abort-on-container-exit --exit-code-from tests`
+
+Optional overrides (examples):
+
+* `WP_VERSION=6.5 docker compose up --build --abort-on-container-exit --exit-code-from tests`
+* `PHPUNIT_VERSION=9.6.20 docker compose up --build --abort-on-container-exit --exit-code-from tests`
+
 == Changelog ==
+
+= 0.6.0 =
+* Fix: Preserve stylesheet enqueue/document order when concatenating CSS. Concat-eligible styles are now emitted as sequential runs and split around non-concatenated items (e.g. external/excluded/dynamic URLs), media changes, RTL handling, and other boundaries.
+* Fix: Inline styles (wp_add_inline_style) now print immediately after their parent stylesheet, including when styles are concatenated.
+* Fix: Apply core's style_loader_tag filter when a concatenation run contains only a single stylesheet (matching core behavior and the JS-side fix from 0.5.0).
+* Fix: The css_do_concat filter is now evaluated once per handle.
+* Fix: The concat service no longer drops @import directives due to a closure scoping bug. (@charset/@import handling now runs against the intended pre-output buffer.)
+* Fix: Stylesheets containing @import now start a new concat run so service-side @import hoisting cannot reorder imports ahead of earlier stylesheets.
+* Fix: Treat @import and @charset as case‑insensitive when building concatenated CSS, preventing missed rules in some stylesheets.
 
 = 0.5.8 =

page-optimize/trunk/service.php

@@ -202 +202 @@
 
             // The @charset rules must be on top of the output
-            if ( 0 === strpos( $buf, '@charset' ) ) {
-                preg_replace_callback(
+            if ( 0 === stripos( $buf, '@charset' ) ) {
+                $buf = preg_replace_callback(
                     '/(?P<charset_rule>@charset\s+[\'"][^\'"]+[\'"];)/i',
-                    function ( $match ) {
-                        global $pre_output;
-
-                        if ( 0 === strpos( (string) $pre_output, '@charset' ) ) {
+                    function ( $match ) use ( &$pre_output ) {
+
+                        if ( 0 === stripos( (string) $pre_output, '@charset' ) ) {
                             return '';
                         }
 
                         $pre_output = $match[0] . "\n" . $pre_output;
-
                         return '';
                     },
@@ -222 +220 @@
             // Move the @import rules on top of the concatenated output.
             // Only @charset rule are allowed before them.
-            if ( false !== strpos( $buf, '@import' ) ) {
+            if ( false !== stripos( $buf, '@import' ) ) {
                 $buf = preg_replace_callback(
                     '/(?P<pre_path>@import\s+(?:url\s*\()?[\'"\s]*)(?P<path>[^\'"\s](?:https?:\/\/.+\/?)?.+?)(?P<post_path>[\'"\s\)]*;)/i',
-                    function ( $match ) use ( $dirpath ) {
-                        global $pre_output;
-
-                        if ( 0 !== strpos( $match['path'], 'http' ) && '/' != $match['path'][0] ) {
+                    function ( $match ) use ( $dirpath, &$pre_output ) {
+
+                        if ( 0 !== stripos( $match['path'], 'http' ) && '/' != $match['path'][0] ) {
                             $pre_output .= $match['pre_path'] . ( $dirpath == '/' ? '/' : $dirpath . '/' ) .
                                            $match['path'] . $match['post_path'] . "\n";
@@ -326 +323 @@
 }
 
-page_optimize_service_request();
+if ( ! defined( 'PAGE_OPTIMIZE_SKIP_SERVICE_REQUEST' ) ) {
+    page_optimize_service_request();
+}