useSSR fix

i18next · Jul 2, 2019 · 83625ba · 83625ba
1 parent bd16062
commit 83625ba
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 10.11.3
+
+- only apply initial values in useSSR, withSSR on i18next instances not being a clone (eg. created by express middleware on server) ==> don't apply on serverside
+
 ### 10.11.2
 
 - Reload translations whenever namespaces passed to useTranslation() change [878](https://github.com/i18next/react-i18next/pull/878)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-i18next",
-  "version": "10.11.2",
+  "version": "10.11.3",
   "description": "Internationalization for react done right. Using the i18next i18n ecosystem.",
   "main": "dist/commonjs/index.js",
   "types": "src/index.d.ts",

diff --git a/react-i18next.js b/react-i18next.js
@@ -878,7 +878,10 @@
     const _ref = getHasUsedI18nextProvider() ? React.useContext(I18nContext) : {},
           i18nFromContext = _ref.i18n;
 
-    const i18n = i18nFromProps || i18nFromContext || getI18n(); // nextjs / SSR: getting data from next.js or other ssr stack
+    const i18n = i18nFromProps || i18nFromContext || getI18n(); // opt out if is a cloned instance, eg. created by i18next-express-middleware on request
+    // -> do not set initial stuff on server side
+
+    if (i18n.options && i18n.options.isClone) return; // nextjs / SSR: getting data from next.js or other ssr stack
 
     if (initialI18nStore && !i18n.initializedStoreOnce) {
       i18n.services.resourceStore.data = initialI18nStore;