Changeset 2978978

Timestamp:

10/14/2023 08:25:20 AM (2 years ago)

Author:

futtta

Message:

getting ready for 3.1.9

Location:

autoptimize/trunk

Files:

• autoptimize.php (modified) (2 diffs)
• classes/autoptimizeCache.php (modified) (1 diff)
• classes/autoptimizeConfig.php (modified) (3 diffs)
• classes/autoptimizeCriticalCSSSettings.php (modified) (1 diff)
• classes/autoptimizeImages.php (modified) (1 diff)
• classes/autoptimizeMain.php (modified) (3 diffs)
• classes/autoptimizeProTab.php (added)
• classes/autoptimizeScripts.php (modified) (2 diffs)
• classes/autoptimizeUtils.php (modified) (3 diffs)
• classes/critcss-inc/admin_settings_explain.php (modified) (1 diff)
• classes/critcss-inc/admin_settings_rules.js.php (modified) (4 diffs)
• readme.txt (modified) (3 diffs)

autoptimize/trunk/autoptimize.php

@@ -4 +4 @@
  * Plugin URI: https://autoptimize.com/pro/
  * Description: Makes your site faster by optimizing CSS, JS, Images, Google fonts and more.
- * Version: 3.1.8.1
+ * Version: 3.1.9
  * Author: Frank Goossens (futtta)
  * Author URI: https://autoptimize.com/pro/
@@ -22 +22 @@
 }
 
-define( 'AUTOPTIMIZE_PLUGIN_VERSION', '3.1.8.1' );
+define( 'AUTOPTIMIZE_PLUGIN_VERSION', '3.1.9' );
 
 // plugin_dir_path() returns the trailing slash!

autoptimize/trunk/classes/autoptimizeCache.php

@@ -388 +388 @@
             $caller = isset( $dbt[1]['function'] ) ? $dbt[1]['function'] : null;
             if ( 'et_core_clear_wp_cache' === $caller ) {
-                _doing_it_wrong( 'autoptimizeCache::clearall', 'Divi devs: please don\'t clear Autoptimize\'s cache, it is unneeded and can break sites. You can contact me at [email protected] to discuss.', 'Autoptimize 2.9.6' );
+                if ( apply_filters( 'autoptimize_filter_cache_divi_wrong_complain', true ) ) {
+                    _doing_it_wrong( 'autoptimizeCache::clearall', 'Divi devs: please don\'t clear Autoptimize\'s cache, it is unneeded and can break sites. You can contact me at [email protected] to discuss.', 'Autoptimize 2.9.6' );
+                }
                 return false;
             }

autoptimize/trunk/classes/autoptimizeConfig.php

@@ -336 +336 @@
 <tr valign="top" class="css_sub" id="autoptimize_css_defer_inline">
 <th scope="row"></th>
-<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste the above the fold CSS here. You can leave this empty when using the automated Critical CSS integration.', 'autoptimize' ); ?>" name="autoptimize_css_defer_inline"><?php echo autoptimizeStyles::sanitize_css( autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer_inline' ) ); ?></textarea></label></td>
+<td><label><textarea rows="10" cols="10" style="width:100%;" spellcheck="false" placeholder="<?php _e( 'Paste the above the fold CSS here. You can leave this empty when using the automated Critical CSS integration.', 'autoptimize' ); ?>" name="autoptimize_css_defer_inline"><?php echo autoptimizeStyles::sanitize_css( autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer_inline' ) ); ?></textarea></label></td>
 </tr>
 <tr valign="top" class="css_sub css_aggregate">
@@ -809 +809 @@
     {
         static $config = array(
-            'autoptimize_html'                           => 0,
+            'autoptimize_html'                           => 1,
             'autoptimize_html_keepcomments'              => 0,
             'autoptimize_html_minify_inline'             => 0,
             'autoptimize_enable_site_config'             => 1,
-            'autoptimize_js'                             => 0,
+            'autoptimize_js'                             => 1,
             'autoptimize_js_aggregate'                   => 0,
             'autoptimize_js_defer_not_aggregate'         => 1,
@@ -822 +822 @@
             'autoptimize_js_include_inline'              => 0,
             'autoptimize_js_forcehead'                   => 0,
-            'autoptimize_css'                            => 0,
+            'autoptimize_css'                            => 1,
             'autoptimize_css_aggregate'                  => 0,
             'autoptimize_css_exclude'                    => '',

autoptimize/trunk/classes/autoptimizeCriticalCSSSettings.php

@@ -190 +190 @@
                     <div data-dismissible="i-know-about-disable-cron-forever" class="notice-warning notice is-dismissible"><p>
                     <?php
-                    _e( 'WordPress cron (for task scheduling) seems to be disabled. Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize' );
+                    _e( 'WordPress cron (for task scheduling) seems to be disabled. Have a look at <a href="https://blog.futtta.be/2023/03/17/how-to-fix-autoptimize-critical-css-cron-issue/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize' );
                     ?>
                     </p></div>

autoptimize/trunk/classes/autoptimizeImages.php

@@ -1085 +1085 @@
 
             // set default exclusions.
-            $exclude_lazyload_array = array( 'skip-lazy', 'data-no-lazy', 'notlazy', 'data-src', 'data-srcset', 'data:image/', 'data-lazyload', 'rev-slidebg', 'loading="eager"' );
+            $exclude_lazyload_array = array( 'skip-lazy', 'data-no-lazy', 'notlazy', 'data-src', 'data-srcset', 'data:image/', 'data-lazyload', 'rev-slidebg', 'loading="eager"', 'fetchpriority="high"' );
 
             // add from setting.

autoptimize/trunk/classes/autoptimizeMain.php

@@ -192 +192 @@
 
                 // And disable Jetpack's site accelerator if JS or CSS opt. are active.
-                if ( class_exists( 'Jetpack' ) && apply_filters( 'autoptimize_filter_main_disable_jetpack_cdn', true ) && ( $conf->get( 'autoptimize_js' ) || $conf->get( 'autoptimize_css' ) ) ) {
-                    add_filter( 'jetpack_force_disable_site_accelerator', '__return_true' );
+                if ( class_exists( 'Jetpack' ) && apply_filters( 'autoptimize_filter_main_disable_jetpack_cdn', true ) && ( $conf->get( 'autoptimize_js' ) || $conf->get( 'autoptimize_css' ) || autoptimizeImages::imgopt_active() ) ) {
+                    add_filter( 'jetpack_force_disable_site_accelerator', '__return_true' ); // this does not seemt to work any more?
+                    add_filter( 'jetpack_photon_skip_for_url', '__return_true' );
                 }
 
@@ -225 +226 @@
             new autoptimizePartners();
             new autoptimizeExitSurvey();
+            new autoptimizeProTab();
         }
     }
@@ -750 +752 @@
     {
         echo '<div class="updated"><p>';
-        printf( __( 'Thank you for installing and activating Autoptimize. Please configure it under %1$sSettings -> Autoptimize%2$s to start improving your site\'s performance.', 'autoptimize' ), '<a href="options-general.php?page=autoptimize">', '</a>' );
+        printf( __( 'Thank you for installing and activating Autoptimize. Your site is being optimized immediately, please test the frontend to ensure everything still works as expected. If needed you can change JavaScript or CSS optimization settings under %1$sSettings -> Autoptimize%2$s .', 'autoptimize' ), '<a href="options-general.php?page=autoptimize">', '</a>' );
         echo '</p></div>';
     }

autoptimize/trunk/classes/autoptimizeScripts.php

@@ -378 +378 @@
 
                         // not aggregating but deferring?
-                        if ( $this->defer_not_aggregate && false === $this->aggregate && ( str_replace( $this->dontmove, '', $path ) === $path || ( apply_filters( 'autoptimize_filter_js_defer_external', true ) && str_replace( $this->dontmove, '', $orig_tag ) === $orig_tag ) ) && strpos( $new_tag, ' defer' ) === false && strpos( $new_tag, ' async' ) === false ) {
-                            $new_tag = str_replace( '<script ', '<script defer ', $new_tag );
+                        if ( $this->defer_not_aggregate && false === $this->aggregate && ( str_replace( $this->dontmove, '', $path ) === $path || ( apply_filters( 'autoptimize_filter_js_defer_external', true ) && str_replace( $this->dontmove, '', $orig_tag ) === $orig_tag ) ) && strpos( $new_tag, ' defer' ) === false ) {
+                            if ( false !== strpos( $new_tag, ' async' ) && true === apply_filters( 'autoptimize_filter_js_defer_trumps_async', true ) ) {
+                                // remove async flag to ensure JS is properly deferred, otherwise the asynced JS might fire 
+                                // before deferred inlined JS is executed, off course except filter is set to false which
+                                // re-institutes previous behavior.
+                                $new_tag = str_replace( array( " async='async'", ' async="async"', ' async=async', ' async' ), '', $new_tag );
+                            }
+                            
+                            if ( false === strpos( $new_tag, ' async' ) ) {
+                                // either async wasn't there to begin with or it was removed.
+                                // if async is there, the autoptimize_filter_js_defer_trumps_async
+                                // filter was set to false and in that case defer should not be added.
+                                $new_tag = str_replace( '<script ', '<script defer ', $new_tag );
+                            }
                         }
 
@@ -461 +473 @@
 
                             $new_tag       = '<script defer ' . $_id . 'src="data:text/javascript;base64,' . base64_encode( $match[3] ) . '"></script>';
-                            $this->content = str_replace( $tag, $new_tag, $this->content );
+                            $this->content = str_replace( $this->hide_comments( $tag ), $new_tag, $this->content );
                             $tag           = '';
                         } else {

autoptimize/trunk/classes/autoptimizeUtils.php

@@ -410 +410 @@
             $_page_cache_constants = array(
                 'NgInx' => 'NGINX_HELPER_BASENAME',
-                'Kinsta' => 'KINSTA_CACHE_ZONE',
+                'Kinsta' => 'KINSTAMU_VERSION',
                 'Presslabs' => 'PL_INSTANCE_REF',
                 'Cache Enabler' => 'CACHE_ENABLER_VERSION',
@@ -491 +491 @@
      */
     public static function is_ao_settings() {
-        $_is_ao_settings = ( str_replace( array( 'autoptimize', 'autoptimize_imgopt', 'ao_critcss', 'autoptimize_extra', 'ao_partners', 'ao_pro_boosters' ), '', $_SERVER['REQUEST_URI'] ) !== $_SERVER['REQUEST_URI'] ? true : false );
+        $_is_ao_settings = ( str_replace( array( 'autoptimize', 'autoptimize_imgopt', 'ao_critcss', 'autoptimize_extra', 'ao_partners', 'ao_pro_boosters', 'ao_pro_pagecache', 'ao_protab' ), '', $_SERVER['REQUEST_URI'] ) !== $_SERVER['REQUEST_URI'] ? true : false );
         return $_is_ao_settings;
     }
@@ -557 +557 @@
                 // localhost IPv4/ IPv6.
                 $_is_local_server = true;
-            } elseif ( 0 === strpos( $_domain, '127.' ) || 0 === strpos( $_domain, '192.168.' ) || 0 === strpos( $_domain, 'fd' ) ) {
+            } elseif ( 0 === strpos( $_domain, '127.' ) || 0 === strpos( $_domain, '192.168.' ) || 0 === strpos( $_domain, '10.' ) || 0 === strpos( $_domain, 'fd' ) ) {
                 // private ranges so unreachable for imgopt/ CCSS.
+                // fixme; 172.16.0.0–172.31.255.255 also private.
                 $_is_local_server = true;
             } elseif ( autoptimizeUtils::str_ends_in( $_domain, '.local') ) {

autoptimize/trunk/classes/critcss-inc/admin_settings_explain.php

@@ -35 +35 @@
                         if ( '200' == wp_remote_retrieve_response_code( $ccss_expl_resp ) ) {
                             $ccss_explanation = wp_kses_post( wp_remote_retrieve_body( $ccss_expl_resp ) );
-                            set_transient( 'ao3_ccss_explain', $ccss_explanation, WEEK_IN_SECONDS );
+                            set_transient( $_transient, $ccss_explanation, WEEK_IN_SECONDS );
                         }
                     }

autoptimize/trunk/classes/critcss-inc/admin_settings_rules.js.php

@@ -233 +233 @@
         jQuery("#critcss_addedit_file").val(crit_file);
         jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'Loading critical CSS...', 'autoptimize' ); ?>");
+        jQuery("#critcss_addedit_css").attr("spellcheck",false);
         jQuery("#critcss_addedit_type").attr("disabled",true);
 
@@ -265 +266 @@
         // default: paths, hide content type field
         jQuery("#critcss_addedit_type").val("paths");
+        jQuery("#critcss_addedit_css").attr("spellcheck",false);
         jQuery("#critcss_addedit_pagetype_wrapper").hide();
 
@@ -316 +318 @@
 function editDefaultCritCss(){
     document.getElementById("dummyDefault").value=document.getElementById("autoptimize_css_defer_inline").value;
+    jQuery("#dummyDefault").attr("spellcheck",false);
     jQuery("#default_critcss_wrapper").dialog({
         autoOpen: true,
@@ -337 +340 @@
 function editAdditionalCritCss(){
     document.getElementById("dummyAdditional").value=document.getElementById("autoptimize_ccss_additional").value;
+    jQuery("#dummyAdditional").attr("spellcheck",false);
     jQuery("#additional_critcss_wrapper").dialog({
         autoOpen: true,

autoptimize/trunk/readme.txt

@@ -3 +3 @@
 Tags: optimize, minify, performance, images, core web vitals, lazy-load, pagespeed, google fonts
 Donate link: http://blog.futtta.be/2013/10/21/do-not-donate-to-me/
-Requires at least: 5.3 
-Tested up to: 6.3
+Requires at least: 5.3
+Tested up to: 6.4
 Requires PHP: 5.6
 Stable tag: 3.1.8.1
@@ -21 +21 @@
 > We provide great [Premium Support and Web Performance Optimization services](https://misc.optimizingmatters.com/partners/?from=partnertab&partner=autoptimizepro), check out our offering on [https://accelera.site/](https://misc.optimizingmatters.com/partners/?from=partnertab&partner=autoptimizepro)!
 
-(Speed-surfing image under  creative commons [by LL Twistiti](https://www.flickr.com/photos/twistiti/818552808/))
+(Speed-surfing image under creative commons [by LL Twistiti](https://www.flickr.com/photos/twistiti/818552808/))
 
 == Installation ==
@@ -320 +320 @@
 == Changelog ==
 
+= 3.1.9 =
+* improvement: activate JS, CSS & HTML optimization upon plugin activation (hat tip to Adam Silverstein (developer relations engineer at Google))
+* improvement: also defer asynced JS (to ensure execution order remains intact; asynced JS should not execute before deferred inline JS which it might depend upon)
+* improvement: exclude images from being lazyloaded if they have fetchpriority attribute set to high (as done by WordPress core since 6.3)
+* bugfix: disable spellcheck on CSS textarea's (above the fold CSS/ critical CSS) which in some cases caused browser issues
+* add tab to explain Autoptimize Pro.
+* confirmed working with WordPress 6.4 (beta 3)
+* some other minor changes/ improvements/ filters, see the [GitHub commit log](https://github.com/futtta/autoptimize/commits/beta).
+
 = 3.1.8.1 =
 * urgent fix for PHP error, sorry about that!