@spscommerce/i18n 3.12.3 → 3.15.4

package/lib/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./localize";
-export * from "./SpsLanguage";
-export * from "./useSpsLanguage";
+export * from './localize';
+export * from './SpsLanguage';
+export * from './useSpsLanguage';

package/lib/index.esm.js

@@ -44,23 +44,23 @@ function __rest(s, e) {
     return t;
 }
 
-function _typeof$3(obj) {
+function _typeof$2(obj) {
   "@babel/helpers - typeof";
 
   if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-    _typeof$3 = function _typeof(obj) {
+    _typeof$2 = function _typeof(obj) {
       return typeof obj;
     };
   } else {
-    _typeof$3 = function _typeof(obj) {
+    _typeof$2 = function _typeof(obj) {
       return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
     };
   }
 
-  return _typeof$3(obj);
+  return _typeof$2(obj);
 }
 
-function _defineProperty$2(obj, key, value) {
+function _defineProperty$1(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
       value: value,
@@ -87,20 +87,20 @@ function _objectSpread$3(target) {
     }
 
     ownKeys.forEach(function (key) {
-      _defineProperty$2(target, key, source[key]);
+      _defineProperty$1(target, key, source[key]);
     });
   }
 
   return target;
 }
 
-function _classCallCheck$3(instance, Constructor) {
+function _classCallCheck$1(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
     throw new TypeError("Cannot call a class as a function");
   }
 }
 
-function _defineProperties$3(target, props) {
+function _defineProperties$1(target, props) {
   for (var i = 0; i < props.length; i++) {
     var descriptor = props[i];
     descriptor.enumerable = descriptor.enumerable || false;
@@ -110,9 +110,9 @@ function _defineProperties$3(target, props) {
   }
 }
 
-function _createClass$3(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties$3(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties$3(Constructor, staticProps);
+function _createClass$1(Constructor, protoProps, staticProps) {
+  if (protoProps) _defineProperties$1(Constructor.prototype, protoProps);
+  if (staticProps) _defineProperties$1(Constructor, staticProps);
   return Constructor;
 }
 
@@ -125,7 +125,7 @@ function _assertThisInitialized(self) {
 }
 
 function _possibleConstructorReturn(self, call) {
-  if (call && (_typeof$3(call) === "object" || typeof call === "function")) {
+  if (call && (_typeof$2(call) === "object" || typeof call === "function")) {
     return call;
   }
 
@@ -183,12 +183,12 @@ var Logger = function () {
   function Logger(concreteLogger) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-    _classCallCheck$3(this, Logger);
+    _classCallCheck$1(this, Logger);
 
     this.init(concreteLogger, options);
   }
 
-  _createClass$3(Logger, [{
+  _createClass$1(Logger, [{
     key: "init",
     value: function init(concreteLogger) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -261,12 +261,12 @@ var baseLogger = new Logger();
 
 var EventEmitter = function () {
   function EventEmitter() {
-    _classCallCheck$3(this, EventEmitter);
+    _classCallCheck$1(this, EventEmitter);
 
     this.observers = {};
   }
 
-  _createClass$3(EventEmitter, [{
+  _createClass$1(EventEmitter, [{
     key: "on",
     value: function on(events, listener) {
       var _this = this;
@@ -355,7 +355,12 @@ function getLastOfPath(object, path, Empty) {
     if (canNotTraverseDeeper()) return {};
     var key = cleanKey(stack.shift());
     if (!object[key] && Empty) object[key] = new Empty();
-    object = object[key];
+
+    if (Object.prototype.hasOwnProperty.call(object, key)) {
+      object = object[key];
+    } else {
+      object = {};
+    }
   }
 
   if (canNotTraverseDeeper()) return {};
@@ -448,7 +453,7 @@ var ResourceStore = function (_EventEmitter) {
       defaultNS: 'translation'
     };
 
-    _classCallCheck$3(this, ResourceStore);
+    _classCallCheck$1(this, ResourceStore);
 
     _this = _possibleConstructorReturn(this, _getPrototypeOf(ResourceStore).call(this));
 
@@ -466,7 +471,7 @@ var ResourceStore = function (_EventEmitter) {
     return _this;
   }
 
-  _createClass$3(ResourceStore, [{
+  _createClass$1(ResourceStore, [{
     key: "addNamespaces",
     value: function addNamespaces(ns) {
       if (this.options.ns.indexOf(ns) < 0) {
@@ -622,7 +627,7 @@ var Translator = function (_EventEmitter) {
 
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-    _classCallCheck$3(this, Translator);
+    _classCallCheck$1(this, Translator);
 
     _this = _possibleConstructorReturn(this, _getPrototypeOf(Translator).call(this));
 
@@ -641,7 +646,7 @@ var Translator = function (_EventEmitter) {
     return _this;
   }
 
-  _createClass$3(Translator, [{
+  _createClass$1(Translator, [{
     key: "changeLanguage",
     value: function changeLanguage(lng) {
       if (lng) this.language = lng;
@@ -689,7 +694,7 @@ var Translator = function (_EventEmitter) {
     value: function translate(keys, options, lastKey) {
       var _this2 = this;
 
-      if (_typeof$3(options) !== 'object' && this.options.overloadTranslationOptionHandler) {
+      if (_typeof$2(options) !== 'object' && this.options.overloadTranslationOptionHandler) {
         options = this.options.overloadTranslationOptionHandler(arguments);
       }
 
@@ -733,21 +738,21 @@ var Translator = function (_EventEmitter) {
 
         if (keySeparator) {
           var resTypeIsArray = resType === '[object Array]';
-          var copy$$1 = resTypeIsArray ? [] : {};
+          var copy = resTypeIsArray ? [] : {};
           var newKeyToUse = resTypeIsArray ? resExactUsedKey : resUsedKey;
 
           for (var m in res) {
             if (Object.prototype.hasOwnProperty.call(res, m)) {
               var deepKey = "".concat(newKeyToUse).concat(keySeparator).concat(m);
-              copy$$1[m] = this.translate(deepKey, _objectSpread$3({}, options, {
+              copy[m] = this.translate(deepKey, _objectSpread$3({}, options, {
                 joinArrays: false,
                 ns: namespaces
               }));
-              if (copy$$1[m] === deepKey) copy$$1[m] = res[m];
+              if (copy[m] === deepKey) copy[m] = res[m];
             }
           }
 
-          res = copy$$1;
+          res = copy;
         }
       } else if (handleAsObjectInI18nFormat && typeof joinArrays === 'string' && resType === '[object Array]') {
         res = res.join(joinArrays);
@@ -755,16 +760,14 @@ var Translator = function (_EventEmitter) {
       } else {
         var usedDefault = false;
         var usedKey = false;
+        var needsPluralHandling = options.count !== undefined && typeof options.count !== 'string';
+        var hasDefaultValue = Translator.hasDefaultValue(options);
+        var defaultValueSuffix = needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count) : '';
+        var defaultValue = options["defaultValue".concat(defaultValueSuffix)] || options.defaultValue;
 
-        if (!this.isValidLookup(res) && options.defaultValue !== undefined) {
+        if (!this.isValidLookup(res) && hasDefaultValue) {
           usedDefault = true;
-
-          if (options.count !== undefined) {
-            var suffix = this.pluralResolver.getSuffix(lng, options.count);
-            res = options["defaultValue".concat(suffix)];
-          }
-
-          if (!res) res = options.defaultValue;
+          res = defaultValue;
         }
 
         if (!this.isValidLookup(res)) {
@@ -772,10 +775,10 @@ var Translator = function (_EventEmitter) {
           res = key;
         }
 
-        var updateMissing = options.defaultValue && options.defaultValue !== res && this.options.updateMissing;
+        var updateMissing = hasDefaultValue && defaultValue !== res && this.options.updateMissing;
 
         if (usedKey || usedDefault || updateMissing) {
-          this.logger.log(updateMissing ? 'updateKey' : 'missingKey', lng, namespace, key, updateMissing ? options.defaultValue : res);
+          this.logger.log(updateMissing ? 'updateKey' : 'missingKey', lng, namespace, key, updateMissing ? defaultValue : res);
 
           if (keySeparator) {
             var fk = this.resolve(key, _objectSpread$3({}, options, {
@@ -797,29 +800,25 @@ var Translator = function (_EventEmitter) {
             lngs.push(options.lng || this.language);
           }
 
-          var send = function send(l, k) {
+          var send = function send(l, k, fallbackValue) {
             if (_this2.options.missingKeyHandler) {
-              _this2.options.missingKeyHandler(l, namespace, k, updateMissing ? options.defaultValue : res, updateMissing, options);
+              _this2.options.missingKeyHandler(l, namespace, k, updateMissing ? fallbackValue : res, updateMissing, options);
             } else if (_this2.backendConnector && _this2.backendConnector.saveMissing) {
-              _this2.backendConnector.saveMissing(l, namespace, k, updateMissing ? options.defaultValue : res, updateMissing, options);
+              _this2.backendConnector.saveMissing(l, namespace, k, updateMissing ? fallbackValue : res, updateMissing, options);
             }
 
             _this2.emit('missingKey', l, namespace, k, res);
           };
 
           if (this.options.saveMissing) {
-            var needsPluralHandling = options.count !== undefined && typeof options.count !== 'string';
-
             if (this.options.saveMissingPlurals && needsPluralHandling) {
-              lngs.forEach(function (l) {
-                var plurals = _this2.pluralResolver.getPluralFormsOfKey(l, key);
-
-                plurals.forEach(function (p) {
-                  return send([l], p);
+              lngs.forEach(function (language) {
+                _this2.pluralResolver.getSuffixes(language).forEach(function (suffix) {
+                  send([language], key + suffix, options["defaultValue".concat(suffix)] || defaultValue);
                 });
               });
             } else {
-              send(lngs, key);
+              send(lngs, key, defaultValue);
             }
           }
         }
@@ -970,6 +969,19 @@ var Translator = function (_EventEmitter) {
       if (this.i18nFormat && this.i18nFormat.getResource) return this.i18nFormat.getResource(code, ns, key, options);
       return this.resourceStore.getResource(code, ns, key, options);
     }
+  }], [{
+    key: "hasDefaultValue",
+    value: function hasDefaultValue(options) {
+      var prefix = 'defaultValue';
+
+      for (var option in options) {
+        if (Object.prototype.hasOwnProperty.call(options, option) && prefix === option.substring(0, prefix.length) && undefined !== options[option]) {
+          return true;
+        }
+      }
+
+      return false;
+    }
   }]);
 
   return Translator;
@@ -981,7 +993,7 @@ function capitalize(string) {
 
 var LanguageUtil = function () {
   function LanguageUtil(options) {
-    _classCallCheck$3(this, LanguageUtil);
+    _classCallCheck$1(this, LanguageUtil);
 
     this.options = options;
     this.whitelist = this.options.supportedLngs || false;
@@ -989,7 +1001,7 @@ var LanguageUtil = function () {
     this.logger = baseLogger.create('languageUtils');
   }
 
-  _createClass$3(LanguageUtil, [{
+  _createClass$1(LanguageUtil, [{
     key: "getScriptPartFromCode",
     value: function getScriptPartFromCode(code) {
       if (!code || code.indexOf('-') < 0) return null;
@@ -1132,7 +1144,7 @@ var LanguageUtil = function () {
 }();
 
 var sets = [{
-  lngs: ['ach', 'ak', 'am', 'arn', 'br', 'fil', 'gun', 'ln', 'mfe', 'mg', 'mi', 'oc', 'pt', 'pt-BR', 'tg', 'ti', 'tr', 'uz', 'wa'],
+  lngs: ['ach', 'ak', 'am', 'arn', 'br', 'fil', 'gun', 'ln', 'mfe', 'mg', 'mi', 'oc', 'pt', 'pt-BR', 'tg', 'tl', 'ti', 'tr', 'uz', 'wa'],
   nr: [1, 2],
   fc: 1
 }, {
@@ -1310,7 +1322,7 @@ var PluralResolver = function () {
   function PluralResolver(languageUtils) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-    _classCallCheck$3(this, PluralResolver);
+    _classCallCheck$1(this, PluralResolver);
 
     this.languageUtils = languageUtils;
     this.options = options;
@@ -1318,7 +1330,7 @@ var PluralResolver = function () {
     this.rules = createRules();
   }
 
-  _createClass$3(PluralResolver, [{
+  _createClass$1(PluralResolver, [{
     key: "addRule",
     value: function addRule(lng, obj) {
       this.rules[lng] = obj;
@@ -1337,17 +1349,24 @@ var PluralResolver = function () {
   }, {
     key: "getPluralFormsOfKey",
     value: function getPluralFormsOfKey(code, key) {
+      return this.getSuffixes(code).map(function (suffix) {
+        return key + suffix;
+      });
+    }
+  }, {
+    key: "getSuffixes",
+    value: function getSuffixes(code) {
       var _this = this;
 
-      var ret = [];
       var rule = this.getRule(code);
-      if (!rule) return ret;
-      rule.numbers.forEach(function (n) {
-        var suffix = _this.getSuffix(code, n);
 
-        ret.push("".concat(key).concat(suffix));
+      if (!rule) {
+        return [];
+      }
+
+      return rule.numbers.map(function (number) {
+        return _this.getSuffix(code, number);
       });
-      return ret;
     }
   }, {
     key: "getSuffix",
@@ -1397,7 +1416,7 @@ var Interpolator = function () {
   function Interpolator() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-    _classCallCheck$3(this, Interpolator);
+    _classCallCheck$1(this, Interpolator);
 
     this.logger = baseLogger.create('interpolator');
     this.options = options;
@@ -1409,7 +1428,7 @@ var Interpolator = function () {
     this.init(options);
   }
 
-  _createClass$3(Interpolator, [{
+  _createClass$1(Interpolator, [{
     key: "init",
     value: function init() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -1611,7 +1630,7 @@ var Connector = function (_EventEmitter) {
 
     var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
 
-    _classCallCheck$3(this, Connector);
+    _classCallCheck$1(this, Connector);
 
     _this = _possibleConstructorReturn(this, _getPrototypeOf(Connector).call(this));
 
@@ -1635,7 +1654,7 @@ var Connector = function (_EventEmitter) {
     return _this;
   }
 
-  _createClass$3(Connector, [{
+  _createClass$1(Connector, [{
     key: "queueLoad",
     value: function queueLoad(languages, namespaces, options, callback) {
       var _this2 = this;
@@ -1861,11 +1880,11 @@ function get() {
     appendNamespaceToCIMode: false,
     overloadTranslationOptionHandler: function handle(args) {
       var ret = {};
-      if (_typeof$3(args[1]) === 'object') ret = args[1];
+      if (_typeof$2(args[1]) === 'object') ret = args[1];
       if (typeof args[1] === 'string') ret.defaultValue = args[1];
       if (typeof args[2] === 'string') ret.tDescription = args[2];
 
-      if (_typeof$3(args[2]) === 'object' || _typeof$3(args[3]) === 'object') {
+      if (_typeof$2(args[2]) === 'object' || _typeof$2(args[3]) === 'object') {
         var options = args[3] || args[2];
         Object.keys(options).forEach(function (key) {
           ret[key] = options[key];
@@ -1926,7 +1945,7 @@ var I18n = function (_EventEmitter) {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var callback = arguments.length > 1 ? arguments[1] : undefined;
 
-    _classCallCheck$3(this, I18n);
+    _classCallCheck$1(this, I18n);
 
     _this = _possibleConstructorReturn(this, _getPrototypeOf(I18n).call(this));
 
@@ -1956,7 +1975,7 @@ var I18n = function (_EventEmitter) {
     return _this;
   }
 
-  _createClass$3(I18n, [{
+  _createClass$1(I18n, [{
     key: "init",
     value: function init() {
       var _this2 = this;
@@ -2041,6 +2060,11 @@ var I18n = function (_EventEmitter) {
         });
       }
 
+      if (this.options.fallbackLng && !this.services.languageDetector && !this.options.lng) {
+        var codes = this.services.languageUtils.getFallbackCodes(this.options.fallbackLng);
+        if (codes.length > 0 && codes[0] !== 'dev') this.options.lng = codes[0];
+      }
+
       if (!this.services.languageDetector && !this.options.lng) {
         this.logger.warn('init: no languageDetector is used and no lng is defined');
       }
@@ -2066,7 +2090,8 @@ var I18n = function (_EventEmitter) {
       var deferred = defer();
 
       var load = function load() {
-        _this2.changeLanguage(_this2.options.lng, function (err, t) {
+        var finish = function finish(err, t) {
+          if (_this2.isInitialized) _this2.logger.warn('init: i18next is already initialized. You should call init just once!');
           _this2.isInitialized = true;
           if (!_this2.options.isClone) _this2.logger.log('initialized', _this2.options);
 
@@ -2074,7 +2099,11 @@ var I18n = function (_EventEmitter) {
 
           deferred.resolve(t);
           callback(err, t);
-        });
+        };
+
+        if (_this2.languages && _this2.options.compatibilityAPI !== 'v1' && !_this2.isInitialized) return finish(null, _this2.t.bind(_this2));
+
+        _this2.changeLanguage(_this2.options.lng, finish);
       };
 
       if (this.options.resources || !this.options.initImmediate) {
@@ -2243,7 +2272,7 @@ var I18n = function (_EventEmitter) {
       var fixedT = function fixedT(key, opts) {
         var options;
 
-        if (_typeof$3(opts) !== 'object') {
+        if (_typeof$2(opts) !== 'object') {
           for (var _len3 = arguments.length, rest = new Array(_len3 > 2 ? _len3 - 2 : 0), _key3 = 2; _key3 < _len3; _key3++) {
             rest[_key3 - 2] = arguments[_key3];
           }
@@ -2427,27 +2456,6 @@ var I18n = function (_EventEmitter) {
 
 var i18next = new I18n();
 
-var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
-function getAugmentedNamespace(n) {
-	if (n.__esModule) return n;
-	var a = Object.defineProperty({}, '__esModule', {value: true});
-	Object.keys(n).forEach(function (k) {
-		var d = Object.getOwnPropertyDescriptor(n, k);
-		Object.defineProperty(a, k, d.get ? d : {
-			enumerable: true,
-			get: function () {
-				return n[k];
-			}
-		});
-	});
-	return a;
-}
-
-function commonjsRequire (path) {
-	throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
-}
-
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
@@ -2463,13 +2471,9 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   return target;
 }
 
-var objectWithoutPropertiesLoose$1 = _objectWithoutPropertiesLoose;
-
-var objectWithoutPropertiesLoose = objectWithoutPropertiesLoose$1;
-
 function _objectWithoutProperties(source, excluded) {
   if (source == null) return {};
-  var target = objectWithoutPropertiesLoose(source, excluded);
+  var target = _objectWithoutPropertiesLoose(source, excluded);
   var key, i;
 
   if (Object.getOwnPropertySymbols) {
@@ -2486,51 +2490,33 @@ function _objectWithoutProperties(source, excluded) {
   return target;
 }
 
-var objectWithoutProperties = _objectWithoutProperties;
-
-function _typeof$1(obj) {
-  "@babel/helpers - typeof";
-
-  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-    _typeof_1 = _typeof$1 = function _typeof(obj) {
-      return typeof obj;
-    };
-  } else {
-    _typeof_1 = _typeof$1 = function _typeof(obj) {
-      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-    };
-  }
+var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-  return _typeof$1(obj);
+function getAugmentedNamespace(n) {
+	if (n.__esModule) return n;
+	var a = Object.defineProperty({}, '__esModule', {value: true});
+	Object.keys(n).forEach(function (k) {
+		var d = Object.getOwnPropertyDescriptor(n, k);
+		Object.defineProperty(a, k, d.get ? d : {
+			enumerable: true,
+			get: function () {
+				return n[k];
+			}
+		});
+	});
+	return a;
 }
 
-var _typeof_1 = _typeof$1;
-
-var _typeof$2 = _typeof_1;
-
-function _defineProperty$1(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
+function commonjsRequire (path) {
+	throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
 }
 
-var defineProperty = _defineProperty$1;
-
 /**
  * This file automatically generated from `pre-publish.js`.
  * Do not manually edit.
  */
 
-var voidElements$1 = {
+var voidElements = {
   "area": true,
   "base": true,
   "br": true,
@@ -2539,9 +2525,7 @@ var voidElements$1 = {
   "hr": true,
   "img": true,
   "input": true,
-  "keygen": true,
   "link": true,
-  "menuitem": true,
   "meta": true,
   "param": true,
   "source": true,
@@ -2549,225 +2533,17 @@ var voidElements$1 = {
   "wbr": true
 };
 
-var attrRE = /([\w-]+)|=|(['"])([.\s\S]*?)\2/g;
-var voidElements = voidElements$1;
-
-var parseTag$1 = function (tag) {
-    var i = 0;
-    var key;
-    var expectingValueAfterEquals = true;
-    var res = {
-        type: 'tag',
-        name: '',
-        voidElement: false,
-        attrs: {},
-        children: []
-    };
-
-    tag.replace(attrRE, function (match) {
-        if (match === '=') {
-            expectingValueAfterEquals = true;
-            i++;
-            return;
-        }
-
-        if (!expectingValueAfterEquals) {
-            if (key) {
-                res.attrs[key] = key; // boolean attribute
-            }
-            key=match;
-        } else {
-            if (i === 0) {
-                if (voidElements[match] || tag.charAt(tag.length - 2) === '/') {
-                    res.voidElement = true;
-                }
-                res.name = match;
-            } else {
-                res.attrs[key] = match.replace(/^['"]|['"]$/g, '');
-                key=undefined;
-            }
-        }
-        i++;
-        expectingValueAfterEquals = false;
-    });
-
-    return res;
-};
-
-/*jshint -W030 */
-
-var tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
-var parseTag = parseTag$1;
-// re-used obj for quick lookups of components
-var empty = Object.create ? Object.create(null) : {};
-// common logic for pushing a child node onto a list
-function pushTextNode(list, html, level, start, ignoreWhitespace) {
-    // calculate correct end of the content slice in case there's
-    // no tag after the text node.
-    var end = html.indexOf('<', start);
-    var content = html.slice(start, end === -1 ? undefined : end);
-    // if a node is nothing but whitespace, collapse it as the spec states:
-    // https://www.w3.org/TR/html4/struct/text.html#h-9.1
-    if (/^\s*$/.test(content)) {
-        content = ' ';
-    }
-    // don't add whitespace-only text nodes if they would be trailing text nodes
-    // or if they would be leading whitespace-only text nodes:
-    //  * end > -1 indicates this is not a trailing text node
-    //  * leading node is when level is -1 and list has length 0
-    if ((!ignoreWhitespace && end > -1 && level + list.length >= 0) || content !== ' ') {
-        list.push({
-            type: 'text',
-            content: content
-        });
-    }
-}
-
-var parse = function parse(html, options) {
-    options || (options = {});
-    options.components || (options.components = empty);
-    var result = [];
-    var current;
-    var level = -1;
-    var arr = [];
-    var byTag = {};
-    var inComponent = false;
-
-    html.replace(tagRE, function (tag, index) {
-        if (inComponent) {
-            if (tag !== ('</' + current.name + '>')) {
-                return;
-            } else {
-                inComponent = false;
-            }
-        }
-
-        var isOpen = tag.charAt(1) !== '/';
-        var isComment = tag.indexOf('<!--') === 0;
-        var start = index + tag.length;
-        var nextChar = html.charAt(start);
-        var parent;
-
-        if (isOpen && !isComment) {
-            level++;
-
-            current = parseTag(tag);
-            if (current.type === 'tag' && options.components[current.name]) {
-                current.type = 'component';
-                inComponent = true;
-            }
-
-            if (!current.voidElement && !inComponent && nextChar && nextChar !== '<') {
-                pushTextNode(current.children, html, level, start, options.ignoreWhitespace);
-            }
-
-            byTag[current.tagName] = current;
-
-            // if we're at root, push new base node
-            if (level === 0) {
-                result.push(current);
-            }
-
-            parent = arr[level - 1];
-
-            if (parent) {
-                parent.children.push(current);
-            }
-
-            arr[level] = current;
-        }
-
-        if (isComment || !isOpen || current.voidElement) {
-            if (!isComment) {
-                level--;
-            }
-            if (!inComponent && nextChar !== '<' && nextChar) {
-                // trailing text node
-                // if we're at the root, push a base text node. otherwise add as
-                // a child to the current node.
-                parent = level === -1 ? result : arr[level].children;
-                pushTextNode(parent, html, level, start, options.ignoreWhitespace);
-            }
-        }
-    });
-
-    // If the "html" passed isn't actually html, add it as a text node.
-    if (!result.length && html.length) {
-        pushTextNode(result, html, 0, 0, options.ignoreWhitespace);
-    }
-
-    return result;
-};
-
-function attrString(attrs) {
-    var buff = [];
-    for (var key in attrs) {
-        buff.push(key + '="' + attrs[key] + '"');
-    }
-    if (!buff.length) {
-        return '';
-    }
-    return ' ' + buff.join(' ');
-}
-
-function stringify(buff, doc) {
-    switch (doc.type) {
-    case 'text':
-        return buff + doc.content;
-    case 'tag':
-        buff += '<' + doc.name + (doc.attrs ? attrString(doc.attrs) : '') + (doc.voidElement ? '/>' : '>');
-        if (doc.voidElement) {
-            return buff;
-        }
-        return buff + doc.children.reduce(stringify, '') + '</' + doc.name + '>';
-    }
-}
-
-var stringify_1 = function (doc) {
-    return doc.reduce(function (token, rootEl) {
-        return token + stringify('', rootEl);
-    }, '');
-};
-
-var htmlParseStringify2 = {
-    parse: parse,
-    stringify: stringify_1
-};
-
-function _classCallCheck$2(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
-}
-
-var classCallCheck = _classCallCheck$2;
-
-function _defineProperties$2(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, descriptor.key, descriptor);
-  }
-}
-
-function _createClass$2(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties$2(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties$2(Constructor, staticProps);
-  return Constructor;
-}
-
-var createClass = _createClass$2;
+var t=/\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;function n(n){var r={type:"tag",name:"",voidElement:!1,attrs:{},children:[]},i=n.match(/<\/?([^\s]+?)[/\s>]/);if(i&&(r.name=i[1],(voidElements[i[1]]||"/"===n.charAt(n.length-2))&&(r.voidElement=!0),r.name.startsWith("!--"))){var s=n.indexOf("--\x3e");return {type:"comment",comment:-1!==s?n.slice(4,s):""}}for(var a=new RegExp(t),c=null;null!==(c=a.exec(n));)if(c[0].trim())if(c[1]){var o=c[1].trim(),l=[o,""];o.indexOf("=")>-1&&(l=o.split("=")),r.attrs[l[0]]=l[1],a.lastIndex--;}else c[2]&&(r.attrs[c[2]]=c[3].trim().substring(1,c[3].length-1));return r}var r=/<[a-zA-Z0-9\-\!\/](?:"[^"]*"|'[^']*'|[^'">])*>/g,i=/^\s*$/,s=Object.create(null);function a(e,t){switch(t.type){case"text":return e+t.content;case"tag":return e+="<"+t.name+(t.attrs?function(e){var t=[];for(var n in e)t.push(n+'="'+e[n]+'"');return t.length?" "+t.join(" "):""}(t.attrs):"")+(t.voidElement?"/>":">"),t.voidElement?e:e+t.children.reduce(a,"")+"</"+t.name+">";case"comment":return e+"\x3c!--"+t.comment+"--\x3e"}}var c={parse:function(e,t){t||(t={}),t.components||(t.components=s);var a,c=[],o=[],l=-1,m=!1;if(0!==e.indexOf("<")){var u=e.indexOf("<");c.push({type:"text",content:-1===u?e:e.substring(0,u)});}return e.replace(r,function(r,s){if(m){if(r!=="</"+a.name+">")return;m=!1;}var u,f="/"!==r.charAt(1),h=r.startsWith("\x3c!--"),p=s+r.length,d=e.charAt(p);if(h){var v=n(r);return l<0?(c.push(v),c):((u=o[l]).children.push(v),c)}if(f&&(l++,"tag"===(a=n(r)).type&&t.components[a.name]&&(a.type="component",m=!0),a.voidElement||m||!d||"<"===d||a.children.push({type:"text",content:e.slice(p,e.indexOf("<",p))}),0===l&&c.push(a),(u=o[l-1])&&u.children.push(a),o[l]=a),(!f||a.voidElement)&&(l>-1&&(a.voidElement||a.name===r.slice(2,-1))&&(l--,a=-1===l?c:o[l]),!m&&"<"!==d&&d)){u=-1===l?c:o[l].children;var x=e.indexOf("<",p),g=e.slice(p,-1===x?void 0:x);i.test(g)&&(g=" "),(x>-1&&l+u.length>=0||" "!==g)&&u.push({type:"text",content:g});}}),c},stringify:function(e){return e.reduce(function(e,t){return e+a("",t)},"")}};
 
-function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$2(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$2(Object(source), true).forEach(function (key) { _defineProperty$1(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var defaultOptions = {
   bindI18n: 'languageChanged',
   bindI18nStore: '',
   transEmptyNodeValue: '',
   transSupportBasicHtmlNodes: true,
+  transWrapTextNodes: '',
   transKeepBasicHtmlNodesFor: ['br', 'strong', 'i', 'p'],
   useSuspense: true
 };
@@ -2782,12 +2558,12 @@ function getDefaults$2() {
 }
 var ReportNamespaces = function () {
   function ReportNamespaces() {
-    classCallCheck(this, ReportNamespaces);
+    _classCallCheck$1(this, ReportNamespaces);
 
     this.usedNamespaces = {};
   }
 
-  createClass(ReportNamespaces, [{
+  _createClass$1(ReportNamespaces, [{
     key: "addUsedNamespaces",
     value: function addUsedNamespaces(namespaces) {
       var _this = this;
@@ -2883,9 +2659,12 @@ function hasLoadedNamespace(ns, i18n) {
   return false;
 }
 
-function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+var _excluded = ["format"],
+    _excluded2 = ["children", "count", "parent", "i18nKey", "tOptions", "values", "defaults", "components", "ns", "i18n", "t"];
 
-function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$1(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$1(Object(source), true).forEach(function (key) { _defineProperty$1(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function hasChildren(node, checkLength) {
   if (!node) return false;
@@ -2942,9 +2721,11 @@ function nodesToString(children, i18nOptions) {
         var content = nodesToString(childChildren, i18nOptions);
         stringNode += "<".concat(childIndex, ">").concat(content, "</").concat(childIndex, ">");
       }
+    } else if (child === null) {
+      warn("Trans: the passed in value is invalid - seems you passed in a null child.");
     } else if (_typeof$2(child) === 'object') {
       var format = child.format,
-          clone = objectWithoutProperties(child, ["format"]);
+          clone = _objectWithoutProperties(child, _excluded);
 
       var keys = Object.keys(clone);
 
@@ -2978,7 +2759,7 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts) {
 
   getData(children);
   var interpolatedString = i18n.services.interpolator.interpolate(targetString, _objectSpread$1(_objectSpread$1({}, data), combinedTOpts), i18n.language);
-  var ast = htmlParseStringify2.parse("<0>".concat(interpolatedString, "</0>"));
+  var ast = c.parse("<0>".concat(interpolatedString, "</0>"));
 
   function renderInner(child, node, rootReactNode) {
     var childs = getChildren(child);
@@ -3059,7 +2840,15 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts) {
           })));
         }
       } else if (node.type === 'text') {
-        mem.push(node.content);
+        var wrapTextNodes = i18nOptions.transWrapTextNodes;
+
+        if (wrapTextNodes) {
+          mem.push(React__default.createElement(wrapTextNodes, {
+            key: "".concat(node.name, "-").concat(i)
+          }, node.content));
+        } else {
+          mem.push(node.content);
+        }
       }
 
       return mem;
@@ -3086,7 +2875,7 @@ function Trans(_ref) {
       ns = _ref.ns,
       i18nFromProps = _ref.i18n,
       tFromProps = _ref.t,
-      additionalProps = objectWithoutProperties(_ref, ["children", "count", "parent", "i18nKey", "tOptions", "values", "defaults", "components", "ns", "i18n", "t"]);
+      additionalProps = _objectWithoutProperties(_ref, _excluded2);
 
   var _ref2 = useContext(I18nContext) || {},
       i18nFromContext = _ref2.i18n,
@@ -3134,17 +2923,18 @@ function _arrayWithHoles(arr) {
   if (Array.isArray(arr)) return arr;
 }
 
-var arrayWithHoles$1 = _arrayWithHoles;
-
 function _iterableToArrayLimit(arr, i) {
-  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
+  var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+
+  if (_i == null) return;
   var _arr = [];
   var _n = true;
   var _d = false;
-  var _e = undefined;
+
+  var _s, _e;
 
   try {
-    for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+    for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
       _arr.push(_s.value);
 
       if (i && _arr.length === i) break;
@@ -3163,8 +2953,6 @@ function _iterableToArrayLimit(arr, i) {
   return _arr;
 }
 
-var iterableToArrayLimit$1 = _iterableToArrayLimit;
-
 function _arrayLikeToArray(arr, len) {
   if (len == null || len > arr.length) len = arr.length;
 
@@ -3175,44 +2963,26 @@ function _arrayLikeToArray(arr, len) {
   return arr2;
 }
 
-var arrayLikeToArray$1 = _arrayLikeToArray;
-
-var arrayLikeToArray = arrayLikeToArray$1;
-
 function _unsupportedIterableToArray(o, minLen) {
   if (!o) return;
-  if (typeof o === "string") return arrayLikeToArray(o, minLen);
+  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
   var n = Object.prototype.toString.call(o).slice(8, -1);
   if (n === "Object" && o.constructor) n = o.constructor.name;
   if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return arrayLikeToArray(o, minLen);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 
-var unsupportedIterableToArray$1 = _unsupportedIterableToArray;
-
 function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
-var nonIterableRest$1 = _nonIterableRest;
-
-var arrayWithHoles = arrayWithHoles$1;
-
-var iterableToArrayLimit = iterableToArrayLimit$1;
-
-var unsupportedIterableToArray = unsupportedIterableToArray$1;
-
-var nonIterableRest = nonIterableRest$1;
-
 function _slicedToArray(arr, i) {
-  return arrayWithHoles(arr) || iterableToArrayLimit(arr, i) || unsupportedIterableToArray(arr, i) || nonIterableRest();
+  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
 }
 
-var slicedToArray = _slicedToArray;
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty$1(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 function useTranslation(ns) {
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var i18nFromProps = props.i18n;
@@ -3238,6 +3008,8 @@ function useTranslation(ns) {
     return retNotReady;
   }
 
+  if (i18n.options.react && i18n.options.react.wait !== undefined) warnOnce('It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.');
+
   var i18nOptions = _objectSpread(_objectSpread(_objectSpread({}, getDefaults$2()), i18n.options.react), props);
 
   var useSuspense = i18nOptions.useSuspense;
@@ -3249,13 +3021,11 @@ function useTranslation(ns) {
   });
 
   function getT() {
-    return {
-      t: i18n.getFixedT(null, i18nOptions.nsMode === 'fallback' ? namespaces : namespaces[0])
-    };
+    return i18n.getFixedT(null, i18nOptions.nsMode === 'fallback' ? namespaces : namespaces[0]);
   }
 
-  var _useState = useState(getT()),
-      _useState2 = slicedToArray(_useState, 2),
+  var _useState = useState(getT),
+      _useState2 = _slicedToArray(_useState, 2),
       t = _useState2[0],
       setT = _useState2[1];
 
@@ -3267,12 +3037,12 @@ function useTranslation(ns) {
 
     if (!ready && !useSuspense) {
       loadNamespaces(i18n, namespaces, function () {
-        if (isMounted.current) setT(getT());
+        if (isMounted.current) setT(getT);
       });
     }
 
     function boundReset() {
-      if (isMounted.current) setT(getT());
+      if (isMounted.current) setT(getT);
     }
 
     if (bindI18n && i18n) i18n.on(bindI18n, boundReset);
@@ -3286,9 +3056,17 @@ function useTranslation(ns) {
         return i18n.store.off(e, boundReset);
       });
     };
-  }, [namespaces.join()]);
-  var ret = [t.t, i18n, ready];
-  ret.t = t.t;
+  }, [i18n, namespaces.join()]);
+  var isInitial = useRef(true);
+  useEffect(function () {
+    if (isMounted.current && !isInitial.current) {
+      setT(getT);
+    }
+
+    isInitial.current = false;
+  }, [i18n]);
+  var ret = [t, i18n, ready];
+  ret.t = t;
   ret.i18n = i18n;
   ret.ready = ready;
   if (ready) return ret;
@@ -3300,6 +3078,8 @@ function useTranslation(ns) {
   });
 }
 
+function _typeof$1(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof$1 = function _typeof(obj) { return typeof obj; }; } else { _typeof$1 = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof$1(obj); }
+
 var arr$1 = [];
 var each$1 = arr$1.forEach;
 var slice$1 = arr$1.slice;
@@ -3313,9 +3093,14 @@ function defaults$1(obj) {
   });
   return obj;
 }
+function hasXMLHttpRequest() {
+  return typeof XMLHttpRequest === 'function' || (typeof XMLHttpRequest === "undefined" ? "undefined" : _typeof$1(XMLHttpRequest)) === 'object';
+}
 
 var getFetch$1 = {exports: {}};
 
+var nodePonyfill = {exports: {}};
+
 // Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
 
 // fix for "Readable" isn't a named export issue
@@ -4957,6 +4742,31 @@ var lib = /*#__PURE__*/Object.freeze({
 
 var require$$0 = /*@__PURE__*/getAugmentedNamespace(lib);
 
+(function (module, exports) {
+const nodeFetch = require$$0;
+const realFetch = nodeFetch.default || nodeFetch;
+
+const fetch = function (url, options) {
+  // Support schemaless URIs on the server for parity with the browser.
+  // Ex: //github.com/ -> https://github.com/
+  if (/^\/\//.test(url)) {
+    url = 'https:' + url;
+  }
+  return realFetch.call(this, url, options)
+};
+
+fetch.ponyfill = true;
+
+module.exports = exports = fetch;
+exports.fetch = fetch;
+exports.Headers = nodeFetch.Headers;
+exports.Request = nodeFetch.Request;
+exports.Response = nodeFetch.Response;
+
+// Needed for TypeScript consumers without esModuleInterop.
+exports.default = fetch;
+}(nodePonyfill, nodePonyfill.exports));
+
 (function (module, exports) {
 var fetchApi;
 if (typeof fetch === 'function') {
@@ -4968,7 +4778,7 @@ if (typeof fetch === 'function') {
 }
 
 if (typeof commonjsRequire !== 'undefined' && (typeof window === 'undefined' || typeof window.document === 'undefined')) {
-  var f = fetchApi || require$$0;
+  var f = fetchApi || nodePonyfill.exports;
   if (f.default) f = f.default;
   exports.default = f;
   module.exports = exports.default;
@@ -4994,7 +4804,7 @@ if (typeof fetch === 'function') {
 
 var XmlHttpRequestApi;
 
-if (typeof XMLHttpRequest === 'function') {
+if (hasXMLHttpRequest) {
   if (typeof global !== 'undefined' && global.XMLHttpRequest) {
     XmlHttpRequestApi = global.XMLHttpRequest;
   } else if (typeof window !== 'undefined' && window.XMLHttpRequest) {
@@ -5122,16 +4932,16 @@ var request = function request(options, url, payload, callback) {
     return requestWithFetch(options, url, payload, callback);
   }
 
-  if (typeof XMLHttpRequest === 'function' || typeof ActiveXObject === 'function') {
+  if (hasXMLHttpRequest || typeof ActiveXObject === 'function') {
     return requestWithXmlHttpRequest(options, url, payload, callback);
   }
 };
 
-function _classCallCheck$1(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _defineProperties$1(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass$1(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties$1(Constructor.prototype, protoProps); if (staticProps) _defineProperties$1(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -5167,7 +4977,7 @@ var Backend = function () {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var allOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
-    _classCallCheck$1(this, Backend);
+    _classCallCheck(this, Backend);
 
     this.services = services;
     this.options = options;
@@ -5176,7 +4986,7 @@ var Backend = function () {
     this.init(services, options, allOptions);
   }
 
-  _createClass$1(Backend, [{
+  _createClass(Backend, [{
     key: "init",
     value: function init(services) {
       var _this = this;
@@ -5187,7 +4997,7 @@ var Backend = function () {
       this.options = defaults$1(options, this.options || {}, getDefaults$1());
       this.allOptions = allOptions;
 
-      if (this.options.reloadInterval) {
+      if (this.services && this.options.reloadInterval) {
         setInterval(function () {
           return _this.reload();
         }, this.options.reloadInterval);
@@ -5229,9 +5039,9 @@ var Backend = function () {
       var _this2 = this;
 
       this.options.request(this.options, url, undefined, function (err, res) {
-        if (res && (res.status >= 500 && res.status < 600 || !res.status)) return callback('failed loading ' + url, true);
-        if (res && res.status >= 400 && res.status < 500) return callback('failed loading ' + url, false);
-        if (!res && err && err.message && err.message.indexOf('Failed to fetch') > -1) return callback('failed loading ' + url, true);
+        if (res && (res.status >= 500 && res.status < 600 || !res.status)) return callback('failed loading ' + url + '; status code: ' + res.status, true);
+        if (res && res.status >= 400 && res.status < 500) return callback('failed loading ' + url + '; status code: ' + res.status, false);
+        if (!res && err && err.message && err.message.indexOf('Failed to fetch') > -1) return callback('failed loading ' + url + ': ' + err.message, true);
         if (err) return callback(err, false);
         var ret, parseErr;
 
@@ -5251,19 +5061,36 @@ var Backend = function () {
     }
   }, {
     key: "create",
-    value: function create(languages, namespace, key, fallbackValue) {
+    value: function create(languages, namespace, key, fallbackValue, callback) {
       var _this3 = this;
 
       if (!this.options.addPath) return;
       if (typeof languages === 'string') languages = [languages];
       var payload = this.options.parsePayload(namespace, key, fallbackValue);
+      var finished = 0;
+      var dataArray = [];
+      var resArray = [];
       languages.forEach(function (lng) {
-        var url = _this3.services.interpolator.interpolate(_this3.options.addPath, {
+        var addPath = _this3.options.addPath;
+
+        if (typeof _this3.options.addPath === 'function') {
+          addPath = _this3.options.addPath(lng, namespace);
+        }
+
+        var url = _this3.services.interpolator.interpolate(addPath, {
           lng: lng,
           ns: namespace
         });
 
-        _this3.options.request(_this3.options, url, payload, function (data, res) {});
+        _this3.options.request(_this3.options, url, payload, function (data, res) {
+          finished += 1;
+          dataArray.push(data);
+          resArray.push(res);
+
+          if (finished === languages.length) {
+            if (callback) callback(dataArray, resArray);
+          }
+        });
       });
     }
   }, {
@@ -5307,28 +5134,6 @@ var Backend = function () {
 
 Backend.type = 'backend';
 
-function _classCallCheck(instance, Constructor) {
-  if (!(instance instanceof Constructor)) {
-    throw new TypeError("Cannot call a class as a function");
-  }
-}
-
-function _defineProperties(target, props) {
-  for (var i = 0; i < props.length; i++) {
-    var descriptor = props[i];
-    descriptor.enumerable = descriptor.enumerable || false;
-    descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, descriptor.key, descriptor);
-  }
-}
-
-function _createClass(Constructor, protoProps, staticProps) {
-  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-  if (staticProps) _defineProperties(Constructor, staticProps);
-  return Constructor;
-}
-
 var arr = [];
 var each = arr.forEach;
 var slice = arr.slice;
@@ -5659,14 +5464,14 @@ function () {
   function Browser(services) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-    _classCallCheck(this, Browser);
+    _classCallCheck$1(this, Browser);
 
     this.type = 'languageDetector';
     this.detectors = {};
     this.init(services, options);
   }
 
-  _createClass(Browser, [{
+  _createClass$1(Browser, [{
     key: "init",
     value: function init(services) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -5732,26 +5537,26 @@ function localize(_a) {
     var detectorConfig = _a.detectorConfig, translationPath = _a.translationPath, i18nConfig = __rest(_a, ["detectorConfig", "translationPath"]);
     var detectionObject = detectorConfig || {
         // order and from where user language should be detected
-        order: ["querystring", "cookie", "localStorage"],
+        order: ['querystring', 'cookie', 'localStorage'],
         // keys or params to lookup language from
-        lookupQuerystring: "lang",
-        lookupCookie: "lang",
-        lookupSessionStorage: "lang",
-        lookupLocalStorage: "lang",
+        lookupQuerystring: 'lang',
+        lookupCookie: 'lang',
+        lookupSessionStorage: 'lang',
+        lookupLocalStorage: 'lang',
         // cache user language on
-        caches: ["localStorage", "cookie"],
-        excludeCacheFor: ["cimode"],
+        caches: ['localStorage', 'cookie'],
+        excludeCacheFor: ['cimode'],
         // optional set cookie options, reference:[MDN Set-Cookie docs](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie)
-        cookieOptions: { path: "/", sameSite: "strict" },
+        cookieOptions: { path: '/', sameSite: 'strict' },
     };
-    var transPath = translationPath || "/locales/{{lng}}/{{ns}}.json";
-    var mergedConfig = __assign({ fallbackLng: "en-US", debug: true, keySeparator: ".", backend: {
+    var transPath = translationPath || '/locales/{{lng}}/{{ns}}.json';
+    var mergedConfig = __assign({ fallbackLng: 'en-US', debug: true, keySeparator: '.', backend: {
             // this is the path to your translation files
             // this can also take an absolute path as well as the current relative path
             // relative path currently points to public/locales
             loadPath: transPath,
         }, interpolation: {
-            escapeValue: false,
+            escapeValue: false, // React takes care of interpolation for us
         }, detection: detectionObject }, i18nConfig);
     i18next.use(Backend) // used for loading external translation files
         .use(Browser) // used to detect langage via cookie, local storage, or query param
@@ -5765,8 +5570,8 @@ function SpsLanguage(_a) {
 }
 
 function useSpsLanguage(ns, options) {
-    if (ns === void 0) { ns = "translation"; }
-    return useTranslation([ns, "design-system"], options);
+    if (ns === void 0) { ns = 'translation'; }
+    return useTranslation([ns, 'design-system'], options);
 }
 
 export { SpsLanguage, localize, useSpsLanguage };