@sapui5/sap.ushell_abap 1.100.0 → 1.102.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell_abap",
-    "version": "1.100.0",
+    "version": "1.102.0",
     "description": "SAPUI5 Library sap.ushell_abap",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [

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

@@ -2,7 +2,7 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell_abap</name>
     <vendor>SAP SE</vendor>
-    <version>1.100.0</version>
+    <version>1.102.0</version>
     <copyright>Copyright (c) 2009-2022 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell_abap</documentation>
 
@@ -24,6 +24,10 @@
             <libraryName>sap.ui.fl</libraryName>
             <lazy>true</lazy>
         </dependency>
+        <dependency>
+            <libraryName>sap.f</libraryName>
+            <lazy>true</lazy>
+        </dependency>
     </dependencies>
 
     <appData>

package/src/main/js/sap/ushell_abap/adapters/abap/AppStateAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's AppStateAdapter for the ABAP platform.
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell_abap/adapters/abap/ClientSideTargetResolutionAdapter.js

@@ -9,7 +9,7 @@
  *     <li>provide the resolveHashFragmentFallback function, a fallback method called by ClientSideTargetResolution service.</li>
  *   </ul>
  *
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell_abap/adapters/abap/ConfigurationDefaultsAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The ConfigurationDefaults adapter for the ABAP platform.
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([
     "sap/ushell_abap/bootstrap/evo/abap.constants",

package/src/main/js/sap/ushell_abap/adapters/abap/ContainerAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's container adapter for the ABAP platform.
  *
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell_abap/adapters/abap/LaunchPageAdapter.js

@@ -2,7 +2,9 @@
 
 /**
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
- * @version 1.100.0
+ *
+ * @deprecated since 1.100
+ * @version 1.102.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI",
@@ -76,6 +78,7 @@ sap.ui.define([
      * @constructor
      * @see sap.ushell.services.LaunchPage
      * @since 1.11.0
+     * @deprecated since 1.100
      * @private
      */
     var LaunchPageAdapter = function (oUnused, sParameter, oAdapterConfiguration) {
@@ -88,7 +91,6 @@ sap.ui.define([
             oTargetMappingSupport = new Utils.Map(),
 
             oAdapterConfig = (oAdapterConfiguration && oAdapterConfiguration.config) || {},
-            oTargetMappingServiceConfig = oAdapterConfig.services && oAdapterConfig.services.targetMappings,
             oLaunchPageServiceConfig = oAdapterConfig.services && oAdapterConfig.services.launchPage,
             mEarlyTileVisibilities = {},
             that = this;
@@ -96,16 +98,6 @@ sap.ui.define([
         this._oCurrentPageSet = null;
         this._bPageSetFullyLoaded = false;
 
-        if (!oTargetMappingServiceConfig) {
-            throw new Error("Configuration for target mappings service not passed");
-        }
-        if (!oTargetMappingServiceConfig.baseUrl) {
-            throw new Error("baseUrl was not passed in Configuration for target mappings service");
-        }
-        if (!oTargetMappingServiceConfig.relativeUrl) {
-            throw new Error("relativeUrl was not passed in Configuration for target mappings service");
-        }
-
         if (sap.ui2.srvc.contracts.preview.setEnvironmentType) {
             sap.ui2.srvc.contracts.preview.setEnvironmentType("runtime");
         }
@@ -2419,17 +2411,18 @@ sap.ui.define([
         this._startLoading = function (oDeferred, bRefreshRequired) {
             var oPromise;
 
-            if (oTargetMappingServiceConfig && oTargetMappingServiceConfig.cacheId) {
-                // add cache buster token for the allCatalogs request.
-                // Reuse TargetMappings token as it is also invalidated in case the user's catalogs changed
+            if (oLaunchPageServiceConfig && oLaunchPageServiceConfig.cacheId) {
+                // add cache buster token for the allCatalogs request
+                // use the same token as for the classic homepage (for service /UI2/PAGE_BUILDER_PERS),
+                // this is invalidated for all kind of changes of a catalog (title, tiles, target mappings)
                 oPromise = sap.ushell.Container.getServiceAsync("PageBuilding")
                     .then(function (PageBuildingService) {
                         var oCacheTokens = PageBuildingService.getFactory().getPageBuildingService().readAllCatalogs.cacheBusterTokens;
 
-                        oCacheTokens.put(sDEFAULT_PAGE_ID, oTargetMappingServiceConfig.cacheId);
+                        oCacheTokens.put(sDEFAULT_PAGE_ID, oLaunchPageServiceConfig.cacheId);
 
                         if (Config.last("/core/spaces/enabled")) {
-                            oCacheTokens.put(PAGE_ID_WITHOUT_TM, oTargetMappingServiceConfig.cacheId);
+                            oCacheTokens.put(PAGE_ID_WITHOUT_TM, oLaunchPageServiceConfig.cacheId);
                         }
                     })
                     .catch(oDeferred.reject);

package/src/main/js/sap/ushell_abap/adapters/abap/NavTargetResolutionAdapter.js

@@ -8,7 +8,7 @@
  * service now calls the ClientSideTargetResolution service in the abap
  * platform.
  *
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell_abap/adapters/abap/PageBuildingAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's page building adapter for the ABAP platform.
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
@@ -103,10 +103,14 @@ sap.ui.define([
             sPageBuilderServiceUrl = sConfigBaseUrl;
         }
 
+        // Get CacheId for PAGE_BUILDER_PERS when available
+        var sCacheId = ObjectPath.get("sap-ushell-config.services.Container.adapter.config.services.pbFioriHome.cacheId");
+
         oFactory = Factory.createFactory(
             sPageBuilderServiceUrl,
             undefined,
-            sScope === "PERS"
+            sScope === "PERS",
+            sCacheId
         );
         [ // predefined remote catalog services
             "/sap/hba/apps/kpi/s/odata/hana_chip_catalog.xsodata/",

package/src/main/js/sap/ushell_abap/adapters/abap/PagePersistenceAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview PagePersistenceAdapter for the ABAP platform.
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",
@@ -3958,8 +3958,7 @@ sap.ui.define([
             "sap-client": sap.ushell.Container.getLogonSystem().getClient()
         },
         defaultCountMode: "None",
-        skipMetadataAnnotationParsing: true,
-        useBatch: true
+        skipMetadataAnnotationParsing: true
     });
 
     // If we have the metdata cache backe in action, we will need to revert to the previous implementation
@@ -4056,6 +4055,8 @@ sap.ui.define([
     PagePersistenceAdapter.prototype._readPage = function (pageId) {
         return this.getMetadataPromise().then(function () {
             return new Promise(function (resolve, reject) {
+                // disable batch mode for reading single pages to avoid additional round trip for CSRF token fetch
+                this.getODataModel().setUseBatch(false);
                 this.getODataModel().read("/pageSet('" + encodeURIComponent(pageId) + "')", {
                     urlParameters: {
                         $expand: "sections/viz,vizReferences/chipBags/properties,tileTypes/vizOptions/displayFormats/supported"
@@ -4091,6 +4092,8 @@ sap.ui.define([
                         });
                         aPageFilters.push(oPageFilter);
                     }
+                    // use batch mode for reading multiple pages to avoid URL length limit exceeding
+                    this.getODataModel().setUseBatch(true);
                     this.getODataModel().read("/pageSet", {
                         urlParameters: {
                             $expand: "sections/viz,vizReferences/chipBags/properties,tileTypes/vizOptions/displayFormats/supported"

package/src/main/js/sap/ushell_abap/adapters/abap/PersonalizationAdapter.js

@@ -7,7 +7,7 @@
  *               Container header properties transported via pseudo-items are mapped to the
  *               respective header properties in setItem/getItem/delItem
  *
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([
     "sap/ushell_abap/adapters/abap/AdapterContainer",

package/src/main/js/sap/ushell_abap/adapters/abap/SearchAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Search adapter for the ABAP platform.
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell_abap/adapters/abap/SupportTicketAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The SupportTicket adapter for the ABAP platform.
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([
     "sap/base/util/isEmptyObject",
@@ -76,13 +76,16 @@ sap.ui.define([
             sHash = typeof sHash === "string" ? sHash : "";
             sCatalogId = typeof sCatalogId === "string" && sCatalogId.length > 0 ? JSON.parse(sCatalogId).catalogId || "" : "";
 
+            //Remove whitespaces from both sides of the string
+            oSupportTicketData.text = oSupportTicketData.text.trim();
+            oSupportTicketData.subject = oSupportTicketData.subject.trim();
+
+            if (oSupportTicketData.subject.length > 40) {
+                oSupportTicketData.text = oSupportTicketData.subject + "\n" + oSupportTicketData.text;
+                oSupportTicketData.subject = oSupportTicketData.subject.substring(0, 40).slice(0, -3) + "...";
+            }
             oSupportTicketData.url = sUrl;
             oSupportTicketData.catalogId = sCatalogId;
-
-            oSupportTicketData.subject = resources.i18n.getText("contactSupport.Subject", [
-                oContainer.getLogonSystem().getName() + "-" + oContainer.getLogonSystem().getClient(),
-                oContainer.getUser().getId()
-            ]).substring(0, 40);
             oSupportTicketData.hash = sHash;
             oSupportTicketData.clientContext = convertToReadable(oSupportTicketData.clientContext);
 

package/src/main/js/sap/ushell_abap/adapters/abap/Ui5ComponentLoaderAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the ABAP platform
  *
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell_abap/adapters/hana/ContainerAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's container adapter for the HANA platform.
  *
- * @version 1.100.0
+ * @version 1.102.0
  */
 /**
  * @namespace Default namespace for Unified Shell adapters for the HANA platform. They can usually

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

@@ -14,7 +14,7 @@
  * It furthermore calculates if FLP pages get activated and if needed sets up
  * the configuration environment to run these.
  *
- * @version 1.100.0
+ * @version 1.102.0
  */
 sap.ui.define([
     "./abap.constants",

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

@@ -12,7 +12,7 @@ sap.ui.define([
                     tilesWrappingType: "Hyphenated"
                 },
                 darkMode: {
-                    enabled: false
+                    enabled: true
                 },
                 spaces: {
                     myHome: {

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

@@ -359,7 +359,7 @@ function (
      *
      * @private
      */
-    function setSapui5Settings (oSettings, oCurrencyFormats) {
+    function setSapui5Settings (oSettings, oCurrencyFormats, sTimeZoneIana) {
         var oCore = sap.ui.getCore(),
             oConfiguration = oCore.getConfiguration(),
             oFormatSettings = oConfiguration.getFormatSettings();
@@ -384,6 +384,9 @@ function (
         if (typeof oCurrencyFormats === "object") {
             oFormatSettings.addCustomCurrencies(oCurrencyFormats);
         }
+        if (sTimeZoneIana !== "" && typeof sTimeZoneIana === "string") {
+            oConfiguration.setTimezone(sTimeZoneIana);
+        }
     }
 
     /**
@@ -648,7 +651,8 @@ function (
         var mParameterMap = Utils.getParameterMap(),
             sRequestLocale = oAbapUtils.getUrlParameterValue("sap-locale", mParameterMap),
             oUi5UserInfo = {},
-            oConfig;
+            oConfig,
+            sTimeZoneIana;
 
         // write the support ticket service enablement to the bootstrap config;
         // do not enable if already disabled, but disable if not available in backend
@@ -699,8 +703,14 @@ function (
                 legacyTimeFormat: oStartupResult.timeFormat
             };
         }
+
+        sTimeZoneIana = ObjectPath.get("sap-ushell-config.startupConfig.timeZoneIana");
+        if (sTimeZoneIana === undefined) {
+            sTimeZoneIana = ObjectPath.set("sap-ushell-config.startupConfig.timeZoneIana", "");
+        }
+
         processTheme(oStartupTheme, sSystemThemeRoot);
-        setSapui5Settings(oUi5UserInfo, oStartupResult.currencyFormats);
+        setSapui5Settings(oUi5UserInfo, oStartupResult.currencyFormats, sTimeZoneIana);
     }
 
     /**

package/src/main/js/sap/ushell_abap/integration/fileshares/NavTargetResolutionFileShareSupport.js

@@ -0,0 +1,69 @@
+// Copyright (c) 2009-2022 SAP SE, All Rights Reserved
+
+sap.ui.define([
+    "sap/base/Log",
+    "sap/ui/core/Manifest"
+], function (
+    Log,
+    Manifest
+) {
+    "use strict";
+
+    /**
+     * Provides the configuration for integration with remote file shares.
+     * <p>
+     * This is the <em>FileShareSupport</em> strategy implementation for usage in the FLP on the ABAP platform.
+     * It uses the <code>NavTargetResolution</code> service to determine whether the Fiori App for the file integration
+     * is assigned to the currently logged on user (controls the enablement) and then reads the data source
+     * properties for the file share integration service from the app manifest.
+     * </p>
+     * <p>
+     * This module must not be used directly. Instead, the module name must be retrieved from the SAPUI5 Core
+     * configuration (<code>Core.getConfiguration().getFileShareSupport()</code>) and then loaded
+     * using <code>sap.ui.require</code> if set. The configuration is done by the FLP during bootstrap.
+     * </p>
+     *
+     * @private
+     */
+    var NavTargetResolutionFileShareSupport = {};
+
+    var MODULE_NAME = "sap.ushell_abap.integration.fileshares.NavTargetResolutionFileShareSupport";
+    var FILE_SHARE_INTENT = "#FileShare-manage";
+
+    /**
+     * Get the data source for file share integration
+     * <p>
+     * This is the implementation of the <em>FileShareSupport</em> interface, i.e.
+     * the public contract with the consumers.
+     * </p>
+     *
+     * @return {Promise<Object>} Promise resolving an object for the
+     * 	data source of the file integration service as defined in the manifest;
+     *  if the file share integration is not enabled or an error occurs, the promise is rejected
+     */
+    NavTargetResolutionFileShareSupport.getDataSource = function () {
+        if (!NavTargetResolutionFileShareSupport._getDataSourcePromise) {
+            NavTargetResolutionFileShareSupport._getDataSourcePromise = sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oNavTargetResolutionService) {
+                return oNavTargetResolutionService.resolveHashFragment(FILE_SHARE_INTENT); // jQuery promise is implicitly converted to native
+            }).then(function (oResolvedHashFragment) {
+                var sManifestUrl = oResolvedHashFragment && oResolvedHashFragment.applicationDependencies && oResolvedHashFragment.applicationDependencies.manifest;
+                if (sManifestUrl) {
+                    return Manifest.load({
+                        manifestUrl: sManifestUrl,
+                        async: true
+                    });
+                }
+
+                var sErrorMessage = ["No manifest URL defined in resolved navigation target:", JSON.stringify(oResolvedHashFragment)].join(" ");
+                Log.error(sErrorMessage, null, MODULE_NAME);
+                throw new Error(sErrorMessage);
+            }).then(function (oManifest) {
+                return oManifest.getEntry("/sap.app/dataSources/mainService");
+            });
+        }
+
+        return NavTargetResolutionFileShareSupport._getDataSourcePromise;
+    };
+
+    return NavTargetResolutionFileShareSupport;
+});

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

@@ -3,23 +3,26 @@
 sap.ui.define([
     "sap/ui/core/library",
     "sap/m/library"
-], function (coreLib, mLib) {
+], function (
+    coreLib,
+    mLib
+) {
     "use strict";
 
     /**
      * SAP library: sap.ushell_abap
-     * provides base functions for the Fiori Launchpad running under SAP NetWeaver
+     * provides base functions for Fiori launchpad running on SAP NetWeaver ABAP
      *
      * @namespace
      * @name sap.ushell_abap
      * @author SAP SE
-     * @version 1.100.0
+     * @version 1.102.0
      * @private
      * @ui5-restricted
      */
-    sap.ui.getCore().initLibrary({
+    var ushellAbapLib = sap.ui.getCore().initLibrary({
         name: "sap.ushell_abap",
-        version: "1.100.0",
+        version: "1.102.0",
         dependencies: ["sap.ui.core", "sap.m"],
         noLibraryCSS: true,
         extensions: {
@@ -31,5 +34,5 @@ sap.ui.define([
         }
     });
 
-    return sap.ushell_abap;
-}, /* bExport= */ true);
+    return ushellAbapLib;
+});

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

@@ -629,6 +629,8 @@ sap.ui.define([
      * @param {boolean} [bIsPersonalization=false]
      *   defines the return value of {@link sap.ushell_abap.pbServices.ui2.PageBuildingService#isPersonalization} of
      *   the returned factory's page building service facade (since 1.16.1)
+     * @param {string} [sCacheId]
+     *   Cache ID to read from PAGE_BUILDER_PERS with cache busting.
      * @returns {sap.ushell_abap.pbServices.ui2.Factory}
      *   returns the new factory for the given <code>sBaseUri</code>
      * @since 1.2.0
@@ -637,9 +639,9 @@ sap.ui.define([
      * @see sap.ushell_abap.pbServices.ui2.PageBuildingService
      * @see PageBuildingService.createPageBuildingService()
      */
-    Factory.createFactory = function (sBaseUri, fnDefaultFailure, bIsPersonalization) {
+    Factory.createFactory = function (sBaseUri, fnDefaultFailure, bIsPersonalization, sCacheId) {
         return new Factory(
-            PageBuildingService.createPageBuildingService(sBaseUri, fnDefaultFailure, bIsPersonalization)
+            PageBuildingService.createPageBuildingService(sBaseUri, fnDefaultFailure, bIsPersonalization, sCacheId)
         );
     };
 

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

@@ -52,12 +52,13 @@ sap.ui.define([
      *   for more details.
      * @param {boolean} [bIsPersonalization=false]
      *   defines the return value of {@link #isPersonalization}; nothing else (since 1.16.1)
-     *
+     * @param {string} [sCacheId]
+     *   Cache ID to read from PAGE_BUILDER_PERS with cache busting.
      * @class
      * @augments ODataService
      * @since 1.2.0
      */
-    var PageBuildingService = function (vODataBase, fnDefaultFailure, bIsPersonalization) {
+    var PageBuildingService = function (vODataBase, fnDefaultFailure, bIsPersonalization, sCacheId) {
         var oWrapper,
             that = this;
 
@@ -1431,9 +1432,13 @@ sap.ui.define([
             if (!sChipId) {
                 throw new SrvcError("Missing CHIP ID", "PageBuildingService");
             }
+            var sUrl = "Chips('" + encodeURIComponent(sChipId) + "')?$expand=ChipBags/ChipProperties";
+
+            if (sCacheId !== undefined) {
+                sUrl = sUrl + "&sap-cache-id=" + sCacheId;
+            }
 
-            oWrapper.read("Chips('" + encodeURIComponent(sChipId) + "')" +
-                "?$expand=ChipBags/ChipProperties", fnSuccess, fnFailure);
+            oWrapper.read(sUrl, fnSuccess, fnFailure);
         };
 
         // constructor code -------------------------------------------------------
@@ -1484,14 +1489,16 @@ sap.ui.define([
      * @param {boolean} [bIsPersonalization=false]
      *   defines the return value of {@link PageBuildingService#isPersonalization} of
      *   the returned instance (since 1.16.1)
+     * @param {string} [sCacheId]
+     *   Cache ID to read from PAGE_BUILDER_PERS with cache busting.
      * @returns {PageBuildingService}
      *   a facade to the page building service
      * @since 1.2.0
      *
      * @see PageBuildingService
      */
-    PageBuildingService.createPageBuildingService = function (sBaseUri, fnDefaultFailure, bIsPersonalization) {
-        return new PageBuildingService(sBaseUri, fnDefaultFailure, bIsPersonalization);
+    PageBuildingService.createPageBuildingService = function (sBaseUri, fnDefaultFailure, bIsPersonalization, sCacheId) {
+        return new PageBuildingService(sBaseUri, fnDefaultFailure, bIsPersonalization, sCacheId);
     };
 
     return PageBuildingService;

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

@@ -522,6 +522,7 @@ sap.ui.define([
             sValue,
             iIndexOfEquals,
             aKeyValuePairs,
+            aKeyValuePairsLength,
             // Note: location.search starts with "?" if not empty
             sSearch = arguments.length > 0 ? sSearchString : location.search;
 
@@ -536,8 +537,9 @@ sap.ui.define([
         //       (http://www.w3.org/TR/1999/REC-html401-19991224/appendix/notes.html#h-B.2.2)
         // http://unixpapa.com/js/querystring.html advocates this on the client-side also!
         aKeyValuePairs = sSearch.substring(1).replace(/\+/g, " ").split(/[&;]/);
+        aKeyValuePairsLength = aKeyValuePairs.length < 500 ? aKeyValuePairs.length : 500;
 
-        for (i = 0, n = aKeyValuePairs.length; i < n; i += 1) {
+        for (i = 0, n = aKeyValuePairsLength; i < n; i += 1) {
             // decode key/value pair at first "=" character
             sKey = aKeyValuePairs[i];
             sValue = ""; // Note: empty value may be omitted altogether

package/ui5.yaml

@@ -16,6 +16,7 @@ framework:
     - name: sap.ui.layout
     - name: sap.ui.fl
     - name: sap.ushell
+    - name: sap.f
 builder:
   bundles:
     - bundleDefinition:
@@ -273,9 +274,6 @@ builder:
               - sap/ushell_abap/bootstrap/evo/abap-def-loader.js
               # end bundle sap/ushell_abap/bootstrap/evo/abap.js
               # bundle sap/ushell_abap/bootstrap/evo/core-min.js
-              - ui5loader-autoconfig.js
-              - sap/ushell_abap/bootstrap/evo/abap-def.js
-              - sap/ushell/bootstrap/ui5loader-config.js
               - sap/ui/core/ComponentContainer.js
               - sap/ui/core/CustomData.js
               - sap/ui/core/EventBus.js
@@ -306,6 +304,7 @@ builder:
               - sap/m/BusyIndicator.js
               - sap/m/GenericTile.js
               - sap/m/GenericTileRenderer.js
+              - sap/m/IllustratedMessage.js
               - sap/m/Image.js
               - sap/m/ImageContent.js
               - sap/m/ImageContentRenderer.js
@@ -324,6 +323,8 @@ builder:
               - sap/m/Table.js
               - sap/m/TileContent.js
               - sap/m/TileContentRenderer.js
+              - sap/f/GridContainer.js
+              - sap/f/GridContainerItemLayoutData.js
               - sap/ushell/library.js
               - sap/ushell/CanvasShapesManager.js
               - sap/ushell/Fiori20AdapterTest.js
@@ -429,7 +430,6 @@ builder:
             resolve: true
             renderer: true
           - mode: preload
-            name: sap/fiori/core-ext-light
             filters:
               - jquery.sap.*
               - sap/base/
@@ -437,14 +437,19 @@ builder:
               - sap/ui/core/
               - sap/ui/dom/
               - sap/ui/events/
+              - sap/ui/layout/ # layout's library.js is used in sap.f in core-min
               - sap/ui/model/
               - sap/ui/performance/
               - sap/ui/security/
               - sap/ui/util/
               - sap/ui/thirdparty/
               - sap/m/
+              - sap/f/
               - sap/ushell/
+              - 'sap/ushell_abap/integration/fileshares/NavTargetResolutionFileShareSupport.js'
               - '!**/*-preload.js'
+              - '!**/*.support.js'
+              - '!**/designtime/'
               - '!sap/ui/core/messagebundle*.properties'
               - '!sap/ui/core/plugin/'
               - '!sap/ui/core/tmpl/'
@@ -453,15 +458,35 @@ builder:
               - '!sap/ui/thirdparty/blanket.js'
               - '!sap/ui/thirdparty/qunit*'
               - '!sap/ui/thirdparty/sinon*'
-              - '!sap/ui/core/designtime/'
-              - '!sap/ui/core/**/*.support.js'
               - '!sap/ui/core/rules/'
               - '!sap/ui/core/support/'
               - '!sap/m/designtime/'
-              - '!sap/m/**/*.support.js'
               - '!sap/m/rules/'
-              - '!sap/ushell/UIActions.js'
+              - '!sap/f/designtime/'
+              - '!sap/ui/layout/designtime/'
+              - '!sap/ushell/adapters/'
+              - '!sap/ushell/applications/'
+              - '!sap/ushell/appRuntime/'
+              - '!sap/ushell/bootstrap/'
+              - '!sap/ushell/components/appfinder/'
+              - '!sap/ushell/components/homepage/'
+              - '!sap/ushell/components/pages/'
+              - '!sap/ushell/components/shell/'
+              - '!sap/ushell/components/tiles/action/'
+              - '!sap/ushell/components/tiles/applauncher/Configuration.view.xml'
+              - '!sap/ushell/components/tiles/applauncher/StaticTile.controller.js'
+              - '!sap/ushell/components/tiles/applauncher/StaticTile.view.js'
+              - '!sap/ushell/components/tiles/applauncherdynamic/Configuration.view.xml'
+              - '!sap/ushell/components/tiles/applauncherdynamic/DynamicTile.controller.js'
+              - '!sap/ushell/components/tiles/applauncherdynamic/DynamicTile.view.js'
+              - '!sap/ushell/components/tiles/cdm/'
+              - '!sap/ushell/components/tiles/utils.js'
+              - '!sap/ushell/components/workPageBuilder/'
+              - '!sap/ushell/components/workPageRuntime/'
+              - '!sap/ushell/designtime'
               - '!sap/ushell/Layout.js'
+              - '!sap/ushell/plugins/'
+              - '!sap/ushell/services/SearchCEP.js'
               - '!sap/ushell/ui/launchpad/AccessibilityCustomData.js'
               - '!sap/ushell/ui/launchpad/AnchorItem.js'
               - '!sap/ushell/ui/launchpad/AnchorItemRenderer.js'
@@ -491,26 +516,9 @@ builder:
               - '!sap/ushell/ui/launchpad/TileState.js'
               - '!sap/ushell/ui/launchpad/TileStateRenderer.js'
               - '!sap/ushell/ui/tile/'
-              - '!sap/ushell/components/tiles/applauncher/StaticTile.controller.js'
-              - '!sap/ushell/components/tiles/applauncher/StaticTile.view.js'
-              - '!sap/ushell/components/tiles/applauncherdynamic/DynamicTile.controller.js'
-              - '!sap/ushell/components/tiles/applauncherdynamic/DynamicTile.view.js'
-              - '!sap/ushell/components/tiles/cdm/'
-              - '!sap/ushell/components/tiles/utils.js'
-              - '!sap/ushell/adapters/'
-              - '!sap/ushell/applications/'
-              - '!sap/ushell/appRuntime/'
-              - '!sap/ushell/bootstrap/'
-              - '!sap/ushell/components/homepage/'
-              - '!sap/ushell/components/appfinder/'
-              - '!sap/ushell/components/shell/'
-              - '!sap/ushell/components/pages/'
-              - '!sap/ushell/components/tiles/action/'
-              - '!sap/ushell/components/tiles/applauncher/Configuration.view.xml'
-              - '!sap/ushell/components/tiles/applauncherdynamic/Configuration.view.xml'
-              - '!sap/ushell/plugins/'
-              - '!sap/ushell/utils/'
+              - '!sap/ushell/UIActions.js'
               - '!sap/ushell/ui5service/UserStatus.js'
+              - '!sap/ushell/utils/'
             resolve: false
       bundleOptions:
         optimize: true