Fixes #5970: Delay js new jquery regex not working (#6031)

wp-media · Jul 10, 2023 · d6b4666 · d6b4666
1 parent b11a9ef
commit d6b4666
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/inc/Engine/Optimization/DelayJS/Admin/Settings.php b/inc/Engine/Optimization/DelayJS/Admin/Settings.php
@@ -145,7 +145,7 @@ public function maybe_disable_combine_js( $value, $old_value ): array {
 	public static function get_delay_js_default_exclusions(): array {
 
 		$exclusions = [
-			'\/jquery(-migrate)?-?([0-9.]+)?(.min|.slim|.slim.min)?.js(\?(.*))?$',
+			'\/jquery(-migrate)?-?([0-9.]+)?(.min|.slim|.slim.min)?.js(\?(.*))?( |\'|"|>)',
 			'js-(before|after)',
 		];
 

diff --git a/inc/ThirdParty/Themes/MinimalistBlogger.php b/inc/ThirdParty/Themes/MinimalistBlogger.php
@@ -35,7 +35,7 @@ public static function get_subscribed_events() {
 	 * @return array
 	 */
 	public function exclude_jquery_from_delay_js( array $exclusions = [] ) {
-		$exclusions[] = '\/jquery(-migrate)?-?([0-9.]+)?(.min|.slim|.slim.min)?.js(\?(.*))?$';
+		$exclusions[] = '\/jquery(-migrate)?-?([0-9.]+)?(.min|.slim|.slim.min)?.js(\?(.*))?( |\'|"|>)';
 		return $exclusions;
 	}
 }
diff --git a/tests/Fixtures/inc/ThirdParty/Themes/MinimalistBlogger/excludeJqueryFromDelayJs.php b/tests/Fixtures/inc/ThirdParty/Themes/MinimalistBlogger/excludeJqueryFromDelayJs.php
@@ -7,8 +7,8 @@
 			'excluded' => []
 		],
 		'expected' => [
-			'\/jquery(-migrate)?-?([0-9.]+)?(.min|.slim|.slim.min)?.js(\?(.*))?$'
-		]
+			'\/jquery(-migrate)?-?([0-9.]+)?(.min|.slim|.slim.min)?.js(\?(.*))?( |\'|"|>)',
+		],
 	],
 	'testThemeShouldReturnExpected' => [
 		'config' => [
@@ -17,7 +17,7 @@
 			'excluded' => []
 		],
 		'expected' => [
-			'\/jquery(-migrate)?-?([0-9.]+)?(.min|.slim|.slim.min)?.js(\?(.*))?$'
-		]
-	]
+			'\/jquery(-migrate)?-?([0-9.]+)?(.min|.slim|.slim.min)?.js(\?(.*))?( |\'|"|>)',
+		],
+	],
 ];