@nectary/components 5.14.4 → 5.14.5

package/bundle.ts

@@ -1,4 +1,5 @@
 // Reminder: Keep this list updated as we add new components
+
 export * from './accordion-item/index.js'
 export * from './accordion/index.js'
 export * from './action-menu-option/index.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nectary/components",
-  "version": "5.14.4",
+  "version": "5.14.5",
   "files": [
     "**/*/*.css",
     "**/*/*.json",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.22.15",
-    "@nectary/assets": "3.4.0"
+    "@nectary/assets": "3.4.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.22.15",

package/utils/shared/global-elements-manager.js

@@ -43,27 +43,39 @@ class GlobalElementsManager {
     const store = getStore(this.config.storeKey);
     const importPath = this.getImportPath(store.cdnUrl, modulePath);
     const fallbackImportPath = this.getImportPath(store.fallbackCdnUrl, modulePath);
-    try {
-      const module = await import(
+    const promises = [
+      import(
         /* webpackIgnore: true */
         importPath
+      )
+    ];
+    let timeoutId = null;
+    const FALLBACK_DELAY_MS = 2e3;
+    if (fallbackImportPath !== null) {
+      promises.push(
+        new Promise((resolve) => {
+          timeoutId = setTimeout(() => resolve(import(
+            /* webpackIgnore: true */
+            fallbackImportPath
+          )), FALLBACK_DELAY_MS);
+        })
       );
+    }
+    try {
+      const module = await Promise.any(promises);
+      if (timeoutId !== null) {
+        clearTimeout(timeoutId);
+      }
       return module;
     } catch (error) {
-      if (fallbackImportPath !== null) {
-        try {
-          const fallbackModule = await import(
-            /* webpackIgnore: true */
-            fallbackImportPath
-          );
-          return fallbackModule;
-        } catch (fallbackError) {
-          console.error(`Nectary Primary load failed: ${importPath}`, error);
-          console.error(`Nectary fallback load failed: ${fallbackImportPath}`, fallbackError);
-          throw fallbackError;
+      if (error instanceof AggregateError) {
+        console.error(`Nectary Primary load failed: ${importPath}`, error.errors[0]);
+        if (fallbackImportPath !== null) {
+          console.error(`Nectary fallback load failed: ${fallbackImportPath}`, error.errors[1]);
         }
+      } else {
+        console.error(`Nectary failed to load module: ${importPath}`, error);
       }
-      console.error(`Nectary failed to load module: ${importPath}`, error);
       throw error;
     }
   }