react-i18next 12.3.1 → 13.0.1

package/dist/es/useSSR.js

@@ -1,19 +1,19 @@
 import { useContext } from 'react';
 import { getI18n, I18nContext } from './context.js';
 export function useSSR(initialI18nStore, initialLanguage) {
-  var props = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  var i18nFromProps = props.i18n;
-
-  var _ref = useContext(I18nContext) || {},
-      i18nFromContext = _ref.i18n;
-
-  var i18n = i18nFromProps || i18nFromContext || getI18n();
+  let props = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  const {
+    i18n: i18nFromProps
+  } = props;
+  const {
+    i18n: i18nFromContext
+  } = useContext(I18nContext) || {};
+  const i18n = i18nFromProps || i18nFromContext || getI18n();
   if (i18n.options && i18n.options.isClone) return;
-
   if (initialI18nStore && !i18n.initializedStoreOnce) {
     i18n.services.resourceStore.data = initialI18nStore;
-    i18n.options.ns = Object.values(initialI18nStore).reduce(function (mem, lngResources) {
-      Object.keys(lngResources).forEach(function (ns) {
+    i18n.options.ns = Object.values(initialI18nStore).reduce((mem, lngResources) => {
+      Object.keys(lngResources).forEach(ns => {
         if (mem.indexOf(ns) < 0) mem.push(ns);
       });
       return mem;
@@ -21,7 +21,6 @@ export function useSSR(initialI18nStore, initialLanguage) {
     i18n.initializedStoreOnce = true;
     i18n.isInitialized = true;
   }
-
   if (initialLanguage && !i18n.initializedLanguageOnce) {
     i18n.changeLanguage(initialLanguage);
     i18n.initializedLanguageOnce = true;

package/dist/es/useTranslation.js

@@ -1,136 +1,108 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _typeof from "@babel/runtime/helpers/typeof";
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 import { useState, useEffect, useContext, useRef } from 'react';
 import { getI18n, getDefaults, ReportNamespaces, I18nContext } from './context.js';
 import { warnOnce, loadNamespaces, loadLanguages, hasLoadedNamespace } from './utils.js';
-
-var usePrevious = function usePrevious(value, ignore) {
-  var ref = useRef();
-  useEffect(function () {
+const usePrevious = (value, ignore) => {
+  const ref = useRef();
+  useEffect(() => {
     ref.current = ignore ? ref.current : value;
   }, [value, ignore]);
   return ref.current;
 };
-
 export function useTranslation(ns) {
-  var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var i18nFromProps = props.i18n;
-
-  var _ref = useContext(I18nContext) || {},
-      i18nFromContext = _ref.i18n,
-      defaultNSFromContext = _ref.defaultNS;
-
-  var i18n = i18nFromProps || i18nFromContext || getI18n();
+  let props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  const {
+    i18n: i18nFromProps
+  } = props;
+  const {
+    i18n: i18nFromContext,
+    defaultNS: defaultNSFromContext
+  } = useContext(I18nContext) || {};
+  const i18n = i18nFromProps || i18nFromContext || getI18n();
   if (i18n && !i18n.reportNamespaces) i18n.reportNamespaces = new ReportNamespaces();
-
   if (!i18n) {
     warnOnce('You will need to pass in an i18next instance by using initReactI18next');
-
-    var notReadyT = function notReadyT(k, optsOrDefaultValue) {
+    const notReadyT = (k, optsOrDefaultValue) => {
       if (typeof optsOrDefaultValue === 'string') return optsOrDefaultValue;
-      if (optsOrDefaultValue && _typeof(optsOrDefaultValue) === 'object' && typeof optsOrDefaultValue.defaultValue === 'string') return optsOrDefaultValue.defaultValue;
+      if (optsOrDefaultValue && typeof optsOrDefaultValue === 'object' && typeof optsOrDefaultValue.defaultValue === 'string') return optsOrDefaultValue.defaultValue;
       return Array.isArray(k) ? k[k.length - 1] : k;
     };
-
-    var retNotReady = [notReadyT, {}, false];
+    const retNotReady = [notReadyT, {}, false];
     retNotReady.t = notReadyT;
     retNotReady.i18n = {};
     retNotReady.ready = false;
     return retNotReady;
   }
-
   if (i18n.options.react && i18n.options.react.wait !== undefined) warnOnce('It seems you are still using the old wait option, you may migrate to the new useSuspense behaviour.');
-
-  var i18nOptions = _objectSpread(_objectSpread(_objectSpread({}, getDefaults()), i18n.options.react), props);
-
-  var useSuspense = i18nOptions.useSuspense,
-      keyPrefix = i18nOptions.keyPrefix;
-  var namespaces = ns || defaultNSFromContext || i18n.options && i18n.options.defaultNS;
+  const i18nOptions = {
+    ...getDefaults(),
+    ...i18n.options.react,
+    ...props
+  };
+  const {
+    useSuspense,
+    keyPrefix
+  } = i18nOptions;
+  let namespaces = ns || defaultNSFromContext || i18n.options && i18n.options.defaultNS;
   namespaces = typeof namespaces === 'string' ? [namespaces] : namespaces || ['translation'];
   if (i18n.reportNamespaces.addUsedNamespaces) i18n.reportNamespaces.addUsedNamespaces(namespaces);
-  var ready = (i18n.isInitialized || i18n.initializedStoreOnce) && namespaces.every(function (n) {
-    return hasLoadedNamespace(n, i18n, i18nOptions);
-  });
-
+  const ready = (i18n.isInitialized || i18n.initializedStoreOnce) && namespaces.every(n => hasLoadedNamespace(n, i18n, i18nOptions));
   function getT() {
     return i18n.getFixedT(props.lng || null, i18nOptions.nsMode === 'fallback' ? namespaces : namespaces[0], keyPrefix);
   }
-
-  var _useState = useState(getT),
-      _useState2 = _slicedToArray(_useState, 2),
-      t = _useState2[0],
-      setT = _useState2[1];
-
-  var joinedNS = namespaces.join();
-  if (props.lng) joinedNS = "".concat(props.lng).concat(joinedNS);
-  var previousJoinedNS = usePrevious(joinedNS);
-  var isMounted = useRef(true);
-  useEffect(function () {
-    var bindI18n = i18nOptions.bindI18n,
-        bindI18nStore = i18nOptions.bindI18nStore;
+  const [t, setT] = useState(getT);
+  let joinedNS = namespaces.join();
+  if (props.lng) joinedNS = `${props.lng}${joinedNS}`;
+  const previousJoinedNS = usePrevious(joinedNS);
+  const isMounted = useRef(true);
+  useEffect(() => {
+    const {
+      bindI18n,
+      bindI18nStore
+    } = i18nOptions;
     isMounted.current = true;
-
     if (!ready && !useSuspense) {
       if (props.lng) {
-        loadLanguages(i18n, props.lng, namespaces, function () {
+        loadLanguages(i18n, props.lng, namespaces, () => {
           if (isMounted.current) setT(getT);
         });
       } else {
-        loadNamespaces(i18n, namespaces, function () {
+        loadNamespaces(i18n, namespaces, () => {
           if (isMounted.current) setT(getT);
         });
       }
     }
-
     if (ready && previousJoinedNS && previousJoinedNS !== joinedNS && isMounted.current) {
       setT(getT);
     }
-
     function boundReset() {
       if (isMounted.current) setT(getT);
     }
-
     if (bindI18n && i18n) i18n.on(bindI18n, boundReset);
     if (bindI18nStore && i18n) i18n.store.on(bindI18nStore, boundReset);
-    return function () {
+    return () => {
       isMounted.current = false;
-      if (bindI18n && i18n) bindI18n.split(' ').forEach(function (e) {
-        return i18n.off(e, boundReset);
-      });
-      if (bindI18nStore && i18n) bindI18nStore.split(' ').forEach(function (e) {
-        return i18n.store.off(e, boundReset);
-      });
+      if (bindI18n && i18n) bindI18n.split(' ').forEach(e => i18n.off(e, boundReset));
+      if (bindI18nStore && i18n) bindI18nStore.split(' ').forEach(e => i18n.store.off(e, boundReset));
     };
   }, [i18n, joinedNS]);
-  var isInitial = useRef(true);
-  useEffect(function () {
+  const isInitial = useRef(true);
+  useEffect(() => {
     if (isMounted.current && !isInitial.current) {
       setT(getT);
     }
-
     isInitial.current = false;
   }, [i18n, keyPrefix]);
-  var ret = [t, i18n, ready];
+  const ret = [t, i18n, ready];
   ret.t = t;
   ret.i18n = i18n;
   ret.ready = ready;
   if (ready) return ret;
   if (!ready && !useSuspense) return ret;
-  throw new Promise(function (resolve) {
+  throw new Promise(resolve => {
     if (props.lng) {
-      loadLanguages(i18n, props.lng, namespaces, function () {
-        return resolve();
-      });
+      loadLanguages(i18n, props.lng, namespaces, () => resolve());
     } else {
-      loadNamespaces(i18n, namespaces, function () {
-        return resolve();
-      });
+      loadNamespaces(i18n, namespaces, () => resolve());
     }
   });
 }

package/dist/es/utils.js

@@ -1,91 +1,73 @@
 export function warn() {
   if (console && console.warn) {
-    var _console;
-
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
-    if (typeof args[0] === 'string') args[0] = "react-i18next:: ".concat(args[0]);
-
-    (_console = console).warn.apply(_console, args);
+    if (typeof args[0] === 'string') args[0] = `react-i18next:: ${args[0]}`;
+    console.warn(...args);
   }
 }
-var alreadyWarned = {};
+const alreadyWarned = {};
 export function warnOnce() {
   for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
     args[_key2] = arguments[_key2];
   }
-
   if (typeof args[0] === 'string' && alreadyWarned[args[0]]) return;
   if (typeof args[0] === 'string') alreadyWarned[args[0]] = new Date();
-  warn.apply(void 0, args);
+  warn(...args);
 }
-
-var loadedClb = function loadedClb(i18n, cb) {
-  return function () {
-    if (i18n.isInitialized) {
+const loadedClb = (i18n, cb) => () => {
+  if (i18n.isInitialized) {
+    cb();
+  } else {
+    const initialized = () => {
+      setTimeout(() => {
+        i18n.off('initialized', initialized);
+      }, 0);
       cb();
-    } else {
-      var initialized = function initialized() {
-        setTimeout(function () {
-          i18n.off('initialized', initialized);
-        }, 0);
-        cb();
-      };
-
-      i18n.on('initialized', initialized);
-    }
-  };
+    };
+    i18n.on('initialized', initialized);
+  }
 };
-
 export function loadNamespaces(i18n, ns, cb) {
   i18n.loadNamespaces(ns, loadedClb(i18n, cb));
 }
 export function loadLanguages(i18n, lng, ns, cb) {
   if (typeof ns === 'string') ns = [ns];
-  ns.forEach(function (n) {
+  ns.forEach(n => {
     if (i18n.options.ns.indexOf(n) < 0) i18n.options.ns.push(n);
   });
   i18n.loadLanguages(lng, loadedClb(i18n, cb));
 }
-
 function oldI18nextHasLoadedNamespace(ns, i18n) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  var lng = i18n.languages[0];
-  var fallbackLng = i18n.options ? i18n.options.fallbackLng : false;
-  var lastLng = i18n.languages[i18n.languages.length - 1];
+  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  const lng = i18n.languages[0];
+  const fallbackLng = i18n.options ? i18n.options.fallbackLng : false;
+  const lastLng = i18n.languages[i18n.languages.length - 1];
   if (lng.toLowerCase() === 'cimode') return true;
-
-  var loadNotPending = function loadNotPending(l, n) {
-    var loadState = i18n.services.backendConnector.state["".concat(l, "|").concat(n)];
+  const loadNotPending = (l, n) => {
+    const loadState = i18n.services.backendConnector.state[`${l}|${n}`];
     return loadState === -1 || loadState === 2;
   };
-
   if (options.bindI18n && options.bindI18n.indexOf('languageChanging') > -1 && i18n.services.backendConnector.backend && i18n.isLanguageChangingTo && !loadNotPending(i18n.isLanguageChangingTo, ns)) return false;
   if (i18n.hasResourceBundle(lng, ns)) return true;
   if (!i18n.services.backendConnector.backend || i18n.options.resources && !i18n.options.partialBundledLanguages) return true;
   if (loadNotPending(lng, ns) && (!fallbackLng || loadNotPending(lastLng, ns))) return true;
   return false;
 }
-
 export function hasLoadedNamespace(ns, i18n) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-
+  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!i18n.languages || !i18n.languages.length) {
     warnOnce('i18n.languages were undefined or empty', i18n.languages);
     return true;
   }
-
-  var isNewerI18next = i18n.options.ignoreJSONStructure !== undefined;
-
+  const isNewerI18next = i18n.options.ignoreJSONStructure !== undefined;
   if (!isNewerI18next) {
     return oldI18nextHasLoadedNamespace(ns, i18n, options);
   }
-
   return i18n.hasLoadedNamespace(ns, {
     lng: options.lng,
-    precheck: function precheck(i18nInstance, loadNotPending) {
+    precheck: (i18nInstance, loadNotPending) => {
       if (options.bindI18n && options.bindI18n.indexOf('languageChanging') > -1 && i18nInstance.services.backendConnector.backend && i18nInstance.isLanguageChangingTo && !loadNotPending(i18nInstance.isLanguageChangingTo, ns)) return false;
     }
   });

package/dist/es/withSSR.js

@@ -1,11 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["initialI18nStore", "initialLanguage"];
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 import { createElement } from 'react';
 import { useSSR } from './useSSR.js';
 import { composeInitialProps } from './context.js';
@@ -13,16 +5,18 @@ import { getDisplayName } from './utils.js';
 export function withSSR() {
   return function Extend(WrappedComponent) {
     function I18nextWithSSR(_ref) {
-      var initialI18nStore = _ref.initialI18nStore,
-          initialLanguage = _ref.initialLanguage,
-          rest = _objectWithoutProperties(_ref, _excluded);
-
+      let {
+        initialI18nStore,
+        initialLanguage,
+        ...rest
+      } = _ref;
       useSSR(initialI18nStore, initialLanguage);
-      return createElement(WrappedComponent, _objectSpread({}, rest));
+      return createElement(WrappedComponent, {
+        ...rest
+      });
     }
-
     I18nextWithSSR.getInitialProps = composeInitialProps(WrappedComponent);
-    I18nextWithSSR.displayName = "withI18nextSSR(".concat(getDisplayName(WrappedComponent), ")");
+    I18nextWithSSR.displayName = `withI18nextSSR(${getDisplayName(WrappedComponent)})`;
     I18nextWithSSR.WrappedComponent = WrappedComponent;
     return I18nextWithSSR;
   };

package/dist/es/withTranslation.js

@@ -1,54 +1,36 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["forwardedRef"];
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 import { createElement, forwardRef as forwardRefReact } from 'react';
 import { useTranslation } from './useTranslation.js';
 import { getDisplayName } from './utils.js';
 export function withTranslation(ns) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return function Extend(WrappedComponent) {
     function I18nextWithTranslation(_ref) {
-      var forwardedRef = _ref.forwardedRef,
-          rest = _objectWithoutProperties(_ref, _excluded);
-
-      var _useTranslation = useTranslation(ns, _objectSpread(_objectSpread({}, rest), {}, {
+      let {
+        forwardedRef,
+        ...rest
+      } = _ref;
+      const [t, i18n, ready] = useTranslation(ns, {
+        ...rest,
         keyPrefix: options.keyPrefix
-      })),
-          _useTranslation2 = _slicedToArray(_useTranslation, 3),
-          t = _useTranslation2[0],
-          i18n = _useTranslation2[1],
-          ready = _useTranslation2[2];
-
-      var passDownProps = _objectSpread(_objectSpread({}, rest), {}, {
-        t: t,
-        i18n: i18n,
-        tReady: ready
       });
-
+      const passDownProps = {
+        ...rest,
+        t,
+        i18n,
+        tReady: ready
+      };
       if (options.withRef && forwardedRef) {
         passDownProps.ref = forwardedRef;
       } else if (!options.withRef && forwardedRef) {
         passDownProps.forwardedRef = forwardedRef;
       }
-
       return createElement(WrappedComponent, passDownProps);
     }
-
-    I18nextWithTranslation.displayName = "withI18nextTranslation(".concat(getDisplayName(WrappedComponent), ")");
+    I18nextWithTranslation.displayName = `withI18nextTranslation(${getDisplayName(WrappedComponent)})`;
     I18nextWithTranslation.WrappedComponent = WrappedComponent;
-
-    var forwardRef = function forwardRef(props, ref) {
-      return createElement(I18nextWithTranslation, Object.assign({}, props, {
-        forwardedRef: ref
-      }));
-    };
-
+    const forwardRef = (props, ref) => createElement(I18nextWithTranslation, Object.assign({}, props, {
+      forwardedRef: ref
+    }));
     return options.withRef ? forwardRefReact(forwardRef) : I18nextWithTranslation;
   };
 }