@ui5/server 3.1.1 → 3.1.3

package/CHANGELOG.md

@@ -2,10 +2,22 @@
 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.1.1...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-server/compare/v3.1.3...HEAD).
+
+<a name="v3.1.3"></a>
+## [v3.1.3] - 2023-05-23
+### Bug Fixes
+- **middleware/testRunner:** Update resources from OpenUI5 [`f0c7291`](https://github.com/SAP/ui5-server/commit/f0c7291d2dc1d753e04184fdf2127c278810f0c4)
+
+
+<a name="v3.1.2"></a>
+## [v3.1.2] - 2023-04-12
+### Bug Fixes
+- Fix JSDoc names of typedefs in MiddlewareUtil. [`dbd6fe1`](https://github.com/SAP/ui5-server/commit/dbd6fe19c229471ba2b8621b97b8f5a9bca56a78)
+
 
 <a name="v3.1.1"></a>
-## [v3.1.1] - 2023-03-14
+## [v3.1.1] - 2023-03-16
 ### Bug Fixes
 - Allow serving of propertyfiles of non component project types [`1bc6ec7`](https://github.com/SAP/ui5-server/commit/1bc6ec72a15ae7df558c4938b2670d0e78af710b)
 
@@ -308,6 +320,8 @@ Only Node.js v10 or higher is supported.
 
 <a name="v0.0.1"></a>
 ## v0.0.1 - 2018-06-06
+[v3.1.3]: https://github.com/SAP/ui5-server/compare/v3.1.2...v3.1.3
+[v3.1.2]: https://github.com/SAP/ui5-server/compare/v3.1.1...v3.1.2
 [v3.1.1]: https://github.com/SAP/ui5-server/compare/v3.1.0...v3.1.1
 [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

package/lib/middleware/MiddlewareUtil.js

@@ -101,7 +101,7 @@ class MiddlewareUtil {
 	 * For details on individual functions, see [Project]{@link @ui5/project/specifications/Project}
 	 *
 	 * @public
-	 * @typedef {object} @ui5/project/build/helpers/MiddlewareUtill~ProjectInterface
+	 * @typedef {object} @ui5/server/middleware/MiddlewareUtil~ProjectInterface
 	 * @property {Function} getType Get the project type
 	 * @property {Function} getName Get the project name
 	 * @property {Function} getVersion Get the project version
@@ -127,7 +127,7 @@ class MiddlewareUtil {
 	 * @param {string|@ui5/fs/Resource} [projectNameOrResource]
 	 * Name of the project to retrieve or a Resource instance to retrieve the associated project for.
 	 * Defaults to the name of the current root project
-	 * @returns {@ui5/project/build/helpers/MiddlewareUtill~ProjectInterface|undefined}
+	 * @returns {@ui5/server/middleware/MiddlewareUtil~ProjectInterface|undefined}
 	 * Specification Version-dependent interface to the Project instance or <code>undefined</code>
 	 * if the project name is unknown or the provided resource is not associated with any project.
 	 * @public
@@ -170,7 +170,7 @@ class MiddlewareUtil {
 	 * For details on individual functions, see [@ui5/fs/resourceFactory]{@link @ui5/fs/resourceFactory}
 	 *
 	 * @public
-	 * @typedef {object} @ui5/project/build/helpers/MiddlewareUtill~resourceFactory
+	 * @typedef {object} @ui5/server/middleware/MiddlewareUtil~resourceFactory
 	 * @property {Function} createResource Creates a [Resource]{@link @ui5/fs/Resource}.
 	 * 	Accepts the same parameters as the [Resource]{@link @ui5/fs/Resource} constructor.
 	 * @property {Function} createReaderCollection Creates a reader collection:
@@ -192,7 +192,7 @@ class MiddlewareUtil {
 	 * This attribute is only available to custom server middleware extensions defining
 	 * <b>Specification Version 3.0 and above</b>.
 	 *
-	 * @type {@ui5/project/build/helpers/MiddlewareUtill~resourceFactory}
+	 * @type {@ui5/server/middleware/MiddlewareUtil~resourceFactory}
 	 * @public
 	 */
 	resourceFactory = {

package/lib/middleware/testRunner/TestRunner.js

@@ -108,13 +108,9 @@
 	window.sap.ui.qunit.TestRunner = {
 
 		checkTestPage: function(sTestPage, bSequential) {
-			var t0 = Date.now();
 			var oPromise =
 				this._checkTestPage(sTestPage, bSequential)
 				.then(function(aTestPages) {
-					var t1 = Date.now();
-					window.console.log("[DEBUG] checkTestPage(\"" + sTestPage + "\") found " + aTestPages.length + " pages in " + (t1 - t0) + "msec.");
-					window.console.log("[DEBUG] checkTestPage(\"" + sTestPage + "\") currently running IFrames: " + window.frames.length);
 					return aTestPages;
 				});
 			oPromise.done = oPromise.then; // compat for Deferred
@@ -139,8 +135,8 @@
 				// check for an existing test page and check for test suite or page
 				oXHRQueue.ajax(sTestPage).then(function(sData) {
 					if (/(?:window\.suite\s*=|function\s*suite\s*\(\s*\)\s*{)/.test(sData)
-							|| (/data-sap-ui-testsuite/.test(sData) && !/sap\/ui\/test\/starter\/runTest/.test(sData)) ) {
-						// window.console.log("[DEBUG] _checkTestPage checking testsuite page: " + sTestPage);
+							|| (/data-sap-ui-testsuite/.test(sData) && !/sap\/ui\/test\/starter\/runTest/.test(sData))
+							|| /sap\/ui\/test\/starter\/createSuite/.test(sData) ) {
 						var $frame = jQuery("<iframe>");
 						var that = this;
 
@@ -194,11 +190,7 @@
 		findTestPages: function(oIFrame, bSequential) {
 
 			return Promise.resolve(oIFrame.contentWindow.suite()).then(function(oSuite) {
-				window.console.log("[DEBUG] findTestPages oIFrame source: " + oIFrame.src);
 				var aPages = oSuite && oSuite.getTestPages() || [];
-				for (var i = 0; i < aPages.length; i++) {
-					window.console.log("[DEBUG] findTestPages oIFrame source " + oIFrame.src + ": " + aPages[i]);
-				}
 				return new Promise(function(resolve, reject) {
 
 					try {
@@ -303,12 +295,12 @@
 		},
 
 		printTestResultAndRemoveFrame : function (oInst, $frame, $framediv, oContext) {
-			var oCoverage = $frame[0].contentWindow._$blanket;
+			var oBlanketCoverage = $frame[0].contentWindow._$blanket;
 
 			// in case of coverage either merge it or set it on the _$blanket object
-			if (oCoverage) {
+			if (oBlanketCoverage) {
 				window._$blanket = window._$blanket || {};
-				jQuery.each(oCoverage, function(sModule, aCoverageInfo) {
+				jQuery.each(oBlanketCoverage, function(sModule, aCoverageInfo) {
 					if (!window._$blanket[sModule]) {
 						window._$blanket[sModule] = aCoverageInfo;
 					} else {
@@ -387,11 +379,8 @@
 
 						if ($qunitBanner.hasClass("qunit-fail") || $qunitBanner.hasClass("qunit-pass")) {
 
-							//IE workaround for the lack of document.baseURI property
-							var baseURI = doc.location.href;
-
 							if (sTestName == " ") {
-								sTestName = "QUnit page for " + baseURI.substring(baseURI.indexOf("test-resources") + 15, baseURI.length);
+								sTestName = "QUnit page for " + doc.baseURI.substring(doc.baseURI.indexOf("test-resources") + 15, doc.baseURI.length);
 							}
 							oContext = oInst.fnGetTestResults(sTestName, $results);
 							this.printTestResultAndRemoveFrame(oInst, $frame, $framediv, oContext);
@@ -473,7 +462,47 @@
 		},
 
 		getCoverage: function() {
-			return window._$blanket;
+			return window._$blanket || window.top.__coverage__;
+		},
+
+		reportCoverage: function (reportToEl) {
+			var oCoverage = this.getCoverage();
+
+			if (!oCoverage) {
+				return;
+			}
+
+			if ( window.blanket && !window.top.__coverage__ ) {
+				window.blanket.report({});
+			} else {
+				jQuery.ajax("/.ui5/coverage/report", {
+					method: "POST",
+					data: JSON.stringify(window.top.__coverage__),
+					headers: {
+						"Content-Type": "application/json"
+					}
+				})
+				.then(function (oData) {
+					var aReports = oData.availableReports;
+					var oHTMLReport = aReports.filter(function (oCurReport) {
+						// HTML is the only one that make sense and
+						// provides understandable information
+						return oCurReport.report === "html";
+					})[0];
+
+					if (!oHTMLReport) { // Do not render reports if HTML or lcov are not provided
+						return;
+					}
+
+					var oFrameEl = document.createElement("iframe");
+					oFrameEl.src = "/.ui5/coverage/report/" + oHTMLReport.destination;
+					oFrameEl.style.border = "none";
+					oFrameEl.style.width = "100%";
+					oFrameEl.style.height = "100vh";
+					oFrameEl.sandbox = "allow-scripts";
+					reportToEl.appendChild(oFrameEl);
+				});
+			}
 		},
 
 		getTestPageUrl: function(sFallbackUrl) {

package/lib/middleware/testRunner/testrunner.html

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-
+	<meta charset="utf-8">
 	<title>SAPUI5 QUnit TestRunner</title>
 
 	<script src="../../../../resources/sap/ui/thirdparty/es6-promise.js"></script>
@@ -147,9 +147,10 @@
 				sap.ui.qunit.TestRunner.runTests(aTests, nStep).then(function(oResult) {
 					$this.val("Run");
 					jQuery("#stop").toggle();
-					if (sap.ui.qunit.TestRunner.hasCoverage() && window.blanket) {
-						window.blanket.report({});
-						jQuery("div.test-coverage").toggle();
+					if (sap.ui.qunit.TestRunner.hasCoverage()) {
+						var $testCoverage = jQuery("div.test-coverage");
+						$testCoverage.toggle();
+						sap.ui.qunit.TestRunner.reportCoverage( $testCoverage[0] );
 					}
 				}).then(function() {
 					$this.val("Run");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/server",
-	"version": "3.1.1",
+	"version": "3.1.3",
 	"description": "UI5 Tooling - Server",
 	"author": {
 		"name": "SAP SE",
@@ -114,8 +114,8 @@
 		"url": "git@github.com:SAP/ui5-server.git"
 	},
 	"dependencies": {
-		"@ui5/builder": "^3.0.1",
-		"@ui5/fs": "^3.0.2",
+		"@ui5/builder": "^3.0.5",
+		"@ui5/fs": "^3.0.4",
 		"@ui5/logger": "^3.0.0",
 		"body-parser": "^1.20.2",
 		"compression": "^1.7.4",
@@ -125,7 +125,7 @@
 		"etag": "^1.8.1",
 		"express": "^4.18.2",
 		"fresh": "^0.5.2",
-		"graceful-fs": "^4.2.10",
+		"graceful-fs": "^4.2.11",
 		"mime-types": "^2.1.35",
 		"parseurl": "^1.3.3",
 		"portscanner": "^2.2.0",
@@ -136,22 +136,22 @@
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
-		"@ui5/project": "^3.0.4",
-		"ava": "^5.2.0",
+		"@ui5/project": "^3.3.1",
+		"ava": "^5.3.0",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.3",
 		"docdash": "^2.0.1",
-		"eslint": "^8.36.0",
+		"eslint": "^8.42.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^14.0.0",
-		"eslint-plugin-jsdoc": "^40.0.1",
-		"esmock": "^2.1.0",
+		"eslint-plugin-jsdoc": "^46.2.2",
+		"esmock": "^2.3.1",
 		"jsdoc": "^4.0.2",
 		"nyc": "^15.1.0",
-		"open-cli": "^7.1.0",
-		"rimraf": "^4.4.0",
-		"sinon": "^15.0.1",
+		"open-cli": "^7.2.0",
+		"rimraf": "^5.0.1",
+		"sinon": "^15.1.0",
 		"supertest": "^6.3.3",
 		"tap-xunit": "^2.4.1"
 	}