From 649a9cd10bd224d7c13c6d03df76a8861df09957 Mon Sep 17 00:00:00 2001
From: Tim Carr <tim@n7studios.co.uk>
Date: Thu, 23 Apr 2026 18:43:06 +0800
Subject: [PATCH] LiteSpeed Cache: Exclude JS from Combine

---
 includes/class-convertkit-cache-plugins.php   | 24 +++++++++++++++++++
 .../PageBlockFormPerformancePluginsCest.php   |  6 ++---
 .../PageShortcodeFormCest.php                 |  6 ++---
 .../forms/post-types/BlockEditorFormCest.php  |  6 ++---
 .../post-types/ClassicEditorFormCest.php      |  6 ++---
 tests/Support/Helper/WPCachePlugins.php       |  8 ++++++-
 6 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/includes/class-convertkit-cache-plugins.php b/includes/class-convertkit-cache-plugins.php
index bbb71b688..e777f560f 100644
--- a/includes/class-convertkit-cache-plugins.php
+++ b/includes/class-convertkit-cache-plugins.php
@@ -67,6 +67,10 @@ public function __construct() {
 		add_filter( 'convertkit_output_script_footer', array( $this, 'litespeed_cache_exclude_js_defer' ) );
 		add_filter( 'convertkit_resource_forms_output_script', array( $this, 'litespeed_cache_exclude_js_defer' ) );
 
+		// LiteSpeed: Exclude Forms from JS optimization.
+		add_filter( 'convertkit_output_script_footer', array( $this, 'litespeed_cache_exclude_js_optimize' ) );
+		add_filter( 'convertkit_resource_forms_output_script', array( $this, 'litespeed_cache_exclude_js_optimize' ) );
+
 		// Perfmatters: Exclude Forms from Delay JavaScript.
 		add_filter( 'convertkit_output_script_footer', array( $this, 'perfmatters_exclude_delay_js' ) );
 		add_filter( 'convertkit_resource_forms_output_script', array( $this, 'perfmatters_exclude_delay_js' ) );
@@ -156,6 +160,26 @@ public function litespeed_cache_exclude_js_defer( $script ) {
 
 	}
 
+	/**
+	 * Disable JS Optimization on Kit scripts when the LiteSpeed Cache Plugin is installed, active
+	 * and its "JS Combine" setting is enabled.
+	 *
+	 * @since   3.3.1
+	 *
+	 * @param   array $script     Script key/value pairs to output as <script> tag.
+	 * @return  array
+	 */
+	public function litespeed_cache_exclude_js_optimize( $script ) {
+
+		return array_merge(
+			$script,
+			array(
+				'data-no-optimize' => '1',
+			)
+		);
+
+	}
+
 	/**
 	 * Exclude ConvertKit scripts from Perfmatters' "Delay JS" setting.
 	 *
diff --git a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormPerformancePluginsCest.php b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormPerformancePluginsCest.php
index dbcaac603..008e368ba 100644
--- a/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormPerformancePluginsCest.php
+++ b/tests/EndToEnd/forms/blocks-shortcodes/PageBlockFormPerformancePluginsCest.php
@@ -246,7 +246,7 @@ public function testFormBlockWithSitegroundSpeedOptimizerPlugin(EndToEndTester $
 
 	/**
 	 * Test that the Form <script> embed is output in the content, and not the footer of the site
-	 * when the LiteSpeed Cache Plugin is active and its "Load JS Deferred" setting is enabled.
+	 * when the LiteSpeed Cache Plugin is active and its "Load JS Deferred" and "JS Combine" settings are enabled.
 	 *
 	 * @since   2.4.5
 	 *
@@ -262,8 +262,8 @@ public function testFormBlockWithLiteSpeedCachePlugin(EndToEndTester $I)
 		$I->activateThirdPartyPlugin($I, 'litespeed-cache');
 		$I->enableCachingLiteSpeedCachePlugin($I);
 
-		// Enable LiteSpeed Cache's "Load JS Deferred" setting.
-		$I->enableLiteSpeedCacheLoadJSDeferred($I);
+		// Enable LiteSpeed Cache's "Load JS Deferred" and "JS Combine" settings.
+		$I->enableLiteSpeedCacheLoadJSDeferredAndCombine($I);
 
 		// Add a Page using the Gutenberg editor.
 		$I->addGutenbergPage(
diff --git a/tests/EndToEnd/forms/blocks-shortcodes/PageShortcodeFormCest.php b/tests/EndToEnd/forms/blocks-shortcodes/PageShortcodeFormCest.php
index 18ea9391b..a9fba083c 100644
--- a/tests/EndToEnd/forms/blocks-shortcodes/PageShortcodeFormCest.php
+++ b/tests/EndToEnd/forms/blocks-shortcodes/PageShortcodeFormCest.php
@@ -665,7 +665,7 @@ public function testFormShortcodeWithJetpackBoostPlugin(EndToEndTester $I)
 
 	/**
 	 * Test that the Form <script> embed is output in the content, and not the footer of the site
-	 * when the LiteSpeed Cache Plugin is active and its "Load JS Deferred" setting is enabled.
+	 * when the LiteSpeed Cache Plugin is active and its "Load JS Deferred" and "JS Combine" settings are enabled.
 	 *
 	 * @since   2.4.5
 	 *
@@ -681,8 +681,8 @@ public function testFormShortcodeWithLiteSpeedCachePlugin(EndToEndTester $I)
 		$I->activateThirdPartyPlugin($I, 'litespeed-cache');
 		$I->enableCachingLiteSpeedCachePlugin($I);
 
-		// Enable LiteSpeed Cache's "Load JS Deferred" setting.
-		$I->enableLiteSpeedCacheLoadJSDeferred($I);
+		// Enable LiteSpeed Cache's "Load JS Deferred" and "JS Combine" settings.
+		$I->enableLiteSpeedCacheLoadJSDeferredAndCombine($I);
 
 		// Add a Page using the Classic Editor.
 		$I->addClassicEditorPage(
diff --git a/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php b/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
index 764183ccb..50f84b9d6 100644
--- a/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
+++ b/tests/EndToEnd/forms/post-types/BlockEditorFormCest.php
@@ -786,7 +786,7 @@ public function testAddNewPostTypeUsingModalFormWithJetpackBoostPlugin(EndToEndT
 
 	/**
 	 * Test that the Modal Form is output once when the LiteSpeed Cache Plugin is active and
-	 * its "Load JS Deferred" setting is enabled for a WordPress Page, Post or Article.
+	 * its "Load JS Deferred" and "JS Combine" settings are enabled for a WordPress Page, Post or Article.
 	 *
 	 * @since   2.4.5
 	 *
@@ -802,8 +802,8 @@ public function testAddNewPostTypeUsingModalFormWithLiteSpeedCachePlugin(EndToEn
 		$I->activateThirdPartyPlugin($I, 'litespeed-cache');
 		$I->enableCachingLiteSpeedCachePlugin($I);
 
-		// Enable LiteSpeed Cache's "Load JS Deferred" setting.
-		$I->enableLiteSpeedCacheLoadJSDeferred($I);
+		// Enable LiteSpeed Cache's "Load JS Deferred" and "JS Combine" settings.
+		$I->enableLiteSpeedCacheLoadJSDeferredAndCombine($I);
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
diff --git a/tests/EndToEnd/forms/post-types/ClassicEditorFormCest.php b/tests/EndToEnd/forms/post-types/ClassicEditorFormCest.php
index d33f005d5..c9990099d 100644
--- a/tests/EndToEnd/forms/post-types/ClassicEditorFormCest.php
+++ b/tests/EndToEnd/forms/post-types/ClassicEditorFormCest.php
@@ -863,7 +863,7 @@ public function testAddNewPostTypeUsingModalFormWithJetpackBoostPlugin(EndToEndT
 
 	/**
 	 * Test that the Modal Form is output once when the LiteSpeed Cache Plugin is active and
-	 * its "Load JS Deferred" setting is enabled for a WordPress Page, Post or Article.
+	 * its "Load JS Deferred" and "JS Combine" settings are enabled for a WordPress Page, Post or Article.
 	 *
 	 * @since   2.4.5
 	 *
@@ -879,8 +879,8 @@ public function testAddNewPostTypeUsingModalFormWithLiteSpeedCachePlugin(EndToEn
 		$I->activateThirdPartyPlugin($I, 'litespeed-cache');
 		$I->enableCachingLiteSpeedCachePlugin($I);
 
-		// Enable LiteSpeed Cache's "Load JS Deferred" setting.
-		$I->enableLiteSpeedCacheLoadJSDeferred($I);
+		// Enable LiteSpeed Cache's "Load JS Deferred" and "JS Combine" settings.
+		$I->enableLiteSpeedCacheLoadJSDeferredAndCombine($I);
 
 		// Test each Post Type.
 		foreach ( $this->postTypes as $postType ) {
diff --git a/tests/Support/Helper/WPCachePlugins.php b/tests/Support/Helper/WPCachePlugins.php
index 52ba2f669..4f2c2b4e4 100644
--- a/tests/Support/Helper/WPCachePlugins.php
+++ b/tests/Support/Helper/WPCachePlugins.php
@@ -61,14 +61,20 @@ public function enableCachingLiteSpeedCachePlugin($I)
 	 *
 	 * @param   EndToEndTester $I      EndToEnd Tester.
 	 */
-	public function enableLiteSpeedCacheLoadJSDeferred($I)
+	public function enableLiteSpeedCacheLoadJSDeferredAndCombine($I)
 	{
 		// Enable LiteSpeed Cache's "Load JS Deferred" setting.
 		$I->amOnAdminPage('admin.php?page=litespeed-page_optm#settings_js');
 
 		// Wait for the LiteSpeed Cache settings to load.
+		$I->waitForElementVisible('label[for=input_radio_optmjs_comb_1]');
 		$I->waitForElementVisible('label[for=input_radio_optmjs_defer_1]');
+
+		// Enable JS Combine and Deferred.
+		$I->click('label[for=input_radio_optmjs_comb_1]');
 		$I->click('label[for=input_radio_optmjs_defer_1]');
+
+		// Save.
 		$I->click('Save Changes');
 
 		// Confirm LiteSpeed Cache settings saved.