@sapui5/sap.ushell 1.136.3 → 1.138.0

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5.js

@@ -3,11 +3,11 @@ sap.ui.define([
     "sap/base/Log",
     "./common.load.launchpad",
     "./common.read.ui5theme.from.config"
-], function (
+], (
     Log,
     fnLoadLaunchpadContent,
     fnGetUi5theme
-) {
+) => {
     "use strict";
 
     /**
@@ -33,15 +33,15 @@ sap.ui.define([
             return {};
         }
 
-        var oSAPUIConfig = window["sap-ui-config"] || (window["sap-ui-config"] = {});
-        var sPlatform = oSettings && oSettings.platform;
-        var oPlatformAdapters = oSettings && oSettings.platformAdapters;
-        var oUshellConfig = oSettings.ushellConfig;
-        var sUi5Theme = oSettings.theme ? oSettings.theme : fnGetUi5theme(oUshellConfig).theme; // fallback theme if no user-specific or default theme is defined
+        const oSAPUIConfig = window["sap-ui-config"] || (window["sap-ui-config"] = {});
+        const sPlatform = oSettings && oSettings.platform;
+        const oPlatformAdapters = oSettings && oSettings.platformAdapters;
+        const oUshellConfig = oSettings.ushellConfig;
+        const sUi5Theme = oSettings.theme ? oSettings.theme : fnGetUi5theme(oUshellConfig).theme; // fallback theme if no user-specific or default theme is defined
         const oThemeRoots = oSettings.themeRoots;
 
         if (oUshellConfig && oUshellConfig.modulePaths) {
-            var oModules = Object.keys(oUshellConfig.modulePaths).reduce(function (result, sModulePath) {
+            const oModules = Object.keys(oUshellConfig.modulePaths).reduce((result, sModulePath) => {
                 result[sModulePath.replace(/\./g, "/")] = oUshellConfig.modulePaths[sModulePath];
                 return result;
             }, {});
@@ -56,19 +56,19 @@ sap.ui.define([
          * 2) Bootstrap ushell
          * 3) Load FLP content etc.
          */
-        var bootOnInit = oSAPUIConfig.oninit;
+        const bootOnInit = oSAPUIConfig.oninit;
         oSAPUIConfig.oninit = function () {
             // See also Core.prototype._executeOnInit
             if (typeof bootOnInit === "string") {
-                var aResult = /^module:((?:[_$.\-a-zA-Z0-9]+\/)*[_$.\-a-zA-Z0-9]+)$/.exec(bootOnInit);
+                const aResult = /^module:((?:[_$.\-a-zA-Z0-9]+\/)*[_$.\-a-zA-Z0-9]+)$/.exec(bootOnInit);
                 if (aResult && aResult[1]) {
                     sap.ui.require([aResult[1]]);
                 } else {
-                    Log.error("Given onInit module (" + bootOnInit + ") cannot be loaded.");
+                    Log.error(`Given onInit module (${bootOnInit}) cannot be loaded.`);
                 }
             }
-            sap.ui.require(["sap/ushell/Container"], function (Container) {
-                Container.init(sPlatform, oPlatformAdapters).then(function () {
+            sap.ui.require(["sap/ushell/Container"], (Container) => {
+                Container.init(sPlatform, oPlatformAdapters).then(() => {
                     (oSettings.onInitCallback || fnLoadLaunchpadContent)();
                 });
             });

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5datetimeformat.js

@@ -4,17 +4,15 @@
  * @fileOverview Configure the UI5Settings for Date and Time Format for the 'CDM'
  *               platform.
  *
- * @version 1.136.3
+ * @version 1.138.0
  */
 sap.ui.define([
     "sap/base/i18n/Formatting",
     "sap/base/Log",
     "sap/base/util/ObjectPath"
-], function (Formatting, Log, ObjectPath) {
+], (Formatting, Log, ObjectPath) => {
     "use strict";
 
-    return configureUI5DateTimeFormat;
-
     /**
      * This function configures the UI5 settings for Date and Time Format.
      * Note: TimeZone is not taken into account.
@@ -27,23 +25,25 @@ sap.ui.define([
      * @private
      */
     function configureUI5DateTimeFormat (oUshellConfig) {
-        var oUserProfileDefaults = ObjectPath.get("services.Container.adapter.config.userProfile.defaults", oUshellConfig);
+        const oUserProfileDefaults = ObjectPath.get("services.Container.adapter.config.userProfile.defaults", oUshellConfig);
 
-        var sMessageDate = "Date Format is incorrectly set for the User";
-        var sMessageTime = "Time Format is incorrectly set for the User";
+        const sMessageDate = "Date Format is incorrectly set for the User";
+        const sMessageTime = "Time Format is incorrectly set for the User";
 
         try {
-            var sSapDateFormat = oUserProfileDefaults && oUserProfileDefaults.sapDateFormat;
+            const sSapDateFormat = oUserProfileDefaults && oUserProfileDefaults.sapDateFormat;
             Formatting.setABAPDateFormat(sSapDateFormat);
         } catch (e) {
             Log.error(sMessageDate, e.stack, "sap/ushell/bootstrap/common/common.configure.ui5datetimeformat");
         }
 
         try {
-            var sSapTimeFormat = oUserProfileDefaults && oUserProfileDefaults.sapTimeFormat;
+            const sSapTimeFormat = oUserProfileDefaults && oUserProfileDefaults.sapTimeFormat;
             Formatting.setABAPTimeFormat(sSapTimeFormat);
         } catch (e) {
             Log.error(sMessageTime, e.stack, "sap/ushell/bootstrap/common/common.configure.ui5datetimeformat");
         }
     }
+
+    return configureUI5DateTimeFormat;
 }, /* bExport = */ false);

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5language.js

@@ -3,7 +3,7 @@
 sap.ui.define([
     "sap/base/i18n/Localization",
     "sap/base/util/ObjectPath"
-], function (Localization, ObjectPath) {
+], (Localization, ObjectPath) => {
     "use strict";
 
     /**
@@ -14,8 +14,8 @@ sap.ui.define([
      * @private
      */
     function configureUI5Language (oUshellConfig) {
-        var oUserProfileDefaults = ObjectPath.get("services.Container.adapter.config.userProfile.defaults", oUshellConfig);
-        var sLanguageBcp47 = oUserProfileDefaults && oUserProfileDefaults.languageBcp47;
+        const oUserProfileDefaults = ObjectPath.get("services.Container.adapter.config.userProfile.defaults", oUshellConfig);
+        const sLanguageBcp47 = oUserProfileDefaults && oUserProfileDefaults.languageBcp47;
 
         // note: the sap-language query parameter must be considered by the server
         // and will change the language defaults read above

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5theme.js

@@ -3,22 +3,22 @@ sap.ui.define([
     "./common.read.ui5theme.from.config",
     "sap/base/util/ObjectPath",
     "sap/base/Log"
-], function (getUi5Theme, ObjectPath, Log) {
+], (getUi5Theme, ObjectPath, Log) => {
     "use strict";
 
     function setThemesInUserInfoAdapter (oUshellConfig) {
-        var oThemeRange = ObjectPath.get("services.Container.adapter.config.userProfile.metadata.ranges.theme", oUshellConfig);
+        const oThemeRange = ObjectPath.get("services.Container.adapter.config.userProfile.metadata.ranges.theme", oUshellConfig);
         if (!oThemeRange) {
             return;
         }
         // creates path
         ObjectPath.create("services.UserInfo.adapter.config.themes", oUshellConfig);
 
-        oUshellConfig.services.UserInfo.adapter.config.themes = Object.keys(oThemeRange).map(function (key) {
+        oUshellConfig.services.UserInfo.adapter.config.themes = Object.keys(oThemeRange).map((key) => {
             return {
-                "id": key,
-                "name": oThemeRange[key].displayName,
-                "root": oThemeRange[key].themeRoot
+                id: key,
+                name: oThemeRange[key].displayName,
+                root: oThemeRange[key].themeRoot
             };
         });
     }
@@ -31,22 +31,20 @@ sap.ui.define([
      * @private
      */
     function configureUi5Theme (oUshellConfig) {
-
-        var oContainerAdapterConfig = ObjectPath.get("services.Container.adapter.config", oUshellConfig),
-            oValidTheme = getUi5Theme(oUshellConfig);
+        const oContainerAdapterConfig = ObjectPath.get("services.Container.adapter.config", oUshellConfig);
+        const oValidTheme = getUi5Theme(oUshellConfig);
 
         setThemesInUserInfoAdapter(oUshellConfig);
 
-
         // does personalized or standard theme exists
         if (oValidTheme.theme) {
             oContainerAdapterConfig.userProfile.defaults.bootTheme = oValidTheme;
         } else {
-            var sDefaultTheme = ObjectPath.get("userProfile.defaults.theme", oContainerAdapterConfig),
-                sPersonalizedTheme = ObjectPath.get("userProfilePersonalization.theme", oContainerAdapterConfig);
-            Log.error("No valid boot theme could be determined: personalizedTheme = '" + sPersonalizedTheme +
-                "' default theme = '" + sDefaultTheme + "'", null,
-                "common.configure.ui5theme"
+            const sDefaultTheme = ObjectPath.get("userProfile.defaults.theme", oContainerAdapterConfig);
+            const sPersonalizedTheme = ObjectPath.get("userProfilePersonalization.theme", oContainerAdapterConfig);
+            Log.error(`No valid boot theme could be determined: personalizedTheme = '${sPersonalizedTheme
+            }' default theme = '${sDefaultTheme}'`, null,
+            "common.configure.ui5theme"
             );
         }
     }

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ushell.js

@@ -9,7 +9,7 @@ sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/base/Log",
     "sap/base/util/extend"
-], function (oConstants, oDebugMode, oMetaTagReader, oUtil, oConfigFromUrl, ObjectPath, Log, extend) {
+], (oConstants, oDebugMode, oMetaTagReader, oUtil, oConfigFromUrl, ObjectPath, Log, extend) => {
     "use strict";
 
     // Some settings of the ushell which are dependent on user personalisation
@@ -19,13 +19,11 @@ sap.ui.define([
     // This function transforms the stored key-value pairs into a structure the
     // ushell configuration processor understands.
     function fixUpPersonalisedSettings (oUShellConfig, sSettingPath) {
-        var oPersonalizedSetting;
-
         if (!oUShellConfig || !sSettingPath) {
             return;
         }
 
-        oPersonalizedSetting = ObjectPath.get(sSettingPath, oUShellConfig);
+        const oPersonalizedSetting = ObjectPath.get(sSettingPath, oUShellConfig);
 
         if (oPersonalizedSetting && oPersonalizedSetting.items) {
             extend(oPersonalizedSetting, oPersonalizedSetting.items);
@@ -87,11 +85,9 @@ sap.ui.define([
      * @param {object} config FLP Configuration passed from backend
      */
     function setSpacesOrHomepageMode (config) {
-
-        var bSpacesConfigurableByUser = ObjectPath.get("ushell.spaces.configurable", config);
+        const bSpacesConfigurableByUser = ObjectPath.get("ushell.spaces.configurable", config);
         if (bSpacesConfigurableByUser) {
-
-            var bSpacesEnabledByUser = ObjectPath.get("services.Container.adapter.config.userProfilePersonalization.spacesEnabled", config);
+            const bSpacesEnabledByUser = ObjectPath.get("services.Container.adapter.config.userProfilePersonalization.spacesEnabled", config);
 
             if (bSpacesEnabledByUser === true) {
                 ObjectPath.set("ushell.spaces.enabled", true, config);
@@ -129,5 +125,4 @@ sap.ui.define([
     }
 
     return configureUshell;
-
 });

package/src/main/js/sap/ushell/bootstrap/common/common.constants.js

@@ -3,7 +3,7 @@
 /**
  * @fileoverview This module provides a collection of constant values.
  */
-sap.ui.define([], function () {
+sap.ui.define([], () => {
     "use strict";
 
     return {

package/src/main/js/sap/ushell/bootstrap/common/common.create.configcontract.core.js

@@ -64,18 +64,6 @@ sap.ui.define([
             return (oSegment !== undefined) ? oSegment : oDefaultValue;
         }
 
-        // do not render background shapes in Spaces mode
-        // "enableBackGroundShapes" has default value of "false" in Spaces FLP and "true" in Classic FLP
-        function getEnableBackGroundShapes () {
-            const sPath = "renderers/fiori2/componentData/config/enableBackGroundShapes";
-            let bEnableShapes = !!getValueFromConfig(oGetConfigValueMemory, sPath);
-            if (bEnableShapes) {
-                bEnableShapes = !getConfigValue("ushell/spaces/enabled", false);
-            }
-            oDefaultConfigValues[sPath] = bEnableShapes;
-            return bEnableShapes;
-        }
-
         function getEnablePersonalization () {
             // default is "true"
             return getConfigValue("renderers/fiori2/componentData/config/enablePersonalization",
@@ -411,7 +399,6 @@ sap.ui.define([
                     intentNavigation: getConfigValue("ushell/intentNavigation", false),
                     model: {
                         enableSAPCopilotWindowDocking: undefined, // todo: remove (done in follow up)
-                        enableBackGroundShapes: getEnableBackGroundShapes(),
                         personalization: undefined,
                         contentDensity: undefined,
                         setTheme: undefined,

package/src/main/js/sap/ushell/bootstrap/common/common.debug.mode.js

@@ -5,11 +5,11 @@
  */
 sap.ui.define([
     "./common.constants"
-], function (oConstants) {
+], (oConstants) => {
     "use strict";
 
-    var sStoredSapUiDebugValue;
-    var bDebugSources = /[?&]sap-ui-debug=(true|x|X)(&|$)/.test(window.location.search);
+    let sStoredSapUiDebugValue;
+    let bDebugSources = /[?&]sap-ui-debug=(true|x|X)(&|$)/.test(window.location.search);
 
     if (!bDebugSources) {
         try {

package/src/main/js/sap/ushell/bootstrap/common/common.load.bootstrapExtension.js

@@ -4,17 +4,16 @@
  */
 sap.ui.define([
     "sap/base/util/ObjectPath"
-], function (ObjectPath) {
+], (ObjectPath) => {
     "use strict";
 
     function loadBootstrapExtension (oUShellConfig) {
-
-        var sPath = ObjectPath.get("bootstrap.extensionModule", oUShellConfig);
+        let sPath = ObjectPath.get("bootstrap.extensionModule", oUShellConfig);
         if (!sPath || typeof sPath !== "string") {
             return;
         }
         sPath = sPath.replace(/\./g, "/");
-        sap.ui.require([sPath], function (oExtensionModule) {
+        sap.ui.require([sPath], (oExtensionModule) => {
             if (oExtensionModule && typeof oExtensionModule === "function") {
                 oExtensionModule();
             }

package/src/main/js/sap/ushell/bootstrap/common/common.load.core-min.js

@@ -6,10 +6,10 @@
 sap.ui.define([
     "./common.debug.mode",
     "./common.load.script"
-], function (oDebugMode, oScriptLoader) {
+], (oDebugMode, oScriptLoader) => {
     "use strict";
 
-    var coreMinLoader = {};
+    const coreMinLoader = {};
 
     /**
      * Load the <em>coreResources</em> bundles by adding the script tags to the head.
@@ -25,8 +25,6 @@ sap.ui.define([
      * @private
      */
     coreMinLoader.load = function (oPreloadBundleConfig) {
-        var aCoreResources;
-
         if (typeof (oPreloadBundleConfig) !== "object") {
             //  bundle config is mandatory for cdm bootstrap - fail fast
             throw new Error("Mandatory preload bundle configuration is not provided");
@@ -36,7 +34,7 @@ sap.ui.define([
             // If pure debug mode is turned on (sap-ui-debug=(true|x|X)), it's only
             // needed to require the Core and boot the core because the minified preload
             // modules should be loaded with the single -dbg versions.
-            sap.ui.require(["sap/ui/core/Core"], function (core) {
+            sap.ui.require(["sap/ui/core/Core"], (core) => {
                 core.boot();
             });
         }
@@ -45,8 +43,8 @@ sap.ui.define([
             throw new Error("Disabling the custom preload bundles is not yet supported");
         }
 
-        aCoreResources = oPreloadBundleConfig && oPreloadBundleConfig.coreResources || [];
-        aCoreResources.forEach(function (sBundleName) {
+        const aCoreResources = oPreloadBundleConfig && oPreloadBundleConfig.coreResources || [];
+        aCoreResources.forEach((sBundleName) => {
             oScriptLoader.loadScript(sap.ui.require.toUrl(sBundleName));
         });
     };

package/src/main/js/sap/ushell/bootstrap/common/common.load.launchpad.js

@@ -5,20 +5,17 @@
  */
 sap.ui.define([
 
-], function (
+], (
 
-) {
+) => {
     "use strict";
 
-    return loadLaunchpadContent;
-
     function loadLaunchpadContent (sDomId) {
-
-        //Lazy loading of iconfonts and AppConfiguration (avoid packing this module into cdm.js bundle)
-        sap.ui.require(["sap/ushell/iconfonts", "sap/ushell/services/AppConfiguration", "sap/ushell/Container"], function (IconFonts, Configuration, Container) {
+        // Lazy loading of iconfonts and AppConfiguration (avoid packing this module into cdm.js bundle)
+        sap.ui.require(["sap/ushell/iconfonts", "sap/ushell/services/AppConfiguration", "sap/ushell/Container"], (IconFonts, Configuration, Container) => {
             // Create the default renderer asynchronously and place its UI5 control into the canvas div replacing the contents
             Container.createRendererInternal(null).then(
-                function (oContent) {
+                (oContent) => {
                     oContent.placeAt(sDomId || "canvas", "only");
                 }
             );
@@ -26,4 +23,5 @@ sap.ui.define([
         });
     }
 
+    return loadLaunchpadContent;
 });

package/src/main/js/sap/ushell/bootstrap/common/common.load.model.js

@@ -6,20 +6,20 @@ sap.ui.define([
     "sap/ui/Device",
     "sap/ui/model/json/JSONModel",
     "sap/ushell/Config"
-], function (
+], (
     Localization,
     extend,
     Device,
     JSONModel,
     Config
-) {
+) => {
     "use strict";
 
-    var _oModel;
+    let _oModel;
 
     function _instantiateModel () {
-        var oShellCoreConfigFromConfig = Config.last("/core");
-        var oInitialConfig = {
+        const oShellCoreConfigFromConfig = Config.last("/core");
+        let oInitialConfig = {
             groups: [],
             rtl: Localization.getRTL(),
             personalization: oShellCoreConfigFromConfig.shell.enablePersonalization,
@@ -48,7 +48,7 @@ sap.ui.define([
     }
 
     function _triggerSubscriptions () {
-        var mediaQ = window.matchMedia("(min-width: 800px)");
+        const mediaQ = window.matchMedia("(min-width: 800px)");
 
         // condition check if mediaMatch supported(Not supported on IE9)
         if (mediaQ.addListener) {

package/src/main/js/sap/ushell/bootstrap/common/common.load.script.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
-sap.ui.define([], function () {
+sap.ui.define([], () => {
     "use strict";
 
     /**
@@ -17,7 +17,7 @@ sap.ui.define([], function () {
      * @private
      */
     function fnLoadScript (sFilePath, sId, bIsDefer, bAsync) {
-        return new Promise(function (resolve, reject) {
+        return new Promise((resolve, reject) => {
             function listener (oEvent) {
                 oEvent.target.removeEventListener("load", listener);
                 oEvent.target.removeEventListener("error", listener);
@@ -27,7 +27,7 @@ sap.ui.define([], function () {
                 resolve();
             }
 
-            var oScriptElement = document.createElement("script");
+            const oScriptElement = document.createElement("script");
             oScriptElement.src = sFilePath;
             oScriptElement.async = !!bAsync;
             oScriptElement.addEventListener("load", listener);

package/src/main/js/sap/ushell/bootstrap/common/common.override.registermodulepath.js

@@ -9,34 +9,12 @@
 sap.ui.define([
     "jquery.sap.global", // LEGACY API (deprecated) - keep for the third party legacy calls
     "sap/ui/thirdparty/URI"
-], function (
+], (
     jQuery,
     URI
-) {
+) => {
     "use strict";
 
-    function overrideRegisterModulePath () {
-        /**
-         * @deprecated since 1.96
-         * @private
-         */
-        (function () {
-            var fnRegisterModulePath = jQuery.sap.registerModulePath; // LEGACY API (deprecated) - keep for the third party legacy calls
-
-            jQuery.sap.registerModulePath = function (sModuleName, vUrlPrefix) {
-                // since 1.28, registerModulePath can take either a URL string or an object of form {url: "url", "final": true}
-                if (typeof vUrlPrefix === "object") {
-                    vUrlPrefix.url = removeCBAndNormalizeUrl(vUrlPrefix.url);
-                } else if (typeof vUrlPrefix === "string") {
-                    vUrlPrefix = removeCBAndNormalizeUrl(vUrlPrefix);
-                }
-                // any other types are just passed through
-
-                fnRegisterModulePath(sModuleName, vUrlPrefix);
-            };
-        }());
-    }
-
     /**
      * Removes a cache buster token (if available) of an Url and normalizes the url afterwards
      * @param {string} sUrl
@@ -47,18 +25,13 @@ sap.ui.define([
      * @private
      */
     function removeCBAndNormalizeUrl (sUrl) {
-        var aMatches,
-            sUrlPrefix,
-            sCacheBusterSegment,
-            sUrlPostfix;
-
-        if (typeof sUrl !== "string" || sUrl === "" || isUriWithRelativeOrEmptyPath(sUrl)) {
-            return sUrl;
-        }
+        let sUrlPrefix;
+        let sCacheBusterSegment;
+        let sUrlPostfix;
 
         function isUriWithRelativeOrEmptyPath (sUrl0) {
-            var oUri = new URI(sUrl0),
-                sPath = oUri.path();
+            const oUri = new URI(sUrl0);
+            const sPath = oUri.path();
 
             if (oUri.is("absolute")) {
                 return false;
@@ -71,9 +44,13 @@ sap.ui.define([
             return true;
         }
 
+        if (typeof sUrl !== "string" || sUrl === "" || isUriWithRelativeOrEmptyPath(sUrl)) {
+            return sUrl;
+        }
+
         // split up the URL into 3 parts: prefix, cache-buster segment, postfix
         // leading slashes are always part of the segment, the postfix might have a trailing slash
-        aMatches = sUrl.match(/(.*)(\/~[\w-]+~[A-Z0-9]?)(.*)/);
+        const aMatches = sUrl.match(/(.*)(\/~[\w-]+~[A-Z0-9]?)(.*)/);
         if (aMatches) {
             sUrlPrefix = aMatches[1];
             sCacheBusterSegment = aMatches[2];
@@ -85,9 +62,9 @@ sap.ui.define([
         }
 
         function isRelativePathWithDotSegmentsThatGoOutside (sPath) {
-            var aSegments = new URI(sPath).segment(),
-                i,
-                iPos = 0;
+            const aSegments = new URI(sPath).segment();
+            let i;
+            let iPos = 0;
 
             for (i = 0; i < aSegments.length && iPos >= 0; i += 1) {
                 if (aSegments[i] === "..") {
@@ -113,5 +90,27 @@ sap.ui.define([
         return normalizePath(sUrl);
     }
 
+    function overrideRegisterModulePath () {
+        /**
+         * @deprecated since 1.96
+         * @private
+         */
+        (function () {
+            const fnRegisterModulePath = jQuery.sap.registerModulePath; // LEGACY API (deprecated) - keep for the third party legacy calls
+
+            jQuery.sap.registerModulePath = function (sModuleName, vUrlPrefix) {
+                // since 1.28, registerModulePath can take either a URL string or an object of form {url: "url", "final": true}
+                if (typeof vUrlPrefix === "object") {
+                    vUrlPrefix.url = removeCBAndNormalizeUrl(vUrlPrefix.url);
+                } else if (typeof vUrlPrefix === "string") {
+                    vUrlPrefix = removeCBAndNormalizeUrl(vUrlPrefix);
+                }
+                // any other types are just passed through
+
+                fnRegisterModulePath(sModuleName, vUrlPrefix);
+            };
+        }());
+    }
+
     return overrideRegisterModulePath;
 });

package/src/main/js/sap/ushell/bootstrap/common/common.read.metatags.js

@@ -4,18 +4,18 @@
  * @fileoverview Reads meta tags based on the provided Prefix.
  * Parses each value of a meta tag to an array of object by a given a parse; default is JSON parser.
  */
-sap.ui.define(["sap/base/Log"], function (Log) {
+sap.ui.define(["sap/base/Log"], (Log) => {
     "use strict";
 
     function fnReadMetaTags (sMetaPrefix, fnParse) {
-        var sSelector = "meta[name^='" + sMetaPrefix + "']:not([name=''])";
-        var oMetaNodeList = document.querySelectorAll(sSelector);
-        var S_COMPONENT = "sap/ushell/bootstrap/common/common.read.metatags";
+        const sSelector = `meta[name^='${sMetaPrefix}']:not([name=''])`;
+        const oMetaNodeList = document.querySelectorAll(sSelector);
+        const S_COMPONENT = "sap/ushell/bootstrap/common/common.read.metatags";
 
-        var aItems = [];
+        const aItems = [];
         fnParse = fnParse || JSON.parse;
 
-        Array.prototype.forEach.call(oMetaNodeList, function (oMetaNode) {
+        Array.prototype.forEach.call(oMetaNodeList, (oMetaNode) => {
             try {
                 aItems.push(fnParse(oMetaNode.content));
             } catch (e) {

package/src/main/js/sap/ushell/bootstrap/common/common.read.ui5theme.from.config.js

@@ -2,13 +2,11 @@
 
 sap.ui.define([
     "sap/base/util/ObjectPath"
-], function (ObjectPath) {
+], (ObjectPath) => {
     "use strict";
 
-    return getValidTheme;
-
     function extractThemeDataFromConfig (oUshellConfig) {
-        var oContainerAdapterConfig = ObjectPath.get("services.Container.adapter.config", oUshellConfig);
+        const oContainerAdapterConfig = ObjectPath.get("services.Container.adapter.config", oUshellConfig);
         return {
             sDefaultTheme: ObjectPath.get("userProfile.defaults.theme", oContainerAdapterConfig),
             sPersonalizedTheme: ObjectPath.get("userProfilePersonalization.theme", oContainerAdapterConfig),
@@ -17,28 +15,30 @@ sap.ui.define([
     }
 
     function getValidTheme (oUshellConfig) {
-        var oThemeData = extractThemeDataFromConfig(oUshellConfig),
-            sPersonalizedTheme = oThemeData.sPersonalizedTheme,
-            oRangeTheme = oThemeData.oRangeTheme,
-            sDefaultTheme = oThemeData.sDefaultTheme;
+        const oThemeData = extractThemeDataFromConfig(oUshellConfig);
+        const sPersonalizedTheme = oThemeData.sPersonalizedTheme;
+        const oRangeTheme = oThemeData.oRangeTheme;
+        const sDefaultTheme = oThemeData.sDefaultTheme;
 
         if (oThemeData.oRangeTheme) {
             // Range of themes contains boot theme
             if (Object.keys(oRangeTheme).indexOf(sPersonalizedTheme) > -1) {
-                var oPersonalizedTheme = oRangeTheme[sPersonalizedTheme] || {};
+                const oPersonalizedTheme = oRangeTheme[sPersonalizedTheme] || {};
                 return { theme: sPersonalizedTheme, root: oPersonalizedTheme.themeRoot };
             }
             // return DefaultTheme
-            var oDefaultTheme = oRangeTheme[sDefaultTheme] || {};
+            const oDefaultTheme = oRangeTheme[sDefaultTheme] || {};
             return {
                 theme: sDefaultTheme,
                 root: oDefaultTheme.themeRoot
             };
         }
         // stay compatible
-        var sAppliedTheme = sPersonalizedTheme || sDefaultTheme;
+        const sAppliedTheme = sPersonalizedTheme || sDefaultTheme;
         return {
             theme: sAppliedTheme, root: ""
         };
     }
+
+    return getValidTheme;
 });