@sap-ux/preview-middleware 0.13.70 → 0.13.72

package/dist/base/flp.js

@@ -406,6 +406,7 @@ class FlpSandbox {
         this.router.get(config.path, ((_req, res) => __awaiter(this, void 0, void 0, function* () {
             this.logger.debug(`Serving test route: ${config.path}`);
             const templateConfig = {
+                basePath: this.templateConfig.basePath,
                 initPath: config.init
             };
             const html = (0, ejs_1.render)(testsuite, templateConfig);
@@ -420,17 +421,24 @@ class FlpSandbox {
             if (testConfig.framework === 'Testsuite') {
                 continue;
             }
-            const config = (0, test_1.mergeTestConfigDefaults)(testConfig);
-            testPaths.push(config.path);
+            const mergedConfig = (0, test_1.mergeTestConfigDefaults)(testConfig);
+            testPaths.push(path_1.posix.relative(path_1.posix.dirname(config.path), mergedConfig.path));
         }
         this.logger.debug(`Add route for ${config.init}`);
-        this.router.get(config.init, ((_req, res) => __awaiter(this, void 0, void 0, function* () {
-            this.logger.debug(`Serving test route: ${config.init}`);
-            const templateConfig = {
-                testPaths: testPaths
-            };
-            const js = (0, ejs_1.render)(initTemplate, templateConfig);
-            this.sendResponse(res, 'application/javascript', 200, js);
+        this.router.get(config.init, ((_req, res, next) => __awaiter(this, void 0, void 0, function* () {
+            const files = yield this.project.byGlob(config.init.replace('.js', '.[jt]s'));
+            if ((files === null || files === void 0 ? void 0 : files.length) > 0) {
+                this.logger.warn(`Script returned at ${config.path} is loaded from the file system.`);
+                next();
+            }
+            else {
+                this.logger.debug(`Serving test route: ${config.init}`);
+                const templateConfig = {
+                    testPaths: testPaths
+                };
+                const js = (0, ejs_1.render)(initTemplate, templateConfig);
+                this.sendResponse(res, 'application/javascript', 200, js);
+            }
         })));
     }
     /**
@@ -477,7 +485,7 @@ class FlpSandbox {
                         id,
                         framework: config.framework,
                         basePath: (_a = path_1.posix.relative(path_1.posix.dirname(config.path), '/')) !== null && _a !== void 0 ? _a : '.',
-                        initPath: `${ns}${config.init.replace('.js', '')}`
+                        initPath: path_1.posix.relative(path_1.posix.dirname(config.path), config.init)
                     };
                     const html = (0, ejs_1.render)(htmlTemplate, templateConfig);
                     this.sendResponse(res, 'text/html', 200, html);
@@ -491,7 +499,7 @@ class FlpSandbox {
             this.logger.debug(`Add route for ${config.init}`);
             this.router.get(config.init, ((_req, res, next) => __awaiter(this, void 0, void 0, function* () {
                 this.logger.debug(`Serving test init script: ${config.init}`);
-                const files = yield this.project.byGlob(config.init.replace('.js', '.*'));
+                const files = yield this.project.byGlob(config.init.replace('.js', '.[jt]s'));
                 if ((files === null || files === void 0 ? void 0 : files.length) > 0) {
                     this.logger.warn(`Script returned at ${config.path} is loaded from the file system.`);
                     next();
@@ -564,19 +572,20 @@ class FlpSandbox {
      * @returns UI5 libs that should preloaded
      */
     getUI5Libs(manifest) {
-        var _a, _b, _c;
-        const libs = (_c = (_b = (_a = manifest['sap.ui5']) === null || _a === void 0 ? void 0 : _a.dependencies) === null || _b === void 0 ? void 0 : _b.libs) !== null && _c !== void 0 ? _c : {};
-        // add libs that should always be preloaded
-        libs['sap.m'] = {};
-        libs['sap.ui.core'] = {};
-        libs['sap.ushell'] = {};
-        return Object.keys(libs)
-            .filter((key) => {
-            return UI5_LIBS.some((substring) => {
-                return key === substring || key.startsWith(substring + '.');
-            });
-        })
-            .join(',');
+        var _a, _b;
+        if ((_b = (_a = manifest['sap.ui5']) === null || _a === void 0 ? void 0 : _a.dependencies) === null || _b === void 0 ? void 0 : _b.libs) {
+            const libNames = Object.keys(manifest['sap.ui5'].dependencies.libs);
+            return libNames
+                .filter((key) => {
+                return UI5_LIBS.some((substring) => {
+                    return key === substring || key.startsWith(substring + '.');
+                });
+            })
+                .join(',');
+        }
+        else {
+            return 'sap.m,sap.ui.core,sap.ushell';
+        }
     }
 }
 exports.FlpSandbox = FlpSandbox;

package/dist/base/test.d.ts

@@ -1,18 +1,13 @@
 /// <reference path="../../../../types/ui5.d.ts" />
 import type { Resource } from '@ui5/fs';
-import type { TestConfig } from '../types';
+import type { InternalTestConfig, TestConfig } from '../types';
 /**
  * Merge the given test configuration with the default values.
  *
  * @param config test configuration
  * @returns merged test configuration
  */
-export declare function mergeTestConfigDefaults(config: TestConfig): {
-    framework: "OPA5" | "QUnit" | "Testsuite";
-    path: string;
-    init: string;
-    pattern: string;
-};
+export declare function mergeTestConfigDefaults(config: TestConfig): InternalTestConfig;
 /**
  * Generate a list of imports from a list of resources.
  *

package/dist/base/test.js

@@ -28,21 +28,16 @@ const DEFAULTS = {
  * @returns merged test configuration
  */
 function mergeTestConfigDefaults(config) {
-    var _a, _b, _c, _d;
-    const key = config.framework.toLowerCase();
-    const defaults = (_a = DEFAULTS[key]) !== null && _a !== void 0 ? _a : {};
-    if (config.path && !config.path.startsWith('/')) {
-        config.path = `/${config.path}`;
+    var _a;
+    const defaults = (_a = DEFAULTS[config.framework.toLowerCase()]) !== null && _a !== void 0 ? _a : {};
+    const merged = Object.assign(Object.assign({}, defaults), config);
+    if (!merged.path.startsWith('/')) {
+        merged.path = `/${merged.path}`;
     }
-    if (config.init && !config.init.startsWith('/')) {
-        config.init = `/${config.init}`;
+    if (!merged.init.startsWith('/')) {
+        merged.init = `/${config.init}`;
     }
-    return {
-        framework: config.framework,
-        path: (_b = config.path) !== null && _b !== void 0 ? _b : defaults.path,
-        init: (_c = config.init) !== null && _c !== void 0 ? _c : defaults.init,
-        pattern: (_d = config.pattern) !== null && _d !== void 0 ? _d : defaults.pattern
-    };
+    return merged;
 }
 exports.mergeTestConfigDefaults = mergeTestConfigDefaults;
 /**

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Apreview-middleware"
   },
-  "version": "0.13.70",
+  "version": "0.13.72",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -27,9 +27,9 @@
     "mem-fs-editor": "9.4.0",
     "@sap-ux/logger": "0.5.1",
     "@sap-ux/btp-utils": "0.14.4",
-    "@sap-ux/adp-tooling": "0.11.5",
-    "@sap-ux/project-access": "1.22.2",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.23"
+    "@sap-ux/adp-tooling": "0.11.6",
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.23",
+    "@sap-ux/project-access": "1.22.3"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",

package/templates/test/qunit.html

@@ -12,10 +12,11 @@
 		}'
 		data-sap-ui-animation="false"
 		data-sap-ui-compatVersion="edge"
-		data-sap-ui-async="true"
-		data-sap-ui-oninit="module:<%- initPath %>">
+		data-sap-ui-async="true">
 	</script>
 
+	<script src="<%- initPath %>"></script>
+
 	<link rel="stylesheet" type="text/css" href="<%- basePath %>/resources/sap/ui/thirdparty/qunit-2.css">
 </head>
 <body>

package/templates/test/qunit.js

@@ -1,8 +1,28 @@
-sap.ui.define([
-    'sap/ui/thirdparty/qunit-2'
-], function(QUnit) {
-        QUnit.config.autostart = false;
-        sap.ui.require(<%- JSON.stringify(tests) %>, function() {
-            QUnit.start();
-    });
+sap.ui.loader.config({
+    shim: {
+        "sap/ui/qunit/qunit-junit": {
+            deps: ["sap/ui/thirdparty/qunit-2"]
+        },
+        "sap/ui/qunit/qunit-coverage": {
+            deps: ["sap/ui/thirdparty/qunit-2"]
+        },
+        "sap/ui/thirdparty/sinon-qunit": {
+            deps: ["sap/ui/thirdparty/qunit-2", "sap/ui/thirdparty/sinon"]
+        },
+        "sap/ui/qunit/sinon-qunit-bridge": {
+            deps: ["sap/ui/thirdparty/qunit", "sap/ui/thirdparty/sinon-4"]
+        }        
+    }
+});
+
+sap.ui.require([
+    "sap/ui/thirdparty/qunit-2",
+    "sap/ui/qunit/qunit-junit",
+    "sap/ui/qunit/qunit-coverage"
+], function (QUnit) {
+    'use strict';
+    QUnit.config.autostart = false;
+    sap.ui.require(<%- JSON.stringify(tests) %>, function() {
+        QUnit.start();
+    }); 
 });

package/templates/test/testsuite.qunit.html

@@ -2,8 +2,8 @@
 <html lang="en">
 <head>
     <title>QUnit TestSuite</title>
-    <script src="/resources/sap/ui/qunit/qunit-redirect.js"></script>
-    <script src="<%- locals.initPath %>" data-sap-ui-testsuite></script>
+    <script src="<%- basePath %>/resources/sap/ui/qunit/qunit-redirect.js"></script>
+    <script src="<%- initPath %>" data-sap-ui-testsuite></script>
 </head>
 <body>
 </body>

package/templates/test/testsuite.qunit.js

@@ -1,7 +1,8 @@
 window.suite = function () {
     const oSuite = new parent.jsUnitTestSuite();
+    var sContextPath = location.pathname.substring(0, location.pathname.lastIndexOf("/") + 1);
 <% for (const path of locals.testPaths) { %>
-    oSuite.addTestPage("<%- path %>");
+    oSuite.addTestPage(sContextPath + "<%- path %>");
 <% } %>
     return oSuite;
 }