From e50fc010855caaf70ad25d56f29fc585c954783f Mon Sep 17 00:00:00 2001
From: sorrycc <sorrycc@gmail.com>
Date: Thu, 8 Sep 2016 22:11:17 +0800
Subject: [PATCH] 1.0.0

---
 CHANGELOG.md | 16 ++++++++++++++++
 README.md    |  4 ++--
 package.json |  7 +++----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d96e8b5..64ddc7c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,20 @@
 
+## `1.0.0`
+
+- [42](https://github.com/dvajs/dva/pull/42)
+  - Add namespace prefix for reducers and effects automatically
+  - Add namespace prefix for dispatch in subscriptions, and put in effects
+  - Delete api `dva/effects`, it's passed to effect as second argument
+  - Simplify `app.start()`, move config to `dva()`
+  - Change subscriptions format to Object, keep the same with effects and reducers 
+  - Replace assert with [invariant](https://github.com/zertosh/invariant) and [warning](https://github.com/BerkeleyTrue/warning)
+  - Refactor testcase
+- [56](https://github.com/dvajs/dva/pull/56) - Remove router match from history, use [path-to-regexp](https://github.com/pillarjs/path-to-regexp) instead, [example](https://github.com/dvajs/dva-hackernews/commit/3314c7cf0751def7a87b351b87983aba0ba4b100)
+- [59](https://github.com/dvajs/dva/pull/59) - Add onEffect hook, so we can use plugin like [dva-loading](https://github.com/dvajs/dva-loading)
+- [71](https://github.com/dvajs/dva/pull/71) - Use handleActions directly to resize dva size by 46K (minified)
+
+Docs: [Upgrade to 1.0.0](https://github.com/dvajs/dva/pull/42#issuecomment-241323617)
+
 ## `0.0.16`
 
 - Fix renderProps undefined when redirecting
diff --git a/README.md b/README.md
index 27d7b72f..50f7c810 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Coverage Status](https://img.shields.io/coveralls/dvajs/dva.svg?style=flat)](https://coveralls.io/r/dvajs/dva)
 [![NPM downloads](http://img.shields.io/npm/dm/dva.svg?style=flat)](https://npmjs.org/package/dva)
 
-Lightweight elm-style framework based on react and redux.
+React and redux based, lightweight and elm-style framework.
 
 ----
 
@@ -19,7 +19,7 @@ Lightweight elm-style framework based on react and redux.
 - [Demos](#demos)
 - [dva 简介：Why dva and What's dva](https://github.com/dvajs/dva/issues/1)
 - [教程：教你如何一步步完成一个中型应用](https://github.com/dvajs/dva-docs/blob/master/zh/tutorial/01-%E6%A6%82%E8%A6%81.md)
-- [升级文档：Upgrade to 1.0.0-beta1](https://github.com/dvajs/dva/pull/42#issuecomment-241323617)
+- [升级文档：Upgrade to 1.0.0](https://github.com/dvajs/dva/pull/42#issuecomment-241323617)
 
 扩展阅读：
 
diff --git a/package.json b/package.json
index cfaebb12..fed2796f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dva",
-  "version": "1.0.0-beta4",
-  "description": "Front-end framework based on react, redux, react-redux, react-router and redux-saga, inspired by elm and choo.",
+  "version": "1.0.0",
+  "description": "React and redux based, lightweight and elm-style framework.",
   "repository": {
     "type": "git",
     "url": "https://github.com/dvajs/dva"
@@ -16,7 +16,6 @@
     "redux",
     "redux-saga",
     "elm",
-    "choo",
     "framework",
     "frontend"
   ],
@@ -102,4 +101,4 @@
     "mobile.js",
     "index.js"
   ]
-}
\ No newline at end of file
+}