3.10.1

inc/3rd-party/themes/uncode.php

@@ -17,8 +17,10 @@
 	function rocket_exclude_js_uncode( $excluded_js ) {
 		$excluded_js[] = rocket_clean_exclude_file( get_template_directory_uri() . '/library/js/init.js' );
 		$excluded_js[] = rocket_clean_exclude_file( get_template_directory_uri() . '/library/js/min/init.min.js' );
+		$excluded_js[] = rocket_clean_exclude_file( get_template_directory_uri() . '/library/js/init.min.js' );
 		$excluded_js[] = rocket_clean_exclude_file( get_template_directory_uri() . '/library/js/ai-uncode.js' );
 		$excluded_js[] = rocket_clean_exclude_file( get_template_directory_uri() . '/library/js/min/ai-uncode.min.js' );
+		$excluded_js[] = rocket_clean_exclude_file( get_template_directory_uri() . '/library/js/ai-uncode.min.js' );
 
 		return $excluded_js;
 	}
@@ -56,6 +58,7 @@ function rocket_exclude_inline_js_uncode( $inline_js ) {
 	function rocket_exclude_defer_js_uncode( $exclude_defer_js ) {
 		$exclude_defer_js[] = rocket_clean_exclude_file( get_template_directory_uri() . '/library/js/init.js' );
 		$exclude_defer_js[] = rocket_clean_exclude_file( get_template_directory_uri() . '/library/js/min/init.min.js' );
+		$exclude_defer_js[] = rocket_clean_exclude_file( get_template_directory_uri() . '/library/js/init.min.js' );
 		return $exclude_defer_js;
 	}
 	add_filter( 'rocket_exclude_defer_js', 'rocket_exclude_defer_js_uncode' );

inc/Engine/Admin/Beacon/Beacon.php

@@ -475,8 +475,8 @@ public function get_suggest( $doc_id ) {
 			],
 			'ecommerce'                  => [
 				'en' => [
-					'id'  => '555c619ce4b027e1978e1767',
-					'url' => 'https://docs.wp-rocket.me/article/75-is-wp-rocket-compatible-with-e-commerce-plugins/?utm_source=wp_plugin&utm_medium=wp_rocket',
+					'id'  => '548f492de4b034fd4862493e',
+					'url' => 'https://docs.wp-rocket.me/article/27-using-wp-rocket-on-your-ecommerce-site/?utm_source=wp_plugin&utm_medium=wp_rocket',
 				],
 				'fr' => [
 					'id'  => '568f8291c69791436155caea',

inc/Engine/Admin/Settings/Page.php

@@ -701,9 +701,9 @@ private function assets_section() {
 					'sanitize_callback'       => 'sanitize_checkbox',
 					'options'                 => [
 						'remove_unused_css' => [
-							'label'       => __( 'Remove Unused CSS', 'rocket' ),
+							'label'       => __( 'Remove Unused CSS (Beta)', 'rocket' ),
 							// translators: %1$s = opening <a> tag, %2$s = closing </a> tag.
-							'description' => sprintf( __( 'Removes unused CSS per page and helps to reduce page size and HTTP requests. Recommended for best performance. Test thoroughly!  %1$sMore info%2$s', 'rocket' ), '<a href="' . esc_url( $rucss_beacon['url'] ) . '" data-beacon-article="' . esc_attr( $rucss_beacon['id'] ) . '" target="_blank">', '</a>' ),
+							'description' => sprintf( __( 'Removes unused CSS per page and helps to reduce page size and HTTP requests. Recommended for best performance. Test thoroughly! %1$sMore info%2$s', 'rocket' ), '<a href="' . esc_url( $rucss_beacon['url'] ) . '" data-beacon-article="' . esc_attr( $rucss_beacon['id'] ) . '" target="_blank">', '</a>' ),
 							'warning'     => [
 								'title'        => __( 'We’re still working on it!', 'rocket' ),
 								'description'  => __( 'This is a beta feature. We’re providing you early access but some changes might be added later on. If you notice any errors on your website, simply deactivate the feature.', 'rocket' ),
@@ -729,7 +729,7 @@ private function assets_section() {
 							],
 						],
 						'async_css'         => [
-							'label'       => __( 'Load CSS Asynchronously', 'rocket' ),
+							'label'       => __( 'Load CSS asynchronously', 'rocket' ),
 							'description' => is_plugin_active( 'wp-criticalcss/wp-criticalcss.php' ) ?
 								// translators: %1$s = plugin name.
 								sprintf( _x( 'Load CSS asynchronously is currently handled by the %1$s plugin. If you want to use WP Rocket’s load CSS asynchronously option, disable the %1$s plugin.', 'WP Critical CSS compatibility', 'rocket' ), 'WP Critical CSS' ) :

inc/Engine/CriticalPath/CriticalCSSSubscriber.php

@@ -91,6 +91,8 @@ public static function get_subscribed_events() {
 			'switch_theme'                      => 'maybe_regenerate_cpcss',
 			'rocket_excluded_inline_js_content' => 'exclude_inline_js',
 			'before_delete_post'                => 'delete_cpcss',
+			'admin_post_rocket_rollback' => [ 'stop_critical_css_generation', 9 ],
+			'wp_rocket_upgrade' => [ 'stop_critical_css_generation', 9 ],
 		];
 		// phpcs:enable WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned
 	}
@@ -300,10 +302,7 @@ public function stop_process_on_deactivation( $old_value, $value ) {
 			&&
 			0 === (int) $value['async_css']
 		) {
-			$this->critical_css->stop_generation();
-
-			delete_transient( 'rocket_critical_css_generation_process_running' );
-			delete_transient( 'rocket_critical_css_generation_process_complete' );
+			$this->stop_critical_css_generation();
 		}
 	}
 
@@ -729,4 +728,18 @@ private function should_async_css() {
 
 		return ! is_rocket_post_excluded_option( 'async_css' );
 	}
+
+	/**
+	 * Stops the critical CSS generation.
+	 *
+	 * @since 3.10
+	 *
+	 * @return void
+	 */
+	public function stop_critical_css_generation() {
+
+		$this->critical_css->stop_generation();
+		delete_transient( 'rocket_critical_css_generation_process_running' );
+		delete_transient( 'rocket_critical_css_generation_process_complete' );
+	}
 }

inc/Engine/Optimization/DeferJS/DeferJS.php

@@ -219,6 +219,7 @@ public function get_excluded() : array {
 			'/wp-includes/js/dist/vendor/wp-polyfill(.min)?.js',
 			'/wp-includes/js/dist/url(.min)?.js',
 			'/wp-includes/js/dist/hooks(.min)?.js',
+			'www.paypal.com/sdk/js',
 		];
 
 		$exclude_defer_js = array_unique( array_merge( $exclude_defer_js, $this->options->get( 'exclude_defer_js', [] ) ) );

inc/Engine/Optimization/DelayJS/HTML.php

@@ -216,16 +216,43 @@ public function replace_scripts( $matches ): string {
 	 */
 	public function move_meta_charset_to_head( $html ): string {
 		$meta_pattern = "#<meta[^h]*(http-equiv[^=]*=[^\'\"]*[\'\" ]Content-Type[\'\"][ ]*[^>]*|)(charset[^=]*=[ ]*[\'\" ]*[^\'\"> ][^\'\">]+[^\'\"> ][\'\" ]*|charset[^=]*=*[^\'\"> ][^\'\">]+[^\'\"> ])([^>]*|)>(?=.*</head>)#Usmi";
-		if ( preg_match( $meta_pattern, $html, $matches ) ) {
-			$html = preg_replace( "$meta_pattern", '', $html );
-			if ( preg_match( '/<head\b/i', $html ) ) {
-				$html = preg_replace( '/(<head\b[^>]*?>)/i', "\${1}${matches[0]}", $html );
-			} elseif ( preg_match( '/<html\b/i', $html ) ) {
-				$html = preg_replace( '/(<html\b[^>]*?>)/i', "\${1}${matches[0]}", $html );
-			} else {
-				$html = preg_replace( '/(<\w+)/', "${matches[0]}\${1}", $html, 1 );
+
+		if ( ! preg_match( $meta_pattern, $html, $matches ) ) {
+			return $html;
+		}
+
+		$replaced_html = preg_replace( "$meta_pattern", '', $html );
+
+		if ( empty( $replaced_html ) ) {
+			return $html;
+		}
+
+		if ( preg_match( '/<head\b/i', $replaced_html ) ) {
+			$replaced_html = preg_replace( '/(<head\b[^>]*?>)/i', "\${1}${matches[0]}", $replaced_html, 1 );
+
+			if ( empty( $replaced_html ) ) {
+				return $html;
 			}
+
+			return $replaced_html;
 		}
-		return $html;
+
+		if ( preg_match( '/<html\b/i', $replaced_html ) ) {
+			$replaced_html = preg_replace( '/(<html\b[^>]*?>)/i', "\${1}${matches[0]}", $replaced_html, 1 );
+
+			if ( empty( $replaced_html ) ) {
+				return $html;
+			}
+
+			return $replaced_html;
+		}
+
+		$replaced_html = preg_replace( '/(<\w+)/', "${matches[0]}\${1}", $replaced_html, 1 );
+
+		if ( empty( $replaced_html ) ) {
+			return $html;
+		}
+
+		return $replaced_html;
 	}
 }

inc/Engine/Optimization/DelayJS/Subscriber.php

@@ -105,13 +105,23 @@ public function add_delay_js_script( $html ): string {
 
 		$lazyload_script = $this->filesystem->get_contents( rocket_get_constant( 'WP_ROCKET_PATH' ) . 'assets/js/lazyload-scripts.min.js' );
 
+		$replaced_html = $html;
+
 		if ( false !== $lazyload_script ) {
-			$html = preg_replace( $pattern, "$0<script>{$lazyload_script}</script>", $html, 1 );
+			$replaced_html = preg_replace( $pattern, "$0<script>{$lazyload_script}</script>", $replaced_html, 1 );
+
+			if ( empty( $replaced_html ) ) {
+				return $html;
+			}
 		}
 
-		$html = preg_replace( $pattern, '$0<script>' . $this->html->get_ie_fallback() . '</script>', $html, 1 );
+		$replaced_html = preg_replace( $pattern, '$0<script>' . $this->html->get_ie_fallback() . '</script>', $replaced_html, 1 );
+
+		if ( empty( $replaced_html ) ) {
+			return $html;
+		}
 
-		return $this->html->move_meta_charset_to_head( $html );
+		return $this->html->move_meta_charset_to_head( $replaced_html );
 	}
 
 	/**

inc/Engine/Optimization/Minify/JS/AbstractJSOptimization.php

@@ -245,6 +245,8 @@ protected function get_excluded_external_file_path() {
 			'cdna.hubpeople.com/js/widget_standalone_two_modes.js',
 			's3.tradingview.com',
 			'www.vbt.io/ext/vbtforms.js',
+			'cdn.callrail.com',
+			'documentcloud.adobe.com/view-sdk/main.js',
 		];
 
 		$excluded_external = array_merge( $defaults, $this->options->get( 'exclude_js', [] ) );

inc/Engine/Optimization/Minify/JS/Combine.php

@@ -714,6 +714,8 @@ protected function get_excluded_inline_content() {
 			'WoocommerceWidget/woocommerceWidget.js',
 			'var ht_ctc_chat_var',
 			'spuvar',
+			'var wpilFrontend',
+			'urls_polylangREPLACETOID',
 		];
 
 		$excluded_inline = array_merge( $defaults, $this->options->get( 'exclude_inline_js', [] ) );

inc/Engine/Optimization/RUCSS/Warmup/ResourceFetcher.php

@@ -334,4 +334,15 @@ private function decompress( string $data ): string {
 
 		return $decompressed;
 	}
+
+	/**
+	 * Cancel resource fetcher process
+	 *
+	 * @since 3.10
+	 *
+	 * @return void
+	 */
+	public function cancel_resource_fetcher_process() {
+		$this->process->cancel_process();
+	}
 }

inc/Engine/Optimization/RUCSS/Warmup/ResourceFetcherProcess.php

@@ -120,19 +120,22 @@ private function prepare_js_content( string $contents ) : string {
 	 * @return string
 	 */
 	private function get_resource_contents( array $resource ) : string {
-		$file_content = $resource['external'] ? $this->local_cache->get_content( $resource['url'] ) : $this->get_file_content( $resource['path'] );
+
+		$resource_path = ! empty( $resource['path'] ) ? $resource['path'] : '';
+
+		$file_content = ! empty( $resource['external'] ) ? $this->local_cache->get_content( $resource['url'] ) : $this->get_file_content( $resource_path );
 
 		// Minify the content if it's there.
 		if ( $file_content ) {
-			$file_content = 'js' === $resource['type'] ? $this->prepare_js_content( $file_content ) : $this->prepare_css_content( $resource['path'], $file_content );
+			$file_content = 'js' === $resource['type'] ? $this->prepare_js_content( $file_content ) : $this->prepare_css_content( $resource_path, $file_content );
 		}
 
 		if ( ! $file_content ) {
 			Logger::error(
 				'No file content.',
 				[
 					'RUCSS warmup process',
-					'path' => $resource['path'],
+					'path' => $resource_path,
 				]
 			);
 

inc/Engine/Optimization/RUCSS/Warmup/Subscriber.php

@@ -69,16 +69,18 @@ public function __construct( Options_Data $options, ResourceFetcher $resource_fe
 	 */
 	public static function get_subscribed_events() : array {
 		return [
-			'rocket_buffer' => [ 'collect_resources', 11 ],
-			'rest_api_init' => 'register_routes',
-			'switch_theme'  => 'restart_warmup_on_theme_change',
-			'init'          => [
+			'rocket_buffer'              => [ 'collect_resources', 11 ],
+			'rest_api_init'              => 'register_routes',
+			'switch_theme'               => 'restart_warmup_on_theme_change',
+			'init'                       => [
 				[ 'update_warmup_status_while_has_items', 10 ],
 				[ 'activate_optimization_on_warmup_completion', 11 ],
 				[ 'auto_stop_warmup_after_1hour', 12 ],
 			],
 			// The following priority should be less than 10.
 			'update_option_' . rocket_get_constant( 'WP_ROCKET_SLUG' ) => [ 'start_scanner', 9, 2 ],
+			'admin_post_rocket_rollback' => [ 'cancel_resource_fetching', 9 ],
+			'wp_rocket_upgrade'          => [ 'cancel_resource_fetching', 9 ],
 		];
 	}
 
@@ -203,4 +205,14 @@ public function register_routes() {
 		$this->restwp->register_status_route();
 	}
 
+	/**
+	 * Cancel resource fetching
+	 *
+	 * @since 3.10
+	 *
+	 * @return void
+	 */
+	public function cancel_resource_fetching() {
+		$this->resource_fetcher->cancel_resource_fetcher_process();
+	}
 }

inc/Engine/Preload/PreloadSubscriber.php

@@ -82,6 +82,8 @@ public static function get_subscribed_events() {
 			'rocket_after_preload_after_purge_cache' => [
 				[ 'maybe_preload_mobile_homepage', 10, 3 ],
 			],
+			'admin_post_rocket_rollback'             => [ 'stop_homepage_preload', 9 ],
+			'wp_rocket_upgrade'                      => [ 'stop_homepage_preload', 9 ],
 		];
 	}
 
@@ -385,4 +387,15 @@ public function do_admin_post_stop_preload() {
 		wp_safe_redirect( wp_get_referer() );
 		die();
 	}
+
+	/**
+	 * Stops homepage preload.
+	 *
+	 * @since 3.10
+	 *
+	 * @return void
+	 */
+	public function stop_homepage_preload() {
+		$this->homepage_preloader->cancel_preload();
+	}
 }

inc/Engine/Preload/SitemapPreloadSubscriber.php

@@ -40,6 +40,8 @@ public static function get_subscribed_events() {
 			'pagely_cache_purge_after'        => [ 'preload', 12 ],
 			'update_option_' . WP_ROCKET_SLUG => [ 'maybe_cancel_preload', 10, 2 ],
 			'admin_notices'                   => [ 'simplexml_notice' ],
+			'admin_post_rocket_rollback'      => [ 'stop_sitemap_preload', 9 ],
+			'wp_rocket_upgrade'               => [ 'stop_sitemap_preload', 9 ],
 		];
 	}
 
@@ -129,4 +131,15 @@ public function simplexml_notice() {
 			]
 		);
 	}
+
+	/**
+	 * Stops sitemap preload.
+	 *
+	 * @since 3.10
+	 *
+	 * @return void
+	 */
+	public function stop_sitemap_preload() {
+		$this->sitemap_preload->cancel_preload();
+	}
 }

inc/ThirdParty/Themes/Divi.php

@@ -56,11 +56,13 @@ public static function get_subscribed_events() {
 		if ( ! self::is_divi() ) {
 			return $events;
 		}
-
 		$events['rocket_exclude_js']                            = 'exclude_js';
 		$events['rocket_maybe_disable_youtube_lazyload_helper'] = 'add_divi_to_description';
 
 		$events['wp_enqueue_scripts'] = 'disable_divi_jquery_body';
+
+		$events['rocket_exclude_css'] = 'exclude_css_from_combine';
+
 		return $events;
 	}
 
@@ -172,4 +174,28 @@ public function disable_divi_jquery_body() {
 		}
 
 	}
+
+	/**
+	 * Excludes Divi's CSS files from CSS combination
+	 *
+	 * @since 3.10.1
+	 *
+	 * @param array $exclude_css An array of CSS to be excluded.
+	 *
+	 * @return array the updated array of paths
+	 */
+	public function exclude_css_from_combine( $exclude_css ) {
+
+		if ( ! (bool) $this->options->get( 'minify_concatenate_css', 0 ) ) {
+			return $exclude_css;
+		}
+
+		$wp_content = wp_parse_url( content_url( '/' ), PHP_URL_PATH );
+
+		if ( $wp_content ) {
+			$exclude_css[] = $wp_content . 'et-cache/(.*).css';
+		}
+
+		return $exclude_css;
+	}
 }