@sapui5/sap.ushell_abap 1.146.0 → 1.147.1

package/src/main/js/sap/ushell_abap/bootstrap/ThemeHandler.js

@@ -0,0 +1,276 @@
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+
+sap.ui.define([
+    "sap/base/Log",
+    "sap/base/util/ObjectPath",
+    "sap/ui/thirdparty/URI",
+    "sap/ushell/bootstrap/Config"
+], (
+    Log,
+    ObjectPath,
+    URI,
+    BootstrapConfig
+) => {
+    "use strict";
+
+    class ThemeHandler {
+        #sIgnoredUnsafeUrlTheme = null;
+
+        getUI5ConfigTheme () {
+            const oUshellConfig = BootstrapConfig.get();
+            let oThemeRoots;
+
+            const oStartupConfig = oUshellConfig?.startupConfig || {};
+            const oThemeEntry = oStartupConfig.userProfile?.find((entry) => entry?.id === "THEME");
+
+            // 1) theme from UserProfile;
+            // 2) default theme from config;
+            // 3) sap_horizon as SAP default theme
+            const sTheme = oThemeEntry?.value || oStartupConfig.theme || "sap_horizon";
+
+            let sThemeRoot = oStartupConfig.themeRoot;
+            if (!sThemeRoot && oStartupConfig.client) {
+                sThemeRoot = `/sap/public/bc/themes/~client-${oStartupConfig.client}`;
+            }
+            if (sThemeRoot && !sTheme.startsWith("sap_")) { // set the theme root for the custom theme only
+                oThemeRoots = {};
+                oThemeRoots[sTheme] = sThemeRoot.replace(/\/?$/, "/UI5/"); // Add /UI5/, theme roots from ABAP theming service do not contain UI5 at the end.
+            }
+            return {
+                theme: sTheme,
+                themeRoots: oThemeRoots
+            };
+        }
+
+        setBootThemeInUserConfig () {
+            const oUshellConfig = BootstrapConfig.get();
+
+            // 1) URL
+            let oBootTheme = this.#getUrlTheme();
+            if (oBootTheme) {
+                Log.debug(`theme: URL theme = "${oBootTheme.theme}"  theme root = "${oBootTheme.root}"`, null, "sap.ushell_abap.bootstrap");
+            } else {
+                // 2) container adapter
+                oBootTheme = this.#getContainerAdapterTheme();
+                if (oBootTheme) {
+                    Log.debug(`theme: startup service theme = "${oBootTheme.theme}"  theme root = "${oBootTheme.root}"`, null, "sap.ushell_abap.bootstrap");
+                } else {
+                    // 3) html file
+                    oBootTheme = this.#getHtmlTheme();
+                    if (oBootTheme) {
+                        Log.debug(`theme: html file theme = "${oBootTheme.theme}"  theme root = "${oBootTheme.root}"`, null, "sap.ushell_abap.bootstrap");
+                    } else {
+                        // error fallback
+                        Log.error("Could not determine theme", null, "sap.ushell_abap.bootstrap");
+                        oBootTheme = {
+                            theme: "",
+                            root: ""
+                        };
+                    }
+                }
+            }
+
+            ObjectPath.set("services.Container.adapter.config.bootTheme", oBootTheme, oUshellConfig);
+        }
+
+        #getUrlTheme () {
+            const sSearch = this.getWindowLocationSearch();
+            const oUrlParameters = new URLSearchParams(sSearch);
+
+            const sUrlTheme = oUrlParameters.get("sap-theme") || oUrlParameters.get("sap-ui-theme");
+            if (sUrlTheme && this.#isThemeSafe(sUrlTheme)) {
+                if (sUrlTheme.indexOf("@") > 0) {
+                    const [sTheme, sThemeRoot] = sUrlTheme.split("@", 2);
+                    return {
+                        theme: sTheme,
+                        root: sThemeRoot
+                    };
+                }
+
+                // no theme root supplied
+                return {
+                    theme: sUrlTheme,
+                    root: this.#getThemeRoot(sUrlTheme)
+                };
+            } else if (sUrlTheme) {
+                this.#sIgnoredUnsafeUrlTheme = sUrlTheme;
+            }
+        }
+
+        #getContainerAdapterTheme () {
+            const oUshellConfig = BootstrapConfig.get();
+            const oContainerAdapterConfig = ObjectPath.get("services.Container.adapter.config", oUshellConfig);
+
+            let sTheme;
+            if (oContainerAdapterConfig.userProfile?.length > 0) {
+                const oThemeEntry = oContainerAdapterConfig.userProfile.find((entry) => entry.id === "THEME");
+                sTheme = oThemeEntry?.value;
+            }
+            if (!sTheme) {
+                sTheme = oContainerAdapterConfig.theme || "";
+            }
+
+            if (!sTheme) {
+                return;
+            }
+
+            return {
+                theme: sTheme,
+                root: this.#getThemeRoot(sTheme)
+            };
+        }
+
+        #getHtmlTheme () {
+            // set via e.g. data-sap-ui-theme="sap_horizon" as part of UI5 startup in the central
+            // Fiori launchpad html file
+            const sTheme = ObjectPath.get("sap-ui-config.theme");
+            // could be the URL theme; no problem
+            // Assumption: no theme root included here
+            if (sTheme) {
+                let sThemeRoot = ObjectPath.get(`sap-ui-config.themeRoots.${sTheme}`);
+                if (!sThemeRoot) {
+                    sThemeRoot = this.#getThemeRoot(sTheme);
+                }
+                return {
+                    theme: sTheme,
+                    root: sThemeRoot
+                };
+            }
+        }
+
+        #getThemeRoot (sTheme) {
+            if (!sTheme) {
+                return "";
+            }
+
+            if (sTheme.startsWith("sap_")) {
+                // sap theme
+                return "";
+            }
+
+            // for custom themes, the theme root must be provided.
+
+            const oUshellConfig = BootstrapConfig.get();
+            const oContainerAdapterConfig = ObjectPath.get("services.Container.adapter.config", oUshellConfig);
+
+            let sSystemThemeRoot = oContainerAdapterConfig.themeRoot;
+            if (!sSystemThemeRoot && oContainerAdapterConfig.client) {
+                // fallback
+                Log.warning(
+                    "Theme root was not contained in startup service result. A fallback to /sap/public/bc/themes/~client-<client number> is used",
+                    null,
+                    "sap.ushell_abap.bootstrap"
+                );
+                sSystemThemeRoot = `/sap/public/bc/themes/~client-${oContainerAdapterConfig.client}`;
+            } else if (!sSystemThemeRoot) {
+                Log.error("extractSystemThemeRoot: Could not determine system theme root");
+            }
+
+            return sSystemThemeRoot;
+        }
+
+        /**
+         * Validates the provided theme
+         *
+         * Checks if the origin of the theme root string passed on entry
+         * is regarded safe.
+         *
+         * The function returns <code>true</code>
+         * - if the theme root is server relative
+         * - if the allowlist check passed successfully
+         * - if the theme root is identical to the current host
+         *
+         * The allowlist is taken from the value of the meta tag
+         * <code><meta name="sap-allowed-theme-origins" value=...></code>.
+         *
+         * @param {string} sTheme Theme root string to be verified
+         *
+         * @returns {boolean}
+         *   true/false if the allowlist check passed/failed
+         *   false in case no allowlist was specified, not producible by flp-handler
+         */
+        #isThemeSafe (sTheme) {
+            if (!sTheme.includes("@")) {
+                return true; // no theme root supplied, only theme name -> safe
+            }
+
+            const sThemeRoot = sTheme.split("@")[1];
+
+            // Remove search query as they are not supported for themeRoots/resourceRoots
+            const oURI = new URI(sThemeRoot).search("");
+            const sOrigin = oURI.origin().toString();
+
+            // Return true if the theme root is relative or on the same host
+            if (sOrigin === "" || this.#validateThemeOrigin(sOrigin) || oURI.origin() === window.location.origin) {
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * Checks if ThemeRoot is part of the allowlist
+         * @param {string} sOrigin the origin of the theme root to be validated
+         *
+         * @returns {boolean} if it is part of the allowlist
+         */
+        #validateThemeOrigin (sOrigin) {
+            const aArrayOfAllowedOrigins = this.#getAllowedThemeOrigins();
+            let sAllowedOrigins = "";
+            // only one meta tag of this type should exist, therefore only looking for first element
+            if (aArrayOfAllowedOrigins.length > 0) {
+                sAllowedOrigins = aArrayOfAllowedOrigins[0];
+            } else {
+                Log.debug('No meta tag "sap-allowed-theme-origins" was found. No allowed origin for "theme-url" was applied.');
+            }
+
+            return !!sAllowedOrigins && sAllowedOrigins.split(",").some((sAllowedOrigin) => {
+                return sAllowedOrigin === "*" || sOrigin === sAllowedOrigin.trim();
+            });
+        }
+
+        #getAllowedThemeOrigins () {
+            const sSelector = "meta[name^='sap-allowed-theme-origins']:not([name=''])";
+            const aNodeList = Array.from(document.querySelectorAll(sSelector));
+
+            function parse (sNodeContent) {
+                // only one allowed origin shall be provided
+                return sNodeContent.trim();
+            }
+
+            const aItems = [];
+            aNodeList.forEach((oMetaNode) => {
+                try {
+                    aItems.push(parse(oMetaNode.content));
+                } catch (oError) {
+                    Log.error("Metatag Read failed for allowed-theme-origins", oError, "sap.ushell_abap.bootstrap");
+                }
+            });
+
+            return aItems;
+        }
+
+        /**
+         * If the theme is provided in the url and the theme origin is not in "sap-allowed-theme-origins" meta tag,
+         * switch to the theme from userParameters because ui5 core does not do such a switch itself.
+         */
+        updateUnsafeBootTheme () {
+            if (!this.#sIgnoredUnsafeUrlTheme) {
+                return;
+            }
+
+            // replace unsafe url theme theme only after the core is ready
+            sap.ui.require("sap/ui/core/Theming").setTheme(this.#sIgnoredUnsafeUrlTheme);
+        }
+
+        getWindowLocationSearch () {
+            return window.location.search;
+        }
+
+        reset () {
+            this.#sIgnoredUnsafeUrlTheme = null;
+        }
+    }
+
+    return new ThemeHandler();
+});

package/src/main/js/sap/ushell_abap/bootstrap/XhrFactory.js

@@ -0,0 +1,69 @@
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+sap.ui.define([
+], (
+) => {
+    "use strict";
+
+    class XhrFactory {
+        /**
+         * Creates and opens a new XMLHttpRequest object.
+         *
+         * @param {string} sUrl
+         *  The URL the XHR object should request from.
+         * @param {object} oStartupParameters
+         *   The start_up parameters. This object must
+         *   contain at least the following fields:
+         * <pre>
+         * {
+         *     "client": "<client>",
+         *     "language": "<language>"
+         * }
+         * </pre>
+         *
+         * @param {string} [sHttpMethod]
+         *  The Http method name with default value "GET".
+         * @returns {object}
+         *   The oXHR object.
+         */
+        createAndOpen (sUrl, oStartupParameters, sHttpMethod) {
+            sHttpMethod = sHttpMethod || "GET";
+            const oXhr = new XMLHttpRequest();
+            oXhr.open(sHttpMethod, sUrl, /* async=*/true);
+            if (oStartupParameters) {
+                this.#addCommonHeadersToXhr(oXhr, oStartupParameters);
+            }
+            return oXhr;
+        }
+
+        /**
+         * Adds common headers to the given XHR object. This method is ideal to be used whenever the request should be made with certain headers.
+         *
+         * @param {object} oXhr Instance of XMLHttpRequest object
+         *
+         * @param {object} oStartupResultLikeObject
+         *   An object that looks like the start_up result. This object must
+         *   contain at least the following fields:
+         * <pre>
+         * {
+         *     "client": "<client>",
+         *     "language": "<language>"
+         * }
+         * </pre>
+         *
+         * @returns {object}
+         *   The input oXHR object amended with headers.
+         */
+        #addCommonHeadersToXhr (oXhr, oStartupResultLikeObject) {
+            oXhr.setRequestHeader("Accept", "application/json");
+            if (oStartupResultLikeObject.client) {
+                oXhr.setRequestHeader("sap-client", oStartupResultLikeObject.client);
+            }
+            if (oStartupResultLikeObject.language) {
+                oXhr.setRequestHeader("sap-language", oStartupResultLikeObject.language);
+            }
+            return oXhr;
+        }
+    }
+
+    return new XhrFactory();
+});

package/src/main/js/sap/ushell_abap/bootstrap/{evo/XhrLogonEventHandler.js → XhrLogonEventHandler.js}

@@ -1,11 +1,9 @@
 // Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ushell_abap/bootstrap/evo/abap.bootstrap.utils",
     "sap/base/util/ObjectPath",
     "sap/base/Log"
 ], (
-    abapBootstrapUtils,
     ObjectPath,
     Log
 ) => {
@@ -54,7 +52,7 @@ sap.ui.define([
             }
         } else {
             Log.error(`Cannot handle event with type: ${oEvent.type}`,
-                null, "sap.ushell_abap.bootstrap.evo.XhrLogonEventHandler");
+                null, "sap.ushell_abap.bootstrap.XhrLogonEventHandler");
         }
 
         return true;
@@ -126,14 +124,14 @@ sap.ui.define([
      * @private
      */
     XhrLogonEventHandler.prototype._logoffAndRedirect = function () {
-        const sLocationHref = abapBootstrapUtils.getLocationHref();
+        const sLocationHref = this.getLocationHref();
         const sClientId = ObjectPath.get("sap-ushell-config.services.Container.adapter.config.client");
 
         const sUrl = new URI("/sap/public/bc/icf/logoff")
             .absoluteTo(sLocationHref)
             .search(`sap-client=${sClientId}&propagateLogoff=false&redirectURL=${encodeURIComponent(sLocationHref)}`)
             .toString();
-        document.location = sUrl;
+        this.setDocumentLocation(sUrl);
     };
 
     /**
@@ -160,7 +158,7 @@ sap.ui.define([
             Log.error(
                 "Illegal state: XHR authentication (mode=reload) requested before SAPUI5 is initialized. "
                 + "This should not happen if the FioriLaunchpad.html page is loaded from the server. Trying to reload page once.",
-                null, "sap.ushell_abap.bootstrap.evo.XhrLogonEventHandler"
+                null, "sap.ushell_abap.bootstrap.XhrLogonEventHandler"
             );
 
             const sMessage = "Authentication required\n\nYour session might have expired. Press OK to reload.";
@@ -173,7 +171,7 @@ sap.ui.define([
                 "Illegal state: XHR authentication (mode=reload) requested before SAPUI5 is initialized and page reload has been triggered once."
                 + " Stopping reload to avoid endless loop. This state cannot be overcome. Please ensure that the FioriLaunchpad.html"
                 + " page is not cached, but always loaded from the server.",
-                null, "sap.ushell_abap.bootstrap.evo.XhrLogonEventHandler"
+                null, "sap.ushell_abap.bootstrap.XhrLogonEventHandler"
             );
         }
     };
@@ -252,5 +250,13 @@ sap.ui.define([
         return oText.text;
     };
 
+    XhrLogonEventHandler.prototype.getLocationHref = function () {
+        return window.location.href;
+    };
+
+    XhrLogonEventHandler.prototype.setDocumentLocation = function (sUrl) {
+        window.document.location = sUrl;
+    };
+
     return XhrLogonEventHandler;
 }, true /* bExport */);

package/src/main/js/sap/ushell_abap/bootstrap/XhrLogonLibLoader.js

@@ -0,0 +1,51 @@
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+
+sap.ui.define([
+], (
+) => {
+    "use strict";
+
+    const sUiDebugKey = "sap-ui-debug";
+
+    class XhrLogonLibLoader {
+        #pLib;
+
+        constructor () {
+            this.#pLib = this.#loadLib();
+        }
+
+        #isDebug () {
+            let sStoredSapUiDebugValue;
+            let bDebugSources = /[?&]sap-ui-debug=(true|x|X)(&|$)/.test(this.getWindowLocationSearch());
+
+            if (!bDebugSources) {
+                try {
+                    sStoredSapUiDebugValue = window.localStorage.getItem(sUiDebugKey);
+                    bDebugSources = !!sStoredSapUiDebugValue && /^(true|x|X)$/.test(sStoredSapUiDebugValue);
+                } catch { /* fail silently */ }
+            }
+
+            return bDebugSources;
+        }
+
+        #loadLib () {
+            const sFileName = `sap/ushell_abap/thirdparty/sap-xhrlib-esm${this.#isDebug() ? "-dbg" : ""}.js`;
+            const sPath = sap.ui.require.toUrl(sFileName);
+            return import(sPath).then((oModule) => oModule.xhrlib);
+        }
+
+        getLib () {
+            return this.#pLib;
+        }
+
+        getWindowLocationSearch () {
+            return window.location.search;
+        }
+
+        reset () {
+            this.#pLib = this.#loadLib();
+        }
+    }
+
+    return new XhrLogonLibLoader();
+});

package/src/main/js/sap/ushell_abap/bootstrap/abap-def-dev.js

@@ -0,0 +1,20 @@
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+/**
+ * @fileoverview This module is the root of the ABAP bootstrap
+ * to be used ONLY in DEVELOPMENT ENVIRONMENT.
+ */
+sap.ui.define([
+    "sap/base/config",
+    "sap/ushell_abap/bootstrap/ConfigurationProvider",
+    "sap/ushell/bootstrap/OverrideRegisterModulePath"
+], (
+    BaseConfig,
+    ConfigurationProvider,
+    overrideRegisterModulePath
+) => {
+    "use strict";
+
+    BaseConfig.registerProvider(ConfigurationProvider);
+
+    overrideRegisterModulePath();
+});

package/src/main/js/sap/ushell_abap/bootstrap/{evo/abap-def-loader.js → abap-def-loader.js}

@@ -5,7 +5,7 @@
     const sAsyncLoader = document.getElementById("sap-ui-bootstrap").getAttribute("data-sap-ui-async");
 
     if (sAsyncLoader && sAsyncLoader.toLowerCase() === "true") {
-        sap.ui.require(["sap/ushell_abap/bootstrap/evo/abap-def"]);
+        sap.ui.require(["sap/ushell_abap/bootstrap/abap-def"]);
         return;
     }
 
@@ -13,5 +13,5 @@
      * Sync bootstrap is deprecated
      * @deprecated since 1.120
      */
-    sap.ui.requireSync("sap/ushell_abap/bootstrap/evo/abap-def"); // LEGACY API (deprecated)
+    sap.ui.requireSync("sap/ushell_abap/bootstrap/abap-def"); // LEGACY API (deprecated)
 })();

package/src/main/js/sap/ushell_abap/bootstrap/abap-def.js

@@ -0,0 +1,22 @@
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+/**
+ * @fileoverview This module is the root of the ABAP bootstrap.
+ */
+sap.ui.define([
+    "sap/base/config",
+    "sap/ushell_abap/bootstrap/ConfigurationProvider",
+    "sap/ushell/bootstrap/CoreMinLoader",
+    "sap/ushell/bootstrap/OverrideRegisterModulePath"
+], (
+    BaseConfig,
+    ConfigurationProvider,
+    CoreMinLoader,
+    overrideRegisterModulePath
+) => {
+    "use strict";
+
+    BaseConfig.registerProvider(ConfigurationProvider);
+
+    overrideRegisterModulePath();
+    CoreMinLoader.load();
+});

package/src/main/js/sap/ushell_abap/bootstrap/evo/abap.js

@@ -50,7 +50,7 @@
             ], () => {
                 // cascade 4: the abap-def-dev (must be loaded before the core because it needs to set the core configuration)
                 sap.ui.require([
-                    "sap/ushell_abap/bootstrap/evo/abap-def-dev"
+                    "sap/ushell_abap/bootstrap/abap-def-dev"
                 ], (/* abapDefDev */) => {
                     // cascade 5: load core and finally boot the core
                     sap.ui.require([

package/src/main/js/sap/ushell_abap/components/TCodeNavigation.js

@@ -37,7 +37,7 @@ sap.ui.define([
      * @alias sap.ushell_abap.components.TCodeNavigation
      * @namespace
      * @description This module provides functionality to navigate to an application intent based on a transaction code.
-     * It checks if the provided transaction code matches any inbound's appInfo parameter `abap.transaction`.
+     * It checks if the provided transaction code matches any inbound's appInfo parameter `transaction`.
      * If a match is found, it extracts the semantic object, action, and parameters from the inbound
      * and uses the Navigation service to perform the navigation.
      *
@@ -55,7 +55,7 @@ sap.ui.define([
         static MessageCode = MessageCode;
 
         /**
-         * Navigates to an app intent if the given sTCode matches an inbound's appInfo parameter abap.transaction.
+         * Navigates to an app intent if the given sTCode matches an inbound's appInfo parameter transaction.
          * The transaction code is case-insensitive and will be converted to uppercase for matching.
          * If a matching inbound is found, it extracts the semantic object, action, and parameters
          * and uses the Navigation service to perform the navigation.
@@ -205,7 +205,7 @@ sap.ui.define([
             // "App" in this sense mean: combination of inbound and default tile (the default tile might bring values for defined mandatory parameters,
             // therefore, both artefacts are combined and checked together).
             const aTransactionCodeInbounds = oNavigationData.inbounds.filter((oInbound) =>
-                oInbound.resolutionResult?.appInfo?.["abap.transaction"] === sTCode
+                oInbound.resolutionResult?.appInfo?.transaction === sTCode
             );
             if (aTransactionCodeInbounds.length === 0) {
                 throw new TCodeNavigationError(

package/src/main/js/sap/ushell_abap/library.js

@@ -30,7 +30,7 @@ sap.ui.define([
     const ushellAbapLib = Library.init({
         name: "sap.ushell_abap",
         apiVersion: 2,
-        version: "1.146.0",
+        version: "1.147.1",
         dependencies: ["sap.ui.core", "sap.m"],
         noLibraryCSS: true,
         extensions: {

package/src/main/js/sap/ushell_abap/pbServices/ui2/Contracts.js

@@ -0,0 +1,33 @@
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
+
+/**
+ * @fileOverview A Helper to load all ui2 CHIP contracts.
+ */
+
+sap.ui.define([
+    "sap/ushell/utils"
+], (
+    ushellUtils
+) => {
+    "use strict";
+
+    class Contracts {
+        async load () {
+            await ushellUtils.requireAsync([
+                "sap/ushell_abap/pbServices/ui2/contracts/bag",
+                "sap/ushell_abap/pbServices/ui2/contracts/configuration",
+                "sap/ushell_abap/pbServices/ui2/contracts/configurationUi",
+                "sap/ushell_abap/pbServices/ui2/contracts/fullscreen",
+                "sap/ushell_abap/pbServices/ui2/contracts/preview",
+                "sap/ushell_abap/pbServices/ui2/contracts/visible",
+                "sap/ushell_abap/pbServices/ui2/contracts/refresh",
+                "sap/ushell_abap/pbServices/ui2/contracts/search",
+                "sap/ushell_abap/pbServices/ui2/contracts/url",
+                "sap/ushell_abap/pbServices/ui2/contracts/actions",
+                "sap/ushell_abap/pbServices/ui2/contracts/types"
+            ]);
+        }
+    }
+
+    return new Contracts();
+});

package/ui5.yaml

@@ -267,7 +267,7 @@ builder:
             sort: true
           - mode: raw
             filters:
-              - sap/ushell_abap/bootstrap/evo/abap-def-loader.js
+              - sap/ushell_abap/bootstrap/abap-def-loader.js
             declareRawModules: false
             resolve: false
       bundleOptions:
@@ -291,12 +291,12 @@ builder:
           - mode: preload
             name: sap/ushell/bootstrap/common
             filters:
-              - sap/ushell_abap/bootstrap/evo/abap-def.js
+              - sap/ushell_abap/bootstrap/abap-def.js
               - sap/ui/thirdparty/datajs.js
             resolve: true
           - mode: raw
             filters:
-              - sap/ushell_abap/bootstrap/evo/abap-def-loader.js
+              - sap/ushell_abap/bootstrap/abap-def-loader.js
             declareRawModules: false
             resolve: false
       bundleOptions:
@@ -311,8 +311,8 @@ builder:
               - ui5loader-autoconfig.js
               - sap/ui/thirdparty/datajs.js
               - sap/ushell/bootstrap/ui5loader-config.js
-              - sap/ushell_abap/bootstrap/evo/abap-def-loader.js
-              - sap/ushell_abap/bootstrap/evo/abap-def.js
+              - sap/ushell_abap/bootstrap/abap-def-loader.js
+              - sap/ushell_abap/bootstrap/abap-def.js
             resolve: true
           - mode: bundleInfo
             name: sap/ushell_abap/preload-bundles/flex-plugins.js
@@ -408,10 +408,10 @@ builder:
               - sap/ushell/api/NewExperience.js
               - sap/ushell/api/RTA.js
               - sap/ushell/api/common/ComponentInstantiation.js
-              - sap/ushell/bootstrap/SchedulingAgent/*.json                    # json files must be explicitly defined
               - sap/ushell/components/ComponentKeysHandler.js
               - sap/ushell/components/container/ApplicationContainer.js
               - sap/ushell/components/pages/controller/PagesAndSpaceId.js
+              - sap/ushell/components/SchedulingAgent/*.json                    # json files must be explicitly defined
               - sap/ushell/components/tiles/applauncher/StaticTile.controller.js
               - sap/ushell/components/tiles/applauncherdynamic/DynamicTile.controller.js
               - sap/ushell/components/tiles/cdm/applauncher/Component.js
@@ -478,6 +478,7 @@ builder:
               - sap/ushell/ui5service/ShellUIService.js
               - sap/ushell/utils/HttpClient.js
               - sap/ushell/utils/utilsCdm.js
+              - sap/ushell_abap/bootstrap/LoadLaunchpadModule.js
               - sap/ushell_abap/adapters/abap/AppStateAdapter.js
               - sap/ushell_abap/adapters/abap/ClientSideTargetResolutionAdapter.js
               - sap/ushell_abap/adapters/abap/ContainerAdapter.js