Merge pull request #13 from monkeyInShell/feature-add-homepame

Feature add homepame

Author: ZhouYK

Diff for: .babelrc

@@ -11,6 +11,7 @@
     "syntax-dynamic-import"//不解析动态加载标识符 import() node环境无作用，得另想办法
   ],
   "env": {
+    //这个配置只针对服务端的客户端代码
     "node": {
       "plugins": [[
         "babel-plugin-transform-require-ignore",

Diff for: .gitignore

@@ -3,3 +3,4 @@
 .git/
 node_modules/
 dist/
+package-lock.json

Diff for: README.md

@@ -1,8 +1,8 @@
-# server-side-render
-## for development
+# 服务端渲染同构框架
+
+## 本地开发
 > npm run start
-## for production
+
+## 生产打包
 > npm run build
-### start production server
 
-> node bin/www.js

Diff for: bin/README.md

@@ -0,0 +1,5 @@
+## 启动文件
+
+*   www
+
+    > 服务器入口文件，里面针对开发环境node端的babel编译做了配置

Diff for: bin/www

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 if (process.env.NODE_ENV === 'local') {
-  //node运行时生效,同样也会去读.babelrc，plugins不会覆盖，会concat生效
-  //webpack生效的配置是.babelrc
+  //由于运行时不会设置BABEL_ENV = node，单独为node运行时设置插件处理
+  //这里如果统一设置BABEL_ENV = node，导致webpack内babel运行时也会去读取env: node的配置
   require('babel-register')({
     'plugins': [
       [

Diff for: client/pages/example/index.js

@@ -7,7 +7,7 @@ import ReactDom from 'react-dom'
 import {BrowserRouter} from 'react-router-dom'
 import App from './App'
 ReactDom.hydrate(
-  <BrowserRouter basename='/components'>
+  <BrowserRouter basename='/p/components'>
     <App/>
   </BrowserRouter>
   , document.getElementById('bd'))

Diff for: client/pages/integration/App.js

@@ -12,7 +12,7 @@ const App = (props) => {
   return (
     <Fragment>
       <div>
-        <Link to='/home'>首页</Link>
+        <Link to='/home'>个人主页</Link>
       </div>
       <div>
         <Link to='/center'>用户中心</Link>

Diff for: client/pages/integration/Center/index.js

@@ -7,7 +7,7 @@ import connect from '../../tools/connect'
 
 class Center extends Component {
   render () {
-    return (<div>欢迎来到个人中心</div>)
+    return (<div>{this.props.title}</div>)
   }
 }
 export default connect({

Diff for: client/pages/integration/Home/index.js

@@ -5,12 +5,9 @@ import React, {Component} from 'react'
 import connect from '../../tools/connect'
 import * as actions from '../redux/action'
 class Home extends Component {
-  constructor(options) {
-    super(options)
-  }
   componentDidMount() {
     setTimeout(() => {
-      this.props.actions.home('我是首页')
+      this.props.actions.home('个人主页内容展示')
       //通过action出发路由跳转
       //this.props.actions.jump('center')
     }, 2000)

Diff for: client/pages/integration/index.js

@@ -8,7 +8,7 @@ import App from './App'
 import storeFactory, {historyConf} from '../tools/store/forBrowser'
 import reducers from './store/'
 const history = historyConf({
-  basename: '/integration'
+  basename: '/p/integration'
 })
 const store = storeFactory(reducers, history)
 

Diff for: client/pages/integration/redux/reducer.js

@@ -10,7 +10,7 @@ export function center (state = {title: '欢迎来到个人中心'}, action) {
   }
 }
 
-export function home (state = {title: '默认首页'}, action) {
+export function home (state = {title: '个人首页内容'}, action) {
   switch (action.type) {
     case 'home_title':
       return Object.assign({}, state, {title: action.data})