| @@ -185,9 +185,9 @@ | ||
| 185 | 185 | // so carry it — and everything else the late filter set in the |
| 186 | 186 | // same pass — over. A consumer reading the rendered HTML (or |
| 187 | 187 | // our own buffer passes) must still see the opt-out it asked |
| 188 | 188 | // for. |
| 189 | - $tag = self::copy_late_attributes( $tag, $pristine ); | |
| 189 | + $tag = self::copy_late_attributes( $tag, $pristine, $handle ); | |
| 190 | 190 | } |
| 191 | 191 | // The snapshot was taken on `script_loader_tag`, by which point |
| 192 | 192 | // `script_loader_src` (priority 10) had ALREADY swapped in the |
| 193 | 193 | // hashed cache URL — so reverting the tag alone still leaves the |
| @@ -230,9 +230,9 @@ | ||
| 230 | 230 | * |
| 231 | 231 | * @param string $from Tag as the late filter left it. |
| 232 | 232 | * @param string $to Snapshot tag to stamp onto. |
| 233 | 233 | */ |
| 234 | - private static function copy_late_attributes( string $from, string $to ): string { | |
| 234 | + private static function copy_late_attributes( string $from, string $to, string $handle ): string { | |
| 235 | 235 | $late_tags = self::open_tags( $from ); |
| 236 | 236 | $to_tags = self::open_tags( $to ); |
| 237 | 237 | if ( empty( $late_tags ) || empty( $to_tags ) || count( $late_tags ) !== count( $to_tags ) ) { |
| 238 | 238 | // Counts differ when a stamper/blocker injected or replaced a |
| @@ -254,9 +254,9 @@ | ||
| 254 | 254 | // later. (#469) |
| 255 | 255 | $out = $to; |
| 256 | 256 | // Right to left: an earlier splice would shift every later offset. |
| 257 | 257 | for ( $i = count( $to_tags ) - 1; $i >= 0; $i-- ) { |
| 258 | - $add = self::late_attribute_delta( $late_tags[ $i ]['attrs'], $to_tags[ $i ]['attrs'] ); | |
| 258 | + $add = self::late_attribute_delta( $late_tags[ $i ]['attrs'], $to_tags[ $i ]['attrs'], $handle ); | |
| 259 | 259 | if ( '' !== $add ) { |
| 260 | 260 | $out = substr_replace( $out, $add, $to_tags[ $i ]['attrs_end'], 0 ); |
| 261 | 261 | } |
| 262 | 262 | } |
| @@ -305,14 +305,25 @@ | ||
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | /** |
| 308 | 308 | * The attributes present on the late tag but not the snapshot, minus |
| 309 | - * the ones our own transforms add. | |
| 309 | + * the ones OUR transforms put there for this handle. | |
| 310 | 310 | * |
| 311 | + * Only attributes recorded in $our_late_attrs are dropped — a blanket | |
| 312 | + * defer/type skip threw away a defer the STAMPER set in the same pass | |
| 313 | + * as its marker. Themify prints main.js with defer + data-no-optimize | |
| 314 | + * together, and its config rides a deferred data: URI script printed | |
| 315 | + * just before it; stripping the theme's defer made main.js | |
| 316 | + * parser-blocking, so it ran ahead of its config and the theme died | |
| 317 | + * with "themify_vars is not defined". `src` is still never copied: | |
| 318 | + * it belongs to the snapshot, and restore_marked_script_src() owns | |
| 319 | + * undoing a minified URL. | |
| 320 | + * | |
| 311 | 321 | * @param string $late_attrs Attribute string from the transformed tag. |
| 312 | 322 | * @param string $to_attrs Attribute string from the snapshot tag. |
| 323 | + * @param string $handle Script handle the tags belong to. | |
| 313 | 324 | */ |
| 314 | - private static function late_attribute_delta( string $late_attrs, string $to_attrs ): string { | |
| 325 | + private static function late_attribute_delta( string $late_attrs, string $to_attrs, string $handle ): string { | |
| 315 | 326 | $pattern = '#\s([-\w:]+)(?:\s*=\s*(?:"[^"]*"|\'[^\']*\'|[^\s>]*))?#'; |
| 316 | 327 | if ( ! preg_match_all( $pattern, $late_attrs, $late, PREG_SET_ORDER ) ) { |
| 317 | 328 | return ''; |
| 318 | 329 | } |
| @@ -324,9 +335,9 @@ | ||
| 324 | 335 | } |
| 325 | 336 | $add = ''; |
| 326 | 337 | foreach ( $late as $attr ) { |
| 327 | 338 | $name = strtolower( $attr[1] ); |
| 328 | - if ( isset( $have[ $name ] ) || in_array( $name, self::OUR_TRANSFORM_ATTRS, true ) ) { | |
| 339 | + if ( isset( $have[ $name ] ) || 'src' === $name || isset( self::$our_late_attrs[ $handle ][ $name ] ) ) { | |
| 329 | 340 | continue; |
| 330 | 341 | } |
| 331 | 342 | if ( 0 === strpos( $name, 'data-xs-' ) ) { |
| 332 | 343 | continue; |
| @@ -336,21 +347,20 @@ | ||
| 336 | 347 | return $add; |
| 337 | 348 | } |
| 338 | 349 | |
| 339 | 350 | /** |
| 340 | - * Attributes our own transforms add. Copying any of these from the | |
| 341 | - * transformed tag back onto the snapshot would re-apply the very | |
| 342 | - * transform we are undoing: | |
| 351 | + * Attribute names OUR transforms added in this request, keyed by | |
| 352 | + * handle: defer_script_tag() records `defer`, delay_script_tag() | |
| 353 | + * records `type` when it parks an inline block. Copying one of these | |
| 354 | + * from the late tag back onto the snapshot would re-apply the very | |
| 355 | + * transform the revert is undoing — but the same names coming from a | |
| 356 | + * STAMPER are the author's intent and must survive, so the skip is | |
| 357 | + * per-handle, never by name alone. `data-xs-*` is handled by prefix | |
| 358 | + * separately. (#469) | |
| 343 | 359 | * |
| 344 | - * defer/async — defer_script_tag() | |
| 345 | - * type — delay_script_tag() parks an inline block as | |
| 346 | - * text/xspeed-delayed; a type the author set is on the | |
| 347 | - * snapshot already and matches by name before we get here | |
| 348 | - * src — belongs to the snapshot, never to the late tag | |
| 349 | - * | |
| 350 | - * `data-xs-*` is handled by prefix separately. (#469) | |
| 360 | + * @var array<string,array<string,true>> | |
| 351 | 361 | */ |
| 352 | - private const OUR_TRANSFORM_ATTRS = array( 'defer', 'async', 'type', 'src' ); | |
| 362 | + private static $our_late_attrs = array(); | |
| 353 | 363 | |
| 354 | 364 | /** |
| 355 | 365 | * Locate the opening `<script>` that carries the src, falling back to |
| 356 | 366 | * the last one when none does. |
| @@ -509,8 +519,12 @@ | ||
| 509 | 519 | // bundle's <script> tag intact so the dashboard mounts. |
| 510 | 520 | if ( self::skip_in_non_frontend_context() ) { |
| 511 | 521 | return $tag; |
| 512 | 522 | } |
| 523 | + // The author asked every optimizer to leave this tag alone. | |
| 524 | + if ( self::carries_optimizer_opt_out( $tag ) ) { | |
| 525 | + return $tag; | |
| 526 | + } | |
| 513 | 527 | if ( '' === (string) $src ) { |
| 514 | 528 | return $tag; |
| 515 | 529 | } |
| 516 | 530 | if ( self::is_excluded_script( (string) $handle, (string) $src ) ) { |
| @@ -544,9 +558,15 @@ | ||
| 544 | 558 | // dependent that touches a global its dependency defines. (#234) |
| 545 | 559 | // |
| 546 | 560 | // The lookahead scans only within the tag (`[^>]*`) for ` src=`, so |
| 547 | 561 | // an inline `<script id="…-js-before">` can never match. |
| 548 | - return (string) preg_replace( '#<script\b(?=[^>]*\ssrc\s*=)#i', '<script defer="defer"', $tag, 1 ); | |
| 562 | + $deferred = (string) preg_replace( '#<script\b(?=[^>]*\ssrc\s*=)#i', '<script defer="defer"', $tag, 1 ); | |
| 563 | + if ( $deferred !== $tag ) { | |
| 564 | + // Remember that THIS defer is ours, so the late opt-out revert | |
| 565 | + // drops it — and only it, never a stamper's own defer. | |
| 566 | + self::$our_late_attrs[ (string) $handle ]['defer'] = true; | |
| 567 | + } | |
| 568 | + return $deferred; | |
| 549 | 569 | } |
| 550 | 570 | |
| 551 | 571 | /** |
| 552 | 572 | * Filter: `script_loader_tag` — rewrite src= to data-xs-src= so the |
| @@ -565,11 +585,15 @@ | ||
| 565 | 585 | } |
| 566 | 586 | if ( self::skip_in_non_frontend_context() ) { |
| 567 | 587 | return $tag; |
| 568 | 588 | } |
| 569 | - if ( self::is_excluded_script( (string) $handle, (string) $src ) ) { | |
| 589 | + // The author asked every optimizer to leave this tag alone. | |
| 590 | + if ( self::carries_optimizer_opt_out( $tag ) ) { | |
| 570 | 591 | return $tag; |
| 571 | 592 | } |
| 593 | + if ( self::is_excluded_script( (string) $handle, (string) $src, true ) ) { | |
| 594 | + return $tag; | |
| 595 | + } | |
| 572 | 596 | // The tag itself asked to be left alone. (#456) |
| 573 | 597 | if ( self::tag_opts_out( $tag ) ) { |
| 574 | 598 | return $tag; |
| 575 | 599 | } |
| @@ -584,9 +608,16 @@ | ||
| 584 | 608 | // the moment jquery-core is delayed. A handle the user NAMED in |
| 585 | 609 | // delay_js_targets is still delayed — an explicit entry is the user |
| 586 | 610 | // saying they know the inline consumer is safe to break or absent. |
| 587 | 611 | if ( isset( self::inline_bound_handles()[ (string) $handle ] ) |
| 588 | - && ! self::is_user_named_target( (string) $handle, (string) $src ) ) { | |
| 612 | + && ! self::is_user_named_target( (string) $handle, (string) $src ) | |
| 613 | + // Smart Delay inverts this protection: the handle is delayed and | |
| 614 | + // its own before/after snippets are parked WITH it (see | |
| 615 | + // park_smart_inline()), so the consumer no longer runs against a | |
| 616 | + // missing global — it replays after its provider, in page order. | |
| 617 | + // On a builder page nearly every script is inline-bound, which is | |
| 618 | + // why delay-all without this delayed almost nothing. | |
| 619 | + && ! self::smart_delay_enabled() ) { | |
| 589 | 620 | return $tag; |
| 590 | 621 | } |
| 591 | 622 | // A non-executable type means this tag is data, or is being held by |
| 592 | 623 | // somebody else on purpose. The buffer pass has always checked this; |
| @@ -629,9 +660,9 @@ | ||
| 629 | 660 | // would win over a marker appended behind it and keep executing. |
| 630 | 661 | // A non-default original type is stashed in data-xs-type so the |
| 631 | 662 | // bootstrap can restore it on replay (#274 — type is what a script |
| 632 | 663 | // IS; a parked `type="module"` must come back as a module). |
| 633 | - $tag = (string) preg_replace_callback( | |
| 664 | + $parked = (string) preg_replace_callback( | |
| 634 | 665 | '#<script\b([^>]*)>#i', |
| 635 | 666 | static function ( array $m ): string { |
| 636 | 667 | return '<script' . self::park_type_attrs( $m[1] ) . '>'; |
| 637 | 668 | }, |
| @@ -637,9 +668,14 @@ | ||
| 637 | 668 | }, |
| 638 | 669 | $tag, |
| 639 | 670 | 1 |
| 640 | 671 | ); |
| 641 | - return $tag; | |
| 672 | + if ( $parked !== $tag ) { | |
| 673 | + // The parked type is ours to drop on a late opt-out revert; an | |
| 674 | + // author-set type sits on the snapshot and survives regardless. | |
| 675 | + self::$our_late_attrs[ (string) $handle ]['type'] = true; | |
| 676 | + } | |
| 677 | + return $parked; | |
| 642 | 678 | } |
| 643 | 679 | |
| 644 | 680 | /** |
| 645 | 681 | * Script types the buffer pass must never touch. `<script>` carries |
| @@ -647,8 +683,104 @@ | ||
| 647 | 683 | * consumers, importmaps must resolve before any module runs, and our |
| 648 | 684 | * own delayed-inline marker is already handled by the bootstrap. |
| 649 | 685 | * Rewriting any of these breaks the page or its metadata. |
| 650 | 686 | */ |
| 687 | + /** | |
| 688 | + * Attributes by which a script's own author tells optimizers to stand down. | |
| 689 | + * | |
| 690 | + * The report behind #275 also asked us to leave a script alone when its | |
| 691 | + * author "already marked it to load late". Read literally that means | |
| 692 | + * `defer`/`async`, and that reading is wrong twice over: `defer` is | |
| 693 | + * stamped onto every enqueued script by our OWN Defer JS filter at | |
| 694 | + * priority 20, before Delay JS sees it at 30 — so honouring it would | |
| 695 | + * switch Delay JS off entirely on sites running both — and `async` is the | |
| 696 | + * shape of gtag, GTM and every pixel loader, which is precisely the | |
| 697 | + * payload Delay JS exists to postpone. `defer`/`async` say WHEN TO FETCH, | |
| 698 | + * not "leave me alone". | |
| 699 | + * | |
| 700 | + * These attributes do say it. Each is an established opt-out honoured by | |
| 701 | + * another optimizer — WP Rocket, LiteSpeed, Autoptimize, NitroPack, | |
| 702 | + * Jetpack Boost — so an author who prints one has already declared that | |
| 703 | + * no optimizer should touch this tag. Consent banners are the main | |
| 704 | + * beneficiary, but the rule is general and needs neither a handle nor a | |
| 705 | + * recognised URL, so it works identically on both passes. | |
| 706 | + * | |
| 707 | + * Two deliberate omissions: | |
| 708 | + * | |
| 709 | + * - `data-cfasync="false"` is a Cloudflare Rocket Loader opt-out, and | |
| 710 | + * ad stacks (Mediavine, Ezoic, AdThrive) print it on exactly the | |
| 711 | + * heavy loaders a site turns Delay JS on for. Honouring it would | |
| 712 | + * un-delay the ads. | |
| 713 | + * - `data-no-minify` is about minification, not execution timing. | |
| 714 | + */ | |
| 715 | + private const OPT_OUT_ATTRIBUTES = array( | |
| 716 | + 'nowprocket', // WP Rocket | |
| 717 | + 'data-nowprocket', // WP Rocket | |
| 718 | + 'data-no-optimize', // LiteSpeed | |
| 719 | + 'data-noptimize', // Autoptimize | |
| 720 | + 'data-no-defer', // used by several optimizers | |
| 721 | + 'nitro-exclude', // NitroPack | |
| 722 | + 'data-jetpack-boost', // Jetpack Boost (value "ignore") | |
| 723 | + 'data-wpmeteor-nooptimize', // WP Meteor | |
| 724 | + 'data-xs-nodelay', // ours | |
| 725 | + ); | |
| 726 | + | |
| 727 | + /** | |
| 728 | + * Does this tag carry an explicit "optimizers keep out" attribute? | |
| 729 | + * | |
| 730 | + * Same `(?<![-\w])` lookbehind the rest of this file uses, so | |
| 731 | + * `data-nowprocket` does not also satisfy a bare `nowprocket` lookup, and | |
| 732 | + * a trailing `\b` so `data-no-defer` does not match `data-no-deferral`. | |
| 733 | + * Bare and valued forms both count: an author writes `nowprocket`, | |
| 734 | + * `nowprocket=""` and `data-noptimize="1"` interchangeably. | |
| 735 | + * | |
| 736 | + * @param string $tag Full opening tag. | |
| 737 | + */ | |
| 738 | + private static function carries_optimizer_opt_out( string $tag ): bool { | |
| 739 | + // Read ATTRIBUTE NAMES, not the tag as a string. A substring scan | |
| 740 | + // matched `src="https://cdn/nowprocket/loader.js"`, `?nowprocket=1`, | |
| 741 | + // `class="nowprocket"` and any inline body that merely mentioned one | |
| 742 | + // of these names -- each silently un-delaying a script that should | |
| 743 | + // have been delayed. | |
| 744 | + // | |
| 745 | + // EVERY opening tag is checked, not just the first. On the enqueue | |
| 746 | + // path WP_Scripts::do_item() hands us translations + before-inline + | |
| 747 | + // the real tag + after-inline concatenated, so the first `<script` | |
| 748 | + // is often an inline block and the author's opt-out sits on the | |
| 749 | + // external tag behind it. Reading only the first tag missed it and | |
| 750 | + // delayed the script anyway -- the wrong direction: a consent banner | |
| 751 | + // its author told optimizers to leave alone would not appear. | |
| 752 | + // | |
| 753 | + // The tag regex is quote-aware because `[^>]*>` stops at a `>` inside | |
| 754 | + // a quoted value, and consent managers routinely ship JSON in a | |
| 755 | + // data-* attribute. | |
| 756 | + if ( ! preg_match_all( '#<script\b(?:[^>"\']|"[^"]*"|\'[^\']*\')*>#is', $tag, $tags ) ) { | |
| 757 | + return false; | |
| 758 | + } | |
| 759 | + | |
| 760 | + foreach ( $tags[0] as $open ) { | |
| 761 | + // Walk name/value pairs. The name pattern is deliberately | |
| 762 | + // permissive: a name we cannot recognise (Alpine's `@load`, say) | |
| 763 | + // must still consume ITS OWN VALUE, or the value gets scanned as | |
| 764 | + // if it were more attribute names. | |
| 765 | + if ( ! preg_match_all( | |
| 766 | + '#\s+([^\s=/>]+)(?:\s*=\s*(?:"[^"]*"|\'[^\']*\'|[^\s>]*))?#s', | |
| 767 | + substr( $open, 7, -1 ), | |
| 768 | + $found | |
| 769 | + ) ) { | |
| 770 | + continue; | |
| 771 | + } | |
| 772 | + | |
| 773 | + foreach ( $found[1] as $name ) { | |
| 774 | + if ( in_array( strtolower( $name ), self::OPT_OUT_ATTRIBUTES, true ) ) { | |
| 775 | + return true; | |
| 776 | + } | |
| 777 | + } | |
| 778 | + } | |
| 779 | + | |
| 780 | + return false; | |
| 781 | + } | |
| 782 | + | |
| 651 | 783 | private const NON_EXECUTABLE_TYPES = array( |
| 652 | 784 | 'application/ld+json', |
| 653 | 785 | 'application/json', |
| 654 | 786 | 'importmap', |
| @@ -782,10 +914,21 @@ | ||
| 782 | 914 | if ( false !== stripos( $tag, 'data-xs-delay' ) || false !== stripos( $tag, 'data-xs-src' ) ) { |
| 783 | 915 | return $tag; |
| 784 | 916 | } |
| 785 | 917 | |
| 786 | - // The tag itself asked to be left alone. (#456) | |
| 787 | - if ( self::tag_opts_out( $tag ) ) { | |
| 918 | + // The author asked every optimizer to leave this tag alone. | |
| 919 | + // Checked before src/type: it needs neither, so an | |
| 920 | + // un-enqueued banner printed straight into wp_head is | |
| 921 | + // covered the same as an enqueued one. | |
| 922 | + // | |
| 923 | + // Both checks, because they disagree on purpose and either | |
| 924 | + // saying "leave it" is the safe answer. tag_opts_out() is | |
| 925 | + // dev's (#456) and also drives the late re-check at #469; | |
| 926 | + // carries_optimizer_opt_out() reads attribute NAMES across | |
| 927 | + // every opening tag, so it is not fooled by a marker sitting | |
| 928 | + // inside a quoted value or an inline body, and it knows the | |
| 929 | + // other optimizers' markers. | |
| 930 | + if ( self::tag_opts_out( $tag ) || self::carries_optimizer_opt_out( $tag ) ) { | |
| 788 | 931 | return $tag; |
| 789 | 932 | } |
| 790 | 933 | |
| 791 | 934 | // No src → inline code. The enqueue path owns those; a |
| @@ -811,37 +954,48 @@ | ||
| 811 | 954 | return $tag; |
| 812 | 955 | } |
| 813 | 956 | } |
| 814 | 957 | |
| 815 | - // Recover the handle from the tag's id before deciding. | |
| 958 | + // An ENQUEUED script reaches this sweep too: the enqueue-path | |
| 959 | + // filter leaves an EXCLUDED tag unmarked, and unmarked is all | |
| 960 | + // this pass can see. Judging it on its URL alone re-delays the | |
| 961 | + // very script the exclusion protected — and a handle is not | |
| 962 | + // generally in its own URL, which is the shape Complianz | |
| 963 | + // (`cmplz-cookiebanner`), NotificationX (`notificationx-public`) | |
| 964 | + // and jQuery (`jquery-core`) all have. A site with jquery-core | |
| 965 | + // excluded still shipped jQuery delayed, and every inline | |
| 966 | + // `jQuery(...)` on the page threw "jQuery is not defined". | |
| 967 | + // WordPress prints `id="<handle>-js"` on every enqueued | |
| 968 | + // script, so the handle is right there in the tag. (#275) | |
| 816 | 969 | // |
| 817 | - // This pass used to pass '' as the handle, on the reasoning | |
| 818 | - // that a tag reaching the buffer was never enqueued and so has | |
| 819 | - // none. That holds for the third-party snippets this pass | |
| 820 | - // exists for — but NOT for enqueued scripts, which also travel | |
| 821 | - // through here, and which WordPress prints with | |
| 822 | - // `id="<handle>-js"`. Passing '' meant every handle-based | |
| 823 | - // exclusion was silently inert at this layer: the user writes | |
| 824 | - // `jquery-core`, the enqueue path honours it, and then the | |
| 825 | - // buffer pass — which only ever compared URLs — delayed the | |
| 826 | - // very script the list was protecting. | |
| 970 | + // The lookbehind matters: `data-id="cmplz-cookiebanner-js"` is | |
| 971 | + // somebody's own attribute, not the handle, and reading it as | |
| 972 | + // one would shield a script nobody excluded. | |
| 827 | 973 | // |
| 828 | - // That is how a site with jquery-core AND jquery-migrate | |
| 829 | - // excluded still shipped jQuery delayed while migrate loaded | |
| 830 | - // normally, and every inline `jQuery(...)` on the page threw | |
| 831 | - // "jQuery is not defined". The two behaved differently for no | |
| 832 | - // reason a user could see, which is what made it look like a | |
| 833 | - // matching quirk rather than a whole layer ignoring the list. | |
| 974 | + // Merge note for #374: if a URL->handle map built from | |
| 975 | + // wp_scripts() lands first, resolve through that and keep | |
| 976 | + // this as the FALLBACK rather than replacing it. The map is | |
| 977 | + // keyed on the REGISTERED src, and Minifier::rewrite_script() | |
| 978 | + // rewrites a local script's URL to a hashed /cache/xspeed/min/ | |
| 979 | + // path at output time -- which is why remember_original_src() | |
| 980 | + // exists. So with minify_js on, the map misses every minified | |
| 981 | + // script and an excluded one would be re-delayed here. The | |
| 982 | + // `id` survives that rewrite. | |
| 834 | 983 | $tag_handle = ''; |
| 835 | - if ( preg_match( '#\sid\s*=\s*(["\'])(.*?)\1#i', $tag, $id_m ) ) { | |
| 984 | + if ( preg_match( '#(?<![-\w])id\s*=\s*(["\'])(.*?)\1#is', $tag, $id_m ) ) { | |
| 836 | 985 | // WP appends `-js`; anything else is somebody's own id and |
| 837 | 986 | // is still worth matching literally. |
| 838 | - $tag_handle = (string) preg_replace( '/-js$/', '', $id_m[2] ); | |
| 987 | + $tag_handle = (string) preg_replace( '/-js$/', '', trim( $id_m[2] ) ); | |
| 839 | 988 | } |
| 840 | 989 | |
| 841 | - if ( self::is_excluded_script( $tag_handle, $src ) ) { | |
| 990 | + if ( self::is_excluded_script( $tag_handle, $src, true ) ) { | |
| 842 | 991 | return $tag; |
| 843 | 992 | } |
| 993 | + // The handle is passed to the target test as well, so naming a | |
| 994 | + // handle in the delay list behaves the same here as it does on | |
| 995 | + // the enqueue path. The two layers disagreeing on what a target | |
| 996 | + // means is what made this look like a matching quirk rather | |
| 997 | + // than a whole layer ignoring the list. | |
| 844 | 998 | if ( ! self::is_delay_target( $tag_handle, $src ) ) { |
| 845 | 999 | return $tag; |
| 846 | 1000 | } |
| 847 | 1001 | // Mirror of the enqueue-path guard: a handle that inline code |
| @@ -946,8 +1100,17 @@ | ||
| 946 | 1100 | if ( false !== stripos( $body, 'document.write' ) ) { |
| 947 | 1101 | return $whole; |
| 948 | 1102 | } |
| 949 | 1103 | |
| 1104 | + // Our own inline scripts, by the id they are printed with. | |
| 1105 | + // The src passes get this for free from the handle prefix, | |
| 1106 | + // but here the handle is '' — and the facade observer's body | |
| 1107 | + // names youtube/vimeo, so a user target like "youtube" would | |
| 1108 | + // park the very script that makes those embeds cheap. | |
| 1109 | + if ( preg_match( '#(?<![-\w])id\s*=\s*(["\'])xspeed-#i', $attrs ) ) { | |
| 1110 | + return $whole; | |
| 1111 | + } | |
| 1112 | + | |
| 950 | 1113 | // The body stands in for the URL in the lists the src passes |
| 951 | 1114 | // consult — but NOT via is_delay_target(), whose empty-list |
| 952 | 1115 | // default is "delay everything". That default is right for a |
| 953 | 1116 | // tag with a URL and catastrophic here: it would park every |
| @@ -953,10 +1116,13 @@ | ||
| 953 | 1116 | // tag with a URL and catastrophic here: it would park every |
| 954 | 1117 | // inline script on the page. Inline code is delayed only on a |
| 955 | 1118 | // positive identification — the body names a known vendor |
| 956 | 1119 | // host, or a fragment the user targeted — and the exclusion |
| 957 | - // list still wins first. | |
| 958 | - if ( self::is_excluded_script( '', $body ) ) { | |
| 1120 | + // list still wins first. A target naming a consent manager | |
| 1121 | + // lifts the floor here the same way it does for a src tag; | |
| 1122 | + // without it the same entry delayed the file and left the | |
| 1123 | + // vendor's inline code eager. | |
| 1124 | + if ( self::is_excluded_script( '', $body, true ) ) { | |
| 959 | 1125 | return $whole; |
| 960 | 1126 | } |
| 961 | 1127 | if ( ! self::matches_known_third_party( $body ) && ! self::matches_user_targets( $body ) ) { |
| 962 | 1128 | return $whole; |
| @@ -998,70 +1164,49 @@ | ||
| 998 | 1164 | $opts = self::opts(); |
| 999 | 1165 | $timeout = isset( $opts['delay_js_timeout'] ) ? (int) $opts['delay_js_timeout'] : 8000; |
| 1000 | 1166 | $timeout = max( 0, min( 60000, $timeout ) ); |
| 1001 | 1167 | |
| 1002 | - // Tiny vanilla bootstrap; keep it self-contained so the page | |
| 1003 | - // has no JS dependencies before the first interaction. | |
| 1004 | - ?> | |
| 1005 | -<script id="xspeed-delay-bootstrap"> | |
| 1006 | -(function(){ | |
| 1007 | - var events=['mousemove','keydown','touchstart','scroll','wheel']; | |
| 1008 | - var fired=false; | |
| 1009 | - function load(){ | |
| 1010 | - if(fired)return;fired=true; | |
| 1011 | - events.forEach(function(e){window.removeEventListener(e,load,{passive:true,capture:true});}); | |
| 1012 | - var delayed=document.querySelectorAll('script[data-xs-delay]'); | |
| 1013 | - delayed.forEach(function(s){ | |
| 1014 | - var n=document.createElement('script'); | |
| 1015 | - // A dynamically-created script is async by default, so replayed | |
| 1016 | - // EXTERNALS would race each other; async=false restores document | |
| 1017 | - // order among the externals. Narrower guarantee, stated plainly: | |
| 1018 | - // a replayed INLINE script still executes synchronously at its | |
| 1019 | - // replaceChild, i.e. possibly before an earlier external has | |
| 1020 | - // finished LOADING — so an inline consumer of a delayed external | |
| 1021 | - // is only safe when both were delayed by explicit user targeting | |
| 1022 | - // (the inline-bound guard keeps the implicit case eager). | |
| 1023 | - n.async=false; | |
| 1024 | - // Nonce hiding: a connected element's nonce CONTENT attribute reads | |
| 1025 | - // as "", so copying it via the attribute loop would hand the clone | |
| 1026 | - // an empty nonce and a nonce-based CSP would block the replay. The | |
| 1027 | - // IDL property still carries the real value. | |
| 1028 | - if(s.nonce){n.nonce=s.nonce;} | |
| 1029 | - Array.prototype.slice.call(s.attributes).forEach(function(a){ | |
| 1030 | - if(a.name==='data-xs-src'){n.setAttribute('src',a.value);return;} | |
| 1031 | - if(a.name==='data-xs-delay')return; | |
| 1032 | - if(a.name==='nonce')return; | |
| 1033 | - // A parked inline tag's ORIGINAL type (module, mostly) rides in | |
| 1034 | - // data-xs-type — restore it, or the replay runs a module as a | |
| 1035 | - // classic script and its imports throw. (#274) | |
| 1036 | - if(a.name==='data-xs-type'){n.setAttribute('type',a.value);return;} | |
| 1037 | - // `type` is what a script IS, not decoration, so it is carried over | |
| 1038 | - // — with ONE exception: our own inline parking marker, which exists | |
| 1039 | - // only to stop the browser executing the original and must not be | |
| 1040 | - // copied onto the replacement. Dropping type wholesale broke two | |
| 1041 | - // things: `type="module"` became a classic script (core's Script | |
| 1042 | - // Modules — Navigation, lightbox, Query Loop — threw "Cannot use | |
| 1043 | - // import statement outside a module" on the default theme), and | |
| 1044 | - // `type="text/plain"`, which is precisely how a consent manager | |
| 1045 | - // parks a blocked third-party script, became executable again. The | |
| 1046 | - // second is a privacy failure, not a broken feature. (#274) | |
| 1047 | - if(a.name==='type'&&a.value==='text/xspeed-delayed')return; | |
| 1048 | - n.setAttribute(a.name,a.value); | |
| 1049 | - }); | |
| 1050 | - if(!s.hasAttribute('data-xs-src')){n.text=s.text;} | |
| 1051 | - s.parentNode.replaceChild(n,s); | |
| 1052 | - }); | |
| 1053 | - } | |
| 1054 | - events.forEach(function(e){window.addEventListener(e,load,{passive:true,capture:true});}); | |
| 1055 | -<?php if ( $timeout > 0 ) : ?> | |
| 1056 | - setTimeout(load,<?php echo (int) $timeout; ?>); | |
| 1057 | -<?php endif; ?> | |
| 1058 | -})(); | |
| 1059 | -</script> | |
| 1060 | - <?php | |
| 1168 | + // The script is includes/js/delay-bootstrap.js, which also carries | |
| 1169 | + // the design notes for the lifecycle replay (#494). `npm run build` | |
| 1170 | + // minifies it into assets/delay-bootstrap.min.js; the timeout goes in | |
| 1171 | + // place of its one placeholder. | |
| 1172 | + // | |
| 1173 | + // The tag goes out through wp_print_inline_script_tag(), like Free's | |
| 1174 | + // other inline scripts, so a CSP plugin's wp_inline_script_attributes | |
| 1175 | + // filter can give it a nonce. Printed bare, a nonce CSP blocked it | |
| 1176 | + // and nothing was ever replayed. | |
| 1177 | + $js = str_replace( 'XSPEED_DELAY_TIMEOUT', (string) $timeout, self::delay_bootstrap_js() ); | |
| 1178 | + wp_print_inline_script_tag( $js, array( 'id' => 'xspeed-delay-bootstrap' ) ); | |
| 1061 | 1179 | } |
| 1062 | 1180 | |
| 1181 | + /** The delay bootstrap's code, read once per request. */ | |
| 1182 | + private static $delay_bootstrap_js = null; | |
| 1183 | + | |
| 1063 | 1184 | /** |
| 1185 | + * The built delay bootstrap, without the line that records its source. | |
| 1186 | + * If the build is missing, the readable source is valid JS too, only | |
| 1187 | + * larger: printing nothing would leave every delayed script parked for | |
| 1188 | + * good, because the tags are already rewritten by the time this runs. | |
| 1189 | + */ | |
| 1190 | + private static function delay_bootstrap_js(): string { | |
| 1191 | + if ( null !== self::$delay_bootstrap_js ) { | |
| 1192 | + return self::$delay_bootstrap_js; | |
| 1193 | + } | |
| 1194 | + $root = dirname( __DIR__ ); | |
| 1195 | + $built = $root . '/assets/delay-bootstrap.min.js'; | |
| 1196 | + // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents -- a local plugin file, not a remote URL. | |
| 1197 | + $js = is_readable( $built ) ? (string) file_get_contents( $built ) : ''; | |
| 1198 | + if ( '' !== $js ) { | |
| 1199 | + $js = (string) preg_replace( '#\A/\*[^\n]*\*/\n#', '', $js ); | |
| 1200 | + } else { | |
| 1201 | + // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents -- a local plugin file, not a remote URL. | |
| 1202 | + $js = (string) file_get_contents( $root . '/includes/js/delay-bootstrap.js' ); | |
| 1203 | + } | |
| 1204 | + self::$delay_bootstrap_js = trim( $js ); | |
| 1205 | + return self::$delay_bootstrap_js; | |
| 1206 | + } | |
| 1207 | + | |
| 1208 | + /** | |
| 1064 | 1209 | * Filter: `style_loader_tag` — wrap stylesheets in the |
| 1065 | 1210 | * print → onload="all" pattern so they download non-blocking. |
| 1066 | 1211 | * Pairs with critical CSS workflows. Adds a <noscript> fallback so |
| 1067 | 1212 | * users with JS disabled still get styles applied (via media="all"). |
| @@ -1670,9 +1815,201 @@ | ||
| 1670 | 1815 | 'wp-url', |
| 1671 | 1816 | 'wp-api-fetch', |
| 1672 | 1817 | ); |
| 1673 | 1818 | |
| 1674 | - private static function is_excluded_script( string $handle, string $src ): bool { | |
| 1819 | + /** | |
| 1820 | + * Consent managers are never deferred, and never delayed by a broad | |
| 1821 | + * setting — only a delay_js_targets entry that NAMES the vendor lifts | |
| 1822 | + * the floor (see user_named_consent_manager()); the | |
| 1823 | + * `xspeed_js_exclusion_floor` filter remains the code-level override. | |
| 1824 | + * | |
| 1825 | + * A consent banner is drawn by JavaScript, and it is the one thing on | |
| 1826 | + * the page that has to appear before anything else happens. Delay it | |
| 1827 | + * and a visitor who lands, reads and leaves without touching the page | |
| 1828 | + * is never asked — on an opt-in configuration the site then ran | |
| 1829 | + * without ever offering the choice. | |
| 1830 | + * | |
| 1831 | + * The editable list cannot carry this. A stored value replaces the | |
| 1832 | + * schema default outright (Settings_Manager::get()), so widening that | |
| 1833 | + * default would reach fresh installs only, and clearing the textarea | |
| 1834 | + * would drop the protection again. Same floor pattern as | |
| 1835 | + * Server_Rules::COOKIE_FLOOR. Trim or extend it through | |
| 1836 | + * `xspeed_js_exclusion_floor`. | |
| 1837 | + * | |
| 1838 | + * A URL token cannot survive a rewrite of that URL: Minify JS rewrites a | |
| 1839 | + * local script to a hashed /cache/xspeed/min/ path, and Combine JS folds | |
| 1840 | + * it into a bundle. On the enqueue path original_src() gives the pre-minify | |
| 1841 | + * URL back, but the buffer sweep has only the tag -- so with Minify JS on | |
| 1842 | + * and the `id` stripped, a banner shipped un-minified is not recognised. | |
| 1843 | + * Documented in docs/user/minification.md rather than papered over. | |
| 1844 | + * | |
| 1845 | + * Each entry goes through target_matches(): an exact handle OR a | |
| 1846 | + * case-insensitive URL substring. Both passes can match either — the | |
| 1847 | + * enqueue path is handed the handle, and the buffer sweep reads it back | |
| 1848 | + * out of the tag's `id`. A URL token additionally covers a banner that | |
| 1849 | + * was never enqueued at all, which is how Cookiebot prints itself. (#275) | |
| 1850 | + */ | |
| 1851 | + private const CONSENT_MANAGER_FLOOR = array( | |
| 1852 | + // Prefer a plugin-directory or vendor-host URL token over a handle. | |
| 1853 | + // A handle is only readable on the enqueue path and, on the buffer | |
| 1854 | + // sweep, only if the tag still carries the `id` WordPress prints — | |
| 1855 | + // which another plugin can strip. A URL token matches on both passes | |
| 1856 | + // and covers a banner that was never enqueued at all. (#275 QA) | |
| 1857 | + | |
| 1858 | + // CookieYes / GDPR Cookie Consent. Handle and plugin directory are | |
| 1859 | + // the same string, so this covers both paths. | |
| 1860 | + 'cookie-law-info', | |
| 1861 | + // Complianz: the plugin directory, covering -gdpr and -gdpr-premium. | |
| 1862 | + // Was the `cmplz-cookiebanner` handle, which needed the `id` tag. | |
| 1863 | + 'complianz', | |
| 1864 | + // NotificationX runs its GDPR cookie notice off the same handle as | |
| 1865 | + // every other notification, so excluding it excludes them all. That | |
| 1866 | + // is what the plugin's own team asked for. Directory token covers | |
| 1867 | + // the Pro build too; was the `notificationx-public` handle. | |
| 1868 | + 'notificationx', | |
| 1869 | + // Cookiebot prints its loader straight into wp_head, so only the | |
| 1870 | + // buffer sweep ever sees it. This is the token Cookiebot's own WP | |
| 1871 | + // Rocket and LiteSpeed integrations exclude. | |
| 1872 | + 'consent.cookiebot.com', | |
| 1873 | + // Cookie Notice — named in the original report and one of the most | |
| 1874 | + // installed consent plugins. Its banner is enqueued from | |
| 1875 | + // /plugins/cookie-notice/js/front.min.js. | |
| 1876 | + 'cookie-notice', | |
| 1877 | + // Cookie Notice in Cookie Compliance mode prints a different loader, | |
| 1878 | + // whose host is overridable via CN_APP_WIDGET_URL — so key on the | |
| 1879 | + // filename, not the CDN host. | |
| 1880 | + 'hu-banner', | |
| 1881 | + // Moove GDPR Cookie Compliance. Directory token: its handle | |
| 1882 | + // (`moove_gdpr_frontend`) does not appear in its own URL. | |
| 1883 | + 'gdpr-cookie-compliance', | |
| 1884 | + // Termly's resource blocker, which also covers the legacy embed. | |
| 1885 | + 'app.termly.io', | |
| 1886 | + // Usercentrics, reached three ways: Cookiebot's UC mode | |
| 1887 | + // (web.cmp.usercentrics.eu), Termageddon (app.usercentrics.eu) and | |
| 1888 | + // the privacy proxy. | |
| 1889 | + 'usercentrics.eu', | |
| 1890 | + // Iubenda: both the consent solution and the consent database SDK. | |
| 1891 | + 'cdn.iubenda.com', | |
| 1892 | + // OneTrust. Pasted snippet rather than a wordpress.org plugin, so | |
| 1893 | + // this is the SDK host rather than a verified plugin path. | |
| 1894 | + 'cdn.cookielaw.org', | |
| 1895 | + // Borlabs is commercial and renames its files per release; the | |
| 1896 | + // vendor's own guidance is that this string stays in every path. | |
| 1897 | + 'borlabs-cookie', | |
| 1898 | + // Real Cookie Banner, free and pro. Its anti-adblock mode serves the | |
| 1899 | + // banner from an anonymised path that no URL token can match — use | |
| 1900 | + // `xspeed_js_exclusion_floor` to add the handle on such a site. | |
| 1901 | + 'real-cookie-banner', | |
| 1902 | + // SureCookie. | |
| 1903 | + 'surecookie', | |
| 1904 | + ); | |
| 1905 | + | |
| 1906 | + /** | |
| 1907 | + * What a site owner types to name each floor entry, and what the admin | |
| 1908 | + * shows them. Keyed by CONSENT_MANAGER_FLOOR token; a test holds the two | |
| 1909 | + * in step. | |
| 1910 | + * | |
| 1911 | + * The keyword is the part of the token a person would actually write | |
| 1912 | + * (`cookiebot`, not `consent.cookiebot.com`), and it is always a substring | |
| 1913 | + * of the token, so an entry that names the vendor this way still matches | |
| 1914 | + * the vendor's URL. A brand name that appears nowhere in the URL | |
| 1915 | + * (`cookieyes`, `onetrust`, `cmplz`) is deliberately not a keyword: it | |
| 1916 | + * could never match the tag, so offering it would promise a lift that | |
| 1917 | + * cannot happen. The exact handle always works as well. | |
| 1918 | + * | |
| 1919 | + * Cookiebot in Usercentrics CMP mode loads from web.cmp.usercentrics.eu, | |
| 1920 | + * so the floor catches it as Usercentrics and `usercentrics` names it, | |
| 1921 | + * not `cookiebot`. | |
| 1922 | + */ | |
| 1923 | + private const CONSENT_MANAGER_NAMES = array( | |
| 1924 | + 'cookie-law-info' => array( 'label' => 'CookieYes', 'keyword' => 'cookie-law-info' ), | |
| 1925 | + 'complianz' => array( 'label' => 'Complianz', 'keyword' => 'complianz' ), | |
| 1926 | + 'notificationx' => array( 'label' => 'NotificationX', 'keyword' => 'notificationx' ), | |
| 1927 | + 'consent.cookiebot.com' => array( 'label' => 'Cookiebot', 'keyword' => 'cookiebot' ), | |
| 1928 | + 'cookie-notice' => array( 'label' => 'Cookie Notice', 'keyword' => 'cookie-notice' ), | |
| 1929 | + 'hu-banner' => array( 'label' => 'Cookie Notice (Cookie Compliance)', 'keyword' => 'hu-banner' ), | |
| 1930 | + 'gdpr-cookie-compliance' => array( 'label' => 'GDPR Cookie Compliance (Moove)', 'keyword' => 'gdpr-cookie-compliance' ), | |
| 1931 | + 'app.termly.io' => array( 'label' => 'Termly', 'keyword' => 'termly' ), | |
| 1932 | + 'usercentrics.eu' => array( 'label' => 'Usercentrics', 'keyword' => 'usercentrics' ), | |
| 1933 | + 'cdn.iubenda.com' => array( 'label' => 'Iubenda', 'keyword' => 'iubenda' ), | |
| 1934 | + 'cdn.cookielaw.org' => array( 'label' => 'OneTrust', 'keyword' => 'cookielaw' ), | |
| 1935 | + 'borlabs-cookie' => array( 'label' => 'Borlabs Cookie', 'keyword' => 'borlabs' ), | |
| 1936 | + 'real-cookie-banner' => array( 'label' => 'Real Cookie Banner', 'keyword' => 'real-cookie-banner' ), | |
| 1937 | + 'surecookie' => array( 'label' => 'SureCookie', 'keyword' => 'surecookie' ), | |
| 1938 | + ); | |
| 1939 | + | |
| 1940 | + /** | |
| 1941 | + * "Label (keyword)" for every built-in consent manager, for the admin. | |
| 1942 | + * | |
| 1943 | + * Reads the built-in list, not the filtered floor: the admin describes | |
| 1944 | + * what ships, and a site that trimmed the floor in code knows it did. | |
| 1945 | + * | |
| 1946 | + * @return string[] | |
| 1947 | + */ | |
| 1948 | + public static function consent_manager_labels(): array { | |
| 1949 | + $out = array(); | |
| 1950 | + foreach ( self::CONSENT_MANAGER_FLOOR as $token ) { | |
| 1951 | + $name = self::CONSENT_MANAGER_NAMES[ $token ] ?? array( | |
| 1952 | + 'label' => $token, | |
| 1953 | + 'keyword' => $token, | |
| 1954 | + ); | |
| 1955 | + $out[] = $name['label'] . ' (' . $name['keyword'] . ')'; | |
| 1956 | + } | |
| 1957 | + return $out; | |
| 1958 | + } | |
| 1959 | + | |
| 1960 | + /** | |
| 1961 | + * Per-request memo for exclusion_floor(). Null = not resolved. | |
| 1962 | + * | |
| 1963 | + * @var string[]|null | |
| 1964 | + */ | |
| 1965 | + private static $exclusion_floor = null; | |
| 1966 | + | |
| 1967 | + /** | |
| 1968 | + * The built-in exclusion floor, after the site has had its say. | |
| 1969 | + * | |
| 1970 | + * @return string[] | |
| 1971 | + */ | |
| 1972 | + private static function exclusion_floor(): array { | |
| 1973 | + if ( null === self::$exclusion_floor ) { | |
| 1974 | + /** | |
| 1975 | + * Scripts that are never deferred or delayed, whatever the | |
| 1976 | + * user's exclusion list holds. Each entry is an exact script | |
| 1977 | + * handle or a case-insensitive URL substring. | |
| 1978 | + * | |
| 1979 | + * Return the array minus a token to let Delay JS postpone that | |
| 1980 | + * consent manager on purpose; add one to protect another script. | |
| 1981 | + * | |
| 1982 | + * @param string[] $floor Built-in floor. | |
| 1983 | + */ | |
| 1984 | + $floor = apply_filters( 'xspeed_js_exclusion_floor', self::CONSENT_MANAGER_FLOOR ); | |
| 1985 | + self::$exclusion_floor = array_values( | |
| 1986 | + array_filter( array_map( 'strval', (array) $floor ), static fn( $t ) => '' !== $t ) | |
| 1987 | + ); | |
| 1988 | + } | |
| 1989 | + return self::$exclusion_floor; | |
| 1990 | + } | |
| 1991 | + | |
| 1992 | + /** | |
| 1993 | + * @param string $handle Script handle ('' on the buffer sweep | |
| 1994 | + * when no id survived). | |
| 1995 | + * @param string $src Script URL. | |
| 1996 | + * @param bool $named_lifts_floor Delay paths only: a delay_js_targets | |
| 1997 | + * entry that NAMES the consent manager | |
| 1998 | + * passes the floor (see | |
| 1999 | + * user_named_consent_manager()). Typing a | |
| 2000 | + * consent manager's name into an | |
| 2001 | + * allow-list is the site owner taking the | |
| 2002 | + * consent-timing decision back — GDPR is | |
| 2003 | + * theirs to weigh, not ours; the floor | |
| 2004 | + * only exists so Delay JS can't hide a | |
| 2005 | + * banner NOBODY pointed at. Their own | |
| 2006 | + * exclusion list, ALWAYS_EXCLUDED_HANDLES | |
| 2007 | + * and our beacons still win: on a | |
| 2008 | + * conflict between the user's two lists, | |
| 2009 | + * protection beats postponement. | |
| 2010 | + */ | |
| 2011 | + private static function is_excluded_script( string $handle, string $src, bool $named_lifts_floor = false ): bool { | |
| 1675 | 2012 | if ( in_array( $handle, self::ALWAYS_EXCLUDED_HANDLES, true ) ) { |
| 1676 | 2013 | return true; |
| 1677 | 2014 | } |
| 1678 | 2015 | // Never defer or delay our own scripts. The fold and RUM beacons |
| @@ -1685,8 +2022,24 @@ | ||
| 1685 | 2022 | // beacon added later cannot re-open the hole. |
| 1686 | 2023 | if ( 0 === strpos( $handle, 'xspeed-' ) ) { |
| 1687 | 2024 | return true; |
| 1688 | 2025 | } |
| 2026 | + // Ahead of the user list, and ahead of the empty-list early return | |
| 2027 | + // below: an install that saved the Minify panel before this shipped | |
| 2028 | + // has a stored list that knows nothing about consent managers, and | |
| 2029 | + // one that cleared the textarea has no list at all. Neither may | |
| 2030 | + // hide the banner. (#275) | |
| 2031 | + foreach ( self::exclusion_floor() as $needle ) { | |
| 2032 | + if ( self::target_matches( $needle, $handle, $src ) ) { | |
| 2033 | + // `continue`, not `break`: a second floor token matching the | |
| 2034 | + // same tag has to be named too, or a filter-added token | |
| 2035 | + // would be lifted by an entry that names only the first. | |
| 2036 | + if ( $named_lifts_floor && self::user_named_consent_manager( $needle, $handle, $src ) ) { | |
| 2037 | + continue; | |
| 2038 | + } | |
| 2039 | + return true; | |
| 2040 | + } | |
| 2041 | + } | |
| 1689 | 2042 | $opts = self::opts(); |
| 1690 | 2043 | $excluded = is_array( $opts['defer_js_excluded'] ?? null ) ? $opts['defer_js_excluded'] : array(); |
| 1691 | 2044 | if ( empty( $excluded ) ) { |
| 1692 | 2045 | return false; |
| @@ -1753,8 +2106,131 @@ | ||
| 1753 | 2106 | } |
| 1754 | 2107 | return false; |
| 1755 | 2108 | } |
| 1756 | 2109 | |
| 2110 | + /** | |
| 2111 | + * Whether a delay_js_targets entry NAMES the consent manager whose floor | |
| 2112 | + * token matched this tag, and so lifts the floor for it. | |
| 2113 | + * | |
| 2114 | + * is_user_named_target() is not enough here: it asks whether any entry | |
| 2115 | + * matches the tag, and a delay target is a URL substring. `/plugins/`, | |
| 2116 | + * `.js`, `min.js`, `frontend` or the site's own host each match every | |
| 2117 | + * consent banner on the page, so one broad entry switched the floor off | |
| 2118 | + * for all of them and brought #275 back. An entry names the vendor when | |
| 2119 | + * it is the exact handle, or when it contains the vendor's keyword (or | |
| 2120 | + * its floor token) and still matches the tag, so `notificationx` and | |
| 2121 | + * `/plugins/notificationx/` lift NotificationX, `termly` cannot lift | |
| 2122 | + * Cookiebot, and `/plugins/` lifts nothing. | |
| 2123 | + * | |
| 2124 | + * A token added through `xspeed_js_exclusion_floor` has no keyword, so | |
| 2125 | + * only an entry containing that token, or the exact handle, names it. | |
| 2126 | + * | |
| 2127 | + * @param string $floor_token The floor entry that matched this tag. | |
| 2128 | + * @param string $handle Script handle ('' when unknown). | |
| 2129 | + * @param string $src Script URL, or the body on the inline pass. | |
| 2130 | + */ | |
| 2131 | + private static function user_named_consent_manager( string $floor_token, string $handle, string $src ): bool { | |
| 2132 | + $opts = self::opts(); | |
| 2133 | + $targets = is_array( $opts['delay_js_targets'] ?? null ) ? $opts['delay_js_targets'] : array(); | |
| 2134 | + $names = array( $floor_token ); | |
| 2135 | + if ( isset( self::CONSENT_MANAGER_NAMES[ $floor_token ] ) ) { | |
| 2136 | + $names[] = self::CONSENT_MANAGER_NAMES[ $floor_token ]['keyword']; | |
| 2137 | + } | |
| 2138 | + foreach ( $targets as $needle ) { | |
| 2139 | + $needle = trim( (string) $needle ); | |
| 2140 | + if ( '' === $needle ) { | |
| 2141 | + continue; | |
| 2142 | + } | |
| 2143 | + $names_it = '' !== $handle && $handle === $needle; | |
| 2144 | + foreach ( $names as $name ) { | |
| 2145 | + if ( false !== stripos( $needle, $name ) ) { | |
| 2146 | + $names_it = true; | |
| 2147 | + break; | |
| 2148 | + } | |
| 2149 | + } | |
| 2150 | + if ( $names_it && self::target_matches( $needle, $handle, $src ) ) { | |
| 2151 | + return true; | |
| 2152 | + } | |
| 2153 | + } | |
| 2154 | + return false; | |
| 2155 | + } | |
| 2156 | + | |
| 2157 | + /** Both toggles on: delay_js and its carry-the-inline-snippets mode. */ | |
| 2158 | + private static function smart_delay_enabled(): bool { | |
| 2159 | + $opts = self::opts(); | |
| 2160 | + return ! empty( $opts['delay_js'] ) && ! empty( $opts['delay_js_smart'] ); | |
| 2161 | + } | |
| 2162 | + | |
| 2163 | + /** | |
| 2164 | + * Would Smart Delay postpone this handle's tag? | |
| 2165 | + * | |
| 2166 | + * The snippet-parking filter runs when WordPress prints a handle's | |
| 2167 | + * `before` snippet — BEFORE script_loader_tag sees the tag itself — so | |
| 2168 | + * the decision cannot be read back from what happened to the tag; both | |
| 2169 | + * sides evaluate this same predicate. It mirrors the handle/src checks | |
| 2170 | + * of delay_script_tag() only: the tag-level outs there (an optimizer | |
| 2171 | + * opt-out attribute, a non-executable type) are invisible here, so a | |
| 2172 | + * tag that keeps itself eager through one of those can still have its | |
| 2173 | + * snippets parked. That parks an init until first interaction rather | |
| 2174 | + * than throwing, and Smart Delay is opt-in — acceptable, and documented | |
| 2175 | + * on the setting. | |
| 2176 | + */ | |
| 2177 | + private static function smart_delays_handle( string $handle ): bool { | |
| 2178 | + if ( '' === $handle ) { | |
| 2179 | + return false; | |
| 2180 | + } | |
| 2181 | + $src = self::original_src( $handle ); | |
| 2182 | + if ( self::is_excluded_script( $handle, $src, true ) ) { | |
| 2183 | + return false; | |
| 2184 | + } | |
| 2185 | + return self::is_delay_target( $handle, $src ); | |
| 2186 | + } | |
| 2187 | + | |
| 2188 | + /** | |
| 2189 | + * Park a delayed handle's own before/after snippet, in Smart Delay mode. | |
| 2190 | + * | |
| 2191 | + * Runs on `wp_inline_script_attributes`, which fires for every inline | |
| 2192 | + * script WordPress prints itself — so it works on pages the HTML buffer | |
| 2193 | + * never filters (a BYPASS route like /cart), where the handle's tag is | |
| 2194 | + * still delayed by script_loader_tag. `-js-extra` stays eager on | |
| 2195 | + * purpose: it is data assignments, harmless early and sometimes read by | |
| 2196 | + * eager code. | |
| 2197 | + * | |
| 2198 | + * @param mixed $attributes Inline script attributes. | |
| 2199 | + * @param string $javascript The snippet body. | |
| 2200 | + * @return mixed | |
| 2201 | + */ | |
| 2202 | + public static function park_smart_inline( $attributes, $javascript = '' ) { | |
| 2203 | + if ( ! is_array( $attributes ) || ! self::smart_delay_enabled() || self::skip_in_non_frontend_context() ) { | |
| 2204 | + return $attributes; | |
| 2205 | + } | |
| 2206 | + $id = isset( $attributes['id'] ) ? (string) $attributes['id'] : ''; | |
| 2207 | + if ( ! preg_match( '#^(.+)-js-(?:before|after)$#', $id, $m ) ) { | |
| 2208 | + return $attributes; | |
| 2209 | + } | |
| 2210 | + if ( ! self::smart_delays_handle( $m[1] ) ) { | |
| 2211 | + return $attributes; | |
| 2212 | + } | |
| 2213 | + $type = isset( $attributes['type'] ) ? (string) $attributes['type'] : ''; | |
| 2214 | + if ( in_array( $type, self::NON_EXECUTABLE_TYPES, true ) ) { | |
| 2215 | + return $attributes; // data, or parked by someone else on purpose. | |
| 2216 | + } | |
| 2217 | + // A delayed document.write replays after the document has closed | |
| 2218 | + // and replaces the page. Same rule as delay_inline_snippets(). | |
| 2219 | + if ( false !== stripos( (string) $javascript, 'document.write' ) ) { | |
| 2220 | + return $attributes; | |
| 2221 | + } | |
| 2222 | + if ( '' !== $type && ! in_array( $type, self::DEFAULT_JS_TYPES, true ) ) { | |
| 2223 | + $stash = (string) preg_replace( '#[^a-z0-9/+.\-]#', '', $type ); | |
| 2224 | + if ( '' !== $stash ) { | |
| 2225 | + $attributes['data-xs-type'] = $stash; | |
| 2226 | + } | |
| 2227 | + } | |
| 2228 | + $attributes['type'] = 'text/xspeed-delayed'; | |
| 2229 | + $attributes['data-xs-delay'] = '1'; | |
| 2230 | + return $attributes; | |
| 2231 | + } | |
| 2232 | + | |
| 1757 | 2233 | private static function is_delay_target( string $handle, string $src ): bool { |
| 1758 | 2234 | $opts = self::opts(); |
| 1759 | 2235 | $targets = is_array( $opts['delay_js_targets'] ?? null ) ? $opts['delay_js_targets'] : array(); |
| 1760 | 2236 | $targets = array_filter( array_map( 'strval', $targets ), static fn( $t ) => '' !== $t ); |
| @@ -1891,10 +2367,12 @@ | ||
| 1891 | 2367 | self::$opts = null; |
| 1892 | 2368 | self::$uploads_base = null; |
| 1893 | 2369 | self::$delay_bootstrap_printed = false; |
| 1894 | 2370 | self::$js_measured_layout = null; |
| 2371 | + self::$exclusion_floor = null; | |
| 1895 | 2372 | self::$inline_bound_handles = null; |
| 1896 | 2373 | self::$pristine_tag = array(); |
| 2374 | + self::$our_late_attrs = array(); | |
| 1897 | 2375 | } |
| 1898 | 2376 | |
| 1899 | 2377 | /** |
| 1900 | 2378 | * Per-request memo for inline_bound_handles(). Null = not resolved. |
