@ui5/server 2.3.1 → 2.4.1

package/CHANGELOG.md

@@ -2,7 +2,19 @@
 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-server/compare/v2.3.1...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-server/compare/v2.4.1...HEAD).
+
+<a name="v2.4.1"></a>
+## [v2.4.1] - 2022-11-30
+### Dependency Updates
+- Bump connect-openui5 from 0.10.2 to 0.10.3 [`20b6fc8`](https://github.com/SAP/ui5-server/commit/20b6fc8fbad69265bae3e8f7efd320f6297ac4c4)
+
+
+<a name="v2.4.0"></a>
+## [v2.4.0] - 2021-10-19
+### Features
+- Enhance versionInfo middleware to serve sap-ui-version.json ([#420](https://github.com/SAP/ui5-server/issues/420)) [`c6f83f5`](https://github.com/SAP/ui5-server/commit/c6f83f5472eb2fe6a8d4eca10ecdc5f4b522bc3c)
+
 
 <a name="v2.3.1"></a>
 ## [v2.3.1] - 2021-07-23
@@ -240,6 +252,8 @@ Only Node.js v10 or higher is supported.
 <a name="v0.0.1"></a>
 ## v0.0.1 - 2018-06-06
 
+[v2.4.1]: https://github.com/SAP/ui5-server/compare/v2.4.0...v2.4.1
+[v2.4.0]: https://github.com/SAP/ui5-server/compare/v2.3.1...v2.4.0
 [v2.3.1]: https://github.com/SAP/ui5-server/compare/v2.3.0...v2.3.1
 [v2.3.0]: https://github.com/SAP/ui5-server/compare/v2.2.10...v2.3.0
 [v2.2.10]: https://github.com/SAP/ui5-server/compare/v2.2.9...v2.2.10

package/lib/middleware/MiddlewareManager.js

@@ -244,7 +244,8 @@ class MiddlewareManager {
 						if (
 							specVersion === "2.0" || specVersion === "2.1" ||
 							specVersion === "2.2" || specVersion === "2.3" ||
-							specVersion === "2.4" || specVersion === "2.5"
+							specVersion === "2.4" || specVersion === "2.5" ||
+							specVersion === "2.6"
 						) {
 							// Supply interface to MiddlewareUtil instance starting with specVersion 2.0
 							params.middlewareUtil = middlewareUtil.getInterface(specVersion);

package/lib/middleware/MiddlewareUtil.js

@@ -34,6 +34,7 @@ class MiddlewareUtil {
 		case "2.3":
 		case "2.4":
 		case "2.5":
+		case "2.6":
 			return baseInterface;
 		default:
 			throw new Error(`MiddlewareUtil: Unknown or unsupported Specification Version ${specVersion}`);

package/lib/middleware/versionInfo.js

@@ -1,4 +1,7 @@
 const createVersionInfoProcessor = require("@ui5/builder").processors.versionInfoGenerator;
+const createManifestProcessor = require("@ui5/builder").processors.manifestCreator;
+
+const MANIFEST_JSON = "manifest.json";
 
 /**
  * Creates and returns the middleware to create the version info as json object.
@@ -10,37 +13,61 @@ const createVersionInfoProcessor = require("@ui5/builder").processors.versionInf
  * @returns {Function} Returns a server middleware closure.
  */
 function createMiddleware({resources, tree: project}) {
-	return function versionInfo(req, res, next) {
-		resources.dependencies.byGlob("/resources/**/.library")
-			.then((resources) => {
-				resources.sort((a, b) => {
-					return a._project.metadata.name.localeCompare(b._project.metadata.name);
-				});
-				return createVersionInfoProcessor({
-					options: {
-						rootProjectName: project.metadata.name,
-						rootProjectVersion: project.version,
-						libraryInfos: resources.map((dotLibResource) => {
-							return {
-								name: dotLibResource._project.metadata.name,
-								version: dotLibResource._project.version
-							};
-						})
-					}
-				});
-			})
-			.then(([versionInfoResource]) => {
-				return versionInfoResource.getBuffer();
-			})
-			.then((versionInfoContent) => {
-				res.writeHead(200, {
-					"Content-Type": "application/json"
+	return async function versionInfo(req, res, next) {
+		try {
+			const dependencies = resources.dependencies;
+			const dotLibResources = await dependencies.byGlob("/resources/**/.library");
+
+			dotLibResources.sort((a, b) => {
+				return a._project.metadata.name.localeCompare(b._project.metadata.name);
+			});
+
+			const libraryInfosPromises = dotLibResources.map(async (dotLibResource) => {
+				const namespace = dotLibResource._project.metadata.namespace;
+				const manifestResources = await dependencies.byGlob(`/resources/${namespace}/**/${MANIFEST_JSON}`);
+				let libraryManifest = manifestResources.find((manifestResource) => {
+					return manifestResource.getPath() === `/resources/${namespace}/${MANIFEST_JSON}`;
 				});
-				res.end(versionInfoContent.toString());
-			})
-			.catch((err) => {
-				next(err);
+				const embeddedManifests =
+					manifestResources.filter((manifestResource) => manifestResource !== libraryManifest);
+				if (!libraryManifest) {
+					const extensions = "js,json,library,less,css,theming,theme,properties";
+					const libResources = await dependencies.byGlob(`/resources/${namespace}/**/*.{${extensions}}`);
+
+					libraryManifest = await createManifestProcessor({
+						libraryResource: dotLibResource,
+						namespace,
+						resources: libResources,
+						options: {
+							omitMinVersions: true
+						}
+					});
+				}
+				return {
+					libraryManifest,
+					embeddedManifests,
+					name: dotLibResource._project.metadata.name,
+					version: dotLibResource._project.version
+				};
+			});
+			const libraryInfos = await Promise.all(libraryInfosPromises);
+
+			const [versionInfoResource] = await createVersionInfoProcessor({
+				options: {
+					rootProjectName: project.metadata.name,
+					rootProjectVersion: project.version,
+					libraryInfos
+				}
+			});
+			const versionInfoContent = await versionInfoResource.getBuffer();
+
+			res.writeHead(200, {
+				"Content-Type": "application/json"
 			});
+			res.end(versionInfoContent.toString());
+		} catch (err) {
+			next(err);
+		}
 	};
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/server",
-	"version": "2.3.1",
+	"version": "2.4.1",
 	"description": "UI5 Tooling - Server",
 	"author": {
 		"name": "SAP SE",
@@ -104,46 +104,46 @@
 		"url": "git@github.com:SAP/ui5-server.git"
 	},
 	"dependencies": {
-		"@ui5/builder": "^2.9.4",
+		"@ui5/builder": "^2.11.9",
 		"@ui5/fs": "^2.0.6",
 		"@ui5/logger": "^2.0.1",
-		"body-parser": "^1.19.0",
+		"body-parser": "^1.20.1",
 		"compression": "^1.7.4",
-		"connect-openui5": "^0.10.2",
+		"connect-openui5": "^0.10.3",
 		"cors": "^2.8.5",
 		"devcert-sanscache": "^0.4.8",
 		"escape-html": "^1.0.3",
 		"etag": "^1.8.1",
-		"express": "^4.17.1",
+		"express": "^4.18.2",
 		"fresh": "^0.5.2",
-		"graceful-fs": "^4.2.6",
+		"graceful-fs": "^4.2.10",
 		"make-dir": "^3.1.0",
-		"mime-types": "^2.1.31",
+		"mime-types": "^2.1.35",
 		"parseurl": "^1.3.3",
 		"portscanner": "^2.1.1",
 		"replacestream": "^4.0.3",
-		"router": "^1.3.5",
+		"router": "^1.3.7",
 		"spdy": "^4.0.2",
 		"treeify": "^1.0.1",
 		"yesno": "^0.3.1"
 	},
 	"devDependencies": {
-		"@ui5/project": "^2.4.0",
+		"@ui5/project": "^2.6.0",
 		"ava": "^3.15.0",
-		"chokidar-cli": "^2.1.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.31.0",
+		"eslint": "^7.32.0",
 		"eslint-config-google": "^0.14.0",
-		"eslint-plugin-jsdoc": "^35.4.5",
-		"jsdoc": "^3.6.7",
+		"eslint-plugin-jsdoc": "^37.9.7",
+		"jsdoc": "^3.6.11",
 		"mock-require": "^3.0.3",
 		"nyc": "^15.1.0",
 		"open-cli": "^6.0.1",
 		"rimraf": "^3.0.2",
-		"sinon": "^11.1.1",
-		"supertest": "^6.1.3",
+		"sinon": "^11.1.2",
+		"supertest": "^6.3.1",
 		"tap-nyan": "^1.1.0",
 		"tap-xunit": "^2.4.1"
 	}