@ui5/server 3.0.0-rc.1 → 3.0.0-rc.3

package/CHANGELOG.md

@@ -2,7 +2,16 @@
 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.0.0-rc.1...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-server/compare/v3.0.0-rc.3...HEAD).
+
+<a name="v3.0.0-rc.3"></a>
+## [v3.0.0-rc.3] - 2023-02-04
+### Bug Fixes
+- **MiddlewareManager:** Throw if custom middleware is unknown [`5d5bbe1`](https://github.com/SAP/ui5-server/commit/5d5bbe1bc7b8e12e2094e9ef08807d5359d8ac5e)
+
+
+<a name="v3.0.0-rc.2"></a>
+## [v3.0.0-rc.2] - 2023-01-25
 
 <a name="v3.0.0-rc.1"></a>
 ## [v3.0.0-rc.1] - 2023-01-23
@@ -330,6 +339,8 @@ Only Node.js v10 or higher is supported.
 <a name="v0.0.1"></a>
 ## v0.0.1 - 2018-06-06
 
+[v3.0.0-rc.3]: https://github.com/SAP/ui5-server/compare/v3.0.0-rc.2...v3.0.0-rc.3
+[v3.0.0-rc.2]: https://github.com/SAP/ui5-server/compare/v3.0.0-rc.1...v3.0.0-rc.2
 [v3.0.0-rc.1]: https://github.com/SAP/ui5-server/compare/v3.0.0-rc.0...v3.0.0-rc.1
 [v3.0.0-rc.0]: https://github.com/SAP/ui5-server/compare/v3.0.0-beta.4...v3.0.0-rc.0
 [v3.0.0-beta.4]: https://github.com/SAP/ui5-server/compare/v3.0.0-beta.3...v3.0.0-beta.4

package/lib/middleware/MiddlewareManager.js

@@ -1,6 +1,6 @@
 import middlewareRepository from "./middlewareRepository.js";
 import MiddlewareUtil from "./MiddlewareUtil.js";
-import logger from "@ui5/logger";
+import {getLogger} from "@ui5/logger";
 const hasOwn = Function.prototype.call.bind(Object.prototype.hasOwnProperty);
 
 /**
@@ -274,6 +274,12 @@ class MiddlewareManager {
 					`Custom middleware definition ${middlewareDef.name} of project ${project.getName()} ` +
 					`defines neither a "beforeMiddleware" nor an "afterMiddleware" parameter. One must be defined.`);
 			}
+			const customMiddleware = this.graph.getExtension(middlewareDef.name);
+			if (!customMiddleware) {
+				throw new Error(
+					`Could not find custom middleware ${middlewareDef.name}, ` +
+					`referenced by project ${project.getName()}`);
+			}
 
 			let middlewareName = middlewareDef.name;
 			if (this.middleware[middlewareName]) {
@@ -288,8 +294,6 @@ class MiddlewareManager {
 
 			await this.addMiddleware(middlewareName, {
 				customMiddleware: async ({resources, middlewareUtil}) => {
-					const customMiddleware = this.graph.getExtension(middlewareDef.name);
-
 					const params = {
 						resources,
 						options: {
@@ -300,7 +304,7 @@ class MiddlewareManager {
 					const specVersion = customMiddleware.getSpecVersion();
 					if (specVersion.gte("3.0")) {
 						params.options.middlewareName = middlewareName;
-						params.log = logger.getLogger(`server:custom-middleware:${middlewareDef.name}`);
+						params.log = getLogger(`server:custom-middleware:${middlewareDef.name}`);
 					}
 					const middlewareUtilInterface = middlewareUtil.getInterface(specVersion);
 					if (middlewareUtilInterface) {

package/lib/middleware/MiddlewareUtil.js

@@ -108,6 +108,7 @@ class MiddlewareUtil {
 	 * @property {Function} getNamespace Get the project namespace
 	 * @property {Function} getRootReader Get the project rootReader
 	 * @property {Function} getReader Get the project reader
+	 * @property {Function} getRootPath Get the local File System path of the project's root directory
 	 * @property {Function} getSourcePath Get the local File System path of the project's source directory
 	 * @property {Function} getCustomConfiguration Get the project Custom Configuration
 	 * @property {Function} isFrameworkProject Check whether the project is a UI5-Framework project
@@ -226,7 +227,7 @@ class MiddlewareUtil {
 				const baseProjectInterface = {};
 				bindFunctions(project, baseProjectInterface, [
 					"getType", "getName", "getVersion", "getNamespace",
-					"getRootReader", "getReader", "getSourcePath",
+					"getRootReader", "getReader", "getRootPath", "getSourcePath",
 					"getCustomConfiguration", "isFrameworkProject"
 				]);
 				return baseProjectInterface;

package/lib/middleware/csp.js

@@ -1,10 +1,10 @@
 import parseurl from "parseurl";
 import Router from "router";
 import querystring from "node:querystring";
-import logger from "@ui5/logger";
+import {getLogger} from "@ui5/logger";
 import bodyParser from "body-parser";
 
-const log = logger.getLogger("server:middleware:csp");
+const log = getLogger("server:middleware:csp");
 
 const HEADER_CONTENT_SECURITY_POLICY = "Content-Security-Policy";
 const HEADER_CONTENT_SECURITY_POLICY_REPORT_ONLY = "Content-Security-Policy-Report-Only";

package/lib/middleware/serveIndex.js

@@ -1,5 +1,5 @@
-import logger from "@ui5/logger";
-const log = logger.getLogger("server:middleware:serveIndex");
+import {getLogger} from "@ui5/logger";
+const log = getLogger("server:middleware:serveIndex");
 import mime from "mime-types";
 import serveIndex from "./serveIndex/serveIndex.cjs";
 
@@ -56,7 +56,7 @@ function createResourceInfo(resource) {
 		size: formatSize(stat.size),
 		sizeInBytes: stat.size,
 		project: resource.getProject()?.getName() || "<unknown>",
-		projectPath: resource.getProject()?.getPath() || "<unknown>"
+		projectPath: resource.getProject()?.getRootPath() || "<unknown>"
 	};
 }
 

package/lib/middleware/serveResources.js

@@ -1,5 +1,5 @@
-import logger from "@ui5/logger";
-const log = logger.getLogger("server:middleware:serveResources");
+import {getLogger} from "@ui5/logger";
+const log = getLogger("server:middleware:serveResources");
 import replaceStream from "replacestream";
 import etag from "etag";
 import fresh from "fresh";

package/lib/middleware/testRunner.js

@@ -4,8 +4,8 @@ const readFile = promisify(fs.readFile);
 import {fileURLToPath} from "node:url";
 import mime from "mime-types";
 import parseurl from "parseurl";
-import logger from "@ui5/logger";
-const log = logger.getLogger("server:middleware:testRunner");
+import {getLogger} from "@ui5/logger";
+const log = getLogger("server:middleware:testRunner");
 
 const testRunnerResourceRegEx = /\/test-resources\/sap\/ui\/qunit\/(testrunner\.(html|css)|TestRunner.js)$/;
 const resourceCache = Object.create(null);

package/lib/sslUtil.js

@@ -1,9 +1,9 @@
 import os from "node:os";
 import {stat, readFile, writeFile, mkdir} from "node:fs/promises";
 import path from "node:path";
-import logger from "@ui5/logger";
+import {getLogger} from "@ui5/logger";
 
-const log = logger.getLogger("server:sslUtil");
+const log = getLogger("server:sslUtil");
 
 /**
  * @private

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/server",
-	"version": "3.0.0-rc.1",
+	"version": "3.0.0-rc.3",
 	"description": "UI5 Tooling - Server",
 	"author": {
 		"name": "SAP SE",
@@ -25,7 +25,7 @@
 		"./package.json": "./package.json"
 	},
 	"engines": {
-		"node": "^16.18.0 || >=18.0.0",
+		"node": "^16.18.0 || >=18.12.0",
 		"npm": ">= 8"
 	},
 	"scripts": {
@@ -114,9 +114,9 @@
 		"url": "git@github.com:SAP/ui5-server.git"
 	},
 	"dependencies": {
-		"@ui5/builder": "^3.0.0-rc.2",
-		"@ui5/fs": "^3.0.0-rc.3",
-		"@ui5/logger": "^3.0.1-rc.1",
+		"@ui5/builder": "^3.0.0-rc.5",
+		"@ui5/fs": "^3.0.0-rc.6",
+		"@ui5/logger": "^3.0.1-rc.3",
 		"body-parser": "^1.20.1",
 		"compression": "^1.7.4",
 		"cors": "^2.8.5",
@@ -136,21 +136,21 @@
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
-		"@ui5/project": "^3.0.0-rc.3",
+		"@ui5/project": "^3.0.0-rc.8",
 		"ava": "^5.1.1",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.3",
 		"docdash": "^2.0.1",
-		"eslint": "^8.32.0",
+		"eslint": "^8.33.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^14.0.0",
-		"eslint-plugin-jsdoc": "^39.6.7",
+		"eslint-plugin-jsdoc": "^39.8.0",
 		"esmock": "^2.1.0",
 		"jsdoc": "^3.6.11",
 		"nyc": "^15.1.0",
 		"open-cli": "^7.1.0",
-		"rimraf": "^4.1.1",
+		"rimraf": "^4.1.2",
 		"sinon": "^15.0.1",
 		"supertest": "^6.3.3",
 		"tap-xunit": "^2.4.1"