Merge 973653a into d1f0b11

lerna.json

@@ -3,11 +3,10 @@
   "changelog": {
     "repo": "dvajs/dva",
     "labels": {
-      "new feature": ":rocket: New Feature",
-      "breaking change": ":boom: Breaking Change",
-      "bug": ":bug: Bug Fix",
-      "enhancement": ":nail_care: Enhancement",
-      "documentation": ":memo: Documentation"
+      "pr: enhancement": ":rocket: Enhancement",
+      "pr: bug": ":bug: Bug Fix",
+      "pr: documentation": ":book: Documentation",
+      "pr: dependency": ":deciduous_tree: Dependency"
     },
     "cacheDir": ".changelog"
   },

packages/dva-core/package.json

@@ -32,15 +32,14 @@
     "global": "^4.3.2",
     "invariant": "^2.2.1",
     "is-plain-object": "^2.0.3",
-    "redux": "^3.7.1",
     "redux-saga": "^0.16.0",
     "warning": "^3.0.0"
   },
   "peerDependencies": {
-    "redux": "3.x"
+    "redux": "4.x"
   },
   "devDependencies": {
-    "redux": "^4.0.0"
+    "redux": "^4.0.1"
   },
   "files": [
     "lib",

packages/dva/package.json

@@ -42,7 +42,7 @@
     "react-redux": "5.0.7",
     "react-router-dom": "^4.1.2",
     "react-router-redux": "5.0.0-alpha.9",
-    "redux": "^3.7.2"
+    "redux": "^4.0.1"
   },
   "peerDependencies": {
     "react": "15.x || ^16.0.0-0",