@sap-ux/preview-middleware 0.16.46 → 0.16.48

package/README.md

@@ -57,12 +57,12 @@ Array of additional application configurations:
 | `developerMode` | `boolean` optional | Enables/disables the runtime adaptation developer mode (only supported for adaptation projects) |
 
 ### `test`
-| Option          | Type               | Description                                                                                                                                                                                                     |
-| --------------- | -------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `framework`     | `string` mandatory | Currently `OPA5`, `QUnit` and `Testsuite` are supported. `Testsuite` will generate a testsuite for all configured frameworks that can be be used with a test runner (like e.g. karma)                           |
-| `path`          | `string` optional  | The mount point to be used for test suite. By default `/test/opaTests.qunit.html` is used for `OPA5`, `/test/unitTests.qunit.html` is used for `QUnit` and `/test/testsuite.qunit.html` is used for `Testsuite` |
-| `init`          | `string` optional  | The mount point to be used for custom test runner script                                                                                                                                                        |
-| `pattern`       | `string` optional  | Optional glob pattern to find the tests. By default `/test/**/*Journey.*` is used for `OPA5` and `/test/**/*Test.*` is used for `QUnit` (n.a. for `Testsuite`)                                                  |
+| Option          | Type               | Description                                                                                                                                                                                                                                                                                                             |
+| --------------- | -------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `framework`     | `string` mandatory | Currently `OPA5`, `QUnit` (only QUnit 2.3.2 provided as third-party module via [OpenUI5](https://github.com/SAP/openui5/blob/master/THIRDPARTY.txt)/SAPUI5) and `Testsuite` are supported. `Testsuite` will generate a testsuite for all configured frameworks that can be be used with a test runner (like e.g. karma) |
+| `path`          | `string` optional  | The mount point to be used for test suite. By default `/test/opaTests.qunit.html` is used for `OPA5`, `/test/unitTests.qunit.html` is used for `QUnit` and `/test/testsuite.qunit.html` is used for `Testsuite`                                                                                                         |
+| `init`          | `string` optional  | The mount point to be used for custom test runner script                                                                                                                                                                                                                                                                |
+| `pattern`       | `string` optional  | Optional glob pattern to find the tests. By default `/test/**/*Journey.*` is used for `OPA5` and `/test/**/*Test.*` is used for `QUnit` (n.a. for `Testsuite`)                                                                                                                                                          |
 
 
 ## Usage

package/dist/base/config.d.ts

@@ -48,7 +48,8 @@ export interface TemplateConfig {
  */
 export declare const PREVIEW_URL: {
     readonly client: {
-        readonly url: "/preview/client";
+        readonly path: "/preview/client";
+        readonly getUrl: (basePath: string) => string;
         readonly local: string;
         readonly ns: "open.ux.preview.client";
     };

package/dist/base/config.js

@@ -14,7 +14,8 @@ const mem_fs_1 = require("mem-fs");
  */
 exports.PREVIEW_URL = {
     client: {
-        url: '/preview/client',
+        path: '/preview/client',
+        getUrl: (basePath) => path_1.posix.join(basePath, 'preview', 'client'),
         local: (0, path_1.join)(__dirname, '../../dist/client'),
         ns: 'open.ux.preview.client'
     },
@@ -182,8 +183,9 @@ async function getI18nTextFromProperty(projectRoot, propertyValue, logger) {
     }
     const propertyI18nKey = propertyValue.replace(/i18n>|[{}]/g, '');
     const projectAccess = await (0, project_access_1.createProjectAccess)(projectRoot);
+    const applicationIds = projectAccess.getApplicationIds();
     try {
-        const bundle = (await projectAccess.getApplication('').getI18nBundles())['sap.app'];
+        const bundle = (await projectAccess.getApplication(applicationIds[0]).getI18nBundles())['sap.app'];
         return bundle[propertyI18nKey]?.[0]?.value?.value ?? propertyI18nKey;
     }
     catch (e) {
@@ -205,8 +207,9 @@ function createFlpTemplateConfig(config, manifest, resources = {}) {
     const ui5Theme = config.theme ?? (supportedThemes.includes(exports.DEFAULT_THEME) ? exports.DEFAULT_THEME : supportedThemes[0]);
     const id = manifest['sap.app']?.id ?? '';
     const ns = id.replace(/\./g, '/');
+    const basePath = path_1.posix.relative(path_1.posix.dirname(config.path), '/') ?? '.';
     return {
-        basePath: path_1.posix.relative(path_1.posix.dirname(config.path), '/') ?? '.',
+        basePath: basePath,
         apps: {},
         init: config.init ? ns + config.init : undefined,
         ui5: {
@@ -215,7 +218,7 @@ function createFlpTemplateConfig(config, manifest, resources = {}) {
             flex,
             resources: {
                 ...resources,
-                [exports.PREVIEW_URL.client.ns]: exports.PREVIEW_URL.client.url
+                [exports.PREVIEW_URL.client.ns]: exports.PREVIEW_URL.client.getUrl(basePath)
             },
             bootstrapOptions: ''
         },

package/dist/base/flp.js

@@ -175,7 +175,7 @@ class FlpSandbox {
      */
     addStandardRoutes() {
         // register static client sources
-        this.router.use(config_1.PREVIEW_URL.client.url, (0, express_1.static)(config_1.PREVIEW_URL.client.local));
+        this.router.use(config_1.PREVIEW_URL.client.path, (0, express_1.static)(config_1.PREVIEW_URL.client.local));
         // add route for the sandbox.html
         this.router.get(this.config.path, (async (_req, res, next) => {
             // inform the user if a html file exists on the filesystem

package/dist/client/flp/bootstrap.js

@@ -9,14 +9,16 @@
  * @param fnCallback {Function} The callback function to be executed after the bootstrap is loaded.
  */
 async function ushellBootstrap(fnCallback) {
-    let src = '/test-resources/sap/ushell/bootstrap/sandbox.js';
+    const basePath = window['data-open-ux-preview-basePath'] ?? '';
+
+    let src = `${basePath}/test-resources/sap/ushell/bootstrap/sandbox.js`;
     try {
-        const response = await fetch('/resources/sap-ui-version.json');
+        const response = await fetch(`${basePath}/resources/sap-ui-version.json`);
         const json = await response.json();
         const version = json?.libraries?.find((lib) => lib.name === 'sap.ui.core')?.version;
         const major = version ? parseInt(version.split('.')[0], 10) : 2;
         if (major >= 2) {
-            src = '/resources/sap/ushell/bootstrap/sandbox2.js';
+            src = `${basePath}/resources/sap/ushell/bootstrap/sandbox2.js`;
         }
     } catch (error) {
         console.warn('Failed to fetch sap-ui-version.json. Assuming it is a 1.x version.');

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.16.46",
+  "version": "0.16.48",
   "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.6.0",
     "@sap-ux/btp-utils": "0.15.0",
-    "@sap-ux/adp-tooling": "0.12.35",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.27",
-    "@sap-ux/project-access": "1.26.6"
+    "@sap-ux/project-access": "1.26.6",
+    "@sap-ux/adp-tooling": "0.12.36"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -47,7 +47,7 @@
     "dotenv": "16.3.1",
     "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.10.7",
     "@sap-ux/axios-extension": "1.16.3",
-    "@sap-ux/store": "0.9.0",
+    "@sap-ux/store": "0.9.1",
     "@sap-ux/ui5-info": "0.8.0",
     "@sap-ux/i18n": "0.1.1"
   },

package/templates/flp/sandbox.html

@@ -40,7 +40,11 @@
         };
     </script>
 
-    <script src="/preview/client/flp/bootstrap.js" id="preview-bootstrap"></script>
+    <script type="text/javascript">
+        window["data-open-ux-preview-basePath"] = "<%- basePath %>";
+    </script>
+
+    <script src="<%- basePath %>/preview/client/flp/bootstrap.js" id="preview-bootstrap"></script>
     <script id="sap-ushell-bootstrap"></script>
     <!-- Bootstrap the UI5 core library. 'data-sap-ui-frameOptions="allow"'' is a NON-SECURE setting for test environments -->
     <script id="sap-ui-bootstrap"
@@ -68,7 +72,7 @@
         #shell-header, .sapUiRtaToolbar {
             visibility: hidden;
             height: 1px;
-        } 
+        }
         .sapUshellShellCanvas {
             top: 0 !important;
         }