From 7e3dfdfa132db05e9aa980d7141d660f14b35503 Mon Sep 17 00:00:00 2001
From: Matt Hand <34258655+matthandus@users.noreply.github.com>
Date: Thu, 23 Feb 2023 11:04:37 -0500
Subject: [PATCH 1/3] Add typeAttribute parameter to scriptloader.js load
 method.

Support custom type attributes on the rendered script tag using a new typeAttribute parameter that defaults to 'text/javascript'.
---
 core/scriptloader.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/scriptloader.js b/core/scriptloader.js
index 855c32aad72..2da0bde8d0a 100644
--- a/core/scriptloader.js
+++ b/core/scriptloader.js
@@ -36,6 +36,8 @@ CKEDITOR.scriptLoader = ( function() {
 		 *			alert( 'Number of failures: ' + failed.length );
 		 *		} );
 		 *
+		 *		CKEDITOR.scriptLoader.load( '/myscript.js', callback, CKEDITOR, false, 'module' );
+		 *
 		 * @param {String/Array} scriptUrl One or more URLs pointing to the
 		 * scripts to be loaded.
 		 * @param {Function} [callback] A function to be called when the script
@@ -48,8 +50,10 @@ CKEDITOR.scriptLoader = ( function() {
 		 * the callback call. Defaults to {@link CKEDITOR}.
 		 * @param {Boolean} [showBusy] Changes the cursor of the document while
 		 * the script is loaded.
+		 * @param {String} [typeAttribute] Set a custom type attribute on the
+		 * script tag. Defaults to `text/javascript`.
 		 */
-		load: function( scriptUrl, callback, scope, showBusy ) {
+		load: function( scriptUrl, callback, scope, showBusy, typeAttribute ) {
 			var isString = ( typeof scriptUrl == 'string' );
 
 			if ( isString )
@@ -58,6 +62,9 @@ CKEDITOR.scriptLoader = ( function() {
 			if ( !scope )
 				scope = CKEDITOR;
 
+			if ( !typeAttribute )
+				typeAttribute = 'text/javascript';
+
 			var scriptCount = scriptUrl.length,
 				scriptCountDoCallback = scriptCount,
 				completed = [],
@@ -115,7 +122,7 @@ CKEDITOR.scriptLoader = ( function() {
 					// Create the <script> element.
 					var script = new CKEDITOR.dom.element( 'script' );
 					script.setAttributes( {
-						type: 'text/javascript',
+						type: typeAttribute,
 						src: url
 					} );
 

From 44e039a1c3bd100d0830c362636da26f2e6e23d1 Mon Sep 17 00:00:00 2001
From: Matt Hand <34258655+matthandus@users.noreply.github.com>
Date: Thu, 23 Feb 2023 11:13:48 -0500
Subject: [PATCH 2/3] Add custom attribute test to tests/core/scriptloader.js.

Test that the new custom type attribute is detected using the new typeAttribute parameter on the scriptLoader.load method.
---
 tests/core/scriptloader.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/core/scriptloader.js b/tests/core/scriptloader.js
index c89bdfe06fa..dbec3da585c 100644
--- a/tests/core/scriptloader.js
+++ b/tests/core/scriptloader.js
@@ -25,6 +25,23 @@ var tests = {
 		this.wait();
 	},
 
+	'test load with custom type attribute': function() {
+		var tc = this;
+
+		function callback() {
+			tc.resume( function() {
+				var script = CKEDITOR.document.findOne( 'src="../_assets/sample.js"' );
+
+				assert.areSame( script.$.attr( 'type' ), 'module' );
+				assert.areSame( 'Test!', testVar );
+			} );
+		}
+
+		CKEDITOR.scriptLoader.load( '../_assets/sample.js', callback, CKEDITOR, false, 'module' );
+
+		this.wait();
+	},
+
 	'test load event handling': function() {
 		var tc = this;
 

From bdee318b6ec7a638c4388961216b876231be5756 Mon Sep 17 00:00:00 2001
From: Matt Hand <34258655+matthandus@users.noreply.github.com>
Date: Thu, 23 Feb 2023 15:18:10 -0500
Subject: [PATCH 3/3] Fix findOne selector.

---
 tests/core/scriptloader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/core/scriptloader.js b/tests/core/scriptloader.js
index dbec3da585c..6fc30cf15ad 100644
--- a/tests/core/scriptloader.js
+++ b/tests/core/scriptloader.js
@@ -30,7 +30,7 @@ var tests = {
 
 		function callback() {
 			tc.resume( function() {
-				var script = CKEDITOR.document.findOne( 'src="../_assets/sample.js"' );
+				var script = CKEDITOR.document.findOne( 'script[src="../_assets/sample.js"]' );
 
 				assert.areSame( script.$.attr( 'type' ), 'module' );
 				assert.areSame( 'Test!', testVar );