next-i18next 13.0.2 → 13.1.0

package/README.md

@@ -140,7 +140,9 @@ The `serverSideTranslations` HOC is primarily responsible for passing translatio
 
 ### useTranslation
 
-This is the hook which you'll actually use to do the translation itself. The `useTranslation` hook [comes from `react-i18next`](https://react.i18next.com/latest/usetranslation-hook), but can be imported from `next-i18next` directly:
+This is the hook which you'll actually use to do the translation itself. The `useTranslation` hook [comes from `react-i18next`](https://react.i18next.com/latest/usetranslation-hook), but needs to be imported from `next-i18next` directly.
+<br/>
+**Do NOT use the `useTranslation` export of `react-i18next`, but ONLY use the on of `next-i18next`!**
 
 ```tsx
 import { useTranslation } from 'next-i18next'
@@ -327,6 +329,34 @@ For example, if you want to use `{` and `}` the config would look like this:
 }
 ```
 
+#### Custom `next-i18next.config.js` path
+
+If you want to change the default config path, you can set the environment variable `I18NEXT_DEFAULT_CONFIG_PATH`.
+
+For example, inside the `.env` file you can set a static path:
+```
+I18NEXT_DEFAULT_CONFIG_PATH=/path/to/project/apps/my-app/next-i18next.config.js
+```
+
+Or you can use a trick for dynamic path and set the following inside `next.config.js`:
+
+```js
+process.env.I18NEXT_DEFAULT_CONFIG_PATH = `${__dirname}/next-i18next.config.js`;
+
+// ... Some other imports
+
+const { i18n } = require('./next-i18next.config');
+
+// ... Some other code
+
+module.exports = {
+  i18n,
+  ...
+};
+```
+
+This means that the i18n configuration file will be in the same directory as `next.config.js` and it doesn't matter where your current working directory is. This helps for example for `nx` when you have monorepo and start your application from project root but the application is in `apps/{appName}`.
+
 ## Notes
 
 ### Vercel and Netlify

package/dist/commonjs/config/createConfig.js

@@ -33,6 +33,7 @@ require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.string.replace.js");
 require("core-js/modules/es.array.join.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.array.index-of.js");
 require("core-js/modules/es.array.for-each.js");
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
@@ -190,6 +191,7 @@ var createConfig = function createConfig(userConfig) {
       // Set server side preload (namespaces)
       //
       if (!combinedConfig.ns && typeof lng !== 'undefined') {
+        var _userConfig$interpola5, _userConfig$interpola6, _userConfig$interpola7, _userConfig$interpola8;
         if (typeof localePath === 'function') {
           throw new Error('Must provide all namespaces in ns option if using a function as localePath');
         }
@@ -228,6 +230,11 @@ var createConfig = function createConfig(userConfig) {
           }
           return (0, _utils.unique)(allNamespaces);
         };
+        var _prefix = (_userConfig$interpola5 = userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$interpola6 = userConfig.interpolation) === null || _userConfig$interpola6 === void 0 ? void 0 : _userConfig$interpola6.prefix) !== null && _userConfig$interpola5 !== void 0 ? _userConfig$interpola5 : '{{';
+        var _suffix = (_userConfig$interpola7 = userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$interpola8 = userConfig.interpolation) === null || _userConfig$interpola8 === void 0 ? void 0 : _userConfig$interpola8.suffix) !== null && _userConfig$interpola7 !== void 0 ? _userConfig$interpola7 : '}}';
+        if (localeStructure.indexOf("".concat(_prefix, "lng").concat(_suffix)) > localeStructure.indexOf("".concat(_prefix, "ns").concat(_suffix))) {
+          throw new Error('Must provide all namespaces in ns option if using a localeStructure that is not namespace-listable like lng/ns');
+        }
         combinedConfig.ns = getNamespaces((0, _utils.unique)([lng].concat((0, _toConsumableArray2["default"])((0, _utils.getFallbackForLng)(lng, combinedConfig.fallbackLng)))));
       }
     }

package/dist/commonjs/serverSideTranslations.js

@@ -41,7 +41,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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) { (0, _defineProperty2["default"])(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; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var DEFAULT_CONFIG_PATH = './next-i18next.config.js';
+var _process$env$I18NEXT_ = process.env.I18NEXT_DEFAULT_CONFIG_PATH,
+  DEFAULT_CONFIG_PATH = _process$env$I18NEXT_ === void 0 ? './next-i18next.config.js' : _process$env$I18NEXT_;
 var serverSideTranslations = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(initialLocale) {
     var namespacesRequired,

package/dist/es/config/createConfig.js

@@ -158,6 +158,11 @@ export const createConfig = userConfig => {
           }
           return unique(allNamespaces);
         };
+        const prefix = userConfig?.interpolation?.prefix ?? '{{';
+        const suffix = userConfig?.interpolation?.suffix ?? '}}';
+        if (localeStructure.indexOf(`${prefix}lng${suffix}`) > localeStructure.indexOf(`${prefix}ns${suffix}`)) {
+          throw new Error('Must provide all namespaces in ns option if using a localeStructure that is not namespace-listable like lng/ns');
+        }
         combinedConfig.ns = getNamespaces(unique([lng, ...getFallbackForLng(lng, combinedConfig.fallbackLng)]));
       }
     }

package/dist/es/serverSideTranslations.js

@@ -4,7 +4,9 @@ import { createConfig } from './config/createConfig';
 import createClient from './createClient/node';
 import { globalI18n } from './appWithTranslation';
 import { getFallbackForLng, unique } from './utils';
-const DEFAULT_CONFIG_PATH = './next-i18next.config.js';
+const {
+  I18NEXT_DEFAULT_CONFIG_PATH: DEFAULT_CONFIG_PATH = './next-i18next.config.js'
+} = process.env;
 export const serverSideTranslations = async (initialLocale, namespacesRequired = undefined, configOverride = null, extraLocales = false) => {
   if (typeof initialLocale !== 'string') {
     throw new Error('Initial locale argument was not passed into serverSideTranslations');

package/dist/esm/config/createConfig.js

@@ -154,6 +154,7 @@ export var createConfig = function createConfig(userConfig) {
       // Set server side preload (namespaces)
       //
       if (!combinedConfig.ns && typeof lng !== 'undefined') {
+        var _userConfig$interpola5, _userConfig$interpola6, _userConfig$interpola7, _userConfig$interpola8;
         if (typeof localePath === 'function') {
           throw new Error('Must provide all namespaces in ns option if using a function as localePath');
         }
@@ -192,6 +193,11 @@ export var createConfig = function createConfig(userConfig) {
           }
           return unique(allNamespaces);
         };
+        var _prefix = (_userConfig$interpola5 = userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$interpola6 = userConfig.interpolation) === null || _userConfig$interpola6 === void 0 ? void 0 : _userConfig$interpola6.prefix) !== null && _userConfig$interpola5 !== void 0 ? _userConfig$interpola5 : '{{';
+        var _suffix = (_userConfig$interpola7 = userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$interpola8 = userConfig.interpolation) === null || _userConfig$interpola8 === void 0 ? void 0 : _userConfig$interpola8.suffix) !== null && _userConfig$interpola7 !== void 0 ? _userConfig$interpola7 : '}}';
+        if (localeStructure.indexOf("".concat(_prefix, "lng").concat(_suffix)) > localeStructure.indexOf("".concat(_prefix, "ns").concat(_suffix))) {
+          throw new Error('Must provide all namespaces in ns option if using a localeStructure that is not namespace-listable like lng/ns');
+        }
         combinedConfig.ns = getNamespaces(unique([lng].concat(_toConsumableArray(getFallbackForLng(lng, combinedConfig.fallbackLng)))));
       }
     }

package/dist/esm/serverSideTranslations.js

@@ -9,7 +9,8 @@ import { createConfig } from './config/createConfig';
 import createClient from './createClient/node';
 import { globalI18n } from './appWithTranslation';
 import { getFallbackForLng, unique } from './utils';
-var DEFAULT_CONFIG_PATH = './next-i18next.config.js';
+var _process$env$I18NEXT_ = process.env.I18NEXT_DEFAULT_CONFIG_PATH,
+  DEFAULT_CONFIG_PATH = _process$env$I18NEXT_ === void 0 ? './next-i18next.config.js' : _process$env$I18NEXT_;
 export var serverSideTranslations = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(initialLocale) {
     var namespacesRequired,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-i18next",
-  "version": "13.0.2",
+  "version": "13.1.0",
   "repository": "git@github.com:i18next/next-i18next.git",
   "author": "i18next",
   "funding": [