next-i18next 2.1.3 → 4.1.0

package/README.md

@@ -31,18 +31,21 @@ You need to also have `react` and `next` installed.
 By default, `next-i18next` expects your translations to be organised as such:
 ```
 .
-└── static
-    └── locales
-        ├── en
-        |   └── common.json
-        └── de
-            └── common.json
+└── public
+    └── static
+        └── locales
+            ├── en
+            |   └── common.json
+            └── de
+                └── common.json
 ```
 
 This structure can also be seen in the [simple example](./examples/simple).
 
 If you want to structure your translations/namespaces in a custom way, you will need to pass modified `localePath` and `localeStructure` values into the initialisation config.
 
+If translations are not found in `config.localePath` or `public/static/locales` an attempt will be made to find the locales in `static/locales`, if found a deprecation warning will be logged.
+
 ### 3. Project setup
 
 The default export of `next-i18next` is a class constructor, into which you pass your config options. The resulting class has all the methods you will need to translate your app:
@@ -236,10 +239,10 @@ MyPage.getInitialProps = async({ req }) => {
 | `browserLanguageDetection`  | `true`  |
 | `defaultNS` | `'common'`  |
 | `defaultLanguage`  | `'en'`  |
-| `ignoreRoutes`  | `['/_next/', '/static/']`  |
+| `ignoreRoutes`  | `['/_next/', '/static/', '/public/', '/api/']`  |
 | `otherLanguages` (required) | `[]`  |
 | `localeExtension` | `'json'`  |
-| `localePath` | `'static/locales'`  |
+| `localePath` | `'public/static/locales'`  |
 | `localeStructure` | `'{{lng}}/{{ns}}'`  |
 | `localeSubpaths` | `{}`  |
 | `serverLanguageDetection` | `true`  |
@@ -263,7 +266,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore -->
-<table cellspacing="0" cellpadding="1"><tr><td><a href="https://github.com/capellini"><img src="https://avatars3.githubusercontent.com/u/75311?v=4" width="100px;" height="100px;" alt="Rob Capellini"/><br /><sub><b>Rob Capellini</b></sub></a><br /><a href="https://github.com/isaachinman/next-i18next/commits?author=capellini" title="Code">💻</a> <a href="https://github.com/isaachinman/next-i18next/commits?author=capellini" title="Tests">⚠️</a></td><td><a href="https://en.kachkaev.ru"><img src="https://avatars3.githubusercontent.com/u/608862?v=4" width="100px;" height="100px;" alt="Alexander Kachkaev"/><br /><sub><b>Alexander Kachkaev</b></sub></a><br /><a href="#talk-kachkaev" title="Talks">📢</a> <a href="#question-kachkaev" title="Answering Questions">💬</a> <a href="#ideas-kachkaev" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/isaachinman/next-i18next/commits?author=kachkaev" title="Code">💻</a> <a href="https://github.com/isaachinman/next-i18next/commits?author=kachkaev" title="Tests">⚠️</a></td><td><a href="https://kandelborg.dk"><img src="https://avatars1.githubusercontent.com/u/33042011?v=4" width="100px;" height="100px;" alt="Mathias Wøbbe"/><br /><sub><b>Mathias Wøbbe</b></sub></a><br /><a href="https://github.com/isaachinman/next-i18next/commits?author=MathiasKandelborg" title="Code">💻</a> <a href="#ideas-MathiasKandelborg" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/isaachinman/next-i18next/commits?author=MathiasKandelborg" title="Tests">⚠️</a></td><td><a href="http://lucasfeliciano.com"><img src="https://avatars3.githubusercontent.com/u/968014?v=4" width="100px;" height="100px;" alt="Lucas Feliciano"/><br /><sub><b>Lucas Feliciano</b></sub></a><br /><a href="#ideas-lucasfeliciano" title="Ideas, Planning, & Feedback">🤔</a> <a href="#review-lucasfeliciano" title="Reviewed Pull Requests">👀</a></td><td><a href="http://www.fifteenprospects.com"><img src="https://avatars2.githubusercontent.com/u/6932550?v=4" width="100px;" height="100px;" alt="Ryan Leung"/><br /><sub><b>Ryan Leung</b></sub></a><br /><a href="https://github.com/isaachinman/next-i18next/commits?author=minocys" title="Code">💻</a></td></tr></table>
+<table cellspacing="0" cellpadding="1"><tr><td><a href="https://github.com/capellini"><img src="https://avatars3.githubusercontent.com/u/75311?v=4" width="100px;" height="100px;" alt="Rob Capellini"/><br /><sub><b>Rob Capellini</b></sub></a><br /><a href="https://github.com/isaachinman/next-i18next/commits?author=capellini" title="Code">💻</a> <a href="https://github.com/isaachinman/next-i18next/commits?author=capellini" title="Tests">⚠️</a></td><td><a href="https://en.kachkaev.ru"><img src="https://avatars3.githubusercontent.com/u/608862?v=4" width="100px;" height="100px;" alt="Alexander Kachkaev"/><br /><sub><b>Alexander Kachkaev</b></sub></a><br /><a href="#talk-kachkaev" title="Talks">📢</a> <a href="#question-kachkaev" title="Answering Questions">💬</a> <a href="#ideas-kachkaev" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/isaachinman/next-i18next/commits?author=kachkaev" title="Code">💻</a> <a href="https://github.com/isaachinman/next-i18next/commits?author=kachkaev" title="Tests">⚠️</a></td><td><a href="https://kandelborg.dk"><img src="https://avatars1.githubusercontent.com/u/33042011?v=4" width="100px;" height="100px;" alt="Mathias Wøbbe"/><br /><sub><b>Mathias Wøbbe</b></sub></a><br /><a href="https://github.com/isaachinman/next-i18next/commits?author=MathiasKandelborg" title="Code">💻</a> <a href="#ideas-MathiasKandelborg" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/isaachinman/next-i18next/commits?author=MathiasKandelborg" title="Tests">⚠️</a></td><td><a href="http://lucasfeliciano.com"><img src="https://avatars3.githubusercontent.com/u/968014?v=4" width="100px;" height="100px;" alt="Lucas Feliciano"/><br /><sub><b>Lucas Feliciano</b></sub></a><br /><a href="#ideas-lucasfeliciano" title="Ideas, Planning, & Feedback">🤔</a> <a href="#review-lucasfeliciano" title="Reviewed Pull Requests">👀</a></td><td><a href="http://www.fifteenprospects.com"><img src="https://avatars2.githubusercontent.com/u/6932550?v=4" width="100px;" height="100px;" alt="Ryan Leung"/><br /><sub><b>Ryan Leung</b></sub></a><br /><a href="https://github.com/isaachinman/next-i18next/commits?author=minocys" title="Code">💻</a></td><td><a href="http://nathanfriemel.com"><img src="https://avatars3.githubusercontent.com/u/1325835?v=4" width="100px;" height="100px;" alt="Nathan Friemel"/><br /><sub><b>Nathan Friemel</b></sub></a><br /><a href="https://github.com/isaachinman/next-i18next/commits?author=nathanfriemel" title="Code">💻</a> <a href="https://github.com/isaachinman/next-i18next/commits?author=nathanfriemel" title="Documentation">📖</a> <a href="#example-nathanfriemel" title="Examples">💡</a> <a href="#ideas-nathanfriemel" title="Ideas, Planning, & Feedback">🤔</a></td></tr></table>
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

package/dist/commonjs/config/create-config.js

@@ -11,6 +11,8 @@ exports.createConfig = void 0;
 
 require("core-js/modules/es6.array.for-each");
 
+require("core-js/modules/es6.string.starts-with");
+
 require("core-js/modules/es6.regexp.replace");
 
 require("core-js/modules/es6.array.map");
@@ -23,7 +25,7 @@ require("core-js/modules/es6.array.filter");
 
 var _defaultConfig = require("./default-config");
 
-var _isServer = require("../utils/is-server");
+var _utils = require("../utils");
 
 var deepMergeObjects = ['backend', 'detection'];
 
@@ -33,13 +35,21 @@ var dedupe = function dedupe(names) {
   });
 };
 
+var STATIC_LOCALE_PATH = 'static/locales';
+
 var createConfig = function createConfig(userConfig) {
   if (typeof userConfig.localeSubpaths === 'string') {
     throw new Error('The localeSubpaths option has been changed to an object. Please refer to documentation.');
-  } // Initial merge of default and user-provided config
+  }
+  /*
+    Initial merge of default and user-provided config
+  */
 
 
-  var combinedConfig = (0, _objectSpread2["default"])({}, _defaultConfig.defaultConfig, userConfig); // Sensible defaults to prevent user duplication
+  var combinedConfig = (0, _objectSpread2["default"])({}, _defaultConfig.defaultConfig, userConfig);
+  /*
+    Sensible defaults to prevent user duplication
+  */
 
   combinedConfig.allLanguages = dedupe(combinedConfig.otherLanguages.concat([combinedConfig.defaultLanguage]));
   combinedConfig.whitelist = combinedConfig.allLanguages;
@@ -49,26 +59,49 @@ var createConfig = function createConfig(userConfig) {
       localePath = combinedConfig.localePath,
       localeStructure = combinedConfig.localeStructure;
 
-  if ((0, _isServer.isServer)()) {
+  if ((0, _utils.isServer)()) {
     var fs = eval("require('fs')");
 
-    var path = require('path'); // Validate defaultNS
-    // https://github.com/isaachinman/next-i18next/issues/358
+    var path = require('path');
 
+    var serverLocalePath = localePath;
+    /*
+      Validate defaultNS
+      https://github.com/isaachinman/next-i18next/issues/358
+    */
 
-    if (process.env.NODE_ENV !== 'production' && typeof combinedConfig.defaultNS === 'string') {
-      var defaultNSPath = path.join(process.cwd(), "".concat(localePath, "/").concat(defaultLanguage, "/").concat(combinedConfig.defaultNS, ".").concat(localeExtension));
+    if (typeof combinedConfig.defaultNS === 'string') {
+      var defaultFile = "/".concat(defaultLanguage, "/").concat(combinedConfig.defaultNS, ".").concat(localeExtension);
+      var defaultNSPath = path.join(process.cwd(), localePath, defaultFile);
       var defaultNSExists = fs.existsSync(defaultNSPath);
 
       if (!defaultNSExists) {
-        throw new Error("Default namespace not found at ".concat(defaultNSPath));
+        /*
+          If defaultNS doesn't exist, try to fall back to the deprecated static folder
+          https://github.com/isaachinman/next-i18next/issues/523
+        */
+        var staticDirPath = path.join(process.cwd(), STATIC_LOCALE_PATH, defaultFile);
+        var staticDirExists = fs.existsSync(staticDirPath);
+
+        if (staticDirExists) {
+          (0, _utils.consoleMessage)('warn', 'next-i18next: Falling back to /static folder, deprecated in next@9.1.*', combinedConfig);
+          serverLocalePath = STATIC_LOCALE_PATH;
+        } else if (process.env.NODE_ENV !== 'production') {
+          throw new Error("Default namespace not found at ".concat(defaultNSPath));
+        }
       }
-    } // Set server side backend
+    }
+    /*
+      Set server side backend
+    */
 
 
     combinedConfig.backend = {
-      loadPath: path.join(process.cwd(), "".concat(localePath, "/").concat(localeStructure, ".").concat(localeExtension)),
-      addPath: path.join(process.cwd(), "".concat(localePath, "/").concat(localeStructure, ".missing.").concat(localeExtension)) // Set server side preload (languages and namespaces)
+      loadPath: path.join(process.cwd(), "".concat(serverLocalePath, "/").concat(localeStructure, ".").concat(localeExtension)),
+      addPath: path.join(process.cwd(), "".concat(serverLocalePath, "/").concat(localeStructure, ".missing.").concat(localeExtension))
+      /*
+        Set server side preload (languages and namespaces)
+      */
 
     };
     combinedConfig.preload = allLanguages;
@@ -80,21 +113,39 @@ var createConfig = function createConfig(userConfig) {
         });
       };
 
-      combinedConfig.ns = getAllNamespaces(path.join(process.cwd(), "".concat(localePath, "/").concat(defaultLanguage)));
+      combinedConfig.ns = getAllNamespaces(path.join(process.cwd(), "".concat(serverLocalePath, "/").concat(defaultLanguage)));
     }
   } else {
-    // Set client side backend
+    var clientLocalePath = localePath;
+    /*
+      Remove public prefix from client site config
+    */
+
+    if (localePath.startsWith('public/')) {
+      clientLocalePath = localePath.replace(/^public\//, '');
+    }
+    /*
+      Set client side backend
+    */
+
+
     combinedConfig.backend = {
-      loadPath: "/".concat(localePath, "/").concat(localeStructure, ".").concat(localeExtension),
-      addPath: "/".concat(localePath, "/").concat(localeStructure, ".missing.").concat(localeExtension)
+      loadPath: "/".concat(clientLocalePath, "/").concat(localeStructure, ".").concat(localeExtension),
+      addPath: "/".concat(clientLocalePath, "/").concat(localeStructure, ".missing.").concat(localeExtension)
     };
     combinedConfig.ns = [combinedConfig.defaultNS];
-  } // Set fallback language to defaultLanguage in production
+  }
+  /*
+    Set fallback language to defaultLanguage in production
+  */
 
 
   if (!userConfig.fallbackLng) {
     combinedConfig.fallbackLng = process.env.NODE_ENV === 'production' ? combinedConfig.defaultLanguage : false;
-  } // Deep merge with overwrite - goes last
+  }
+  /*
+    Deep merge with overwrite - goes last
+  */
 
 
   deepMergeObjects.forEach(function (obj) {

package/dist/commonjs/config/default-config.js

@@ -12,7 +12,7 @@ var _utils = require("../utils");
 var DEFAULT_LANGUAGE = 'en';
 var OTHER_LANGUAGES = [];
 var DEFAULT_NAMESPACE = 'common';
-var LOCALE_PATH = 'static/locales';
+var LOCALE_PATH = 'public/static/locales';
 var LOCALE_STRUCTURE = '{{lng}}/{{ns}}';
 var LOCALE_EXTENSION = 'json';
 var defaultConfig = {
@@ -34,7 +34,7 @@ var defaultConfig = {
   },
   browserLanguageDetection: true,
   serverLanguageDetection: true,
-  ignoreRoutes: ['/_next/', '/static/'],
+  ignoreRoutes: ['/_next/', '/static/', '/public/', '/api/'],
   customDetectors: [],
   detection: {
     lookupCookie: 'next-i18next',

package/dist/commonjs/create-i18next-client.js

@@ -20,6 +20,8 @@ var _i18nextXhrBackend = _interopRequireDefault(require("i18next-xhr-backend"));
 var _i18nextBrowserLanguagedetector = _interopRequireDefault(require("i18next-browser-languagedetector"));
 
 var _default = function _default(config) {
+  var initPromise;
+
   if (!_i18next["default"].isInitialized) {
     if (_detectNode["default"]) {
       var i18nextNodeBackend = eval("require('i18next-node-fs-backend')");
@@ -51,11 +53,13 @@ var _default = function _default(config) {
     config.use.forEach(function (x) {
       return _i18next["default"].use(x);
     });
-
-    _i18next["default"].init(config);
+    initPromise = _i18next["default"].init(config);
   }
 
-  return _i18next["default"];
+  return {
+    i18n: _i18next["default"],
+    initPromise: initPromise
+  };
 };
 
 exports["default"] = _default;

package/dist/commonjs/index.js

@@ -43,6 +43,7 @@ var NextI18Next = function NextI18Next(userConfig) {
   (0, _defineProperty2["default"])(this, "Link", void 0);
   (0, _defineProperty2["default"])(this, "Router", void 0);
   (0, _defineProperty2["default"])(this, "i18n", void 0);
+  (0, _defineProperty2["default"])(this, "initPromise", void 0);
   (0, _defineProperty2["default"])(this, "config", void 0);
   (0, _defineProperty2["default"])(this, "useTranslation", void 0);
   (0, _defineProperty2["default"])(this, "withTranslation", void 0);
@@ -61,7 +62,12 @@ var NextI18Next = function NextI18Next(userConfig) {
     throw new Error('next-i18next has upgraded to react-i18next v10 - please rename withNamespaces to withTranslation.');
   };
 
-  this.i18n = (0, _createI18nextClient["default"])(this.config);
+  var _createI18NextClient = (0, _createI18nextClient["default"])(this.config),
+      i18n = _createI18NextClient.i18n,
+      initPromise = _createI18NextClient.initPromise;
+
+  this.i18n = i18n;
+  this.initPromise = initPromise;
   this.appWithTranslation = _hocs.appWithTranslation.bind(this);
 
   this.withTranslation = function (namespace, options) {

package/dist/commonjs/utils/console-message.js

@@ -44,9 +44,9 @@ var logMessage = function logMessage(messageType, message) {
 };
 
 var consoleMessage = function consoleMessage(messageType, message) {
-  var _this$config = this.config,
-      errorStackTraceLimit = _this$config.errorStackTraceLimit,
-      strictMode = _this$config.strictMode;
+  var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this.config;
+  var errorStackTraceLimit = config.errorStackTraceLimit,
+      strictMode = config.strictMode;
   var prevStackLimit = Error.stackTraceLimit;
   var util;
 

package/dist/commonjs/utils/subpath-is-present.js

@@ -19,7 +19,7 @@ var subpathIsPresent = function subpathIsPresent(url, subpath) {
   var _parseUrl = (0, _url.parse)(url),
       pathname = _parseUrl.pathname;
 
-  return pathname.length === subpath.length + 1 && pathname === "/".concat(subpath) || pathname.startsWith("/".concat(subpath, "/"));
+  return typeof pathname === 'string' && (pathname.length === subpath.length + 1 && pathname === "/".concat(subpath) || pathname.startsWith("/".concat(subpath, "/")));
 };
 
 exports.subpathIsPresent = subpathIsPresent;

package/dist/es/config/create-config.js

@@ -1,18 +1,25 @@
 import { defaultConfig } from './default-config';
-import { isServer } from '../utils/is-server';
+import { consoleMessage, isServer } from '../utils';
 const deepMergeObjects = ['backend', 'detection'];
 
 const dedupe = names => names.filter((v, i) => names.indexOf(v) === i);
 
+const STATIC_LOCALE_PATH = 'static/locales';
 export const createConfig = userConfig => {
   if (typeof userConfig.localeSubpaths === 'string') {
     throw new Error('The localeSubpaths option has been changed to an object. Please refer to documentation.');
-  } // Initial merge of default and user-provided config
+  }
+  /*
+    Initial merge of default and user-provided config
+  */
 
 
   const combinedConfig = { ...defaultConfig,
     ...userConfig
-  }; // Sensible defaults to prevent user duplication
+  };
+  /*
+    Sensible defaults to prevent user duplication
+  */
 
   combinedConfig.allLanguages = dedupe(combinedConfig.otherLanguages.concat([combinedConfig.defaultLanguage]));
   combinedConfig.whitelist = combinedConfig.allLanguages;
@@ -27,23 +34,46 @@ export const createConfig = userConfig => {
   if (isServer()) {
     const fs = eval("require('fs')");
 
-    const path = require('path'); // Validate defaultNS
-    // https://github.com/isaachinman/next-i18next/issues/358
+    const path = require('path');
 
+    let serverLocalePath = localePath;
+    /*
+      Validate defaultNS
+      https://github.com/isaachinman/next-i18next/issues/358
+    */
 
-    if (process.env.NODE_ENV !== 'production' && typeof combinedConfig.defaultNS === 'string') {
-      const defaultNSPath = path.join(process.cwd(), `${localePath}/${defaultLanguage}/${combinedConfig.defaultNS}.${localeExtension}`);
+    if (typeof combinedConfig.defaultNS === 'string') {
+      const defaultFile = `/${defaultLanguage}/${combinedConfig.defaultNS}.${localeExtension}`;
+      const defaultNSPath = path.join(process.cwd(), localePath, defaultFile);
       const defaultNSExists = fs.existsSync(defaultNSPath);
 
       if (!defaultNSExists) {
-        throw new Error(`Default namespace not found at ${defaultNSPath}`);
+        /*
+          If defaultNS doesn't exist, try to fall back to the deprecated static folder
+          https://github.com/isaachinman/next-i18next/issues/523
+        */
+        const staticDirPath = path.join(process.cwd(), STATIC_LOCALE_PATH, defaultFile);
+        const staticDirExists = fs.existsSync(staticDirPath);
+
+        if (staticDirExists) {
+          consoleMessage('warn', 'next-i18next: Falling back to /static folder, deprecated in next@9.1.*', combinedConfig);
+          serverLocalePath = STATIC_LOCALE_PATH;
+        } else if (process.env.NODE_ENV !== 'production') {
+          throw new Error(`Default namespace not found at ${defaultNSPath}`);
+        }
       }
-    } // Set server side backend
+    }
+    /*
+      Set server side backend
+    */
 
 
     combinedConfig.backend = {
-      loadPath: path.join(process.cwd(), `${localePath}/${localeStructure}.${localeExtension}`),
-      addPath: path.join(process.cwd(), `${localePath}/${localeStructure}.missing.${localeExtension}`) // Set server side preload (languages and namespaces)
+      loadPath: path.join(process.cwd(), `${serverLocalePath}/${localeStructure}.${localeExtension}`),
+      addPath: path.join(process.cwd(), `${serverLocalePath}/${localeStructure}.missing.${localeExtension}`)
+      /*
+        Set server side preload (languages and namespaces)
+      */
 
     };
     combinedConfig.preload = allLanguages;
@@ -51,21 +81,39 @@ export const createConfig = userConfig => {
     if (!combinedConfig.ns) {
       const getAllNamespaces = p => fs.readdirSync(p).map(file => file.replace(`.${localeExtension}`, ''));
 
-      combinedConfig.ns = getAllNamespaces(path.join(process.cwd(), `${localePath}/${defaultLanguage}`));
+      combinedConfig.ns = getAllNamespaces(path.join(process.cwd(), `${serverLocalePath}/${defaultLanguage}`));
     }
   } else {
-    // Set client side backend
+    let clientLocalePath = localePath;
+    /*
+      Remove public prefix from client site config
+    */
+
+    if (localePath.startsWith('public/')) {
+      clientLocalePath = localePath.replace(/^public\//, '');
+    }
+    /*
+      Set client side backend
+    */
+
+
     combinedConfig.backend = {
-      loadPath: `/${localePath}/${localeStructure}.${localeExtension}`,
-      addPath: `/${localePath}/${localeStructure}.missing.${localeExtension}`
+      loadPath: `/${clientLocalePath}/${localeStructure}.${localeExtension}`,
+      addPath: `/${clientLocalePath}/${localeStructure}.missing.${localeExtension}`
     };
     combinedConfig.ns = [combinedConfig.defaultNS];
-  } // Set fallback language to defaultLanguage in production
+  }
+  /*
+    Set fallback language to defaultLanguage in production
+  */
 
 
   if (!userConfig.fallbackLng) {
     combinedConfig.fallbackLng = process.env.NODE_ENV === 'production' ? combinedConfig.defaultLanguage : false;
-  } // Deep merge with overwrite - goes last
+  }
+  /*
+    Deep merge with overwrite - goes last
+  */
 
 
   deepMergeObjects.forEach(obj => {

package/dist/es/config/default-config.js

@@ -2,7 +2,7 @@ import { isServer } from '../utils';
 const DEFAULT_LANGUAGE = 'en';
 const OTHER_LANGUAGES = [];
 const DEFAULT_NAMESPACE = 'common';
-const LOCALE_PATH = 'static/locales';
+const LOCALE_PATH = 'public/static/locales';
 const LOCALE_STRUCTURE = '{{lng}}/{{ns}}';
 const LOCALE_EXTENSION = 'json';
 export const defaultConfig = {
@@ -22,7 +22,7 @@ export const defaultConfig = {
   },
   browserLanguageDetection: true,
   serverLanguageDetection: true,
-  ignoreRoutes: ['/_next/', '/static/'],
+  ignoreRoutes: ['/_next/', '/static/', '/public/', '/api/'],
   customDetectors: [],
   detection: {
     lookupCookie: 'next-i18next',

package/dist/es/create-i18next-client.js

@@ -3,6 +3,8 @@ import i18n from 'i18next';
 import i18nextXHRBackend from 'i18next-xhr-backend';
 import I18nextBrowserLanguageDetector from 'i18next-browser-languagedetector';
 export default (config => {
+  let initPromise;
+
   if (!i18n.isInitialized) {
     if (isNode) {
       const i18nextNodeBackend = eval("require('i18next-node-fs-backend')");
@@ -25,8 +27,11 @@ export default (config => {
     }
 
     config.use.forEach(x => i18n.use(x));
-    i18n.init(config);
+    initPromise = i18n.init(config);
   }
 
-  return i18n;
+  return {
+    i18n,
+    initPromise
+  };
 });

package/dist/es/index.js

@@ -21,7 +21,12 @@ export default class NextI18Next {
       throw new Error('next-i18next has upgraded to react-i18next v10 - please rename withNamespaces to withTranslation.');
     };
 
-    this.i18n = createI18NextClient(this.config);
+    const {
+      i18n,
+      initPromise
+    } = createI18NextClient(this.config);
+    this.i18n = i18n;
+    this.initPromise = initPromise;
     this.appWithTranslation = appWithTranslation.bind(this);
 
     this.withTranslation = (namespace, options) => Component => hoistNonReactStatics(withTranslation(namespace, options)(Component), Component);

package/dist/es/utils/console-message.js

@@ -14,11 +14,11 @@ const logMessage = (messageType, message) => {
   }
 };
 
-export const consoleMessage = function (messageType, message) {
+export const consoleMessage = function (messageType, message, config = this.config) {
   const {
     errorStackTraceLimit,
     strictMode
-  } = this.config;
+  } = config;
   const prevStackLimit = Error.stackTraceLimit;
   let util;
 

package/dist/es/utils/subpath-is-present.js

@@ -7,5 +7,5 @@ export const subpathIsPresent = (url, subpath) => {
   const {
     pathname
   } = parseUrl(url);
-  return pathname.length === subpath.length + 1 && pathname === `/${subpath}` || pathname.startsWith(`/${subpath}/`);
+  return typeof pathname === 'string' && (pathname.length === subpath.length + 1 && pathname === `/${subpath}` || pathname.startsWith(`/${subpath}/`));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-i18next",
-  "version": "2.1.3",
+  "version": "4.1.0",
   "repository": "git@github.com:isaachinman/next-i18next.git",
   "author": "Isaac Hinman <isaac@isaachinman.com>",
   "funding": {
@@ -95,15 +95,15 @@
     "jsdom-global": "^3.0.2",
     "next": "^9.0.1",
     "puppeteer": "^1.11.0",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
     "typescript": "^3.5.3"
   },
   "dependencies": {
     "core-js": "^2",
     "detect-node": "^2.0.4",
     "hoist-non-react-statics": "^3.2.0",
-    "i18next": "^18.0.1",
+    "i18next": "^19.0.3",
     "i18next-browser-languagedetector": "^4.0.0",
     "i18next-express-middleware": "^1.5.0",
     "i18next-node-fs-backend": "^2.1.0",
@@ -113,10 +113,6 @@
     "react-i18next": "^11.0.0",
     "url": "^0.11.0"
   },
-  "resolutions": {
-    "**/react": "^16.8.6",
-    "**/react-dom": "^16.8.6"
-  },
   "peerDependencies": {
     "next": ">= 7.0.0",
     "react": ">= 16.8.0"

package/types.d.ts

@@ -9,7 +9,7 @@ import {
 } from 'react-i18next'
 import { LinkProps } from 'next/link'
 import { SingletonRouter } from 'next/router'
-import i18next from 'i18next'
+import { InitOptions, i18n, TFunction as I18NextTFunction } from 'i18next'
 
 export type InitConfig = {
   browserLanguageDetection?: boolean;
@@ -23,7 +23,7 @@ export type InitConfig = {
   localeSubpaths?: Record<string, string>;
   use?: any[];
   customDetectors?: any[];
-} & i18next.InitOptions
+} & InitOptions
 
 export type Config = {
   fallbackLng: boolean;
@@ -42,10 +42,11 @@ export type Link = React.ComponentClass<LinkProps>
 export type Router = SingletonRouter
 export type UseTranslation = typeof useTranslation
 export type AppWithTranslation = <P extends object>(Component: React.ComponentType<P> | React.ElementType<P>) => any
-export type TFunction = i18next.TFunction
-export type I18n = i18next.i18n
+export type TFunction = I18NextTFunction
+export type I18n = i18n
 export type WithTranslationHocType = typeof withTranslation
 export type WithTranslation = ReactI18nextWithTranslation
+export type InitPromise = Promise<TFunction>
 
 declare class NextI18Next {
   constructor(config: InitConfig);
@@ -53,6 +54,7 @@ declare class NextI18Next {
   Link: Link
   Router: Router
   i18n: I18n
+  initPromise: InitPromise
   config: Config
   useTranslation: UseTranslation
   withTranslation: WithTranslationHocType