fix: createRouterContextDataWrapper: arrow function messed up webpack-dev-server

Author: ngduc

package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-setup",
   "description": "A Universal React setup with i18n: Babel 6, Koa 2, React, React Router, React Transmit, React Bootstrap, React-intl, Mocha, Webpack HMR, PostCSS, ESLint.",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "author": "Duc Nguyen (https://github.com/ngduc)",
   "license": "MIT",
   "homepage": "https://github.com/ngduc/react-setup",
@@ -68,7 +68,7 @@
     "koa-compose": "^3.0.0",
     "koa-compress": "^2.0.0",
     "koa-convert": "^1.2",
-    "koa-generic-session": "^1.10",
+    "koa-session": "^3.3.1",
     "koa-passport": "^2.0",
     "koa-router": "7.0.1",
     "koa-serve-static": "^1.0.0",

src/containers/App/App.js

@@ -8,13 +8,13 @@ import jaLocaleData from 'react-intl/locale-data/ja'
 addLocaleData(enLocaleData)
 addLocaleData(jaLocaleData)
 
-let currentLocale
+let currentLocale = 'en-US'
 let messages
 
 export default class App extends React.Component {
   componentWillMount () {
     if (__CLIENT__) {
-      currentLocale = (__CLIENT__ ? window.App.locale : 'en-US')
+      currentLocale = window.App.locale
       messages = window.App.messages
     } else {
       currentLocale = this.context.data.i18nData.locale || 'en-US'

src/server.js

@@ -6,7 +6,7 @@ import Router from 'koa-router'
 import serveStatic from 'koa-serve-static'
 import koaConvert from 'koa-convert'
 import koaCompress from 'koa-compress'
-//import koaSession from 'koa-session'
+import koaSession from 'koa-session'
 import zlib from 'zlib'
 
 import routesContainer from 'containers/routes'
@@ -23,7 +23,7 @@ try {
   let routes = routesContainer
 
   app.use(koaCompress({ flush: zlib.Z_SYNC_FLUSH }))
-  //app.use(koaConvert(koaSession(app)))
+  app.use(koaConvert(koaSession(app)))
 
   app.use(apiRouter())
 

src/server/libs/RouterContextDataWrapper.js

@@ -7,12 +7,12 @@ export function createRouterContextDataWrapper (dataObj) {
     childContextTypes: {
       data: React.PropTypes.object.isRequired
     },
-    getChildContext: () => {
+    getChildContext: function () {
       return {
         data: dataObj
       }
     },
-    render: () => {
+    render: function () {
       return <RouterContext { ...this.props } />
     }
   })

src/server/renderAppRouter.js

@@ -24,8 +24,8 @@ export default function renderAppRouter () {
       return next()
     }
 
-    const locale = ctx.query.locale || 'en-US'
-    // ctx.session.locale = locale
+    const locale = ctx.query.locale || ctx.session.locale || 'en-US'
+    ctx.session.locale = locale
     i18nData = i18n.getLocaleMessages(locale)
     const i18nDataString = JSON.stringify(i18nData)