@ui5/builder 3.0.6 → 3.0.8

package/CHANGELOG.md

@@ -2,7 +2,20 @@
 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.0.6...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.0.8...HEAD).
+
+<a name="v3.0.8"></a>
+## [v3.0.8] - 2023-07-18
+### Bug Fixes
+- Revert "[INTERNAL] Remove implicit dependencies concept ([#913](https://github.com/SAP/ui5-builder/issues/913))" [`1043714`](https://github.com/SAP/ui5-builder/commit/1043714e3b952a8280f1ff7909f79db3b750eb0c)
+- **generateJsdoc:** Also process resources created by preceeding tasks [`04447bd`](https://github.com/SAP/ui5-builder/commit/04447bdec28b8bf18c24bd53e3fe8be9bdeed6c2)
+
+
+<a name="v3.0.7"></a>
+## [v3.0.7] - 2023-07-13
+### Bug Fixes
+- Don't report a missing module that's contained in another bundle ([#915](https://github.com/SAP/ui5-builder/issues/915)) [`8f23f38`](https://github.com/SAP/ui5-builder/commit/8f23f388f6d64f313ae8a89d0fcaf39ba905a70b)
+
 
 <a name="v3.0.6"></a>
 ## [v3.0.6] - 2023-06-21
@@ -803,6 +816,8 @@ 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.0.8]: https://github.com/SAP/ui5-builder/compare/v3.0.7...v3.0.8
+[v3.0.7]: https://github.com/SAP/ui5-builder/compare/v3.0.6...v3.0.7
 [v3.0.6]: https://github.com/SAP/ui5-builder/compare/v3.0.5...v3.0.6
 [v3.0.5]: https://github.com/SAP/ui5-builder/compare/v3.0.4...v3.0.5
 [v3.0.4]: https://github.com/SAP/ui5-builder/compare/v3.0.3...v3.0.4

package/lib/lbt/bundle/Resolver.js

@@ -51,6 +51,16 @@ class BundleResolver {
 		let selectedResources = Object.create(null);
 		let selectedResourcesSequence = [];
 		const pool = this.pool;
+		/**
+		 * Names of modules that are required in some way but could not be found
+		 * in the resource pool.
+		 */
+		const missingModules = Object.create(null);
+		/**
+		 * Names of modules that are included in non-decomposable bundles.
+		 * If they occur in the missingModules, then this is not an error.
+		 */
+		const includedModules = new Set();
 
 		/**
 		 * @param {JSModuleSectionDefinition} section
@@ -71,11 +81,16 @@ class BundleResolver {
 			}
 
 			function checkForDecomposableBundle(resource) {
-				if ( resource == null ||
-						resource.info == null ||
-						resource.info.subModules.length === 0 ||
-						/(?:^|\/)library.js$/.test(resource.info.name) ) {
-					return {resource, decomposable: false};
+				const isBundle =
+					resource?.info?.subModules.length > 0 &&
+					!/(?:^|\/)library.js$/.test(resource.info.name);
+
+				if (!isBundle) {
+					return {
+						resource,
+						isBundle,
+						decomposable: false
+					};
 				}
 
 				return Promise.all(
@@ -83,7 +98,11 @@ class BundleResolver {
 				).then((modules) => {
 					// it might look more natural to expect 'all' embedded modules to exist in the pool,
 					// but expecting only 'some' module to exist is a more conservative approach
-					return ({resource, decomposable: modules.some(($) => ($))});
+					return {
+						resource,
+						isBundle,
+						decomposable: modules.some(($) => ($))
+					};
 				});
 			}
 
@@ -105,20 +124,29 @@ class BundleResolver {
 						.catch( (err) => {
 							// if the caller provided an error message, log it
 							if ( msg ) {
-								log.error(msg);
+								missingModules[resourceName] ??= [];
+								missingModules[resourceName].push(msg);
 							}
 							// return undefined
 						})
 						.then( (resource) => checkForDecomposableBundle(resource) )
-						.then( ({resource, decomposable}) => {
+						.then( ({resource, isBundle, decomposable}) => {
 							const dependencyInfo = resource && resource.info;
 							let promises = [];
 
+							if ( isBundle && !decomposable ) {
+								resource.info.subModules.forEach(
+									(included) => {
+										includedModules.add(included);
+									}
+								);
+							}
+
 							if ( decomposable ) {
 								// bundles are not added, only their embedded modules
 								promises = dependencyInfo.subModules.map( (included) => {
 									return checkAndAddResource(included, depth + 1,
-										"**** error: missing submodule " + included + ", included by " + resourceName);
+										`**** error: missing submodule ${included}, included by ${resourceName}`);
 								});
 							} else if ( resource != null ) {
 								// trace.trace("    checking dependencies of " + resource.name );
@@ -136,8 +164,8 @@ class BundleResolver {
 											return;
 										}
 
-										return checkAndAddResource( required, depth + 1,
-											"**** error: missing module " + required + ", required by " + resourceName);
+										return checkAndAddResource(required, depth + 1,
+											`**** error: missing module ${required}, required by ${resourceName}`);
 									});
 								}
 
@@ -317,6 +345,17 @@ class BundleResolver {
 		// NODE-TODO if ( PerfMeasurement.ACTIVE ) PerfMeasurement.stop(PerfKeys.RESOLVE_MODULE);
 
 		return previous.then( function() {
+			// ignore missing modules that have been found in non-decomposable bundles
+			includedModules.forEach((included) => delete missingModules[included]);
+
+			// report the remaining missing modules
+			Object.keys(missingModules).sort().forEach((missing) => {
+				const messages = missingModules[missing];
+				messages.sort().forEach((msg) => {
+					log.error(msg);
+				});
+			});
+
 			log.verbose("  Resolving bundle done");
 
 			return resolved;