@sapui5/sap.ushell 1.140.0 → 1.141.1

package/src/main/js/sap/ushell/appRuntime/ui5/services/MessageBroker.js

@@ -3,17 +3,23 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.MessageBroker}.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
-    "sap/ushell/appRuntime/ui5/AppCommunicationMgr"
+    "sap/base/Log",
+    "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
+    "sap/ushell/appRuntime/ui5/services/MessageBroker/Client",
+    "sap/ushell/services/MessageBroker/ClientAlias",
+    "sap/ushell/utils/CallbackQueue"
 ], (
-    AppCommunicationMgr
+    Log,
+    AppCommunicationMgr,
+    MessageBrokerClient,
+    ClientAlias,
+    CallbackQueue
 ) => {
     "use strict";
 
-    let oClientData = {};
-
     /**
      * @alias sap.ushell.appRuntime.ui5.services.MessageBroker
      * @class
@@ -23,78 +29,152 @@ sap.ui.define([
      *
      * @private
      */
-    function MessageBrokerProxy () {}
+    function MessageBrokerProxy () {
+        this._mClientData = new Map();
+        this._oLogger = Log.getLogger("sap.ushell.services.MessageBroker");
 
-    MessageBrokerProxy.prototype.connect = function (sClientId) {
-        return new Promise((fnResolve, fnReject) => {
-            AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
+        /*
+         * We have to track changes in a queue because the underlying communication layer is asynchronous.
+         * This ensures that the internal state is always consistent.
+         * E.g.
+         * When a client is connecting and subscribing and receives messages in the meantime.
+         * The sender might be already informed and it should be legit to send a message.
+         * But the appruntime wasn't informed yet.
+         */
+        this.oCallbackQueue = new CallbackQueue();
+    }
+
+    MessageBrokerProxy.prototype.connect = async function (sClientId, fnClientConnectionCallback) {
+        return this.oCallbackQueue.push(async () => {
+            if (typeof sClientId !== "string" || !sClientId.length) {
+                throw new Error("Cannot connect client: Missing required parameter client id");
+            }
+
+            if (typeof fnClientConnectionCallback !== "function") {
+                this._oLogger.error(`Missing required parameter 'fnClientConnectionCallback' for client '${sClientId}'! It has to be provided as part of the connect() call`);
+            }
+
+            const oClient = new MessageBrokerClient(sClientId);
+            oClient.setClientConnectionCallback(fnClientConnectionCallback);
+
+            await AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
                 channelId: "sap.ushell.MessageBroker",
                 clientId: sClientId,
                 messageName: "connect"
-            }).then(fnResolve).catch(fnReject);
+            });
+
+            this._mClientData.set(sClientId, oClient);
         });
     };
 
-    MessageBrokerProxy.prototype.disconnect = function (sClientId) {
-        return new Promise((fnResolve, fnReject) => {
-            oClientData = {};
-            AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
+    MessageBrokerProxy.prototype.disconnect = async function (sClientId) {
+        return this.oCallbackQueue.push(async () => {
+            if (typeof sClientId !== "string" || !sClientId.length) {
+                throw new Error("Cannot disconnect client: Missing required parameter client id");
+            }
+
+            await AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
                 channelId: "sap.ushell.MessageBroker",
                 clientId: sClientId,
                 messageName: "disconnect"
-            }).then(fnResolve).catch(fnReject);
+            });
+
+            this._mClientData.delete(sClientId);
         });
     };
 
-    MessageBrokerProxy.prototype.subscribe = function (
-        sClientId,
-        aSubscribedChannels,
-        fnMessageCallback,
-        fnClientConnectionCallback
-    ) {
-        return new Promise((fnResolve, fnReject) => {
-            oClientData = {
-                fnMessageCallback: fnMessageCallback,
-                fnClientConnectionCallback: fnClientConnectionCallback
-            };
+    MessageBrokerProxy.prototype.subscribe = async function (sClientId, aSubscribedChannels, fnMessageCallback, fnClientConnectionCallback) {
+        return this.oCallbackQueue.push(async () => {
+            if (
+                typeof sClientId !== "string"
+                || !sClientId.length
+                || !aSubscribedChannels.length
+                || typeof fnMessageCallback !== "function"
+            ) {
+                throw new Error(`Cannot subscribe client '${sClientId}': Missing required parameter(s)`);
+            }
 
-            AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
+            if (typeof fnClientConnectionCallback === "function") {
+                // eslint-disable-next-line max-len
+                this._oLogger.error(`The 'fnClientConnectionCallback' parameter was provided by client '${sClientId}'. This parameter is deprecated and should be provided as part of the connect() call`);
+            }
+
+            const oClient = this._mClientData.get(sClientId);
+
+            if (!oClient) {
+                throw new Error(`Cannot subscribe client '${sClientId}': Client is not connected`);
+            }
+
+            await AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
                 channelId: "sap.ushell.MessageBroker",
                 clientId: sClientId,
                 messageName: "subscribe",
                 subscribedChannels: aSubscribedChannels
-            }).then(fnResolve).catch(fnReject);
+            });
+
+            aSubscribedChannels.forEach((oChannel) => oClient.subscribe(oChannel.channelId, fnMessageCallback));
+
+            if (fnClientConnectionCallback) {
+                oClient.setClientConnectionCallback(fnClientConnectionCallback);
+            }
         });
     };
 
-    MessageBrokerProxy.prototype.unsubscribe = function (sClientId, aUnsubscribedChannels) {
-        return new Promise((fnResolve, fnReject) => {
-            oClientData = {};
-            AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
+    MessageBrokerProxy.prototype.unsubscribe = async function (sClientId, aUnsubscribedChannels) {
+        return this.oCallbackQueue.push(async () => {
+            if (
+                typeof sClientId !== "string"
+                || !sClientId.length
+                || !Array.isArray(aUnsubscribedChannels)
+                || !aUnsubscribedChannels.length
+            ) {
+                throw new Error(`Cannot unsubscribe client '${sClientId}': Missing required parameter(s)`);
+            }
+
+            const oClient = this._mClientData.get(sClientId);
+
+            if (!oClient) {
+                throw new Error(`Cannot subscribe client '${sClientId}': Client is not connected`);
+            }
+
+            await AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
                 channelId: "sap.ushell.MessageBroker",
                 clientId: sClientId,
                 messageName: "unsubscribe",
                 subscribedChannels: aUnsubscribedChannels
-            }).then(fnResolve).catch(fnReject);
+            });
+
+            aUnsubscribedChannels.forEach((oChannel) => oClient.subscribe(oChannel.channelId, undefined));
         });
     };
 
-    MessageBrokerProxy.prototype.publish = function (
-        sChannelId,
-        sClientId,
-        sMessageId,
-        sMessageName,
-        aTargetClientIds,
-        data
-    ) {
-        return new Promise((fnResolve, fnReject) => {
+    MessageBrokerProxy.prototype.publish = async function (sChannelId, sClientId, sMessageId, sMessageName, vTargetClientIds, oData) {
+        return this.oCallbackQueue.push(async () => {
+            if (typeof sMessageName === "string" && (Array.isArray(vTargetClientIds) || vTargetClientIds === ClientAlias.AllClients)) {
+                this._oLogger.error(`The parameter 'sMessageId' was provided by client '${sClientId}'. It is deprecated and should not be provided`);
+            } else {
+                // do remapping
+                oData = vTargetClientIds;
+                vTargetClientIds = sMessageName;
+                sMessageName = sMessageId;
+                sMessageId = undefined;
+            }
+
+            let aTargetClientIds;
+            if (vTargetClientIds === ClientAlias.AllClients) {
+                aTargetClientIds = [ClientAlias.AllClients];
+            } else {
+                aTargetClientIds = [...vTargetClientIds];
+            }
+
+            // do not await, because it does not respond!
             AppCommunicationMgr.postMessageToFLP("sap.ushell.services.MessageBroker", {
                 clientId: sClientId,
                 channelId: sChannelId,
                 targetClientIds: aTargetClientIds,
                 messageName: sMessageName,
-                data: data
-            }, sMessageId).then(fnResolve).catch(fnReject);
+                data: oData
+            });
         });
     };
 
@@ -114,21 +194,40 @@ sap.ui.define([
         // should be empty in AppRuntime
     };
 
-    MessageBrokerProxy.prototype.handleMessage = function (oBody) {
-        return new Promise((fnResolve, fnReject) => {
-            switch (oBody.messageName) {
-                case "clientSubscribed":
-                case "clientUnsubscribed":
-                    oClientData.fnClientConnectionCallback(oBody.messageName, oBody.clientId, oBody.channels);
-                    break;
-                default:
-                    oClientData.fnMessageCallback(oBody.clientId, oBody.channelId, oBody.messageName, oBody.data);
-                    break;
+    MessageBrokerProxy.prototype.handleMessage = async function (oBody) {
+        return this.oCallbackQueue.push(async () => {
+            const oClient = this._mClientData.get(oBody.targetClientId);
+
+            if (!oClient) {
+                throw new Error(`Client '${oBody.targetClientId}' is not connected`);
+            }
+
+            if (["clientSubscribed", "clientUnsubscribed"].includes(oBody.messageName)) {
+                oClient.callClientConnectionCallback(
+                    oBody.messageName,
+                    oBody.clientId,
+                    oBody.channels
+                );
+                return { _noresponse_: true };
             }
-            fnResolve({ _noresponse_: true });
+
+            const fnMessageCallback = oClient.getMessageCallback(oBody.channelId);
+            if (!fnMessageCallback) {
+                throw new Error(`Client '${oBody.clientId}' is not subscribed to channel '${oBody.channelId}'`);
+            }
+
+            fnMessageCallback(
+                oBody.clientId,
+                oBody.channelId,
+                oBody.messageName,
+                oBody.data
+            );
+
+            return { _noresponse_: true };
         });
     };
 
     MessageBrokerProxy.hasNoAdapter = true;
+
     return MessageBrokerProxy;
-}, false);
+});

package/src/main/js/sap/ushell/appRuntime/ui5/services/NavTargetResolution.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.NavTargetResolution}.
  *
- * @version 1.140.0
+ * @version 1.141.1
  * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} for Navigation instead.
  */
 sap.ui.define([
@@ -74,7 +74,7 @@ sap.ui.define([
                     .fail(() => {
                         return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.NavTargetResolution.resolveHashFragment", {
                             sHashFragment: sHashFragment
-                        }).then(oDeferred.resolve, oDeferred.reject);
+                        }).then(oDeferred.resolve).catch(oDeferred.reject);
                     });
                 return oDeferred.promise();
             }

package/src/main/js/sap/ushell/appRuntime/ui5/services/NavTargetResolutionInternal.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.NavTargetResolutionInternal}.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/ushell/services/NavTargetResolutionInternal",
@@ -74,7 +74,7 @@ sap.ui.define([
                     .fail(() => {
                         return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.NavTargetResolutionInternal.resolveHashFragment", {
                             sHashFragment: sHashFragment
-                        }).then(oDeferred.resolve, oDeferred.reject);
+                        }).then(oDeferred.resolve).catch(oDeferred.reject);
                     });
                 return oDeferred.promise();
             }

package/src/main/js/sap/ushell/appRuntime/ui5/services/Navigation.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.Navigation}.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/ushell/services/Navigation",
@@ -101,39 +101,35 @@ sap.ui.define([
                 oLinkFilter: oLinkFilter
             });
         };
-
+        // ready also for scube
+        this._removeComponent = function (aArgsParam) {
+            aArgsParam.forEach((oElement) => {
+                if (oElement) {
+                    delete oElement.ui5Component;
+                }
+            });
+        };
         this.getLinksLocal = this.getLinks;
         this.getLinks = function (aLinkFilter = []) {
-            // ready also for scube
-            function removeComponent (oArgsParam) {
-                oArgsParam.forEach((element) => {
-                    if (element) {
-                        delete element.ui5Component;
-                    }
-                });
-            }
-
             if (!Array.isArray(aLinkFilter)) {
                 throw new Error("Unexpected Input: aLinkFilter has to be an array with plain objects!");
             }
 
             if (AppRuntimeContext.getIsScube()) {
-                this.getLinksLocal(aLinkFilter).then((arrResult1) => {
-                    removeComponent(aLinkFilter);
+                return this.getLinksLocal(aLinkFilter).then((aResultLocal) => {
+                    this._removeComponent(aLinkFilter);
                     return AppCommunicationMgr.postMessageToFLP(
                         "sap.ushell.services.Navigation.getLinks",
                         aLinkFilter
-                    ).then((arrResult2) => {
-                        if (arrResult1.length !== 0) {
-                            arrResult2 = arrResult2.concat(arrResult1);
-                        }
-                        return arrResult2;
+                    ).then((aResultFlp) => {
+                        return aResultLocal.map((_oLink, iIndex) => {
+                            return aResultFlp[iIndex].concat(aResultLocal[iIndex]);
+                        });
                     });
                 });
-            } else {
-                removeComponent(aLinkFilter);
-                return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.getLinks", aLinkFilter);
             }
+            this._removeComponent(aLinkFilter);
+            return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.getLinks", aLinkFilter);
         };
 
         this.getSemanticObjectsLocal = this.getSemanticObjects;

package/src/main/js/sap/ushell/appRuntime/ui5/services/ReferenceResolver.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ReferenceResolver}.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppCommunicationMgr"

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellNavigation.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ShellNavigation}.
  *
- * @version 1.140.0
+ * @version 1.141.1
  * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} for Navigation instead.
  */
 sap.ui.define([

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellNavigationInternal.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ShellNavigationInternal}.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/ushell/services/ShellNavigationInternal",

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellUIService.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.ui5service.ShellUIService}.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/appRuntime/ui5/services/UserInfo.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.UserInfo}.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
@@ -43,7 +43,7 @@ sap.ui.define([
             sap.ui.require(["sap/ushell/appRuntime/ui5/services/Container"], (Container) => {
                 AppCommunicationMgr.postMessageToFLP("sap.ushell.services.UserInfo.updateUserPreferences", {
                     language: Container.getUser().getLanguage()
-                }).then(oDeferred.resolve, oDeferred.reject);
+                }).then(oDeferred.resolve).catch(oDeferred.reject);
             });
 
             return oDeferred.promise();

package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/ContainerAdapter.js

@@ -120,11 +120,12 @@ sap.ui.define([
                     } else {
                         oDeferred.resolve();
                     }
-                } catch (e) {
+                } catch (oError) {
                     Log.error(
                         `logout from iframe ${document.URL} failed`,
-                        e,
-                        "sap.ushell.appRuntime.ui5.SessionHandlerAgent");
+                        oError,
+                        "sap.ushell.appRuntime.ui5.SessionHandlerAgent"
+                    );
                     oDeferred.resolve();
                 }
             }

package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/Ui5ComponentLoaderAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the application runtime platform
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
 ], () => {

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/FLPLoader.js

@@ -35,9 +35,7 @@ sap.ui.define([
          */
         loadComponentByComponentCreate: function (oStepConfig) {
             return Component.create(oStepConfig.oData).then(() => {
-                return Promise.resolve(oStepConfig.sStepName);
-            }, () => {
-                return Promise.reject(oStepConfig.sStepName);
+                return oStepConfig.sStepName;
             });
         },
 

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/logger.js

@@ -45,7 +45,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/state.js

@@ -71,7 +71,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/ushell/bootstrap/SchedulingAgent/logger",

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent.js

@@ -230,38 +230,37 @@ sap.ui.define([
                         this.oPathsLoading[oStepConfig.sStepName] = oPathLoadingPromise;
                         state.setForLoadingStep(oStepConfig.sStepName, state.id.loadingStep.InProgress, oStepConfig.oData.sPath, "byRequire step sent to FLP Loader");
                         const sStepName = oStepConfig.sStepName;
-                        oPathLoadingPromise.then(
-                            () => {
+                        oPathLoadingPromise
+                            .then(() => {
                                 /* eslint-disable */
                                 state.setForLoadingStep(sStepName, state.id.loadingStep.InProgress, "", "Step's promise has resolved");
                                 /* eslint-enable */
                                 delete this.oPathsLoading[sStepName];
                                 EventHub.emit("StepDone", sStepName);
-                            },
-                            () => {
+                            })
+                            .catch(() => {
                                 /* eslint-disable */
-                                state.setForLoadingStep(sStepName, state.id.loadingStep.FatalError, "", "Step's promise failed");
-                                /* eslint-enable */
+                                    state.setForLoadingStep(sStepName, state.id.loadingStep.FatalError, "", "Step's promise failed");
+                                    /* eslint-enable */
                                 delete this.oPathsLoading[sStepName];
                                 EventHub.emit("StepFailed", sStepName);
-                            }
-                        );
+                            });
                     } else if (oStepConfig.sStepType === oLoadingModes.BY_COMPONENT_CREATE) {
                         const oPromise = FLPLoader.loadComponentByComponentCreate(oStepConfig);
-                        this.oComponentsLoading[oStepConfig.sStepName] = oPromise;
-                        state.setForLoadingStep(oStepConfig.sStepName, state.id.loadingStep.InProgress, oStepConfig.oData, "byComponentCreate step sent to FLP Loader");
-                        oPromise.then(
-                            (sLoadedStepName) => {
-                                state.setForLoadingStep(sLoadedStepName, state.id.loadingStep.InProgress, "", "Step's promise has resolved");
-                                delete this.oComponentsLoading[sLoadedStepName];
-                                EventHub.emit("StepDone", sLoadedStepName);
-                            },
-                            (sLoadedStepName) => {
-                                state.setForLoadingStep(sLoadedStepName, state.id.loadingStep.FatalError, "", "Step's promise failed");
-                                delete this.oComponentsLoading[sLoadedStepName];
-                                EventHub.emit("StepFailed", sLoadedStepName);
-                            }
-                        );
+                        const sStepName = oStepConfig.sStepName;
+                        this.oComponentsLoading[sStepName] = oPromise;
+                        state.setForLoadingStep(sStepName, state.id.loadingStep.InProgress, oStepConfig.oData, "byComponentCreate step sent to FLP Loader");
+                        oPromise
+                            .then(() => {
+                                state.setForLoadingStep(sStepName, state.id.loadingStep.InProgress, "", "Step's promise has resolved");
+                                delete this.oComponentsLoading[sStepName];
+                                EventHub.emit("StepDone", sStepName);
+                            })
+                            .catch(() => {
+                                state.setForLoadingStep(sStepName, state.id.loadingStep.FatalError, "", "Step's promise failed");
+                                delete this.oComponentsLoading[sStepName];
+                                EventHub.emit("StepFailed", sStepName);
+                            });
                     }
                 }
             } while (oNextStep.sStatus !== oStatusDefinitions.WAIT);

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

@@ -4,7 +4,7 @@
  * @fileOverview Configure the UI5Settings for Date and Time Format for the 'CDM'
  *               platform.
  *
- * @version 1.140.0
+ * @version 1.141.1
  */
 sap.ui.define([
     "sap/base/i18n/Formatting",
@@ -33,15 +33,15 @@ sap.ui.define([
         try {
             const sSapDateFormat = oUserProfileDefaults && oUserProfileDefaults.sapDateFormat;
             Formatting.setABAPDateFormat(sSapDateFormat);
-        } catch (e) {
-            Log.error(sMessageDate, e.stack, "sap/ushell/bootstrap/common/common.configure.ui5datetimeformat");
+        } catch (oError) {
+            Log.error(sMessageDate, oError, "sap/ushell/bootstrap/common/common.configure.ui5datetimeformat");
         }
 
         try {
             const sSapTimeFormat = oUserProfileDefaults && oUserProfileDefaults.sapTimeFormat;
             Formatting.setABAPTimeFormat(sSapTimeFormat);
-        } catch (e) {
-            Log.error(sMessageTime, e.stack, "sap/ushell/bootstrap/common/common.configure.ui5datetimeformat");
+        } catch (oError) {
+            Log.error(sMessageTime, oError, "sap/ushell/bootstrap/common/common.configure.ui5datetimeformat");
         }
     }
 

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

@@ -15,7 +15,7 @@ sap.ui.define([
         try {
             sStoredSapUiDebugValue = window.localStorage.getItem(oConstants.uiDebugKey);
             bDebugSources = !!sStoredSapUiDebugValue && /^(true|x|X)$/.test(sStoredSapUiDebugValue);
-        } catch (e) {
+        } catch {
             // comment just to benefit eslint
         }
     }

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

@@ -4,9 +4,14 @@
  * Besides that <code>loaded</code> indicates if core-min bundles have been loaded - or not.
  */
 sap.ui.define([
+    "sap/base/Log",
     "./common.debug.mode",
     "./common.load.script"
-], (oDebugMode, oScriptLoader) => {
+], (
+    Log,
+    oDebugMode,
+    oScriptLoader
+) => {
     "use strict";
 
     const coreMinLoader = {};
@@ -30,13 +35,20 @@ sap.ui.define([
             throw new Error("Mandatory preload bundle configuration is not provided");
         }
 
-        if (oDebugMode.isDebug()) {
+        if (oDebugMode.isDebug() || oPreloadBundleConfig.enabled === false) {
+            if (oPreloadBundleConfig.enabled === false) {
+                Log.error("Disabling the custom preload bundles is not yet supported and might fail.");
+            }
+
             // 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"], (core) => {
                 core.boot();
             });
+
+            // do not continue with bundle loading
+            return;
         }
 
         if (oPreloadBundleConfig.enabled === false) {

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

@@ -22,7 +22,7 @@ sap.ui.define([], () => {
                 oEvent.target.removeEventListener("load", listener);
                 oEvent.target.removeEventListener("error", listener);
                 if (oEvent.type === "error") {
-                    reject();
+                    reject(new Error(`Failed to load script: ${sFilePath}`));
                 }
                 resolve();
             }