LPD-52709 Part 5: reenable functionality disabled in LPD-63433 (once CI is fixed)

modules/_node-scripts/bundle/cssLoad/writeCSSExportsLoaderModules.mjs

@@ -6,8 +6,13 @@
 import fs from 'fs/promises';
 import path from 'path';
 
-import {BUILD_NPM_EXPORTS_PATH} from '../../util/constants.mjs';
+import {
+	BUILD_CSS_EXPORTS_PATH,
+	BUILD_NPM_EXPORTS_PATH,
+} from '../../util/constants.mjs';
 import getFlatName from '../../util/getFlatName.mjs';
+import calculateFileHash from '../util/calculateFileHash.mjs';
+import extractFileHash from '../util/extractFileHash.mjs';
 import getCSSLoadJavaScript from '../util/getCSSLoadJavaScript.mjs';
 
 export default async function writeCSSExportsLoaderModules(
@@ -30,17 +35,31 @@ export default async function writeCSSExportsLoaderModules(
 async function writeCSSExportLoaderModule(webContextPath, moduleName) {
 	const flatModuleName = getFlatName(moduleName);
 
+	const baseFlatModuleName = flatModuleName.substring(
+		0,
+		flatModuleName.length - 4
+	);
+
+	const cssFiles = await fs.readdir(path.join(BUILD_CSS_EXPORTS_PATH));
+
+	const cssFile = cssFiles.find((cssFile) =>
+		cssFile.startsWith(`${baseFlatModuleName}.(`)
+	);
+
+	const cssFileHash = extractFileHash(cssFile);
+
+	const source = getCSSLoadJavaScript(
+		webContextPath,
+		`__liferay__/css/${baseFlatModuleName}.(${cssFileHash}).css`
+	);
+
+	const hash = await calculateFileHash(source);
+
 	const cssLoaderPath = path.join(
 		BUILD_NPM_EXPORTS_PATH,
-		`${flatModuleName}.js`
+		`${flatModuleName}.(${hash}).js`
 	);
 
 	await fs.mkdir(path.dirname(cssLoaderPath), {recursive: true});
-	await fs.writeFile(
-		cssLoaderPath,
-		getCSSLoadJavaScript(
-			webContextPath,
-			`__liferay__/css/${flatModuleName}`
-		)
-	);
+	await fs.writeFile(cssLoaderPath, source);
 }

modules/_node-scripts/bundle/esbuild/bundleCSSExports.mjs

@@ -30,6 +30,7 @@ async function bundle(moduleName) {
 	const entryPoint = getEntryPoint(moduleName);
 
 	const esbuildConfig = {
+		entryNames: '[dir]/[name].([hash])',
 		entryPoints: [entryPoint],
 		loader: {
 			'.png': 'empty',

modules/_node-scripts/bundle/esbuild/bundleJavaScriptExports.mjs

@@ -57,6 +57,7 @@ async function bundle(
 	const esbuildConfig = {
 		alias: projectAlias,
 		bundle: true,
+		entryNames: '[dir]/[name].([hash])',
 		entryPoints: [entryPoint],
 		format: 'esm',
 		outdir: BUILD_MAIN_EXPORTS_PATH,
@@ -103,14 +104,17 @@ async function bundle(
 
 	const flatModuleName = getFlatName(moduleName);
 
-	await runEsbuild(esbuildConfig, flatModuleName);
+	const {metafile} = await runEsbuild(esbuildConfig, flatModuleName);
+	const {outputs} = metafile;
 
-	await relocateSourcemap(
-		path.join(
-			BUILD_MAIN_EXPORTS_PATH,
-			'exports',
-			`${flatModuleName}.js.map`
-		),
-		projectWebContextPath
-	);
+	await Promise.all([
+		...Object.keys(outputs).map(async (output) => {
+			if (output.endsWith('.map')) {
+				return relocateSourcemap(
+					path.join(output),
+					projectWebContextPath
+				);
+			}
+		}),
+	]);
 }

modules/_node-scripts/bundle/esbuild/bundleJavaScriptMain.mjs

@@ -41,6 +41,7 @@ export default async function bundleJavaScriptMain(
 	const esbuildConfig = {
 		alias: projectAlias,
 		bundle: true,
+		entryNames: '[dir]/[name].([hash])',
 		entryPoints: [
 			...Object.keys(submodules).map((submoduleName) => ({
 				in: path.resolve(submodules[submoduleName]),
@@ -97,19 +98,18 @@ export default async function bundleJavaScriptMain(
 		);
 	}
 
-	await runEsbuild(esbuildConfig, 'main');
+	const {metafile} = await runEsbuild(esbuildConfig, 'main');
+	const {outputs} = metafile;
 
 	await Promise.all([
-		relocateSourcemap(
-			path.join(BUILD_MAIN_EXPORTS_PATH, 'index.js.map'),
-			projectWebContextPath
-		),
-		...Object.keys(submodules).map((submodule) =>
-			relocateSourcemap(
-				path.join(BUILD_MAIN_EXPORTS_PATH, `${submodule}.js.map`),
-				projectWebContextPath
-			)
-		),
+		...Object.keys(outputs).map(async (output) => {
+			if (output.endsWith('.map')) {
+				return relocateSourcemap(
+					path.join(output),
+					projectWebContextPath
+				);
+			}
+		}),
 		writeLanguageJSON(languageJSON),
 	]);
 }

modules/_node-scripts/bundle/esbuild/plugins/getScssLoaderPlugin.mjs

@@ -29,15 +29,15 @@ export default function getScssLoaderPlugin(projectWebContextPath) {
 				async (args) => {
 					const projectPath = path.relative(SRC_PATH, args.path);
 
+					const projectBasePath = projectPath.replace(/\.scss$/, '');
+
 					const cssFiles = await fs.readdir(
 						path.join(
 							BUILD_SASS_CACHE_PATH,
 							path.dirname(projectPath)
 						)
 					);
 
-					const projectBasePath = projectPath.replace(/\.scss$/, '');
-
 					const cssBasename = cssFiles.find((cssFile) =>
 						cssFile.startsWith(
 							`${path.basename(projectBasePath)}.(`

modules/_node-scripts/bundle/esbuild/runEsbuild.mjs

@@ -8,17 +8,21 @@ import fs from 'fs/promises';
 import path from 'path';
 
 export default async function runEsbuild(esbuildConfig, configName) {
-	await Promise.all([
+	const [result] = await Promise.all([
 		doRunEsbuild(esbuildConfig, configName),
 		writeDebugEsbuildConfig(esbuildConfig, configName),
 	]);
+
+	return result;
 }
 
 async function doRunEsbuild(esbuildesbuildConfig, configName) {
+	let result;
+
 	const start = performance.now();
 
 	try {
-		await esbuild.build({
+		result = await esbuild.build({
 			define: {
 
 				// Flag to use React 16 instead of React 18. See render.tsx in frontend-js-react-web.
@@ -27,6 +31,7 @@ async function doRunEsbuild(esbuildesbuildConfig, configName) {
 					? 'true'
 					: 'false',
 			},
+			metafile: true,
 			minify: process.env.NODE_ENV === 'production',
 			...esbuildesbuildConfig,
 		});
@@ -40,6 +45,8 @@ async function doRunEsbuild(esbuildesbuildConfig, configName) {
 	console.log(
 		`⌛ Esbuild for ${configName} took: ${(lapse / 1000).toFixed(3)} s`
 	);
+
+	return result;
 }
 
 async function writeDebugEsbuildConfig(esbuildConfig, configName) {

modules/_node-scripts/bundle/index.mjs

@@ -74,7 +74,6 @@ export default async function main() {
 		// CSS exports bundling
 
 		bundleCSSExports(projectExports),
-		writeCSSExportsLoaderModules(projectExports, projectWebContextPath),
 
 		// AMD bridging
 
@@ -100,5 +99,7 @@ export default async function main() {
 		),
 	]);
 
+	await writeCSSExportsLoaderModules(projectExports, projectWebContextPath);
+
 	await writeTimings(start, endConfig);
 }

modules/_node-scripts/package.json

@@ -4,7 +4,7 @@
 		"node-scripts": "./bin.js"
 	},
 	"com.liferay": {
-		"sha256": "00d2a972afe65186b666efa058975f387ea44673708b4158204d3bbdba5cc781"
+		"sha256": "731360bca3b133cedbdc76f8b0ee91196992ac777cbd90f7b21ae9f4105701fd"
 	},
 	"dependencies": {
 		"@babel/preset-env": "7.24.7",

modules/apps/frontend-editor/frontend-editor-alloyeditor-web/src/main/resources/META-INF/resources/resources.jsp

@@ -8,6 +8,12 @@
 <%@ include file="/init.jsp" %>
 
 <%
+String alloyEditorServletContextName = PortalWebResourcesUtil.getServletContext(
+	PortalWebResourceConstants.RESOURCE_TYPE_EDITOR_ALLOYEDITOR
+).getServletContextName();
+String ckEditorServletContextName = PortalWebResourcesUtil.getServletContext(
+	PortalWebResourceConstants.RESOURCE_TYPE_EDITOR_CKEDITOR
+).getServletContextName();
 String editorName = (String)request.getAttribute(AlloyEditorConstants.ATTRIBUTE_NAMESPACE + ":editorName");
 %>
 
@@ -16,18 +22,14 @@ String editorName = (String)request.getAttribute(AlloyEditorConstants.ATTRIBUTE_
 >
 	<aui:link href='<%= PortalUtil.getStaticResourceURL(request, themeDisplay.getCDNHost() + PortalWebResourcesUtil.getContextPath(PortalWebResourceConstants.RESOURCE_TYPE_EDITOR_ALLOYEDITOR) + "/alloyeditor/assets/alloy-editor-atlas.css") %>' rel="stylesheet" senna="temporary" type="text/css" />
 
-	<%
-	long javaScriptLastModified = PortalWebResourcesUtil.getLastModified(PortalWebResourceConstants.RESOURCE_TYPE_EDITOR_ALLOYEDITOR);
-	%>
-
 	<aui:script senna="temporary" type="text/javascript">
 		window.ALLOYEDITOR_BASEPATH =
 			'<%= PortalUtil.getPathProxy() + application.getContextPath() %>/alloyeditor/';
 	</aui:script>
 
-	<aui:script id='<%= namespace + "ckEditorScript" %>' senna="temporary" src='<%= HtmlUtil.escapeAttribute(PortalUtil.getStaticResourceURL(request, themeDisplay.getCDNHost() + PortalWebResourcesUtil.getContextPath(PortalWebResourceConstants.RESOURCE_TYPE_EDITOR_CKEDITOR) + "/ckeditor/ckeditor.js", javaScriptLastModified)) %>' type="text/javascript"></aui:script>
+	<aui:script hashedFile="<%= true %>" id='<%= namespace + "ckEditorScript" %>' senna="temporary" src='<%= ckEditorServletContextName + "/ckeditor/ckeditor.js" %>' type="text/javascript"></aui:script>
 
-	<aui:script id='<%= namespace + "alloyEditorScript" %>' senna="temporary" src='<%= HtmlUtil.escapeAttribute(PortalUtil.getStaticResourceURL(request, themeDisplay.getCDNHost() + PortalWebResourcesUtil.getContextPath(PortalWebResourceConstants.RESOURCE_TYPE_EDITOR_ALLOYEDITOR) + "/alloyeditor/alloy-editor-no-ckeditor-min.js", javaScriptLastModified)) %>' type="text/javascript"></aui:script>
+	<aui:script hashedFile="<%= true %>" id='<%= namespace + "alloyEditorScript" %>' senna="temporary" src='<%= alloyEditorServletContextName + "/alloyeditor/alloy-editor-no-ckeditor-min.js" %>' type="text/javascript"></aui:script>
 
 	<liferay-util:dynamic-include key='<%= "com.liferay.frontend.editor.alloyeditor.web#" + editorName + "#additionalResources" %>' />
 

modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/init.jsp

@@ -30,7 +30,6 @@ page import="com.liferay.portal.kernel.util.GetterUtil" %><%@
 page import="com.liferay.portal.kernel.util.HashMapBuilder" %><%@
 page import="com.liferay.portal.kernel.util.HtmlUtil" %><%@
 page import="com.liferay.portal.kernel.util.JavaConstants" %><%@
-page import="com.liferay.portal.kernel.util.PortalUtil" %><%@
 page import="com.liferay.portal.kernel.util.SessionClicks" %><%@
 page import="com.liferay.portal.kernel.util.TextFormatter" %><%@
 page import="com.liferay.portal.kernel.util.URLCodec" %><%@

modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/resources.jsp

@@ -8,6 +8,9 @@
 <%@ include file="/init.jsp" %>
 
 <%
+String ckEditorServletContextName = PortalWebResourcesUtil.getServletContext(
+	PortalWebResourceConstants.RESOURCE_TYPE_EDITOR_CKEDITOR
+).getServletContextName();
 String editorName = (String)request.getAttribute(CKEditorConstants.ATTRIBUTE_NAMESPACE + ":editorName");
 boolean inlineEdit = GetterUtil.getBoolean((String)request.getAttribute(CKEditorConstants.ATTRIBUTE_NAMESPACE + ":inlineEdit"));
 String inlineEditSaveURL = GetterUtil.getString((String)request.getAttribute(CKEditorConstants.ATTRIBUTE_NAMESPACE + ":inlineEditSaveURL"));
@@ -22,14 +25,10 @@ String inlineEditSaveURL = GetterUtil.getString((String)request.getAttribute(CKE
 		}
 	</aui:style>
 
-	<%
-	long javaScriptLastModified = PortalWebResourcesUtil.getLastModified(PortalWebResourceConstants.RESOURCE_TYPE_EDITOR_CKEDITOR);
-	%>
-
-	<aui:script senna="temporary" src='<%= HtmlUtil.escapeAttribute(PortalUtil.getStaticResourceURL(request, themeDisplay.getCDNHost() + PortalWebResourcesUtil.getContextPath(PortalWebResourceConstants.RESOURCE_TYPE_EDITOR_CKEDITOR) + "/ckeditor/ckeditor.js", javaScriptLastModified)) %>' type="text/javascript"></aui:script>
+	<aui:script hashedFile="<%= true %>" senna="temporary" src='<%= ckEditorServletContextName + "/ckeditor/ckeditor.js" %>' type="text/javascript"></aui:script>
 
 	<c:if test="<%= inlineEdit && Validator.isNotNull(inlineEditSaveURL) %>">
-		<aui:script senna="temporary" src='<%= HtmlUtil.escapeAttribute(PortalUtil.getStaticResourceURL(request, themeDisplay.getCDNHost() + PortalWebResourcesUtil.getContextPath(PortalWebResourceConstants.RESOURCE_TYPE_EDITOR_CKEDITOR) + "/js/legacy/main.js", javaScriptLastModified)) %>' type="text/javascript"></aui:script>
+		<aui:script hashedFile="<%= true %>" senna="temporary" src='<%= ckEditorServletContextName + "/js/legacy/main.js" %>' type="text/javascript"></aui:script>
 	</c:if>
 
 	<liferay-util:dynamic-include key='<%= "com.liferay.frontend.editor.ckeditor.web#" + editorName + "#additionalResources" %>' />