i18next-http-middleware 3.9.9 → 3.9.10

package/cjs/index.js

@@ -258,17 +258,27 @@ function getResourcesHandler(i18next) {
         i18next.options.ns.push(ns);
       }
     });
+    var loaded = false;
+    var onLoaded;
     i18next.services.backendConnector.load(languages, namespaces, function () {
       languages.forEach(function (lng) {
         namespaces.forEach(function (ns) {
           utils.setPath(resources, [lng, ns], i18next.getResourceBundle(lng, ns));
         });
       });
+      loaded = true;
+      if (onLoaded) onLoaded();
     });
-    if (typeof Response !== 'undefined' && res.constructor === Response && typeof JSON !== 'undefined') {
-      return options.send(res, JSON.stringify(resources));
-    }
-    return options.send(res, resources);
+    var sendResources = function sendResources() {
+      if (typeof Response !== 'undefined' && res.constructor === Response && typeof JSON !== 'undefined') {
+        return options.send(res, JSON.stringify(resources));
+      }
+      return options.send(res, resources);
+    };
+    if (loaded) return sendResources();
+    return new Promise(function (resolve) {
+      onLoaded = resolve;
+    }).then(sendResources);
   };
 }
 function missingKeyHandler(i18next) {

package/esm/index.js

@@ -241,17 +241,27 @@ export function getResourcesHandler(i18next) {
         i18next.options.ns.push(ns);
       }
     });
+    var loaded = false;
+    var onLoaded;
     i18next.services.backendConnector.load(languages, namespaces, function () {
       languages.forEach(function (lng) {
         namespaces.forEach(function (ns) {
           utils.setPath(resources, [lng, ns], i18next.getResourceBundle(lng, ns));
         });
       });
+      loaded = true;
+      if (onLoaded) onLoaded();
     });
-    if (typeof Response !== 'undefined' && res.constructor === Response && typeof JSON !== 'undefined') {
-      return options.send(res, JSON.stringify(resources));
-    }
-    return options.send(res, resources);
+    var sendResources = function sendResources() {
+      if (typeof Response !== 'undefined' && res.constructor === Response && typeof JSON !== 'undefined') {
+        return options.send(res, JSON.stringify(resources));
+      }
+      return options.send(res, resources);
+    };
+    if (loaded) return sendResources();
+    return new Promise(function (resolve) {
+      onLoaded = resolve;
+    }).then(sendResources);
   };
 }
 export function missingKeyHandler(i18next) {

package/lib/index.js

@@ -272,6 +272,8 @@ export function getResourcesHandler (i18next, options = {}) {
       }
     })
 
+    let loaded = false
+    let onLoaded
     i18next.services.backendConnector.load(languages, namespaces, function () {
       languages.forEach(lng => {
         namespaces.forEach(ns => {
@@ -282,14 +284,22 @@ export function getResourcesHandler (i18next, options = {}) {
           )
         })
       })
+      loaded = true
+      if (onLoaded) onLoaded()
     })
 
-    if (typeof Response !== 'undefined' &&
-        res.constructor === Response &&
-        typeof JSON !== 'undefined') {
-      return options.send(res, JSON.stringify(resources))
+    const sendResources = () => {
+      if (typeof Response !== 'undefined' &&
+          res.constructor === Response &&
+          typeof JSON !== 'undefined') {
+        return options.send(res, JSON.stringify(resources))
+      }
+      return options.send(res, resources)
     }
-    return options.send(res, resources)
+
+    if (loaded) return sendResources()
+    // an async backend calls back after load() returned, so send once it did
+    return new Promise(resolve => { onLoaded = resolve }).then(sendResources)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-http-middleware",
-  "version": "3.9.9",
+  "version": "3.9.10",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",