Cherry pick branch 'genexuslabs:issue204942/javascript_modules_support' into beta

Daniel Eduardo Mendez BArberan · Beta Bot · commit 27134820667f · 2025-06-12T18:26:42.000Z
diff --git a/gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java b/gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java
@@ -673,7 +673,11 @@ public void ClearJavascriptSources() {
 		javascriptSources.clear();
 	}
 
-	public void AddJavascriptSource(String jsSrc, String urlBuildNumber, boolean userDefined, boolean isInlined)
+	public void AddJavascriptSource(String jsSrc, String urlBuildNumber, boolean userDefined, boolean isInlined) {
+		AddJavascriptSource( jsSrc, urlBuildNumber, userDefined, isInlined, false);
+	}
+
+	public void AddJavascriptSource(String jsSrc, String urlBuildNumber, boolean userDefined, boolean isInlined, boolean isModule)
 	{
 		if(!javascriptSources.contains(jsSrc))
 		{
@@ -686,7 +690,7 @@ public void AddJavascriptSource(String jsSrc, String urlBuildNumber, boolean use
 				queryString = "";
 				attributes = "data-gx-external-script";
 			}
-			String fragment = "<script type=\"text/javascript\" src=\"" + oldConvertURL(jsSrc) + queryString + "\" " + attributes + "></script>" ;
+			String fragment = "<script type=\"" + (isModule ? "module" : "text/javascript") + "\" src=\"" + oldConvertURL(jsSrc) + queryString + "\" " + attributes + "></script>" ;
 			if (isAjaxRequest() || isInlined || jsSrc == "jquery.js" || jsSrc == "gxcore.js")
 			{
 				writeTextNL(fragment);

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,11 @@ public void ClearJavascriptSources() {`
`673`	`673`	`javascriptSources.clear();`
`674`	`674`	`}`
`675`	`675`
`676`		`- public void AddJavascriptSource(String jsSrc, String urlBuildNumber, boolean userDefined, boolean isInlined)`
	`676`	`+ public void AddJavascriptSource(String jsSrc, String urlBuildNumber, boolean userDefined, boolean isInlined) {`
	`677`	`+ AddJavascriptSource( jsSrc, urlBuildNumber, userDefined, isInlined, false);`
	`678`	`+ }`
	`679`	`+`
	`680`	`+ public void AddJavascriptSource(String jsSrc, String urlBuildNumber, boolean userDefined, boolean isInlined, boolean isModule)`
`677`	`681`	`{`
`678`	`682`	`if(!javascriptSources.contains(jsSrc))`
`679`	`683`	`{`
`@@ -686,7 +690,7 @@ public void AddJavascriptSource(String jsSrc, String urlBuildNumber, boolean use`
`686`	`690`	`queryString = "";`
`687`	`691`	`attributes = "data-gx-external-script";`
`688`	`692`	`}`
`689`		`- String fragment = "<script type=\"text/javascript\" src=\"" + oldConvertURL(jsSrc) + queryString + "\" " + attributes + "></script>" ;`
	`693`	`+ String fragment = "<script type=\"" + (isModule ? "module" : "text/javascript") + "\" src=\"" + oldConvertURL(jsSrc) + queryString + "\" " + attributes + "></script>" ;`
`690`	`694`	`if (isAjaxRequest() \|\| isInlined \|\| jsSrc == "jquery.js" \|\| jsSrc == "gxcore.js")`
`691`	`695`	`{`
`692`	`696`	`writeTextNL(fragment);`