@ui5/server 3.0.0 → 3.1.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.0.0...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-server/compare/v3.1.0...HEAD).
+
+<a name="v3.1.0"></a>
+## [v3.1.0] - 2023-03-01
+### Features
+- **CSP:** Increase defaultPolicy2 to sap-target-level-3 ([#580](https://github.com/SAP/ui5-server/issues/580)) [`5a981a1`](https://github.com/SAP/ui5-server/commit/5a981a1d7f2d2aaffbcd2f68e02206a8bdb0494b)
+
+
+<a name="v3.0.1"></a>
+## [v3.0.1] - 2023-02-16
+### Bug Fixes
+- **MiddlewareUtil:** Provide framework configuration getters to custom tasks ([#579](https://github.com/SAP/ui5-server/issues/579)) [`58bf4f5`](https://github.com/SAP/ui5-server/commit/58bf4f5953aed3a1fc6f4f4353e37fe6c3b7094f)
+
 
 <a name="v3.0.0"></a>
 ## [v3.0.0] - 2023-02-09
@@ -290,6 +302,8 @@ Only Node.js v10 or higher is supported.
 
 <a name="v0.0.1"></a>
 ## v0.0.1 - 2018-06-06
+[v3.1.0]: https://github.com/SAP/ui5-server/compare/v3.0.1...v3.1.0
+[v3.0.1]: https://github.com/SAP/ui5-server/compare/v3.0.0...v3.0.1
 [v3.0.0]: https://github.com/SAP/ui5-server/compare/v2.4.0...v3.0.0
 [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

package/lib/middleware/MiddlewareManager.js

@@ -184,7 +184,7 @@ class MiddlewareManager {
 					const defaultSAPTargetConfig = {
 						defaultPolicy: "sap-target-level-1",
 						defaultPolicyIsReportOnly: true,
-						defaultPolicy2: "sap-target-level-2",
+						defaultPolicy2: "sap-target-level-3",
 						defaultPolicy2IsReportOnly: true,
 						ignorePaths: ["test-resources/sap/ui/qunit/testrunner.html"]
 					};

package/lib/middleware/MiddlewareUtil.js

@@ -107,11 +107,14 @@ class MiddlewareUtil {
 	 * @property {Function} getVersion Get the project version
 	 * @property {Function} getNamespace Get the project namespace
 	 * @property {Function} getRootReader Get the project rootReader
-	 * @property {Function} getReader Get the project reader
+	 * @property {Function} getReader Get the project reader, defaulting to "runtime" style instead of "buildtime"
 	 * @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
+	 * @property {Function} getFrameworkName Get the project's framework name configuration
+	 * @property {Function} getFrameworkVersion Get the project's framework version configuration
+	 * @property {Function} getFrameworkDependencies Get the project's framework dependencies configuration
 	 */
 
 	/**
@@ -227,9 +230,19 @@ class MiddlewareUtil {
 				const baseProjectInterface = {};
 				bindFunctions(project, baseProjectInterface, [
 					"getType", "getName", "getVersion", "getNamespace",
-					"getRootReader", "getReader", "getRootPath", "getSourcePath",
-					"getCustomConfiguration", "isFrameworkProject"
+					"getRootReader", "getRootPath", "getSourcePath",
+					"getCustomConfiguration", "isFrameworkProject", "getFrameworkName",
+					"getFrameworkVersion", "getFrameworkDependencies"
 				]);
+				// Project#getReader defaults to style "buildtime". However ui5-server uses
+				// style "runtime". The main difference is that for some project types (like applications)
+				// the /resources/<namespace> path prefix is omitted for "runtime". Also, no builder resource-
+				// exclude configuration is applied.
+				// Therefore default to style "runtime" here so that custom middleware will commonly work with
+				// the same paths as ui5-server and no unexpected builder-excludes.
+				baseProjectInterface.getReader = function(options = {style: "runtime"}) {
+					return project.getReader(options);
+				};
 				return baseProjectInterface;
 			};
 			// getDependencies function, returning an array of project names

package/lib/server.js

@@ -99,7 +99,7 @@ async function _addSsl({app, key, cert}) {
  * @typedef {object} module:@ui5/server.SAPTargetCSPOptions
  * @property {string} [defaultPolicy="sap-target-level-1"]
  * @property {string} [defaultPolicyIsReportOnly=true]
- * @property {string} [defaultPolicy2="sap-target-level-2"]
+ * @property {string} [defaultPolicy2="sap-target-level-3"]
  * @property {string} [defaultPolicy2IsReportOnly=true]
  * @property {string[]} [ignorePaths=["test-resources/sap/ui/qunit/testrunner.html"]]
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/server",
-	"version": "3.0.0",
+	"version": "3.1.0",
 	"description": "UI5 Tooling - Server",
 	"author": {
 		"name": "SAP SE",
@@ -114,10 +114,10 @@
 		"url": "git@github.com:SAP/ui5-server.git"
 	},
 	"dependencies": {
-		"@ui5/builder": "^3.0.0",
-		"@ui5/fs": "^3.0.0",
+		"@ui5/builder": "^3.0.1",
+		"@ui5/fs": "^3.0.2",
 		"@ui5/logger": "^3.0.0",
-		"body-parser": "^1.20.1",
+		"body-parser": "^1.20.2",
 		"compression": "^1.7.4",
 		"cors": "^2.8.5",
 		"devcert-sanscache": "^0.4.8",
@@ -130,24 +130,24 @@
 		"parseurl": "^1.3.3",
 		"portscanner": "^2.2.0",
 		"replacestream": "^4.0.3",
-		"router": "^1.3.7",
+		"router": "^1.3.8",
 		"spdy": "^4.0.2",
 		"yesno": "^0.4.0"
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
-		"@ui5/project": "^3.0.0-rc.9",
+		"@ui5/project": "^3.0.2",
 		"ava": "^5.2.0",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.3",
 		"docdash": "^2.0.1",
-		"eslint": "^8.33.0",
+		"eslint": "^8.35.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^14.0.0",
-		"eslint-plugin-jsdoc": "^39.8.0",
+		"eslint-plugin-jsdoc": "^40.0.0",
 		"esmock": "^2.1.0",
-		"jsdoc": "^4.0.0",
+		"jsdoc": "^4.0.2",
 		"nyc": "^15.1.0",
 		"open-cli": "^7.1.0",
 		"rimraf": "^4.1.2",