@ui5/server 3.2.0 → 3.3.0

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/v3.2.0...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-server/compare/v3.3.0...HEAD).
+
+<a name="v3.3.0"></a>
+## [v3.3.0] - 2024-09-13
+### Dependency Updates
+- Bump path-to-regexp, router and sinon ([#696](https://github.com/SAP/ui5-server/issues/696)) [`343b9e4`](https://github.com/SAP/ui5-server/commit/343b9e41b4367fd2087d8c9e1bdfcdb10d49b7aa)
+
+
+<a name="v3.2.1"></a>
+## [v3.2.1] - 2024-05-17
+### Bug Fixes
+- **middleware/versionInfo:** Only process dependencies of type 'library' [`4c99455`](https://github.com/SAP/ui5-server/commit/4c99455cf21539c2d1403cca81c603ead7124351)
+
 
 <a name="v3.2.0"></a>
 ## [v3.2.0] - 2024-04-24
@@ -335,6 +347,8 @@ Only Node.js v10 or higher is supported.
 
 <a name="v0.0.1"></a>
 ## v0.0.1 - 2018-06-06
+[v3.3.0]: https://github.com/SAP/ui5-server/compare/v3.2.1...v3.3.0
+[v3.2.1]: https://github.com/SAP/ui5-server/compare/v3.2.0...v3.2.1
 [v3.2.0]: https://github.com/SAP/ui5-server/compare/v3.1.5...v3.2.0
 [v3.1.5]: https://github.com/SAP/ui5-server/compare/v3.1.4...v3.1.5
 [v3.1.4]: https://github.com/SAP/ui5-server/compare/v3.1.3...v3.1.4

package/lib/middleware/helper/generateLibraryManifest.js

@@ -13,6 +13,8 @@ export default async function generateLibraryManifest(middlewareUtil, dotLibReso
 			return middlewareUtil.getProject(projectName)?.getVersion();
 		}
 	});
-	res.setProject(project);
-	return res;
+	if (res) {
+		res.setProject(project);
+		return res;
+	}
 }

package/lib/middleware/serveResources.js

@@ -41,14 +41,14 @@ function createMiddleware({resources, middlewareUtil}) {
 				// Attempt to find a .library file, which is required for generating a manifest.json
 				const dotLibraryPath = pathname.replace(rManifest, "/.library");
 				const dotLibraryResource = await resources.all.byPath(dotLibraryPath);
-				if (!dotLibraryResource) {
-					log.verbose(
-						`Could not find a .library to generate manifest.json from at ${dotLibraryPath}. ` +
-						`This might indicate that the project is not a library project.`);
+				if (dotLibraryResource && dotLibraryResource.getProject()?.getType() === "library") {
+					resource = await generateLibraryManifest(middlewareUtil, dotLibraryResource);
+				}
+				if (!resource) {
+					// Not a library project, missing .library file or other reason for failed manifest.json generation
 					next();
 					return;
 				}
-				resource = await generateLibraryManifest(middlewareUtil, dotLibraryResource);
 			}
 
 			const resourcePath = resource.getPath();

package/lib/middleware/versionInfo.js

@@ -16,7 +16,9 @@ function createMiddleware({resources, middlewareUtil}) {
 	return async function versionInfo(req, res, next) {
 		try {
 			const dependencies = resources.dependencies;
-			const dotLibResources = await dependencies.byGlob("/resources/**/.library");
+			let dotLibResources = await dependencies.byGlob("/resources/**/.library");
+
+			dotLibResources = dotLibResources.filter((res) => res.getProject()?.getType() === "library");
 
 			dotLibResources.sort((a, b) => {
 				return a.getProject().getName().localeCompare(b.getProject().getName());

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/server",
-	"version": "3.2.0",
+	"version": "3.3.0",
 	"description": "UI5 Tooling - Server",
 	"author": {
 		"name": "SAP SE",
@@ -115,7 +115,7 @@
 		"url": "git@github.com:SAP/ui5-server.git"
 	},
 	"dependencies": {
-		"@ui5/builder": "^3.4.0",
+		"@ui5/builder": "^3.5.1",
 		"@ui5/fs": "^3.0.5",
 		"@ui5/logger": "^3.0.0",
 		"body-parser": "^1.20.2",
@@ -131,13 +131,13 @@
 		"parseurl": "^1.3.3",
 		"portscanner": "^2.2.0",
 		"replacestream": "^4.0.3",
-		"router": "^1.3.8",
+		"router": "^2.0.0",
 		"spdy": "^4.0.2",
 		"yesno": "^0.4.0"
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
-		"@ui5/project": "^3.9.1",
+		"@ui5/project": "^3.9.2",
 		"ava": "^5.3.1",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
@@ -147,12 +147,12 @@
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^14.0.0",
 		"eslint-plugin-jsdoc": "^46.10.1",
-		"esmock": "^2.6.4",
-		"jsdoc": "^4.0.2",
+		"esmock": "^2.6.7",
+		"jsdoc": "^4.0.3",
 		"nyc": "^15.1.0",
 		"open-cli": "^7.2.0",
-		"rimraf": "^5.0.5",
-		"sinon": "^16.1.3",
+		"rimraf": "^5.0.10",
+		"sinon": "^18.0.1",
 		"supertest": "^6.3.4",
 		"tap-xunit": "^2.4.1"
 	}