@ui5/builder 3.1.0 → 3.1.1

package/CHANGELOG.md

@@ -2,7 +2,14 @@
 All notable changes to this project will be documented in this file.  
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.1.0...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.1.1...HEAD).
+
+<a name="v3.1.1"></a>
+## [v3.1.1] - 2023-11-19
+### Bug Fixes
+- Handle graceful termination of workerpool for parallel builds ([#953](https://github.com/SAP/ui5-builder/issues/953)) [`f7b9f27`](https://github.com/SAP/ui5-builder/commit/f7b9f27ac5966bd89e52e4c2d5b03482a0f3dbb7)
+- **Bundling:** Detect manifest.json dependency of libraries [`6f9995f`](https://github.com/SAP/ui5-builder/commit/6f9995f5b47a6094fa93b5d433be849b1d3cdc7e)
+
 
 <a name="v3.1.0"></a>
 ## [v3.1.0] - 2023-10-11
@@ -832,6 +839,7 @@ to load the custom bundle file instead.
 
 ### Features
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
+[v3.1.1]: https://github.com/SAP/ui5-builder/compare/v3.1.0...v3.1.1
 [v3.1.0]: https://github.com/SAP/ui5-builder/compare/v3.0.9...v3.1.0
 [v3.0.9]: https://github.com/SAP/ui5-builder/compare/v3.0.8...v3.0.9
 [v3.0.8]: https://github.com/SAP/ui5-builder/compare/v3.0.7...v3.0.8

package/lib/lbt/resources/ResourcePool.js

@@ -95,6 +95,16 @@ async function determineDependencyInfo(resource, rawInfo, pool) {
 				new ComponentAnalyzer(pool).analyze(resource, info),
 				new SmartTemplateAnalyzer(pool).analyze(resource, info)
 			);
+		} else if ( /(?:^|\/)library\.js/.test(resource.name) ) {
+			promises.push(
+				(async () => {
+					const manifestName = resource.name.replace(/library\.js$/, "manifest.json");
+					const manifestResource = await pool.findResource(manifestName).catch(() => null);
+					if (manifestResource) {
+						info.addDependency(manifestName);
+					}
+				})()
+			);
 		}
 
 		await Promise.all(promises);

package/lib/processors/minifier.js

@@ -6,6 +6,7 @@ import workerpool from "workerpool";
 import Resource from "@ui5/fs/Resource";
 import {getLogger} from "@ui5/logger";
 const log = getLogger("builder:processors:minifier");
+import {setTimeout as setTimeoutPromise} from "node:timers/promises";
 
 const debugFileRegex = /((?:\.view|\.fragment|\.controller|\.designtime|\.support)?\.js)$/;
 
@@ -28,11 +29,28 @@ function getPool(taskUtil) {
 			workerType: "auto",
 			maxWorkers
 		});
-		taskUtil.registerCleanupTask(() => {
-			log.verbose(`Terminating workerpool`);
-			const poolToBeTerminated = pool;
-			pool = null;
-			poolToBeTerminated.terminate();
+		taskUtil.registerCleanupTask((force) => {
+			const attemptPoolTermination = async () => {
+				log.verbose(`Attempt to terminate the workerpool...`);
+
+				if (!pool) {
+					return;
+				}
+
+				// There are many stats that could be used, but these ones seem the most
+				// convenient. When all the (available) workers are idle, then it's safe to terminate.
+				let {idleWorkers, totalWorkers} = pool.stats();
+				while (idleWorkers !== totalWorkers && !force) {
+					await setTimeoutPromise(100); // Wait a bit workers to finish and try again
+					({idleWorkers, totalWorkers} = pool.stats());
+				}
+
+				const poolToBeTerminated = pool;
+				pool = null;
+				return poolToBeTerminated.terminate(force);
+			};
+
+			return attemptPoolTermination();
 		});
 	}
 	return pool;

package/lib/tasks/buildThemes.js

@@ -7,6 +7,7 @@ import {fileURLToPath} from "node:url";
 import os from "node:os";
 import workerpool from "workerpool";
 import {deserializeResources, serializeResources, FsMainThreadInterface} from "../processors/themeBuilderWorker.js";
+import {setTimeout as setTimeoutPromise} from "node:timers/promises";
 
 let pool;
 
@@ -23,11 +24,28 @@ function getPool(taskUtil) {
 			workerType: "thread",
 			maxWorkers
 		});
-		taskUtil.registerCleanupTask(() => {
-			log.verbose(`Terminating workerpool`);
-			const poolToBeTerminated = pool;
-			pool = null;
-			poolToBeTerminated.terminate();
+		taskUtil.registerCleanupTask((force) => {
+			const attemptPoolTermination = async () => {
+				log.verbose(`Attempt to terminate the workerpool...`);
+
+				if (!pool) {
+					return;
+				}
+
+				// There are many stats that could be used, but these ones seem the most
+				// convenient. When all the (available) workers are idle, then it's safe to terminate.
+				let {idleWorkers, totalWorkers} = pool.stats();
+				while (idleWorkers !== totalWorkers && !force) {
+					await setTimeoutPromise(100); // Wait a bit workers to finish and try again
+					({idleWorkers, totalWorkers} = pool.stats());
+				}
+
+				const poolToBeTerminated = pool;
+				pool = null;
+				return poolToBeTerminated.terminate(force);
+			};
+
+			return attemptPoolTermination();
 		});
 	}
 	return pool;

package/lib/tasks/bundlers/generateLibraryPreload.js

@@ -32,7 +32,11 @@ function getDefaultLibraryPreloadFilters(namespace, excludes) {
 }
 
 function getBundleDefinition(namespace, excludes) {
-	// TODO: move to config of actual core project
+	// Note: This configuration is only used when no bundle definition in ui5.yaml exists (see "skipBundles" parameter)
+
+	// TODO: Remove this hardcoded bundle definition.
+	// sap.ui.core ui5.yaml contains a configuration since UI5 1.103.0 (specVersion 2.4)
+	// so this is still required to build UI5 versions <= 1.102.0.
 	if (namespace === "sap/ui/core") {
 		return {
 			name: `${namespace}/library-preload.js`,
@@ -51,8 +55,6 @@ function getBundleDefinition(namespace, excludes) {
 					filters: [
 						// Note: Don't pass configured preload excludes for sap.ui.core
 						// as they are already hardcoded below.
-						// In future the sap/ui/core/library-preload should be configured
-						// as a custom bundle in the ui5.yaml.
 						...getDefaultLibraryPreloadFilters(namespace),
 
 						`!${namespace}/cldr/`,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "3.1.0",
+	"version": "3.1.1",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -131,31 +131,31 @@
 		"pretty-data": "^0.40.0",
 		"rimraf": "^5.0.5",
 		"semver": "^7.5.4",
-		"terser": "^5.21.0",
-		"workerpool": "^6.5.0",
+		"terser": "^5.24.0",
+		"workerpool": "^6.5.1",
 		"xml2js": "^0.6.2"
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
-		"@jridgewell/trace-mapping": "^0.3.19",
-		"@ui5/project": "^3.7.1",
+		"@jridgewell/trace-mapping": "^0.3.20",
+		"@ui5/project": "^3.7.3",
 		"ava": "^5.3.1",
 		"chai": "^4.3.10",
 		"chai-fs": "^2.0.0",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
-		"depcheck": "^1.4.6",
+		"depcheck": "^1.4.7",
 		"docdash": "^2.0.2",
-		"eslint": "^8.51.0",
+		"eslint": "^8.54.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^14.0.0",
-		"eslint-plugin-jsdoc": "^46.8.2",
-		"esmock": "^2.5.2",
+		"eslint-plugin-jsdoc": "^46.9.0",
+		"esmock": "^2.6.0",
 		"line-column": "^1.0.2",
 		"nyc": "^15.1.0",
 		"open-cli": "^7.2.0",
 		"recursive-readdir": "^2.2.3",
-		"sinon": "^16.1.0",
+		"sinon": "^16.1.3",
 		"tap-xunit": "^2.4.1"
 	}
 }