Merge branch 'master' of https://github.com/kenberkeley/react-demo

Ken Berkeley · Ken Berkeley · commit adf5266990c4 · 2016-11-26T17:18:53.000+08:00
diff --git a/README.md b/README.md
@@ -141,7 +141,7 @@
 ### <a name="webpack-configure">⊙ Webpack 配置</a>
 > 由于已经拥有相对成熟的 Webpack 配置，因此在一定程度上您可以不求甚解，但了解其配置会更能把握整体开发  
 
-* 前端开发服务器为 `localhost:9090`，可在 `build/webpack.config.dev.js` 中找到
+* 前端开发服务器为 `localhost:9090`，可在 `build/webpack.dev.conf.js` 中找到
 > 后端 RESTful API 基地址写在了 `src/services/xhr/config.js` 中，请根据实际自行修改
 
 * 框架 / 类库 须分离打包以加快开发时的编译速度并有利于缓存，详见 `build/webpack.base.conf.js` 中的 `vendor`
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
@@ -30,7 +30,8 @@ config.plugins.push(
   }),
   new CopyWebpackPlugin([ // 复制高度静态资源
     {
-      from: config.commonPath.staticDir,
+      context: config.commonPath.staticDir,
+      from: '**/*',
       ignore: ['*.md']
     }
   ]),
diff --git a/package.json b/package.json
@@ -14,8 +14,8 @@
   "dependencies": {
     "history": "^2.0.0",
     "lodash": "^4.15.0",
-    "react": "^15.3.1",
-    "react-dom": "^15.3.1",
+    "react": "~15.3.1",
+    "react-dom": "~15.3.1",
     "react-redux": "^4.4.5",
     "react-router": "^2.7.0",
     "react-router-redux": "^4.0.5",
@@ -37,7 +37,7 @@
     "browser-sync-webpack-plugin": "^1.0.1",
     "clean-webpack-plugin": "^0.1.13",
     "connect-history-api-fallback": "^1.1.0",
-    "copy-webpack-plugin": "^3.0.1",
+    "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.23.0",
     "eslint": "^1.10.3",
     "eslint-friendly-formatter": "^1.2.2",
diff --git a/src/redux/store/initState.js b/src/redux/store/initState.js
@@ -9,7 +9,7 @@ export default {
   msg: {
     msgs: [],           // 当前显示的留言列表
     displayControl: {   // 查询条件
-      pageIdx: 1,         // 默认是第 10 页
+      pageIdx: 1,         // 默认是第 1 页
       quantity: 10,       // 默认每页显示 10 条记录
       authorSpecified: '' // 是否有指定发布者
     }
diff --git a/src/utils/userAuth.js b/src/utils/userAuth.js
@@ -13,10 +13,3 @@ export default function userAuth(nextState, replace, next) {
   history.goBack()
   // next(replace('/loginPage')) # 举例：跳转到登录页的写法
 }
-
-/* 
-  还记得吗？在 Vue Demo 中
-  我们依靠 userService 实现 userData 的全局访问
-  每次修改顶级变量 $root.userData 都要同步 userService.data
-  如今用上 Redux，就再也不需要这样操作了
- */

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@ config.plugins.push(`
`30`	`30`	`}),`
`31`	`31`	`new CopyWebpackPlugin([ // 复制高度静态资源`
`32`	`32`	`{`
`33`		`- from: config.commonPath.staticDir,`
	`33`	`+ context: config.commonPath.staticDir,`
	`34`	`+ from: '*/',`
`34`	`35`	`ignore: ['*.md']`
`35`	`36`	`}`
`36`	`37`	`]),`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export default {`
`9`	`9`	`msg: {`
`10`	`10`	`msgs: [], // 当前显示的留言列表`
`11`	`11`	`displayControl: { // 查询条件`
`12`		`- pageIdx: 1, // 默认是第 10 页`
	`12`	`+ pageIdx: 1, // 默认是第 1 页`
`13`	`13`	`quantity: 10, // 默认每页显示 10 条记录`
`14`	`14`	`authorSpecified: '' // 是否有指定发布者`
`15`	`15`	`}`