@sapui5/sap.ushell 1.141.3 → 1.142.1

package/src/main/js/sap/ushell/ui/launchpad/VizInstance.js

@@ -216,7 +216,7 @@ sap.ui.define([
             state: this.getState()
         });
 
-        this._disableTabindexOfGenericTile(oContent);
+        this._disableTabindexOfInnerTile(oContent);
 
         this.setAggregation("content", oContent);
     };
@@ -396,16 +396,16 @@ sap.ui.define([
             content.data("tile-id", sVizRefId, true);
         }
 
-        this._sGenericTileId = null;
+        this._oInnerTile = null;
         this._disableTabindexOfContent(content);
 
         this.setAggregation("content", content);
     };
 
     /**
-     * Removes the tabindex of a possible genericTile inside of the given control.
+     * Heuristic to find and disable the tabindex of a possible tile inside of the given control.
      *
-     * @param {sap.ui.core.Control} [content] the control to search in
+     * @param {sap.ui.core.Control} [content] the control to search in.
      *
      * @since 1.121
      * @private
@@ -431,36 +431,42 @@ sap.ui.define([
             } else if (content.isA("sap.cloudfnd.smartbusiness.lib.reusetiles.Singleton")) {
                 // Some SSB tiles have a FlexBox-View-Singleton-GenericTile structure
                 this._disableTabindexOfContent(content.getContent());
-            } else if (content.isA("sap.m.GenericTile")) {
-                this._disableTabindexOfGenericTile(content);
+            } else if (content.isA("sap.m.SlideTile") || content.isA("sap.m.GenericTile")) {
+                // News tiles are SlideTiles and have multiple inner GenericTiles,
+                // the inner tiles are already disabled, but the slide tile itself is not
+                this._disableTabindexOfInnerTile(content);
             }
         }
     };
 
     /**
      * Removes the tabindex of tile, so we avoid the inner and outer focus issue.
+     * Stores the inner tile for later use in onAfterRendering.
      *
-     * @param {sap.m.GenericTile} genericTile the tile that should not be focusable
+     * @param {sap.m.GenericTile | sap.m.SlideTile} innerTile the tile that should not be focusable
      *
      * @since 1.121
      * @private
      */
-    VizInstance.prototype._disableTabindexOfGenericTile = function (genericTile) {
-        function removeTabindex (control) {
-            const oFocusDomRef = control.getFocusDomRef();
-            if (oFocusDomRef) {
-                this._sGenericTileId = oFocusDomRef.id;
-                if (oFocusDomRef.getAttribute("tabindex") === "0") {
-                    oFocusDomRef.setAttribute("tabindex", -1);
-                    oFocusDomRef.tabIndex = -1;
+    VizInstance.prototype._disableTabindexOfInnerTile = function (innerTile) {
+        function removeTabindex () {
+            const oFocusDomRef = this.getFocusDomRef();
+            if (oFocusDomRef && oFocusDomRef.getAttribute("tabindex") === "0") {
+                if (oFocusDomRef.tagName === "A") {
+                    oFocusDomRef.setAttribute("tabindex", "-1");
+                    oFocusDomRef.tabindex = -1;
+                } else {
+                    oFocusDomRef.removeAttribute("tabindex");
                 }
             }
         }
 
+        this._oInnerTile = innerTile;
+
         // Some SSB tiles are already rendered
-        removeTabindex.call(this, genericTile);
-        genericTile.addEventDelegate({
-            onAfterRendering: removeTabindex.bind(this, genericTile)
+        removeTabindex.call(innerTile);
+        innerTile.addEventDelegate({
+            onAfterRendering: removeTabindex.bind(innerTile)
         });
     };
 
@@ -563,11 +569,30 @@ sap.ui.define([
         }
     };
 
+    /**
+     * SAPUI5 Lifecycle hook which is called before the control is re-rendered.
+     * Cleans up event listeners added in onAfterRendering.
+     * @override
+     * @private
+     */
     VizInstance.prototype.onBeforeRendering = function () {
         const oDomRef = this.getDomRef();
         if (oDomRef) {
-            oDomRef.removeEventListener("keyup", this._fnKeyupHandler);
-            oDomRef.removeEventListener("touchend", this._fnTouchendHandler);
+            oDomRef.removeEventListener("keyup", this._fnKeyupHandler, true);
+            oDomRef.removeEventListener("touchend", this._fnTouchendHandler, true);
+            delete this._fnKeyupHandler;
+            delete this._fnTouchendHandler;
+
+            if (oDomRef.parentElement) {
+                oDomRef.parentElement.removeAttribute("aria-description");
+                oDomRef.parentElement.removeAttribute("aria-labelledby");
+                oDomRef.parentElement.removeEventListener("focusin", this._fnOnParentElementFocusInHandler, true);
+                oDomRef.parentElement.removeEventListener("focusout", this._fnOnParentElementFocusOutHandler, true);
+                oDomRef.parentElement.removeEventListener("keyup", this._fnOnParentElementKeyupHandler, true);
+                delete this._fnOnParentElementFocusInHandler;
+                delete this._fnOnParentElementFocusOutHandler;
+                delete this._fnOnParentElementKeyupHandler;
+            }
         }
     };
 
@@ -604,10 +629,76 @@ sap.ui.define([
 
         if (oDomRef.parentElement) {
             oDomRef.parentElement.setAttribute("aria-description", resources.i18n.getText("VizInstance.AriaDescription.Link"));
-            if (this._sGenericTileId) {
-                oDomRef.parentElement.setAttribute("aria-labelledby", this._sGenericTileId);
+            if (this._oInnerTile) {
+                const sInnerTileId = this._oInnerTile.getId();
+                if (this._oInnerTile.isA("sap.m.SlideTile")) {
+                    oDomRef.parentElement.setAttribute("aria-labelledby", `${sInnerTileId}-ariaText`);
+                    this._fnOnParentElementFocusInHandler = this._onParentElementFocusIn.bind(this, this._oInnerTile);
+                    this._fnOnParentElementFocusOutHandler = this._onParentElementFocusOut.bind(this, this._oInnerTile);
+                    this._fnOnParentElementKeyupHandler = this._onParentElementKeyup.bind(this, this._oInnerTile);
+                    oDomRef.parentElement.addEventListener("focusin", this._fnOnParentElementFocusInHandler, true);
+                    oDomRef.parentElement.addEventListener("focusout", this._fnOnParentElementFocusOutHandler, true);
+                    oDomRef.parentElement.addEventListener("keyup", this._fnOnParentElementKeyupHandler, true);
+                } else {
+                    oDomRef.parentElement.setAttribute("aria-labelledby", sInnerTileId);
+                }
+            }
+        }
+    };
+
+    /**
+     * Handles the focusin event on the parent element of the vizinstance in case the inner tile is a slidetile.
+     * It pauses the slidetile if not already paused.
+     *
+     * @param {sap.m.SlideTile} slideTile the slidetile inside the vizinstance.
+     * @private
+     */
+    VizInstance.prototype._onParentElementFocusIn = function (slideTile) {
+        if (!slideTile.mouseDown) {
+            const oSlideTileDomRef = slideTile.getDomRef();
+            if (oSlideTileDomRef && oSlideTileDomRef.classList.contains("sapMSTPauseIcon")) {
+                slideTile.addStyleClass("sapUshellPaused");
+                slideTile.addStyleClass("sapMSTIconPressed");
+                slideTile.onmouseup();
+            }
+        }
+    };
+
+    /**
+     * Handles the focusout event on the parent element of the vizinstance in case the inner tile is a slidetile.
+     * It resumes the slidetile if it was paused on focusin.
+     *
+     * @param {sap.m.SlideTile} slideTile the slidetile inside the vizinstance.
+     * @private
+     */
+    VizInstance.prototype._onParentElementFocusOut = function (slideTile) {
+        if (!slideTile.mouseDown && slideTile.hasStyleClass("sapUshellPaused")) {
+            slideTile.removeStyleClass("sapUshellPaused");
+            slideTile.addStyleClass("sapMSTIconPressed");
+            slideTile.onmouseup();
+        }
+        slideTile.mouseDown = false;
+    };
+
+    /**
+     * Handles the keyup event on the parent element of the vizinstance in case the inner tile is a slidetile.
+     * It removes the custom paused state on space key press.
+     *
+     * @param {sap.m.SlideTile} slideTile the slidetile inside the vizinstance.
+     * @param {KeyboardEvent} event the keyboard event.
+     * @private
+     */
+    VizInstance.prototype._onParentElementKeyup = function (slideTile, event) {
+        if (PseudoEvents.events.sapspace.fnCheck(event)) {
+            if (slideTile.hasStyleClass("sapUshellPaused")) {
+                slideTile.removeStyleClass("sapUshellPaused");
             }
         }
+
+        if (event.key === "b" || event.key === "B"
+            || event.key === "f" || event.key === "F") {
+            this.getParent().focus();
+        }
     };
 
     /**

package/src/main/js/sap/ushell/ui/launchpad/VizInstanceCdm.js

@@ -118,14 +118,12 @@ sap.ui.define([
      */
     VizInstanceCdm.prototype._loadCustomVizType = function () {
         const oAppProperties = this._getCustomComponentConfiguration();
-        const oParsedShellHash = {};
         const aWaitForBeforeInstantiation = [];
 
         return Container.getServiceAsync("Ui5ComponentLoader")
             .then((oComponentLoader) => {
                 return oComponentLoader.createComponent(
                     oAppProperties,
-                    oParsedShellHash,
                     aWaitForBeforeInstantiation,
                     UI5ComponentType.Visualization
                 );

package/src/main/js/sap/ushell/ui/launchpad/section/CompactArea.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Provides control sap.ushell.ui.launchpad.section.CompactArea
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/ui/shell/ShellAppTitle.js

@@ -581,18 +581,10 @@ sap.ui.define([
         if (oSpanElement) {
             let sNewTooltip;
 
-            const bAllMyAppsEnabled = Config.last("/core/services/allMyApps/enabled");
-            const bDefaultShellMode = StateManager.getShellMode() === ShellMode.Default;
-            const bLegacyHomeState = StateManager.isLegacyHome();
-
-            const bAllMyAppsMenu = (bDefaultShellMode || bLegacyHomeState) && bAllMyAppsEnabled;
-
             const oNavMenu = Element.getElementById(this.getNavigationMenu());
             const bNavMenu = oNavMenu && oNavMenu.getItems() && oNavMenu.getItems().length > 0;
             if (bNavMenu) {
                 sNewTooltip = ushellResources.i18n.getText("shellNavMenu_openMenuTooltip_navigationMenu");
-            } else if (bAllMyAppsMenu) {
-                sNewTooltip = ushellResources.i18n.getText("shellNavMenu_openMenuTooltip_allMyApps");
             } else {
                 const bTruncated = oSpanElement.offsetWidth < oSpanElement.scrollWidth;
                 sNewTooltip = bTruncated ? this.getText() : null;

package/src/main/js/sap/ushell/ui/shell/ToolAreaItem.js

@@ -18,7 +18,7 @@ sap.ui.define([
      * A control to be placed in the tool area
      * @extends sap.ui.core.Control
      *
-     * @version 1.141.3
+     * @version 1.142.1
      *
      * @public
      * @since 1.30.5

package/src/main/js/sap/ushell/ui/utils.js

@@ -6,7 +6,7 @@
  * This is a utility module that collects common activities implemented
  * by controllers of different ui components.
  *
- * @version 1.141.3
+ * @version 1.142.1
  * @private
  */
 

package/src/main/js/sap/ushell/ui5service/ShellUIServiceFactory.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The ShellUIService UI5 service factory
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/base/util/Deferred",

package/src/main/js/sap/ushell/ui5service/UserStatus.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The UserStatus UI5 service
  *
- * @version 1.141.3
+ * @version 1.142.1
  * @deprecated since 1.70. Support for this service has been discontinued.
  */
 sap.ui.define([

package/src/main/js/sap/ushell/utils/SmartBusiness.js

@@ -0,0 +1,102 @@
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+
+/**
+ * @fileOverview This module contains Smart Business specific functionality
+ */
+sap.ui.define([
+    "sap/base/util/deepClone",
+    "sap/ushell/utils",
+    "sap/ushell/Container"
+], (
+    deepClone,
+    ushellUtils,
+    Container
+) => {
+    "use strict";
+    class SmartBusiness {
+        #pStoredEvaluationIdResolutionResult = null;
+        #oSmartBusinessLibraryUtils = null;
+
+        /**
+         * Some Smart Business tiles do not have static navigation parameters that could be stored in the FLP content.
+         * Instead the navigation parameters have to be resolved during navigation.
+         * Those tiles contain parameter sap-ssb-eval-id in the FLP content that is resolved by the FLP during navigation.
+         *
+         * @param {object} oParsedHash The navigation parameters of this parsed shell hash are updated with the Smart Business parameters
+         * @param {boolean} [bStoreResult] Store the result for later use during a direct app start
+         * @returns {Promise<sap.ushell.services.URLParsing.DecomposedHash>} Resolves when the evaluation ID has been processed with the updated parsed hash.
+         */
+        async resolveEvaluationId (oParsedHash, bStoreResult) {
+            const oParsedHashClone = deepClone(oParsedHash);
+            const sEvaluationId = oParsedHashClone.params["sap-ssb-eval-id"] && oParsedHashClone.params["sap-ssb-eval-id"][0];
+
+            if (!sEvaluationId) {
+                return oParsedHashClone;
+            }
+
+            // Use the target parameters that were already resolved during the direct app start.
+            // This is necessary as the Smart Business parameters are stored in an app state,
+            // so the app state from the direct app start has to be used later on in the navigation filter.
+            if (this.#pStoredEvaluationIdResolutionResult) {
+                // It is not checked if the parameters match the first call. This is the same as
+                // for the direct app start promise. It is just expected that the two calls match.
+                const pResult = this.#pStoredEvaluationIdResolutionResult;
+                // make sure the property is cleared in case the await throws
+                this.#pStoredEvaluationIdResolutionResult = null;
+                oParsedHashClone.params = (await pResult).params;
+                return oParsedHashClone;
+            }
+
+            let oDeferred;
+            if (bStoreResult) {
+                oDeferred = Promise.withResolvers();
+                this.#pStoredEvaluationIdResolutionResult = oDeferred.promise;
+            }
+
+            try {
+                const oSmartBusinessLibraryUtils = await this.#getSmartBusinessLibraryUtils();
+                const oSmartBusinessNavigationParameters = await oSmartBusinessLibraryUtils.getNavigationParametersForEvaluationId(sEvaluationId);
+
+                // The navigation API has the transformation of parameter sap-xapp-state-data already build in.
+                // However, as this is also needed for the direct app start the app state is created here.
+                if (oSmartBusinessNavigationParameters?.["sap-xapp-state-data"]) {
+                    const oAppStateService = await Container.getServiceAsync("AppState");
+                    const oAppState = oAppStateService.createEmptyAppState();
+                    oAppState.setData(JSON.parse(oSmartBusinessNavigationParameters["sap-xapp-state-data"]));
+                    await oAppState.save();
+
+                    delete oSmartBusinessNavigationParameters["sap-xapp-state-data"];
+                    oSmartBusinessNavigationParameters["sap-xapp-state"] = oAppState.getKey();
+                }
+
+                delete oParsedHashClone.params["sap-ssb-eval-id"];
+                Object.assign(oParsedHashClone.params, oSmartBusinessNavigationParameters);
+
+                oDeferred?.resolve(oParsedHashClone);
+                return oParsedHashClone;
+            } catch (oError) {
+                oDeferred?.reject(oError);
+                throw oError;
+            }
+        }
+
+        /**
+         * Loads and returns the Smart Business library utils instance.
+         * Instantiates the util UI component if not already available.
+         *
+         * @private
+         * @returns {Promise<object>} Resolves to the Smart Business library utils instance
+         */
+        async #getSmartBusinessLibraryUtils () {
+            if (!this.#oSmartBusinessLibraryUtils) {
+                // If the Smart Business library is not available the module loading throws and we enter the normal error handling flow
+                const [SmartBusinessLibraryUtilsUiComponent] = await ushellUtils.requireAsync(["sap/cloudfnd/smartbusiness/lib/reusetiles/Util"]);
+                // It was aligned with Smart Business that this util UI component shall be instantiated in the FLP coding again
+                this.#oSmartBusinessLibraryUtils = new SmartBusinessLibraryUtilsUiComponent();
+            }
+            return this.#oSmartBusinessLibraryUtils;
+        }
+    }
+
+    return new SmartBusiness();
+});

package/src/main/js/sap/ushell/utils/UrlShortening.js

@@ -5,7 +5,7 @@
  *
  * This module is for internal Shell usage only
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define(["sap/base/Log", "sap/ushell/utils/UrlParsing"], (Log, urlParsing) => {
     "use strict";

package/src/main/js/sap/ushell/utils/workpage/WorkPageHost.js

@@ -2,7 +2,7 @@
 
 /**
  * @file WorkPageHost for WorkPageBuilder and DWSPageBuilder
- * @version 1.141.3
+ * @version 1.142.1
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/utils/workpage/WorkPageService.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module communicates with the content API graphql service to retrieve workpage and visualization data.
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/base/i18n/Localization",

package/src/main/js/sap/ushell/utils/workpage/WorkPageVizInstantiation.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module provides utilities for creating visualization instances for work pages.
- * @version 1.141.3
+ * @version 1.142.1
  */
 sap.ui.define([
     "sap/ushell/services/VisualizationInstantiation",

package/src/main/js/sap/ushell/utils.js

@@ -585,27 +585,6 @@ sap.ui.define([
         };
     };
 
-    /**
-     * Appends a "sap-shell" parameter to the given URL to indicate the FLP version to legacy applications.
-     * This method should be called only when it is necessary to add the sap-shell parameter to the URL.
-     *
-     * @param {string} sUrl The URL to be amended.
-     * @param {string} sApplicationType The application type for the given URL.
-     * @param {string} sVersion The UI5 version.
-     *
-     * @returns {string} The URL where the parameter should be appended to.
-     * @private
-     */
-    utils.appendSapShellParamSync = function (sUrl, sApplicationType, sVersion) {
-        const sUrlSuffix = sApplicationType === "TR" ? "" : "-NWBC";
-        if (sVersion) {
-            // we pass it either completely or not at all
-            sUrl += sUrl.indexOf("?") >= 0 ? "&" : "?"; // FIXME: This is a bug.
-            sUrl += `sap-shell=${encodeURIComponent(`FLP${sVersion}${sUrlSuffix}`)}`;
-        }
-        return sUrl;
-    };
-
     /**
      * Appends a "sap-shell" parameter to the given URL to indicate the FLP version to legacy applications.
      * This method should be called only when it is necessary to add the sap-shell parameter to the URL.
@@ -668,7 +647,7 @@ sap.ui.define([
      * @private
      */
     utils.getIframeFeaturePolicies = function () {
-        return "autoplay;battery;camera;display-capture;geolocation;gyroscope;magnetometer;microphone;midi;clipboard-write;clipboard-read;fullscreen;serial;";
+        return "autoplay;battery;camera;display-capture;geolocation;gyroscope;magnetometer;microphone;midi;clipboard-write;clipboard-read;fullscreen;serial;local-network-access *;";
     };
 
     /**
@@ -695,19 +674,16 @@ sap.ui.define([
      * @since 1.119.0
      * @private
      */
-    utils.getUi5Version = function () {
-        return new Promise((resolve, reject) => {
-            sap.ui.require(["sap/ui/VersionInfo"], (VersionInfo) => {
-                VersionInfo.load()
-                    .then((oVersionInfo) => {
-                        resolve(_extractUi5Version(oVersionInfo.version));
-                    })
-                    .catch(() => {
-                        Log.error("UI5 version could not be determined.");
-                        resolve("");
-                    });
-            });
-        });
+    utils.getUi5Version = async function () {
+        try {
+            const [VersionInfo] = await this.requireAsync(["sap/ui/VersionInfo"]);
+            const oVersionInfo = await VersionInfo.load();
+
+            return _extractUi5Version(oVersionInfo.version);
+        } catch (oError) {
+            Log.error("UI5 version could not be determined.", oError);
+            return "";
+        }
     };
 
     /**

package/src/test/js/sap/ushell/bootstrap/sandbox.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  *
- * @version 1.141.3
+ * @version 1.142.1
  */
 
 (function () {

package/ui5.yaml

@@ -193,6 +193,7 @@ builder:
               - sap/ushell/adapters/cdm/v3/utilsCdm.js
               - sap/ushell/ui/cards/FrequentActivitiesExtension.js
               - sap/ushell/ui/cards/RecentActivitiesExtension.js
+              - '!sap/f/thirdparty/'
             resolve: false
             renderer: false
       bundleOptions:
@@ -214,6 +215,16 @@ builder:
           - mode: preload
             name: sap/ushell/core-lib-preload
             filters: &core-min-preload
+              - sap/f/gen/ui5/webcomponents/dist/Avatar.js
+              - sap/f/gen/ui5/webcomponents/dist/Button.js
+              - sap/f/gen/ui5/webcomponents_fiori/dist/ShellBar.js
+              - sap/f/gen/ui5/webcomponents_fiori/dist/ShellBarBranding.js
+              - sap/f/gen/ui5/webcomponents_fiori/dist/ShellBarItem.js
+              - sap/f/gen/ui5/webcomponents_fiori/dist/ShellBarSearch.js
+              - sap/f/gen/ui5/webcomponents_fiori/dist/ShellBarSpacer.js
+              - sap/f/thirdparty/ui5/webcomponents_icons_business_suite/AllIcons.js
+              - sap/f/thirdparty/ui5/webcomponents_icons_tnt/AllIcons.js
+              - sap/f/thirdparty/ui5/webcomponents_icons/AllIcons.js
               - sap/f/GridContainer.js
               - sap/f/GridContainerItemLayoutData.js
               - sap/m/**/*.flexibility.js             # include all change handlers
@@ -316,6 +327,7 @@ builder:
               - sap/ushell/components/tiles/cdm/applauncherdynamic/DynamicTile.view.xml
               - sap/ushell/components/tiles/cdm/applauncherdynamic/manifest.json
               - sap/ushell/iconfonts.js
+              - sap/ushell/modules
               - sap/ushell/override.js
               - sap/ushell/renderer/Renderer.js
               - sap/ushell/renderer/RendererRootView.fragment.xml
@@ -369,8 +381,6 @@ builder:
               - sap/ushell/utils/utilsCdm.js
               - '!sap/viz/libs/sap-viz.js'
               - '!sap/ui/unified/'
-              - '!sap/ushell/thirdparty/'
-              - '!sap/ushell/gen/'
             resolve: true
             renderer: true
           - mode: require
@@ -380,25 +390,6 @@ builder:
         optimize: true
         usePredefineCalls: true
         numberOfParts: 4
-    - bundleDefinition:
-        name: sap/ushell/preload-bundles/thirdparty.js
-        sections:
-          - mode: provided
-            filters: *core-min-preload
-            resolve: true
-          - mode: provided
-            filters: *core-min-provided
-            resolve: true
-          - mode: preload
-            filters:
-              - sap/ushell/gen/
-              - sap/ushell/thirdparty/
-              - '!sap/ushell/thirdparty/_dynamics/'
-            resolve: true
-            renderer: false
-      bundleOptions:
-        optimize: true
-        usePredefineCalls: true
     - bundleDefinition:
         name: sap/ushell/preload-bundles/core-ext-light.js
         sections:
@@ -430,11 +421,10 @@ builder:
               - sap/ui/unified/
               - sap/ui/util/
               - sap/ushell/
-              - '!sap/ushell/thirdparty/'
-              - '!sap/ushell/gen/'
               - '!**/*-preload*.js'
               - '!**/*.support.js'
               - '!**/designtime/'
+              - '!sap/f/thirdparty/_dynamics/'
               - '!sap/m/rules/'
               - '!sap/ui/core/messagebundle*.properties'
               - '!sap/ui/core/plugin/'
@@ -474,6 +464,8 @@ builder:
               - sap/ushell/components/tiles/sbtilecontent.js
               # dependency of sap.ushell.ui.QuickAccess
               - sap/ushell/utils/AppType.js
+              # Default ushell modules
+              - sap/ushell/components/shell/Notifications/NotificationsModule.js
             resolve: false
       bundleOptions:
         optimize: true
@@ -511,15 +503,13 @@ builder:
               # FailedTileDialog.fragment.xml has a dependency to sap.ui.layout.form
               - '!sap/ui/layout/'
               - '!sap/viz/libs/sap-viz.js'
-              - '!sap/ushell/thirdparty/'
-              - '!sap/ushell/gen/'
             resolve: true
             renderer: false
       bundleOptions:
         optimize: true
         usePredefineCalls: true
     - bundleDefinition:
-        # bundle for modules used by both work page runtimes (ushell & dws page builder)
+        # bundle for modules used by work page runtime (dws page builder)
         name: sap/ushell/preload-bundles/workpage-rt-common.js
         sections:
           - mode: provided
@@ -536,8 +526,6 @@ builder:
               - sap/ushell/utils/workpage/resources/resources*.properties
               - sap/ushell/utils/tilecard/
               - sap/ushell/utils/tilecard/resources/resources*.properties
-              - '!sap/ushell/thirdparty/'
-              - '!sap/ushell/gen/'
             resolve: false    # avoid including the sap/ui/integration/library module only
             renderer: true
             sort: true
@@ -586,8 +574,6 @@ builder:
               - sap/m/ActionListItem.js                                                 # implicit dependency of sap.viz (chartpopover)
               - sap/ui/layout/form/ResponsiveGridLayout.js                              # implicit dependency of sap.viz (chartpopover)
               - sap/ui/core/format/FileSizeFormat.js                                    # implicit dependency of sap.viz (chart formatter)
-              - '!sap/ushell/thirdparty/'
-              - '!sap/ushell/gen/'
               - '!sap/ui/core/plugin/'
               - '!sap/ui/core/support/'
               - '!sap/ui/core/tmpl/'
@@ -612,6 +598,9 @@ builder:
         usePredefineCalls: true
         numberOfParts: 4
   componentPreload:
+    excludes:
+      # Default ushell modules
+      - sap/ushell/components/shell/Notifications/NotificationsModule.js
     paths:
       - sap/ushell/components/appfinder/Component.js
       - sap/ushell/components/cepsearchresult/app/Component.js
@@ -637,8 +626,6 @@ builder:
       - sap/ushell/components/tiles/cdm/applauncherdynamic/Component.js
       - sap/ushell/components/tiles/applauncher/Component.js
       - sap/ushell/components/tiles/applauncherdynamic/Component.js
-      - sap/ushell/components/workPageBuilder/Component.js
-      - sap/ushell/components/workPageRuntime/Component.js
       - sap/ushell/plugins/appwarmup/Component.js
       - sap/ushell/plugins/ghostapp/Component.js
       # dependencies are covered by the flex-plugins bundle