@bigbinary/neeto-tags-frontend 0.0.49 → 0.0.51

package/dist/index.js

@@ -9,32 +9,30 @@ import _possibleConstructorReturn from '@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from '@babel/runtime/helpers/esm/getPrototypeOf';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import _toArray from '@babel/runtime/helpers/esm/toArray';
-import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
-import _typeof$1 from '@babel/runtime/helpers/typeof';
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
-import React, { createContext, useContext, createElement, isValidElement, cloneElement, useState, useRef, useEffect, useMemo } from 'react';
 import _classCallCheck$1 from '@babel/runtime/helpers/classCallCheck';
 import _createClass$1 from '@babel/runtime/helpers/createClass';
-import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
+import React, { createElement, isValidElement, cloneElement, createContext, useContext, useState, useRef, useEffect, useMemo } from 'react';
 import _extends from '@babel/runtime/helpers/extends';
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import { Plus, MenuHorizontal, Merge as Merge$1 } from '@bigbinary/neeto-icons';
 import { Typography, Tag, Select, Button, Dropdown, Toastr, Pane, PageLoader, NoData, Table, Alert, Input as Input$1, Modal } from '@bigbinary/neetoui';
 import { useHistory, Switch, Route } from 'react-router-dom';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import * as yup from 'yup';
-import _inheritsLoose from '@babel/runtime/helpers/esm/inheritsLoose';
-import _extends$1 from '@babel/runtime/helpers/esm/extends';
 import ReactDOM from 'react-dom';
+import _extends$1 from '@babel/runtime/helpers/esm/extends';
+import _inheritsLoose from '@babel/runtime/helpers/esm/inheritsLoose';
 import axios from 'axios';
 import { Container, Header, SubHeader, MenuBar } from '@bigbinary/neetoui/layouts';
 import { Formik, Form } from 'formik';
 import { Input, Textarea } from '@bigbinary/neetoui/formik';
 import classames from 'classnames';
+import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
+import _typeof$1 from '@babel/runtime/helpers/typeof';
 
-function ownKeys$8(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$8(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$8(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$8(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
+function ownKeys$6$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$6$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$6$1(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$6$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var consoleLogger = {
   type: 'logger',
   log: function log(args) {
@@ -50,16 +48,12 @@ var consoleLogger = {
     if (console && console[type]) console[type].apply(console, args);
   }
 };
-
 var Logger = function () {
   function Logger(concreteLogger) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
     _classCallCheck(this, Logger);
-
     this.init(concreteLogger, options);
   }
-
   _createClass(Logger, [{
     key: "init",
     value: function init(concreteLogger) {
@@ -80,7 +74,6 @@ var Logger = function () {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-
       return this.forward(args, 'log', '', true);
     }
   }, {
@@ -89,7 +82,6 @@ var Logger = function () {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
-
       return this.forward(args, 'warn', '', true);
     }
   }, {
@@ -98,7 +90,6 @@ var Logger = function () {
       for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
         args[_key3] = arguments[_key3];
       }
-
       return this.forward(args, 'error', '');
     }
   }, {
@@ -107,7 +98,6 @@ var Logger = function () {
       for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
         args[_key4] = arguments[_key4];
       }
-
       return this.forward(args, 'warn', 'WARNING DEPRECATED: ', true);
     }
   }, {
@@ -120,32 +110,33 @@ var Logger = function () {
   }, {
     key: "create",
     value: function create(moduleName) {
-      return new Logger(this.logger, _objectSpread$8(_objectSpread$8({}, {
+      return new Logger(this.logger, _objectSpread$6$1(_objectSpread$6$1({}, {
         prefix: "".concat(this.prefix, ":").concat(moduleName, ":")
       }), this.options));
     }
+  }, {
+    key: "clone",
+    value: function clone(options) {
+      options = options || this.options;
+      options.prefix = options.prefix || this.prefix;
+      return new Logger(this.logger, options);
+    }
   }]);
-
   return Logger;
 }();
-
 var baseLogger = new Logger();
 
 var EventEmitter = function () {
   function EventEmitter() {
     _classCallCheck(this, EventEmitter);
-
     this.observers = {};
   }
-
   _createClass(EventEmitter, [{
     key: "on",
     value: function on(events, listener) {
       var _this = this;
-
       events.split(' ').forEach(function (event) {
         _this.observers[event] = _this.observers[event] || [];
-
         _this.observers[event].push(listener);
       });
       return this;
@@ -154,12 +145,10 @@ var EventEmitter = function () {
     key: "off",
     value: function off(event, listener) {
       if (!this.observers[event]) return;
-
       if (!listener) {
         delete this.observers[event];
         return;
       }
-
       this.observers[event] = this.observers[event].filter(function (l) {
         return l !== listener;
       });
@@ -170,24 +159,20 @@ var EventEmitter = function () {
       for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
         args[_key - 1] = arguments[_key];
       }
-
       if (this.observers[event]) {
         var cloned = [].concat(this.observers[event]);
         cloned.forEach(function (observer) {
           observer.apply(void 0, args);
         });
       }
-
       if (this.observers['*']) {
         var _cloned = [].concat(this.observers['*']);
-
         _cloned.forEach(function (observer) {
           observer.apply(observer, [event].concat(args));
         });
       }
     }
   }]);
-
   return EventEmitter;
 }();
 
@@ -211,68 +196,56 @@ function copy(a, s, t) {
     if (s[m]) t[m] = s[m];
   });
 }
-
 function getLastOfPath(object, path, Empty) {
   function cleanKey(key) {
     return key && key.indexOf('###') > -1 ? key.replace(/###/g, '.') : key;
   }
-
   function canNotTraverseDeeper() {
     return !object || typeof object === 'string';
   }
-
   var stack = typeof path !== 'string' ? [].concat(path) : path.split('.');
-
   while (stack.length > 1) {
     if (canNotTraverseDeeper()) return {};
     var key = cleanKey(stack.shift());
     if (!object[key] && Empty) object[key] = new Empty();
-
     if (Object.prototype.hasOwnProperty.call(object, key)) {
       object = object[key];
     } else {
       object = {};
     }
   }
-
   if (canNotTraverseDeeper()) return {};
   return {
     obj: object,
     k: cleanKey(stack.shift())
   };
 }
-
 function setPath(object, path, newValue) {
   var _getLastOfPath = getLastOfPath(object, path, Object),
-      obj = _getLastOfPath.obj,
-      k = _getLastOfPath.k;
-
+    obj = _getLastOfPath.obj,
+    k = _getLastOfPath.k;
   obj[k] = newValue;
 }
 function pushPath(object, path, newValue, concat) {
   var _getLastOfPath2 = getLastOfPath(object, path, Object),
-      obj = _getLastOfPath2.obj,
-      k = _getLastOfPath2.k;
-
+    obj = _getLastOfPath2.obj,
+    k = _getLastOfPath2.k;
   obj[k] = obj[k] || [];
   if (concat) obj[k] = obj[k].concat(newValue);
   if (!concat) obj[k].push(newValue);
 }
 function getPath(object, path) {
   var _getLastOfPath3 = getLastOfPath(object, path),
-      obj = _getLastOfPath3.obj,
-      k = _getLastOfPath3.k;
-
+    obj = _getLastOfPath3.obj,
+    k = _getLastOfPath3.k;
   if (!obj) return undefined;
   return obj[k];
 }
 function getPathWithDefaults(data, defaultData, key) {
   var value = getPath(data, key);
-
   if (value !== undefined) {
     return value;
   }
-
   return getPath(defaultData, key);
 }
 function deepExtend(target, source, overwrite) {
@@ -289,7 +262,6 @@ function deepExtend(target, source, overwrite) {
       }
     }
   }
-
   return target;
 }
 function regexEscape(str) {
@@ -309,7 +281,6 @@ function escape(data) {
       return _entityMap[s];
     });
   }
-
   return data;
 }
 var isIE10 = typeof window !== 'undefined' && window.navigator && typeof window.navigator.userAgentData === 'undefined' && window.navigator.userAgent && window.navigator.userAgent.indexOf('MSIE') > -1;
@@ -325,105 +296,77 @@ function looksLikeObjectPath(key, nsSeparator, keySeparator) {
     return c === '?' ? '\\?' : c;
   }).join('|'), ")"));
   var matched = !r.test(key);
-
   if (!matched) {
     var ki = key.indexOf(keySeparator);
-
     if (ki > 0 && !r.test(key.substring(0, ki))) {
       matched = true;
     }
   }
-
   return matched;
 }
 
-function ownKeys$1$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$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$1$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$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+function ownKeys$5$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$5$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$5$1(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$5$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _createSuper$3(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$3(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _isNativeReflectConstruct$3() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function deepFind(obj, path) {
   var keySeparator = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '.';
   if (!obj) return undefined;
   if (obj[path]) return obj[path];
   var paths = path.split(keySeparator);
   var current = obj;
-
   for (var i = 0; i < paths.length; ++i) {
     if (!current) return undefined;
-
     if (typeof current[paths[i]] === 'string' && i + 1 < paths.length) {
       return undefined;
     }
-
     if (current[paths[i]] === undefined) {
       var j = 2;
       var p = paths.slice(i, i + j).join(keySeparator);
       var mix = current[p];
-
       while (mix === undefined && paths.length > i + j) {
         j++;
         p = paths.slice(i, i + j).join(keySeparator);
         mix = current[p];
       }
-
       if (mix === undefined) return undefined;
       if (mix === null) return null;
-
       if (path.endsWith(p)) {
         if (typeof mix === 'string') return mix;
         if (p && typeof mix[p] === 'string') return mix[p];
       }
-
       var joinedPath = paths.slice(i + j).join(keySeparator);
       if (joinedPath) return deepFind(mix, joinedPath, keySeparator);
       return undefined;
     }
-
     current = current[paths[i]];
   }
-
   return current;
 }
-
 var ResourceStore = function (_EventEmitter) {
   _inherits(ResourceStore, _EventEmitter);
-
-  var _super = _createSuper(ResourceStore);
-
+  var _super = _createSuper$3(ResourceStore);
   function ResourceStore(data) {
     var _this;
-
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
       ns: ['translation'],
       defaultNS: 'translation'
     };
-
     _classCallCheck(this, ResourceStore);
-
     _this = _super.call(this);
-
     if (isIE10) {
       EventEmitter.call(_assertThisInitialized(_this));
     }
-
     _this.data = data || {};
     _this.options = options;
-
     if (_this.options.keySeparator === undefined) {
       _this.options.keySeparator = '.';
     }
-
     if (_this.options.ignoreJSONStructure === undefined) {
       _this.options.ignoreJSONStructure = true;
     }
-
     return _this;
   }
-
   _createClass(ResourceStore, [{
     key: "addNamespaces",
     value: function addNamespaces(ns) {
@@ -435,7 +378,6 @@ var ResourceStore = function (_EventEmitter) {
     key: "removeNamespaces",
     value: function removeNamespaces(ns) {
       var index = this.options.ns.indexOf(ns);
-
       if (index > -1) {
         this.options.ns.splice(index, 1);
       }
@@ -449,11 +391,9 @@ var ResourceStore = function (_EventEmitter) {
       var path = [lng, ns];
       if (key && typeof key !== 'string') path = path.concat(key);
       if (key && typeof key === 'string') path = path.concat(keySeparator ? key.split(keySeparator) : key);
-
       if (lng.indexOf('.') > -1) {
         path = lng.split('.');
       }
-
       var result = getPath(this.data, path);
       if (result || !ignoreJSONStructure || typeof key !== 'string') return result;
       return deepFind(this.data && this.data[lng] && this.data[lng][ns], key, keySeparator);
@@ -468,13 +408,11 @@ var ResourceStore = function (_EventEmitter) {
       if (keySeparator === undefined) keySeparator = '.';
       var path = [lng, ns];
       if (key) path = path.concat(keySeparator ? key.split(keySeparator) : key);
-
       if (lng.indexOf('.') > -1) {
         path = lng.split('.');
         value = ns;
         ns = path[1];
       }
-
       this.addNamespaces(ns);
       setPath(this.data, path, value);
       if (!options.silent) this.emit('added', lng, ns, key, value);
@@ -485,13 +423,11 @@ var ResourceStore = function (_EventEmitter) {
       var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
         silent: false
       };
-
       for (var m in resources) {
         if (typeof resources[m] === 'string' || Object.prototype.toString.apply(resources[m]) === '[object Array]') this.addResource(lng, ns, m, resources[m], {
           silent: true
         });
       }
-
       if (!options.silent) this.emit('added', lng, ns, resources);
     }
   }, {
@@ -501,23 +437,19 @@ var ResourceStore = function (_EventEmitter) {
         silent: false
       };
       var path = [lng, ns];
-
       if (lng.indexOf('.') > -1) {
         path = lng.split('.');
         deep = resources;
         resources = ns;
         ns = path[1];
       }
-
       this.addNamespaces(ns);
       var pack = getPath(this.data, path) || {};
-
       if (deep) {
         deepExtend(pack, resources, overwrite);
       } else {
-        pack = _objectSpread$1$1(_objectSpread$1$1({}, pack), resources);
+        pack = _objectSpread$5$1(_objectSpread$5$1({}, pack), resources);
       }
-
       setPath(this.data, path, pack);
       if (!options.silent) this.emit('added', lng, ns, resources);
     }
@@ -527,7 +459,6 @@ var ResourceStore = function (_EventEmitter) {
       if (this.hasResourceBundle(lng, ns)) {
         delete this.data[lng][ns];
       }
-
       this.removeNamespaces(ns);
       this.emit('removed', lng, ns);
     }
@@ -540,7 +471,7 @@ var ResourceStore = function (_EventEmitter) {
     key: "getResourceBundle",
     value: function getResourceBundle(lng, ns) {
       if (!ns) ns = this.options.defaultNS;
-      if (this.options.compatibilityAPI === 'v1') return _objectSpread$1$1(_objectSpread$1$1({}, {}), this.getResource(lng, ns));
+      if (this.options.compatibilityAPI === 'v1') return _objectSpread$5$1(_objectSpread$5$1({}, {}), this.getResource(lng, ns));
       return this.getResource(lng, ns);
     }
   }, {
@@ -563,7 +494,6 @@ var ResourceStore = function (_EventEmitter) {
       return this.data;
     }
   }]);
-
   return ResourceStore;
 }(EventEmitter);
 
@@ -574,7 +504,6 @@ var postProcessor = {
   },
   handle: function handle(processors, value, key, options, translator) {
     var _this = this;
-
     processors.forEach(function (processor) {
       if (_this.processors[processor]) value = _this.processors[processor].process(value, key, options, translator);
     });
@@ -582,44 +511,30 @@ var postProcessor = {
   }
 };
 
-function ownKeys$2$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$2$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$2$1(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$2$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct$1() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function ownKeys$4$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$4$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$4$1(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$4$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _createSuper$2(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$2(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _isNativeReflectConstruct$2() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var checkedLoadedFor = {};
-
 var Translator = function (_EventEmitter) {
   _inherits(Translator, _EventEmitter);
-
-  var _super = _createSuper$1(Translator);
-
+  var _super = _createSuper$2(Translator);
   function Translator(services) {
     var _this;
-
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
     _classCallCheck(this, Translator);
-
     _this = _super.call(this);
-
     if (isIE10) {
       EventEmitter.call(_assertThisInitialized(_this));
     }
-
     copy(['resourceStore', 'languageUtils', 'pluralResolver', 'interpolator', 'backendConnector', 'i18nFormat', 'utils'], services, _assertThisInitialized(_this));
     _this.options = options;
-
     if (_this.options.keySeparator === undefined) {
       _this.options.keySeparator = '.';
     }
-
     _this.logger = baseLogger.create('translator');
     return _this;
   }
-
   _createClass(Translator, [{
     key: "changeLanguage",
     value: function changeLanguage(lng) {
@@ -631,11 +546,9 @@ var Translator = function (_EventEmitter) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
         interpolation: {}
       };
-
       if (key === undefined || key === null) {
         return false;
       }
-
       var resolved = this.resolve(key, options);
       return resolved && resolved.res !== undefined;
     }
@@ -648,22 +561,18 @@ var Translator = function (_EventEmitter) {
       var namespaces = options.ns || this.options.defaultNS || [];
       var wouldCheckForNsInKey = nsSeparator && key.indexOf(nsSeparator) > -1;
       var seemsNaturalLanguage = !this.options.userDefinedKeySeparator && !options.keySeparator && !this.options.userDefinedNsSeparator && !options.nsSeparator && !looksLikeObjectPath(key, nsSeparator, keySeparator);
-
       if (wouldCheckForNsInKey && !seemsNaturalLanguage) {
         var m = key.match(this.interpolator.nestingRegexp);
-
         if (m && m.length > 0) {
           return {
             key: key,
             namespaces: namespaces
           };
         }
-
         var parts = key.split(nsSeparator);
         if (nsSeparator !== keySeparator || nsSeparator === keySeparator && this.options.ns.indexOf(parts[0]) > -1) namespaces = parts.shift();
         key = parts.join(keySeparator);
       }
-
       if (typeof namespaces === 'string') namespaces = [namespaces];
       return {
         key: key,
@@ -674,45 +583,35 @@ var Translator = function (_EventEmitter) {
     key: "translate",
     value: function translate(keys, options, lastKey) {
       var _this2 = this;
-
       if (_typeof(options) !== 'object' && this.options.overloadTranslationOptionHandler) {
         options = this.options.overloadTranslationOptionHandler(arguments);
       }
-
       if (!options) options = {};
       if (keys === undefined || keys === null) return '';
       if (!Array.isArray(keys)) keys = [String(keys)];
       var returnDetails = options.returnDetails !== undefined ? options.returnDetails : this.options.returnDetails;
       var keySeparator = options.keySeparator !== undefined ? options.keySeparator : this.options.keySeparator;
-
       var _this$extractFromKey = this.extractFromKey(keys[keys.length - 1], options),
-          key = _this$extractFromKey.key,
-          namespaces = _this$extractFromKey.namespaces;
-
+        key = _this$extractFromKey.key,
+        namespaces = _this$extractFromKey.namespaces;
       var namespace = namespaces[namespaces.length - 1];
       var lng = options.lng || this.language;
       var appendNamespaceToCIMode = options.appendNamespaceToCIMode || this.options.appendNamespaceToCIMode;
-
       if (lng && lng.toLowerCase() === 'cimode') {
         if (appendNamespaceToCIMode) {
           var nsSeparator = options.nsSeparator || this.options.nsSeparator;
-
           if (returnDetails) {
             resolved.res = "".concat(namespace).concat(nsSeparator).concat(key);
             return resolved;
           }
-
           return "".concat(namespace).concat(nsSeparator).concat(key);
         }
-
         if (returnDetails) {
           resolved.res = key;
           return resolved;
         }
-
         return key;
       }
-
       var resolved = this.resolve(keys, options);
       var res = resolved && resolved.res;
       var resUsedKey = resolved && resolved.usedKey || key;
@@ -722,41 +621,34 @@ var Translator = function (_EventEmitter) {
       var joinArrays = options.joinArrays !== undefined ? options.joinArrays : this.options.joinArrays;
       var handleAsObjectInI18nFormat = !this.i18nFormat || this.i18nFormat.handleAsObject;
       var handleAsObject = typeof res !== 'string' && typeof res !== 'boolean' && typeof res !== 'number';
-
       if (handleAsObjectInI18nFormat && res && handleAsObject && noObject.indexOf(resType) < 0 && !(typeof joinArrays === 'string' && resType === '[object Array]')) {
         if (!options.returnObjects && !this.options.returnObjects) {
           if (!this.options.returnedObjectHandler) {
             this.logger.warn('accessing an object - but returnObjects options is not enabled!');
           }
-
-          var r = this.options.returnedObjectHandler ? this.options.returnedObjectHandler(resUsedKey, res, _objectSpread$2$1(_objectSpread$2$1({}, options), {}, {
+          var r = this.options.returnedObjectHandler ? this.options.returnedObjectHandler(resUsedKey, res, _objectSpread$4$1(_objectSpread$4$1({}, options), {}, {
             ns: namespaces
           })) : "key '".concat(key, " (").concat(this.language, ")' returned an object instead of string.");
-
           if (returnDetails) {
             resolved.res = r;
             return resolved;
           }
-
           return r;
         }
-
         if (keySeparator) {
           var resTypeIsArray = resType === '[object Array]';
           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[m] = this.translate(deepKey, _objectSpread$2$1(_objectSpread$2$1({}, options), {
+              copy[m] = this.translate(deepKey, _objectSpread$4$1(_objectSpread$4$1({}, options), {
                 joinArrays: false,
                 ns: namespaces
               }));
               if (copy[m] === deepKey) copy[m] = res[m];
             }
           }
-
           res = copy;
         }
       } else if (handleAsObjectInI18nFormat && typeof joinArrays === 'string' && resType === '[object Array]') {
@@ -769,34 +661,27 @@ var Translator = function (_EventEmitter) {
         var hasDefaultValue = Translator.hasDefaultValue(options);
         var defaultValueSuffix = needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, options) : '';
         var defaultValue = options["defaultValue".concat(defaultValueSuffix)] || options.defaultValue;
-
         if (!this.isValidLookup(res) && hasDefaultValue) {
           usedDefault = true;
           res = defaultValue;
         }
-
         if (!this.isValidLookup(res)) {
           usedKey = true;
           res = key;
         }
-
         var missingKeyNoValueFallbackToKey = options.missingKeyNoValueFallbackToKey || this.options.missingKeyNoValueFallbackToKey;
         var resForMissing = missingKeyNoValueFallbackToKey && usedKey ? undefined : res;
         var updateMissing = hasDefaultValue && defaultValue !== res && this.options.updateMissing;
-
         if (usedKey || usedDefault || updateMissing) {
           this.logger.log(updateMissing ? 'updateKey' : 'missingKey', lng, namespace, key, updateMissing ? defaultValue : res);
-
           if (keySeparator) {
-            var fk = this.resolve(key, _objectSpread$2$1(_objectSpread$2$1({}, options), {}, {
+            var fk = this.resolve(key, _objectSpread$4$1(_objectSpread$4$1({}, options), {}, {
               keySeparator: false
             }));
             if (fk && fk.res) this.logger.warn('Seems the loaded translations were in flat JSON format instead of nested. Either set keySeparator: false on init or make sure your translations are published in nested format.');
           }
-
           var lngs = [];
           var fallbackLngs = this.languageUtils.getFallbackCodes(this.options.fallbackLng, options.lng || this.language);
-
           if (this.options.saveMissingTo === 'fallback' && fallbackLngs && fallbackLngs[0]) {
             for (var i = 0; i < fallbackLngs.length; i++) {
               lngs.push(fallbackLngs[i]);
@@ -806,19 +691,15 @@ var Translator = function (_EventEmitter) {
           } else {
             lngs.push(options.lng || this.language);
           }
-
           var send = function send(l, k, specificDefaultValue) {
             var defaultForMissing = hasDefaultValue && specificDefaultValue !== res ? specificDefaultValue : resForMissing;
-
             if (_this2.options.missingKeyHandler) {
               _this2.options.missingKeyHandler(l, namespace, k, defaultForMissing, updateMissing, options);
             } else if (_this2.backendConnector && _this2.backendConnector.saveMissing) {
               _this2.backendConnector.saveMissing(l, namespace, k, defaultForMissing, updateMissing, options);
             }
-
             _this2.emit('missingKey', l, namespace, k, res);
           };
-
           if (this.options.saveMissing) {
             if (this.options.saveMissingPlurals && needsPluralHandling) {
               lngs.forEach(function (language) {
@@ -831,10 +712,8 @@ var Translator = function (_EventEmitter) {
             }
           }
         }
-
         res = this.extendTranslation(res, keys, options, resolved, lastKey);
         if (usedKey && res === key && this.options.appendNamespaceToMissingKey) res = "".concat(namespace, ":").concat(key);
-
         if ((usedKey || usedDefault) && this.options.parseMissingKeyHandler) {
           if (this.options.compatibilityAPI !== 'v1') {
             res = this.options.parseMissingKeyHandler(this.options.appendNamespaceToMissingKey ? "".concat(namespace, ":").concat(key) : key, usedDefault ? res : undefined);
@@ -843,77 +722,63 @@ var Translator = function (_EventEmitter) {
           }
         }
       }
-
       if (returnDetails) {
         resolved.res = res;
         return resolved;
       }
-
       return res;
     }
   }, {
     key: "extendTranslation",
     value: function extendTranslation(res, key, options, resolved, lastKey) {
       var _this3 = this;
-
       if (this.i18nFormat && this.i18nFormat.parse) {
-        res = this.i18nFormat.parse(res, _objectSpread$2$1(_objectSpread$2$1({}, this.options.interpolation.defaultVariables), options), resolved.usedLng, resolved.usedNS, resolved.usedKey, {
+        res = this.i18nFormat.parse(res, _objectSpread$4$1(_objectSpread$4$1({}, this.options.interpolation.defaultVariables), options), resolved.usedLng, resolved.usedNS, resolved.usedKey, {
           resolved: resolved
         });
       } else if (!options.skipInterpolation) {
-        if (options.interpolation) this.interpolator.init(_objectSpread$2$1(_objectSpread$2$1({}, options), {
-          interpolation: _objectSpread$2$1(_objectSpread$2$1({}, this.options.interpolation), options.interpolation)
+        if (options.interpolation) this.interpolator.init(_objectSpread$4$1(_objectSpread$4$1({}, options), {
+          interpolation: _objectSpread$4$1(_objectSpread$4$1({}, this.options.interpolation), options.interpolation)
         }));
         var skipOnVariables = typeof res === 'string' && (options && options.interpolation && options.interpolation.skipOnVariables !== undefined ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables);
         var nestBef;
-
         if (skipOnVariables) {
           var nb = res.match(this.interpolator.nestingRegexp);
           nestBef = nb && nb.length;
         }
-
         var data = options.replace && typeof options.replace !== 'string' ? options.replace : options;
-        if (this.options.interpolation.defaultVariables) data = _objectSpread$2$1(_objectSpread$2$1({}, this.options.interpolation.defaultVariables), data);
+        if (this.options.interpolation.defaultVariables) data = _objectSpread$4$1(_objectSpread$4$1({}, this.options.interpolation.defaultVariables), data);
         res = this.interpolator.interpolate(res, data, options.lng || this.language, options);
-
         if (skipOnVariables) {
           var na = res.match(this.interpolator.nestingRegexp);
           var nestAft = na && na.length;
           if (nestBef < nestAft) options.nest = false;
         }
-
         if (options.nest !== false) res = this.interpolator.nest(res, function () {
           for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
             args[_key] = arguments[_key];
           }
-
           if (lastKey && lastKey[0] === args[0] && !options.context) {
             _this3.logger.warn("It seems you are nesting recursively key: ".concat(args[0], " in key: ").concat(key[0]));
-
             return null;
           }
-
           return _this3.translate.apply(_this3, args.concat([key]));
         }, options);
         if (options.interpolation) this.interpolator.reset();
       }
-
       var postProcess = options.postProcess || this.options.postProcess;
       var postProcessorNames = typeof postProcess === 'string' ? [postProcess] : postProcess;
-
       if (res !== undefined && res !== null && postProcessorNames && postProcessorNames.length && options.applyPostProcessor !== false) {
-        res = postProcessor.handle(postProcessorNames, res, key, this.options && this.options.postProcessPassResolved ? _objectSpread$2$1({
+        res = postProcessor.handle(postProcessorNames, res, key, this.options && this.options.postProcessPassResolved ? _objectSpread$4$1({
           i18nResolved: resolved
         }, options) : options, this);
       }
-
       return res;
     }
   }, {
     key: "resolve",
     value: function resolve(keys) {
       var _this4 = this;
-
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var found;
       var usedKey;
@@ -923,65 +788,50 @@ var Translator = function (_EventEmitter) {
       if (typeof keys === 'string') keys = [keys];
       keys.forEach(function (k) {
         if (_this4.isValidLookup(found)) return;
-
         var extracted = _this4.extractFromKey(k, options);
-
         var key = extracted.key;
         usedKey = key;
         var namespaces = extracted.namespaces;
         if (_this4.options.fallbackNS) namespaces = namespaces.concat(_this4.options.fallbackNS);
         var needsPluralHandling = options.count !== undefined && typeof options.count !== 'string';
-
         var needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0 && _this4.pluralResolver.shouldUseIntlApi();
-
         var needsContextHandling = options.context !== undefined && (typeof options.context === 'string' || typeof options.context === 'number') && options.context !== '';
         var codes = options.lngs ? options.lngs : _this4.languageUtils.toResolveHierarchy(options.lng || _this4.language, options.fallbackLng);
         namespaces.forEach(function (ns) {
           if (_this4.isValidLookup(found)) return;
           usedNS = ns;
-
           if (!checkedLoadedFor["".concat(codes[0], "-").concat(ns)] && _this4.utils && _this4.utils.hasLoadedNamespace && !_this4.utils.hasLoadedNamespace(usedNS)) {
             checkedLoadedFor["".concat(codes[0], "-").concat(ns)] = true;
-
             _this4.logger.warn("key \"".concat(usedKey, "\" for languages \"").concat(codes.join(', '), "\" won't get resolved as namespace \"").concat(usedNS, "\" was not yet loaded"), 'This means something IS WRONG in your setup. You access the t function before i18next.init / i18next.loadNamespace / i18next.changeLanguage was done. Wait for the callback or Promise to resolve before accessing it!!!');
           }
-
           codes.forEach(function (code) {
             if (_this4.isValidLookup(found)) return;
             usedLng = code;
             var finalKeys = [key];
-
             if (_this4.i18nFormat && _this4.i18nFormat.addLookupKeys) {
               _this4.i18nFormat.addLookupKeys(finalKeys, key, code, ns, options);
             } else {
               var pluralSuffix;
               if (needsPluralHandling) pluralSuffix = _this4.pluralResolver.getSuffix(code, options.count, options);
               var zeroSuffix = "".concat(_this4.options.pluralSeparator, "zero");
-
               if (needsPluralHandling) {
                 finalKeys.push(key + pluralSuffix);
-
                 if (needsZeroSuffixLookup) {
                   finalKeys.push(key + zeroSuffix);
                 }
               }
-
               if (needsContextHandling) {
                 var contextKey = "".concat(key).concat(_this4.options.contextSeparator).concat(options.context);
                 finalKeys.push(contextKey);
-
                 if (needsPluralHandling) {
                   finalKeys.push(contextKey + pluralSuffix);
-
                   if (needsZeroSuffixLookup) {
                     finalKeys.push(contextKey + zeroSuffix);
                   }
                 }
               }
             }
-
             var possibleKey;
-
             while (possibleKey = finalKeys.pop()) {
               if (!_this4.isValidLookup(found)) {
                 exactUsedKey = possibleKey;
@@ -1015,33 +865,27 @@ var Translator = function (_EventEmitter) {
     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;
 }(EventEmitter);
 
 function capitalize(string) {
   return string.charAt(0).toUpperCase() + string.slice(1);
 }
-
 var LanguageUtil = function () {
   function LanguageUtil(options) {
     _classCallCheck(this, LanguageUtil);
-
     this.options = options;
     this.supportedLngs = this.options.supportedLngs || false;
     this.logger = baseLogger.create('languageUtils');
   }
-
   _createClass(LanguageUtil, [{
     key: "getScriptPartFromCode",
     value: function getScriptPartFromCode(code) {
@@ -1065,7 +909,6 @@ var LanguageUtil = function () {
       if (typeof code === 'string' && code.indexOf('-') > -1) {
         var specialCases = ['hans', 'hant', 'latn', 'cyrl', 'cans', 'mong', 'arab'];
         var p = code.split('-');
-
         if (this.options.lowerCaseLng) {
           p = p.map(function (part) {
             return part.toLowerCase();
@@ -1081,10 +924,8 @@ var LanguageUtil = function () {
           if (specialCases.indexOf(p[1].toLowerCase()) > -1) p[1] = capitalize(p[1].toLowerCase());
           if (specialCases.indexOf(p[2].toLowerCase()) > -1) p[2] = capitalize(p[2].toLowerCase());
         }
-
         return p.join('-');
       }
-
       return this.options.cleanCode || this.options.lowerCaseLng ? code.toLowerCase() : code;
     }
   }, {
@@ -1093,37 +934,29 @@ var LanguageUtil = function () {
       if (this.options.load === 'languageOnly' || this.options.nonExplicitSupportedLngs) {
         code = this.getLanguagePartFromCode(code);
       }
-
       return !this.supportedLngs || !this.supportedLngs.length || this.supportedLngs.indexOf(code) > -1;
     }
   }, {
     key: "getBestMatchFromCodes",
     value: function getBestMatchFromCodes(codes) {
       var _this = this;
-
       if (!codes) return null;
       var found;
       codes.forEach(function (code) {
         if (found) return;
-
         var cleanedLng = _this.formatLanguageCode(code);
-
         if (!_this.options.supportedLngs || _this.isSupportedCode(cleanedLng)) found = cleanedLng;
       });
-
       if (!found && this.options.supportedLngs) {
         codes.forEach(function (code) {
           if (found) return;
-
           var lngOnly = _this.getLanguagePartFromCode(code);
-
           if (_this.isSupportedCode(lngOnly)) return found = lngOnly;
           found = _this.options.supportedLngs.find(function (supportedLng) {
             if (supportedLng.indexOf(lngOnly) === 0) return supportedLng;
           });
         });
       }
-
       if (!found) found = this.getFallbackCodes(this.options.fallbackLng)[0];
       return found;
     }
@@ -1146,20 +979,16 @@ var LanguageUtil = function () {
     key: "toResolveHierarchy",
     value: function toResolveHierarchy(code, fallbackCode) {
       var _this2 = this;
-
       var fallbackCodes = this.getFallbackCodes(fallbackCode || this.options.fallbackLng || [], code);
       var codes = [];
-
       var addCode = function addCode(c) {
         if (!c) return;
-
         if (_this2.isSupportedCode(c)) {
           codes.push(c);
         } else {
           _this2.logger.warn("rejecting language code not found in supportedLngs: ".concat(c));
         }
       };
-
       if (typeof code === 'string' && code.indexOf('-') > -1) {
         if (this.options.load !== 'languageOnly') addCode(this.formatLanguageCode(code));
         if (this.options.load !== 'languageOnly' && this.options.load !== 'currentOnly') addCode(this.getScriptPartFromCode(code));
@@ -1167,14 +996,12 @@ var LanguageUtil = function () {
       } else if (typeof code === 'string') {
         addCode(this.formatLanguageCode(code));
       }
-
       fallbackCodes.forEach(function (fc) {
         if (codes.indexOf(fc) < 0) addCode(_this2.formatLanguageCode(fc));
       });
       return codes;
     }
   }]);
-
   return LanguageUtil;
 }();
 
@@ -1348,7 +1175,6 @@ var suffixesOrder = {
   many: 4,
   other: 5
 };
-
 function createRules() {
   var rules = {};
   sets.forEach(function (set) {
@@ -1361,25 +1187,19 @@ function createRules() {
   });
   return rules;
 }
-
 var PluralResolver = function () {
   function PluralResolver(languageUtils) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
     _classCallCheck(this, PluralResolver);
-
     this.languageUtils = languageUtils;
     this.options = options;
     this.logger = baseLogger.create('pluralResolver');
-
     if ((!this.options.compatibilityJSON || this.options.compatibilityJSON === 'v4') && (typeof Intl === 'undefined' || !Intl.PluralRules)) {
       this.options.compatibilityJSON = 'v3';
       this.logger.error('Your environment seems not to be Intl API compatible, use an Intl.PluralRules polyfill. Will fallback to the compatibilityJSON v3 format handling.');
     }
-
     this.rules = createRules();
   }
-
   _createClass(PluralResolver, [{
     key: "addRule",
     value: function addRule(lng, obj) {
@@ -1389,7 +1209,6 @@ var PluralResolver = function () {
     key: "getRule",
     value: function getRule(code) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       if (this.shouldUseIntlApi()) {
         try {
           return new Intl.PluralRules(code, {
@@ -1399,7 +1218,6 @@ var PluralResolver = function () {
           return;
         }
       }
-
       return this.rules[code] || this.rules[this.languageUtils.getLanguagePartFromCode(code)];
     }
   }, {
@@ -1407,11 +1225,9 @@ var PluralResolver = function () {
     value: function needsPlural(code) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var rule = this.getRule(code, options);
-
       if (this.shouldUseIntlApi()) {
         return rule && rule.resolvedOptions().pluralCategories.length > 1;
       }
-
       return rule && rule.numbers.length > 1;
     }
   }, {
@@ -1426,14 +1242,11 @@ var PluralResolver = function () {
     key: "getSuffixes",
     value: function getSuffixes(code) {
       var _this = this;
-
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var rule = this.getRule(code, options);
-
       if (!rule) {
         return [];
       }
-
       if (this.shouldUseIntlApi()) {
         return rule.resolvedOptions().pluralCategories.sort(function (pluralCategory1, pluralCategory2) {
           return suffixesOrder[pluralCategory1] - suffixesOrder[pluralCategory2];
@@ -1441,7 +1254,6 @@ var PluralResolver = function () {
           return "".concat(_this.options.prepend).concat(pluralCategory);
         });
       }
-
       return rule.numbers.map(function (number) {
         return _this.getSuffix(code, number, options);
       });
@@ -1451,15 +1263,12 @@ var PluralResolver = function () {
     value: function getSuffix(code, count) {
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       var rule = this.getRule(code, options);
-
       if (rule) {
         if (this.shouldUseIntlApi()) {
           return "".concat(this.options.prepend).concat(rule.select(count));
         }
-
         return this.getSuffixRetroCompatible(rule, count);
       }
-
       this.logger.warn("no plural rule found for: ".concat(code));
       return '';
     }
@@ -1467,10 +1276,8 @@ var PluralResolver = function () {
     key: "getSuffixRetroCompatible",
     value: function getSuffixRetroCompatible(rule, count) {
       var _this2 = this;
-
       var idx = rule.noAbs ? rule.plurals(count) : rule.plurals(Math.abs(count));
       var suffix = rule.numbers[idx];
-
       if (this.options.simplifyPluralSuffix && rule.numbers.length === 2 && rule.numbers[0] === 1) {
         if (suffix === 2) {
           suffix = 'plural';
@@ -1478,11 +1285,9 @@ var PluralResolver = function () {
           suffix = '';
         }
       }
-
       var returnSuffix = function returnSuffix() {
         return _this2.options.prepend && suffix.toString() ? _this2.options.prepend + suffix.toString() : suffix.toString();
       };
-
       if (this.options.compatibilityJSON === 'v1') {
         if (suffix === 1) return '';
         if (typeof suffix === 'number') return "_plural_".concat(suffix.toString());
@@ -1492,7 +1297,6 @@ var PluralResolver = function () {
       } else if (this.options.simplifyPluralSuffix && rule.numbers.length === 2 && rule.numbers[0] === 1) {
         return returnSuffix();
       }
-
       return this.options.prepend && idx.toString() ? this.options.prepend + idx.toString() : idx.toString();
     }
   }, {
@@ -1501,30 +1305,22 @@ var PluralResolver = function () {
       return !deprecatedJsonVersions.includes(this.options.compatibilityJSON);
     }
   }]);
-
   return PluralResolver;
 }();
 
-function ownKeys$3$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$3$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$3$1(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$3$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
+function ownKeys$3$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$3$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$3$1(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$3$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Interpolator = function () {
   function Interpolator() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
     _classCallCheck(this, Interpolator);
-
     this.logger = baseLogger.create('interpolator');
     this.options = options;
-
     this.format = options.interpolation && options.interpolation.format || function (value) {
       return value;
     };
-
     this.init(options);
   }
-
   _createClass(Interpolator, [{
     key: "init",
     value: function init() {
@@ -1567,16 +1363,13 @@ var Interpolator = function () {
     key: "interpolate",
     value: function interpolate(str, data, lng, options) {
       var _this = this;
-
       var match;
       var value;
       var replaces;
       var defaultData = this.options && this.options.interpolation && this.options.interpolation.defaultVariables || {};
-
       function regexSafe(val) {
         return val.replace(/\$/g, '$$$$');
       }
-
       var handleFormat = function handleFormat(key) {
         if (key.indexOf(_this.formatSeparator) < 0) {
           var path = getPathWithDefaults(data, defaultData, key);
@@ -1584,7 +1377,6 @@ var Interpolator = function () {
             interpolationkey: key
           })) : path;
         }
-
         var p = key.split(_this.formatSeparator);
         var k = p.shift().trim();
         var f = p.join(_this.formatSeparator).trim();
@@ -1592,7 +1384,6 @@ var Interpolator = function () {
           interpolationkey: k
         }));
       };
-
       this.resetRegExp();
       var missingInterpolationHandler = options && options.missingInterpolationHandler || this.options.missingInterpolationHandler;
       var skipOnVariables = options && options.interpolation && options.interpolation.skipOnVariables !== undefined ? options.interpolation.skipOnVariables : this.options.interpolation.skipOnVariables;
@@ -1609,11 +1400,9 @@ var Interpolator = function () {
       }];
       todos.forEach(function (todo) {
         replaces = 0;
-
         while (match = todo.regex.exec(str)) {
           var matchedVar = match[1].trim();
           value = handleFormat(matchedVar);
-
           if (value === undefined) {
             if (typeof missingInterpolationHandler === 'function') {
               var temp = missingInterpolationHandler(str, match, options);
@@ -1625,25 +1414,20 @@ var Interpolator = function () {
               continue;
             } else {
               _this.logger.warn("missed to pass in variable ".concat(matchedVar, " for interpolating ").concat(str));
-
               value = '';
             }
           } else if (typeof value !== 'string' && !_this.useRawValueToEscape) {
             value = makeString(value);
           }
-
           var safeValue = todo.safeValue(value);
           str = str.replace(match[0], safeValue);
-
           if (skipOnVariables) {
             todo.regex.lastIndex += value.length;
             todo.regex.lastIndex -= match[0].length;
           } else {
             todo.regex.lastIndex = 0;
           }
-
           replaces++;
-
           if (replaces >= _this.maxReplaces) {
             break;
           }
@@ -1655,16 +1439,10 @@ var Interpolator = function () {
     key: "nest",
     value: function nest(str, fc) {
       var _this2 = this;
-
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       var match;
       var value;
-
-      var clonedOptions = _objectSpread$3$1({}, options);
-
-      clonedOptions.applyPostProcessor = false;
-      delete clonedOptions.defaultValue;
-
+      var clonedOptions;
       function handleHasOptions(key, inheritedOptions) {
         var sep = this.nestingOptionsSeparator;
         if (key.indexOf(sep) < 0) return key;
@@ -1672,8 +1450,11 @@ var Interpolator = function () {
         var optionsString = "{".concat(c[1]);
         key = c[0];
         optionsString = this.interpolate(optionsString, clonedOptions);
-        optionsString = optionsString.replace(/'/g, '"');
-
+        var matchedSingleQuotes = optionsString.match(/'/g);
+        var matchedDoubleQuotes = optionsString.match(/"/g);
+        if (matchedSingleQuotes && matchedSingleQuotes.length % 2 === 0 && !matchedDoubleQuotes || matchedDoubleQuotes.length % 2 !== 0) {
+          optionsString = optionsString.replace(/'/g, '"');
+        }
         try {
           clonedOptions = JSON.parse(optionsString);
           if (inheritedOptions) clonedOptions = _objectSpread$3$1(_objectSpread$3$1({}, inheritedOptions), clonedOptions);
@@ -1681,15 +1462,16 @@ var Interpolator = function () {
           this.logger.warn("failed parsing options string in nesting for key ".concat(key), e);
           return "".concat(key).concat(sep).concat(optionsString);
         }
-
         delete clonedOptions.defaultValue;
         return key;
       }
-
       while (match = this.nestingRegexp.exec(str)) {
         var formatters = [];
+        clonedOptions = _objectSpread$3$1({}, options);
+        clonedOptions = clonedOptions.replace && typeof clonedOptions.replace !== 'string' ? clonedOptions.replace : clonedOptions;
+        clonedOptions.applyPostProcessor = false;
+        delete clonedOptions.defaultValue;
         var doReduce = false;
-
         if (match[0].indexOf(this.formatSeparator) !== -1 && !/{.*}/.test(match[1])) {
           var r = match[1].split(this.formatSeparator).map(function (elem) {
             return elem.trim();
@@ -1698,16 +1480,13 @@ var Interpolator = function () {
           formatters = r;
           doReduce = true;
         }
-
         value = fc(handleHasOptions.call(this, match[1].trim(), clonedOptions), clonedOptions);
         if (value && match[0] === str && typeof value !== 'string') return value;
         if (typeof value !== 'string') value = makeString(value);
-
         if (!value) {
           this.logger.warn("missed to resolve ".concat(match[1], " for nesting ").concat(str));
           value = '';
         }
-
         if (doReduce) {
           value = formatters.reduce(function (v, f) {
             return _this2.format(v, f, options.lng, _objectSpread$3$1(_objectSpread$3$1({}, options), {}, {
@@ -1715,31 +1494,24 @@ var Interpolator = function () {
             }));
           }, value.trim());
         }
-
         str = str.replace(match[0], value);
         this.regexp.lastIndex = 0;
       }
-
       return str;
     }
   }]);
-
   return Interpolator;
 }();
 
-function ownKeys$4$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$4$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$4$1(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$4$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
+function ownKeys$2$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$2$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$2$1(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$2$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function parseFormatStr(formatStr) {
   var formatName = formatStr.toLowerCase().trim();
   var formatOptions = {};
-
   if (formatStr.indexOf('(') > -1) {
     var p = formatStr.split('(');
     formatName = p[0].toLowerCase().trim();
     var optStr = p[1].substring(0, p[1].length - 1);
-
     if (formatName === 'currency' && optStr.indexOf(':') < 0) {
       if (!formatOptions.currency) formatOptions.currency = optStr.trim();
     } else if (formatName === 'relativetime' && optStr.indexOf(':') < 0) {
@@ -1748,12 +1520,10 @@ function parseFormatStr(formatStr) {
       var opts = optStr.split(';');
       opts.forEach(function (opt) {
         if (!opt) return;
-
         var _opt$split = opt.split(':'),
-            _opt$split2 = _toArray(_opt$split),
-            key = _opt$split2[0],
-            rest = _opt$split2.slice(1);
-
+          _opt$split2 = _toArray(_opt$split),
+          key = _opt$split2[0],
+          rest = _opt$split2.slice(1);
         var val = rest.join(':').trim().replace(/^'+|'+$/g, '');
         if (!formatOptions[key.trim()]) formatOptions[key.trim()] = val;
         if (val === 'false') formatOptions[key.trim()] = false;
@@ -1762,43 +1532,65 @@ function parseFormatStr(formatStr) {
       });
     }
   }
-
   return {
     formatName: formatName,
     formatOptions: formatOptions
   };
 }
-
+function createCachedFormatter(fn) {
+  var cache = {};
+  return function invokeFormatter(val, lng, options) {
+    var key = lng + JSON.stringify(options);
+    var formatter = cache[key];
+    if (!formatter) {
+      formatter = fn(lng, options);
+      cache[key] = formatter;
+    }
+    return formatter(val);
+  };
+}
 var Formatter = function () {
   function Formatter() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
     _classCallCheck(this, Formatter);
-
     this.logger = baseLogger.create('formatter');
     this.options = options;
     this.formats = {
-      number: function number(val, lng, options) {
-        return new Intl.NumberFormat(lng, options).format(val);
-      },
-      currency: function currency(val, lng, options) {
-        return new Intl.NumberFormat(lng, _objectSpread$4$1(_objectSpread$4$1({}, options), {}, {
+      number: createCachedFormatter(function (lng, options) {
+        var formatter = new Intl.NumberFormat(lng, options);
+        return function (val) {
+          return formatter.format(val);
+        };
+      }),
+      currency: createCachedFormatter(function (lng, options) {
+        var formatter = new Intl.NumberFormat(lng, _objectSpread$2$1(_objectSpread$2$1({}, options), {}, {
           style: 'currency'
-        })).format(val);
-      },
-      datetime: function datetime(val, lng, options) {
-        return new Intl.DateTimeFormat(lng, _objectSpread$4$1({}, options)).format(val);
-      },
-      relativetime: function relativetime(val, lng, options) {
-        return new Intl.RelativeTimeFormat(lng, _objectSpread$4$1({}, options)).format(val, options.range || 'day');
-      },
-      list: function list(val, lng, options) {
-        return new Intl.ListFormat(lng, _objectSpread$4$1({}, options)).format(val);
-      }
+        }));
+        return function (val) {
+          return formatter.format(val);
+        };
+      }),
+      datetime: createCachedFormatter(function (lng, options) {
+        var formatter = new Intl.DateTimeFormat(lng, _objectSpread$2$1({}, options));
+        return function (val) {
+          return formatter.format(val);
+        };
+      }),
+      relativetime: createCachedFormatter(function (lng, options) {
+        var formatter = new Intl.RelativeTimeFormat(lng, _objectSpread$2$1({}, options));
+        return function (val) {
+          return formatter.format(val, options.range || 'day');
+        };
+      }),
+      list: createCachedFormatter(function (lng, options) {
+        var formatter = new Intl.ListFormat(lng, _objectSpread$2$1({}, options));
+        return function (val) {
+          return formatter.format(val);
+        };
+      })
     };
     this.init(options);
   }
-
   _createClass(Formatter, [{
     key: "init",
     value: function init(services) {
@@ -1813,76 +1605,62 @@ var Formatter = function () {
     value: function add(name, fc) {
       this.formats[name.toLowerCase().trim()] = fc;
     }
+  }, {
+    key: "addCached",
+    value: function addCached(name, fc) {
+      this.formats[name.toLowerCase().trim()] = createCachedFormatter(fc);
+    }
   }, {
     key: "format",
     value: function format(value, _format, lng, options) {
       var _this = this;
-
       var formats = _format.split(this.formatSeparator);
-
       var result = formats.reduce(function (mem, f) {
         var _parseFormatStr = parseFormatStr(f),
-            formatName = _parseFormatStr.formatName,
-            formatOptions = _parseFormatStr.formatOptions;
-
+          formatName = _parseFormatStr.formatName,
+          formatOptions = _parseFormatStr.formatOptions;
         if (_this.formats[formatName]) {
           var formatted = mem;
-
           try {
             var valOptions = options && options.formatParams && options.formatParams[options.interpolationkey] || {};
             var l = valOptions.locale || valOptions.lng || options.locale || options.lng || lng;
-            formatted = _this.formats[formatName](mem, l, _objectSpread$4$1(_objectSpread$4$1(_objectSpread$4$1({}, formatOptions), options), valOptions));
+            formatted = _this.formats[formatName](mem, l, _objectSpread$2$1(_objectSpread$2$1(_objectSpread$2$1({}, formatOptions), options), valOptions));
           } catch (error) {
             _this.logger.warn(error);
           }
-
           return formatted;
         } else {
           _this.logger.warn("there was no format function for ".concat(formatName));
         }
-
         return mem;
       }, value);
       return result;
     }
   }]);
-
   return Formatter;
 }();
 
-function ownKeys$5$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$5$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$5$1(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$5$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _createSuper$2(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$2(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct$2() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+function ownKeys$1$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$1$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1$1(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _isNativeReflectConstruct$1() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function removePending(q, name) {
   if (q.pending[name] !== undefined) {
     delete q.pending[name];
     q.pendingCount--;
   }
 }
-
 var Connector = function (_EventEmitter) {
   _inherits(Connector, _EventEmitter);
-
-  var _super = _createSuper$2(Connector);
-
+  var _super = _createSuper$1(Connector);
   function Connector(backend, store, services) {
     var _this;
-
     var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
     _classCallCheck(this, Connector);
-
     _this = _super.call(this);
-
     if (isIE10) {
       EventEmitter.call(_assertThisInitialized(_this));
     }
-
     _this.backend = backend;
     _this.store = store;
     _this.services = services;
@@ -1892,21 +1670,19 @@ var Connector = function (_EventEmitter) {
     _this.waitingReads = [];
     _this.maxParallelReads = options.maxParallelReads || 10;
     _this.readingCalls = 0;
+    _this.maxRetries = options.maxRetries >= 0 ? options.maxRetries : 5;
+    _this.retryTimeout = options.retryTimeout >= 1 ? options.retryTimeout : 350;
     _this.state = {};
     _this.queue = [];
-
     if (_this.backend && _this.backend.init) {
       _this.backend.init(services, options.backend, options);
     }
-
     return _this;
   }
-
   _createClass(Connector, [{
     key: "queueLoad",
     value: function queueLoad(languages, namespaces, options, callback) {
       var _this2 = this;
-
       var toLoad = {};
       var pending = {};
       var toLoadLanguages = {};
@@ -1915,7 +1691,6 @@ var Connector = function (_EventEmitter) {
         var hasAllNamespaces = true;
         namespaces.forEach(function (ns) {
           var name = "".concat(lng, "|").concat(ns);
-
           if (!options.reload && _this2.store.hasResourceBundle(lng, ns)) {
             _this2.state[name] = 2;
           } else if (_this2.state[name] < 0) ; else if (_this2.state[name] === 1) {
@@ -1930,7 +1705,6 @@ var Connector = function (_EventEmitter) {
         });
         if (!hasAllNamespaces) toLoadLanguages[lng] = true;
       });
-
       if (Object.keys(toLoad).length || Object.keys(pending).length) {
         this.queue.push({
           pending: pending,
@@ -1940,7 +1714,6 @@ var Connector = function (_EventEmitter) {
           callback: callback
         });
       }
-
       return {
         toLoad: Object.keys(toLoad),
         pending: Object.keys(pending),
@@ -1955,23 +1728,19 @@ var Connector = function (_EventEmitter) {
       var lng = s[0];
       var ns = s[1];
       if (err) this.emit('failedLoading', lng, ns, err);
-
       if (data) {
         this.store.addResourceBundle(lng, ns, data);
       }
-
       this.state[name] = err ? -1 : 2;
       var loaded = {};
       this.queue.forEach(function (q) {
         pushPath(q.loaded, [lng], ns);
         removePending(q, name);
         if (err) q.errors.push(err);
-
         if (q.pendingCount === 0 && !q.done) {
           Object.keys(q.loaded).forEach(function (l) {
             if (!loaded[l]) loaded[l] = {};
             var loadedKeys = q.loaded[l];
-
             if (loadedKeys.length) {
               loadedKeys.forEach(function (ns) {
                 if (loaded[l][ns] === undefined) loaded[l][ns] = true;
@@ -1979,7 +1748,6 @@ var Connector = function (_EventEmitter) {
             }
           });
           q.done = true;
-
           if (q.errors.length) {
             q.callback(q.errors);
           } else {
@@ -1996,12 +1764,10 @@ var Connector = function (_EventEmitter) {
     key: "read",
     value: function read(lng, ns, fcName) {
       var _this3 = this;
-
       var tried = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-      var wait = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 350;
+      var wait = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : this.retryTimeout;
       var callback = arguments.length > 5 ? arguments[5] : undefined;
       if (!lng.length) return callback(null, {});
-
       if (this.readingCalls >= this.maxParallelReads) {
         this.waitingReads.push({
           lng: lng,
@@ -2013,49 +1779,56 @@ var Connector = function (_EventEmitter) {
         });
         return;
       }
-
       this.readingCalls++;
-      return this.backend[fcName](lng, ns, function (err, data) {
-        if (err && data && tried < 5) {
-          setTimeout(function () {
-            _this3.read.call(_this3, lng, ns, fcName, tried + 1, wait * 2, callback);
-          }, wait);
-          return;
-        }
-
+      var resolver = function resolver(err, data) {
         _this3.readingCalls--;
-
         if (_this3.waitingReads.length > 0) {
           var next = _this3.waitingReads.shift();
-
           _this3.read(next.lng, next.ns, next.fcName, next.tried, next.wait, next.callback);
         }
-
+        if (err && data && tried < _this3.maxRetries) {
+          setTimeout(function () {
+            _this3.read.call(_this3, lng, ns, fcName, tried + 1, wait * 2, callback);
+          }, wait);
+          return;
+        }
         callback(err, data);
-      });
+      };
+      var fc = this.backend[fcName].bind(this.backend);
+      if (fc.length === 2) {
+        try {
+          var r = fc(lng, ns);
+          if (r && typeof r.then === 'function') {
+            r.then(function (data) {
+              return resolver(null, data);
+            })["catch"](resolver);
+          } else {
+            resolver(null, r);
+          }
+        } catch (err) {
+          resolver(err);
+        }
+        return;
+      }
+      return fc(lng, ns, resolver);
     }
   }, {
     key: "prepareLoading",
     value: function prepareLoading(languages, namespaces) {
       var _this4 = this;
-
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       var callback = arguments.length > 3 ? arguments[3] : undefined;
-
       if (!this.backend) {
         this.logger.warn('No backend was added via i18next.use. Will not load resources.');
         return callback && callback();
       }
-
       if (typeof languages === 'string') languages = this.languageUtils.toResolveHierarchy(languages);
       if (typeof namespaces === 'string') namespaces = [namespaces];
       var toLoad = this.queueLoad(languages, namespaces, options, callback);
-
       if (!toLoad.toLoad.length) {
         if (!toLoad.pending.length) callback();
         return null;
       }
-
       toLoad.toLoad.forEach(function (name) {
         _this4.loadOne(name);
       });
@@ -2076,7 +1849,6 @@ var Connector = function (_EventEmitter) {
     key: "loadOne",
     value: function loadOne(name) {
       var _this5 = this;
-
       var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
       var s = name.split('|');
       var lng = s[0];
@@ -2084,7 +1856,6 @@ var Connector = function (_EventEmitter) {
       this.read(lng, ns, 'read', undefined, undefined, function (err, data) {
         if (err) _this5.logger.warn("".concat(prefix, "loading namespace ").concat(ns, " for language ").concat(lng, " failed"), err);
         if (!err && data) _this5.logger.log("".concat(prefix, "loaded namespace ").concat(ns, " for language ").concat(lng), data);
-
         _this5.loaded(name, err, data);
       });
     }
@@ -2092,25 +1863,43 @@ var Connector = function (_EventEmitter) {
     key: "saveMissing",
     value: function saveMissing(languages, namespace, key, fallbackValue, isUpdate) {
       var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
-
+      var clb = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : function () {};
       if (this.services.utils && this.services.utils.hasLoadedNamespace && !this.services.utils.hasLoadedNamespace(namespace)) {
         this.logger.warn("did not save key \"".concat(key, "\" as the namespace \"").concat(namespace, "\" was not yet loaded"), 'This means something IS WRONG in your setup. You access the t function before i18next.init / i18next.loadNamespace / i18next.changeLanguage was done. Wait for the callback or Promise to resolve before accessing it!!!');
         return;
       }
-
       if (key === undefined || key === null || key === '') return;
-
       if (this.backend && this.backend.create) {
-        this.backend.create(languages, namespace, key, fallbackValue, null, _objectSpread$5$1(_objectSpread$5$1({}, options), {}, {
+        var opts = _objectSpread$1$1(_objectSpread$1$1({}, options), {}, {
           isUpdate: isUpdate
-        }));
+        });
+        var fc = this.backend.create.bind(this.backend);
+        if (fc.length < 6) {
+          try {
+            var r;
+            if (fc.length === 5) {
+              r = fc(languages, namespace, key, fallbackValue, opts);
+            } else {
+              r = fc(languages, namespace, key, fallbackValue);
+            }
+            if (r && typeof r.then === 'function') {
+              r.then(function (data) {
+                return clb(null, data);
+              })["catch"](clb);
+            } else {
+              clb(null, r);
+            }
+          } catch (err) {
+            clb(err);
+          }
+        } else {
+          fc(languages, namespace, key, fallbackValue, clb, opts);
+        }
       }
-
       if (!languages || !languages[0]) return;
       this.store.addResource(languages[0], namespace, key, fallbackValue);
     }
   }]);
-
   return Connector;
 }(EventEmitter);
 
@@ -2153,14 +1942,12 @@ function get() {
       if (_typeof(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(args[2]) === 'object' || _typeof(args[3]) === 'object') {
         var options = args[3] || args[2];
         Object.keys(options).forEach(function (key) {
           ret[key] = options[key];
         });
       }
-
       return ret;
     },
     interpolation: {
@@ -2184,24 +1971,17 @@ function transformOptions(options) {
   if (typeof options.ns === 'string') options.ns = [options.ns];
   if (typeof options.fallbackLng === 'string') options.fallbackLng = [options.fallbackLng];
   if (typeof options.fallbackNS === 'string') options.fallbackNS = [options.fallbackNS];
-
   if (options.supportedLngs && options.supportedLngs.indexOf('cimode') < 0) {
     options.supportedLngs = options.supportedLngs.concat(['cimode']);
   }
-
   return options;
 }
 
-function ownKeys$6$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$6$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$6$1(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$6$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _createSuper$3(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$3(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct$3() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+function ownKeys$9(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread$9(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$9(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$9(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function noop$1() {}
-
 function bindMemberFunctions(inst) {
   var mems = Object.getOwnPropertyNames(Object.getPrototypeOf(inst));
   mems.forEach(function (mem) {
@@ -2210,26 +1990,18 @@ function bindMemberFunctions(inst) {
     }
   });
 }
-
 var I18n = function (_EventEmitter) {
   _inherits(I18n, _EventEmitter);
-
-  var _super = _createSuper$3(I18n);
-
+  var _super = _createSuper(I18n);
   function I18n() {
     var _this;
-
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var callback = arguments.length > 1 ? arguments[1] : undefined;
-
     _classCallCheck(this, I18n);
-
     _this = _super.call(this);
-
     if (isIE10) {
       EventEmitter.call(_assertThisInitialized(_this));
     }
-
     _this.options = transformOptions(options);
     _this.services = {};
     _this.logger = baseLogger;
@@ -2237,79 +2009,62 @@ var I18n = function (_EventEmitter) {
       external: []
     };
     bindMemberFunctions(_assertThisInitialized(_this));
-
     if (callback && !_this.isInitialized && !options.isClone) {
       if (!_this.options.initImmediate) {
         _this.init(options, callback);
-
         return _possibleConstructorReturn(_this, _assertThisInitialized(_this));
       }
-
       setTimeout(function () {
         _this.init(options, callback);
       }, 0);
     }
-
     return _this;
   }
-
   _createClass(I18n, [{
     key: "init",
     value: function init() {
       var _this2 = this;
-
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var callback = arguments.length > 1 ? arguments[1] : undefined;
-
       if (typeof options === 'function') {
         callback = options;
         options = {};
       }
-
-      if (!options.defaultNS && options.ns) {
+      if (!options.defaultNS && options.defaultNS !== false && options.ns) {
         if (typeof options.ns === 'string') {
           options.defaultNS = options.ns;
         } else if (options.ns.indexOf('translation') < 0) {
           options.defaultNS = options.ns[0];
         }
       }
-
       var defOpts = get();
-      this.options = _objectSpread$6$1(_objectSpread$6$1(_objectSpread$6$1({}, defOpts), this.options), transformOptions(options));
-
+      this.options = _objectSpread$9(_objectSpread$9(_objectSpread$9({}, defOpts), this.options), transformOptions(options));
       if (this.options.compatibilityAPI !== 'v1') {
-        this.options.interpolation = _objectSpread$6$1(_objectSpread$6$1({}, defOpts.interpolation), this.options.interpolation);
+        this.options.interpolation = _objectSpread$9(_objectSpread$9({}, defOpts.interpolation), this.options.interpolation);
       }
-
       if (options.keySeparator !== undefined) {
         this.options.userDefinedKeySeparator = options.keySeparator;
       }
-
       if (options.nsSeparator !== undefined) {
         this.options.userDefinedNsSeparator = options.nsSeparator;
       }
-
       function createClassOnDemand(ClassOrObject) {
         if (!ClassOrObject) return null;
         if (typeof ClassOrObject === 'function') return new ClassOrObject();
         return ClassOrObject;
       }
-
       if (!this.options.isClone) {
         if (this.modules.logger) {
           baseLogger.init(createClassOnDemand(this.modules.logger), this.options);
         } else {
           baseLogger.init(null, this.options);
         }
-
         var formatter;
-
         if (this.modules.formatter) {
           formatter = this.modules.formatter;
         } else if (typeof Intl !== 'undefined') {
           formatter = Formatter;
         }
-
         var lu = new LanguageUtil(this.options);
         this.store = new ResourceStore(this.options.resources, this.options);
         var s = this.services;
@@ -2321,13 +2076,11 @@ var I18n = function (_EventEmitter) {
           compatibilityJSON: this.options.compatibilityJSON,
           simplifyPluralSuffix: this.options.simplifyPluralSuffix
         });
-
         if (formatter && (!this.options.interpolation.format || this.options.interpolation.format === defOpts.interpolation.format)) {
           s.formatter = createClassOnDemand(formatter);
           s.formatter.init(s, this.options);
           this.options.interpolation.format = s.formatter.format.bind(s.formatter);
         }
-
         s.interpolator = new Interpolator(this.options);
         s.utils = {
           hasLoadedNamespace: this.hasLoadedNamespace.bind(this)
@@ -2337,50 +2090,40 @@ var I18n = function (_EventEmitter) {
           for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
             args[_key - 1] = arguments[_key];
           }
-
           _this2.emit.apply(_this2, [event].concat(args));
         });
-
         if (this.modules.languageDetector) {
           s.languageDetector = createClassOnDemand(this.modules.languageDetector);
-          s.languageDetector.init(s, this.options.detection, this.options);
+          if (s.languageDetector.init) s.languageDetector.init(s, this.options.detection, this.options);
         }
-
         if (this.modules.i18nFormat) {
           s.i18nFormat = createClassOnDemand(this.modules.i18nFormat);
           if (s.i18nFormat.init) s.i18nFormat.init(this);
         }
-
         this.translator = new Translator(this.services, this.options);
         this.translator.on('*', function (event) {
           for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
             args[_key2 - 1] = arguments[_key2];
           }
-
           _this2.emit.apply(_this2, [event].concat(args));
         });
         this.modules.external.forEach(function (m) {
           if (m.init) m.init(_this2);
         });
       }
-
       this.format = this.options.interpolation.format;
       if (!callback) callback = noop$1;
-
       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');
       }
-
       var storeApi = ['getResource', 'hasResourceBundle', 'getResourceBundle', 'getDataByLanguage'];
       storeApi.forEach(function (fcName) {
         _this2[fcName] = function () {
           var _this2$store;
-
           return (_this2$store = _this2.store)[fcName].apply(_this2$store, arguments);
         };
       });
@@ -2388,63 +2131,48 @@ var I18n = function (_EventEmitter) {
       storeApiChained.forEach(function (fcName) {
         _this2[fcName] = function () {
           var _this2$store2;
-
           (_this2$store2 = _this2.store)[fcName].apply(_this2$store2, arguments);
-
           return _this2;
         };
       });
       var deferred = defer();
-
       var load = function load() {
         var finish = function finish(err, t) {
           if (_this2.isInitialized && !_this2.initializedStoreOnce) _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);
-
           _this2.emit('initialized', _this2.options);
-
           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) {
         load();
       } else {
         setTimeout(load, 0);
       }
-
       return deferred;
     }
   }, {
     key: "loadResources",
     value: function loadResources(language) {
       var _this3 = this;
-
       var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : noop$1;
       var usedCallback = callback;
       var usedLng = typeof language === 'string' ? language : this.language;
       if (typeof language === 'function') usedCallback = language;
-
       if (!this.options.resources || this.options.partialBundledLanguages) {
         if (usedLng && usedLng.toLowerCase() === 'cimode') return usedCallback();
         var toLoad = [];
-
         var append = function append(lng) {
           if (!lng) return;
-
           var lngs = _this3.services.languageUtils.toResolveHierarchy(lng);
-
           lngs.forEach(function (l) {
             if (toLoad.indexOf(l) < 0) toLoad.push(l);
           });
         };
-
         if (!usedLng) {
           var fallbacks = this.services.languageUtils.getFallbackCodes(this.options.fallbackLng);
           fallbacks.forEach(function (l) {
@@ -2453,13 +2181,11 @@ var I18n = function (_EventEmitter) {
         } else {
           append(usedLng);
         }
-
         if (this.options.preload) {
           this.options.preload.forEach(function (l) {
             return append(l);
           });
         }
-
         this.services.backendConnector.load(toLoad, this.options.ns, function (e) {
           if (!e && !_this3.resolvedLanguage && _this3.language) _this3.setResolvedLanguage(_this3.language);
           usedCallback(e);
@@ -2486,35 +2212,27 @@ var I18n = function (_EventEmitter) {
     value: function use(module) {
       if (!module) throw new Error('You are passing an undefined module! Please check the object you are passing to i18next.use()');
       if (!module.type) throw new Error('You are passing a wrong module! Please check the object you are passing to i18next.use()');
-
       if (module.type === 'backend') {
         this.modules.backend = module;
       }
-
       if (module.type === 'logger' || module.log && module.warn && module.error) {
         this.modules.logger = module;
       }
-
       if (module.type === 'languageDetector') {
         this.modules.languageDetector = module;
       }
-
       if (module.type === 'i18nFormat') {
         this.modules.i18nFormat = module;
       }
-
       if (module.type === 'postProcessor') {
         postProcessor.addPostProcessor(module);
       }
-
       if (module.type === 'formatter') {
         this.modules.formatter = module;
       }
-
       if (module.type === '3rdParty') {
         this.modules.external.push(module);
       }
-
       return this;
     }
   }, {
@@ -2522,11 +2240,9 @@ var I18n = function (_EventEmitter) {
     value: function setResolvedLanguage(l) {
       if (!l || !this.languages) return;
       if (['cimode', 'dev'].indexOf(l) > -1) return;
-
       for (var li = 0; li < this.languages.length; li++) {
         var lngInLngs = this.languages[li];
         if (['cimode', 'dev'].indexOf(lngInLngs) > -1) continue;
-
         if (this.store.hasLanguageSomeTranslations(lngInLngs)) {
           this.resolvedLanguage = lngInLngs;
           break;
@@ -2537,34 +2253,25 @@ var I18n = function (_EventEmitter) {
     key: "changeLanguage",
     value: function changeLanguage(lng, callback) {
       var _this4 = this;
-
       this.isLanguageChangingTo = lng;
       var deferred = defer();
       this.emit('languageChanging', lng);
-
       var setLngProps = function setLngProps(l) {
         _this4.language = l;
         _this4.languages = _this4.services.languageUtils.toResolveHierarchy(l);
         _this4.resolvedLanguage = undefined;
-
         _this4.setResolvedLanguage(l);
       };
-
       var done = function done(err, l) {
         if (l) {
           setLngProps(l);
-
           _this4.translator.changeLanguage(l);
-
           _this4.isLanguageChangingTo = undefined;
-
           _this4.emit('languageChanged', l);
-
           _this4.logger.log('languageChanged', l);
         } else {
           _this4.isLanguageChangingTo = undefined;
         }
-
         deferred.resolve(function () {
           return _this4.t.apply(_this4, arguments);
         });
@@ -2572,67 +2279,67 @@ var I18n = function (_EventEmitter) {
           return _this4.t.apply(_this4, arguments);
         });
       };
-
       var setLng = function setLng(lngs) {
         if (!lng && !lngs && _this4.services.languageDetector) lngs = [];
         var l = typeof lngs === 'string' ? lngs : _this4.services.languageUtils.getBestMatchFromCodes(lngs);
-
         if (l) {
           if (!_this4.language) {
             setLngProps(l);
           }
-
           if (!_this4.translator.language) _this4.translator.changeLanguage(l);
-          if (_this4.services.languageDetector) _this4.services.languageDetector.cacheUserLanguage(l);
+          if (_this4.services.languageDetector && _this4.services.languageDetector.cacheUserLanguage) _this4.services.languageDetector.cacheUserLanguage(l);
         }
-
         _this4.loadResources(l, function (err) {
           done(err, l);
         });
       };
-
       if (!lng && this.services.languageDetector && !this.services.languageDetector.async) {
         setLng(this.services.languageDetector.detect());
       } else if (!lng && this.services.languageDetector && this.services.languageDetector.async) {
-        this.services.languageDetector.detect(setLng);
+        if (this.services.languageDetector.detect.length === 0) {
+          this.services.languageDetector.detect().then(setLng);
+        } else {
+          this.services.languageDetector.detect(setLng);
+        }
       } else {
         setLng(lng);
       }
-
       return deferred;
     }
   }, {
     key: "getFixedT",
     value: function getFixedT(lng, ns, keyPrefix) {
       var _this5 = this;
-
       var fixedT = function fixedT(key, opts) {
         var options;
-
         if (_typeof(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];
           }
-
           options = _this5.options.overloadTranslationOptionHandler([key, opts].concat(rest));
         } else {
-          options = _objectSpread$6$1({}, opts);
+          options = _objectSpread$9({}, opts);
         }
-
         options.lng = options.lng || fixedT.lng;
         options.lngs = options.lngs || fixedT.lngs;
         options.ns = options.ns || fixedT.ns;
+        options.keyPrefix = options.keyPrefix || keyPrefix || fixedT.keyPrefix;
         var keySeparator = _this5.options.keySeparator || '.';
-        var resultKey = keyPrefix ? "".concat(keyPrefix).concat(keySeparator).concat(key) : key;
+        var resultKey;
+        if (options.keyPrefix && Array.isArray(key)) {
+          resultKey = key.map(function (k) {
+            return "".concat(options.keyPrefix).concat(keySeparator).concat(k);
+          });
+        } else {
+          resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+        }
         return _this5.t(resultKey, options);
       };
-
       if (typeof lng === 'string') {
         fixedT.lng = lng;
       } else {
         fixedT.lngs = lng;
       }
-
       fixedT.ns = ns;
       fixedT.keyPrefix = keyPrefix;
       return fixedT;
@@ -2641,14 +2348,12 @@ var I18n = function (_EventEmitter) {
     key: "t",
     value: function t() {
       var _this$translator;
-
       return this.translator && (_this$translator = this.translator).translate.apply(_this$translator, arguments);
     }
   }, {
     key: "exists",
     value: function exists() {
       var _this$translator2;
-
       return this.translator && (_this$translator2 = this.translator).exists.apply(_this$translator2, arguments);
     }
   }, {
@@ -2660,35 +2365,27 @@ var I18n = function (_EventEmitter) {
     key: "hasLoadedNamespace",
     value: function hasLoadedNamespace(ns) {
       var _this6 = this;
-
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       if (!this.isInitialized) {
         this.logger.warn('hasLoadedNamespace: i18next was not initialized', this.languages);
         return false;
       }
-
       if (!this.languages || !this.languages.length) {
         this.logger.warn('hasLoadedNamespace: i18n.languages were undefined or empty', this.languages);
         return false;
       }
-
       var lng = this.resolvedLanguage || this.languages[0];
       var fallbackLng = this.options ? this.options.fallbackLng : false;
       var lastLng = this.languages[this.languages.length - 1];
       if (lng.toLowerCase() === 'cimode') return true;
-
       var loadNotPending = function loadNotPending(l, n) {
         var loadState = _this6.services.backendConnector.state["".concat(l, "|").concat(n)];
-
         return loadState === -1 || loadState === 2;
       };
-
       if (options.precheck) {
         var preResult = options.precheck(this, loadNotPending);
         if (preResult !== undefined) return preResult;
       }
-
       if (this.hasResourceBundle(lng, ns)) return true;
       if (!this.services.backendConnector.backend || this.options.resources && !this.options.partialBundledLanguages) return true;
       if (loadNotPending(lng, ns) && (!fallbackLng || loadNotPending(lastLng, ns))) return true;
@@ -2698,14 +2395,11 @@ var I18n = function (_EventEmitter) {
     key: "loadNamespaces",
     value: function loadNamespaces(ns, callback) {
       var _this7 = this;
-
       var deferred = defer();
-
       if (!this.options.ns) {
         callback && callback();
         return Promise.resolve();
       }
-
       if (typeof ns === 'string') ns = [ns];
       ns.forEach(function (n) {
         if (_this7.options.ns.indexOf(n) < 0) _this7.options.ns.push(n);
@@ -2725,12 +2419,10 @@ var I18n = function (_EventEmitter) {
       var newLngs = lngs.filter(function (lng) {
         return preloaded.indexOf(lng) < 0;
       });
-
       if (!newLngs.length) {
         if (callback) callback();
         return Promise.resolve();
       }
-
       this.options.preload = preloaded.concat(newLngs);
       this.loadResources(function (err) {
         deferred.resolve();
@@ -2744,26 +2436,27 @@ var I18n = function (_EventEmitter) {
       if (!lng) lng = this.resolvedLanguage || (this.languages && this.languages.length > 0 ? this.languages[0] : this.language);
       if (!lng) return 'rtl';
       var rtlLngs = ['ar', 'shu', 'sqr', 'ssh', 'xaa', 'yhd', 'yud', 'aao', 'abh', 'abv', 'acm', 'acq', 'acw', 'acx', 'acy', 'adf', 'ads', 'aeb', 'aec', 'afb', 'ajp', 'apc', 'apd', 'arb', 'arq', 'ars', 'ary', 'arz', 'auz', 'avl', 'ayh', 'ayl', 'ayn', 'ayp', 'bbz', 'pga', 'he', 'iw', 'ps', 'pbt', 'pbu', 'pst', 'prp', 'prd', 'ug', 'ur', 'ydd', 'yds', 'yih', 'ji', 'yi', 'hbo', 'men', 'xmn', 'fa', 'jpr', 'peo', 'pes', 'prs', 'dv', 'sam', 'ckb'];
-      return rtlLngs.indexOf(this.services.languageUtils.getLanguagePartFromCode(lng)) > -1 || lng.toLowerCase().indexOf('-arab') > 1 ? 'rtl' : 'ltr';
+      var languageUtils = this.services && this.services.languageUtils || new LanguageUtil(get());
+      return rtlLngs.indexOf(languageUtils.getLanguagePartFromCode(lng)) > -1 || lng.toLowerCase().indexOf('-arab') > 1 ? 'rtl' : 'ltr';
     }
   }, {
     key: "cloneInstance",
     value: function cloneInstance() {
       var _this8 = this;
-
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : noop$1;
-
-      var mergedOptions = _objectSpread$6$1(_objectSpread$6$1(_objectSpread$6$1({}, this.options), options), {
+      var mergedOptions = _objectSpread$9(_objectSpread$9(_objectSpread$9({}, this.options), options), {
         isClone: true
       });
-
       var clone = new I18n(mergedOptions);
+      if (options.debug !== undefined || options.prefix !== undefined) {
+        clone.logger = clone.logger.clone(options);
+      }
       var membersToCopy = ['store', 'services', 'language'];
       membersToCopy.forEach(function (m) {
         clone[m] = _this8[m];
       });
-      clone.services = _objectSpread$6$1({}, this.services);
+      clone.services = _objectSpread$9({}, this.services);
       clone.services.utils = {
         hasLoadedNamespace: clone.hasLoadedNamespace.bind(clone)
       };
@@ -2772,7 +2465,6 @@ var I18n = function (_EventEmitter) {
         for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
           args[_key4 - 1] = arguments[_key4];
         }
-
         clone.emit.apply(clone, [event].concat(args));
       });
       clone.init(mergedOptions, callback);
@@ -2794,20 +2486,18 @@ var I18n = function (_EventEmitter) {
       };
     }
   }]);
-
   return I18n;
 }(EventEmitter);
-
 _defineProperty(I18n, "createInstance", function () {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var callback = arguments.length > 1 ? arguments[1] : undefined;
   return new I18n(options, callback);
 });
-
 var instance = I18n.createInstance();
 instance.createInstance = I18n.createInstance;
 
 instance.createInstance;
+instance.dir;
 instance.init;
 instance.loadResources;
 instance.reloadResources;
@@ -2823,111 +2513,28 @@ instance.loadLanguages;
 
 /**
  * This file automatically generated from `pre-publish.js`.
- * Do not manually edit.
- */
-
-var voidElements = {
-  "area": true,
-  "base": true,
-  "br": true,
-  "col": true,
-  "embed": true,
-  "hr": true,
-  "img": true,
-  "input": true,
-  "link": true,
-  "meta": true,
-  "param": true,
-  "source": true,
-  "track": true,
-  "wbr": true
-};
-
-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)},"")}};
-
-var matchHtmlEntity = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34);/g;
-var htmlEntities = {
-  '&amp;': '&',
-  '&#38;': '&',
-  '&lt;': '<',
-  '&#60;': '<',
-  '&gt;': '>',
-  '&#62;': '>',
-  '&apos;': "'",
-  '&#39;': "'",
-  '&quot;': '"',
-  '&#34;': '"'
-};
-
-var unescapeHtmlEntity = function unescapeHtmlEntity(m) {
-  return htmlEntities[m];
-};
-
-var unescape = function unescape(text) {
-  return text.replace(matchHtmlEntity, unescapeHtmlEntity);
-};
-
-function ownKeys$7(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$7(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$7(Object(source), true).forEach(function (key) { _defineProperty$1(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$7(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,
-  unescape: unescape
-};
-var i18nInstance;
-var I18nContext = createContext();
-function setDefaults() {
-  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  defaultOptions = _objectSpread$7(_objectSpread$7({}, defaultOptions), options);
-}
-function getDefaults() {
-  return defaultOptions;
-}
-var ReportNamespaces = function () {
-  function ReportNamespaces() {
-    _classCallCheck$1(this, ReportNamespaces);
-
-    this.usedNamespaces = {};
-  }
-
-  _createClass$1(ReportNamespaces, [{
-    key: "addUsedNamespaces",
-    value: function addUsedNamespaces(namespaces) {
-      var _this = this;
-
-      namespaces.forEach(function (ns) {
-        if (!_this.usedNamespaces[ns]) _this.usedNamespaces[ns] = true;
-      });
-    }
-  }, {
-    key: "getUsedNamespaces",
-    value: function getUsedNamespaces() {
-      return Object.keys(this.usedNamespaces);
-    }
-  }]);
-
-  return ReportNamespaces;
-}();
-function setI18n(instance) {
-  i18nInstance = instance;
-}
-function getI18n() {
-  return i18nInstance;
-}
-var initReactI18next = {
-  type: '3rdParty',
-  init: function init(instance) {
-    setDefaults(instance.options.react);
-    setI18n(instance);
-  }
+ * Do not manually edit.
+ */
+
+var voidElements = {
+  "area": true,
+  "base": true,
+  "br": true,
+  "col": true,
+  "embed": true,
+  "hr": true,
+  "img": true,
+  "input": true,
+  "link": true,
+  "meta": true,
+  "param": true,
+  "source": true,
+  "track": true,
+  "wbr": true
 };
 
+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 warn() {
   if (console && console.warn) {
     var _console;
@@ -3008,12 +2615,73 @@ function hasLoadedNamespace(ns, i18n) {
   });
 }
 
-var _excluded = ["format"],
+var matchHtmlEntity = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g;
+var htmlEntities = {
+  '&amp;': '&',
+  '&#38;': '&',
+  '&lt;': '<',
+  '&#60;': '<',
+  '&gt;': '>',
+  '&#62;': '>',
+  '&apos;': "'",
+  '&#39;': "'",
+  '&quot;': '"',
+  '&#34;': '"',
+  '&nbsp;': ' ',
+  '&#160;': ' ',
+  '&copy;': '©',
+  '&#169;': '©',
+  '&reg;': '®',
+  '&#174;': '®',
+  '&hellip;': '…',
+  '&#8230;': '…',
+  '&#x2F;': '/',
+  '&#47;': '/'
+};
+
+var unescapeHtmlEntity = function unescapeHtmlEntity(m) {
+  return htmlEntities[m];
+};
+
+var unescape = function unescape(text) {
+  return text.replace(matchHtmlEntity, unescapeHtmlEntity);
+};
+
+function ownKeys$8(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$8(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$8(Object(source), true).forEach(function (key) { _defineProperty$1(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$8(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,
+  unescape: unescape
+};
+function setDefaults() {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  defaultOptions = _objectSpread$8(_objectSpread$8({}, defaultOptions), options);
+}
+function getDefaults() {
+  return defaultOptions;
+}
+
+var i18nInstance;
+function setI18n(instance) {
+  i18nInstance = instance;
+}
+function getI18n() {
+  return i18nInstance;
+}
+
+var _excluded$1 = ["format"],
     _excluded2 = ["children", "count", "parent", "i18nKey", "context", "tOptions", "values", "defaults", "components", "ns", "i18n", "t", "shouldUnescape"];
 
-function ownKeys$6(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$7(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$6(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$6(Object(source), true).forEach(function (key) { _defineProperty$1(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$7(Object(source), true).forEach(function (key) { _defineProperty$1(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function hasChildren(node, checkLength) {
   if (!node) return false;
@@ -3024,7 +2692,7 @@ function hasChildren(node, checkLength) {
 
 function getChildren(node) {
   if (!node) return [];
-  return node && node.children ? node.children : node.props && node.props.children;
+  return node.props ? node.props.children : node.children;
 }
 
 function hasValidReactChildren(children) {
@@ -3039,7 +2707,7 @@ function getAsArray(data) {
 }
 
 function mergeProps(source, target) {
-  var newTarget = _objectSpread$6({}, target);
+  var newTarget = _objectSpread$7({}, target);
 
   newTarget.props = Object.assign(source.props, target.props);
   return newTarget;
@@ -3074,7 +2742,7 @@ function nodesToString(children, i18nOptions) {
       warn("Trans: the passed in value is invalid - seems you passed in a null child.");
     } else if (_typeof$1(child) === 'object') {
       var format = child.format,
-          clone = _objectWithoutProperties(child, _excluded);
+          clone = _objectWithoutProperties(child, _excluded$1);
 
       var keys = Object.keys(clone);
 
@@ -3109,7 +2777,7 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts, s
   getData(children);
   var ast = c.parse("<0>".concat(targetString, "</0>"));
 
-  var opts = _objectSpread$6(_objectSpread$6({}, data), combinedTOpts);
+  var opts = _objectSpread$7(_objectSpread$7({}, data), combinedTOpts);
 
   function renderInner(child, node, rootReactNode) {
     var childs = getChildren(child);
@@ -3119,7 +2787,7 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts, s
 
   function pushTranslatedJSX(child, inner, mem, i, isVoid) {
     if (child.dummy) child.children = inner;
-    mem.push(cloneElement(child, _objectSpread$6(_objectSpread$6({}, child.props), {}, {
+    mem.push(cloneElement(child, _objectSpread$7(_objectSpread$7({}, child.props), {}, {
       key: i
     }), isVoid ? undefined : inner));
   }
@@ -3151,7 +2819,7 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts, s
           } else if (isEmptyTransWithHTML) {
           var _inner = mapAST(reactNodes, node.children, rootReactNode);
 
-          mem.push(cloneElement(child, _objectSpread$6(_objectSpread$6({}, child.props), {}, {
+          mem.push(cloneElement(child, _objectSpread$7(_objectSpread$7({}, child.props), {}, {
             key: i
           }), _inner));
         } else if (Number.isNaN(parseFloat(node.name))) {
@@ -3182,11 +2850,11 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts, s
           var content = node.children[0] ? translationContent : null;
           if (content) mem.push(content);
         } else if (node.children.length === 1 && translationContent) {
-          mem.push(cloneElement(child, _objectSpread$6(_objectSpread$6({}, child.props), {}, {
+          mem.push(cloneElement(child, _objectSpread$7(_objectSpread$7({}, child.props), {}, {
             key: i
           }), translationContent));
         } else {
-          mem.push(cloneElement(child, _objectSpread$6(_objectSpread$6({}, child.props), {}, {
+          mem.push(cloneElement(child, _objectSpread$7(_objectSpread$7({}, child.props), {}, {
             key: i
           })));
         }
@@ -3215,7 +2883,7 @@ function renderNodes(children, targetString, i18n, i18nOptions, combinedTOpts, s
   return getChildren(result[0]);
 }
 
-function Trans(_ref) {
+function Trans$1(_ref) {
   var children = _ref.children,
       count = _ref.count,
       parent = _ref.parent,
@@ -3232,11 +2900,7 @@ function Trans(_ref) {
       shouldUnescape = _ref.shouldUnescape,
       additionalProps = _objectWithoutProperties(_ref, _excluded2);
 
-  var _ref2 = useContext(I18nContext) || {},
-      i18nFromContext = _ref2.i18n,
-      defaultNSFromContext = _ref2.defaultNS;
-
-  var i18n = i18nFromProps || i18nFromContext || getI18n();
+  var i18n = i18nFromProps || getI18n();
 
   if (!i18n) {
     warnOnce('You will need to pass in an i18next instance by using i18nextReactModule');
@@ -3249,21 +2913,21 @@ function Trans(_ref) {
 
   if (context) tOptions.context = context;
 
-  var reactI18nextOptions = _objectSpread$6(_objectSpread$6({}, getDefaults()), i18n.options && i18n.options.react);
+  var reactI18nextOptions = _objectSpread$7(_objectSpread$7({}, getDefaults()), i18n.options && i18n.options.react);
 
-  var namespaces = ns || t.ns || defaultNSFromContext || i18n.options && i18n.options.defaultNS;
+  var namespaces = ns || t.ns || i18n.options && i18n.options.defaultNS;
   namespaces = typeof namespaces === 'string' ? [namespaces] : namespaces || ['translation'];
   var defaultValue = defaults || nodesToString(children, reactI18nextOptions) || reactI18nextOptions.transEmptyNodeValue || i18nKey;
   var hashTransKey = reactI18nextOptions.hashTransKey;
   var key = i18nKey || (hashTransKey ? hashTransKey(defaultValue) : defaultValue);
   var interpolationOverride = values ? tOptions.interpolation : {
-    interpolation: _objectSpread$6(_objectSpread$6({}, tOptions.interpolation), {}, {
+    interpolation: _objectSpread$7(_objectSpread$7({}, tOptions.interpolation), {}, {
       prefix: '#$?',
       suffix: '?$#'
     })
   };
 
-  var combinedTOpts = _objectSpread$6(_objectSpread$6(_objectSpread$6(_objectSpread$6({}, tOptions), {}, {
+  var combinedTOpts = _objectSpread$7(_objectSpread$7(_objectSpread$7(_objectSpread$7({}, tOptions), {}, {
     count: count
   }, values), interpolationOverride), {}, {
     defaultValue: defaultValue,
@@ -3276,6 +2940,86 @@ function Trans(_ref) {
   return useAsParent ? createElement(useAsParent, additionalProps, content) : content;
 }
 
+var initReactI18next = {
+  type: '3rdParty',
+  init: function init(instance) {
+    setDefaults(instance.options.react);
+    setI18n(instance);
+  }
+};
+
+var I18nContext = createContext();
+var ReportNamespaces = function () {
+  function ReportNamespaces() {
+    _classCallCheck$1(this, ReportNamespaces);
+
+    this.usedNamespaces = {};
+  }
+
+  _createClass$1(ReportNamespaces, [{
+    key: "addUsedNamespaces",
+    value: function addUsedNamespaces(namespaces) {
+      var _this = this;
+
+      namespaces.forEach(function (ns) {
+        if (!_this.usedNamespaces[ns]) _this.usedNamespaces[ns] = true;
+      });
+    }
+  }, {
+    key: "getUsedNamespaces",
+    value: function getUsedNamespaces() {
+      return Object.keys(this.usedNamespaces);
+    }
+  }]);
+
+  return ReportNamespaces;
+}();
+
+var _excluded = ["children", "count", "parent", "i18nKey", "context", "tOptions", "values", "defaults", "components", "ns", "i18n", "t", "shouldUnescape"];
+
+function ownKeys$6(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$6(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$6(Object(source), true).forEach(function (key) { _defineProperty$1(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function Trans(_ref) {
+  var children = _ref.children,
+      count = _ref.count,
+      parent = _ref.parent,
+      i18nKey = _ref.i18nKey,
+      context = _ref.context,
+      _ref$tOptions = _ref.tOptions,
+      tOptions = _ref$tOptions === void 0 ? {} : _ref$tOptions,
+      values = _ref.values,
+      defaults = _ref.defaults,
+      components = _ref.components,
+      ns = _ref.ns,
+      i18nFromProps = _ref.i18n,
+      tFromProps = _ref.t,
+      shouldUnescape = _ref.shouldUnescape,
+      additionalProps = _objectWithoutProperties(_ref, _excluded);
+
+  var _ref2 = useContext(I18nContext) || {},
+      i18nFromContext = _ref2.i18n,
+      defaultNSFromContext = _ref2.defaultNS;
+
+  var i18n = i18nFromProps || i18nFromContext || getI18n();
+  var t = tFromProps || i18n && i18n.t.bind(i18n);
+  return Trans$1(_objectSpread$6({
+    children: children,
+    count: count,
+    parent: parent,
+    i18nKey: i18nKey,
+    context: context,
+    tOptions: tOptions,
+    values: values,
+    defaults: defaults,
+    components: components,
+    ns: ns || t && t.ns || defaultNSFromContext || i18n && i18n.options && i18n.options.defaultNS,
+    i18n: i18n,
+    t: tFromProps,
+    shouldUnescape: shouldUnescape
+  }, additionalProps));
+}
+
 function ownKeys$5(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$5(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$5(Object(source), true).forEach(function (key) { _defineProperty$1(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -3376,7 +3120,7 @@ function useTranslation(ns) {
     }
 
     isInitial.current = false;
-  }, [i18n]);
+  }, [i18n, keyPrefix]);
   var ret = [t, i18n, ready];
   ret.t = t;
   ret.i18n = i18n;
@@ -3501,21 +3245,19 @@ instance.use(initReactI18next).init({
  */
 var Tags$2 = function Tags(_ref) {
   var _ref$label = _ref.label,
-      label = _ref$label === void 0 ? "" : _ref$label,
-      allTags = _ref.allTags,
-      selectedTags = _ref.selectedTags,
-      onTagSelect = _ref.onTagSelect,
-      onTagCreate = _ref.onTagCreate,
-      onTagDelete = _ref.onTagDelete,
-      tagProps = _ref.tagProps,
-      selectProps = _ref.selectProps,
-      buttonProps = _ref.buttonProps;
-
+    label = _ref$label === void 0 ? "" : _ref$label,
+    allTags = _ref.allTags,
+    selectedTags = _ref.selectedTags,
+    onTagSelect = _ref.onTagSelect,
+    onTagCreate = _ref.onTagCreate,
+    onTagDelete = _ref.onTagDelete,
+    tagProps = _ref.tagProps,
+    selectProps = _ref.selectProps,
+    buttonProps = _ref.buttonProps;
   var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      addTag = _useState2[0],
-      setAddTag = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    addTag = _useState2[0],
+    setAddTag = _useState2[1];
   var tags = useMemo(function () {
     if (!allTags) return [];
     if (!selectedTags) return allTags;
@@ -3622,7 +3364,7 @@ var PLURAL = {
 };
 
 var Menu$1 = Dropdown.Menu,
-    MenuItem = Dropdown.MenuItem;
+  MenuItem = Dropdown.MenuItem;
 var renderColumnData = function renderColumnData(columns, handleEdit, handleDelete) {
   return [].concat(_toConsumableArray(columns), [{
     id: "actions",
@@ -3660,7 +3402,6 @@ var getCurrentTagType = function getCurrentTagType() {
   var tagLabel = searchParams.get("view");
   var requiredTagType = tagTypes.find(function (tagType) {
     var _tagType$label;
-
     return (tagType === null || tagType === void 0 ? void 0 : (_tagType$label = tagType.label) === null || _tagType$label === void 0 ? void 0 : _tagType$label.toLowerCase()) === tagLabel;
   });
   return requiredTagType || tagTypes[0];
@@ -3668,10 +3409,9 @@ var getCurrentTagType = function getCurrentTagType() {
 
 function useDebounce(value, delay) {
   var _useState = useState(value),
-      _useState2 = _slicedToArray(_useState, 2),
-      debouncedValue = _useState2[0],
-      setDebouncedValue = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    debouncedValue = _useState2[0],
+    setDebouncedValue = _useState2[1];
   useEffect(function () {
     var timer = setTimeout(function () {
       return setDebouncedValue(value);
@@ -4533,8 +4273,10 @@ var Query = /*#__PURE__*/function () {
   };
 
   _proto.clearGcTimeout = function clearGcTimeout() {
-    clearTimeout(this.gcTimeout);
-    this.gcTimeout = undefined;
+    if (this.gcTimeout) {
+      clearTimeout(this.gcTimeout);
+      this.gcTimeout = undefined;
+    }
   };
 
   _proto.optionalRemove = function optionalRemove() {
@@ -6183,13 +5925,17 @@ var QueryObserver = /*#__PURE__*/function (_Subscribable) {
   };
 
   _proto.clearStaleTimeout = function clearStaleTimeout() {
-    clearTimeout(this.staleTimeoutId);
-    this.staleTimeoutId = undefined;
+    if (this.staleTimeoutId) {
+      clearTimeout(this.staleTimeoutId);
+      this.staleTimeoutId = undefined;
+    }
   };
 
   _proto.clearRefetchInterval = function clearRefetchInterval() {
-    clearInterval(this.refetchIntervalId);
-    this.refetchIntervalId = undefined;
+    if (this.refetchIntervalId) {
+      clearInterval(this.refetchIntervalId);
+      this.refetchIntervalId = undefined;
+    }
   };
 
   _proto.createResult = function createResult(query, options) {
@@ -6833,9 +6579,9 @@ function useQuery(arg1, arg2, arg3) {
 
 var fetch = function fetch(_ref) {
   var url = _ref.url,
-      searchTerm = _ref.searchTerm,
-      limit = _ref.limit,
-      pageNo = _ref.pageNo;
+    searchTerm = _ref.searchTerm,
+    limit = _ref.limit,
+    pageNo = _ref.pageNo;
   return axios.get(url, {
     params: {
       search_term: searchTerm,
@@ -6845,23 +6591,18 @@ var fetch = function fetch(_ref) {
     }
   });
 };
-
 var create = function create(url, payload) {
   return axios.post(url, payload);
 };
-
 var update = function update(url, id, payload) {
   return axios.put("".concat(url, "/").concat(id), payload);
 };
-
 var destroy = function destroy(url, id) {
   return axios["delete"]("".concat(url, "/").concat(id));
 };
-
 var merge = function merge(url, payload) {
   return axios.patch("".concat(url, "/merge"), payload);
 };
-
 var tagsApi = {
   fetch: fetch,
   create: create,
@@ -6879,11 +6620,9 @@ var queryClient = new QueryClient({
 });
 
 function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$4(Object(source), !0).forEach(function (key) { _defineProperty$1(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var TAG_KEY = "tag-key";
 var STALE_TIME = 3200000;
-
 var useFetchTags = function useFetchTags(params) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return useQuery([TAG_KEY, Object.values(params)], function () {
@@ -6896,11 +6635,10 @@ var useFetchTags = function useFetchTags(params) {
     keepPreviousData: true
   }, options));
 };
-
 var useCreateTag = function useCreateTag() {
   return useMutation(function (_ref) {
     var url = _ref.url,
-        payload = _ref.payload;
+      payload = _ref.payload;
     return tagsApi.create(url, payload);
   }, {
     onSuccess: function onSuccess() {
@@ -6908,12 +6646,11 @@ var useCreateTag = function useCreateTag() {
     }
   });
 };
-
 var useUpdateTag = function useUpdateTag() {
   return useMutation(function (_ref2) {
     var url = _ref2.url,
-        id = _ref2.id,
-        payload = _ref2.payload;
+      id = _ref2.id,
+      payload = _ref2.payload;
     return tagsApi.update(url, id, payload);
   }, {
     onSuccess: function onSuccess() {
@@ -6921,11 +6658,10 @@ var useUpdateTag = function useUpdateTag() {
     }
   });
 };
-
 var useDeleteTag = function useDeleteTag() {
   return useMutation(function (_ref3) {
     var url = _ref3.url,
-        id = _ref3.id;
+      id = _ref3.id;
     return tagsApi.destroy(url, id);
   }, {
     onSuccess: function onSuccess() {
@@ -6933,11 +6669,10 @@ var useDeleteTag = function useDeleteTag() {
     }
   });
 };
-
 var useMergeTags = function useMergeTags() {
   return useMutation(function (_ref4) {
     var url = _ref4.url,
-        payload = _ref4.payload;
+      payload = _ref4.payload;
     return tagsApi.merge(url, payload);
   }, {
     onSuccess: function onSuccess(_ref5) {
@@ -6947,7 +6682,6 @@ var useMergeTags = function useMergeTags() {
     }
   });
 };
-
 var refetchTags = function refetchTags() {
   return queryClient.invalidateQueries([TAG_KEY]);
 };
@@ -6961,22 +6695,19 @@ var NO_DATA_PRIMARY_BUTTON_PROPS$1 = {
 
 var useTagsForm = function useTagsForm(_ref) {
   var createTags = _ref.createTags,
-      goToFirstPage = _ref.goToFirstPage,
-      isEdit = _ref.isEdit,
-      onPaneClose = _ref.onPaneClose,
-      setHasSubmitted = _ref.setHasSubmitted,
-      tagType = _ref.tagType,
-      updateTags = _ref.updateTags;
+    goToFirstPage = _ref.goToFirstPage,
+    isEdit = _ref.isEdit,
+    onPaneClose = _ref.onPaneClose,
+    setHasSubmitted = _ref.setHasSubmitted,
+    tagType = _ref.tagType,
+    updateTags = _ref.updateTags;
   var tagModification = isEdit ? useUpdateTag : useCreateTag;
   var tagOperation = isEdit ? updateTags : createTags;
-
   var _tagModification = tagModification(),
-      mutate = _tagModification.mutate,
-      isSubmitting = _tagModification.isLoading;
-
+    mutate = _tagModification.mutate,
+    isSubmitting = _tagModification.isLoading;
   var handleSubmit = function handleSubmit(values, _ref2) {
     var _values$description;
-
     var resetForm = _ref2.resetForm;
     setHasSubmitted(true);
     values.description = values === null || values === void 0 ? void 0 : (_values$description = values.description) === null || _values$description === void 0 ? void 0 : _values$description.trim();
@@ -6986,15 +6717,12 @@ var useTagsForm = function useTagsForm(_ref) {
       }
     };
     tagData.url = tagType.url;
-
     if (isEdit) {
       tagData.id = values.id;
     }
-
     mutate(tagData, {
       onSuccess: function onSuccess() {
         var _tagOperation$onSucce;
-
         !isEdit && goToFirstPage();
         tagOperation === null || tagOperation === void 0 ? void 0 : (_tagOperation$onSucce = tagOperation.onSuccess) === null || _tagOperation$onSucce === void 0 ? void 0 : _tagOperation$onSucce.callback();
         onPaneClose();
@@ -7004,7 +6732,6 @@ var useTagsForm = function useTagsForm(_ref) {
       }
     });
   };
-
   return {
     handleSubmit: handleSubmit,
     isSubmitting: isSubmitting
@@ -7013,42 +6740,38 @@ var useTagsForm = function useTagsForm(_ref) {
 
 var ManageTags = function ManageTags(_ref) {
   var createTags = _ref.createTags,
-      goToFirstPage = _ref.goToFirstPage,
-      onClose = _ref.onClose,
-      tag = _ref.tag,
-      tagType = _ref.tagType,
-      type = _ref.type,
-      updateTags = _ref.updateTags;
-
+    goToFirstPage = _ref.goToFirstPage,
+    onClose = _ref.onClose,
+    tag = _ref.tag,
+    tagType = _ref.tagType,
+    type = _ref.type,
+    updateTags = _ref.updateTags;
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      hasSubmitted = _useState2[0],
-      setHasSubmitted = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    hasSubmitted = _useState2[0],
+    setHasSubmitted = _useState2[1];
   var isEdit = type === PANE_TYPES.EDIT;
   var initValues = isEdit ? tag : INITIAL_TAG_VALUES;
-
+  var inputRef = useRef(null);
   var onPaneClose = function onPaneClose() {
     setHasSubmitted(false);
     onClose();
   };
-
   var _useTagsForm = useTagsForm({
-    createTags: createTags,
-    goToFirstPage: goToFirstPage,
-    isEdit: isEdit,
-    onPaneClose: onPaneClose,
-    setHasSubmitted: setHasSubmitted,
-    tagType: tagType,
-    updateTags: updateTags
-  }),
-      handleSubmit = _useTagsForm.handleSubmit,
-      isSubmitting = _useTagsForm.isSubmitting;
-
+      createTags: createTags,
+      goToFirstPage: goToFirstPage,
+      isEdit: isEdit,
+      onPaneClose: onPaneClose,
+      setHasSubmitted: setHasSubmitted,
+      tagType: tagType,
+      updateTags: updateTags
+    }),
+    handleSubmit = _useTagsForm.handleSubmit,
+    isSubmitting = _useTagsForm.isSubmitting;
   return /*#__PURE__*/React.createElement(Pane, {
+    initialFocusRef: inputRef,
     isOpen: !!type,
     onClose: onPaneClose
   }, /*#__PURE__*/React.createElement(Pane.Header, null, /*#__PURE__*/React.createElement(Typography, {
@@ -7072,12 +6795,12 @@ var ManageTags = function ManageTags(_ref) {
       className: "neeto-ui-flex neeto-ui-w-full neeto-ui-flex-col"
     }, /*#__PURE__*/React.createElement(Input, {
       required: true,
-      autoFocus: true,
       name: "name",
       label: "".concat(t("tag"), " ").concat(t("name").toLocaleLowerCase()),
       "data-cy": "tag-name-text-field",
       maxLength: 50,
-      className: "neeto-ui-mb-4"
+      className: "neeto-ui-mb-4",
+      ref: inputRef
     }), /*#__PURE__*/React.createElement(Textarea, {
       name: "description",
       label: t("description"),
@@ -7114,98 +6837,79 @@ var getHelpText = function getHelpText(url) {
 };
 
 function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$3(Object(source), !0).forEach(function (key) { _defineProperty$1(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 var Dashboard = function Dashboard(_ref) {
   var _data$tags2, _tagType$label;
-
   var breadcrumbs = _ref.breadcrumbs,
-      createTags = _ref.createTags,
-      deleteTags = _ref.deleteTags,
-      displayMenu = _ref.displayMenu,
-      handleMenuToggle = _ref.handleMenuToggle,
-      kbArticleUrl = _ref.kbArticleUrl,
-      onTagRowClick = _ref.onTagRowClick,
-      _ref$tagsMergable = _ref.tagsMergable,
-      tagsMergable = _ref$tagsMergable === void 0 ? false : _ref$tagsMergable,
-      tagsPath = _ref.tagsPath,
-      tagType = _ref.tagType,
-      updateTags = _ref.updateTags;
-
+    createTags = _ref.createTags,
+    deleteTags = _ref.deleteTags,
+    displayMenu = _ref.displayMenu,
+    handleMenuToggle = _ref.handleMenuToggle,
+    kbArticleUrl = _ref.kbArticleUrl,
+    onTagRowClick = _ref.onTagRowClick,
+    _ref$tagsMergable = _ref.tagsMergable,
+    tagsMergable = _ref$tagsMergable === void 0 ? false : _ref$tagsMergable,
+    tagsPath = _ref.tagsPath,
+    tagType = _ref.tagType,
+    updateTags = _ref.updateTags;
   var _useState = useState(null),
-      _useState2 = _slicedToArray(_useState, 2),
-      selectedTag = _useState2[0],
-      setSelectedTag = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    selectedTag = _useState2[0],
+    setSelectedTag = _useState2[1];
   var _useState3 = useState(""),
-      _useState4 = _slicedToArray(_useState3, 2),
-      searchTerm = _useState4[0],
-      setSearchTerm = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    searchTerm = _useState4[0],
+    setSearchTerm = _useState4[1];
   var _useState5 = useState(DEFAULT_PAGE_INDEX),
-      _useState6 = _slicedToArray(_useState5, 2),
-      pageIndex = _useState6[0],
-      setPageIndex = _useState6[1];
-
+    _useState6 = _slicedToArray(_useState5, 2),
+    pageIndex = _useState6[0],
+    setPageIndex = _useState6[1];
   var _useState7 = useState(null),
-      _useState8 = _slicedToArray(_useState7, 2),
-      paneType = _useState8[0],
-      setPaneType = _useState8[1];
-
+    _useState8 = _slicedToArray(_useState7, 2),
+    paneType = _useState8[0],
+    setPaneType = _useState8[1];
   var _useState9 = useState(false),
-      _useState10 = _slicedToArray(_useState9, 2),
-      isDeleteAlertOpen = _useState10[0],
-      setIsDeleteAlertOpen = _useState10[1];
-
+    _useState10 = _slicedToArray(_useState9, 2),
+    isDeleteAlertOpen = _useState10[0],
+    setIsDeleteAlertOpen = _useState10[1];
   var debouncedSearchTerm = useDebounce(searchTerm, 500);
-
   var _useFetchTags = useFetchTags({
-    url: tagType.url,
-    searchTerm: debouncedSearchTerm.trim(),
-    limit: DEFAULT_PAGE_SIZE,
-    pageNo: pageIndex
-  }),
-      data = _useFetchTags.data,
-      isLoading = _useFetchTags.isLoading;
-
+      url: tagType.url,
+      searchTerm: debouncedSearchTerm.trim(),
+      limit: DEFAULT_PAGE_SIZE,
+      pageNo: pageIndex
+    }),
+    data = _useFetchTags.data,
+    isLoading = _useFetchTags.isLoading;
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var history = useHistory();
-
   var primaryButtonProps = _objectSpread$3(_objectSpread$3({}, NO_DATA_PRIMARY_BUTTON_PROPS$1), {}, {
     onClick: function onClick() {
       setSelectedTag(null);
       setPaneType(PANE_TYPES.CREATE);
     }
   });
-
   var goToFirstPage = function goToFirstPage() {
     if (pageIndex !== DEFAULT_PAGE_INDEX) {
       setPageIndex(DEFAULT_PAGE_INDEX);
     }
   };
-
   var handleEdit = function handleEdit(tag) {
     setSelectedTag(tag);
     setPaneType(PANE_TYPES.EDIT);
   };
-
   var handleDelete = function handleDelete(tag) {
     setSelectedTag(tag);
     setIsDeleteAlertOpen(true);
   };
-
   var handleAlertClose = function handleAlertClose() {
     setIsDeleteAlertOpen(false);
     setSelectedTag(null);
   };
-
   var _useDeleteTag = useDeleteTag(),
-      mutate = _useDeleteTag.mutate,
-      isDeletingTag = _useDeleteTag.isLoading;
-
+    mutate = _useDeleteTag.mutate,
+    isDeletingTag = _useDeleteTag.isLoading;
   var handleConfirmDelete = function handleConfirmDelete() {
     var payload = {
       url: tagType.url,
@@ -7215,15 +6919,12 @@ var Dashboard = function Dashboard(_ref) {
     isNotDeleting && mutate(payload, {
       onSuccess: function onSuccess() {
         var _data$tags, _deleteTags$onSuccess;
-
         setIsDeleteAlertOpen(false);
-
         if ((data === null || data === void 0 ? void 0 : (_data$tags = data.tags) === null || _data$tags === void 0 ? void 0 : _data$tags.length) === 1) {
           setPageIndex(function (pageIndex) {
             return pageIndex - 1;
           });
         }
-
         deleteTags === null || deleteTags === void 0 ? void 0 : (_deleteTags$onSuccess = deleteTags.onSuccess) === null || _deleteTags$onSuccess === void 0 ? void 0 : _deleteTags$onSuccess.callback();
         Toastr.success(t("deleteSuccess"));
       },
@@ -7233,13 +6934,11 @@ var Dashboard = function Dashboard(_ref) {
       }
     });
   };
-
   if (isLoading) {
     return /*#__PURE__*/React.createElement("div", {
       className: "neeto-ui-w-full neeto-ui-h-screen"
     }, /*#__PURE__*/React.createElement(PageLoader, null));
   }
-
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Container, {
     isHeaderFixed: true
   }, /*#__PURE__*/React.createElement(Header, {
@@ -7350,26 +7049,22 @@ var NO_DATA_PRIMARY_BUTTON_PROPS = {
 
 var List = function List(_ref) {
   var _ref$tagList = _ref.tagList,
-      tagList = _ref$tagList === void 0 ? [] : _ref$tagList,
-      onSelect = _ref.onSelect,
-      selectedCounterTagId = _ref.selectedCounterTagId,
-      selectedTagId = _ref.selectedTagId,
-      type = _ref.type,
-      isSource = _ref.isSource;
-
+    tagList = _ref$tagList === void 0 ? [] : _ref$tagList,
+    onSelect = _ref.onSelect,
+    selectedCounterTagId = _ref.selectedCounterTagId,
+    selectedTagId = _ref.selectedTagId,
+    type = _ref.type,
+    isSource = _ref.isSource;
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var _useState = useState([]),
-      _useState2 = _slicedToArray(_useState, 2),
-      tags = _useState2[0],
-      setTags = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    tags = _useState2[0],
+    setTags = _useState2[1];
   var _useState3 = useState(""),
-      _useState4 = _slicedToArray(_useState3, 2),
-      searchTerm = _useState4[0],
-      setSearchTerm = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    searchTerm = _useState4[0],
+    setSearchTerm = _useState4[1];
   var listType = isSource ? "source" : "destination";
   useEffect(function () {
     var filteredTags = tagList.filter(function (_ref2) {
@@ -7423,63 +7118,52 @@ var unusualPlurals = {
   person: "people",
   woman: "women"
 };
-
 var pluralize = function pluralize(_ref) {
   var _ref$count = _ref.count,
-      count = _ref$count === void 0 ? 0 : _ref$count,
-      _ref$singular = _ref.singular,
-      singular = _ref$singular === void 0 ? "" : _ref$singular,
-      _ref$plural = _ref.plural,
-      plural = _ref$plural === void 0 ? "" : _ref$plural,
-      _ref$zero = _ref.zero,
-      zero = _ref$zero === void 0 ? false : _ref$zero,
-      _ref$skipCount = _ref.skipCount,
-      skipCount = _ref$skipCount === void 0 ? false : _ref$skipCount;
-
+    count = _ref$count === void 0 ? 0 : _ref$count,
+    _ref$singular = _ref.singular,
+    singular = _ref$singular === void 0 ? "" : _ref$singular,
+    _ref$plural = _ref.plural,
+    plural = _ref$plural === void 0 ? "" : _ref$plural,
+    _ref$zero = _ref.zero,
+    zero = _ref$zero === void 0 ? false : _ref$zero,
+    _ref$skipCount = _ref.skipCount,
+    skipCount = _ref$skipCount === void 0 ? false : _ref$skipCount;
   var pluralString = function pluralString() {
     if (plural) return plural;
     var str = unusualPlurals[singular];
     if (str) return str;
     return "".concat(singular, "s");
   };
-
   var resultText = "";
   if (!skipCount) resultText += "".concat(count, " ");
-
   switch (count) {
     case 0:
       if (zero) return zero;
       resultText += pluralString();
       break;
-
     case 1:
       resultText += singular;
       break;
-
     default:
       resultText += pluralString();
       break;
   }
-
   return resultText;
 };
 
 function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$2(Object(source), !0).forEach(function (key) { _defineProperty$1(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 var MergeAlert = function MergeAlert(_ref) {
   var sourceTag = _ref.sourceTag,
-      destinationTag = _ref.destinationTag,
-      showModal = _ref.showModal,
-      setShowModal = _ref.setShowModal,
-      tagType = _ref.tagType,
-      handleSubmit = _ref.handleSubmit,
-      isSubmitting = _ref.isSubmitting;
-
+    destinationTag = _ref.destinationTag,
+    showModal = _ref.showModal,
+    setShowModal = _ref.setShowModal,
+    tagType = _ref.tagType,
+    handleSubmit = _ref.handleSubmit,
+    isSubmitting = _ref.isSubmitting;
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   return /*#__PURE__*/React.createElement(Modal, {
     isOpen: showModal,
     onClose: function onClose() {
@@ -7521,63 +7205,50 @@ var MergeAlert = function MergeAlert(_ref) {
 };
 
 function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) { _defineProperty$1(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 var Merge = function Merge(_ref) {
   var _data$tags;
-
   var breadcrumbs = _ref.breadcrumbs,
-      displayMenu = _ref.displayMenu,
-      handleMenuToggle = _ref.handleMenuToggle,
-      kbArticleUrl = _ref.kbArticleUrl,
-      mergeTags = _ref.mergeTags,
-      tagsPath = _ref.tagsPath,
-      tagType = _ref.tagType;
-
+    displayMenu = _ref.displayMenu,
+    handleMenuToggle = _ref.handleMenuToggle,
+    kbArticleUrl = _ref.kbArticleUrl,
+    mergeTags = _ref.mergeTags,
+    tagsPath = _ref.tagsPath,
+    tagType = _ref.tagType;
   var _useState = useState({}),
-      _useState2 = _slicedToArray(_useState, 2),
-      sourceTag = _useState2[0],
-      setSourceTag = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    sourceTag = _useState2[0],
+    setSourceTag = _useState2[1];
   var _useState3 = useState({}),
-      _useState4 = _slicedToArray(_useState3, 2),
-      destinationTag = _useState4[0],
-      setDestinationTag = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    destinationTag = _useState4[0],
+    setDestinationTag = _useState4[1];
   var _useState5 = useState(false),
-      _useState6 = _slicedToArray(_useState5, 2),
-      isModalOpen = _useState6[0],
-      setIsModalOpen = _useState6[1];
-
+    _useState6 = _slicedToArray(_useState5, 2),
+    isModalOpen = _useState6[0],
+    setIsModalOpen = _useState6[1];
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var history = useHistory();
-
   var _useFetchTags = useFetchTags({
-    url: tagType.url
-  }),
-      data = _useFetchTags.data,
-      isLoading = _useFetchTags.isLoading;
-
+      url: tagType.url
+    }),
+    data = _useFetchTags.data,
+    isLoading = _useFetchTags.isLoading;
   var _useMergeTags = useMergeTags(),
-      mutate = _useMergeTags.mutate,
-      isSubmitting = _useMergeTags.isLoading;
-
+    mutate = _useMergeTags.mutate,
+    isSubmitting = _useMergeTags.isLoading;
   var primaryButtonProps = _objectSpread$1(_objectSpread$1({}, NO_DATA_PRIMARY_BUTTON_PROPS), {}, {
     onClick: function onClick() {
       return history.push(tagsPath);
     }
   });
-
   var updatedBreadcrumbs = useMemo(function () {
     return [].concat(_toConsumableArray(breadcrumbs), [{
       text: tagType.label,
       link: tagsPath
     }]);
   }, [breadcrumbs, tagsPath]);
-
   var handleSubmit = function handleSubmit() {
     var payload = {
       tags: {
@@ -7591,7 +7262,6 @@ var Merge = function Merge(_ref) {
     }, {
       onSuccess: function onSuccess() {
         var _mergeTags$onSuccess;
-
         setDestinationTag("");
         setSourceTag("");
         mergeTags === null || mergeTags === void 0 ? void 0 : (_mergeTags$onSuccess = mergeTags.onSuccess) === null || _mergeTags$onSuccess === void 0 ? void 0 : _mergeTags$onSuccess.callback();
@@ -7599,13 +7269,11 @@ var Merge = function Merge(_ref) {
       }
     });
   };
-
   if (isLoading) {
     return /*#__PURE__*/React.createElement("div", {
       className: "neeto-ui-w-full neeto-ui-h-screen"
     }, /*#__PURE__*/React.createElement(PageLoader, null));
   }
-
   return /*#__PURE__*/React.createElement("div", {
     className: "neeto-ui-w-full"
   }, /*#__PURE__*/React.createElement(Container, {
@@ -7668,7 +7336,6 @@ var Merge = function Merge(_ref) {
 var renderComponent = function renderComponent(Component, props) {
   return /*#__PURE__*/React.createElement(Component, props);
 };
-
 var createRoutes = function createRoutes(props) {
   return [{
     component: function component() {
@@ -7687,13 +7354,11 @@ var createRoutes = function createRoutes(props) {
 
 var Menu = function Menu(_ref) {
   var tagTypes = _ref.tagTypes,
-      showMenu = _ref.showMenu,
-      tagType = _ref.tagType,
-      setTagType = _ref.setTagType;
-
+    showMenu = _ref.showMenu,
+    tagType = _ref.tagType,
+    setTagType = _ref.setTagType;
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   return /*#__PURE__*/React.createElement(MenuBar, {
     showMenu: showMenu,
     title: t("title")
@@ -7710,7 +7375,11 @@ var Menu = function Menu(_ref) {
   }));
 };
 
-var devtools = {exports: {}};
+var devtoolsExports = {};
+var devtools = {
+  get exports(){ return devtoolsExports; },
+  set exports(v){ devtoolsExports = v; },
+};
 
 {
   devtools.exports = {
@@ -7727,41 +7396,34 @@ var withReactQuery = function withReactQuery(Component) {
   var QueryWrapper = function QueryWrapper(props) {
     return /*#__PURE__*/React.createElement(QueryClientProvider, {
       client: queryClient
-    }, /*#__PURE__*/React.createElement(Component, props), /*#__PURE__*/React.createElement(devtools.exports.ReactQueryDevtools, {
+    }, /*#__PURE__*/React.createElement(Component, props), /*#__PURE__*/React.createElement(devtoolsExports.ReactQueryDevtools, {
       initialIsOpen: false,
       position: "bottom-right"
     }));
   };
-
   return QueryWrapper;
 };
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty$1(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 var Tags = function Tags(_ref) {
   var config = _ref.config;
   var tagTypes = config.tagTypes,
-      _config$displayMenu = config.displayMenu,
-      displayMenu = _config$displayMenu === void 0 ? true : _config$displayMenu;
-
+    _config$displayMenu = config.displayMenu,
+    displayMenu = _config$displayMenu === void 0 ? true : _config$displayMenu;
   var _useState = useState(getCurrentTagType(tagTypes)),
-      _useState2 = _slicedToArray(_useState, 2),
-      tagType = _useState2[0],
-      setTagType = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    tagType = _useState2[0],
+    setTagType = _useState2[1];
   var _useState3 = useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      isMenuOpen = _useState4[0],
-      setIsMenuOpen = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    isMenuOpen = _useState4[0],
+    setIsMenuOpen = _useState4[1];
   var handleMenuToggle = function handleMenuToggle() {
     return setIsMenuOpen(function (isMenuOpen) {
       return !isMenuOpen;
     });
   };
-
   var routes = createRoutes(_objectSpread(_objectSpread({}, config), {}, {
     handleMenuToggle: handleMenuToggle,
     displayMenu: displayMenu,
@@ -7776,8 +7438,8 @@ var Tags = function Tags(_ref) {
     setTagType: setTagType
   }), /*#__PURE__*/React.createElement(Switch, null, routes.map(function (_ref2) {
     var exact = _ref2.exact,
-        path = _ref2.path,
-        component = _ref2.component;
+      path = _ref2.path,
+      component = _ref2.component;
     return /*#__PURE__*/React.createElement(Route, {
       key: path,
       exact: exact,
@@ -7786,7 +7448,6 @@ var Tags = function Tags(_ref) {
     });
   })));
 };
-
 var Tags$1 = withReactQuery(Tags);
 
 var App = function App(_ref) {