mirror of
https://github.com/terribleplan/next.js.git
synced 2024-01-19 02:48:18 +00:00
This fixes https://github.com/zeit/next.js/issues/5260 by making sure that `index.js` has `getInitialProps` defined on the page exported component, not the child component. When fixing that, I uncovered an issue where the server side rendered HTML did not match the clientside HTML, so I reworked _app.js to use the `i18nextprovider` component which has props to hydrate the initial data (for SSR), and makes sure the correct i18n instance is passed to all child components through context. Before: ```html <!DOCTYPE html> <html> <head> <meta charSet="utf-8" class="next-head"/> <link rel="preload" href="/_next/static/development/pages/index.js" as="script"/> <link rel="preload" href="/_next/static/development/pages/_app.js" as="script"/> <link rel="preload" href="/_next/static/development/pages/_error.js" as="script"/> <link rel="preload" href="/_next/static/runtime/webpack.js" as="script"/> <link rel="preload" href="/_next/static/runtime/main.js" as="script"/> </head> <body> <div id="__next"></div> <script src="/_next/static/development/dll/dll_4a2ab6ce0cb456fbfead.js"></script><script>__NEXT_DATA__ = {"props":{"pageProps":{}},"page":"/","pathname":"/","query":{},"buildId":"development"};__NEXT_LOADED_PAGES__=[];__NEXT_REGISTER_PAGE=function(r,f){__NEXT_LOADED_PAGES__.push([r, f])}</script><script async="" id="__NEXT_PAGE__/" src="/_next/static/development/pages/index.js"></script><script async="" id="__NEXT_PAGE__/_app" src="/_next/static/development/pages/_app.js"></script><script async="" id="__NEXT_PAGE__/_error" src="/_next/static/development/pages/_error.js"></script><script src="/_next/static/runtime/webpack.js" async=""></script><script src="/_next/static/runtime/main.js" async=""></script> </body> </html> ``` After: ```html <!DOCTYPE html> <html> <head> <meta charSet="utf-8" class="next-head"/> <link rel="preload" href="/_next/static/development/pages/index.js" as="script"/> <link rel="preload" href="/_next/static/development/pages/_app.js" as="script"/> <link rel="preload" href="/_next/static/development/pages/_error.js" as="script"/> <link rel="preload" href="/_next/static/runtime/webpack.js" as="script"/> <link rel="preload" href="/_next/static/runtime/main.js" as="script"/> </head> <body> <div id="__next"> <h1>This example integrates react-i18next for simple internationalization.</h1> <div> <h1>welcome to next.js</h1> <p>This example integrates react-i18next for simple internationalization.</p> <p>test words for en</p> <div><button>fire in the wind for en</button></div> <p>You can either pass t function to child components.</p> <p>Or wrap your component using the translate hoc provided by react-i18next.</p> <p>Alternatively, you can use <code>Trans</code> component.</p> <a href="/page2">Go to page 2</a><br/><a href="/page3">Go to page 3 (no hoc)</a> </div> </div> <script src="/_next/static/development/dll/dll_4a2ab6ce0cb456fbfead.js"></script><script>__NEXT_DATA__ = {"props":{"pageProps":{"i18n":null,"initialI18nStore":{"en":{"home":{"welcome":"welcome to next.js","sample_test":"test words for en","sample_button":"fire in the wind for en","link":{"gotoPage2":"Go to page 2","gotoPage3":"Go to page 3 (no hoc)"}},"common":{"integrates_react-i18next":"This example integrates react-i18next for simple internationalization.","pureComponent":"You can either pass t function to child components.","extendedComponent":"Or wrap your component using the translate hoc provided by react-i18next.","transComponent":"Alternatively, you can use \u003c1\u003eTrans\u003c/1\u003e component."}}},"initialLanguage":"en-US"}},"page":"/","pathname":"/","query":{},"buildId":"development"};__NEXT_LOADED_PAGES__=[];__NEXT_REGISTER_PAGE=function(r,f){__NEXT_LOADED_PAGES__.push([r, f])}</script><script async="" id="__NEXT_PAGE__/" src="/_next/static/development/pages/index.js"></script><script async="" id="__NEXT_PAGE__/_app" src="/_next/static/development/pages/_app.js"></script><script async="" id="__NEXT_PAGE__/_error" src="/_next/static/development/pages/_error.js"></script><script src="/_next/static/runtime/webpack.js" async=""></script><script src="/_next/static/runtime/main.js" async=""></script> </body> </html> ```
This commit is contained in:
parent
ce8b301f24
commit
9854c342e1
|
@ -2,7 +2,7 @@ import { translate } from 'react-i18next'
|
|||
import i18n from '../i18n'
|
||||
|
||||
export const withI18next = (namespaces = ['common']) => ComposedComponent => {
|
||||
const Extended = translate(namespaces, { i18n, wait: process.browser })(
|
||||
const Extended = translate(namespaces, { wait: process.browser })(
|
||||
ComposedComponent
|
||||
)
|
||||
|
||||
|
|
|
@ -1,23 +1,27 @@
|
|||
import React from 'react'
|
||||
import App, { Container } from 'next/app'
|
||||
import { I18n as I18nR } from 'react-i18next'
|
||||
import i18n from '../i18n'
|
||||
import { I18n as I18nR, I18nextProvider } from 'react-i18next'
|
||||
import initialI18nInstance from '../i18n'
|
||||
|
||||
export default class MyApp extends App {
|
||||
render () {
|
||||
const { Component, pageProps } = this.props
|
||||
const { i18n, initialI18nStore, initialLanguage } = pageProps || {}
|
||||
|
||||
return (
|
||||
<Container>
|
||||
<I18nR ns='common' i18n={(pageProps && pageProps.i18n) || i18n} wait>
|
||||
{
|
||||
(t) => (
|
||||
<div>
|
||||
<h1>{t('common:integrates_react-i18next')}</h1>
|
||||
<Component {...pageProps} />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
<I18nextProvider
|
||||
i18n={i18n || initialI18nInstance}
|
||||
initialI18nStore={initialI18nStore}
|
||||
initialLanguage={initialLanguage}
|
||||
>
|
||||
<React.Fragment>
|
||||
<I18nR ns='common' wait>
|
||||
{t => <h1>{t('common:integrates_react-i18next')}</h1>}
|
||||
</I18nR>
|
||||
<Component {...pageProps} />
|
||||
</React.Fragment>
|
||||
</I18nextProvider>
|
||||
</Container>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@ import ExtendedComponent from '../components/ExtendedComponent'
|
|||
import ComponentWithTrans from '../components/ComponentWithTrans'
|
||||
import { withI18next } from '../lib/withI18next'
|
||||
|
||||
const TestContent = withI18next(['home', 'common'])(({ t, initialI18nStore }) => (
|
||||
const Test = ({ t }) => (
|
||||
<div>
|
||||
<h1>{t('welcome')}</h1>
|
||||
<p>{t('common:integrates_react-i18next')}</p>
|
||||
|
@ -25,10 +25,6 @@ const TestContent = withI18next(['home', 'common'])(({ t, initialI18nStore }) =>
|
|||
<a>{t('link.gotoPage3')}</a>
|
||||
</Link>
|
||||
</div>
|
||||
))
|
||||
)
|
||||
|
||||
const Test = () => {
|
||||
return <TestContent />
|
||||
}
|
||||
|
||||
export default Test
|
||||
export default withI18next(['home', 'common'])(Test)
|
||||
|
|
Loading…
Reference in a new issue