next-i18next 10.2.0 → 10.3.0

package/README.md

@@ -254,6 +254,27 @@ const Component = () => {
 }
 ```
 
+#### Custom interpolation prefix/suffix
+
+By default, i18next uses `{{` as prefix and `}}` as suffix for [interpolation](https://www.i18next.com/translation-function/interpolation).
+If you want/need to override these interpolation settings, you **must** also specify an alternative `localeStructure` setting that matches your custom prefix and suffix.
+
+For example, if you want to use `{` and `}` the config would look like this:
+
+```js
+{
+  i18n: {
+    defaultLocale: 'en',
+    locales: ['en', 'nl'],
+  },
+  interpolation: {
+    prefix: '{',
+    suffix: '}',
+  },
+  localeStructure: '{lng}/{ns}',
+}
+```
+
 ## Migration to v8
 
 To migrate from previous versions to the version 8, check out the [v8-migration guide](https://github.com/isaachinman/next-i18next/tree/master/docs/v8-migration.md)

package/dist/commonjs/appWithTranslation.js

@@ -86,9 +86,11 @@ var appWithTranslation = function appWithTranslation(WrappedComponent) {
   var configOverride = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
 
   var AppWithTranslation = function AppWithTranslation(props) {
+    var _nextI18Next$initialL;
+
     var _ref = props.pageProps,
         _nextI18Next = _ref._nextI18Next;
-    var locale = null; // Memoize the instance and only re-initialize when either:
+    var locale = (_nextI18Next$initialL = _nextI18Next === null || _nextI18Next === void 0 ? void 0 : _nextI18Next.initialLocale) !== null && _nextI18Next$initialL !== void 0 ? _nextI18Next$initialL : null; // Memoize the instance and only re-initialize when either:
     // 1. The route changes (non-shallowly)
     // 2. Router locale changes
 
@@ -97,9 +99,7 @@ var appWithTranslation = function appWithTranslation(WrappedComponent) {
 
       if (!_nextI18Next) return null;
       var userConfig = _nextI18Next.userConfig;
-      var initialI18nStore = _nextI18Next.initialI18nStore,
-          initialLocale = _nextI18Next.initialLocale;
-      locale = initialLocale;
+      var initialI18nStore = _nextI18Next.initialI18nStore;
 
       if (userConfig === null && configOverride === null) {
         throw new Error('appWithTranslation was called without a next-i18next config');

package/dist/commonjs/config/createConfig.js

@@ -75,6 +75,9 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _defaultConfig = require("./defaultConfig");
 
+var _excluded = ["i18n"],
+    _excluded2 = ["i18n"];
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -98,9 +101,9 @@ var createConfig = function createConfig(userConfig) {
 
 
   var userI18n = userConfig.i18n,
-      userConfigStripped = (0, _objectWithoutProperties2["default"])(userConfig, ["i18n"]);
+      userConfigStripped = (0, _objectWithoutProperties2["default"])(userConfig, _excluded);
   var defaultI18n = _defaultConfig.defaultConfig.i18n,
-      defaultConfigStripped = (0, _objectWithoutProperties2["default"])(_defaultConfig.defaultConfig, ["i18n"]);
+      defaultConfigStripped = (0, _objectWithoutProperties2["default"])(_defaultConfig.defaultConfig, _excluded2);
 
   var combinedConfig = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultConfigStripped), userConfigStripped), defaultI18n), userI18n);
 

package/dist/es/appWithTranslation.js

@@ -12,20 +12,20 @@ export const appWithTranslation = (WrappedComponent, configOverride = null) => {
     const {
       _nextI18Next
     } = props.pageProps;
-    let locale = null; // Memoize the instance and only re-initialize when either:
+    const locale = (_nextI18Next === null || _nextI18Next === void 0 ? void 0 : _nextI18Next.initialLocale) ?? null; // Memoize the instance and only re-initialize when either:
     // 1. The route changes (non-shallowly)
     // 2. Router locale changes
 
     const i18n = useMemo(() => {
+      var _userConfig;
+
       if (!_nextI18Next) return null;
       let {
         userConfig
       } = _nextI18Next;
       const {
-        initialI18nStore,
-        initialLocale
+        initialI18nStore
       } = _nextI18Next;
-      locale = initialLocale;
 
       if (userConfig === null && configOverride === null) {
         throw new Error('appWithTranslation was called without a next-i18next config');
@@ -35,7 +35,7 @@ export const appWithTranslation = (WrappedComponent, configOverride = null) => {
         userConfig = configOverride;
       }
 
-      if (!userConfig?.i18n) {
+      if (!((_userConfig = userConfig) !== null && _userConfig !== void 0 && _userConfig.i18n)) {
         throw new Error('appWithTranslation was called without config.i18n');
       }
 

package/dist/es/config/createConfig.js

@@ -1,7 +1,9 @@
 import { defaultConfig } from './defaultConfig';
 const deepMergeObjects = ['backend', 'detection'];
 export const createConfig = userConfig => {
-  if (typeof userConfig?.lng !== 'string') {
+  var _userConfig$use;
+
+  if (typeof (userConfig === null || userConfig === void 0 ? void 0 : userConfig.lng) !== 'string') {
     throw new Error('config.lng was not passed into createConfig');
   } //
   // Initial merge of default and user-provided config
@@ -42,7 +44,7 @@ export const createConfig = userConfig => {
     combinedConfig.fallbackLng = combinedConfig.defaultLocale;
   }
 
-  const hasCustomBackend = userConfig?.use?.some(b => b.type === 'backend');
+  const hasCustomBackend = userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$use = userConfig.use) === null || _userConfig$use === void 0 ? void 0 : _userConfig$use.some(b => b.type === 'backend');
 
   if (!process.browser && typeof window === 'undefined') {
     combinedConfig.preload = locales;
@@ -58,8 +60,10 @@ export const createConfig = userConfig => {
       //
 
       if (typeof defaultNS === 'string' && typeof lng !== 'undefined') {
-        const prefix = userConfig?.interpolation?.prefix ?? '{{';
-        const suffix = userConfig?.interpolation?.suffix ?? '}}';
+        var _userConfig$interpola, _userConfig$interpola2;
+
+        const prefix = (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$interpola = userConfig.interpolation) === null || _userConfig$interpola === void 0 ? void 0 : _userConfig$interpola.prefix) ?? '{{';
+        const suffix = (userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$interpola2 = userConfig.interpolation) === null || _userConfig$interpola2 === void 0 ? void 0 : _userConfig$interpola2.suffix) ?? '}}';
         const defaultLocaleStructure = localeStructure.replace(`${prefix}lng${suffix}`, lng).replace(`${prefix}ns${suffix}`, defaultNS);
         const defaultFile = `/${defaultLocaleStructure}.${localeExtension}`;
         const defaultNSPath = path.join(localePath, defaultFile);

package/dist/es/createClient/browser.js

@@ -4,7 +4,9 @@ export default (config => {
   let initPromise;
 
   if (!instance.isInitialized) {
-    config?.use?.forEach(x => instance.use(x));
+    var _config$use;
+
+    config === null || config === void 0 ? void 0 : (_config$use = config.use) === null || _config$use === void 0 ? void 0 : _config$use.forEach(x => instance.use(x));
     initPromise = instance.init(config);
   } else {
     initPromise = Promise.resolve(i18n.t);

package/dist/es/createClient/node.js

@@ -16,13 +16,15 @@ export default (config => {
   let initPromise;
 
   if (!instance.isInitialized) {
-    const hasCustomBackend = config?.use?.some(b => b.type === 'backend');
+    var _config$use, _config$use2;
+
+    const hasCustomBackend = config === null || config === void 0 ? void 0 : (_config$use = config.use) === null || _config$use === void 0 ? void 0 : _config$use.some(b => b.type === 'backend');
 
     if (!hasCustomBackend) {
       instance.use(i18nextFSBackend);
     }
 
-    config?.use?.forEach(x => instance.use(x));
+    config === null || config === void 0 ? void 0 : (_config$use2 = config.use) === null || _config$use2 === void 0 ? void 0 : _config$use2.forEach(x => instance.use(x));
     initPromise = instance.init(config);
   } else {
     initPromise = Promise.resolve(i18n.t);

package/dist/es/serverSideTranslations.js

@@ -57,7 +57,7 @@ export const serverSideTranslations = async (initialLocale, namespacesRequired =
   } = config;
 
   if (reloadOnPrerender) {
-    await globalI18n?.reloadResources();
+    await (globalI18n === null || globalI18n === void 0 ? void 0 : globalI18n.reloadResources());
   }
 
   const {

package/dist/esm/appWithTranslation.js

@@ -17,9 +17,11 @@ export var appWithTranslation = function appWithTranslation(WrappedComponent) {
   var configOverride = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
 
   var AppWithTranslation = function AppWithTranslation(props) {
+    var _nextI18Next$initialL;
+
     var _ref = props.pageProps,
         _nextI18Next = _ref._nextI18Next;
-    var locale = null; // Memoize the instance and only re-initialize when either:
+    var locale = (_nextI18Next$initialL = _nextI18Next === null || _nextI18Next === void 0 ? void 0 : _nextI18Next.initialLocale) !== null && _nextI18Next$initialL !== void 0 ? _nextI18Next$initialL : null; // Memoize the instance and only re-initialize when either:
     // 1. The route changes (non-shallowly)
     // 2. Router locale changes
 
@@ -28,9 +30,7 @@ export var appWithTranslation = function appWithTranslation(WrappedComponent) {
 
       if (!_nextI18Next) return null;
       var userConfig = _nextI18Next.userConfig;
-      var initialI18nStore = _nextI18Next.initialI18nStore,
-          initialLocale = _nextI18Next.initialLocale;
-      locale = initialLocale;
+      var initialI18nStore = _nextI18Next.initialI18nStore;
 
       if (userConfig === null && configOverride === null) {
         throw new Error('appWithTranslation was called without a next-i18next config');

package/dist/esm/config/createConfig.js

@@ -2,6 +2,8 @@ import _typeof from "@babel/runtime/helpers/typeof";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["i18n"],
+    _excluded2 = ["i18n"];
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
@@ -26,10 +28,10 @@ export var createConfig = function createConfig(userConfig) {
 
 
   var userI18n = userConfig.i18n,
-      userConfigStripped = _objectWithoutProperties(userConfig, ["i18n"]);
+      userConfigStripped = _objectWithoutProperties(userConfig, _excluded);
 
   var defaultI18n = defaultConfig.i18n,
-      defaultConfigStripped = _objectWithoutProperties(defaultConfig, ["i18n"]);
+      defaultConfigStripped = _objectWithoutProperties(defaultConfig, _excluded2);
 
   var combinedConfig = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultConfigStripped), userConfigStripped), defaultI18n), userI18n);
 

package/dist/esm/serverSideTranslations.js

@@ -1,8 +1,8 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _typeof from "@babel/runtime/helpers/typeof";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 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; }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-i18next",
-  "version": "10.2.0",
+  "version": "10.3.0",
   "repository": "git@github.com:isaachinman/next-i18next.git",
   "author": "Isaac Hinman <isaac@isaachinman.com>",
   "funding": {
@@ -96,7 +96,7 @@
     "eslint-plugin-typescript-sort-keys": "^2.1.0",
     "husky": "^3.0.0",
     "jest": "^26.6.3",
-    "next": "^10.0.4",
+    "next": "^11.1.3",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "start-server-and-test": "^1.12.0",