@ui5/server 3.0.0-rc.0 → 3.0.0-rc.2

package/.reuse/dep5

@@ -25,7 +25,7 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
  parties the right to use of access any SAP External Product, through API Calls.
 
 Files: *
-Copyright: 2018-2022 SAP SE or an SAP affiliate company and UI5 Tooling contributors
+Copyright: 2018-2023 SAP SE or an SAP affiliate company and UI5 Tooling contributors
 License: Apache-2.0
 
 Files: lib/middleware/serveIndex/*
@@ -36,5 +36,5 @@ Copyright: 2010 Sencha Inc.
 License: MIT
 
 Files: lib/middleware/testRunner/*
-Copyright: 2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+Copyright: 2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
 License: Apache-2.0

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 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.0...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-server/compare/v3.0.0-rc.2...HEAD).
+
+<a name="v3.0.0-rc.2"></a>
+## [v3.0.0-rc.2] - 2023-01-24
+
+<a name="v3.0.0-rc.1"></a>
+## [v3.0.0-rc.1] - 2023-01-23
 
 <a name="v3.0.0-rc.0"></a>
 ## [v3.0.0-rc.0] - 2022-12-23
@@ -327,6 +333,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.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
 [v3.0.0-beta.3]: https://github.com/SAP/ui5-server/compare/v3.0.0-beta.2...v3.0.0-beta.3

package/LICENSE.txt

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2021 SAP SE or an SAP affiliate company and UI5 Tooling contributors
+   Copyright 2018-2023 SAP SE or an SAP affiliate company and UI5 Tooling contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

package/README.md

@@ -10,7 +10,9 @@
 [![Coverage Status](https://coveralls.io/repos/github/SAP/ui5-server/badge.svg)](https://coveralls.io/github/SAP/ui5-server)
 
 ## Documentation
-Can be found here: [sap.github.io/ui5-tooling](https://sap.github.io/ui5-tooling/pages/Server/)
+UI5 Server documentation can be found here: [sap.github.io/ui5-tooling](https://sap.github.io/ui5-tooling/v3/pages/Server/)
+
+The UI5 Server API Reference can be found here: [`@ui5/server`](https://sap.github.io/ui5-tooling/v3/api/module-@ui5_server.html)
 
 ## Contributing
 Please check our [Contribution Guidelines](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md).

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);
 
 /**
@@ -300,7 +300,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} 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
 	 */
@@ -225,7 +226,8 @@ class MiddlewareUtil {
 				const baseProjectInterface = {};
 				bindFunctions(project, baseProjectInterface, [
 					"getType", "getName", "getVersion", "getNamespace",
-					"getRootReader", "getReader", "getCustomConfiguration", "isFrameworkProject"
+					"getRootReader", "getReader", "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";
 
@@ -49,7 +49,7 @@ function createResourceInfo(resource) {
 	const isDir = stat.isDirectory();
 	return {
 		path: resource.getPath() + (isDir ? "/" : ""),
-		name: resource._name + (isDir ? "/" : ""),
+		name: resource.getName() + (isDir ? "/" : ""),
 		isDir: isDir,
 		mimetype: isDir ? "" : getMimeType(resource),
 		lastModified: new Date(stat.mtime).toLocaleString(),

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.0",
+	"version": "3.0.0-rc.2",
 	"description": "UI5 Tooling - Server",
 	"author": {
 		"name": "SAP SE",
@@ -35,7 +35,6 @@
 		"unit": "rimraf test/tmp && ava",
 		"unit-verbose": "rimraf test/tmp && cross-env UI5_LOG_LVL=verbose ava --verbose --serial",
 		"unit-watch": "npm run unit -- --watch",
-		"unit-nyan": "npm run unit -- --tap | tnyan",
 		"unit-xunit": "rimraf test/tmp && ava --node-arguments=\"--experimental-loader=@istanbuljs/esm-loader-hook\" --tap | tap-xunit --dontUseCommentsAsTestNames=true > test-results.xml",
 		"unit-inspect": "cross-env UI5_LOG_LVL=verbose ava debug --break",
 		"coverage": "rimraf test/tmp && nyc ava --node-arguments=\"--experimental-loader=@istanbuljs/esm-loader-hook\"",
@@ -115,9 +114,9 @@
 		"url": "git@github.com:SAP/ui5-server.git"
 	},
 	"dependencies": {
-		"@ui5/builder": "^3.0.0-rc.0",
-		"@ui5/fs": "^3.0.0-rc.0",
-		"@ui5/logger": "^3.0.1-rc.0",
+		"@ui5/builder": "^3.0.0-rc.3",
+		"@ui5/fs": "^3.0.0-rc.4",
+		"@ui5/logger": "^3.0.1-rc.2",
 		"body-parser": "^1.20.1",
 		"compression": "^1.7.4",
 		"cors": "^2.8.5",
@@ -137,24 +136,23 @@
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
-		"@ui5/project": "^3.0.0-beta.5",
-		"ava": "^5.1.0",
+		"@ui5/project": "^3.0.0-rc.6",
+		"ava": "^5.1.1",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.3",
-		"docdash": "^2.0.0",
-		"eslint": "^8.30.0",
+		"docdash": "^2.0.1",
+		"eslint": "^8.32.0",
 		"eslint-config-google": "^0.14.0",
-		"eslint-plugin-ava": "^13.2.0",
-		"eslint-plugin-jsdoc": "^39.6.4",
+		"eslint-plugin-ava": "^14.0.0",
+		"eslint-plugin-jsdoc": "^39.6.7",
 		"esmock": "^2.1.0",
 		"jsdoc": "^3.6.11",
 		"nyc": "^15.1.0",
 		"open-cli": "^7.1.0",
-		"rimraf": "^3.0.2",
+		"rimraf": "^4.1.1",
 		"sinon": "^15.0.1",
 		"supertest": "^6.3.3",
-		"tap-nyan": "^1.1.0",
 		"tap-xunit": "^2.4.1"
 	}
 }