@social-mail/social-mail-client 1.2.88 → 1.2.89

package/dist/web/AppIndex.pack.js

@@ -1828,6 +1828,9 @@ class System {
                 setup = importsOrSetup;
             }
             const module = instance.get(name);
+            if (module.isLoaded) {
+                return;
+            }
             module.dependencies.push(...imports.map((x) => instance.get(module.require.resolve(x))));
             module.isLoaded = true;
             const postResolve = new Promise((resolve, reject) => {
@@ -1928,17 +1931,12 @@ class UMDClass {
                 AmdLoader.instance.get(path);
                 const m = yield this.load(this.defaultApp, designMode);
                 const app = ((_a = globalNS.webApp) !== null && _a !== void 0 ? _a : (globalNS.webApp = new (m.default)()));
-                app.onReady(() => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        const viewClass = yield AmdLoader.instance.import(path);
-                        const view = new (viewClass.default)(app);
-                        const element = typeof id === "string" ? document.getElementById(id) : id;
-                        element.appendChild(view.element);
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                }));
+                yield app.initPromise;
+                const viewClass = yield AmdLoader.instance.import(path);
+                const view = new (viewClass.default)(app);
+                const element = typeof id === "string" ? document.getElementById(id) : id;
+                element.appendChild(view.element);
+                return view;
             }
             catch (e) {
                 console.error(e);
@@ -1947,26 +1945,18 @@ class UMDClass {
     }
     loadView(path, designMode, appPath) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             try {
                 this.mock = designMode;
                 appPath = appPath || this.defaultApp;
                 AmdLoader.instance.get(path);
                 const m = yield this.load(appPath, designMode);
-                const app = new (m.default)();
-                return yield new Promise((resolve, reject) => {
-                    app.onReady(() => __awaiter(this, void 0, void 0, function* () {
-                        try {
-                            const viewClass = yield AmdLoader.instance.import(path);
-                            const view = new (viewClass.default)(app);
-                            app.root = view;
-                            resolve(view);
-                        }
-                        catch (e) {
-                            console.error(e);
-                            reject(e);
-                        }
-                    }));
-                });
+                const app = ((_a = globalNS.webApp) !== null && _a !== void 0 ? _a : (globalNS.webApp = new (m.default)()));
+                yield app.initPromise;
+                const viewClass = yield AmdLoader.instance.import(path);
+                const view = new (viewClass.default)(app);
+                app.root = view;
+                return view;
             }
             catch (er) {
                 console.error(er);
@@ -28517,6 +28507,9 @@ System.register(["../App", "../core/AtomOnce", "../core/AtomUri", "../di/Service
               this.url = new AtomUri(location.href);
             });
           });
+          this.initPromise = new Promise((resolve, reject) => {
+            this.onReady(resolve);
+          });
         }
         updateDefaultStyle(textContent) {
           if (this.styleElement) {