Merge branch 'develop' into fix/donnot-cache-and-optimize-not-valid-t…

…axonomy-pages
wp-media · Oct 16, 2024 · 8cabc3f · 8cabc3f
2 parents 5e577cb + 8b46e6b
commit 8cabc3f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/inc/Engine/CDN/Subscriber.php b/inc/Engine/CDN/Subscriber.php
@@ -45,8 +45,8 @@ public function __construct( Options_Data $options, CDN $cdn ) {
 	public static function get_subscribed_events() {
 		return [
 			'rocket_buffer'           => [
-				[ 'rewrite', 20 ],
-				[ 'rewrite_srcset', 21 ],
+				[ 'rewrite', 2 ],
+				[ 'rewrite_srcset', 3 ],
 			],
 			'rocket_css_content'      => 'rewrite_css_properties',
 			'rocket_usedcss_content'  => 'rewrite_css_properties',

diff --git a/inc/Engine/Common/PerformanceHints/Frontend/Processor.php b/inc/Engine/Common/PerformanceHints/Frontend/Processor.php
@@ -95,6 +95,10 @@ public function maybe_apply_optimizations( string $html ): string {
 	 * @return string The modified HTML content with the beacon script injected just before the closing body tag.
 	 */
 	private function inject_beacon( $html, $url, $is_mobile ): string {
+		if ( rocket_get_constant( 'DONOTROCKETOPTIMIZE' ) ) {
+			return $html;
+		}
+
 		$min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
 		if ( ! $this->filesystem->exists( rocket_get_constant( 'WP_ROCKET_ASSETS_JS_PATH' ) . 'wpr-beacon' . $min . '.js' ) ) {

diff --git a/...ures/inc/Engine/Common/PerformanceHints/Frontend/Subscriber/maybe_apply_optimizations.php b/...ures/inc/Engine/Common/PerformanceHints/Frontend/Subscriber/maybe_apply_optimizations.php
@@ -68,6 +68,19 @@
 			],
 			'expected' => $html_input,
 		],
+		'shouldReturnOriginalWhenDonotoptimize' => [
+			'config' => [
+				'donotrocketoptimize' => true,
+				'html' => $html_input,
+				'atf' => [
+					'row' => null,
+				],
+				'lrc' => [
+					'row' => null,
+				],
+			],
+			'expected' => $html_input,
+		],
 		'shouldAddBeaconToPage' => [
 			'config' => [
 				'html' => $html_input,

diff --git a/tests/Integration/inc/Engine/CDN/Subscriber/rewrite.php b/tests/Integration/inc/Engine/CDN/Subscriber/rewrite.php
@@ -12,7 +12,7 @@ class Test_Rewrite extends TestCase {
 	public function set_up() {
 		parent::set_up();
 
-		$this->unregisterAllCallbacksExcept( 'rocket_buffer', 'rewrite', 20 );
+		$this->unregisterAllCallbacksExcept( 'rocket_buffer', 'rewrite', 2 );
 	}
 
 	public function tear_down() {

diff --git a/...tion/inc/Engine/Common/PerformanceHints/Frontend/Subscriber/maybe_apply_optimizations.php b/...tion/inc/Engine/Common/PerformanceHints/Frontend/Subscriber/maybe_apply_optimizations.php
@@ -56,6 +56,7 @@ public function tear_down() {
 	public function testShouldReturnAsExpected( $config, $expected ) {
 		$this->config = $config;
 		$this->cached_user = $config['user_cache_enabled'] ?? false;
+		$this->donotrocketoptimize = $config['donotrocketoptimize'] ?? null;
 
 		if ( isset( $config['query_string'] ) ) {
 			$_GET[ $config['query_string'] ] = 1;

diff --git a/wp-rocket.php b/wp-rocket.php
@@ -3,7 +3,7 @@
  * Plugin Name: WP Rocket
  * Plugin URI: https://wp-rocket.me
  * Description: The best WordPress performance plugin.
- * Version: 3.17.1-alpha1
+ * Version: 3.17.1
  * Requires at least: 5.8
  * Requires PHP: 7.3
  * Code Name: Iego
@@ -20,7 +20,7 @@
 defined( 'ABSPATH' ) || exit;
 
 // Rocket defines.
-define( 'WP_ROCKET_VERSION',               '3.17.1-alpha1' );
+define( 'WP_ROCKET_VERSION',               '3.17.1' );
 define( 'WP_ROCKET_WP_VERSION',            '5.8' );
 define( 'WP_ROCKET_WP_VERSION_TESTED',     '6.3.1' );
 define( 'WP_ROCKET_PHP_VERSION',           '7.3' );