@sap-ux/preview-middleware 0.25.2 → 0.25.4

package/dist/base/flp.d.ts

@@ -172,6 +172,11 @@ export declare class FlpSandbox {
      * to load the changes in an Adaptation project.
      */
     private removeAsyncHintsRequests;
+    /**
+     * For UI5 versions below 1.120, flexExtensionPointEnabled must be removed from the application
+     * dependencies manifest. Older UI5 versions cannot handle this property at bootstrap time.
+     */
+    private removeFlexExtensionPointEnabled;
     /**
      * Try finding a locate-reuse-libs script in the project.
      *

package/dist/base/flp.js

@@ -195,6 +195,9 @@ class FlpSandbox {
         if (ui5Version.major === 1 && ui5Version.minor <= 71) {
             this.removeAsyncHintsRequests();
         }
+        if (ui5Version.major === 1 && ui5Version.minor < 120) {
+            this.removeFlexExtensionPointEnabled();
+        }
         const config = structuredClone(this.templateConfig);
         if (!config.ui5.libs.includes('sap.ui.rta')) {
             // sap.ui.rta needs to be added to the list of preload libs for variants management and adaptation projects
@@ -352,6 +355,9 @@ class FlpSandbox {
                 ? req.protocol
                 : (req.headers.referer?.substring(0, req.headers.referer.indexOf(':')) ?? 'http'), req.headers.host, this.templateConfig.baseUrl);
             this.checkDeleteConnectors(ui5Version.major, ui5Version.minor, ui5Version.isCdn);
+            if (ui5Version.major === 1 && ui5Version.minor < 120) {
+                this.removeFlexExtensionPointEnabled();
+            }
             //for consistency reasons, we also add the baseUrl to the HTML here, although it is only used in editor mode
             const html = (0, ejs_1.render)(this.getSandboxTemplate(ui5Version), this.templateConfig);
             this.sendResponse(res, 'text/html', 200, html);
@@ -455,6 +461,18 @@ class FlpSandbox {
             }
         }
     }
+    /**
+     * For UI5 versions below 1.120, flexExtensionPointEnabled must be removed from the application
+     * dependencies manifest. Older UI5 versions cannot handle this property at bootstrap time.
+     */
+    removeFlexExtensionPointEnabled() {
+        for (const app in this.templateConfig.apps) {
+            const manifest = this.templateConfig.apps[app].applicationDependencies?.manifest;
+            if (manifest?.['sap.ui5']?.flexExtensionPointEnabled !== undefined) {
+                delete manifest['sap.ui5'].flexExtensionPointEnabled;
+            }
+        }
+    }
     /**
      * Try finding a locate-reuse-libs script in the project.
      *

package/dist/client/flp/init.js

@@ -133,7 +133,7 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
    * @param container the UShell container
    */
   async function resetAppState(container) {
-    const urlParams = new URLSearchParams(globalThis.location.hash);
+    const urlParams = new URLSearchParams(window.location.hash);
     const appStateValue = urlParams.get('sap-iapp-state') ?? urlParams.get('/?sap-iapp-state');
     if (appStateValue) {
       const appStateService = await container.getServiceAsync('AppState');
@@ -266,7 +266,7 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
     if (enhancedHomePage) {
       initCdm();
     }
-    const urlParams = new URLSearchParams(globalThis.location.search);
+    const urlParams = new URLSearchParams(window.location.search);
     const container = sap?.ushell?.Container ?? (await __ui5_require_async('sap/ushell/Container')).default;
     let scenario = '';
     const ui5VersionInfo = await getUi5Version();
@@ -277,10 +277,6 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
       container.attachRendererCreatedEvent(async function () {
         const lifecycleService = await container.getServiceAsync('AppLifeCycle');
         lifecycleService.attachAppLoaded(event => {
-          // Prevent starting RTA when the FLP home component (#Shell-home) fires attachAppLoaded before the user navigates to the actual app.
-          if (!globalThis.location.hash || globalThis.location.hash.startsWith('#Shell-home')) {
-            return;
-          }
           const view = event.getParameter('componentInstance');
           const pluginScript = flexSettings.pluginScript ?? '';
           const libs = [];
@@ -362,7 +358,7 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
     renderer.placeAt('content');
   }
 
-  // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-dom-access,@sap-ux/fiori-tools/sap-browser-api-warning, @sap-ux/fiori-tools/sap-no-global-variable
+  // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-dom-access,@sap-ux/fiori-tools/sap-browser-api-warning
   const bootstrapConfig = document.getElementById('sap-ui-bootstrap');
   if (bootstrapConfig) {
     init({
@@ -402,7 +398,9 @@ sap.ui.define(["sap/base/Log", "open/ux/preview/client/thirdparty/@sap-ux-privat
           type: MessageBarType.warning
         });
       }
-      globalThis.location.reload();
+
+      // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-location-reload
+      window.location.reload();
     }
   }
   var __exports = {

package/dist/client/flp/init.ts

@@ -168,7 +168,7 @@ function registerModules(dataFromAppIndex: AppIndexData) {
  * @param container the UShell container
  */
 export async function resetAppState(container: typeof sap.ushell.Container): Promise<void> {
-    const urlParams = new URLSearchParams(globalThis.location.hash);
+    const urlParams = new URLSearchParams(window.location.hash);
     const appStateValue = urlParams.get('sap-iapp-state') ?? urlParams.get('/?sap-iapp-state');
     if (appStateValue) {
         const appStateService = await container.getServiceAsync<AppState>('AppState');
@@ -308,7 +308,7 @@ export async function init({
         initCdm();
     }
 
-    const urlParams = new URLSearchParams(globalThis.location.search);
+    const urlParams = new URLSearchParams(window.location.search);
     const container =
         sap?.ushell?.Container ??
         ((await import('sap/ushell/Container')).default as unknown as typeof sap.ushell.Container);
@@ -321,10 +321,6 @@ export async function init({
         container.attachRendererCreatedEvent(async function () {
             const lifecycleService = await container.getServiceAsync<AppLifeCycle>('AppLifeCycle');
             lifecycleService.attachAppLoaded((event) => {
-                // Prevent starting RTA when the FLP home component (#Shell-home) fires attachAppLoaded before the user navigates to the actual app.
-                if (!globalThis.location.hash || globalThis.location.hash.startsWith('#Shell-home')) {
-                    return;
-                }
                 const view = event.getParameter('componentInstance');
                 const pluginScript = flexSettings.pluginScript ?? '';
 
@@ -412,7 +408,7 @@ export async function init({
     renderer.placeAt('content');
 }
 
-// eslint-disable-next-line @sap-ux/fiori-tools/sap-no-dom-access,@sap-ux/fiori-tools/sap-browser-api-warning, @sap-ux/fiori-tools/sap-no-global-variable
+// eslint-disable-next-line @sap-ux/fiori-tools/sap-no-dom-access,@sap-ux/fiori-tools/sap-browser-api-warning
 const bootstrapConfig = document.getElementById('sap-ui-bootstrap');
 if (bootstrapConfig) {
     init({
@@ -446,6 +442,7 @@ export async function handleHigherLayerChanges(error: unknown, ui5VersionInfo: U
             });
         }
 
-        globalThis.location.reload();
+        // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-location-reload
+        window.location.reload();
     }
 }

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.25.2",
+  "version": "0.25.4",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -27,14 +27,14 @@
     "mem-fs-editor": "9.4.0",
     "qrcode": "1.5.4",
     "@sap/bas-sdk": "3.13.3",
-    "@sap-ux/adp-tooling": "0.18.101",
+    "@sap-ux/adp-tooling": "0.18.102",
     "@sap-ux/btp-utils": "1.1.11",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.22",
     "@sap-ux/feature-toggle": "0.3.7",
     "@sap-ux/logger": "0.8.3",
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.22",
     "@sap-ux/project-access": "1.35.16",
-    "@sap-ux/system-access": "0.7.2",
-    "@sap-ux/i18n": "0.3.10"
+    "@sap-ux/i18n": "0.3.10",
+    "@sap-ux/system-access": "0.7.2"
   },
   "devDependencies": {
     "@sap-ux-private/playwright": "0.2.13",
@@ -54,8 +54,8 @@
     "npm-run-all2": "8.0.4",
     "supertest": "7.2.2",
     "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.19.1",
-    "@sap-ux/axios-extension": "1.25.26",
     "@sap-ux/store": "1.5.11",
+    "@sap-ux/axios-extension": "1.25.26",
     "@sap-ux/ui5-info": "0.13.16"
   },
   "peerDependencies": {