next-i18next 15.1.2 → 15.3.0

package/README.md

@@ -332,7 +332,7 @@ This option will reload your translations whenever `serverSideTranslations` is c
 | Key                 | Default value        | Note                                                           |
 | ------------------- | -------------------- | -------------------------------------------------------------- |
 | `defaultNS`         | `'common'`           |                                                                |
-| `localePath`        | `'./public/locales'` | Can be a function, see note below.                             |
+| `localePath`        | `'./public/locales'` | Can be a function, see note below. (can also be null, if passing resources option directly via config, like [here](https://www.i18next.com/how-to/add-or-load-translations#add-on-init))                            |
 | `localeExtension`   | `'json'`             | Ignored if `localePath` is a function.                         |
 | `localeStructure`   | `'{{lng}}/{{ns}}'`   | Ignored if `localePath` is a function.                         |
 | `reloadOnPrerender` | `false`              |                                                                |
@@ -345,6 +345,8 @@ This option will reload your translations whenever `serverSideTranslations` is c
 If the localePath is a function, make sure you also define the ns option, because on server side we're not able to preload the namespaces then.
 
 All other [i18next options](https://www.i18next.com/overview/configuration-options) and [react-i18next options](https://react.i18next.com/latest/i18next-instance) can be passed in as well.
+</br>
+You can also pass in the [`resources`](https://www.i18next.com/overview/configuration-options#languages-namespaces-resources) directly in combination with setting `localePath` to `null`.
 
 #### Custom interpolation prefix/suffix
 
@@ -398,6 +400,20 @@ This means that the i18n configuration file will be in the same directory as `ne
 
 **Notice** If your config `next-i18next.config.js` is not in the same directory as `next.config.js`, you must copy it manually (or by custom script).
 
+#### Adding next-i18next incrementally
+
+If you are planning on incrementally add next-i18next to you project we recommended that you will pass your `next-i18next.config` to `appWithTranslation` to avoid any issues.
+
+i.e
+
+```js
+import nextI18nextConfig from '../../next-i18next.config';
+//...
+export default appWithTranslation(MyApp, nextI18nextConfig);
+```
+
+See Issue [#2259](https://github.com/i18next/next-i18next/issues/2259) for more information.
+
 ## Notes
 
 ### Vercel and Netlify

package/dist/commonjs/appWithTranslation.js

@@ -102,11 +102,13 @@ var appWithTranslation = exports.appWithTranslation = function appWithTranslatio
       if (instance) {
         addResourcesToI18next(instance, resources);
       } else {
-        instance = (0, _createClient["default"])(_objectSpread(_objectSpread({}, (0, _createConfig.createConfig)(_objectSpread(_objectSpread({}, userConfig), {}, {
+        instance = (0, _createClient["default"])(_objectSpread(_objectSpread(_objectSpread({}, (0, _createConfig.createConfig)(_objectSpread(_objectSpread({}, userConfig), {}, {
           lng: locale
         }))), {}, {
-          lng: locale,
-          ns: ns,
+          lng: locale
+        }, ns && {
+          ns: ns
+        }), {}, {
           resources: resources
         })).i18n;
         addResourcesToI18next(instance, resources);

package/dist/commonjs/config/createConfig.js

@@ -1,6 +1,5 @@
 "use strict";
 
-require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/web.dom-collections.for-each.js");
@@ -35,6 +34,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.object.keys.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"));
@@ -189,7 +189,7 @@ var createConfig = exports.createConfig = function createConfig(userConfig) {
             return localePath(locale, namespace, false);
           }
         };
-      } else {
+      } else if (localePath) {
         throw new Error("Unsupported localePath type: ".concat((0, _typeof2["default"])(localePath)));
       }
 
@@ -217,9 +217,17 @@ var createConfig = exports.createConfig = function createConfig(userConfig) {
             });
             return ret;
           };
-          var namespacesByLocale = locales.map(function (locale) {
-            return getLocaleNamespaces(path.resolve(process.cwd(), "".concat(localePath, "/").concat(locale)));
-          });
+          var namespacesByLocale;
+          var r = combinedConfig.resources;
+          if (!localePath && r) {
+            namespacesByLocale = locales.map(function (locale) {
+              return Object.keys(r[locale]);
+            });
+          } else {
+            namespacesByLocale = locales.map(function (locale) {
+              return getLocaleNamespaces(path.resolve(process.cwd(), "".concat(localePath, "/").concat(locale)));
+            });
+          }
           var allNamespaces = [];
           var _iterator = _createForOfIteratorHelper(namespacesByLocale),
             _step;

package/dist/commonjs/config/defaultConfig.js

@@ -19,7 +19,7 @@ var defaultConfig = exports.defaultConfig = {
     locales: LOCALES
   },
   get initImmediate() {
-    return process.browser && typeof window !== 'undefined';
+    return typeof window !== 'undefined';
   },
   interpolation: {
     escapeValue: false

package/dist/es/appWithTranslation.js

@@ -59,7 +59,9 @@ export const appWithTranslation = (WrappedComponent, configOverride = null) => {
             lng: locale
           }),
           lng: locale,
-          ns,
+          ...(ns && {
+            ns
+          }),
           resources
         }).i18n;
         addResourcesToI18next(instance, resources);

package/dist/es/config/createConfig.js

@@ -130,7 +130,7 @@ export const createConfig = userConfig => {
           addPath: (locale, namespace) => localePath(locale, namespace, true),
           loadPath: (locale, namespace) => localePath(locale, namespace, false)
         };
-      } else {
+      } else if (localePath) {
         throw new Error(`Unsupported localePath type: ${typeof localePath}`);
       }
 
@@ -156,7 +156,13 @@ export const createConfig = userConfig => {
             });
             return ret;
           };
-          const namespacesByLocale = locales.map(locale => getLocaleNamespaces(path.resolve(process.cwd(), `${localePath}/${locale}`)));
+          let namespacesByLocale;
+          const r = combinedConfig.resources;
+          if (!localePath && r) {
+            namespacesByLocale = locales.map(locale => Object.keys(r[locale]));
+          } else {
+            namespacesByLocale = locales.map(locale => getLocaleNamespaces(path.resolve(process.cwd(), `${localePath}/${locale}`)));
+          }
           const allNamespaces = [];
           for (const localNamespaces of namespacesByLocale) {
             allNamespaces.push(...localNamespaces);

package/dist/es/config/defaultConfig.js

@@ -12,7 +12,7 @@ export const defaultConfig = {
     locales: LOCALES
   },
   get initImmediate() {
-    return process.browser && typeof window !== 'undefined';
+    return typeof window !== 'undefined';
   },
   interpolation: {
     escapeValue: false

package/dist/esm/appWithTranslation.js

@@ -61,11 +61,13 @@ export var appWithTranslation = function appWithTranslation(WrappedComponent) {
       if (instance) {
         addResourcesToI18next(instance, resources);
       } else {
-        instance = createClient(_objectSpread(_objectSpread({}, createConfig(_objectSpread(_objectSpread({}, userConfig), {}, {
+        instance = createClient(_objectSpread(_objectSpread(_objectSpread({}, createConfig(_objectSpread(_objectSpread({}, userConfig), {}, {
           lng: locale
         }))), {}, {
-          lng: locale,
-          ns: ns,
+          lng: locale
+        }, ns && {
+          ns: ns
+        }), {}, {
           resources: resources
         })).i18n;
         addResourcesToI18next(instance, resources);

package/dist/esm/config/createConfig.js

@@ -150,7 +150,7 @@ export var createConfig = function createConfig(userConfig) {
             return localePath(locale, namespace, false);
           }
         };
-      } else {
+      } else if (localePath) {
         throw new Error("Unsupported localePath type: ".concat(_typeof(localePath)));
       }
 
@@ -178,9 +178,17 @@ export var createConfig = function createConfig(userConfig) {
             });
             return ret;
           };
-          var namespacesByLocale = locales.map(function (locale) {
-            return getLocaleNamespaces(path.resolve(process.cwd(), "".concat(localePath, "/").concat(locale)));
-          });
+          var namespacesByLocale;
+          var r = combinedConfig.resources;
+          if (!localePath && r) {
+            namespacesByLocale = locales.map(function (locale) {
+              return Object.keys(r[locale]);
+            });
+          } else {
+            namespacesByLocale = locales.map(function (locale) {
+              return getLocaleNamespaces(path.resolve(process.cwd(), "".concat(localePath, "/").concat(locale)));
+            });
+          }
           var allNamespaces = [];
           var _iterator = _createForOfIteratorHelper(namespacesByLocale),
             _step;

package/dist/esm/config/defaultConfig.js

@@ -12,7 +12,7 @@ export var defaultConfig = {
     locales: LOCALES
   },
   get initImmediate() {
-    return process.browser && typeof window !== 'undefined';
+    return typeof window !== 'undefined';
   },
   interpolation: {
     escapeValue: false

package/dist/types/types.d.ts

@@ -20,7 +20,7 @@ type DefaultNamespace = TypeOptions['defaultNS'];
 export type UserConfig = {
     i18n: NextJsI18NConfig;
     localeExtension?: string;
-    localePath?: string | ((locale: string, namespace: string, missing: boolean) => string);
+    localePath?: string | ((locale: string, namespace: string, missing: boolean) => string) | null;
     localeStructure?: string;
     onPreInitI18next?: (i18n: I18n) => void;
     reloadOnPrerender?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-i18next",
-  "version": "15.1.2",
+  "version": "15.3.0",
   "repository": "git@github.com:i18next/next-i18next.git",
   "author": "i18next",
   "funding": [
@@ -47,6 +47,7 @@
     "build:examples": "npm-run-all -s build:example:*",
     "build:example:simple": "cd examples/simple && npm run build",
     "build:example:ssg": "cd examples/ssg && npm run build",
+    "build:example:auto-static-optimize": "cd examples/auto-static-optimize && npm run build",
     "typecheck": "tsc --project ./tsconfig.json --noEmit",
     "typecheck:example:simple": "cd examples/simple && npm run typecheck",
     "check-size": "size-limit",
@@ -58,8 +59,9 @@
     "install:examples": "npm-run-all -s install:example:*",
     "install:example:simple": "cd examples/simple && npm install",
     "install:example:ssg": "cd examples/ssg && npm install",
+    "install:example:auto-static-optimize": "cd examples/auto-static-optimize && npm install",
     "move-build-to-examples?": "Hack: see # @link https://github.com/i18next/next-i18next/pull/2012",
-    "move-build-to-examples": "rimraf ./examples/*/node_modules/next-i18next && cpy './package.json' './*.js' './*.ts' './dist' ./examples/simple/node_modules/next-i18next && cpy './package.json' './*.js' './*.ts' './dist' ./examples/ssg/node_modules/next-i18next",
+    "move-build-to-examples": "rimraf ./examples/*/node_modules/next-i18next && cpy './package.json' './*.js' './*.ts' './dist' ./examples/simple/node_modules/next-i18next && cpy './package.json' './*.js' './*.ts' './dist' ./examples/ssg/node_modules/next-i18next && cpy './package.json' './*.js' './*.ts' './dist' ./examples/auto-static-optimize/node_modules/next-i18next ",
     "test:e2e": "start-server-and-test 'cd examples/simple && npm run start' http://127.0.0.1:3000 cy:run",
     "cy:run": "cypress run",
     "example": "npm run example:simple",
@@ -114,7 +116,7 @@
     "eslint-plugin-typescript-sort-keys": "^3.1.0",
     "gh-release": "7.0.2",
     "husky": "^8.0.3",
-    "i18next": "^23.7.13",
+    "i18next": "^23.7.16",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "next": "^14.0.1",