@ui5/builder 2.11.2 → 2.11.5

package/CHANGELOG.md

@@ -2,7 +2,22 @@
 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/v2.11.2...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v2.11.5...HEAD).
+
+<a name="v2.11.5"></a>
+## [v2.11.5] - 2022-05-04
+
+<a name="v2.11.4"></a>
+## [v2.11.4] - 2022-02-21
+### Bug Fixes
+- **generateFlexChangesBundle:** Fix minUI5Version check for UI5 v1.100.0+ ([#706](https://github.com/SAP/ui5-builder/issues/706)) [`fb1217a`](https://github.com/SAP/ui5-builder/commit/fb1217ac536c20da81526f82f2ecb03686815942)
+
+
+<a name="v2.11.3"></a>
+## [v2.11.3] - 2021-12-14
+### Bug Fixes
+- Enable buildThemes for libraries without .library [`7b941a7`](https://github.com/SAP/ui5-builder/commit/7b941a797210463a9fa8ca50753662c5db373aa6)
+
 
 <a name="v2.11.2"></a>
 ## [v2.11.2] - 2021-11-17
@@ -633,6 +648,9 @@ to load the custom bundle file instead.
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
 
 
+[v2.11.5]: https://github.com/SAP/ui5-builder/compare/v2.11.4...v2.11.5
+[v2.11.4]: https://github.com/SAP/ui5-builder/compare/v2.11.3...v2.11.4
+[v2.11.3]: https://github.com/SAP/ui5-builder/compare/v2.11.2...v2.11.3
 [v2.11.2]: https://github.com/SAP/ui5-builder/compare/v2.11.1...v2.11.2
 [v2.11.1]: https://github.com/SAP/ui5-builder/compare/v2.11.0...v2.11.1
 [v2.11.0]: https://github.com/SAP/ui5-builder/compare/v2.10.0...v2.11.0

package/lib/processors/jsdoc/lib/transformApiJson.js

@@ -1386,13 +1386,16 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 		},
 
+		formatUrlToLink: function(sTarget, sText, bSAPHosted){
+			return `<a target="_blank" rel="noopener noreferrer" href="${sTarget}">${sText}</a>
+			<img src="./resources/sap/ui/documentation/sdk/images/${bSAPHosted ? 'link-sap' : 'link-external'}.png"
+			title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapUISDKExternalLink"/>`;
+		},
+
 		handleExternalUrl: function (sTarget, sText) {
 			// Check if the external domain is SAP hosted
 			let bSAPHosted = /^https?:\/\/([\w.]*\.)?(?:sap|hana\.ondemand|sapfioritrial)\.com/.test(sTarget);
-
-			return `<a target="_blank" rel="noopener noreferrer" href="${sTarget}">${sText}</a>
-<img src="./resources/sap/ui/documentation/sdk/images/${bSAPHosted ? 'link-sap' : 'link-external'}.png"
-title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapUISDKExternalLink"/>`;
+			return this.formatUrlToLink(sTarget, sText, bSAPHosted);
 		},
 
 		/**
@@ -1599,6 +1602,12 @@ title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapU
 							return '<a target="_self" href="topic/' + aMatch[1] + '">' + sText + '</a>';
 						}
 
+						// demo:xxx Demo, open the demonstration page in a new window
+						aMatch = sTarget.match(/^demo:([a-zA-Z0-9\/.]*)$/);
+						if (aMatch) {
+							return this.formatUrlToLink("test-resources/" + aMatch[1], sText, true);
+						}
+
 						// sap.x.Xxx.prototype.xxx - In case of prototype we have a link to method
 						aMatch = sTarget.match(/([a-zA-Z0-9.$_]+?)\.prototype\.([a-zA-Z0-9.$_]+)$/);
 						if (aMatch) {

package/lib/tasks/buildThemes.js

@@ -54,8 +54,12 @@ module.exports = async function({
 		*/
 	let availableLibraries;
 	if (pAvailableLibraries) {
-		availableLibraries = (await pAvailableLibraries).map((resource) => {
-			return resource.getPath().replace(/[^/]*\.library/i, "");
+		availableLibraries = [];
+		(await pAvailableLibraries).forEach((resource) => {
+			const library = path.dirname(resource.getPath());
+			if (!availableLibraries.includes(library)) {
+				availableLibraries.push(library);
+			}
 		});
 	}
 	let availableThemes;

package/lib/tasks/bundlers/generateFlexChangesBundle.js

@@ -1,5 +1,6 @@
 const log = require("@ui5/logger").getLogger("builder:tasks:bundlers:generateFlexChangesBundle");
 const flexChangesBundler = require("../../processors/bundlers/flexChangesBundler");
+const semver = require("semver");
 
 /**
  * Task to create changesBundle.json file containing all changes stored in the /changes folder for easier consumption
@@ -68,9 +69,9 @@ module.exports = async function({workspace, taskUtil, options: {namespace}}) {
 	const allResources = await workspace.byGlob(
 		`${pathPrefix}/changes/*.{change,variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change}`);
 	if (allResources.length > 0) {
-		const version = await readManifestMinUI5Version();
+		const version = semver.coerce(await readManifestMinUI5Version());
 		let hasFlexBundleVersion = false;
-		if (parseFloat(version) >= 1.73) {
+		if (semver.compare(version, "1.73.0") >= 0) {
 			hasFlexBundleVersion = true;
 		}
 		const processedResources = await flexChangesBundler({

package/lib/types/library/LibraryBuilder.js

@@ -176,7 +176,7 @@ class LibraryBuilder extends AbstractBuilder {
 				dependencies: resourceCollections.dependencies,
 				options: {
 					projectName: project.metadata.name,
-					librariesPattern: !taskUtil.isRootProject() ? "/resources/**/*.library" : undefined,
+					librariesPattern: !taskUtil.isRootProject() ? "/resources/**/(*.library|library.js)" : undefined,
 					themesPattern: !taskUtil.isRootProject() ? "/resources/sap/ui/core/themes/*" : undefined,
 					inputPattern
 				}

package/lib/types/themeLibrary/ThemeLibraryBuilder.js

@@ -29,7 +29,7 @@ class ThemeLibraryBuilder extends AbstractBuilder {
 				dependencies: resourceCollections.dependencies,
 				options: {
 					projectName: project.metadata.name,
-					librariesPattern: !taskUtil.isRootProject() ? "/resources/**/*.library" : undefined,
+					librariesPattern: !taskUtil.isRootProject() ? "/resources/**/(*.library|library.js)" : undefined,
 					themesPattern: !taskUtil.isRootProject() ? "/resources/sap/ui/core/themes/*" : undefined,
 					inputPattern: "/resources/**/themes/*/library.source.less"
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "2.11.2",
+	"version": "2.11.5",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -110,31 +110,31 @@
 		"escape-unicode": "^0.2.0",
 		"escope": "^3.6.0",
 		"espree": "^6.2.1",
-		"globby": "^11.0.4",
-		"graceful-fs": "^4.2.8",
-		"jsdoc": "^3.6.7",
+		"globby": "^11.1.0",
+		"graceful-fs": "^4.2.10",
+		"jsdoc": "^3.6.10",
 		"less-openui5": "^0.11.2",
 		"make-dir": "^3.1.0",
 		"pretty-data": "^0.40.0",
 		"pretty-hrtime": "^1.0.3",
 		"replacestream": "^4.0.3",
 		"rimraf": "^3.0.2",
-		"semver": "^7.3.5",
-		"terser": "^5.9.0",
+		"semver": "^7.3.7",
+		"terser": "^5.13.1",
 		"xml2js": "^0.4.23",
 		"yazl": "^2.5.1"
 	},
 	"devDependencies": {
 		"ava": "^3.15.0",
-		"chai": "^4.3.4",
+		"chai": "^4.3.6",
 		"chai-fs": "^2.0.0",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
-		"depcheck": "^1.4.2",
+		"depcheck": "^1.4.3",
 		"docdash": "^1.2.0",
 		"eslint": "^7.32.0",
 		"eslint-config-google": "^0.14.0",
-		"eslint-plugin-jsdoc": "^37.0.3",
+		"eslint-plugin-jsdoc": "^37.9.7",
 		"extract-zip": "^2.0.1",
 		"mock-require": "^3.0.3",
 		"nyc": "^15.1.0",