From b2b1a2a24dae7e1f2a548881b432e45d68d0d52f Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Fri, 19 May 2017 15:02:49 +0800
Subject: [PATCH 001/126] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=95=BF?=
 =?UTF-8?q?=E6=8C=89=E5=9B=BE=E7=89=87=EF=BC=8C=E5=9B=BE=E7=89=87=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/image-preview/src/image-preview.vue | 32 ++++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/image-preview/src/image-preview.vue b/packages/image-preview/src/image-preview.vue
index d819a582a..22c2793ca 100644
--- a/packages/image-preview/src/image-preview.vue
+++ b/packages/image-preview/src/image-preview.vue
@@ -1,6 +1,6 @@
 <template>
   <transition name="image-fade">
-    <div class="van-image-preview" ref="previewContainer" v-show="value" @click="handlePreviewClick">
+    <div class="van-image-preview" ref="previewContainer" v-show="value">
       <van-swipe>
         <van-swipe-item v-for="item in images">
           <img class="van-image-preview__image" @load="handleLoad" :src="item" alt="">
@@ -11,6 +11,7 @@
 </template>
 
 <script>
+import Vue from 'vue';
 import Popup from 'src/mixins/popup';
 import VanSwipe from 'packages/swipe';
 import VanSwipeItem from 'packages/swipe-item';
@@ -47,12 +48,9 @@ export default {
   },
 
   methods: {
-    handlePreviewClick() {
-      this.value = false;
-    },
-
     handleLoad(event) {
-      const containerSize = this.$refs.previewContainer.getBoundingClientRect();
+      const container = this.$refs.previewContainer;
+      const containerSize = container.getBoundingClientRect();
       const ratio = containerSize.width / containerSize.height;
       const target = event.currentTarget;
       const targetRatio = target.width / target.height;
@@ -88,6 +86,28 @@ export default {
       this.opened = false;
       this.doAfterClose();
     }
+  },
+
+  mounted() {
+    const supportTouch = !Vue.prototype.$isServer && 'ontouchstart' in window;
+    const container = this.$refs.previewContainer;
+
+    if (supportTouch) {
+      let touchStartTime;
+
+      container.addEventListener('touchstart', () => {
+        touchStartTime = new Date();
+      });
+      container.addEventListener('touchend', () => {
+        if (new Date() - touchStartTime < 1500) {
+          this.value = false;
+        }
+      });
+    } else {
+      container.addEventListener('click', () => {
+        this.value = false;
+      });
+    }
   }
 };
 </script>

From 38d80035321973b9d5c818ddec5974f52df81dce Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Wed, 24 May 2017 10:58:21 +0800
Subject: [PATCH 002/126] fix: button style

---
 packages/vant-css/src/button.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css
index 3ae0856c0..14e89483a 100644
--- a/packages/vant-css/src/button.css
+++ b/packages/vant-css/src/button.css
@@ -18,7 +18,11 @@
 
     &::after {
       content: " ";
-      position: absolute 0 0 0 0;
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
       background-color: #000;
       opacity: 0;
     }

From 19b814f1dba3d95aea2895ad208b2db9af189c49 Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Wed, 24 May 2017 16:53:15 +0800
Subject: [PATCH 003/126] fix: preview unit test

---
 test/unit/karma.conf.js               |  2 +-
 test/unit/specs/image-preview.spec.js | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
index ccd941c1e..8deb01ebb 100644
--- a/test/unit/karma.conf.js
+++ b/test/unit/karma.conf.js
@@ -9,7 +9,7 @@ var travis = process.env.TRAVIS;
 
 module.exports = function(config) {
   config.set({
-    browsers: travis ? ['PhantomJS'] : ['Chrome'],
+    browsers: travis ? ['PhantomJS'] : ['PhantomJS', 'Chrome'],
     frameworks: ['mocha', 'sinon-chai'],
     reporters: ['spec', 'coverage'],
     files: ['./index.js'],
diff --git a/test/unit/specs/image-preview.spec.js b/test/unit/specs/image-preview.spec.js
index 14cb44ef4..56b0d2d2e 100644
--- a/test/unit/specs/image-preview.spec.js
+++ b/test/unit/specs/image-preview.spec.js
@@ -1,4 +1,5 @@
 import ImagePreview from 'packages/image-preview';
+import Wrapper from 'avoriaz/dist/Wrapper';
 
 describe('ImagePreview', () => {
   beforeEach(() => {
@@ -22,7 +23,11 @@ describe('ImagePreview', () => {
     expect(document.querySelector('.van-image-preview')).to.exist;
 
     setTimeout(() => {
-      document.querySelector('.van-swipe-item').click();
+      const image = document.querySelector('.van-image-preview');
+      const avImage = new Wrapper({ elm: image }, () => {}, false);
+      avImage.simulate('click');
+      avImage.simulate('touchstart');
+      avImage.simulate('touchend');
       setTimeout(() => {
         expect(document.querySelector('.van-image-preview').__vue__.$parent.value).to.be.false;
         expect(document.body.style.overflow).to.equal('');
@@ -42,7 +47,12 @@ describe('ImagePreview', () => {
     expect(document.querySelector('.van-image-preview')).to.exist;
 
     setTimeout(() => {
-      document.querySelector('.van-swipe-item').click();
+      const image = document.querySelector('.van-image-preview');
+      const avImage = new Wrapper({ elm: image }, () => {}, false);
+      avImage.simulate('click');
+      avImage.simulate('touchstart');
+      avImage.simulate('touchend');
+
       setTimeout(() => {
         expect(document.querySelector('.van-image-preview').__vue__.$parent.value).to.be.false;
         expect(document.body.style.overflow).to.equal('hidden');

From 6d53bd8118ee04399c10946dbb98e19bb9f966b0 Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Wed, 24 May 2017 17:23:07 +0800
Subject: [PATCH 004/126] fix: init datetime-picker unit test

---
 test/unit/specs/datetime-picker.spec.js | 42 +++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 test/unit/specs/datetime-picker.spec.js

diff --git a/test/unit/specs/datetime-picker.spec.js b/test/unit/specs/datetime-picker.spec.js
new file mode 100644
index 000000000..4b8e37329
--- /dev/null
+++ b/test/unit/specs/datetime-picker.spec.js
@@ -0,0 +1,42 @@
+import DatetimePicker from 'packages/datetime-picker';
+import { mount } from 'avoriaz';
+
+describe('DatetimePicker', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('create a datetime picker', () => {
+    const date = new Date();
+    wrapper = mount(DatetimePicker, {
+      propsData: {
+        type: 'datetime',
+        value: date
+      }
+    });
+    expect(wrapper.data().innerValue.getTime()).to.equal(date.getTime());
+  });
+
+  it('create a date picker', () => {
+    const date = new Date();
+    wrapper = mount(DatetimePicker, {
+      propsData: {
+        type: 'date',
+        value: date
+      }
+    });
+    expect(wrapper.data().innerValue.getTime()).to.equal(date.getTime());
+  });
+
+  it('create a time picker', () => {
+    const time = '10:00';
+    wrapper = mount(DatetimePicker, {
+      propsData: {
+        type: 'time',
+        value: time
+      }
+    });
+    expect(wrapper.data().innerValue).to.equal(time);
+  });
+});

From 21c70ef69e015137289970234e1172f754931561 Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Tue, 27 Jun 2017 16:55:54 +0800
Subject: [PATCH 005/126] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E9=A1=BA=E5=BA=8F=E4=B8=8Ewap=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/vant-css/src/reset.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vant-css/src/reset.css b/packages/vant-css/src/reset.css
index 8221edc3a..5ed0557a0 100644
--- a/packages/vant-css/src/reset.css
+++ b/packages/vant-css/src/reset.css
@@ -47,7 +47,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
 }
 
 body {
-  font-family: Helvetica, "STHeiti STXihei", "Microsoft YaHei", Tohoma, Arial, sans-serif;
+  font-family: Arial, Helvetica, "STHeiti STXihei", "Microsoft YaHei", Tohoma, sans-serif;
 	color: #333;
 	background-color: #f8f8f8;
 	-webkit-backface-visibility: hidden;

From 05181edd524b2a1b9d81a9321d60cb9c926645a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 9 Aug 2017 14:36:52 +0800
Subject: [PATCH 006/126] fix: field error placeholder color

---
 packages/vant-css/src/field.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/vant-css/src/field.css b/packages/vant-css/src/field.css
index e1d7e5a82..e40d6aaa3 100644
--- a/packages/vant-css/src/field.css
+++ b/packages/vant-css/src/field.css
@@ -50,7 +50,10 @@
 
   &--error {
     .van-field__control {
-      color: $c-red;
+      &,
+      &::placeholder {
+        color: $c-red;
+      }
     }
   }
 

From 7bc8c5022ac7835fe23c33f2d4f73f12b93be34b Mon Sep 17 00:00:00 2001
From: Kay <raistlin916@gmail.com>
Date: Wed, 9 Aug 2017 14:48:46 +0800
Subject: [PATCH 007/126] Fixed: one page Swipe components error (#70)

---
 packages/swipe/src/scroll.js      | 12 ++++++------
 packages/swipe/src/swipe-item.vue |  7 +++++++
 packages/swipe/src/swipe.vue      | 27 ++++++++++++++++++++-------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/packages/swipe/src/scroll.js b/packages/swipe/src/scroll.js
index d70b1aba1..988e74e49 100755
--- a/packages/swipe/src/scroll.js
+++ b/packages/swipe/src/scroll.js
@@ -69,12 +69,6 @@ extend(Scroll.prototype, {
     var leftOffset = offset - wrapWidth;
     var rightOffset = offset + wrapWidth;
 
-    page = this.getCurrentPage();
-    if (page) {
-      page.style['-webkit-transform'] = 'translate3d(' + offset + 'px, 0, 0)';
-      page.style['display'] = 'block';
-    }
-
     leftPage = this.pages[this.mapLoopPage(currentOffsetPage - 1)];
     if (leftPage) {
       if (Math.abs(leftOffset) <= wrapWidth) {
@@ -96,6 +90,12 @@ extend(Scroll.prototype, {
         }
       }
     }
+
+    page = this.getCurrentPage();
+    if (page) {
+      page.style['-webkit-transform'] = 'translate3d(' + offset + 'px, 0, 0)';
+      page.style['display'] = 'block';
+    }
   },
 
   movePage: function(dist, isEnd) {
diff --git a/packages/swipe/src/swipe-item.vue b/packages/swipe/src/swipe-item.vue
index ba4489474..dafed2fd2 100644
--- a/packages/swipe/src/swipe-item.vue
+++ b/packages/swipe/src/swipe-item.vue
@@ -10,6 +10,13 @@ export default {
 
   beforeCreate() {
     this.$parent.swipes.push(this);
+  },
+
+  destroyed() {
+    const index = this.$parent.swipes.indexOf(this)
+    if (index > -1) {
+      this.$parent.swipes.splice(index, 1)
+    }
   }
 };
 </script>
diff --git a/packages/swipe/src/swipe.vue b/packages/swipe/src/swipe.vue
index 5063cf8e2..4b6d818b6 100644
--- a/packages/swipe/src/swipe.vue
+++ b/packages/swipe/src/swipe.vue
@@ -36,11 +36,6 @@ export default {
   },
 
   mounted() {
-    const pages = this.$el.querySelectorAll('.van-swipe-item')
-    if (pages.length <= 1) {
-      return
-    }
-
     this.input = new Input(this.$el, {
       listenMoving: true
     });
@@ -66,10 +61,28 @@ export default {
     }).on('autoPlay', function(dist, isEnd) {
       scroll.movePage(dist.x, isEnd);
     });
+    this.dummy = dummy
   },
 
-  updated() {
-    this.scroll.update();
+  watch: {
+    swipes(value) {
+      if (this.autoPlay && value.length > 1) {
+        this.dummy.initMove()
+      } else {
+        this.dummy.clearMove()
+      }
+      this.scroll.update();
+      return value
+    },
+
+    autoPlay(value) {
+      if (value && this.swipes.length > 1) {
+        this.dummy.initMove()
+      } else {
+        this.dummy.clearMove()
+      }
+      return value
+    }
   },
 
   methods: {

From a49f1ba1ac4fab2b896348d9ee911ba646546a12 Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Wed, 9 Aug 2017 15:37:10 +0800
Subject: [PATCH 008/126] [build] 0.7.7

---
 docs/examples-docs/changelog.md | 7 +++++++
 packages/vant-css/package.json  | 2 +-
 src/index.js                    | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index ac512409c..168fafb88 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -1,5 +1,12 @@
 ## 更新日志
 
+## [v0.7.6](https://github.com/youzan/vant/tree/v0.7.6) (2017-08-08)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.7.5...v0.7.6)
+
+**非兼容更新和新特性:**
+
+- 新增几个icon [\#69](https://github.com/youzan/vant/pull/69) ([cookfront](https://github.com/cookfront))
+
 ## [v0.7.5](https://github.com/youzan/vant/tree/v0.7.5) (2017-08-08)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.7.3...v0.7.5)
 
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index 267509355..f48af19d1 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",
diff --git a/src/index.js b/src/index.js
index d1e4eead8..5cb07d0a2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -37,7 +37,7 @@ import Swipe from '../packages/swipe/index.js';
 import SwipeItem from '../packages/swipe-item/index.js';
 import DatetimePicker from '../packages/datetime-picker/index.js';
 
-const version = '0.7.6';
+const version = '0.7.7';
 const components = [
   Button,
   Switch,

From 9663eb431321a0678d9bf3efe20e5b2799ca226a Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Wed, 9 Aug 2017 15:37:11 +0800
Subject: [PATCH 009/126] [release] 0.7.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1c9bdb766..88ca46ac7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From 4e57dfa797a1b67a855ed0ff09f51196abec0c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 9 Aug 2017 16:19:11 +0800
Subject: [PATCH 010/126] update README.md:  add babel-plugin-import

---
 README.md       | 39 ++++++++++++++++++++++++++-------------
 README.zh-CN.md | 42 +++++++++++++++++++++++++++---------------
 2 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index baf5f132e..93081b44c 100644
--- a/README.md
+++ b/README.md
@@ -18,11 +18,36 @@ npm i -S vant
 ```
  
 ## Usage
+
+### Use [babel-plugin-import](https://github.com/ant-design/babel-plugin-import) (Recommended)
+
+   ```js
+   // .babelrc or babel-loader option
+   {
+     "plugins": [
+       ["import", { "libraryName": "vant", "style": true }]
+     ]
+   }
+   ```
+
+   Then you can import components from vant, equivalent to import manually below.
+
+   ```js
+   // import js and css modularly, parsed by babel-plugin-import
+   import { Button } from 'vant';
+   ```
+
+### Manually import
+
+   ```jsx
+   import { Button } from 'vant';
+   import 'vant/lib/vant-css/button.css';
+   ```
  
  
 ### Import all components
  
-```javascript
+```javascrip
 import Vue from 'vue';
 import vant from 'vant';
 import 'vant/lib/vant-css/index.css';
@@ -30,18 +55,6 @@ import 'vant/lib/vant-css/index.css';
 Vue.use(vant);
 ```
  
-### On demand
-
-```javascript
-import Vue from 'vue';
-import { Button, Cell } from 'vant';
-import 'vant/lib/vant-css/button.css';
-import 'vant/lib/vant-css/cell.css';
-
-Vue.component(Button.name, Button);
-Vue.component(Cell.name, Cell);
-```
-
 ## Development
 
 ### Add a new component
diff --git a/README.zh-CN.md b/README.zh-CN.md
index b4596c24d..e0c87b6a8 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -18,28 +18,40 @@ npm i -S vant
 ## 二、使用
  
  
-### 1. 导入所有组件
+### 使用 [babel-plugin-import](https://github.com/ant-design/babel-plugin-import) (推荐)
+
+   ```js
+   // .babelrc or babel-loader option
+   {
+     "plugins": [
+       ["import", { "libraryName": "vant", "style": true }]
+     ]
+   }
+   ```
+   
+   接着你可以直接引入 vant 组件，等价于下方的按需引入组件
+
+   ```js
+   // 模块化地引入 js 和 css, 通过 babel-plugin-import 插件解析
+   import { Button } from 'vant';
+   ```
+
+### 按需引入组件
+
+   ```jsx
+   import { Button } from 'vant/lib/button';
+   import 'vant/lib/vant-css/button.css';
+   ```
  
-```javascript
+### 导入所有组件
+ 
+```javascrip
 import Vue from 'vue';
 import vant from 'vant';
-// 你也可以使用自己的主题
 import 'vant/lib/vant-css/index.css';
 
 Vue.use(vant);
 ```
- 
-### 2. 按需导入组件
-
-```javascript
-import Vue from 'vue';
-import { Button, Cell } from 'vant';
-import 'vant/lib/vant-css/button.css';
-import 'vant/lib/vant-css/cell.css';
-
-Vue.component(Button.name, Button);
-Vue.component(Cell.name, Cell);
-```
 
 ## 三、开发
 

From 8ca524d9ac14f5a50ae762b1205e98d9420d4d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 9 Aug 2017 16:19:45 +0800
Subject: [PATCH 011/126] load doc && demo in demand

---
 .babelrc                     |  4 ++-
 build/webpack.config.dev.js  | 10 +++++---
 build/webpack.config.prod.js |  3 ++-
 docs/src/doc.config.js       |  4 +++
 docs/src/index.js            | 11 --------
 docs/src/router.config.js    | 27 +++++++++-----------
 package.json                 | 14 +++++------
 yarn.lock                    | 49 ++++++++++++++++++++++--------------
 8 files changed, 65 insertions(+), 57 deletions(-)

diff --git a/.babelrc b/.babelrc
index c72eeb3a2..0e5cba99a 100644
--- a/.babelrc
+++ b/.babelrc
@@ -2,7 +2,9 @@
   "presets": [
     [
       "es2015",
-      { "modules": false }
+      {
+        "modules": false
+      }
     ]
   ],
   "plugins": [
diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js
index 9cad7ac96..87105c112 100644
--- a/build/webpack.config.dev.js
+++ b/build/webpack.config.dev.js
@@ -14,7 +14,6 @@ require('./genExamples')(isProduction);
 
 module.exports = {
   entry: {
-    vendor: ['vue', 'vue-router', 'zan-doc'],
     'vant-docs': './docs/src/index.js',
     'vant-examples': './docs/src/examples.js'
   },
@@ -22,7 +21,8 @@ module.exports = {
     path: path.join(__dirname, '../docs/dist'),
     publicPath: '/',
     filename: '[name].js',
-    umdNamedDefine: true
+    umdNamedDefine: true,
+    chunkFilename: 'async.[name].js'
   },
   devServer: {
     historyApiFallback: {
@@ -37,7 +37,7 @@ module.exports = {
     modules: [path.join(__dirname, '../node_modules'), 'node_modules'],
     extensions: ['.js', '.vue', '.css'],
     alias: {
-      vue$: 'vue/dist/vue.esm.js',
+      vue: 'vue/dist/vue.esm.js',
       src: path.join(__dirname, '../src'),
       packages: path.join(__dirname, '../packages'),
       lib: path.join(__dirname, '../lib'),
@@ -131,6 +131,10 @@ module.exports = {
       filename: 'examples.html',
       inject: true
     }),
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor',
+      minChunks: 2
+    }),
     new webpack.HotModuleReplacementPlugin(),
     new OptimizeCssAssetsPlugin(),
     new ExtractTextPlugin({
diff --git a/build/webpack.config.prod.js b/build/webpack.config.prod.js
index d4a45855b..6bbdb5725 100644
--- a/build/webpack.config.prod.js
+++ b/build/webpack.config.prod.js
@@ -8,7 +8,8 @@ module.exports = merge(devConfig, {
     path: path.join(__dirname, '../docs/dist'),
     publicPath: 'https://b.yzcdn.cn/zanui/vue',
     filename: '[name].[hash:8].js',
-    umdNamedDefine: true
+    umdNamedDefine: true,
+    chunkFilename: 'async.[name].[chunkhash:8].js'
   },
   devtool: false,
   plugins: [
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index b58bf3a99..d77c272c0 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -30,6 +30,10 @@ module.exports = {
                 "path": "/changelog",
                 "title": "更新日志",
                 noExample: true
+              },
+              {
+                "title": "业务组件",
+                "link": "/zanui/captain/component/quickstart"
               }
             ]
           }
diff --git a/docs/src/index.js b/docs/src/index.js
index 2f7c3b729..f26018406 100644
--- a/docs/src/index.js
+++ b/docs/src/index.js
@@ -2,16 +2,9 @@ import Vue from 'vue';
 import VueRouter from 'vue-router';
 import App from './ExamplesDocsApp';
 import routes from './router.config';
-import ZanUI from 'src/index.js';
 import ZanDoc from 'zan-doc';
-import packageJson from '../../package.json';
 import DemoBlock from './components/demo-block';
 
-const global = {
-  version: packageJson.version
-};
-window._global = global;
-
 import '../assets/docs.css';
 import 'packages/vant-css/src/index.css';
 
@@ -22,11 +15,7 @@ function isMobile() {
 }
 
 Vue.use(VueRouter);
-Vue.use(ZanUI);
 Vue.use(ZanDoc);
-Vue.use(ZanUI.Lazyload, {
-  lazyComponent: true
-});
 Vue.component('demo-block', DemoBlock);
 
 const routesConfig = routes();
diff --git a/docs/src/router.config.js b/docs/src/router.config.js
index 19d7ad0a3..b49e01ca1 100644
--- a/docs/src/router.config.js
+++ b/docs/src/router.config.js
@@ -1,4 +1,6 @@
 const navs = require('./doc.config')['zh-CN'].nav;
+import componentDocs from '../examples-dist/entry-docs';
+import componentDemos from '../examples-dist/entry-demos';
 
 const registerRoute = (isExample) => {
   let route = [];
@@ -9,31 +11,26 @@ const registerRoute = (isExample) => {
 
     if (nav.groups) {
       nav.groups.forEach(group => {
-        group.list.forEach(nav => {
-          addRoute(nav);
-        });
+        group.list.forEach(addRoute);
       });
     } else if (nav.children) {
-      nav.children.forEach(nav => {
-        addRoute(nav);
-      });
+      nav.children.forEach(addRoute);
     } else {
       addRoute(nav);
     }
   });
 
   function addRoute(page) {
-    const component = isExample
-      ? require(`../examples-dist${page.path}.vue`)
-      : require(`../examples-docs${page.path}.md`);
-    route.push({
-      path: '/component' + page.path,
-      component: component.default || component
-    });
+    const { path } = page;
+    if (path) {
+      const name = path.replace('/', '');
+      route.push({
+        path: '/component' + path,
+        component: isExample ? componentDemos[name] : componentDocs[name]
+      });
+    }
   }
 
-  // console.log(route);
-
   return route;
 };
 
diff --git a/package.json b/package.json
index 1c9bdb766..594249814 100644
--- a/package.json
+++ b/package.json
@@ -60,10 +60,10 @@
     "babel-polyfill": "^6.23.0",
     "babel-preset-es2015": "^6.16.0",
     "babel-runtime": "^6.25.0",
-    "chai": "^4.1.0",
+    "chai": "^4.1.1",
     "cheerio": "^0.22.0",
     "codecov": "^2.2.0",
-    "cross-env": "^5.0.1",
+    "cross-env": "^5.0.5",
     "css-loader": "^0.28.4",
     "eslint-plugin-vue": "^2.1.0",
     "extract-text-webpack-plugin": "2.1.2",
@@ -87,7 +87,7 @@
     "karma-spec-reporter": "^0.0.31",
     "karma-webpack": "^2.0.4",
     "lerna": "^2.0.0",
-    "markdown-it": "^8.3.1",
+    "markdown-it": "^8.3.2",
     "markdown-it-container": "^2.0.0",
     "mocha": "^3.4.2",
     "optimize-css-assets-webpack-plugin": "^3.0.0",
@@ -106,15 +106,15 @@
     "vue": "^2.4.2",
     "vue-hot-reload-api": "^2.1.0",
     "vue-html-loader": "^1.2.4",
-    "vue-loader": "^13.0.2",
+    "vue-loader": "^13.0.4",
     "vue-markdown-loader": "^2.0.0",
     "vue-router": "^2.7.0",
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.4.2",
     "vue-template-es2015-compiler": "^1.5.3",
-    "webpack": "^3.4.1",
-    "webpack-dev-server": "^2.6.1",
+    "webpack": "^3.5.1",
+    "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "^0.1.4"
+    "zan-doc": "0.1.10"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 1efbcb83a..6bd4675cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1147,9 +1147,9 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chai@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.0.tgz#331a0391b55c3af8740ae9c3b7458bc1c3805e6d"
+chai@^4.1.1:
+  version "4.1.1"
+  resolved "http://registry.npm.qima-inc.com/chai/download/chai-4.1.1.tgz#66e21279e6f3c6415ff8231878227900e2171b39"
   dependencies:
     assertion-error "^1.0.1"
     check-error "^1.0.1"
@@ -1787,9 +1787,9 @@ create-hmac@^1.1.0, create-hmac@^1.1.2:
     create-hash "^1.1.0"
     inherits "^2.0.1"
 
-cross-env@^5.0.1:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.3.tgz#8f55acef7469fed364f4039a9f7ece90191e3981"
+cross-env@^5.0.5:
+  version "5.0.5"
+  resolved "http://registry.npm.qima-inc.com/cross-env/download/cross-env-5.0.5.tgz#4383d364d9660873dd185b398af3bfef5efffef3"
   dependencies:
     cross-spawn "^5.1.0"
     is-windows "^1.0.0"
@@ -3854,7 +3854,7 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
-ip@^1.1.0:
+ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
 
@@ -4856,6 +4856,16 @@ markdown-it@^8.3.1:
     mdurl "^1.0.1"
     uc.micro "^1.0.3"
 
+markdown-it@^8.3.2:
+  version "8.3.2"
+  resolved "http://registry.npm.qima-inc.com/markdown-it/download/markdown-it-8.3.2.tgz#df4b86530d17c3bc9beec3b68d770b92ea17ae96"
+  dependencies:
+    argparse "^1.0.7"
+    entities "~1.1.1"
+    linkify-it "^2.0.0"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.3"
+
 math-expression-evaluator@^1.2.14:
   version "1.2.16"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
@@ -7693,9 +7703,9 @@ vue-lazyload@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.0.6.tgz#7d5494fc35c35fc84dcc271165b827e309b4e793"
 
-vue-loader@^13.0.2:
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.0.3.tgz#b38d0fcd9818ae7b6a02932410d34943f9c9466d"
+vue-loader@^13.0.4:
+  version "13.0.4"
+  resolved "http://registry.npm.qima-inc.com/vue-loader/download/vue-loader-13.0.4.tgz#0a6d893698735fcf7037b20a23d724cb39eee7d4"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
@@ -7789,9 +7799,9 @@ webpack-dev-middleware@^1.11.0:
     range-parser "^1.0.3"
     time-stamp "^2.0.0"
 
-webpack-dev-server@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.6.1.tgz#0b292a9da96daf80a65988f69f87b4166e5defe7"
+webpack-dev-server@^2.7.1:
+  version "2.7.1"
+  resolved "http://registry.npm.qima-inc.com/webpack-dev-server/download/webpack-dev-server-2.7.1.tgz#21580f5a08cd065c71144cf6f61c345bca59a8b8"
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -7803,6 +7813,7 @@ webpack-dev-server@^2.6.1:
     html-entities "^1.2.0"
     http-proxy-middleware "~0.17.4"
     internal-ip "^1.2.0"
+    ip "^1.1.5"
     loglevel "^1.4.1"
     opn "4.0.2"
     portfinder "^1.0.9"
@@ -7829,9 +7840,9 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.4.1.tgz#4c3f4f3fb318155a4db0cb6a36ff05c5697418f4"
+webpack@^3.5.1:
+  version "3.5.1"
+  resolved "http://registry.npm.qima-inc.com/webpack/download/webpack-3.5.1.tgz#b749ee3d2b5a118dad53e8e41585b3f71e75499a"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
@@ -8057,9 +8068,9 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-zan-doc@^0.1.4:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.1.8.tgz#e452f9afc29ff292106858f938a9604b82bb8120"
+zan-doc@0.1.10:
+  version "0.1.10"
+  resolved "http://registry.npm.qima-inc.com/zan-doc/download/zan-doc-0.1.10.tgz#4a8b06d851315c2cd4092c9d770024c7a61b8099"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"

From 96053330406dcb630af87a98a71e4325bea8bd34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 9 Aug 2017 16:26:40 +0800
Subject: [PATCH 012/126] update README.md

---
 .babelrc        | 4 +---
 README.md       | 2 +-
 README.zh-CN.md | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.babelrc b/.babelrc
index 0e5cba99a..c72eeb3a2 100644
--- a/.babelrc
+++ b/.babelrc
@@ -2,9 +2,7 @@
   "presets": [
     [
       "es2015",
-      {
-        "modules": false
-      }
+      { "modules": false }
     ]
   ],
   "plugins": [
diff --git a/README.md b/README.md
index 93081b44c..2a90cd0c1 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ npm i -S vant
  
 ### Import all components
  
-```javascrip
+```javascript
 import Vue from 'vue';
 import vant from 'vant';
 import 'vant/lib/vant-css/index.css';
diff --git a/README.zh-CN.md b/README.zh-CN.md
index e0c87b6a8..6cb129656 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -45,7 +45,7 @@ npm i -S vant
  
 ### 导入所有组件
  
-```javascrip
+```javascript
 import Vue from 'vue';
 import vant from 'vant';
 import 'vant/lib/vant-css/index.css';

From 1cab7c449c3492bf7813a3f39832ccf72a3b77c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 9 Aug 2017 16:45:39 +0800
Subject: [PATCH 013/126] update yarn.lock

---
 build/webpack.config.prod.js |    2 +-
 package.json                 |    2 +-
 yarn.lock                    | 1047 ++++++++++++++++++----------------
 3 files changed, 563 insertions(+), 488 deletions(-)

diff --git a/build/webpack.config.prod.js b/build/webpack.config.prod.js
index 6bbdb5725..204bf81a5 100644
--- a/build/webpack.config.prod.js
+++ b/build/webpack.config.prod.js
@@ -6,7 +6,7 @@ var devConfig = require('./webpack.config.dev.js');
 module.exports = merge(devConfig, {
   output: {
     path: path.join(__dirname, '../docs/dist'),
-    publicPath: 'https://b.yzcdn.cn/zanui/vue',
+    publicPath: 'https://b.yzcdn.cn/zanui/vue/',
     filename: '[name].[hash:8].js',
     umdNamedDefine: true,
     chunkFilename: 'async.[name].[chunkhash:8].js'
diff --git a/package.json b/package.json
index 1c09b6a7e..fc8768124 100644
--- a/package.json
+++ b/package.json
@@ -115,6 +115,6 @@
     "webpack": "^3.5.1",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "0.1.10"
+    "zan-doc": "0.1.11"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 6bd4675cd..e7bd70926 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13,7 +13,11 @@ abab@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
 
-abbrev@1, abbrev@1.0.x:
+abbrev@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+
+abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
 
@@ -51,12 +55,12 @@ acorn@^3.0.4:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
 acorn@^4.0.3:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.0, acorn@^5.0.1:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
+acorn@^5.0.0, acorn@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
 
 add-stream@^1.0.0:
   version "1.0.0"
@@ -75,8 +79,8 @@ ajv-keywords@^2.0.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
 
 ajv@^4.7.0, ajv@^4.9.1:
-  version "4.11.7"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.7.tgz#8655a5d86d0824985cc471a1d913fb6729a0ec48"
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
@@ -145,26 +149,26 @@ any-promise@^0.1.0:
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
 
 anymatch@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
   dependencies:
-    arrify "^1.0.0"
     micromatch "^2.1.5"
+    normalize-path "^2.0.0"
 
 aproba@^1.0.3:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1"
 
 archy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
 
 are-we-there-yet@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz#80e470e95a084794fe1899262c5667c6e88de1b3"
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
   dependencies:
     delegates "^1.0.0"
-    readable-stream "^2.0.0 || ^1.1.13"
+    readable-stream "^2.0.6"
 
 argparse@^1.0.7:
   version "1.0.9"
@@ -189,13 +193,17 @@ arr-diff@^2.0.0:
     arr-flatten "^1.0.1"
 
 arr-flatten@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
 array-differ@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
 
+array-each@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
+
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -216,6 +224,10 @@ array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
 
+array-slice@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.0.0.tgz#e73034f00dcc1f40876008fd20feae77bd4b7c2f"
+
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -298,8 +310,8 @@ async@2.1.4:
     lodash "^4.14.0"
 
 async@^2.1.2:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
     lodash "^4.14.0"
 
@@ -405,13 +417,13 @@ babel-core@^6.1.4, babel-core@^6.24.1, babel-core@^6.25.0:
     source-map "^0.5.0"
 
 babel-eslint@^7.2.1:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.2.tgz#0da2cbe6554fd0fb069f19674f2db2f9c59270ff"
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
   dependencies:
     babel-code-frame "^6.22.0"
     babel-traverse "^6.23.1"
     babel-types "^6.23.0"
-    babylon "^6.16.1"
+    babylon "^6.17.0"
 
 babel-generator@^6.25.0:
   version "6.25.0"
@@ -815,7 +827,7 @@ babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
-babylon@^6.16.1, babylon@^6.17.2:
+babylon@^6.17.0, babylon@^6.17.2:
   version "6.17.4"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
 
@@ -827,7 +839,7 @@ balanced-match@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
 
-balanced-match@^0.4.1, balanced-match@^0.4.2:
+balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
@@ -840,8 +852,8 @@ base64-arraybuffer@0.1.5:
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
 
 base64-js@^1.0.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
 
 base64id@1.0.0:
   version "1.0.0"
@@ -851,9 +863,9 @@ base64url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
 
-batch@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.5.3.tgz#3f3414f380321743bfc1042f9a83ff1d5824d464"
+batch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.1"
@@ -876,8 +888,8 @@ big.js@^3.1.3:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
 
 binary-extensions@^1.0.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.9.0.tgz#66506c16ce6f4d6928a5b3cd6a33ca41e941e37b"
 
 blob@0.0.4:
   version "0.0.4"
@@ -894,23 +906,23 @@ bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.7:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.6"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
 
 body-parser@^1.16.1:
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.17.1.tgz#75b3bc98ddd6e7e0d8ffe750dfaca5c66993fa47"
+  version "1.17.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.17.2.tgz#f8892abc8f9e627d42aedafbca66bf5ab99104ee"
   dependencies:
     bytes "2.4.0"
     content-type "~1.0.2"
-    debug "2.6.1"
+    debug "2.6.7"
     depd "~1.1.0"
     http-errors "~1.6.1"
     iconv-lite "0.4.15"
     on-finished "~2.3.0"
     qs "6.4.0"
     raw-body "~2.2.0"
-    type-is "~1.6.14"
+    type-is "~1.6.15"
 
 bonjour@^3.5.0:
   version "3.5.0"
@@ -934,10 +946,10 @@ boom@2.x.x:
     hoek "2.x.x"
 
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
   dependencies:
-    balanced-match "^0.4.1"
+    balanced-match "^1.0.0"
     concat-map "0.0.1"
 
 braces@^0.1.2:
@@ -1021,20 +1033,16 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     electron-to-chromium "^1.2.7"
 
 browserslist@^2.1.5:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.2.2.tgz#e9b4618b8a01c193f9786beea09f6fd10dbe31c3"
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.3.1.tgz#39500a2090330b2a090120ea6c7fc78b6e091c5e"
   dependencies:
-    caniuse-lite "^1.0.30000704"
-    electron-to-chromium "^1.3.16"
+    caniuse-lite "^1.0.30000712"
+    electron-to-chromium "^1.3.17"
 
 buffer-indexof@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.0.tgz#f54f647c4f4e25228baa656a2e57e43d5f270982"
 
-buffer-shims@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-
 buffer-xor@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -1059,14 +1067,14 @@ byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
 
-bytes@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
-
 bytes@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.4.0.tgz#7d97196f9d5baf7f6935e25985549edd2a6c2339"
 
+bytes@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.5.0.tgz#4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"
+
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -1125,12 +1133,12 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000656"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000656.tgz#127c8c6e655e7464e58f039558f1e878fcca3c45"
+  version "1.0.30000713"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000713.tgz#ea01761840b5f148faf94ec5f34d0aa1d321966f"
 
-caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000704:
-  version "1.0.30000710"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000710.tgz#1c249bf7c6a61161c9b10906e3ad9fa5b6761af1"
+caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000712:
+  version "1.0.30000713"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000713.tgz#33957ecb4a2154a5d40a60d13d8bf1cfa0881a8a"
 
 caseless@~0.11.0:
   version "0.11.0"
@@ -1149,7 +1157,7 @@ center-align@^0.1.1:
 
 chai@^4.1.1:
   version "4.1.1"
-  resolved "http://registry.npm.qima-inc.com/chai/download/chai-4.1.1.tgz#66e21279e6f3c6415ff8231878227900e2171b39"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.1.tgz#66e21279e6f3c6415ff8231878227900e2171b39"
   dependencies:
     assertion-error "^1.0.1"
     check-error "^1.0.1"
@@ -1169,8 +1177,8 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     supports-color "^2.0.0"
 
 chalk@^2.0.0, chalk@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
   dependencies:
     ansi-styles "^3.1.0"
     escape-string-regexp "^1.0.5"
@@ -1244,22 +1252,7 @@ cheerio@^0.20.0:
   optionalDependencies:
     jsdom "^7.0.2"
 
-chokidar@^1.4.1, chokidar@^1.6.0, chokidar@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
-chokidar@^1.7.0:
+chokidar@^1.4.1, chokidar@^1.6.0, chokidar@^1.6.1, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1278,32 +1271,33 @@ ci-info@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
 
-cipher-base@^1.0.0, cipher-base@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
   dependencies:
     inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
 circular-json@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
 
 clap@^1.0.9:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.0.tgz#59c90fe3e137104746ff19469a27a634ff68c857"
   dependencies:
     chalk "^1.1.3"
 
 clean-css@3.4.x:
-  version "3.4.25"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.25.tgz#9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"
+  version "3.4.28"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
   dependencies:
     commander "2.8.x"
     source-map "0.4.x"
 
-clean-css@4.0.x:
-  version "4.0.12"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.0.12.tgz#a02e61707f1840bd3338f54dbc9acbda4e772fa3"
+clean-css@4.1.x:
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.7.tgz#b9aea4f85679889cf3eae8b40349ec4ebdfdd032"
   dependencies:
     source-map "0.5.x"
 
@@ -1363,8 +1357,8 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
 coa@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.1.tgz#7f959346cfc8719e3f7233cd6852854a7c67d8a3"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
   dependencies:
     q "^1.1.2"
 
@@ -1387,8 +1381,8 @@ color-convert@^1.3.0, color-convert@^1.9.0:
     color-name "^1.1.1"
 
 color-name@^1.0.0, color-name@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
 color-string@^0.3.0:
   version "0.3.0"
@@ -1439,13 +1433,17 @@ command-join@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
 
+commander@2.11.x, commander@^2.8.1, commander@^2.9.0, commander@~2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+
 commander@2.8.x:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@2.9.0, commander@2.9.x, commander@^2.8.1, commander@^2.9.0, commander@~2.9.0:
+commander@2.9.0, commander@2.9.x, commander@~2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
@@ -1478,22 +1476,23 @@ component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
 
-compressible@~2.0.8:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
+compressible@~2.0.10:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.11.tgz#16718a75de283ed8e604041625a2064586797d8a"
   dependencies:
-    mime-db ">= 1.27.0 < 2"
+    mime-db ">= 1.29.0 < 2"
 
 compression@^1.5.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.6.2.tgz#cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.0.tgz#030c9f198f1643a057d776a738e922da4373012d"
   dependencies:
     accepts "~1.3.3"
-    bytes "2.3.0"
-    compressible "~2.0.8"
-    debug "~2.2.0"
+    bytes "2.5.0"
+    compressible "~2.0.10"
+    debug "2.6.8"
     on-headers "~1.0.1"
-    vary "~1.1.0"
+    safe-buffer "5.1.1"
+    vary "~1.1.1"
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -1527,11 +1526,11 @@ connect-history-api-fallback@^1.3.0:
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169"
 
 connect@^3.6.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.1.tgz#b7760693a74f0454face1d9378edb3f885b43227"
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.3.tgz#f7320d46a25b4be7b483a2236517f24b1e27e301"
   dependencies:
-    debug "2.6.3"
-    finalhandler "1.0.1"
+    debug "2.6.8"
+    finalhandler "1.0.4"
     parseurl "~1.3.1"
     utils-merge "1.0.0"
 
@@ -1746,17 +1745,18 @@ cookie@0.3.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
 core-js@^2.2.0, core-js@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.0.tgz#569c050918be6486b3837552028ae0466b717086"
 
-core-util-is@~1.0.0:
+core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
 cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.1.1.tgz#817f2c2039347a1e9bf7d090c0923e53f749ca82"
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
   dependencies:
+    is-directory "^0.3.1"
     js-yaml "^3.4.3"
     minimist "^1.2.0"
     object-assign "^4.1.0"
@@ -1771,25 +1771,29 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
-create-hash@^1.1.0, create-hash@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.2.tgz#51210062d7bb7479f6c65bb41a92208b1d61abad"
+create-hash@^1.1.0, create-hash@^1.1.1, create-hash@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
-    ripemd160 "^1.0.0"
-    sha.js "^2.3.6"
+    ripemd160 "^2.0.0"
+    sha.js "^2.4.0"
 
-create-hmac@^1.1.0, create-hmac@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.4.tgz#d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170"
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
   dependencies:
+    cipher-base "^1.0.3"
     create-hash "^1.1.0"
     inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
 
 cross-env@^5.0.5:
   version "5.0.5"
-  resolved "http://registry.npm.qima-inc.com/cross-env/download/cross-env-5.0.5.tgz#4383d364d9660873dd185b398af3bfef5efffef3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.5.tgz#4383d364d9660873dd185b398af3bfef5efffef3"
   dependencies:
     cross-spawn "^5.1.0"
     is-windows "^1.0.0"
@@ -1809,8 +1813,8 @@ cryptiles@2.x.x:
     boom "2.x.x"
 
 crypto-browserify@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f"
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -1864,14 +1868,6 @@ css-select@^1.1.0, css-select@~1.2.0:
     domutils "1.5.1"
     nth-check "~1.0.1"
 
-css-selector-tokenizer@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152"
-  dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
-
 css-selector-tokenizer@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
@@ -1997,7 +1993,7 @@ debug@0.7.4, debug@~0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
 
-debug@2.2.0, debug@~2.2.0:
+debug@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
@@ -2009,19 +2005,13 @@ debug@2.3.3:
   dependencies:
     ms "0.7.2"
 
-debug@2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351"
+debug@2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"
   dependencies:
-    ms "0.7.2"
+    ms "2.0.0"
 
-debug@2.6.3, debug@^2.1.1:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
-  dependencies:
-    ms "0.7.2"
-
-debug@2.6.8, debug@^2.2.0, debug@^2.6.6, debug@^2.6.8:
+debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.6, debug@^2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
@@ -2046,8 +2036,8 @@ deep-equal@^1.0.1:
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
 
 deep-extend@~0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.1.tgz#efe4113d08085f4e6f9687759810f807469e2253"
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
 deep-is@~0.1.3:
   version "0.1.3"
@@ -2101,9 +2091,9 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-depd@1.1.0, depd@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"
+depd@1.1.1, depd@~1.1.0, depd@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
 
 deprecated@^0.0.1:
   version "0.0.1"
@@ -2144,10 +2134,14 @@ di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
 
-diff@3.2.0, diff@^3.1.0:
+diff@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
 
+diff@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.0.tgz#056695150d7aa93237ca7e378ac3b1682b7963b9"
+
 diffie-hellman@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
@@ -2209,6 +2203,10 @@ dom-serializer@0, dom-serializer@~0.1.0:
     domelementtype "~1.1.1"
     entities "~1.1.1"
 
+dom-walk@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
+
 domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
@@ -2227,25 +2225,38 @@ domhandler@2.1:
   dependencies:
     domelementtype "1"
 
-domhandler@2.3, domhandler@^2.3.0:
+domhandler@2.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
   dependencies:
     domelementtype "1"
 
+domhandler@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+  dependencies:
+    domelementtype "1"
+
 domutils@1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
   dependencies:
     domelementtype "1"
 
-domutils@1.5, domutils@1.5.1, domutils@^1.5.1:
+domutils@1.5, domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
+domutils@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
 dot-case@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-2.1.1.tgz#34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"
@@ -2287,7 +2298,7 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.16:
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.17:
   version "1.3.17"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.17.tgz#41c13457cc7166c5c15e767ae61d86a8cacdee5d"
 
@@ -2304,8 +2315,8 @@ elliptic@^6.0.0:
     minimalistic-crypto-utils "^1.0.0"
 
 emoji-regex@^6.1.0:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.4.2.tgz#a30b6fee353d406d96cfb9fa765bdc82897eff6e"
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2"
 
 emojis-list@^2.0.0:
   version "2.1.0"
@@ -2400,13 +2411,14 @@ error-stack-parser@^2.0.0:
     stackframe "^1.0.3"
 
 es-abstract@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.0.tgz#3b00385e85729932beffa9163bbea1234e932914"
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.0"
+    has "^1.0.1"
     is-callable "^1.1.3"
-    is-regex "^1.0.3"
+    is-regex "^1.0.4"
 
 es-to-primitive@^1.1.1:
   version "1.1.1"
@@ -2417,8 +2429,8 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.15"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6"
+  version "0.10.26"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.26.tgz#51b2128a531b70c4f6764093a73cbebb82186372"
   dependencies:
     es6-iterator "2"
     es6-symbol "~3.1"
@@ -2508,8 +2520,10 @@ escope@^3.6.0:
     estraverse "^4.1.1"
 
 eslint-config-airbnb-base@^11.1.0:
-  version "11.1.3"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.1.3.tgz#0e8db71514fa36b977fbcf977c01edcf863e0cf0"
+  version "11.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.3.1.tgz#c0ab108c9beed503cb999e4c60f4ef98eda0ed30"
+  dependencies:
+    eslint-restricted-globals "^0.1.1"
 
 eslint-config-airbnb@^14.1.0:
   version "14.1.0"
@@ -2517,19 +2531,18 @@ eslint-config-airbnb@^14.1.0:
   dependencies:
     eslint-config-airbnb-base "^11.1.0"
 
-eslint-import-resolver-node@^0.2.0:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c"
+eslint-import-resolver-node@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.1.tgz#4422574cde66a9a7b099938ee4d508a199e0e3cc"
   dependencies:
-    debug "^2.2.0"
-    object-assign "^4.0.1"
-    resolve "^1.1.6"
+    debug "^2.6.8"
+    resolve "^1.2.0"
 
-eslint-module-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
+eslint-module-utils@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449"
   dependencies:
-    debug "2.2.0"
+    debug "^2.6.8"
     pkg-dir "^1.0.0"
 
 eslint-plugin-html@^3.0.0:
@@ -2539,19 +2552,19 @@ eslint-plugin-html@^3.0.0:
     htmlparser2 "^3.8.2"
 
 eslint-plugin-import@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.2.0.tgz#72ba306fad305d67c4816348a4699a4229ac8b4e"
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.7.0.tgz#21de33380b9efb55f5ef6d2e210ec0e07e7fa69f"
   dependencies:
     builtin-modules "^1.1.1"
     contains-path "^0.1.0"
-    debug "^2.2.0"
+    debug "^2.6.8"
     doctrine "1.5.0"
-    eslint-import-resolver-node "^0.2.0"
-    eslint-module-utils "^2.0.0"
+    eslint-import-resolver-node "^0.3.1"
+    eslint-module-utils "^2.1.1"
     has "^1.0.1"
     lodash.cond "^4.3.0"
     minimatch "^3.0.3"
-    pkg-up "^1.0.0"
+    read-pkg-up "^2.0.0"
 
 eslint-plugin-jsx-a11y@^4.0.0:
   version "4.0.0"
@@ -2593,6 +2606,10 @@ eslint-plugin-vue@^2.1.0:
     eslint-plugin-html "^3.0.0"
     eslint-plugin-react "^7.0.0"
 
+eslint-restricted-globals@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz#35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7"
+
 eslint@^3.18.0:
   version "3.19.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
@@ -2634,17 +2651,21 @@ eslint@^3.18.0:
     user-home "^2.0.0"
 
 espree@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.0.tgz#98358625bdd055861ea27e2867ea729faf463d8d"
   dependencies:
-    acorn "^5.0.1"
+    acorn "^5.1.1"
     acorn-jsx "^3.0.0"
 
 esprima@2.7.x, esprima@^2.1.0, esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^3.1.1, esprima@~3.1.0:
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
+esprima@~3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
@@ -2655,24 +2676,20 @@ esquery@^1.0.0:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
   dependencies:
-    estraverse "~4.1.0"
+    estraverse "^4.1.0"
     object-assign "^4.0.1"
 
 estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
 
-estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
-estraverse@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
-
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -2763,15 +2780,21 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-expand-tilde@^1.2.1, expand-tilde@^1.2.2:
+expand-tilde@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
   dependencies:
     os-homedir "^1.0.1"
 
+expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
 express@^4.13.3:
-  version "4.15.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.15.2.tgz#af107fc148504457f2dca9a6f2571d7129b97b35"
+  version "4.15.4"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.15.4.tgz#032e2253489cf8fce02666beca3d11ed7a2daed1"
   dependencies:
     accepts "~1.3.3"
     array-flatten "1.1.1"
@@ -2779,32 +2802,32 @@ express@^4.13.3:
     content-type "~1.0.2"
     cookie "0.3.1"
     cookie-signature "1.0.6"
-    debug "2.6.1"
-    depd "~1.1.0"
+    debug "2.6.8"
+    depd "~1.1.1"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     etag "~1.8.0"
-    finalhandler "~1.0.0"
+    finalhandler "~1.0.4"
     fresh "0.5.0"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
     on-finished "~2.3.0"
     parseurl "~1.3.1"
     path-to-regexp "0.1.7"
-    proxy-addr "~1.1.3"
-    qs "6.4.0"
+    proxy-addr "~1.1.5"
+    qs "6.5.0"
     range-parser "~1.2.0"
-    send "0.15.1"
-    serve-static "1.12.1"
+    send "0.15.4"
+    serve-static "1.12.4"
     setprototypeof "1.0.3"
     statuses "~1.3.1"
-    type-is "~1.6.14"
+    type-is "~1.6.15"
     utils-merge "1.0.0"
-    vary "~1.1.0"
+    vary "~1.1.1"
 
 extend@^3.0.0, extend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
 external-editor@^2.0.4:
   version "2.0.4"
@@ -2838,9 +2861,9 @@ extract-zip@~1.5.0:
     mkdirp "0.5.0"
     yauzl "2.4.1"
 
-extsprintf@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+extsprintf@1.3.0, extsprintf@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
 
 fancy-log@^1.1.0:
   version "1.3.0"
@@ -2921,8 +2944,8 @@ file-save@^0.2.0:
     mkdirp "~0.5.0"
 
 filename-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
 fill-range@^2.1.0:
   version "2.2.3"
@@ -2934,11 +2957,11 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-finalhandler@1.0.1, finalhandler@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.1.tgz#bcd15d1689c0e5ed729b6f7f541a6df984117db8"
+finalhandler@1.0.4, finalhandler@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.4.tgz#18574f2e7c4b98b8ae3b230c21f201f31bdb3fb7"
   dependencies:
-    debug "2.6.3"
+    debug "2.6.8"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
@@ -2947,10 +2970,10 @@ finalhandler@1.0.1, finalhandler@~1.0.0:
     unpipe "~1.0.0"
 
 find-babel-config@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.0.1.tgz#179fa7b36bf3e94b487410855df448b6f853b9ec"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.1.0.tgz#acc01043a6749fec34429be6b64f542ebb5d6355"
   dependencies:
-    json5 "^0.5.0"
+    json5 "^0.5.1"
     path-exists "^3.0.0"
 
 find-cache-dir@^1.0.0:
@@ -2988,15 +3011,13 @@ findup-sync@^0.4.2:
     resolve-dir "^0.1.0"
 
 fined@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.0.2.tgz#5b28424b760d7598960b7ef8480dff8ad3660e97"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.0.tgz#b37dc844b76a2f5e7081e884f7c0ae344f153476"
   dependencies:
-    expand-tilde "^1.2.1"
-    lodash.assignwith "^4.0.7"
-    lodash.isempty "^4.2.1"
-    lodash.isplainobject "^4.0.4"
-    lodash.isstring "^4.0.1"
-    lodash.pick "^4.2.1"
+    expand-tilde "^2.0.2"
+    is-plain-object "^2.0.3"
+    object.defaults "^1.1.0"
+    object.pick "^1.2.0"
     parse-filepath "^1.0.1"
 
 first-chunk-stream@^1.0.0:
@@ -3030,6 +3051,12 @@ for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
+for-own@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  dependencies:
+    for-in "^1.0.1"
+
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
@@ -3103,11 +3130,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 fsevents@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
   dependencies:
     nan "^2.3.0"
-    node-pre-gyp "^0.6.29"
+    node-pre-gyp "^0.6.36"
 
 fstream-ignore@^1.0.5:
   version "1.0.5"
@@ -3190,8 +3217,8 @@ get-stream@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
 getpass@^0.1.1:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
   dependencies:
     assert-plus "^1.0.0"
 
@@ -3277,7 +3304,7 @@ glob2base@^0.0.12:
   dependencies:
     find-index "^0.1.1"
 
-glob@7.1.1, glob@^7.0.0, glob@^7.1.1:
+glob@7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
   dependencies:
@@ -3307,7 +3334,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -3342,9 +3369,16 @@ global-prefix@^0.1.4:
     is-windows "^0.2.0"
     which "^1.2.12"
 
+global@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
+  dependencies:
+    min-document "^2.19.0"
+    process "~0.5.1"
+
 globals@^9.0.0, globals@^9.14.0:
-  version "9.17.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
 globby@^5.0.0:
   version "5.0.0"
@@ -3455,8 +3489,8 @@ handle-thing@^1.2.5:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
 
 handlebars@^4.0.1, handlebars@^4.0.2:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.6.tgz#2ce4484850537f9c97a8026d5399b935c4ed4ed7"
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
   dependencies:
     async "^1.4.0"
     optimist "^0.6.1"
@@ -3528,15 +3562,22 @@ has@^1.0.1:
   dependencies:
     function-bind "^1.0.2"
 
+hash-base@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
+  dependencies:
+    inherits "^2.0.1"
+
 hash-sum@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
   dependencies:
-    inherits "^2.0.1"
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.0"
 
 hasha@~2.2.0:
   version "2.2.0"
@@ -3588,15 +3629,15 @@ home-or-tmp@^2.0.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
-homedir-polyfill@^1.0.0:
+homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -3628,17 +3669,17 @@ html-minifier@^2.1.5:
     uglify-js "2.6.x"
 
 html-minifier@^3.2.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.4.3.tgz#eb3a7297c804611f470454eeebe0aacc427e424a"
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.3.tgz#4a275e3b1a16639abb79b4c11191ff0d0fcf1ab9"
   dependencies:
     camel-case "3.0.x"
-    clean-css "4.0.x"
-    commander "2.9.x"
+    clean-css "4.1.x"
+    commander "2.11.x"
     he "1.1.x"
     ncname "1.0.x"
     param-case "2.1.x"
     relateurl "0.2.x"
-    uglify-js "~2.8.22"
+    uglify-js "3.0.x"
 
 html-webpack-plugin@^2.29.0:
   version "2.30.1"
@@ -3685,19 +3726,11 @@ http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
 
-http-errors@~1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750"
+http-errors@~1.6.1, http-errors@~1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
   dependencies:
-    inherits "2.0.3"
-    setprototypeof "1.0.2"
-    statuses ">= 1.3.1 < 2"
-
-http-errors@~1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.1.tgz#5f8b8ed98aca545656bf572997387f904a722257"
-  dependencies:
-    depd "1.1.0"
+    depd "1.1.1"
     inherits "2.0.3"
     setprototypeof "1.0.3"
     statuses ">= 1.3.1 < 2"
@@ -3738,9 +3771,9 @@ iconv-lite@^0.4.17:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
 
-icss-replace-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
+icss-replace-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
 
 icss-utils@^2.1.0:
   version "2.1.0"
@@ -3753,8 +3786,8 @@ ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
 ignore@^3.2.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.7.tgz#4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -3785,7 +3818,7 @@ inherits@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3858,9 +3891,9 @@ ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
 
-ipaddr.js@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
+ipaddr.js@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.4.0.tgz#296aca878a821816e5b85d0a285a99bcff4582f0"
 
 is-absolute-url@^2.0.0:
   version "2.1.0"
@@ -3883,7 +3916,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.0.2:
+is-buffer@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
 
@@ -3907,9 +3940,13 @@ is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
 
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
 is-dotfile@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
@@ -3976,12 +4013,18 @@ is-number@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
 
-is-number@^2.0.2, is-number@^2.1.0:
+is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -4006,6 +4049,12 @@ is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
+is-plain-object@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  dependencies:
+    isobject "^3.0.1"
+
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -4022,7 +4071,7 @@ is-property@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
 
-is-regex@^1.0.3:
+is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
   dependencies:
@@ -4089,8 +4138,8 @@ is-windows@^0.2.0:
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
 
 is-windows@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.0.tgz#c61d61020c3ebe99261b781bd3d1622395f547f8"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
 
 isarray@0.0.1:
   version "0.0.1"
@@ -4108,12 +4157,16 @@ isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
 
-isobject@^2.0.0:
+isobject@^2.0.0, isobject@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
   dependencies:
     isarray "1.0.0"
 
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+
 isparta-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isparta-loader/-/isparta-loader-2.0.0.tgz#4425f496c93f765bbceb4dd938576da307566ed1"
@@ -4157,12 +4210,6 @@ istanbul@^0.4.0:
     which "^1.1.1"
     wordwrap "^1.0.0"
 
-jodid25519@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
-  dependencies:
-    jsbn "~0.1.0"
-
 js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
@@ -4177,15 +4224,15 @@ js-beautify@^1.6.14:
     nopt "~3.0.1"
 
 js-tokens@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
 js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.6.1:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766"
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
   dependencies:
     argparse "^1.0.7"
-    esprima "^3.1.1"
+    esprima "^4.0.0"
 
 js-yaml@~3.7.0:
   version "3.7.0"
@@ -4199,8 +4246,8 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
 jschardet@^1.4.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.5.0.tgz#a61f310306a5a71188e1b1acd08add3cfbb08b1e"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.5.1.tgz#c519f629f86b3a5bedba58a88d311309eec097f9"
 
 jsdom@^7.0.2:
   version "7.2.2"
@@ -4231,8 +4278,8 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
 json-loader@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
@@ -4289,13 +4336,13 @@ jsonpointer@^4.0.0:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
 jsprim@^1.2.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
   dependencies:
     assert-plus "1.0.0"
-    extsprintf "1.0.2"
+    extsprintf "1.3.0"
     json-schema "0.2.3"
-    verror "1.3.6"
+    verror "1.10.0"
 
 jsx-ast-utils@^1.0.0, jsx-ast-utils@^1.3.4, jsx-ast-utils@^1.4.1:
   version "1.4.1"
@@ -4396,10 +4443,16 @@ kew@~0.7.0:
   resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
 
 kind-of@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
-    is-buffer "^1.0.2"
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
 
 klaw@^1.0.0:
   version "1.3.1"
@@ -4595,10 +4648,6 @@ lodash.assignin@^4.0.9:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
 
-lodash.assignwith@^4.0.7:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb"
-
 lodash.bind@^4.1.4:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
@@ -4649,10 +4698,6 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
-lodash.isempty@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
-
 lodash.isplainobject@^4.0.4:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
@@ -4797,7 +4842,11 @@ lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
-lru-cache@2, lru-cache@2.2.x:
+lru-cache@2:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+
+lru-cache@2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
 
@@ -4846,19 +4895,9 @@ markdown-it@^6.0.5:
     mdurl "~1.0.1"
     uc.micro "^1.0.1"
 
-markdown-it@^8.3.1:
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.3.1.tgz#2f4b622948ccdc193d66f3ca2d43125ac4ac7323"
-  dependencies:
-    argparse "^1.0.7"
-    entities "~1.1.1"
-    linkify-it "^2.0.0"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.3"
-
-markdown-it@^8.3.2:
+markdown-it@^8.3.1, markdown-it@^8.3.2:
   version "8.3.2"
-  resolved "http://registry.npm.qima-inc.com/markdown-it/download/markdown-it-8.3.2.tgz#df4b86530d17c3bc9beec3b68d770b92ea17ae96"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.3.2.tgz#df4b86530d17c3bc9beec3b68d770b92ea17ae96"
   dependencies:
     argparse "^1.0.7"
     entities "~1.1.1"
@@ -4867,8 +4906,8 @@ markdown-it@^8.3.2:
     uc.micro "^1.0.3"
 
 math-expression-evaluator@^1.2.14:
-  version "1.2.16"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
+  version "1.2.17"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
 mdurl@^1.0.1, mdurl@~1.0.1:
   version "1.0.1"
@@ -4939,24 +4978,34 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.27.0 < 2", mime-db@~1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
+"mime-db@>= 1.29.0 < 2", mime-db@~1.29.0:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878"
 
 mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
-  version "2.1.15"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
+  version "2.1.16"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.16.tgz#2b858a52e5ecd516db897ac2be87487830698e23"
   dependencies:
-    mime-db "~1.27.0"
+    mime-db "~1.29.0"
 
-mime@1.3.4, mime@1.3.x, mime@^1.3.4:
+mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
+mime@1.3.x, mime@^1.3.4:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+  dependencies:
+    dom-walk "^0.1.0"
+
 minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
@@ -4965,7 +5014,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -4977,12 +5026,6 @@ minimatch@^2.0.1:
   dependencies:
     brace-expansion "^1.0.0"
 
-minimatch@^3.0.0, minimatch@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
-  dependencies:
-    brace-expansion "^1.0.0"
-
 minimatch@~0.2.11:
   version "0.2.14"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
@@ -4990,7 +5033,7 @@ minimatch@~0.2.11:
     lru-cache "2"
     sigmund "~1.0.0"
 
-minimist@0.0.8, minimist@~0.0.1:
+minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -5002,6 +5045,10 @@ minimist@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
 
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
 mkdirp@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
@@ -5139,9 +5186,9 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-pre-gyp@^0.6.29:
-  version "0.6.34"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7"
+node-pre-gyp@^0.6.36:
+  version "0.6.36"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
   dependencies:
     mkdirp "^0.5.1"
     nopt "^4.0.1"
@@ -5178,15 +5225,15 @@ nopt@^4.0.1:
     osenv "^0.1.4"
 
 normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.1:
+normalize-path@^2.0.0, normalize-path@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
@@ -5239,8 +5286,8 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
 "nwmatcher@>= 1.3.7 < 2.0.0":
-  version "1.3.9"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.3.9.tgz#8bab486ff7fa3dfd086656bbe8b17116d3692d2a"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.1.tgz#7ae9b07b0ea804db7e25f05cb5fe4097d4e4949f"
 
 oauth-sign@~0.8.1:
   version "0.8.2"
@@ -5274,6 +5321,15 @@ object.assign@^4.0.1, object.assign@^4.0.4:
     function-bind "^1.1.0"
     object-keys "^1.0.10"
 
+object.defaults@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
+  dependencies:
+    array-each "^1.0.1"
+    array-slice "^1.0.0"
+    for-own "^1.0.0"
+    isobject "^3.0.0"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -5281,6 +5337,12 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
+object.pick@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.2.0.tgz#b5392bee9782da6d9fb7d6afaf539779f1234c2b"
+  dependencies:
+    isobject "^2.1.0"
+
 obuf@^1.0.0, obuf@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e"
@@ -5589,10 +5651,14 @@ pathval@^1.0.0:
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
 
 pbkdf2@^3.0.3:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.9.tgz#f2c4b25a600058b3c3773c086c37dbbee1ffe693"
+  version "3.0.13"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.13.tgz#c37d295531e786b1da3e3eadc840426accb0ae25"
   dependencies:
-    create-hmac "^1.1.2"
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
 
 pend@~1.2.0:
   version "1.2.0"
@@ -5646,12 +5712,6 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-pkg-up@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26"
-  dependencies:
-    find-up "^1.0.0"
-
 pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
@@ -5923,31 +5983,31 @@ postcss-mixins@^6.0.1:
     sugarss "^1.0.0"
 
 postcss-modules-extract-imports@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
   dependencies:
-    postcss "^5.0.4"
+    postcss "^6.0.1"
 
 postcss-modules-local-by-default@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
   dependencies:
-    css-selector-tokenizer "^0.6.0"
-    postcss "^5.0.4"
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
 
 postcss-modules-scope@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
   dependencies:
-    css-selector-tokenizer "^0.6.0"
-    postcss "^5.0.4"
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
 
 postcss-modules-values@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
   dependencies:
-    icss-replace-symbols "^1.0.2"
-    postcss "^5.0.14"
+    icss-replace-symbols "^1.1.0"
+    postcss "^6.0.1"
 
 postcss-nested@^2.0.2:
   version "2.1.0"
@@ -6128,8 +6188,8 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 pretty-error@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.0.tgz#87f4e9d706a24c87d6cbee9fabec001fcf8c75d8"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
   dependencies:
     renderkid "^2.0.1"
     utila "~0.4"
@@ -6147,8 +6207,12 @@ process-nextick-args@~1.0.6:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
 process@^0.11.0:
-  version "0.11.9"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+
+process@~0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
 
 progress-bar-webpack-plugin@^1.10.0:
   version "1.10.0"
@@ -6172,12 +6236,12 @@ proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
 
-proxy-addr@~1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3"
+proxy-addr@~1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918"
   dependencies:
     forwarded "~0.1.0"
-    ipaddr.js "1.3.0"
+    ipaddr.js "1.4.0"
 
 prr@~0.0.0:
   version "0.0.0"
@@ -6217,6 +6281,10 @@ qs@6.4.0, qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
+qs@6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.0.tgz#8d04954d364def3efc55b5a0793e1e2c8b1e6e49"
+
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
@@ -6249,15 +6317,17 @@ raf.js@0.0.4:
   resolved "https://registry.yarnpkg.com/raf.js/-/raf.js-0.0.4.tgz#f15af445d241b27fa7131a57450b67ef9c402fec"
 
 randomatic@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
   dependencies:
-    is-number "^2.0.2"
-    kind-of "^3.0.2"
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
 
 randombytes@^2.0.0, randombytes@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec"
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
+  dependencies:
+    safe-buffer "^5.1.0"
 
 range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   version "1.2.0"
@@ -6331,7 +6401,7 @@ readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@1.1, readable-stream@~1.1.9:
+readable-stream@1.1:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
   dependencies:
@@ -6340,18 +6410,27 @@ readable-stream@1.1, readable-stream@~1.1.9:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9:
-  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies:
-    buffer-shims "~1.0.0"
     core-util-is "~1.0.0"
-    inherits "~2.0.1"
+    inherits "~2.0.3"
     isarray "~1.0.0"
     process-nextick-args "~1.0.6"
-    string_decoder "~1.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
+readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -6421,8 +6500,8 @@ regenerate@^1.2.1:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
 
 regenerator-runtime@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e"
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
 
 regenerator-transform@0.9.11:
   version "0.9.11"
@@ -6470,8 +6549,8 @@ relateurl@0.2.x:
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
 
 remove-trailing-separator@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz#69b062d978727ad14dc6b56ba4ab772fd8d70511"
 
 renderkid@^2.0.1:
   version "2.0.1"
@@ -6602,8 +6681,8 @@ resolve@1.1.x:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
 resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
   dependencies:
     path-parse "^1.0.5"
 
@@ -6637,9 +6716,12 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.
   dependencies:
     glob "^7.0.5"
 
-ripemd160@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
+  dependencies:
+    hash-base "^2.0.0"
+    inherits "^2.0.1"
 
 run-async@^0.1.0:
   version "0.1.0"
@@ -6674,17 +6756,17 @@ rx-lite@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
 
-safe-buffer@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
+safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
 samsam@1.x, samsam@^1.1.3:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
 
 sax@^1.1.4, sax@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
 schema-utils@^0.3.0:
   version "0.3.0"
@@ -6703,27 +6785,27 @@ selfsigned@^1.9.1:
     node-forge "0.6.33"
 
 "semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.1.0, semver@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
 semver@^4.1.0, semver@~4.3.3:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
 
-send@0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.15.1.tgz#8a02354c26e6f5cca700065f5f0cdeba90ec7b5f"
+send@0.15.4:
+  version "0.15.4"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.15.4.tgz#985faa3e284b0273c793364a35c6737bd93905b9"
   dependencies:
-    debug "2.6.1"
-    depd "~1.1.0"
+    debug "2.6.8"
+    depd "~1.1.1"
     destroy "~1.0.4"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     etag "~1.8.0"
     fresh "0.5.0"
-    http-errors "~1.6.1"
+    http-errors "~1.6.2"
     mime "1.3.4"
-    ms "0.7.2"
+    ms "2.0.0"
     on-finished "~2.3.0"
     range-parser "~1.2.0"
     statuses "~1.3.1"
@@ -6740,25 +6822,25 @@ sequencify@~0.0.7:
   resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
 
 serve-index@^1.7.2:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.8.0.tgz#7c5d96c13fb131101f93c1c5774f8516a1e78d3b"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.0.tgz#d2b280fc560d616ee81b48bf0fa82abed2485ce7"
   dependencies:
     accepts "~1.3.3"
-    batch "0.5.3"
-    debug "~2.2.0"
+    batch "0.6.1"
+    debug "2.6.8"
     escape-html "~1.0.3"
-    http-errors "~1.5.0"
-    mime-types "~2.1.11"
+    http-errors "~1.6.1"
+    mime-types "~2.1.15"
     parseurl "~1.3.1"
 
-serve-static@1.12.1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.1.tgz#7443a965e3ced647aceb5639fa06bf4d1bbe0039"
+serve-static@1.12.4:
+  version "1.12.4"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.4.tgz#9b6aa98eeb7253c4eedc4c1f6fdbca609901a961"
   dependencies:
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     parseurl "~1.3.1"
-    send "0.15.1"
+    send "0.15.4"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
@@ -6772,15 +6854,11 @@ setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
 
-setprototypeof@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08"
-
 setprototypeof@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
 
-sha.js@^2.3.6:
+sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.8"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
   dependencies:
@@ -6797,8 +6875,8 @@ shebang-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
 shelljs@^0.7.5:
-  version "0.7.7"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
+  version "0.7.8"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -6936,8 +7014,8 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
 source-map-support@^0.4.2:
-  version "0.4.14"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef"
+  version "0.4.15"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
   dependencies:
     source-map "^0.5.6"
 
@@ -7021,8 +7099,8 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
 sshpk@^1.7.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -7031,7 +7109,6 @@ sshpk@^1.7.0:
   optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
     ecc-jsbn "~0.1.1"
-    jodid25519 "^1.0.0"
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
@@ -7055,8 +7132,8 @@ stream-consume@~0.1.0:
   resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
 
 stream-http@^2.3.1:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -7093,11 +7170,11 @@ string_decoder@^0.10.25, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
+string_decoder@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:
-    buffer-shims "~1.0.0"
+    safe-buffer "~5.1.0"
 
 stringstream@~0.0.4:
   version "0.0.5"
@@ -7173,7 +7250,7 @@ sugarss@^1.0.0:
   dependencies:
     postcss "^6.0.0"
 
-supports-color@3.1.2, supports-color@^3.1.1:
+supports-color@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
@@ -7183,7 +7260,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.2.3:
+supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -7325,17 +7402,18 @@ tildify@^1.0.0:
     os-homedir "^1.0.0"
 
 time-stamp@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
 
 time-stamp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
 
 timers-browserify@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.3.tgz#41fd0bdc926a5feedc33a17a8e1f7d491925f7fc"
   dependencies:
+    global "^4.3.2"
     setimmediate "^1.0.4"
 
 title-case@^2.1.0:
@@ -7360,8 +7438,8 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
 to-fast-properties@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
 toposort@^1.0.0:
   version "1.0.3"
@@ -7425,7 +7503,7 @@ type-detect@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea"
 
-type-is@~1.6.14:
+type-is@~1.6.15:
   version "1.6.15"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
   dependencies:
@@ -7449,6 +7527,13 @@ uglify-js@2.6.x:
     uglify-to-browserify "~1.0.0"
     yargs "~3.10.0"
 
+uglify-js@3.0.x:
+  version "3.0.27"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.27.tgz#a97db8c8ba6b9dba4e2f88d86aa9548fa6320034"
+  dependencies:
+    commander "~2.11.0"
+    source-map "~0.5.1"
+
 uglify-js@^2.6, uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
@@ -7458,15 +7543,6 @@ uglify-js@^2.6, uglify-js@^2.8.29:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
-uglify-js@~2.8.22:
-  version "2.8.22"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0"
-  dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
-
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
@@ -7580,8 +7656,8 @@ user-home@^2.0.0:
     os-homedir "^1.0.0"
 
 useragent@^2.1.12:
-  version "2.1.13"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.13.tgz#bba43e8aa24d5ceb83c2937473e102e21df74c10"
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
   dependencies:
     lru-cache "2.2.x"
     tmp "0.0.x"
@@ -7613,8 +7689,8 @@ uuid@^2.0.1, uuid@^2.0.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
 uuid@^3.0.0, uuid@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
 v8flags@^2.0.10, v8flags@^2.0.2:
   version "2.1.1"
@@ -7629,7 +7705,7 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-vary@~1.1.0:
+vary@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
 
@@ -7637,11 +7713,13 @@ vendors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
 
-verror@1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
   dependencies:
-    extsprintf "1.0.2"
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
 
 vinyl-fs@^0.3.0:
   version "0.3.14"
@@ -7705,7 +7783,7 @@ vue-lazyload@^1.0.6:
 
 vue-loader@^13.0.4:
   version "13.0.4"
-  resolved "http://registry.npm.qima-inc.com/vue-loader/download/vue-loader-13.0.4.tgz#0a6d893698735fcf7037b20a23d724cb39eee7d4"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-13.0.4.tgz#0a6d893698735fcf7037b20a23d724cb39eee7d4"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
@@ -7780,16 +7858,7 @@ webidl-conversions@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
 
-webpack-dev-middleware@^1.0.11:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893"
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^1.3.4"
-    path-is-absolute "^1.0.0"
-    range-parser "^1.0.3"
-
-webpack-dev-middleware@^1.11.0:
+webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.11.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709"
   dependencies:
@@ -7801,7 +7870,7 @@ webpack-dev-middleware@^1.11.0:
 
 webpack-dev-server@^2.7.1:
   version "2.7.1"
-  resolved "http://registry.npm.qima-inc.com/webpack-dev-server/download/webpack-dev-server-2.7.1.tgz#21580f5a08cd065c71144cf6f61c345bca59a8b8"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.7.1.tgz#21580f5a08cd065c71144cf6f61c345bca59a8b8"
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -7842,7 +7911,7 @@ webpack-sources@^1.0.1:
 
 webpack@^3.5.1:
   version "3.5.1"
-  resolved "http://registry.npm.qima-inc.com/webpack/download/webpack-3.5.1.tgz#b749ee3d2b5a118dad53e8e41585b3f71e75499a"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.1.tgz#b749ee3d2b5a118dad53e8e41585b3f71e75499a"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
@@ -7895,17 +7964,23 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.0.9, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.9, which@~1.2.10:
+which@^1.0.9, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.9:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  dependencies:
+    isexe "^2.0.0"
+
+which@~1.2.10:
   version "1.2.14"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
   dependencies:
-    string-width "^1.0.1"
+    string-width "^1.0.2"
 
 window-size@0.1.0:
   version "0.1.0"
@@ -8068,9 +8143,9 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-zan-doc@0.1.10:
-  version "0.1.10"
-  resolved "http://registry.npm.qima-inc.com/zan-doc/download/zan-doc-0.1.10.tgz#4a8b06d851315c2cd4092c9d770024c7a61b8099"
+zan-doc@0.1.11:
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.1.11.tgz#cc51ec5e6789930abafcc1648624d6002e7a4c9b"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"

From 6fda3568dad7f1bbb04892afb66d080ff607cdc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 9 Aug 2017 19:12:56 +0800
Subject: [PATCH 014/126] clean unnecessary docs

---
 build/webpack.config.dev.js            |   2 +-
 docs/assets/docs.css                   | 206 -------------------------
 docs/examples-docs/actionsheet.md      |  40 -----
 docs/examples-docs/badge.md            |  33 ----
 docs/examples-docs/button.md           |  31 ----
 docs/examples-docs/card.md             |  31 ----
 docs/examples-docs/cell-swipe.md       |  30 ----
 docs/examples-docs/cell.md             |  33 ----
 docs/examples-docs/checkbox.md         |  33 ----
 docs/examples-docs/datetime-picker.md  |  30 ----
 docs/examples-docs/dialog.md           |   8 -
 docs/examples-docs/field.md            |  31 ----
 docs/examples-docs/icon.md             |  31 ----
 docs/examples-docs/image-preview.md    |   8 -
 docs/examples-docs/layout.md           |  35 -----
 docs/examples-docs/loading.md          |  31 ----
 docs/examples-docs/panel.md            |  31 ----
 docs/examples-docs/picker.md           |  31 ----
 docs/examples-docs/popup.md            |  39 -----
 docs/examples-docs/progress.md         |  31 ----
 docs/examples-docs/quantity.md         |  31 ----
 docs/examples-docs/quickstart.md       |  47 +++---
 docs/examples-docs/radio.md            |  32 ----
 docs/examples-docs/search.md           |  31 ----
 docs/examples-docs/steps.md            |  33 ----
 docs/examples-docs/swipe.md            |  33 ----
 docs/examples-docs/switch.md           |  31 ----
 docs/examples-docs/tab.md              |  33 ----
 docs/examples-docs/tag.md              |  31 ----
 docs/examples-docs/uploader.md         |  31 ----
 docs/src/components/example-block.vue  |  14 --
 docs/src/components/mobile-computed.js |  19 ---
 docs/src/components/mobile-popup.vue   |  51 ------
 docs/src/index.js                      |   2 -
 package.json                           |   2 +-
 packages/actionsheet/README.md         |  26 ----
 packages/badge/README.md               |  26 ----
 packages/button/README.md              |  26 ----
 packages/card/README.md                |  26 ----
 packages/cell/README.md                |  26 ----
 packages/checkbox/README.md            |  26 ----
 packages/col/README.md                 |  26 ----
 packages/datetime-picker/README.md     |  26 ----
 packages/dialog/README.md              |  26 ----
 packages/field/README.md               |  26 ----
 packages/icon/README.md                |  26 ----
 packages/image-preview/README.md       |  26 ----
 packages/lazyload/README.md            |  26 ----
 packages/loading/README.md             |  26 ----
 packages/panel/README.md               |  26 ----
 packages/picker/README.md              |  26 ----
 packages/popup/README.md               |  26 ----
 packages/progress/README.md            |  26 ----
 packages/quantity/README.md            |  26 ----
 packages/radio/README.md               |  26 ----
 packages/row/README.md                 |  26 ----
 packages/search/README.md              |  26 ----
 packages/steps/README.md               |  26 ----
 packages/swipe/README.md               |  26 ----
 packages/switch/README.md              |  26 ----
 packages/tab/README.md                 |  26 ----
 packages/tag/README.md                 |  26 ----
 packages/toast/README.md               |  26 ----
 packages/waterfall/README.md           |  26 ----
 yarn.lock                              |   6 +-
 65 files changed, 34 insertions(+), 1892 deletions(-)
 delete mode 100644 docs/assets/docs.css
 delete mode 100644 docs/src/components/example-block.vue
 delete mode 100644 docs/src/components/mobile-computed.js
 delete mode 100644 docs/src/components/mobile-popup.vue

diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js
index 87105c112..89ae7be1f 100644
--- a/build/webpack.config.dev.js
+++ b/build/webpack.config.dev.js
@@ -37,7 +37,7 @@ module.exports = {
     modules: [path.join(__dirname, '../node_modules'), 'node_modules'],
     extensions: ['.js', '.vue', '.css'],
     alias: {
-      vue: 'vue/dist/vue.esm.js',
+      vue: 'vue/dist/vue.runtime.esm.js',
       src: path.join(__dirname, '../src'),
       packages: path.join(__dirname, '../packages'),
       lib: path.join(__dirname, '../lib'),
diff --git a/docs/assets/docs.css b/docs/assets/docs.css
deleted file mode 100644
index bbcf5edb1..000000000
--- a/docs/assets/docs.css
+++ /dev/null
@@ -1,206 +0,0 @@
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  vertical-align: baseline;
-}
-
-body {
-  font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;
-  font-weight: 400;
-  -webkit-font-smoothing: antialiased;
-  background-color: #f8f8f8;
-}
-
-a {
-  color: #4078c0;
-  text-decoration: none;
-}
-
-button, input, select, textarea {
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
-  color: inherit;
-}
-
-ul, ol {
-  list-style: none;
-}
-
-code.hljs {
-  line-height: 1.5;
-  font-family: Menlo, Monaco, Consolas, Courier, monospace;
-  font-size: 12px;
-  padding: 20px;
-  background-color: #f8f8f8;
-  border: solid 1px #E5E5E5;
-  margin-bottom: 25px;
-  border-radius: 4px;
-  -webkit-font-smoothing: auto;
-}
-
-.clearfix {
-  &::before {
-    display: table;
-    content: "";
-  }
-
-  &::after {
-    display: table;
-    content: "";
-    clear: both;
-  }
-}
-
-.main-content {
-  margin: 130px 20px 40px;
-  padding-top: 20px;
-}
-
-.page-container {
-  background-color: #fff;
-  position: relative;
-  display: flex;
-  width: 100%;
-  overflow: hidden;
-}
-
-.page-content {
-  box-sizing: border-box;
-  flex: 1;
-
-  section {
-    padding: 0 40px;
-
-    > h1,
-    > h2,
-    > h3,
-    > h4,
-    > h5,
-    > h6 {
-      color: #333;
-      line-height: 1.5;
-      margin: 20px 0;
-      font-weight: normal;
-
-      .header-anchor {
-        float: left;
-        margin-left: -20px;
-        opacity: 0;
-        cursor: pointer;
-
-        &:hover {
-          opacity: .4;
-        }
-      }
-    }
-
-    > h1 {
-      font-size: 40px;
-    }
-
-    > h2 {
-      font-size: 36px;
-    }
-
-    > h3 {
-      font-size: 30px;
-    }
-
-    > h4 {
-      font-size: 24px;
-    }
-
-    > h5 {
-      font-size: 14px
-    }
-
-    > h6 {
-      font-size: 14px;
-      color: #666;
-    }
-
-    > p {
-      font-size: 14px;
-      line-height: 20px;
-      color: #666;
-      margin: 14px 0;
-    }
-
-    > ul li,
-    > ol li {
-      color: #666;
-      font-size: 14px;
-      line-height: 20px;
-      margin: 10px 0 10px 20px;
-      padding-left: 20px;
-      position: relative;
-
-      &::before {
-        content: '';
-        position: absolute;
-        width: 8px;
-        height: 8px;
-        box-sizing: border-box;
-        border: 2px solid #999;
-        border-radius: 50%;
-        top: 6px;
-        left: 0;
-      }
-
-      li {
-        margin-left: 0;
-      }
-    }
-  }
-
-  p > code,
-  .table code,
-  li > code {
-    background-color: #F2F2F2;
-    display: inline-block;
-    border: 1px solid #E5E5E5;
-    padding: 2px 4px;
-    color: #333;
-    margin: 0 3px;
-  }
-}
-
-.table {
-  border-collapse: collapse;
-  width: 100%;
-  background-color: #fff;
-  color: #333;
-  font-size: 14px;
-  margin-bottom: 45px;
-
-  th {
-    text-align: left;
-    border: 1px solid #E5E5E5;
-    background-color: #F2F2F2;
-    padding: 10px;
-
-    &:first-child {
-      padding-left: 10px;
-    }
-  }
-
-  td {
-    border: 1px solid #E5E5E5;
-    padding: 10px;
-  }
-}
diff --git a/docs/examples-docs/actionsheet.md b/docs/examples-docs/actionsheet.md
index 92a645069..bb7a56f26 100644
--- a/docs/examples-docs/actionsheet.md
+++ b/docs/examples-docs/actionsheet.md
@@ -15,11 +15,7 @@
 </style>
 
 <script>
-import MobileComputed from 'components/mobile-computed';
-
 export default {
-  mixins: [MobileComputed],
-
   data() {
     return {
       show1: false,
@@ -59,37 +55,6 @@ export default {
 
 ## ActionSheet 行动按钮
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`ActionSheet`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`ActionSheet`组件了：
-
-```js
-import Vue from 'vue';
-import { ActionSheet } from 'vant';
-import 'vant/lib/vant-css/actionSheet.css';
-
-Vue.component(ActionSheet.name, ActionSheet);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`ActionSheet`组件，这样只能在你注册的组件中使用`ActionSheet`：
-
-```js
-import { ActionSheet } from 'vant';
-import 'vant/lib/vant-css/actionSheet.css';
-
-export default {
-  components: {
-    'van-actionSheet': ActionSheet
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
@@ -197,11 +162,6 @@ export default {
 ```
 :::
 
-点击以下按钮查看手机端效果：
-
-<van-button @click="mobileShow = true">点击查看手机端效果</van-button>
-<mobile-popup v-model="mobileShow" :url="mobileUrl"></mobile-popup>
-
 ### API
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
diff --git a/docs/examples-docs/badge.md b/docs/examples-docs/badge.md
index c325671a3..d8cec30bc 100644
--- a/docs/examples-docs/badge.md
+++ b/docs/examples-docs/badge.md
@@ -28,39 +28,6 @@
 
 ## Badge 徽章
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Badge`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Badge`组件了：
-
-```js
-import Vue from 'vue';
-import { Badge, BadgeGroup } from 'vant';
-import 'vant/lib/vant-css/badge.css';
-
-Vue.component(Badge.name, Badge);
-Vue.component(BadgeGroup.name, BadgeGroup);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Badge`组件，这样只能在你注册的组件中使用`Badge`：
-
-```js
-import { Badge, BadgeGroup } from 'vant';
-import 'vant/lib/vant-css/badge.css';
-
-export default {
-  components: {
-    'van-badge': Badge,
-    'van-badge-group': BadgeGroup
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/button.md b/docs/examples-docs/button.md
index 86399691d..fc4f506b5 100644
--- a/docs/examples-docs/button.md
+++ b/docs/examples-docs/button.md
@@ -20,37 +20,6 @@
 
 ## Button 按钮
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Button`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Button`组件了：
-
-```js
-import Vue from 'vue';
-import { Button } from 'vant';
-import 'vant/lib/vant-css/button.css';
-
-Vue.component(Button.name, Button);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Button`组件，这样只能在你注册的组件中使用`Button`：
-
-```js
-import { Button } from 'vant';
-import 'vant/lib/vant-css/button.css';
-
-export default {
-  components: {
-    'van-button': Button
-  }
-};
-```
-
 ### 代码演示
 
 #### 按钮功能
diff --git a/docs/examples-docs/card.md b/docs/examples-docs/card.md
index 74d652d65..79d1704db 100644
--- a/docs/examples-docs/card.md
+++ b/docs/examples-docs/card.md
@@ -1,36 +1,5 @@
 ## Card 图文组件
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Card`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Card`组件了：
-
-```js
-import Vue from 'vue';
-import { Card } from 'vant';
-import 'vant/lib/vant-css/card.css';
-
-Vue.component(Card.name, Card);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Card`组件，这样只能在你注册的组件中使用`Card`：
-
-```js
-import { Card } from 'vant';
-import 'vant/lib/vant-css/card.css';
-
-export default {
-  components: {
-    'van-card': Card
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/cell-swipe.md b/docs/examples-docs/cell-swipe.md
index beafe0aa2..4be8e7d11 100644
--- a/docs/examples-docs/cell-swipe.md
+++ b/docs/examples-docs/cell-swipe.md
@@ -22,36 +22,6 @@
 </style>
 ## CellSwipe 滑动单元格
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Cell Swipe`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Cell Swipe`组件了：
-
-```js
-import Vue from 'vue';
-import { CellSwipe } from 'vant';
-import 'vant/lib/vant-css/cell-swipe.css';
-
-Vue.component(CellSwipe.name, CellSwipe);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Cell Swipe`组件，这样只能在你注册的组件中使用`Cell Swipe`：
-
-```js
-import { CellSwipe } from 'vant';
-
-export default {
-  components: {
-    'van-cell-swipe': CellSwipe
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/cell.md b/docs/examples-docs/cell.md
index b9d9beed0..f3c9c3ffc 100644
--- a/docs/examples-docs/cell.md
+++ b/docs/examples-docs/cell.md
@@ -10,39 +10,6 @@ export default {
 
 ## Cell 单元格
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Cell`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Cell`组件了：
-
-```js
-import Vue from 'vue';
-import { Cell, CellGroup } from 'vant';
-import 'vant/lib/vant-css/cell.css';
-
-Vue.component(CellGroup.name, CellGroup);
-Vue.component(Cell.name, Cell);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Cell`组件，这样只能在你注册的组件中使用`Cell`：
-
-```js
-import { Cell } from 'vant';
-import 'vant/lib/vant-css/cell.css';
-
-export default {
-  components: {
-    'van-cell-group': CellGroup,
-    'van-cell': Cell
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/checkbox.md b/docs/examples-docs/checkbox.md
index a45ecf16d..eb7770e30 100644
--- a/docs/examples-docs/checkbox.md
+++ b/docs/examples-docs/checkbox.md
@@ -35,39 +35,6 @@ export default {
 
 ## Checkbox 复选框
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Checkbox`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Checkbox`组件了：
-
-```js
-import Vue from 'vue';
-import { Checkbox, CheckboxGroup } from 'vant';
-import 'vant/lib/vant-css/checkbox.css';
-
-Vue.component(Checkbox.name, Checkbox);
-Vue.component(CheckboxGroup.name, CheckboxGroup);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Checkbox`组件，这样只能在你注册的组件中使用`Checkbox`：
-
-```js
-import { Checkbox, CheckboxGroup } from 'vant';
-import 'vant/lib/vant-css/checkbox.css';
-
-export default {
-  components: {
-    'van-checkbox': Checkbox,
-    'van-checkbox-group': CheckboxGroup
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/datetime-picker.md b/docs/examples-docs/datetime-picker.md
index e3d33c552..1d90f56c3 100644
--- a/docs/examples-docs/datetime-picker.md
+++ b/docs/examples-docs/datetime-picker.md
@@ -27,36 +27,6 @@ export default {
 
 ## Datetime Picker 时间选择
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Radio`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Radio`组件了：
-
-```js
-import Vue from 'vue';
-import { DatetimePicker } from 'vant';
-
-Vue.component(DatetimePicker.name, DatetimePicker);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`DatetimePicker`组件，这样只能在你注册的组件中使用`DatetimePicker`：
-
-```js
-import { DatetimePicker } from 'vant';
-
-export default {
-  components: {
-    'van-datetime-picker': DatetimePicker
-  }
-};
-```
-
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/dialog.md b/docs/examples-docs/dialog.md
index 1faa20519..8fbcca762 100644
--- a/docs/examples-docs/dialog.md
+++ b/docs/examples-docs/dialog.md
@@ -8,11 +8,8 @@
 
 <script>
 import { Dialog } from 'src/index';
-import MobileComputed from 'components/mobile-computed';
 
 export default {
-  mixins: [MobileComputed],
-
   methods: {
     handleAlertClick() {
       Dialog.alert({
@@ -118,11 +115,6 @@ export default {
 ```
 :::
 
-点击以下按钮查看手机端效果：
-
-<van-button @click="mobileShow = true">点击查看手机端效果</van-button>
-<mobile-popup v-model="mobileShow" :url="mobileUrl"></mobile-popup>
-
 ### 方法
 
 #### Dialog.alert(options)
diff --git a/docs/examples-docs/field.md b/docs/examples-docs/field.md
index a48bb9618..560722d85 100644
--- a/docs/examples-docs/field.md
+++ b/docs/examples-docs/field.md
@@ -29,37 +29,6 @@ export default {
 
 表单中`input`或`textarea`的输入框。
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Field`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Field`组件了：
-
-```js
-import Vue from 'vue';
-import { Field } from 'vant';
-import 'vant/lib/vant-css/field.css';
-
-Vue.component(Field.name, Field);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Field`组件，这样只能在你注册的组件中使用`Field`：
-
-```js
-import { Field } from 'vant';
-import 'vant/lib/vant-css/field.css';
-
-export default {
-  components: {
-    'van-field': Field
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/icon.md b/docs/examples-docs/icon.md
index a3bb72d84..29c333e71 100644
--- a/docs/examples-docs/icon.md
+++ b/docs/examples-docs/icon.md
@@ -19,37 +19,6 @@
 
 ## Icon 图标
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Icon`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Icon`组件了：
-
-```js
-import Vue from 'vue';
-import { Icon } from 'vant';
-import 'vant/lib/vant-css/icon.css';
-
-Vue.component(Icon.name, Icon);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Icon`组件，这样只能在你注册的组件中使用`Icon`：
-
-```js
-import { Icon } from 'vant';
-import 'vant/lib/vant-css/icon.css';
-
-export default {
-  components: {
-    'van-icon': Icon
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/image-preview.md b/docs/examples-docs/image-preview.md
index 55bb07f72..010136045 100644
--- a/docs/examples-docs/image-preview.md
+++ b/docs/examples-docs/image-preview.md
@@ -8,11 +8,8 @@
 
 <script>
 import { ImagePreview } from 'src/index';
-import MobileComputed from 'components/mobile-computed';
 
 export default {
-  mixins: [MobileComputed],
-
   methods: {
     handleImagePreview() {
       ImagePreview([
@@ -60,11 +57,6 @@ export default {
 ```
 :::
 
-点击以下按钮查看手机端效果：
-
-<van-button @click="mobileShow = true">点击查看手机端效果</van-button>
-<mobile-popup v-model="mobileShow" :url="mobileUrl"></mobile-popup>
-
 ### 方法参数
 
 | 参数名       | 说明      | 类型 |
diff --git a/docs/examples-docs/layout.md b/docs/examples-docs/layout.md
index 179abbe79..846437c7c 100644
--- a/docs/examples-docs/layout.md
+++ b/docs/examples-docs/layout.md
@@ -30,41 +30,6 @@
 
 主要提供了`van-row`和`van-col`两个组件来进行行列布局。
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Row`和`Col`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Row`和`Col`组件了：
-
-```js
-import Vue from 'vue';
-import { Row, Col } from 'vant';
-import 'vant/lib/vant-css/col.css';
-import 'vant/lib/vant-css/row.css';
-
-Vue.component(Row.name, Row);
-Vue.component(Col.name, Col);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Row`和`Col`组件，这样只能在你注册的组件中使用`Row`和`Col`：
-
-```js
-import { Row, Col } from 'vant';
-import 'vant/lib/vant-css/col.css';
-import 'vant/lib/vant-css/row.css';
-
-export default {
-  components: {
-    'van-row': Row,
-    'van-col': Col
-  }
-};
-```
-
 ### 代码演示
 
 #### 常规用法
diff --git a/docs/examples-docs/loading.md b/docs/examples-docs/loading.md
index e62e21f8f..4290c9564 100644
--- a/docs/examples-docs/loading.md
+++ b/docs/examples-docs/loading.md
@@ -20,37 +20,6 @@
 
 ## Loading 加载
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Loading`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Loading`组件了：
-
-```js
-import Vue from 'vue';
-import { Loading } from 'vant';
-import 'vant/lib/vant-css/loading.css';
-
-Vue.component(Loading.name, Loading);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Loading`组件，这样只能在你注册的组件中使用`Loading`：
-
-```js
-import { Loading } from 'vant';
-import 'vant/lib/vant-css/loading.css';
-
-export default {
-  components: {
-    'van-loading': Loading
-  }
-};
-```
-
 ### 代码演示
 
 #### 渐变深色spinner
diff --git a/docs/examples-docs/panel.md b/docs/examples-docs/panel.md
index 5d2f870a5..bf5c6530a 100644
--- a/docs/examples-docs/panel.md
+++ b/docs/examples-docs/panel.md
@@ -29,37 +29,6 @@
 
 ## Panel 面板
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Panel`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Panel`组件了：
-
-```js
-import Vue from 'vue';
-import { Panel } from 'vant';
-import 'vant/lib/vant-css/panel.css';
-
-Vue.component(Panel.name, Panel);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Panel`组件，这样只能在你注册的组件中使用`Panel`：
-
-```js
-import { Panel } from 'vant';
-import 'vant/lib/vant-css/panel.css';
-
-export default {
-  components: {
-    'van-panel': Panel
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/picker.md b/docs/examples-docs/picker.md
index d44577c17..8dc626267 100644
--- a/docs/examples-docs/picker.md
+++ b/docs/examples-docs/picker.md
@@ -38,37 +38,6 @@ export default {
 
 ## Picker 选择器
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Picker`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Picker`组件了：
-
-```js
-import Vue from 'vue';
-import { Picker } from 'vant';
-import 'vant/lib/vant-css/picker.css';
-
-Vue.component(Picker.name, Picker);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Picker`组件，这样只能在你注册的组件中使用`Picker`：
-
-```js
-import { Picker } from 'vant';
-import 'vant/lib/vant-css/picker.css';
-
-export default {
-  components: {
-    'van-picker': Picker
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/popup.md b/docs/examples-docs/popup.md
index dd582573b..d3d3b32ac 100644
--- a/docs/examples-docs/popup.md
+++ b/docs/examples-docs/popup.md
@@ -35,12 +35,9 @@
 </style>
 
 <script>
-import MobileComputed from 'components/mobile-computed';
 import Dialog from 'packages/dialog';
 
 export default {
-  mixins: [MobileComputed],
-
   data() {
     return {
       popupShow1: false,
@@ -78,37 +75,6 @@ export default {
 
 ## Popup 弹出菜单
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Popup`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Popup`组件了：
-
-```js
-import Vue from 'vue';
-import { Popup } from 'vant';
-import 'vant/lib/vant-css/popup.css';
-
-Vue.component(Popup.name, Popup);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Popup`组件，这样只能在你注册的组件中使用`Popup`：
-
-```js
-import { Popup } from 'vant';
-import 'vant/lib/vant-css/popup.css';
-
-export default {
-  components: {
-    'van-popup': Popup
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
@@ -186,11 +152,6 @@ export default {
 ```
 :::
 
-点击以下按钮查看手机端效果：
-
-<van-button @click="mobileShow = true">点击查看手机端效果</van-button>
-<mobile-popup v-model="mobileShow" :url="mobileUrl"></mobile-popup>
-
 ### API
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
diff --git a/docs/examples-docs/progress.md b/docs/examples-docs/progress.md
index f2287f31d..57c93c052 100644
--- a/docs/examples-docs/progress.md
+++ b/docs/examples-docs/progress.md
@@ -10,37 +10,6 @@
 
 ## Progress 进度条
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Progress`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Progress`组件了：
-
-```js
-import Vue from 'vue';
-import { Progress } from 'vant';
-import 'vant/lib/vant-css/progress.css';
-
-Vue.component(Progress.name, Progress);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Progress`组件，这样只能在你注册的组件中使用`Progress`：
-
-```js
-import { Progress } from 'vant';
-import 'vant/lib/vant-css/progress.css';
-
-export default {
-  components: {
-    'van-progress': Progress
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/quantity.md b/docs/examples-docs/quantity.md
index 0f0191a3a..f00c49264 100644
--- a/docs/examples-docs/quantity.md
+++ b/docs/examples-docs/quantity.md
@@ -23,37 +23,6 @@ export default {
 
 ## Quantity 数量选择
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Quantity`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Quantity`组件了：
-
-```js
-import Vue from 'vue';
-import { Quantity } from 'vant';
-import 'vant/lib/vant-css/quantity.css';
-
-Vue.component(Quantity.name, Quantity);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Quantity`组件，这样只能在你注册的组件中使用`Quantity`：
-
-```js
-import { Quantity } from 'vant';
-import 'vant/lib/vant-css/quantity.css';
-
-export default {
-  components: {
-    'van-quantity': Quantity
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/quickstart.md b/docs/examples-docs/quickstart.md
index b69b15462..a8d2fd815 100644
--- a/docs/examples-docs/quickstart.md
+++ b/docs/examples-docs/quickstart.md
@@ -2,8 +2,6 @@
 
 一套基于`Vue.js 2.0`的 Mobile 组件库
 
-[查看业务组件库 Captain-UI](/zanui/captain/component/quickstart)
-
 ### 安装
 
 ```shell
@@ -12,26 +10,39 @@ npm i vant -S
 
 ### 引入组件
 
-#### 完整引入
+#### 使用 [babel-plugin-import](https://github.com/ant-design/babel-plugin-import) (推荐)
 
+   ```js
+   // .babelrc or babel-loader option
+   {
+     "plugins": [
+       ["import", { "libraryName": "vant", "style": true }]
+     ]
+   }
+   ```
+   
+   接着你可以直接引入 vant 组件，等价于下方的按需引入组件
+
+   ```js
+   // 模块化地引入 js 和 css, 通过 babel-plugin-import 插件解析
+   import { Button } from 'vant';
+   ```
+
+#### 按需引入组件
+
+   ```jsx
+   import { Button } from 'vant/lib/button';
+   import 'vant/lib/vant-css/button.css';
+   ```
+ 
+#### 导入所有组件
+ 
 ```javascript
 import Vue from 'vue';
-import ZanUI from 'vant';
+import vant from 'vant';
 import 'vant/lib/vant-css/index.css';
 
-Vue.use(ZanUI);
-```
-
-#### 按需引入
-
-```javascript
-import Vue from 'vue';
-import { Button, Cell } from 'vant';
-import 'vant/lib/vant-css/button.css';
-import 'vant/lib/vant-css/cell.css';
-
-Vue.component(Button.name, Button);
-Vue.component(Cell.name, Cell);
+Vue.use(vant);
 ```
 
 ### 自定义主题
@@ -42,7 +53,7 @@ Vue.component(Cell.name, Cell);
 
 可以通过Github或npm来下载主题：
 
-```shell
+```bash
 # npm
 npm i vant-css -D
 
diff --git a/docs/examples-docs/radio.md b/docs/examples-docs/radio.md
index f42b7c977..03a1b2522 100644
--- a/docs/examples-docs/radio.md
+++ b/docs/examples-docs/radio.md
@@ -25,38 +25,6 @@ export default {
 
 ## Radio 单选框
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Radio`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Radio`组件了：
-
-```js
-import Vue from 'vue';
-import { Radio, RadioGroup } from 'vant';
-import 'vant/lib/vant-css/radio.css';
-
-Vue.component(Radio.name, Radio);
-Vue.component(RadioGroup.name, RadioGroup);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Radio`组件，这样只能在你注册的组件中使用`Radio`：
-
-```js
-import { Radio, RadioGroup } from 'vant';
-import 'vant/lib/vant-css/radio.css';
-
-export default {
-  components: {
-    'van-radio': Radio,
-    'van-radio-group': RadioGroup
-  }
-};
-```
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/search.md b/docs/examples-docs/search.md
index 241312784..acc8f62ff 100644
--- a/docs/examples-docs/search.md
+++ b/docs/examples-docs/search.md
@@ -16,37 +16,6 @@ export default {
 
 ## Search 搜索
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Search`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Search`组件了：
-
-```js
-import Vue from 'vue';
-import { Search } from 'vant';
-import 'vant/lib/vant-css/search.css';
-
-Vue.component(Search.name, Search);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Search`组件，这样只能在你注册的组件中使用`Search`：
-
-```js
-import { Search } from 'vant';
-import 'vant/lib/vant-css/search.css';
-
-export default {
-  components: {
-    'van-search': Search
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/steps.md b/docs/examples-docs/steps.md
index 01535c321..0334e692e 100644
--- a/docs/examples-docs/steps.md
+++ b/docs/examples-docs/steps.md
@@ -28,39 +28,6 @@ export default {
 
 ## Steps 步骤条
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Steps`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Steps`组件了：
-
-```js
-import Vue from 'vue';
-import { Steps, Step } from 'vant';
-import 'vant/lib/vant-css/steps.css';
-
-Vue.component(Steps.name, Steps);
-Vue.component(Step.name, Step);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Steps`组件，这样只能在你注册的组件中使用`Steps`：
-
-```js
-import { Steps, Step } from 'vant';
-import 'vant/lib/vant-css/steps.css';
-
-export default {
-  components: {
-    'van-steps': Steps,
-    'van-step': Step
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/swipe.md b/docs/examples-docs/swipe.md
index b584c0feb..c76ecc9b8 100644
--- a/docs/examples-docs/swipe.md
+++ b/docs/examples-docs/swipe.md
@@ -35,39 +35,6 @@ export default {
 
 ## Swipe 轮播
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Swipe`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Swipe`组件了：
-
-```js
-import Vue from 'vue';
-import { Swipe, SwipeItem } from 'vant';
-import 'vant/lib/vant-css/swipe.css';
-
-Vue.component(Swipe.name, Swipe);
-Vue.component(SwipeItem.name, SwipeItem);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Swipe`组件，这样只能在你注册的组件中使用`Swipe`：
-
-```js
-import { Swipe, SwipeItem } from 'vant';
-import 'vant/lib/vant-css/swipe.css';
-
-export default {
-  components: {
-    'van-swipe': Swipe,
-    'van-swipe-item': SwipeItem
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/switch.md b/docs/examples-docs/switch.md
index 6e62d38c0..40500b81f 100644
--- a/docs/examples-docs/switch.md
+++ b/docs/examples-docs/switch.md
@@ -43,37 +43,6 @@ export default {
 
 ## Switch 开关
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Switch`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Switch`组件了：
-
-```js
-import Vue from 'vue';
-import { Switch } from 'vant';
-import 'vant/lib/vant-css/switch.css';
-
-Vue.component(Switch.name, Switch);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Switch`组件，这样只能在你注册的组件中使用`Switch`：
-
-```js
-import { Switch } from 'vant';
-import 'vant/lib/vant-css/switch.css';
-
-export default {
-  components: {
-    'van-switch': Switch
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/tab.md b/docs/examples-docs/tab.md
index 6f6c8e930..5e4af3cbe 100644
--- a/docs/examples-docs/tab.md
+++ b/docs/examples-docs/tab.md
@@ -49,39 +49,6 @@ export default {
 
 ## Tab 标签
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Tab`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Tab`组件了：
-
-```js
-import Vue from 'vue';
-import { Tab, Tabs } from 'vant';
-import 'vant/lib/vant-css/tab.css';
-
-Vue.component(Tab.name, Tab);
-Vue.component(Tabs.name, Tabs);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Tab`组件，这样只能在你注册的组件中使用`Tab`：
-
-```js
-import { Tab, Tabs } from 'vant';
-import 'vant/lib/vant-css/tab.css';
-
-export default {
-  components: {
-    'van-tab': Tab,
-    'van-tabs': Tabs
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/tag.md b/docs/examples-docs/tag.md
index f6ca4d596..5dd8f00d2 100644
--- a/docs/examples-docs/tag.md
+++ b/docs/examples-docs/tag.md
@@ -10,37 +10,6 @@
 
 ## Tag 标记
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Tag`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Tag`组件了：
-
-```js
-import Vue from 'vue';
-import { Tag } from 'vant';
-import 'vant/lib/vant-css/tag.css';
-
-Vue.component(Tag.name, Tag);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Tag`组件，这样只能在你注册的组件中使用`Tag`：
-
-```js
-import { Tag } from 'vant';
-import 'vant/lib/vant-css/tag.css';
-
-export default {
-  components: {
-    'van-tag': Tag
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/uploader.md b/docs/examples-docs/uploader.md
index a682d2da6..9eeab2469 100644
--- a/docs/examples-docs/uploader.md
+++ b/docs/examples-docs/uploader.md
@@ -16,37 +16,6 @@ export default {
 
 ## Uploader 图片上传
 
-### 使用指南
-
-如果你已经按照快速上手中引入了整个`vant`，以下**组件注册**就可以忽略了，因为你已经全局注册了`vant`中的全部组件。
-
-#### 全局注册
-
-你可以在全局注册`Uploader`组件，比如页面的主文件（`index.js`，`main.js`），这样页面任何地方都可以直接使用`Uploader`组件了：
-
-```js
-import Vue from 'vue';
-import { Uploader } from 'vant';
-import 'vant/lib/vant-css/uploader.css';
-
-Vue.component(Uploader.name, Uploader);
-```
-
-#### 局部注册
-
-如果你只是想在某个组件中使用，你可以在对应组件中注册`Uploader`组件，这样只能在你注册的组件中使用`Uploader`：
-
-```js
-import { Uploader } from 'vant';
-import 'vant/lib/vant-css/uploader.css';
-
-export default {
-  components: {
-    'van-uploader': Uploader
-  }
-};
-```
-
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/src/components/example-block.vue b/docs/src/components/example-block.vue
deleted file mode 100644
index 742290f02..000000000
--- a/docs/src/components/example-block.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<template>
-  <div class="example-block">
-    <h2 class="demo-sub-title" v-text="title"></h2>
-    <slot></slot>
-  </div>  
-</template>
-
-<script>
-export default {
-  props: {
-    title: String
-  }
-};
-</script>
diff --git a/docs/src/components/mobile-computed.js b/docs/src/components/mobile-computed.js
deleted file mode 100644
index 9e6d5c5e9..000000000
--- a/docs/src/components/mobile-computed.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import MobilePopup from './mobile-popup.vue';
-
-export default {
-  components: {
-    MobilePopup
-  },
-
-  computed: {
-    mobileUrl() {
-      return '/zanui/vue/examples' + location.pathname.slice(10);
-    }
-  },
-
-  data() {
-    return {
-      mobileShow: false
-    };
-  }
-};
diff --git a/docs/src/components/mobile-popup.vue b/docs/src/components/mobile-popup.vue
deleted file mode 100644
index cdd637d1f..000000000
--- a/docs/src/components/mobile-popup.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <van-popup v-model="currentValue" :lock-on-scroll="true">
-    <div class="mobile-popup">
-      <iframe :src="url" class="mobile-popup-iframe"></iframe>
-    </div>
-  </van-popup>
-</template>
-
-<script>
-export default {
-  props: {
-    url: String,
-    value: {}
-  },
-
-  data() {
-    return {
-      currentValue: this.value
-    };
-  },
-
-  watch: {
-    currentValue(val) {
-      this.$emit('input', val);
-    },
-    value(val) {
-      console.log(val);
-      this.currentValue = val;
-    }
-  }
-};
-</script>
-
-<style>
-.mobile-popup {
-  width: 375px;
-  height: 650px;
-  background: url(https://b.yzcdn.cn/v2/image/wap/zanui-mobile-container.png) no-repeat;
-}
-
-.mobile-popup-iframe {
-  width: 100%;
-  box-sizing: border-box;
-  border-left: 1px solid #e5e5e5;
-  border-right: 1px solid #e5e5e5;
-  border-bottom: 1px solid #e5e5e5;
-  position: relative;
-  top: 64px;
-  height: 586px;
-}
-</style>
diff --git a/docs/src/index.js b/docs/src/index.js
index f26018406..4997a8d15 100644
--- a/docs/src/index.js
+++ b/docs/src/index.js
@@ -4,8 +4,6 @@ import App from './ExamplesDocsApp';
 import routes from './router.config';
 import ZanDoc from 'zan-doc';
 import DemoBlock from './components/demo-block';
-
-import '../assets/docs.css';
 import 'packages/vant-css/src/index.css';
 
 function isMobile() {
diff --git a/package.json b/package.json
index fc8768124..935df9f09 100644
--- a/package.json
+++ b/package.json
@@ -115,6 +115,6 @@
     "webpack": "^3.5.1",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "0.1.11"
+    "zan-doc": "0.1.12"
   }
 }
diff --git a/packages/actionsheet/README.md b/packages/actionsheet/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/actionsheet/README.md
+++ b/packages/actionsheet/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/badge/README.md b/packages/badge/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/badge/README.md
+++ b/packages/badge/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/button/README.md b/packages/button/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/button/README.md
+++ b/packages/button/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/card/README.md b/packages/card/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/card/README.md
+++ b/packages/card/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/cell/README.md b/packages/cell/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/cell/README.md
+++ b/packages/cell/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/checkbox/README.md b/packages/checkbox/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/checkbox/README.md
+++ b/packages/checkbox/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/col/README.md b/packages/col/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/col/README.md
+++ b/packages/col/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/datetime-picker/README.md b/packages/datetime-picker/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/datetime-picker/README.md
+++ b/packages/datetime-picker/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/dialog/README.md b/packages/dialog/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/dialog/README.md
+++ b/packages/dialog/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/field/README.md b/packages/field/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/field/README.md
+++ b/packages/field/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/icon/README.md b/packages/icon/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/icon/README.md
+++ b/packages/icon/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/image-preview/README.md b/packages/image-preview/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/image-preview/README.md
+++ b/packages/image-preview/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/lazyload/README.md b/packages/lazyload/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/lazyload/README.md
+++ b/packages/lazyload/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/loading/README.md b/packages/loading/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/loading/README.md
+++ b/packages/loading/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/panel/README.md b/packages/panel/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/panel/README.md
+++ b/packages/panel/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/picker/README.md b/packages/picker/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/picker/README.md
+++ b/packages/picker/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/popup/README.md b/packages/popup/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/popup/README.md
+++ b/packages/popup/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/progress/README.md b/packages/progress/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/progress/README.md
+++ b/packages/progress/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/quantity/README.md b/packages/quantity/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/quantity/README.md
+++ b/packages/quantity/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/radio/README.md b/packages/radio/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/radio/README.md
+++ b/packages/radio/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/row/README.md b/packages/row/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/row/README.md
+++ b/packages/row/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/search/README.md b/packages/search/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/search/README.md
+++ b/packages/search/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/steps/README.md b/packages/steps/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/steps/README.md
+++ b/packages/steps/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/swipe/README.md b/packages/swipe/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/swipe/README.md
+++ b/packages/swipe/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/switch/README.md b/packages/switch/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/switch/README.md
+++ b/packages/switch/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/tab/README.md b/packages/tab/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/tab/README.md
+++ b/packages/tab/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/tag/README.md b/packages/tag/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/tag/README.md
+++ b/packages/tag/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/toast/README.md b/packages/toast/README.md
index 4c6172563..e69de29bb 100644
--- a/packages/toast/README.md
+++ b/packages/toast/README.md
@@ -1,26 +0,0 @@
-# @youzan/<%= name %>
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/packages/waterfall/README.md b/packages/waterfall/README.md
index 13efadb2c..e69de29bb 100644
--- a/packages/waterfall/README.md
+++ b/packages/waterfall/README.md
@@ -1,26 +0,0 @@
-# @youzan/waterfall
-
-!!! 请在此处填写你的文档最简单描述 !!!
-
-[![version][version-image]][download-url]
-[![download][download-image]][download-url]
-
-[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square
-[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square
-[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %>
-
-## Demo
-
-## Usage
-
-## API
-
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
-|-----------|-----------|-----------|-------------|-------------|
-| className | 自定义额外类名 | string  | ''          | ''          |
-
-
-
-
-## License
-[MIT](https://opensource.org/licenses/MIT)
diff --git a/yarn.lock b/yarn.lock
index e7bd70926..4db5b8377 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8143,9 +8143,9 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-zan-doc@0.1.11:
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.1.11.tgz#cc51ec5e6789930abafcc1648624d6002e7a4c9b"
+zan-doc@0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.1.12.tgz#65b3d43c6a18dbb939c5ea28d6a4630697de6824"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"

From 1e347826578f04686d57c96b738deae24f779517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 10 Aug 2017 14:24:54 +0800
Subject: [PATCH 015/126] fix: not default require reset.css

---
 build/bin/build-lib.js                                         | 2 +-
 packages/cell-swipe/index.js                                   | 3 ++-
 .../{components/CellSwipe.vue => src/cell-swipe.vue}           | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename packages/cell-swipe/{components/CellSwipe.vue => src/cell-swipe.vue} (100%)

diff --git a/build/bin/build-lib.js b/build/bin/build-lib.js
index a9f47fad5..08155459a 100644
--- a/build/bin/build-lib.js
+++ b/build/bin/build-lib.js
@@ -52,7 +52,7 @@ Object.keys(components).forEach((componentName) => {
   const dir = path.join(__dirname, '../../lib/', componentName, '/style');
   const file = path.join(dir, 'index.js');
   const cssPath = path.join(__dirname, '../../lib/vant-css/', `${componentName}.css`);
-  const content = [`require('../../vant-css/base.css');`];
+  const content = [];
   if (fs.existsSync(cssPath)) {
     content.push(`require('../../vant-css/${componentName}.css');`);
   }
diff --git a/packages/cell-swipe/index.js b/packages/cell-swipe/index.js
index bb9559c21..075cbb40d 100644
--- a/packages/cell-swipe/index.js
+++ b/packages/cell-swipe/index.js
@@ -1,2 +1,3 @@
-import CellSwipe from './components/CellSwipe.vue'
+import CellSwipe from './src/cell-swipe';
+
 export default CellSwipe;
diff --git a/packages/cell-swipe/components/CellSwipe.vue b/packages/cell-swipe/src/cell-swipe.vue
similarity index 100%
rename from packages/cell-swipe/components/CellSwipe.vue
rename to packages/cell-swipe/src/cell-swipe.vue

From 890e82ea552ed1a29440052af5b6eb5501460b60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 10 Aug 2017 14:34:03 +0800
Subject: [PATCH 016/126] [build] 0.7.8

---
 docs/examples-docs/changelog.md | 7 +++++++
 packages/vant-css/package.json  | 2 +-
 src/index.js                    | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index 168fafb88..7bfa39b85 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -1,5 +1,12 @@
 ## 更新日志
 
+## [v0.7.7](https://github.com/youzan/vant/tree/v0.7.7) (2017-08-09)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.7.6...v0.7.7)
+
+**修复:**
+
+- Fixed: one page Swipe components error [\#70](https://github.com/youzan/vant/pull/70) ([Raistlin916](https://github.com/Raistlin916))
+
 ## [v0.7.6](https://github.com/youzan/vant/tree/v0.7.6) (2017-08-08)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.7.5...v0.7.6)
 
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index f48af19d1..c6b2671ff 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",
diff --git a/src/index.js b/src/index.js
index 5cb07d0a2..116c60b50 100644
--- a/src/index.js
+++ b/src/index.js
@@ -37,7 +37,7 @@ import Swipe from '../packages/swipe/index.js';
 import SwipeItem from '../packages/swipe-item/index.js';
 import DatetimePicker from '../packages/datetime-picker/index.js';
 
-const version = '0.7.7';
+const version = '0.7.8';
 const components = [
   Button,
   Switch,

From 477996bab5cbd651964b7711696828d02a8c031d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 10 Aug 2017 14:34:03 +0800
Subject: [PATCH 017/126] [release] 0.7.8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 935df9f09..a688f6617 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From df7c13e941daa060e4af62b7732df28bfa7de3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=95=8F?= <cookfront@gmail.com>
Date: Fri, 11 Aug 2017 11:13:22 +0800
Subject: [PATCH 018/126] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Apopup?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E7=A9=BF=E9=80=8F=20(#73)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/popup/index.js | 40 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/mixins/popup/index.js b/src/mixins/popup/index.js
index 405b968a9..c1d0dd0fa 100644
--- a/src/mixins/popup/index.js
+++ b/src/mixins/popup/index.js
@@ -58,11 +58,45 @@ export default {
       opening: false,
       opened: false,
       closing: false,
-      bodyOverflow: null
+      bodyOverflow: null,
+      pos: {
+        x: 0,
+        y: 0
+      }
     };
   },
 
   methods: {
+    recordPosition(e) {
+      this.pos = {
+        x: e.touches[0].clientX,
+        y: e.touches[0].clientY
+      };
+    },
+    watchTouchMove(e) {
+      const pos = this.pos;
+      const dx = e.touches[0].clientX - pos.x;
+      const dy = e.touches[0].clientY - pos.y;
+      const direction = dy > 0 ? '10' : '01';
+      const el = this.$el.querySelector('.scroller') || this.$el;
+      const scrollTop = el.scrollTop;
+      const scrollHeight = el.scrollHeight;
+      const offsetHeight = el.offsetHeight;
+      const isVertical = Math.abs(dx) < Math.abs(dy);
+
+      let status = '11';
+
+      if (scrollTop === 0) {
+        status = offsetHeight >= scrollHeight ? '00' : '01';
+      } else if (scrollTop + offsetHeight >= scrollHeight) {
+        status = '10';
+      }
+
+      if (status !== '11' && isVertical && !(parseInt(status, 2) & parseInt(direction, 2))) {
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    },
     /**
      * 显示popup
      */
@@ -103,6 +137,8 @@ export default {
       this.$el.style.zIndex = PopupManager.nextZIndex();
       this.opened = true;
       this.opening = false;
+      document.addEventListener('touchstart', this.recordPosition, false);
+      document.addEventListener('touchmove', this.watchTouchMove, false);
     },
 
     /**
@@ -131,6 +167,8 @@ export default {
     doAfterClose() {
       this.closing = false;
       PopupManager.closeModal(this._popupId);
+      document.removeEventListener('touchstart', this.recordPosition, false);
+      document.removeEventListener('touchmove', this.watchTouchMove, false);
     }
   },
 

From 3578ead0c61094a357349b3824328ad2843aca75 Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Fri, 11 Aug 2017 11:17:23 +0800
Subject: [PATCH 019/126] [build] 0.7.9

---
 docs/examples-docs/changelog.md |  8 +++++
 packages/vant-css/package.json  |  2 +-
 src/index.js                    |  2 +-
 yarn.lock                       | 52 +++++++--------------------------
 4 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index 7bfa39b85..3255b8fc7 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -1,5 +1,13 @@
 ## 更新日志
 
+## [v0.7.8](https://github.com/youzan/vant/tree/v0.7.8) (2017-08-10)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.7.7...v0.7.8)
+
+**合并的 Pull Request (可能有不兼容改动):**
+
+- not require reset.css by default [\#72](https://github.com/youzan/vant/pull/72) ([chenjiahan](https://github.com/chenjiahan))
+- 补充 babel-plugin-import 文档 [\#71](https://github.com/youzan/vant/pull/71) ([chenjiahan](https://github.com/chenjiahan))
+
 ## [v0.7.7](https://github.com/youzan/vant/tree/v0.7.7) (2017-08-09)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.7.6...v0.7.7)
 
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index c6b2671ff..ac56dc9ea 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",
diff --git a/src/index.js b/src/index.js
index 116c60b50..5da7dba2d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -37,7 +37,7 @@ import Swipe from '../packages/swipe/index.js';
 import SwipeItem from '../packages/swipe-item/index.js';
 import DatetimePicker from '../packages/datetime-picker/index.js';
 
-const version = '0.7.8';
+const version = '0.7.9';
 const components = [
   Button,
   Switch,
diff --git a/yarn.lock b/yarn.lock
index 4db5b8377..672078b41 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13,11 +13,7 @@ abab@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
 
-abbrev@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
-
-abbrev@1.0.x:
+abbrev@1, abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
 
@@ -2134,14 +2130,10 @@ di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
 
-diff@3.2.0:
+diff@3.2.0, diff@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
 
-diff@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.0.tgz#056695150d7aa93237ca7e378ac3b1682b7963b9"
-
 diffie-hellman@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
@@ -2243,20 +2235,13 @@ domutils@1.1:
   dependencies:
     domelementtype "1"
 
-domutils@1.5, domutils@1.5.1:
+domutils@1.5, domutils@1.5.1, domutils@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^1.5.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
 dot-case@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-2.1.1.tgz#34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"
@@ -4842,11 +4827,7 @@ lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-
-lru-cache@2.2.x:
+lru-cache@2, lru-cache@2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
 
@@ -5033,7 +5014,7 @@ minimatch@~0.2.11:
     lru-cache "2"
     sigmund "~1.0.0"
 
-minimist@0.0.8:
+minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -5045,10 +5026,6 @@ minimist@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
 mkdirp@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
@@ -6401,9 +6378,9 @@ readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@1.1:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
+readable-stream@1.1, readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -6422,15 +6399,6 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -7250,7 +7218,7 @@ sugarss@^1.0.0:
   dependencies:
     postcss "^6.0.0"
 
-supports-color@3.1.2:
+supports-color@3.1.2, supports-color@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
@@ -7260,7 +7228,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
+supports-color@^3.1.0, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:

From 6e35dfa177f669c715f7f07f9d199b5e3a2ae235 Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Fri, 11 Aug 2017 11:17:24 +0800
Subject: [PATCH 020/126] [release] 0.7.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a688f6617..c26cf675e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From 4555d82c8e01b2590c4b074a58700b956e6dc384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Sat, 12 Aug 2017 22:33:13 +0800
Subject: [PATCH 021/126] feat: use rollup to build component

---
 .babelrc                                      |   4 +-
 build/rollup.component.config.js              |  42 ++
 package.json                                  |  15 +-
 {src => packages/common}/mixins/findParent.js |   0
 .../common}/mixins/popup/index.js             |   2 +-
 .../common}/mixins/popup/popup-context.js     |   2 +-
 .../common}/mixins/popup/popup-manager.js     |   2 +-
 .../common}/utils/clickoutside.js             |   0
 {src => packages/common}/utils/dom.js         |   0
 {src => packages/common}/utils/merge.js       |   0
 {src => packages/common}/utils/scroll.js      |   0
 {src => packages/common}/utils/transition.js  |   0
 yarn.lock                                     | 647 ++++++++++++++++--
 13 files changed, 665 insertions(+), 49 deletions(-)
 create mode 100644 build/rollup.component.config.js
 rename {src => packages/common}/mixins/findParent.js (100%)
 rename {src => packages/common}/mixins/popup/index.js (99%)
 rename {src => packages/common}/mixins/popup/popup-context.js (94%)
 rename {src => packages/common}/mixins/popup/popup-manager.js (98%)
 rename {src => packages/common}/utils/clickoutside.js (100%)
 rename {src => packages/common}/utils/dom.js (100%)
 rename {src => packages/common}/utils/merge.js (100%)
 rename {src => packages/common}/utils/scroll.js (100%)
 rename {src => packages/common}/utils/transition.js (100%)

diff --git a/.babelrc b/.babelrc
index c72eeb3a2..f266b7fa1 100644
--- a/.babelrc
+++ b/.babelrc
@@ -6,7 +6,7 @@
     ]
   ],
   "plugins": [
-    "transform-runtime",
-    "transform-vue-jsx"
+    "transform-vue-jsx",
+    "external-helpers"
   ]
 }
\ No newline at end of file
diff --git a/build/rollup.component.config.js b/build/rollup.component.config.js
new file mode 100644
index 000000000..4e452bbee
--- /dev/null
+++ b/build/rollup.component.config.js
@@ -0,0 +1,42 @@
+import path from 'path';
+import vue from 'rollup-plugin-vue';
+import alias from 'zan-rollup-plugin-alias';
+import babel from 'rollup-plugin-babel';
+import resolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
+import componentsConfig from '../components.json';
+
+const extensions = ['.js', '.vue'];
+
+export default Object.keys(componentsConfig).map(component => {
+  return {
+    entry: componentsConfig[component],
+    targets: [
+      {
+        dest: path.resolve(__dirname, `../lib/${component}/index.js`),
+        format: 'cjs'
+      }
+    ],
+    external: ['vue', 'vue-lazyload'],
+    plugins: [
+      vue(),
+      babel({
+        externalHelpers: true
+      }),
+      resolve({
+        main: true,
+        jsnext: true,
+        extensions
+      }),
+      commonjs({
+        extensions
+      }),
+      alias({
+        resolve: extensions,
+        'src/mixins': path.resolve(__dirname, '../packages/common/mixins'),
+        'src/utils': path.resolve(__dirname, '../packages/common/utils'),
+        packages: path.resolve(__dirname, '../packages')
+      }),
+    ]
+  };
+});
diff --git a/package.json b/package.json
index c26cf675e..9f63e639c 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "packages"
   ],
   "scripts": {
-    "bootstrap": "yarn || npm i",
+    "bootstrap": "yarn || npm i && cd ./packages/vant-css/ && yarn || npm i && cd ../../",
     "dev": "npm run build:file && webpack-dev-server --inline --config build/webpack.config.dev.js --content-base ./",
     "build:file": "node build/bin/build-entry.js",
     "build:utils": "cross-env BABEL_ENV=utils babel src --out-dir lib --ignore src/index.js --presets=es2015",
@@ -27,7 +27,8 @@
     "test": "karma start test/unit/karma.conf.js --single-run",
     "test:coverage": "open test/unit/coverage/lcov-report/index.html",
     "test:watch": "karma start test/unit/karma.conf.js",
-    "release": "npm run bootstrap && sh build/release.sh"
+    "release": "npm run bootstrap && sh build/release.sh",
+    "rollup": "rollup -c ./build/rollup.component.config.js"
   },
   "repository": {
     "type": "git",
@@ -53,6 +54,7 @@
     "babel-cli": "^6.14.0",
     "babel-core": "^6.25.0",
     "babel-loader": "^7.1.1",
+    "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-module-resolver": "^2.7.1",
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-runtime": "^6.15.0",
@@ -60,6 +62,7 @@
     "babel-polyfill": "^6.23.0",
     "babel-preset-es2015": "^6.16.0",
     "babel-runtime": "^6.25.0",
+    "babelrc-rollup": "^3.0.0",
     "chai": "^4.1.1",
     "cheerio": "^0.22.0",
     "codecov": "^2.2.0",
@@ -97,6 +100,11 @@
     "precss": "^2.0.0",
     "progress-bar-webpack-plugin": "^1.10.0",
     "rimraf": "^2.5.4",
+    "rollup": "^0.45.2",
+    "rollup-plugin-babel": "^3.0.1",
+    "rollup-plugin-commonjs": "^8.1.0",
+    "rollup-plugin-node-resolve": "^3.0.0",
+    "rollup-plugin-vue": "^2.4.1",
     "run-sequence": "^2.1.0",
     "sinon": "^2.4.1",
     "sinon-chai": "^2.12.0",
@@ -115,6 +123,7 @@
     "webpack": "^3.5.1",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "0.1.12"
+    "zan-doc": "0.1.12",
+    "zan-rollup-plugin-alias": "1.0.1"
   }
 }
diff --git a/src/mixins/findParent.js b/packages/common/mixins/findParent.js
similarity index 100%
rename from src/mixins/findParent.js
rename to packages/common/mixins/findParent.js
diff --git a/src/mixins/popup/index.js b/packages/common/mixins/popup/index.js
similarity index 99%
rename from src/mixins/popup/index.js
rename to packages/common/mixins/popup/index.js
index c1d0dd0fa..95af13559 100644
--- a/src/mixins/popup/index.js
+++ b/packages/common/mixins/popup/index.js
@@ -1,4 +1,4 @@
-import merge from 'src/utils/merge';
+import merge from '../../utils/merge';
 import PopupManager from './popup-manager';
 import PopupContext from './popup-context';
 
diff --git a/src/mixins/popup/popup-context.js b/packages/common/mixins/popup/popup-context.js
similarity index 94%
rename from src/mixins/popup/popup-context.js
rename to packages/common/mixins/popup/popup-context.js
index 25a340edc..f0b2ff7ea 100644
--- a/src/mixins/popup/popup-context.js
+++ b/packages/common/mixins/popup/popup-context.js
@@ -1,4 +1,4 @@
-import merge from 'src/utils/merge';
+import merge from '../../utils/merge';
 import Vue from 'vue';
 
 let context;
diff --git a/src/mixins/popup/popup-manager.js b/packages/common/mixins/popup/popup-manager.js
similarity index 98%
rename from src/mixins/popup/popup-manager.js
rename to packages/common/mixins/popup/popup-manager.js
index 5d8bb2d96..3a98cc340 100644
--- a/src/mixins/popup/popup-manager.js
+++ b/packages/common/mixins/popup/popup-manager.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import { addClass } from 'src/utils/dom';
+import { addClass } from '../../utils/dom';
 import PopupContext from './popup-context';
 
 const getModal = function() {
diff --git a/src/utils/clickoutside.js b/packages/common/utils/clickoutside.js
similarity index 100%
rename from src/utils/clickoutside.js
rename to packages/common/utils/clickoutside.js
diff --git a/src/utils/dom.js b/packages/common/utils/dom.js
similarity index 100%
rename from src/utils/dom.js
rename to packages/common/utils/dom.js
diff --git a/src/utils/merge.js b/packages/common/utils/merge.js
similarity index 100%
rename from src/utils/merge.js
rename to packages/common/utils/merge.js
diff --git a/src/utils/scroll.js b/packages/common/utils/scroll.js
similarity index 100%
rename from src/utils/scroll.js
rename to packages/common/utils/scroll.js
diff --git a/src/utils/transition.js b/packages/common/utils/transition.js
similarity index 100%
rename from src/utils/transition.js
rename to packages/common/utils/transition.js
diff --git a/yarn.lock b/yarn.lock
index 672078b41..dec03518f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -36,6 +36,12 @@ acorn-globals@^1.0.4:
   dependencies:
     acorn "^2.1.0"
 
+acorn-globals@^3.0.0:
+  version "3.1.0"
+  resolved "http://registry.npm.qima-inc.com/acorn-globals/download/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+  dependencies:
+    acorn "^4.0.4"
+
 acorn-jsx@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
@@ -46,11 +52,11 @@ acorn@^2.1.0, acorn@^2.4.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
 
-acorn@^3.0.4:
+acorn@^3.0.4, acorn@^3.1.0, acorn@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.3:
+acorn@^4.0.1, acorn@^4.0.3, acorn@^4.0.4, acorn@~4.0.2:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
@@ -253,6 +259,10 @@ arrify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "http://registry.npm.qima-inc.com/asap/download/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
 asn1.js@^4.0.0:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
@@ -295,6 +305,10 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
+async-foreach@^0.1.3:
+  version "0.1.3"
+  resolved "http://registry.npm.qima-inc.com/async-foreach/download/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+
 async@1.x, async@^1.4.0, async@^1.5.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@@ -529,6 +543,12 @@ babel-plugin-check-es2015-constants@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-plugin-external-helpers@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-external-helpers/-/babel-plugin-external-helpers-6.22.0.tgz#2285f48b02bd5dede85175caf8c62e86adccefa1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
 babel-plugin-module-resolver@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-2.7.1.tgz#18be3c42ddf59f7a456c9e0512cd91394f6e4be1"
@@ -823,6 +843,12 @@ babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
+babelrc-rollup@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/babelrc-rollup/-/babelrc-rollup-3.0.0.tgz#fcecdbe3eb6400cf4e769233c1786a2fafe8b56c"
+  dependencies:
+    resolve "^1.1.7"
+
 babylon@^6.17.0, babylon@^6.17.2:
   version "6.17.4"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
@@ -966,6 +992,12 @@ brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
+browser-resolve@^1.11.0:
+  version "1.11.2"
+  resolved "http://registry.npm.qima-inc.com/browser-resolve/download/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+  dependencies:
+    resolve "1.1.7"
+
 browser-stdout@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
@@ -1051,7 +1083,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.1:
+builtin-modules@^1.0.0, builtin-modules@^1.1.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
@@ -1115,7 +1147,7 @@ camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
-camelcase@^4.1.0:
+camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
@@ -1211,6 +1243,12 @@ change-case@3.0.x:
     upper-case "^1.1.1"
     upper-case-first "^1.1.0"
 
+character-parser@^2.1.1:
+  version "2.2.0"
+  resolved "http://registry.npm.qima-inc.com/character-parser/download/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  dependencies:
+    is-regex "^1.0.3"
+
 check-error@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
@@ -1284,7 +1322,7 @@ clap@^1.0.9:
   dependencies:
     chalk "^1.1.3"
 
-clean-css@3.4.x:
+clean-css@3.4.x, clean-css@^3.3.0:
   version "3.4.28"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
   dependencies:
@@ -1370,6 +1408,14 @@ codecov@^2.2.0:
     request "2.81.0"
     urlgrey "0.4.4"
 
+coffee-script@^1.12.4:
+  version "1.12.7"
+  resolved "http://registry.npm.qima-inc.com/coffee-script/download/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
+
+coffeescript-compiler@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npmjs.org/coffeescript-compiler/-/coffeescript-compiler-0.1.1.tgz#81a8bd44a78bda421f7e0b51f28d13c853beb805"
+
 color-convert@^1.3.0, color-convert@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
@@ -1553,6 +1599,13 @@ constant-case@^2.0.0:
     snake-case "^2.1.0"
     upper-case "^1.1.1"
 
+constantinople@^3.0.1:
+  version "3.1.0"
+  resolved "http://registry.npm.qima-inc.com/constantinople/download/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"
+  dependencies:
+    acorn "^3.1.0"
+    is-expression "^2.0.1"
+
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -1794,6 +1847,13 @@ cross-env@^5.0.5:
     cross-spawn "^5.1.0"
     is-windows "^1.0.0"
 
+cross-spawn@^3.0.0:
+  version "3.0.1"
+  resolved "http://registry.npm.qima-inc.com/cross-spawn/download/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  dependencies:
+    lru-cache "^4.0.1"
+    which "^1.2.9"
+
 cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -1855,6 +1915,21 @@ css-loader@^0.28.4:
     postcss-value-parser "^3.3.0"
     source-list-map "^0.1.7"
 
+css-modules-loader-core@^1.0.1:
+  version "1.1.0"
+  resolved "http://registry.npm.qima-inc.com/css-modules-loader-core/download/css-modules-loader-core-1.1.0.tgz#5908668294a1becd261ae0a4ce21b0b551f21d16"
+  dependencies:
+    icss-replace-symbols "1.1.0"
+    postcss "6.0.1"
+    postcss-modules-extract-imports "1.1.0"
+    postcss-modules-local-by-default "1.2.0"
+    postcss-modules-scope "1.1.0"
+    postcss-modules-values "1.3.0"
+
+css-parse@1.7.x:
+  version "1.7.0"
+  resolved "http://registry.npm.qima-inc.com/css-parse/download/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+
 css-select@^1.1.0, css-select@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
@@ -1985,6 +2060,12 @@ de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
 
+debug@*:
+  version "3.0.0"
+  resolved "http://registry.npm.qima-inc.com/debug/download/debug-3.0.0.tgz#1d2feae53349047b08b264ec41906ba17a8516e4"
+  dependencies:
+    ms "2.0.0"
+
 debug@0.7.4, debug@~0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
@@ -2007,7 +2088,7 @@ debug@2.6.7:
   dependencies:
     ms "2.0.0"
 
-debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.6, debug@^2.6.8:
+debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
@@ -2173,6 +2254,10 @@ doctrine@^2.0.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
+doctypes@^1.1.0:
+  version "1.1.0"
+  resolved "http://registry.npm.qima-inc.com/doctypes/download/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+
 dom-converter@~0.1:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
@@ -2377,7 +2462,7 @@ entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-errno@^0.1.3:
+errno@^0.1.1, errno@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
   dependencies:
@@ -2675,6 +2760,14 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
+estree-walker@^0.2.1:
+  version "0.2.1"
+  resolved "http://registry.npm.qima-inc.com/estree-walker/download/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
+
+estree-walker@^0.3.0:
+  version "0.3.1"
+  resolved "http://registry.npm.qima-inc.com/estree-walker/download/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -3161,6 +3254,12 @@ gaze@^0.5.1:
   dependencies:
     globule "~0.1.0"
 
+gaze@^1.0.0:
+  version "1.1.2"
+  resolved "http://registry.npm.qima-inc.com/gaze/download/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105"
+  dependencies:
+    globule "^1.0.0"
+
 generate-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
@@ -3171,6 +3270,12 @@ generate-object-property@^1.1.0:
   dependencies:
     is-property "^1.0.0"
 
+generic-names@^1.0.2:
+  version "1.0.2"
+  resolved "http://registry.npm.qima-inc.com/generic-names/download/generic-names-1.0.2.tgz#e25b7feceb5b5a8f28f5f972a7ccfe57e562adcd"
+  dependencies:
+    loader-utils "^0.2.16"
+
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -3289,6 +3394,17 @@ glob2base@^0.0.12:
   dependencies:
     find-index "^0.1.1"
 
+glob@7.0.x:
+  version "7.0.6"
+  resolved "http://registry.npm.qima-inc.com/glob/download/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
@@ -3319,7 +3435,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -3386,6 +3502,14 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globule@^1.0.0:
+  version "1.2.0"
+  resolved "http://registry.npm.qima-inc.com/globule/download/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
+  dependencies:
+    glob "~7.1.1"
+    lodash "~4.17.4"
+    minimatch "~3.0.2"
+
 globule@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
@@ -3677,7 +3801,7 @@ html-webpack-plugin@^2.29.0:
     pretty-error "^2.0.2"
     toposort "^1.0.0"
 
-htmlparser2@^3.8.2, htmlparser2@^3.9.1:
+htmlparser2@^3.8.2, htmlparser2@^3.8.3, htmlparser2@^3.9.1:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
   dependencies:
@@ -3756,7 +3880,7 @@ iconv-lite@^0.4.17:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
 
-icss-replace-symbols@^1.1.0:
+icss-replace-symbols@1.1.0, icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
 
@@ -3774,10 +3898,18 @@ ignore@^3.2.0:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
 
+image-size@~0.5.0:
+  version "0.5.5"
+  resolved "http://registry.npm.qima-inc.com/image-size/download/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
+in-publish@^2.0.0:
+  version "2.0.0"
+  resolved "http://registry.npm.qima-inc.com/in-publish/download/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -3939,6 +4071,20 @@ is-equal-shallow@^0.1.3:
   dependencies:
     is-primitive "^2.0.0"
 
+is-expression@^2.0.1:
+  version "2.1.0"
+  resolved "http://registry.npm.qima-inc.com/is-expression/download/is-expression-2.1.0.tgz#91be9d47debcfef077977e9722be6dcfb4465ef0"
+  dependencies:
+    acorn "~3.3.0"
+    object-assign "^4.0.1"
+
+is-expression@^3.0.0:
+  version "3.0.0"
+  resolved "http://registry.npm.qima-inc.com/is-expression/download/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
+  dependencies:
+    acorn "~4.0.2"
+    object-assign "^4.0.1"
+
 is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -3985,6 +4131,10 @@ is-lower-case@^1.1.0:
   dependencies:
     lower-case "^1.1.0"
 
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "http://registry.npm.qima-inc.com/is-module/download/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+
 is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
@@ -4030,7 +4180,7 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-obj@^1.0.0:
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
@@ -4048,7 +4198,7 @@ is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
-is-promise@^2.1.0:
+is-promise@^2.0.0, is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
@@ -4056,7 +4206,7 @@ is-property@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
 
-is-regex@^1.0.4:
+is-regex@^1.0.3, is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
   dependencies:
@@ -4195,7 +4345,7 @@ istanbul@^0.4.0:
     which "^1.1.1"
     wordwrap "^1.0.0"
 
-js-base64@^2.1.9:
+js-base64@^2.1.8, js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
@@ -4208,6 +4358,10 @@ js-beautify@^1.6.14:
     mkdirp "~0.5.0"
     nopt "~3.0.1"
 
+js-stringify@^1.0.1:
+  version "1.0.2"
+  resolved "http://registry.npm.qima-inc.com/js-stringify/download/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+
 js-tokens@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -4329,6 +4483,13 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+jstransformer@1.0.0:
+  version "1.0.0"
+  resolved "http://registry.npm.qima-inc.com/jstransformer/download/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  dependencies:
+    is-promise "^2.0.0"
+    promise "^7.0.1"
+
 jsx-ast-utils@^1.0.0, jsx-ast-utils@^1.3.4, jsx-ast-utils@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
@@ -4502,6 +4663,19 @@ lerna@^2.0.0:
     write-pkg "^3.0.1"
     yargs "^8.0.1"
 
+less@^2.7.2:
+  version "2.7.2"
+  resolved "http://registry.npm.qima-inc.com/less/download/less-2.7.2.tgz#368d6cc73e1fb03981183280918743c5dcf9b3df"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    mime "^1.2.11"
+    mkdirp "^0.5.0"
+    promise "^7.1.1"
+    request "^2.72.0"
+    source-map "^0.5.3"
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -4629,6 +4803,10 @@ lodash._root@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
 
+lodash.assign@^4.2.0:
+  version "4.2.0"
+  resolved "http://registry.npm.qima-inc.com/lodash.assign/download/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+
 lodash.assignin@^4.0.9:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
@@ -4641,6 +4819,10 @@ lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
 
+lodash.clonedeep@^4.3.2:
+  version "4.5.0"
+  resolved "http://registry.npm.qima-inc.com/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+
 lodash.cond@^4.3.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
@@ -4715,6 +4897,10 @@ lodash.merge@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
+lodash.mergewith@^4.6.0:
+  version "4.6.0"
+  resolved "http://registry.npm.qima-inc.com/lodash.mergewith/download/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
+
 lodash.pick@^4.2.1:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
@@ -4777,7 +4963,7 @@ lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0:
+lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -4848,6 +5034,12 @@ macaddress@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
 
+magic-string@^0.19.0:
+  version "0.19.1"
+  resolved "http://registry.npm.qima-inc.com/magic-string/download/magic-string-0.19.1.tgz#14d768013caf2ec8fdea16a49af82fc377e75201"
+  dependencies:
+    vlq "^0.2.1"
+
 make-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
@@ -4930,6 +5122,12 @@ merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
+merge-options@0.0.64:
+  version "0.0.64"
+  resolved "http://registry.npm.qima-inc.com/merge-options/download/merge-options-0.0.64.tgz#cbe04f594a6985eaf27f7f8f0b2a3acf6f9d562d"
+  dependencies:
+    is-plain-obj "^1.1.0"
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -4973,7 +5171,7 @@ mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-mime@1.3.x, mime@^1.3.4:
+mime@1.3.x, mime@^1.2.11, mime@^1.3.4:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
 
@@ -4995,7 +5193,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -5099,7 +5297,7 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.3.0:
+nan@^2.3.0, nan@^2.3.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
 
@@ -5135,6 +5333,24 @@ node-forge@0.6.33:
   version "0.6.33"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc"
 
+node-gyp@^3.3.1:
+  version "3.6.2"
+  resolved "http://registry.npm.qima-inc.com/node-gyp/download/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
+  dependencies:
+    fstream "^1.0.0"
+    glob "^7.0.3"
+    graceful-fs "^4.1.2"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.0"
+    nopt "2 || 3"
+    npmlog "0 || 1 || 2 || 3 || 4"
+    osenv "0"
+    request "2"
+    rimraf "2"
+    semver "~5.3.0"
+    tar "^2.0.0"
+    which "1"
+
 node-libs-browser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
@@ -5177,6 +5393,29 @@ node-pre-gyp@^0.6.36:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
+node-sass@^4.5.0:
+  version "4.5.3"
+  resolved "http://registry.npm.qima-inc.com/node-sass/download/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568"
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash.assign "^4.2.0"
+    lodash.clonedeep "^4.3.2"
+    lodash.mergewith "^4.6.0"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.3.2"
+    node-gyp "^3.3.1"
+    npmlog "^4.0.0"
+    request "^2.79.0"
+    sass-graph "^2.1.1"
+    stdout-stream "^1.4.0"
+
 node-watch@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.5.5.tgz#34865ba8bc6861ab086acdcc3403e40ed55c3274"
@@ -5188,7 +5427,7 @@ nomnomnomnom@^2.0.0:
     chalk "~0.4.0"
     underscore "~1.6.0"
 
-nopt@3.x, nopt@~3.0.1:
+"nopt@2 || 3", nopt@3.x, nopt@~3.0.1:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
@@ -5235,7 +5474,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.2, npmlog@^4.1.0:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -5436,7 +5675,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@^0.1.4:
+osenv@0, osenv@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
   dependencies:
@@ -5524,6 +5763,10 @@ parse5@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
 
+parse5@^2.1.0:
+  version "2.2.3"
+  resolved "http://registry.npm.qima-inc.com/parse5/download/parse5-2.2.3.tgz#0c4fc41c1000c5e6b93d48b03f8083837834e9f6"
+
 parsejson@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
@@ -5959,33 +6202,48 @@ postcss-mixins@^6.0.1:
     postcss-simple-vars "^4.0.0"
     sugarss "^1.0.0"
 
+postcss-modules-extract-imports@1.1.0:
+  version "1.1.0"
+  resolved "http://registry.npm.qima-inc.com/postcss-modules-extract-imports/download/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb"
+  dependencies:
+    postcss "^6.0.1"
+
 postcss-modules-extract-imports@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
   dependencies:
     postcss "^6.0.1"
 
-postcss-modules-local-by-default@^1.0.1:
+postcss-modules-local-by-default@1.2.0, postcss-modules-local-by-default@^1.0.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
 
-postcss-modules-scope@^1.0.0:
+postcss-modules-scope@1.1.0, postcss-modules-scope@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
 
-postcss-modules-values@^1.1.0:
+postcss-modules-values@1.3.0, postcss-modules-values@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
   dependencies:
     icss-replace-symbols "^1.1.0"
     postcss "^6.0.1"
 
+postcss-modules@^0.6.4:
+  version "0.6.4"
+  resolved "http://registry.npm.qima-inc.com/postcss-modules/download/postcss-modules-0.6.4.tgz#77a58bb77ba1b4392b270c0b59852fd75e89a8b4"
+  dependencies:
+    css-modules-loader-core "^1.0.1"
+    generic-names "^1.0.2"
+    postcss "^5.2.8"
+    string-hash "^1.1.1"
+
 postcss-nested@^2.0.2:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.1.0.tgz#72661d79463f5894a8c4b890479baec689d1c693"
@@ -6114,7 +6372,15 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.15, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
+postcss@6.0.1:
+  version "6.0.1"
+  resolved "http://registry.npm.qima-inc.com/postcss/download/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
+  dependencies:
+    chalk "^1.1.3"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.15, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.11, postcss@^5.2.16, postcss@^5.2.8:
   version "5.2.17"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
@@ -6131,6 +6397,30 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.6,
     source-map "^0.5.6"
     supports-color "^4.2.0"
 
+posthtml-attrs-parser@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npmjs.org/posthtml-attrs-parser/-/posthtml-attrs-parser-0.1.1.tgz#cc33e00155fb99ba96f67e25e330461f05742ac8"
+  dependencies:
+    object-assign "^4.0.1"
+
+posthtml-parser@^0.2.0:
+  version "0.2.1"
+  resolved "http://registry.npm.qima-inc.com/posthtml-parser/download/posthtml-parser-0.2.1.tgz#35d530de386740c2ba24ff2eb2faf39ccdf271dd"
+  dependencies:
+    htmlparser2 "^3.8.3"
+    isobject "^2.1.0"
+
+posthtml-render@^1.0.5:
+  version "1.0.6"
+  resolved "http://registry.npm.qima-inc.com/posthtml-render/download/posthtml-render-1.0.6.tgz#1b88b8e7860a8ebdfe2f2a1310a4642a55cf5bda"
+
+posthtml@^0.9.2:
+  version "0.9.2"
+  resolved "http://registry.npm.qima-inc.com/posthtml/download/posthtml-0.9.2.tgz#f4c06db9f67b61fd17c4e256e7e3d9515bf726fd"
+  dependencies:
+    posthtml-parser "^0.2.0"
+    posthtml-render "^1.0.5"
+
 precss@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/precss/-/precss-2.0.0.tgz#7f567e3318e06d44c8fdbf9e58452e8358bf4b71"
@@ -6209,6 +6499,12 @@ promise-each@^2.2.0:
   dependencies:
     any-promise "^0.1.0"
 
+promise@^7.0.1, promise@^7.1.1:
+  version "7.3.1"
+  resolved "http://registry.npm.qima-inc.com/promise/download/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  dependencies:
+    asap "~2.0.3"
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -6238,6 +6534,99 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
+pug-attrs@^2.0.2:
+  version "2.0.2"
+  resolved "http://registry.npm.qima-inc.com/pug-attrs/download/pug-attrs-2.0.2.tgz#8be2b2225568ffa75d1b866982bff9f4111affcb"
+  dependencies:
+    constantinople "^3.0.1"
+    js-stringify "^1.0.1"
+    pug-runtime "^2.0.3"
+
+pug-code-gen@^1.1.1:
+  version "1.1.1"
+  resolved "http://registry.npm.qima-inc.com/pug-code-gen/download/pug-code-gen-1.1.1.tgz#1cf72744ef2a039eae6a3340caaa1105871258e8"
+  dependencies:
+    constantinople "^3.0.1"
+    doctypes "^1.1.0"
+    js-stringify "^1.0.1"
+    pug-attrs "^2.0.2"
+    pug-error "^1.3.2"
+    pug-runtime "^2.0.3"
+    void-elements "^2.0.1"
+    with "^5.0.0"
+
+pug-error@^1.3.2:
+  version "1.3.2"
+  resolved "http://registry.npm.qima-inc.com/pug-error/download/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
+
+pug-filters@^2.1.4:
+  version "2.1.4"
+  resolved "http://registry.npm.qima-inc.com/pug-filters/download/pug-filters-2.1.4.tgz#ab247c0f58765414b61be7b54fe979e9f6fc898f"
+  dependencies:
+    clean-css "^3.3.0"
+    constantinople "^3.0.1"
+    jstransformer "1.0.0"
+    pug-error "^1.3.2"
+    pug-walk "^1.1.4"
+    resolve "^1.1.6"
+    uglify-js "^2.6.1"
+
+pug-lexer@^3.1.0:
+  version "3.1.0"
+  resolved "http://registry.npm.qima-inc.com/pug-lexer/download/pug-lexer-3.1.0.tgz#fd087376d4a675b4f59f8fef422883434e9581a2"
+  dependencies:
+    character-parser "^2.1.1"
+    is-expression "^3.0.0"
+    pug-error "^1.3.2"
+
+pug-linker@^3.0.2:
+  version "3.0.2"
+  resolved "http://registry.npm.qima-inc.com/pug-linker/download/pug-linker-3.0.2.tgz#cc0780cf9f3f5522b270871785492b99588d3142"
+  dependencies:
+    pug-error "^1.3.2"
+    pug-walk "^1.1.4"
+
+pug-load@^2.0.8:
+  version "2.0.8"
+  resolved "http://registry.npm.qima-inc.com/pug-load/download/pug-load-2.0.8.tgz#1df1c1716f3e68c70d71699cff9458472dc38b9b"
+  dependencies:
+    object-assign "^4.1.0"
+    pug-walk "^1.1.4"
+
+pug-parser@^3.0.1:
+  version "3.0.1"
+  resolved "http://registry.npm.qima-inc.com/pug-parser/download/pug-parser-3.0.1.tgz#dc0c5dd6c9c2d89da6105abbdf3d1b0fb4d39b5e"
+  dependencies:
+    pug-error "^1.3.2"
+    token-stream "0.0.1"
+
+pug-runtime@^2.0.3:
+  version "2.0.3"
+  resolved "http://registry.npm.qima-inc.com/pug-runtime/download/pug-runtime-2.0.3.tgz#98162607b0fce9e254d427f33987a5aee7168bda"
+
+pug-strip-comments@^1.0.2:
+  version "1.0.2"
+  resolved "http://registry.npm.qima-inc.com/pug-strip-comments/download/pug-strip-comments-1.0.2.tgz#d313afa01bcc374980e1399e23ebf2eb9bdc8513"
+  dependencies:
+    pug-error "^1.3.2"
+
+pug-walk@^1.1.4:
+  version "1.1.4"
+  resolved "http://registry.npm.qima-inc.com/pug-walk/download/pug-walk-1.1.4.tgz#29e5174af43b67e99c31b448632e1ff86ddd671c"
+
+pug@^2.0.0-beta11:
+  version "2.0.0-rc.3"
+  resolved "http://registry.npm.qima-inc.com/pug/download/pug-2.0.0-rc.3.tgz#553cb3c3a97bb54ec3cb1e08591dcae3b6f58891"
+  dependencies:
+    pug-code-gen "^1.1.1"
+    pug-filters "^2.1.4"
+    pug-lexer "^3.1.0"
+    pug-linker "^3.0.2"
+    pug-load "^2.0.8"
+    pug-parser "^3.0.1"
+    pug-runtime "^2.0.3"
+    pug-strip-comments "^1.0.2"
+
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
@@ -6558,7 +6947,7 @@ request-progress@~2.0.1:
   dependencies:
     throttleit "^1.0.0"
 
-request@2.81.0, request@^2.55.0, request@^2.81.0:
+request@2, request@2.81.0, request@^2.55.0, request@^2.72.0, request@^2.79.0, request@^2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   dependencies:
@@ -6644,7 +7033,7 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
-resolve@1.1.x:
+resolve@1.1.7, resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
@@ -6691,6 +7080,82 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
+rollup-plugin-babel@^3.0.1:
+  version "3.0.1"
+  resolved "http://registry.npm.qima-inc.com/rollup-plugin-babel/download/rollup-plugin-babel-3.0.1.tgz#e1b75bc3a6ea876bb8ec747562b344b15e27c94e"
+  dependencies:
+    rollup-pluginutils "^1.5.0"
+
+rollup-plugin-commonjs@^8.1.0:
+  version "8.1.0"
+  resolved "http://registry.npm.qima-inc.com/rollup-plugin-commonjs/download/rollup-plugin-commonjs-8.1.0.tgz#8ac9a87e6ea4c0d136e3e0e25ef41058957622b0"
+  dependencies:
+    acorn "^4.0.1"
+    estree-walker "^0.3.0"
+    magic-string "^0.19.0"
+    resolve "^1.1.7"
+    rollup-pluginutils "^2.0.1"
+
+rollup-plugin-node-resolve@^3.0.0:
+  version "3.0.0"
+  resolved "http://registry.npm.qima-inc.com/rollup-plugin-node-resolve/download/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
+  dependencies:
+    browser-resolve "^1.11.0"
+    builtin-modules "^1.1.0"
+    is-module "^1.0.0"
+    resolve "^1.1.6"
+
+rollup-plugin-vue@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.npmjs.org/rollup-plugin-vue/-/rollup-plugin-vue-2.4.1.tgz#a8780c8f3163880e70631d84019b6183b4198a97"
+  dependencies:
+    babel-runtime "^6.22.0"
+    camelcase "^4.0.0"
+    de-indent "^1.0.2"
+    debug "^2.6.0"
+    hash-sum "^1.0.2"
+    html-minifier "^3.2.3"
+    magic-string "^0.19.0"
+    merge-options "0.0.64"
+    parse5 "^2.1.0"
+    postcss "^5.2.11"
+    postcss-modules "^0.6.4"
+    postcss-selector-parser "^2.2.3"
+    posthtml "^0.9.2"
+    posthtml-attrs-parser "^0.1.1"
+    rollup-pluginutils "^2.0.1"
+    typescript "^2.4.1"
+    vue-template-compiler "*"
+    vue-template-es2015-compiler "^1.5.0"
+    vue-template-validator "^1.1.5"
+  optionalDependencies:
+    coffee-script "^1.12.4"
+    coffeescript-compiler "^0.1.1"
+    less "^2.7.2"
+    node-sass "^4.5.0"
+    pug "^2.0.0-beta11"
+    stylus "^0.54.5"
+
+rollup-pluginutils@^1.5.0:
+  version "1.5.2"
+  resolved "http://registry.npm.qima-inc.com/rollup-pluginutils/download/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
+  dependencies:
+    estree-walker "^0.2.1"
+    minimatch "^3.0.2"
+
+rollup-pluginutils@^2.0.1:
+  version "2.0.1"
+  resolved "http://registry.npm.qima-inc.com/rollup-pluginutils/download/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
+  dependencies:
+    estree-walker "^0.3.0"
+    micromatch "^2.3.11"
+
+rollup@^0.45.2:
+  version "0.45.2"
+  resolved "http://registry.npm.qima-inc.com/rollup/download/rollup-0.45.2.tgz#63a284c2b31234656f24e9e9717fabb6a7f0fa43"
+  dependencies:
+    source-map-support "^0.4.0"
+
 run-async@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
@@ -6732,6 +7197,19 @@ samsam@1.x, samsam@^1.1.3:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
 
+sass-graph@^2.1.1:
+  version "2.2.4"
+  resolved "http://registry.npm.qima-inc.com/sass-graph/download/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  dependencies:
+    glob "^7.0.0"
+    lodash "^4.0.0"
+    scss-tokenizer "^0.2.3"
+    yargs "^7.0.0"
+
+sax@0.5.x:
+  version "0.5.8"
+  resolved "http://registry.npm.qima-inc.com/sax/download/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+
 sax@^1.1.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -6742,6 +7220,13 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
+scss-tokenizer@^0.2.3:
+  version "0.2.3"
+  resolved "http://registry.npm.qima-inc.com/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  dependencies:
+    js-base64 "^2.1.8"
+    source-map "^0.4.2"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -6760,6 +7245,10 @@ semver@^4.1.0, semver@~4.3.3:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
 
+semver@~5.3.0:
+  version "5.3.0"
+  resolved "http://registry.npm.qima-inc.com/semver/download/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
 send@0.15.4:
   version "0.15.4"
   resolved "https://registry.yarnpkg.com/send/-/send-0.15.4.tgz#985faa3e284b0273c793364a35c6737bd93905b9"
@@ -6981,13 +7470,19 @@ source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
-source-map-support@^0.4.2:
+source-map-support@^0.4.0, source-map-support@^0.4.2:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
   dependencies:
     source-map "^0.5.6"
 
-source-map@0.4.x, source-map@^0.4.4:
+source-map@0.1.x, source-map@^0.1.41:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@0.4.x, source-map@^0.4.2, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
@@ -6997,12 +7492,6 @@ source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, sourc
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
-source-map@^0.1.41:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  dependencies:
-    amdefine ">=0.0.4"
-
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
@@ -7088,6 +7577,12 @@ stackframe@^1.0.3:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
+stdout-stream@^1.4.0:
+  version "1.4.0"
+  resolved "http://registry.npm.qima-inc.com/stdout-stream/download/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
+  dependencies:
+    readable-stream "^2.0.1"
+
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -7113,6 +7608,10 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+string-hash@^1.1.1:
+  version "1.1.3"
+  resolved "http://registry.npm.qima-inc.com/string-hash/download/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
+
 string-length@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
@@ -7212,6 +7711,17 @@ style-loader@^0.18.2:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"
 
+stylus@^0.54.5:
+  version "0.54.5"
+  resolved "http://registry.npm.qima-inc.com/stylus/download/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  dependencies:
+    css-parse "1.7.x"
+    debug "*"
+    glob "7.0.x"
+    mkdirp "0.5.x"
+    sax "0.5.x"
+    source-map "0.1.x"
+
 sugarss@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.0.tgz#65e51b3958432fb70d5451a68bb33e32d0cf1ef7"
@@ -7291,7 +7801,7 @@ tar-pack@^3.4.0:
     tar "^2.2.1"
     uid-number "^0.0.6"
 
-tar@^2.2.1:
+tar@^2.0.0, tar@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
   dependencies:
@@ -7409,6 +7919,10 @@ to-fast-properties@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
+token-stream@0.0.1:
+  version "0.0.1"
+  resolved "http://registry.npm.qima-inc.com/token-stream/download/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
+
 toposort@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
@@ -7482,6 +7996,10 @@ typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
+typescript@^2.4.1:
+  version "2.4.2"
+  resolved "http://registry.npm.qima-inc.com/typescript/download/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
+
 uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
@@ -7502,7 +8020,7 @@ uglify-js@3.0.x:
     commander "~2.11.0"
     source-map "~0.5.1"
 
-uglify-js@^2.6, uglify-js@^2.8.29:
+uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -7717,13 +8235,17 @@ vinyl@^0.5.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
+vlq@^0.2.1:
+  version "0.2.2"
+  resolved "http://registry.npm.qima-inc.com/vlq/download/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1"
+
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
   dependencies:
     indexof "0.0.1"
 
-void-elements@^2.0.0:
+void-elements@^2.0.0, void-elements@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
@@ -7787,17 +8309,23 @@ vue-style-loader@^3.0.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.4.2:
+vue-template-compiler@*, vue-template-compiler@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz#5a45d843f148b098f6c1d1e35ac20c4956d30ad1"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
 
-vue-template-es2015-compiler@^1.5.3:
+vue-template-es2015-compiler@^1.5.0, vue-template-es2015-compiler@^1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
 
+vue-template-validator@^1.1.5:
+  version "1.1.5"
+  resolved "http://registry.npm.qima-inc.com/vue-template-validator/download/vue-template-validator-1.1.5.tgz#22d1ee77d0647c1ab14ff7eb01865942d9b3c458"
+  dependencies:
+    chalk "^1.1.1"
+
 vue@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c"
@@ -7932,7 +8460,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.0.9, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.9:
+which@1, which@^1.0.9, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.9:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -7954,6 +8482,13 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
+with@^5.0.0:
+  version "5.1.1"
+  resolved "http://registry.npm.qima-inc.com/with/download/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
+  dependencies:
+    acorn "^3.1.0"
+    acorn-globals "^3.0.0"
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
@@ -8050,6 +8585,12 @@ yargs-parser@^4.2.0:
   dependencies:
     camelcase "^3.0.0"
 
+yargs-parser@^5.0.0:
+  version "5.0.0"
+  resolved "http://registry.npm.qima-inc.com/yargs-parser/download/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  dependencies:
+    camelcase "^3.0.0"
+
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
@@ -8074,6 +8615,24 @@ yargs@^6.0.0:
     y18n "^3.2.1"
     yargs-parser "^4.2.0"
 
+yargs@^7.0.0:
+  version "7.1.0"
+  resolved "http://registry.npm.qima-inc.com/yargs/download/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^5.0.0"
+
 yargs@^8.0.1, yargs@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
@@ -8120,3 +8679,9 @@ zan-doc@0.1.12:
     markdown-it "^8.3.1"
     markdown-it-container "^2.0.0"
     node-watch "^0.5.5"
+
+zan-rollup-plugin-alias@1.0.1:
+  version "1.0.1"
+  resolved "http://registry.npm.taobao.org/zan-rollup-plugin-alias/download/zan-rollup-plugin-alias-1.0.1.tgz#5004b659cdac960a83d75d4b3f8480b3982fbdd8"
+  dependencies:
+    slash "^1.0.0"

From 31d1ae392be202a7aeb01d2a7bd70533efc0547d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 15 Aug 2017 13:24:19 +0800
Subject: [PATCH 022/126] fix: delete unused doc css

---
 CHANGELOG.md                                 |   0
 build/bin/build-entry.js                     |   2 +-
 build/rollup.component.config.js             |  21 +-
 build/webpack.build.js                       |   2 +-
 build/webpack.components.js                  |  31 -
 build/webpack.config.dev.js                  |   3 +-
 docs/examples-docs/dialog.md                 |   2 +-
 docs/examples-docs/image-preview.md          |   4 +-
 docs/examples-docs/toast.md                  |   8 +-
 docs/src/ExamplesApp.vue                     |  60 +-
 docs/src/examples.js                         |   2 +-
 lerna.json                                   |   4 -
 package.json                                 |  12 +-
 packages/cell-swipe/src/cell-swipe.vue       |   5 -
 {src => packages}/index.js                   |   0
 test/unit/components/waterfall/waterfall.vue |   2 -
 yarn.lock                                    | 640 +------------------
 17 files changed, 75 insertions(+), 723 deletions(-)
 delete mode 100644 CHANGELOG.md
 delete mode 100644 build/webpack.components.js
 delete mode 100644 lerna.json
 rename {src => packages}/index.js (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/build/bin/build-entry.js b/build/bin/build-entry.js
index db939e763..1dfb1ce86 100644
--- a/build/bin/build-entry.js
+++ b/build/bin/build-entry.js
@@ -4,7 +4,7 @@ var render = require('json-templater/string');
 var uppercamelcase = require('uppercamelcase');
 var path = require('path');
 
-var OUTPUT_PATH = path.join(__dirname, '../../src/index.js');
+var OUTPUT_PATH = path.join(__dirname, '../../packages/index.js');
 var IMPORT_TEMPLATE = 'import {{name}} from \'../packages/{{package}}/index.js\';';
 var ISNTALL_COMPONENT_TEMPLATE = '  {{name}}';
 var MAIN_TEMPLATE = `{{include}}
diff --git a/build/rollup.component.config.js b/build/rollup.component.config.js
index 4e452bbee..c1f933470 100644
--- a/build/rollup.component.config.js
+++ b/build/rollup.component.config.js
@@ -1,3 +1,4 @@
+import fs from 'fs';
 import path from 'path';
 import vue from 'rollup-plugin-vue';
 import alias from 'zan-rollup-plugin-alias';
@@ -8,6 +9,17 @@ import componentsConfig from '../components.json';
 
 const extensions = ['.js', '.vue'];
 
+// 打包时排除 mixins、utils、其他组件
+const utilsPath = path.resolve(__dirname, '../packages/common/utils/');
+const mixinsPath = path.resolve(__dirname, '../packages/common/mixins/');
+const external = [
+  ...fs.readdirSync(utilsPath).map(item => path.resolve(utilsPath, item)),
+  ...fs.readdirSync(mixinsPath).map(item => path.resolve(mixinsPath, item)),
+  ...Object.keys(componentsConfig).map(component =>
+    path.resolve(__dirname, '../packages', component, 'index.js')
+  )
+];
+
 export default Object.keys(componentsConfig).map(component => {
   return {
     entry: componentsConfig[component],
@@ -17,7 +29,12 @@ export default Object.keys(componentsConfig).map(component => {
         format: 'cjs'
       }
     ],
-    external: ['vue', 'vue-lazyload'],
+    external: [
+      'vue',
+      'vue-lazyload',
+      path.resolve(__dirname, '../packages/common/mixins/popup/index.js'),
+      ...external
+    ],
     plugins: [
       vue(),
       babel({
@@ -36,7 +53,7 @@ export default Object.keys(componentsConfig).map(component => {
         'src/mixins': path.resolve(__dirname, '../packages/common/mixins'),
         'src/utils': path.resolve(__dirname, '../packages/common/utils'),
         packages: path.resolve(__dirname, '../packages')
-      }),
+      })
     ]
   };
 });
diff --git a/build/webpack.build.js b/build/webpack.build.js
index 0ce2bb610..2b53cbae7 100644
--- a/build/webpack.build.js
+++ b/build/webpack.build.js
@@ -3,7 +3,7 @@ const config = require('./webpack.config.dev.js');
 const isMinify = process.argv.indexOf('-p') !== -1;
 
 config.entry = {
-  'vant': './src/index.js'
+  'vant': './packages/index.js'
 };
 
 config.output = {
diff --git a/build/webpack.components.js b/build/webpack.components.js
deleted file mode 100644
index d5a3c18fb..000000000
--- a/build/webpack.components.js
+++ /dev/null
@@ -1,31 +0,0 @@
-const path = require('path');
-const Components = require('../components.json');
-const config = require('./webpack.build.js');
-const webpack = require('webpack');
-
-delete config.devtool;
-
-const entry = {};
-Object.keys(Components).forEach(key => {
-  entry[key + '/index'] = Components[key];
-});
-
-config.entry = entry;
-
-config.externals = {
-  vue: {
-    root: 'Vue',
-    commonjs: 'vue',
-    commonjs2: 'vue',
-    amd: 'vue'
-  }
-};
-
-config.output = {
-  path: path.join(__dirname, '../lib'),
-  filename: '[name].js',
-  libraryExport: "default",
-  libraryTarget: 'umd'
-};
-
-module.exports = config;
diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js
index 89ae7be1f..5e3ccf985 100644
--- a/build/webpack.config.dev.js
+++ b/build/webpack.config.dev.js
@@ -38,7 +38,8 @@ module.exports = {
     extensions: ['.js', '.vue', '.css'],
     alias: {
       vue: 'vue/dist/vue.runtime.esm.js',
-      src: path.join(__dirname, '../src'),
+      'src/mixins': path.resolve(__dirname, '../packages/common/mixins'),
+      'src/utils': path.resolve(__dirname, '../packages/common/utils'),
       packages: path.join(__dirname, '../packages'),
       lib: path.join(__dirname, '../lib'),
       components: path.join(__dirname, '../docs/src/components')
diff --git a/docs/examples-docs/dialog.md b/docs/examples-docs/dialog.md
index 8fbcca762..a40704c8c 100644
--- a/docs/examples-docs/dialog.md
+++ b/docs/examples-docs/dialog.md
@@ -7,7 +7,7 @@
 </style>
 
 <script>
-import { Dialog } from 'src/index';
+import { Dialog } from 'packages/index';
 
 export default {
   methods: {
diff --git a/docs/examples-docs/image-preview.md b/docs/examples-docs/image-preview.md
index 010136045..1239abd78 100644
--- a/docs/examples-docs/image-preview.md
+++ b/docs/examples-docs/image-preview.md
@@ -7,7 +7,7 @@
 </style>
 
 <script>
-import { ImagePreview } from 'src/index';
+import { ImagePreview } from 'packages/index';
 
 export default {
   methods: {
@@ -41,7 +41,7 @@ import { ImagePreview } from 'vant';
 <van-button @click="handleImagePreview">预览图片</van-button>
 
 <script>
-import { ImagePreview } from 'src/index';
+import { ImagePreview } from 'packages/index';
 
 export default {
   methods: {
diff --git a/docs/examples-docs/toast.md b/docs/examples-docs/toast.md
index c36cbdfc6..aed09019c 100644
--- a/docs/examples-docs/toast.md
+++ b/docs/examples-docs/toast.md
@@ -7,7 +7,7 @@
 </style>
 
 <script>
-import { Toast } from 'src/index';
+import { Toast } from 'packages/index';
 
 export default {
   methods: {
@@ -85,7 +85,7 @@ import { Toast } from 'vant';
 <van-button @click="showCustomizedToast(5000)">倒数5秒</van-button>
 
 <script>
-import { Toast } from 'src/index';
+import { Toast } from 'packages/index';
 
 export default {
   methods: {
@@ -137,7 +137,7 @@ export default {
 <van-button @click="closeToast">关闭</van-button>
 
 <script>
-import { Toast } from 'src/index';
+import { Toast } from 'packages/index';
 
 export default {
   methods: {
@@ -161,7 +161,7 @@ export default {
 <van-button @click="showHtmlToast">打开</van-button>
 
 <script>
-import { Toast } from 'src/index';
+import { Toast } from 'packages/index';
 
 export default {
   methods: {
diff --git a/docs/src/ExamplesApp.vue b/docs/src/ExamplesApp.vue
index abdd39f18..78dd05c34 100644
--- a/docs/src/ExamplesApp.vue
+++ b/docs/src/ExamplesApp.vue
@@ -54,37 +54,17 @@ export default {
 </script>
 
 <style>
-  html, body, div, span, applet, object, iframe,
-  h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-  a, abbr, acronym, address, big, cite, code,
-  del, dfn, em, img, ins, kbd, q, s, samp,
-  small, strike, strong, sub, sup, tt, var,
-  b, u, i, center,
-  dl, dt, dd, ol, ul, li,
-  fieldset, form, label, legend,
-  table, caption, tbody, tfoot, thead, tr, th, td,
-  article, aside, canvas, details, embed, 
-  figure, figcaption, footer, header, hgroup, 
-  menu, nav, output, ruby, section, summary,
-  time, mark, audio, video {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    font-size: 100%;
-    vertical-align: baseline;
-  }
-
   a {
     color: #4078c0;
     text-decoration: none;
   }
 
-  body, html {
-    height: 100%;
+  body {
+    -webkit-font-smoothing: antialiased;    
   }
 
-  body {
-    font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;
+  body, html {
+    height: 100%;
   }
 
   .examples-container {
@@ -95,38 +75,6 @@ export default {
     -webkit-overflow-scrolling: touch;
   }
 
-  .page-back {
-    display: inline-block;
-    position: absolute;
-    top: 12px;
-    left: 10px;
-    width: 40px;
-    height: 40px;
-    text-align: center;
-    color: #333;
-    transform: rotate(180deg);
-
-    i {
-      font-size: 24px;
-      line-height: 40px;
-    }
-  }
-
-  .demo-title {
-    font-size: 16px;
-    display: block;
-    line-height: 1;
-    padding: 20px 15px 0;
-  }
-
-  .demo-sub-title {
-    font-size: 14px;
-    font-weight: normal;
-    color: #999;
-    padding: 0 15px;
-    margin: 30px 0 10px;
-  }
-
   .footer {
     margin-top: 30px;
     width: 100%;
diff --git a/docs/src/examples.js b/docs/src/examples.js
index d6d0c5d6d..73f943ae6 100644
--- a/docs/src/examples.js
+++ b/docs/src/examples.js
@@ -2,7 +2,7 @@ import Vue from 'vue';
 import VueRouter from 'vue-router';
 import App from './ExamplesApp';
 import routes from './router.config';
-import ZanUI from 'src/index';
+import ZanUI from 'packages/index';
 import ZanDoc from 'zan-doc';
 import 'packages/vant-css/src/index.css';
 
diff --git a/lerna.json b/lerna.json
deleted file mode 100644
index 69dc0d691..000000000
--- a/lerna.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "lerna": "2.0.0-beta.31",
-  "version": "independent"
-}
diff --git a/package.json b/package.json
index 9f63e639c..f093e9ead 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
     "bootstrap": "yarn || npm i && cd ./packages/vant-css/ && yarn || npm i && cd ../../",
     "dev": "npm run build:file && webpack-dev-server --inline --config build/webpack.config.dev.js --content-base ./",
     "build:file": "node build/bin/build-entry.js",
-    "build:utils": "cross-env BABEL_ENV=utils babel src --out-dir lib --ignore src/index.js --presets=es2015",
-    "build:components": "cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.components.js --color",
+    "build:utils": "cross-env BABEL_ENV=utils babel packages/common --out-dir lib/common --presets=es2015",
+    "build:components": "rollup -c ./build/rollup.component.config.js --color",
     "build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color && cp -R packages/vant-css/lib/ lib/vant-css",
     "build:vant": "cross-env NODE_ENV=production webpack --progress --hide-modules --color --config build/webpack.build.js && cross-env NODE_ENV=production webpack -p --progress --hide-modules --color --config build/webpack.build.js",
     "deploy": "npm run deploy:docs && npm run deploy:cdn && gh-pages -d docs/dist --remote youzan && rimraf docs/dist",
@@ -27,8 +27,7 @@
     "test": "karma start test/unit/karma.conf.js --single-run",
     "test:coverage": "open test/unit/coverage/lcov-report/index.html",
     "test:watch": "karma start test/unit/karma.conf.js",
-    "release": "npm run bootstrap && sh build/release.sh",
-    "rollup": "rollup -c ./build/rollup.component.config.js"
+    "release": "npm run bootstrap && sh build/release.sh"
   },
   "repository": {
     "type": "git",
@@ -89,7 +88,6 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "^0.0.31",
     "karma-webpack": "^2.0.4",
-    "lerna": "^2.0.0",
     "markdown-it": "^8.3.2",
     "markdown-it-container": "^2.0.0",
     "mocha": "^3.4.2",
@@ -100,7 +98,7 @@
     "precss": "^2.0.0",
     "progress-bar-webpack-plugin": "^1.10.0",
     "rimraf": "^2.5.4",
-    "rollup": "^0.45.2",
+    "rollup": "^0.47.4",
     "rollup-plugin-babel": "^3.0.1",
     "rollup-plugin-commonjs": "^8.1.0",
     "rollup-plugin-node-resolve": "^3.0.0",
@@ -120,7 +118,7 @@
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.4.2",
     "vue-template-es2015-compiler": "^1.5.3",
-    "webpack": "^3.5.1",
+    "webpack": "^3.5.4",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
     "zan-doc": "0.1.12",
diff --git a/packages/cell-swipe/src/cell-swipe.vue b/packages/cell-swipe/src/cell-swipe.vue
index 777402261..ad7614ecf 100644
--- a/packages/cell-swipe/src/cell-swipe.vue
+++ b/packages/cell-swipe/src/cell-swipe.vue
@@ -51,12 +51,10 @@
       this.wrap = this.$refs.cell.querySelector('.van-cell-wrapper');
       this.leftElm = this.$refs.left;
       this.leftWrapElm = this.leftElm.parentNode;
-      this.leftDefaultTransform = this.translate3d(-this.leftWidth - 1);
       this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
 
       this.rightElm = this.$refs.right;
       this.rightWrapElm = this.rightElm.parentNode;
-      this.rightDefaultTransform = this.translate3d(this.rightWidth);
       this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
     },
     methods: {
@@ -100,14 +98,12 @@
         }, 0);
       },
       startDrag(evt) {
-        console.log('startDrag')
         evt = evt.changedTouches ? evt.changedTouches[0] : evt;
         this.dragging = true;
         this.start.x = evt.pageX;
         this.start.y = evt.pageY;
       },
       onDrag(evt) {
-        console.log('onDrag')
         if (this.opened) {
           !this.swiping && this.swipeMove(0);
           this.opened = false;
@@ -132,7 +128,6 @@
         this.swipeMove(offsetLeft);
       },
       endDrag() {
-        console.log('endDrag')
         if (!this.swiping) return;
         this.swipeLeaveTransition(this.offsetLeft > 0 ? -1 : 1);
       }
diff --git a/src/index.js b/packages/index.js
similarity index 100%
rename from src/index.js
rename to packages/index.js
diff --git a/test/unit/components/waterfall/waterfall.vue b/test/unit/components/waterfall/waterfall.vue
index b60910883..fd1515db5 100644
--- a/test/unit/components/waterfall/waterfall.vue
+++ b/test/unit/components/waterfall/waterfall.vue
@@ -24,11 +24,9 @@
     },
     methods: {
       triggerWaterfallLower() {
-        console.log('waterfall lower trigger');
         this.onWaterfallLower();
       },
       triggerWaterfallUpper() {
-        console.log('waterfall upper trigger');
         this.onWaterfallUpper();
       }
     }
diff --git a/yarn.lock b/yarn.lock
index dec03518f..dc6011277 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,13 +2,6 @@
 # yarn lockfile v1
 
 
-JSONStream@^1.0.4:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
-
 abab@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
@@ -64,10 +57,6 @@ acorn@^5.0.0, acorn@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
 
-add-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
-
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
@@ -116,10 +105,6 @@ ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
-ansi-escapes@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
-
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -218,10 +203,6 @@ array-flatten@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
 
-array-ify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
-
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
@@ -309,7 +290,7 @@ async-foreach@^0.1.3:
   version "0.1.3"
   resolved "http://registry.npm.qima-inc.com/async-foreach/download/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
 
-async@1.x, async@^1.4.0, async@^1.5.0, async@^1.5.2:
+async@1.x, async@^1.4.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
@@ -1091,10 +1072,6 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
-byline@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
-
 bytes@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.4.0.tgz#7d97196f9d5baf7f6935e25985549edd2a6c2339"
@@ -1204,7 +1181,7 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1:
+chalk@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
   dependencies:
@@ -1301,10 +1278,6 @@ chokidar@^1.4.1, chokidar@^1.6.0, chokidar@^1.6.1, chokidar@^1.7.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
-ci-info@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
-
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -1341,12 +1314,6 @@ cli-cursor@^1.0.1:
   dependencies:
     restore-cursor "^1.0.1"
 
-cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  dependencies:
-    restore-cursor "^2.0.0"
-
 cli-width@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
@@ -1379,13 +1346,6 @@ clone@^1.0.0, clone@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
 
-cmd-shim@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
-  dependencies:
-    graceful-fs "^4.1.2"
-    mkdirp "~0.5.0"
-
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -1452,13 +1412,6 @@ colors@^1.1.0, colors@^1.1.2, colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
-columnify@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
-  dependencies:
-    strip-ansi "^3.0.0"
-    wcwidth "^1.0.0"
-
 combine-lists@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
@@ -1471,10 +1424,6 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-command-join@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
-
 commander@2.11.x, commander@^2.8.1, commander@^2.9.0, commander@~2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
@@ -1495,13 +1444,6 @@ commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
-compare-func@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
-  dependencies:
-    array-ify "^1.0.0"
-    dot-prop "^3.0.0"
-
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
@@ -1548,7 +1490,7 @@ concat-stream@1.5.0:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
-concat-stream@^1.4.10, concat-stream@^1.5.2:
+concat-stream@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -1622,165 +1564,6 @@ content-type@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
 
-conventional-changelog-angular@^1.3.4:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz#118b9f7d41a3d99500bfb6bea1f3525e055e8b9b"
-  dependencies:
-    compare-func "^1.3.1"
-    github-url-from-git "^1.4.0"
-    q "^1.4.1"
-    read-pkg-up "^2.0.0"
-
-conventional-changelog-atom@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz#d40a9b297961b53c745e5d1718fd1a3379f6a92f"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-cli@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.2.tgz#33abf2b5720a9b094df38e81741ccb502e1a4125"
-  dependencies:
-    add-stream "^1.0.0"
-    conventional-changelog "^1.1.4"
-    lodash "^4.1.0"
-    meow "^3.7.0"
-    tempfile "^1.1.1"
-
-conventional-changelog-codemirror@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz#7577a591dbf9b538e7a150a7ee62f65a2872b334"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-core@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz#de5dfbc091847656508d4a389e35c9a1bc49e7f4"
-  dependencies:
-    conventional-changelog-writer "^1.1.0"
-    conventional-commits-parser "^1.0.0"
-    dateformat "^1.0.12"
-    get-pkg-repo "^1.0.0"
-    git-raw-commits "^1.2.0"
-    git-remote-origin-url "^2.0.0"
-    git-semver-tags "^1.2.0"
-    lodash "^4.0.0"
-    normalize-package-data "^2.3.5"
-    q "^1.4.1"
-    read-pkg "^1.1.0"
-    read-pkg-up "^1.0.1"
-    through2 "^2.0.0"
-
-conventional-changelog-ember@^0.2.6:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz#8b7355419f5127493c4c562473ab2fc792f1c2b6"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-eslint@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz#a52411e999e0501ce500b856b0a643d0330907e2"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-express@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz#55c6c841c811962036c037bdbd964a54ae310fce"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-jquery@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-jscs@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-jshint@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz#00cab8e9a3317487abd94c4d84671342918d2a07"
-  dependencies:
-    compare-func "^1.3.1"
-    q "^1.4.1"
-
-conventional-changelog-writer@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz#3f4cb4d003ebb56989d30d345893b52a43639c8e"
-  dependencies:
-    compare-func "^1.3.1"
-    conventional-commits-filter "^1.0.0"
-    dateformat "^1.0.11"
-    handlebars "^4.0.2"
-    json-stringify-safe "^5.0.1"
-    lodash "^4.0.0"
-    meow "^3.3.0"
-    semver "^5.0.1"
-    split "^1.0.0"
-    through2 "^2.0.0"
-
-conventional-changelog@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.4.tgz#108bc750c2a317e200e2f9b413caaa1f8c7efa3b"
-  dependencies:
-    conventional-changelog-angular "^1.3.4"
-    conventional-changelog-atom "^0.1.0"
-    conventional-changelog-codemirror "^0.1.0"
-    conventional-changelog-core "^1.9.0"
-    conventional-changelog-ember "^0.2.6"
-    conventional-changelog-eslint "^0.1.0"
-    conventional-changelog-express "^0.1.0"
-    conventional-changelog-jquery "^0.1.0"
-    conventional-changelog-jscs "^0.1.0"
-    conventional-changelog-jshint "^0.1.0"
-
-conventional-commits-filter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz#6fc2a659372bc3f2339cf9ffff7e1b0344b93039"
-  dependencies:
-    is-subset "^0.1.1"
-    modify-values "^1.0.0"
-
-conventional-commits-parser@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz#e327b53194e1a7ad5dc63479ee9099a52b024865"
-  dependencies:
-    JSONStream "^1.0.4"
-    is-text-path "^1.0.0"
-    lodash "^4.2.1"
-    meow "^3.3.0"
-    split2 "^2.0.0"
-    through2 "^2.0.0"
-    trim-off-newlines "^1.0.0"
-
-conventional-commits-parser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz#71d01910cb0a99aeb20c144e50f81f4df3178447"
-  dependencies:
-    JSONStream "^1.0.4"
-    is-text-path "^1.0.0"
-    lodash "^4.2.1"
-    meow "^3.3.0"
-    split2 "^2.0.0"
-    through2 "^2.0.0"
-    trim-off-newlines "^1.0.0"
-
-conventional-recommended-bump@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-1.0.1.tgz#56b8ae553a8a1152fa069e767599e1f6948bd36c"
-  dependencies:
-    concat-stream "^1.4.10"
-    conventional-commits-filter "^1.0.0"
-    conventional-commits-parser "^2.0.0"
-    git-raw-commits "^1.2.0"
-    git-semver-tags "^1.2.1"
-    meow "^3.3.0"
-    object-assign "^4.0.1"
-
 convert-source-map@^1.1.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
@@ -2029,12 +1812,6 @@ damerau-levenshtein@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
 
-dargs@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
-  dependencies:
-    number-is-nan "^1.0.0"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -2045,7 +1822,7 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-dateformat@^1.0.11, dateformat@^1.0.12, dateformat@^1.0.6:
+dateformat@^1.0.6:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
   dependencies:
@@ -2098,10 +1875,6 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-
 deep-eql@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-2.0.2.tgz#b1bac06e56f0a76777686d50c9feb75c2ed7679a"
@@ -2120,7 +1893,7 @@ deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
-defaults@^1.0.0, defaults@^1.0.3:
+defaults@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
   dependencies:
@@ -2199,10 +1972,6 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-indent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
-
 detect-node@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
@@ -2333,22 +2102,12 @@ dot-case@^2.1.0:
   dependencies:
     no-case "^2.2.0"
 
-dot-prop@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
-  dependencies:
-    is-obj "^1.0.0"
-
 duplexer2@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
   dependencies:
     readable-stream "~1.1.9"
 
-duplexer@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -2803,18 +2562,6 @@ evp_bytestokey@^1.0.0:
   dependencies:
     create-hash "^1.1.1"
 
-execa@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.3.tgz#57b69a594f081759c69e5370f0d17b9cb11658fe"
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -2907,14 +2654,6 @@ extend@^3.0.0, extend@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-external-editor@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972"
-  dependencies:
-    iconv-lite "^0.4.17"
-    jschardet "^1.4.2"
-    tmp "^0.0.31"
-
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
@@ -3002,12 +2741,6 @@ figures@^1.3.5:
     escape-string-regexp "^1.0.5"
     object-assign "^4.1.0"
 
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-entry-cache@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
@@ -3284,20 +3017,6 @@ get-func-name@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
 
-get-pkg-repo@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    meow "^3.3.0"
-    normalize-package-data "^2.3.0"
-    parse-github-repo-url "^1.3.0"
-    through2 "^2.0.0"
-
-get-port@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.1.0.tgz#ef01b18a84ca6486970ff99e54446141a73ffd3e"
-
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -3324,40 +3043,6 @@ gh-pages@^1.0.0:
     graceful-fs "4.1.11"
     rimraf "^2.5.4"
 
-git-raw-commits@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.2.0.tgz#0f3a8bfd99ae0f2d8b9224d58892975e9a52d03c"
-  dependencies:
-    dargs "^4.0.1"
-    lodash.template "^4.0.2"
-    meow "^3.3.0"
-    split2 "^2.0.0"
-    through2 "^2.0.0"
-
-git-remote-origin-url@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
-  dependencies:
-    gitconfiglocal "^1.0.0"
-    pify "^2.3.0"
-
-git-semver-tags@^1.2.0, git-semver-tags@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.2.1.tgz#6ccd2a52e735b736748dc762444fcd9588e27490"
-  dependencies:
-    meow "^3.3.0"
-    semver "^5.0.1"
-
-gitconfiglocal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
-  dependencies:
-    ini "^1.3.2"
-
-github-url-from-git@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/github-url-from-git/-/github-url-from-git-1.5.0.tgz#f985fedcc0a9aa579dc88d7aff068d55cc6251a0"
-
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -3435,7 +3120,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@~7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -3524,7 +3209,7 @@ glogg@^1.0.0:
   dependencies:
     sparkles "^1.0.0"
 
-graceful-fs@4.1.11, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -3597,7 +3282,7 @@ handle-thing@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
 
-handlebars@^4.0.1, handlebars@^4.0.2:
+handlebars@^4.0.1:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f"
   dependencies:
@@ -3876,10 +3561,6 @@ iconv-lite@0.4.15:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
-iconv-lite@^0.4.17:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
-
 icss-replace-symbols@1.1.0, icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -3943,7 +3624,7 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
+ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
@@ -3965,25 +3646,6 @@ inquirer@^0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@^3.0.6:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.2.1.tgz#06ceb0f540f45ca548c17d6840959878265fa175"
-  dependencies:
-    ansi-escapes "^2.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
 internal-ip@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
@@ -4047,12 +3709,6 @@ is-callable@^1.1.1, is-callable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
 
-is-ci@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
-  dependencies:
-    ci-info "^1.0.0"
-
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
@@ -4160,10 +3816,6 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -4198,7 +3850,7 @@ is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
-is-promise@^2.0.0, is-promise@^2.1.0:
+is-promise@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
@@ -4228,10 +3880,6 @@ is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-
 is-svg@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
@@ -4242,12 +3890,6 @@ is-symbol@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
 
-is-text-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
-  dependencies:
-    text-extensions "^1.0.0"
-
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -4384,10 +4026,6 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-jschardet@^1.4.2:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.5.1.tgz#c519f629f86b3a5bedba58a88d311309eec097f9"
-
 jsdom@^7.0.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-7.2.2.tgz#40b402770c2bda23469096bee91ab675e3b1fc6e"
@@ -4434,7 +4072,7 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
@@ -4466,10 +4104,6 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
-jsonparse@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -4623,46 +4257,6 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
-lerna@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.0.0.tgz#49a72fe70e06aebfd7ea23efb2ab41abe60ebeea"
-  dependencies:
-    async "^1.5.0"
-    chalk "^1.1.1"
-    cmd-shim "^2.0.2"
-    columnify "^1.5.4"
-    command-join "^2.0.0"
-    conventional-changelog-cli "^1.3.1"
-    conventional-recommended-bump "^1.0.0"
-    dedent "^0.7.0"
-    execa "^0.6.3"
-    find-up "^2.1.0"
-    fs-extra "^3.0.1"
-    get-port "^3.1.0"
-    glob "^7.1.2"
-    globby "^6.1.0"
-    graceful-fs "^4.1.11"
-    inquirer "^3.0.6"
-    is-ci "^1.0.10"
-    load-json-file "^2.0.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    npmlog "^4.1.0"
-    p-finally "^1.0.0"
-    path-exists "^3.0.0"
-    read-cmd-shim "^1.0.1"
-    read-pkg "^2.0.0"
-    rimraf "^2.6.1"
-    safe-buffer "^5.0.1"
-    semver "^5.1.0"
-    signal-exit "^3.0.2"
-    strong-log-transformer "^1.0.6"
-    temp-write "^3.3.0"
-    write-file-atomic "^2.1.0"
-    write-json-file "^2.1.0"
-    write-pkg "^3.0.1"
-    yargs "^8.0.1"
-
 less@^2.7.2:
   version "2.7.2"
   resolved "http://registry.npm.qima-inc.com/less/download/less-2.7.2.tgz#368d6cc73e1fb03981183280918743c5dcf9b3df"
@@ -4795,7 +4389,7 @@ lodash._reevaluate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
 
-lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0:
+lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
 
@@ -4935,13 +4529,6 @@ lodash.template@^3.0.0:
     lodash.restparam "^3.0.0"
     lodash.templatesettings "^3.0.0"
 
-lodash.template@^4.0.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
-  dependencies:
-    lodash._reinterpolate "~3.0.0"
-    lodash.templatesettings "^4.0.0"
-
 lodash.templatesettings@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
@@ -4949,12 +4536,6 @@ lodash.templatesettings@^3.0.0:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
-lodash.templatesettings@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
-  dependencies:
-    lodash._reinterpolate "~3.0.0"
-
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -4963,7 +4544,7 @@ lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.4:
+lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -5220,10 +4801,6 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
-
 mkdirp@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
@@ -5252,14 +4829,6 @@ mocha@^3.4.2:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
-modify-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
-
-moment@^2.6.0:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
-
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
@@ -5293,10 +4862,6 @@ mute-stream@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
 
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-
 nan@^2.3.0, nan@^2.3.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
@@ -5440,7 +5005,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -5474,7 +5039,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.0:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -5589,12 +5154,6 @@ onetime@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
 
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  dependencies:
-    mimic-fn "^1.0.0"
-
 opn@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
@@ -5736,10 +5295,6 @@ parse-filepath@^1.0.1:
     map-cache "^0.2.0"
     path-root "^0.1.1"
 
-parse-github-repo-url@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz#286c53e2c9962e0641649ee3ac9508fca4dd959c"
-
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -5902,7 +5457,7 @@ phantomjs-prebuilt@^2.1.7:
     request-progress "~2.0.1"
     which "~1.2.10"
 
-pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
+pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
@@ -6635,7 +6190,7 @@ punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-q@^1.1.2, q@^1.4.1:
+q@^1.1.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
@@ -6722,12 +6277,6 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
-read-cmd-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
-  dependencies:
-    graceful-fs "^4.1.2"
-
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -6742,7 +6291,7 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
-read-pkg@^1.0.0, read-pkg@^1.1.0:
+read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
   dependencies:
@@ -7050,13 +6599,6 @@ restore-cursor@^1.0.1:
     exit-hook "^1.0.0"
     onetime "^1.0.0"
 
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
-
 rgb@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/rgb/-/rgb-0.1.0.tgz#be27b291e8feffeac1bd99729721bfa40fc037b5"
@@ -7150,11 +6692,9 @@ rollup-pluginutils@^2.0.1:
     estree-walker "^0.3.0"
     micromatch "^2.3.11"
 
-rollup@^0.45.2:
-  version "0.45.2"
-  resolved "http://registry.npm.qima-inc.com/rollup/download/rollup-0.45.2.tgz#63a284c2b31234656f24e9e9717fabb6a7f0fa43"
-  dependencies:
-    source-map-support "^0.4.0"
+rollup@^0.47.4:
+  version "0.47.4"
+  resolved "http://registry.npm.taobao.org/rollup/download/rollup-0.47.4.tgz#e3a55de83a78221d232ce29619a8d68189ae845e"
 
 run-async@^0.1.0:
   version "0.1.0"
@@ -7162,12 +6702,6 @@ run-async@^0.1.0:
   dependencies:
     once "^1.3.0"
 
-run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  dependencies:
-    is-promise "^2.1.0"
-
 run-sequence@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/run-sequence/-/run-sequence-2.1.0.tgz#149da012516f21dcf79db6dc99a2a95603631b21"
@@ -7175,16 +6709,6 @@ run-sequence@^2.1.0:
     chalk "^1.1.3"
     gulp-util "^3.0.8"
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  dependencies:
-    rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-
 rx-lite@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
@@ -7237,7 +6761,7 @@ selfsigned@^1.9.1:
   dependencies:
     node-forge "0.6.33"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.1.0, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
@@ -7343,7 +6867,7 @@ sigmund@^1.0.1, sigmund@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
+signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
@@ -7372,10 +6896,6 @@ slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
-slide@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-
 snake-case@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
@@ -7450,18 +6970,12 @@ sockjs@0.3.18:
     faye-websocket "^0.10.0"
     uuid "^2.0.2"
 
-sort-keys@^1.0.0, sort-keys@^1.1.1:
+sort-keys@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
   dependencies:
     is-plain-obj "^1.0.0"
 
-sort-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 source-list-map@^0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
@@ -7470,7 +6984,7 @@ source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
-source-map-support@^0.4.0, source-map-support@^0.4.2:
+source-map-support@^0.4.2:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
   dependencies:
@@ -7539,18 +7053,6 @@ spdy@^3.4.1:
     select-hose "^2.0.0"
     spdy-transport "^2.0.18"
 
-split2@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-2.1.1.tgz#7a1f551e176a90ecd3345f7246a0cfe175ef4fd0"
-  dependencies:
-    through2 "^2.0.2"
-
-split@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
-  dependencies:
-    through "2"
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -7626,7 +7128,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.0:
+string-width@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -7694,16 +7196,6 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-strong-log-transformer@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz#f7fb93758a69a571140181277eea0c2eb1301fa3"
-  dependencies:
-    byline "^5.0.0"
-    duplexer "^0.1.1"
-    minimist "^0.1.0"
-    moment "^2.6.0"
-    through "^2.3.4"
-
 style-loader@^0.18.2:
   version "0.18.2"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.18.2.tgz#cc31459afbcd6d80b7220ee54b291a9fd66ff5eb"
@@ -7813,36 +7305,10 @@ tcomb@^2.5.1:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
 
-temp-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
-
-temp-write@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.3.0.tgz#c1a96de2b36061342eae81f44ff001aec8f615a9"
-  dependencies:
-    graceful-fs "^4.1.2"
-    is-stream "^1.1.0"
-    make-dir "^1.0.0"
-    pify "^2.2.0"
-    temp-dir "^1.0.0"
-    uuid "^3.0.1"
-
-tempfile@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
-  dependencies:
-    os-tmpdir "^1.0.0"
-    uuid "^2.0.1"
-
 text-encoding@0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
 
-text-extensions@^1.0.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.5.0.tgz#d1cb2d14b5d0bc45bfdca8a08a473f68c7eb0cbc"
-
 text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -7858,14 +7324,14 @@ through2@^0.6.1:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
-through2@^2.0.0, through2@^2.0.2:
+through2@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@~2.3.6:
+through@^2.3.6, through@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -7901,7 +7367,7 @@ title-case@^2.1.0:
     no-case "^2.2.0"
     upper-case "^1.0.3"
 
-tmp@0.0.31, tmp@0.0.x, tmp@^0.0.31:
+tmp@0.0.31, tmp@0.0.x:
   version "0.0.31"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
   dependencies:
@@ -7941,10 +7407,6 @@ trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
-trim-off-newlines@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
-
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
@@ -8170,11 +7632,11 @@ utils-merge@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
 
-uuid@^2.0.1, uuid@^2.0.2:
+uuid@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
-uuid@^3.0.0, uuid@^3.0.1:
+uuid@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
@@ -8344,12 +7806,6 @@ wbuf@^1.1.0, wbuf@^1.7.2:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-wcwidth@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  dependencies:
-    defaults "^1.0.3"
-
 webidl-conversions@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
@@ -8405,9 +7861,9 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.1.tgz#b749ee3d2b5a118dad53e8e41585b3f71e75499a"
+webpack@^3.5.4:
+  version "3.5.4"
+  resolved "http://registry.npm.taobao.org/webpack/download/webpack-3.5.4.tgz#5583eb263ed27b78b5bd17bfdfb0eb1b1cd1bf81"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
@@ -8512,32 +7968,6 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
-write-file-atomic@^2.0.0, write-file-atomic@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.1.0.tgz#1769f4b551eedce419f0505deae2e26763542d37"
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    slide "^1.1.5"
-
-write-json-file@^2.1.0, write-json-file@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.2.0.tgz#51862506bbb3b619eefab7859f1fd6c6d0530876"
-  dependencies:
-    detect-indent "^5.0.0"
-    graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    pify "^2.0.0"
-    sort-keys "^1.1.1"
-    write-file-atomic "^2.0.0"
-
-write-pkg@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.1.0.tgz#030a9994cc9993d25b4e75a9f1a1923607291ce9"
-  dependencies:
-    sort-keys "^2.0.0"
-    write-json-file "^2.2.0"
-
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
@@ -8633,7 +8063,7 @@ yargs@^7.0.0:
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
 
-yargs@^8.0.1, yargs@^8.0.2:
+yargs@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
   dependencies:

From 711352ae12bc4e25063229f047ce60aa66da5a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 15 Aug 2017 14:32:02 +0800
Subject: [PATCH 023/126] fix: output file size when use rollup

---
 build/bin/build-entry.js                      |  2 +-
 ...mponent.config.js => rollup.config.lib.js} |  2 +
 package.json                                  |  3 +-
 packages/index.js                             | 76 +++++++++----------
 yarn.lock                                     | 68 +++++++++++++++++
 5 files changed, 111 insertions(+), 40 deletions(-)
 rename build/{rollup.component.config.js => rollup.config.lib.js} (96%)

diff --git a/build/bin/build-entry.js b/build/bin/build-entry.js
index 1dfb1ce86..6294590f1 100644
--- a/build/bin/build-entry.js
+++ b/build/bin/build-entry.js
@@ -5,7 +5,7 @@ var uppercamelcase = require('uppercamelcase');
 var path = require('path');
 
 var OUTPUT_PATH = path.join(__dirname, '../../packages/index.js');
-var IMPORT_TEMPLATE = 'import {{name}} from \'../packages/{{package}}/index.js\';';
+var IMPORT_TEMPLATE = 'import {{name}} from \'./{{package}}\';';
 var ISNTALL_COMPONENT_TEMPLATE = '  {{name}}';
 var MAIN_TEMPLATE = `{{include}}
 
diff --git a/build/rollup.component.config.js b/build/rollup.config.lib.js
similarity index 96%
rename from build/rollup.component.config.js
rename to build/rollup.config.lib.js
index c1f933470..917656c56 100644
--- a/build/rollup.component.config.js
+++ b/build/rollup.config.lib.js
@@ -4,6 +4,7 @@ import vue from 'rollup-plugin-vue';
 import alias from 'zan-rollup-plugin-alias';
 import babel from 'rollup-plugin-babel';
 import resolve from 'rollup-plugin-node-resolve';
+import filesize from 'rollup-plugin-filesize';
 import commonjs from 'rollup-plugin-commonjs';
 import componentsConfig from '../components.json';
 
@@ -37,6 +38,7 @@ export default Object.keys(componentsConfig).map(component => {
     ],
     plugins: [
       vue(),
+      filesize(),
       babel({
         externalHelpers: true
       }),
diff --git a/package.json b/package.json
index f093e9ead..47746ed11 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "dev": "npm run build:file && webpack-dev-server --inline --config build/webpack.config.dev.js --content-base ./",
     "build:file": "node build/bin/build-entry.js",
     "build:utils": "cross-env BABEL_ENV=utils babel packages/common --out-dir lib/common --presets=es2015",
-    "build:components": "rollup -c ./build/rollup.component.config.js --color",
+    "build:components": "rollup -c ./build/rollup.config.lib.js --color",
     "build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color && cp -R packages/vant-css/lib/ lib/vant-css",
     "build:vant": "cross-env NODE_ENV=production webpack --progress --hide-modules --color --config build/webpack.build.js && cross-env NODE_ENV=production webpack -p --progress --hide-modules --color --config build/webpack.build.js",
     "deploy": "npm run deploy:docs && npm run deploy:cdn && gh-pages -d docs/dist --remote youzan && rimraf docs/dist",
@@ -101,6 +101,7 @@
     "rollup": "^0.47.4",
     "rollup-plugin-babel": "^3.0.1",
     "rollup-plugin-commonjs": "^8.1.0",
+    "rollup-plugin-filesize": "^1.4.2",
     "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-plugin-vue": "^2.4.1",
     "run-sequence": "^2.1.0",
diff --git a/packages/index.js b/packages/index.js
index 5da7dba2d..f5db1aa8d 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -1,41 +1,41 @@
-import Button from '../packages/button/index.js';
-import Switch from '../packages/switch/index.js';
-import Field from '../packages/field/index.js';
-import Radio from '../packages/radio/index.js';
-import Cell from '../packages/cell/index.js';
-import Icon from '../packages/icon/index.js';
-import CellGroup from '../packages/cell-group/index.js';
-import CellSwipe from '../packages/cell-swipe/index.js';
-import Popup from '../packages/popup/index.js';
-import Dialog from '../packages/dialog/index.js';
-import Picker from '../packages/picker/index.js';
-import RadioGroup from '../packages/radio-group/index.js';
-import Waterfall from '../packages/waterfall/index.js';
-import Loading from '../packages/loading/index.js';
-import Panel from '../packages/panel/index.js';
-import Card from '../packages/card/index.js';
-import Steps from '../packages/steps/index.js';
-import Tag from '../packages/tag/index.js';
-import Checkbox from '../packages/checkbox/index.js';
-import CheckboxGroup from '../packages/checkbox-group/index.js';
-import BadgeGroup from '../packages/badge-group/index.js';
-import Badge from '../packages/badge/index.js';
-import Search from '../packages/search/index.js';
-import Step from '../packages/step/index.js';
-import Tabs from '../packages/tabs/index.js';
-import Tab from '../packages/tab/index.js';
-import Lazyload from '../packages/lazyload/index.js';
-import ImagePreview from '../packages/image-preview/index.js';
-import Col from '../packages/col/index.js';
-import Row from '../packages/row/index.js';
-import Actionsheet from '../packages/actionsheet/index.js';
-import Quantity from '../packages/quantity/index.js';
-import Progress from '../packages/progress/index.js';
-import Toast from '../packages/toast/index.js';
-import Uploader from '../packages/uploader/index.js';
-import Swipe from '../packages/swipe/index.js';
-import SwipeItem from '../packages/swipe-item/index.js';
-import DatetimePicker from '../packages/datetime-picker/index.js';
+import Button from './button';
+import Switch from './switch';
+import Field from './field';
+import Radio from './radio';
+import Cell from './cell';
+import Icon from './icon';
+import CellGroup from './cell-group';
+import CellSwipe from './cell-swipe';
+import Popup from './popup';
+import Dialog from './dialog';
+import Picker from './picker';
+import RadioGroup from './radio-group';
+import Waterfall from './waterfall';
+import Loading from './loading';
+import Panel from './panel';
+import Card from './card';
+import Steps from './steps';
+import Tag from './tag';
+import Checkbox from './checkbox';
+import CheckboxGroup from './checkbox-group';
+import BadgeGroup from './badge-group';
+import Badge from './badge';
+import Search from './search';
+import Step from './step';
+import Tabs from './tabs';
+import Tab from './tab';
+import Lazyload from './lazyload';
+import ImagePreview from './image-preview';
+import Col from './col';
+import Row from './row';
+import Actionsheet from './actionsheet';
+import Quantity from './quantity';
+import Progress from './progress';
+import Toast from './toast';
+import Uploader from './uploader';
+import Swipe from './swipe';
+import SwipeItem from './swipe-item';
+import DatetimePicker from './datetime-picker';
 
 const version = '0.7.9';
 const components = [
diff --git a/yarn.lock b/yarn.lock
index dc6011277..b2a5d91d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -101,6 +101,12 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
+ansi-align@^2.0.0:
+  version "2.0.0"
+  resolved "http://registry.npm.taobao.org/ansi-align/download/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
+  dependencies:
+    string-width "^2.0.0"
+
 ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
@@ -948,6 +954,18 @@ boom@2.x.x:
   dependencies:
     hoek "2.x.x"
 
+boxen@^1.1.0:
+  version "1.2.1"
+  resolved "http://registry.npm.taobao.org/boxen/download/boxen-1.2.1.tgz#0f11e7fe344edb9397977fc13ede7f64d956481d"
+  dependencies:
+    ansi-align "^2.0.0"
+    camelcase "^4.0.0"
+    chalk "^2.0.1"
+    cli-boxes "^1.0.0"
+    string-width "^2.0.0"
+    term-size "^1.2.0"
+    widest-line "^1.0.0"
+
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
@@ -1308,6 +1326,10 @@ clean-css@4.1.x:
   dependencies:
     source-map "0.5.x"
 
+cli-boxes@^1.0.0:
+  version "1.0.0"
+  resolved "http://registry.npm.taobao.org/cli-boxes/download/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
+
 cli-cursor@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
@@ -1875,6 +1897,12 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
+deep-assign@^2.0.0:
+  version "2.0.0"
+  resolved "http://registry.npm.taobao.org/deep-assign/download/deep-assign-2.0.0.tgz#ebe06b1f07f08dae597620e3dd1622f371a1c572"
+  dependencies:
+    is-obj "^1.0.0"
+
 deep-eql@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-2.0.2.tgz#b1bac06e56f0a76777686d50c9feb75c2ed7679a"
@@ -2108,6 +2136,10 @@ duplexer2@0.0.2:
   dependencies:
     readable-stream "~1.1.9"
 
+duplexer@^0.1.1:
+  version "0.1.1"
+  resolved "http://registry.npm.taobao.org/duplexer/download/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -2758,6 +2790,10 @@ filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
+filesize@^3.5.6:
+  version "3.5.10"
+  resolved "http://registry.npm.taobao.org/filesize/download/filesize-3.5.10.tgz#fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f"
+
 fill-range@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
@@ -3278,6 +3314,12 @@ gulplog@^1.0.0:
   dependencies:
     glogg "^1.0.0"
 
+gzip-size@^3.0.0:
+  version "3.0.0"
+  resolved "http://registry.npm.taobao.org/gzip-size/download/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
+  dependencies:
+    duplexer "^0.1.1"
+
 handle-thing@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
@@ -3816,6 +3858,10 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "http://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -6638,6 +6684,16 @@ rollup-plugin-commonjs@^8.1.0:
     resolve "^1.1.7"
     rollup-pluginutils "^2.0.1"
 
+rollup-plugin-filesize@^1.4.2:
+  version "1.4.2"
+  resolved "http://registry.npm.taobao.org/rollup-plugin-filesize/download/rollup-plugin-filesize-1.4.2.tgz#eebdf571217e2fe14ab14a6534bf21f771a053b1"
+  dependencies:
+    boxen "^1.1.0"
+    colors "^1.1.2"
+    deep-assign "^2.0.0"
+    filesize "^3.5.6"
+    gzip-size "^3.0.0"
+
 rollup-plugin-node-resolve@^3.0.0:
   version "3.0.0"
   resolved "http://registry.npm.qima-inc.com/rollup-plugin-node-resolve/download/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
@@ -7305,6 +7361,12 @@ tcomb@^2.5.1:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
 
+term-size@^1.2.0:
+  version "1.2.0"
+  resolved "http://registry.npm.taobao.org/term-size/download/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
+  dependencies:
+    execa "^0.7.0"
+
 text-encoding@0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
@@ -7934,6 +7996,12 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2"
 
+widest-line@^1.0.0:
+  version "1.0.0"
+  resolved "http://registry.npm.taobao.org/widest-line/download/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
+  dependencies:
+    string-width "^1.0.1"
+
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"

From 72d590d890e703476cff19f9706a821f2e9a5a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 15 Aug 2017 17:27:02 +0800
Subject: [PATCH 024/126] fix: change utils && mixins alias

---
 .babelrc                                      | 19 +++++-----
 build/bin/build-all.js                        | 25 -------------
 build/bin/build-lib.js                        | 35 ++++++++++---------
 build/rollup.config.lib.js                    | 26 ++++++++------
 build/webpack.config.dev.js                   |  2 --
 docs/examples-docs/actionsheet.md             | 17 ++++-----
 docs/examples-docs/changelog.md               |  2 +-
 package.json                                  |  5 ++-
 packages/actionsheet/src/actionsheet.vue      |  2 +-
 packages/cell-swipe/src/cell-swipe.vue        |  4 +--
 packages/checkbox/src/checkbox.vue            |  2 +-
 packages/dialog/src/dialog.js                 |  2 +-
 packages/dialog/src/dialog.vue                |  2 +-
 packages/image-preview/src/image-preview.vue  |  2 +-
 packages/{common => }/mixins/findParent.js    |  0
 packages/{common => }/mixins/popup/index.js   |  0
 .../mixins/popup/popup-context.js             |  0
 .../mixins/popup/popup-manager.js             |  0
 packages/picker/src/picker-column.vue         |  2 +-
 packages/popup/src/popup.vue                  |  2 +-
 packages/radio/src/radio.vue                  |  2 +-
 packages/search/src/search.vue                |  2 +-
 packages/tab/src/tabs.vue                     |  2 +-
 packages/toast/src/toast.js                   |  2 +-
 packages/{common => }/utils/clickoutside.js   |  0
 packages/{common => }/utils/dom.js            |  0
 packages/{common => }/utils/merge.js          |  0
 packages/{common => }/utils/scroll.js         |  0
 packages/{common => }/utils/transition.js     |  0
 packages/waterfall/src/directive.js           |  2 +-
 yarn.lock                                     |  9 ++++-
 31 files changed, 76 insertions(+), 92 deletions(-)
 delete mode 100644 build/bin/build-all.js
 rename packages/{common => }/mixins/findParent.js (100%)
 rename packages/{common => }/mixins/popup/index.js (100%)
 rename packages/{common => }/mixins/popup/popup-context.js (100%)
 rename packages/{common => }/mixins/popup/popup-manager.js (100%)
 rename packages/{common => }/utils/clickoutside.js (100%)
 rename packages/{common => }/utils/dom.js (100%)
 rename packages/{common => }/utils/merge.js (100%)
 rename packages/{common => }/utils/scroll.js (100%)
 rename packages/{common => }/utils/transition.js (100%)

diff --git a/.babelrc b/.babelrc
index f266b7fa1..9b6775200 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,12 +1,9 @@
 {
-  "presets": [
-    [
-      "es2015",
-      { "modules": false }
-    ]
-  ],
-  "plugins": [
-    "transform-vue-jsx",
-    "external-helpers"
-  ]
-}
\ No newline at end of file
+  "presets": [["es2015", { "modules": false }]],
+  "plugins": ["transform-vue-jsx", "transform-runtime"],
+  "env": {
+    "utils": {
+      "presets": [["es2015", { "modules": "commonjs" }]]
+    }
+  }
+}
diff --git a/build/bin/build-all.js b/build/bin/build-all.js
deleted file mode 100644
index 565edeee2..000000000
--- a/build/bin/build-all.js
+++ /dev/null
@@ -1,25 +0,0 @@
-'use strict';
-
-const components = require('../../components.json');
-const execSync = require('child_process').execSync;
-const existsSync = require('fs').existsSync;
-const path = require('path');
-
-const componentPaths = [];
-
-delete components.font;
-
-Object.keys(components).forEach(key => {
-  const filePath = path.join(__dirname, `../../packages/${key}/webpack.conf.js`);
-
-  if (existsSync(filePath)) {
-    componentPaths.push(`packages/${key}/webpack.conf.js`);
-  }
-});
-
-const paths = componentPaths.join(',');
-const cli = `node_modules/.bin/webpack build -c ${paths} -p`;
-
-execSync(cli, {
-  stdio: 'inherit'
-});
diff --git a/build/bin/build-lib.js b/build/bin/build-lib.js
index 08155459a..09d99b5b2 100644
--- a/build/bin/build-lib.js
+++ b/build/bin/build-lib.js
@@ -3,11 +3,12 @@
  * Steps:
  * 1. 清理目录
  * 2. 构建 JS 入口文件
- * 3. 打包 JS 文件：vant.js && vant.min.js
- * 4. 构建 CSS 文件：vant-css
- * 5. 构建每个组件对应的 [component].js
+ * 3. 代码格式校验
+ * 4. 构建每个组件对应的 [component].js
+ * 5. 构建 vant-css
  * 6. 生成每个组件目录下的 style 入口
  * 7. 编译 utils
+ * 8. 打包 JS 文件：vant.js && vant.min.js
  */
 
 const fs = require('fs');
@@ -16,37 +17,32 @@ const components = require('../../components.json');
 const chalk = require('chalk');
 require('shelljs/global');
 
-// clean dir
+// 1. clean dir
 log('Starting', 'clean');
 exec('npm run clean --silent');
 log('Finished', 'clean');
 
-// build entry
+// 2. build entry
 log('Starting', 'build:entry');
 exec('npm run build:file --silent');
 log('Finished', 'build:entry');
 
-// lint 
+// 3. lint 
 log('Starting', 'lint');
 exec('npm run lint --silent');
 log('Finished', 'lint');
 
-// build vant.js 
-log('Starting', 'build:vant');
-exec('npm run build:vant --silent');
-log('Finished', 'build:vant');
-
-// build [component].js
+// 4. build [component].js
 log('Starting', 'build:component');
 exec('npm run build:components --silent');
 log('Finished', 'build:component');
 
-// build vant-css
+// 5. build vant-css
 log('Starting', 'build:vant-css');
 exec('npm run build:vant-css --silent');
 log('Finished', 'build:vant-css');
 
-// build style entrys
+// 6. build style entrys
 log('Starting', 'build:style-entries');
 Object.keys(components).forEach((componentName) => {
   const dir = path.join(__dirname, '../../lib/', componentName, '/style');
@@ -61,11 +57,18 @@ Object.keys(components).forEach((componentName) => {
 });
 log('Finished', 'build:style-entries');
 
-// build utils 
+// 7. build utils 
 log('Starting', 'build:utils');
-exec('npm run build:utils --silent');
+exec('cross-env BABEL_ENV=utils babel packages/utils --out-dir lib/utils');
+exec('cross-env BABEL_ENV=utils babel packages/mixins --out-dir lib/mixins');
 log('Finished', 'build:utils');
 
+// 8. build vant.js 
+log('Starting', 'build:vant');
+exec('npm run build:vant --silent');
+log('Finished', 'build:vant');
+
+
 // helpers
 function log(status, action, breakLine) {
   const now = new Date();
diff --git a/build/rollup.config.lib.js b/build/rollup.config.lib.js
index 917656c56..bcc58c750 100644
--- a/build/rollup.config.lib.js
+++ b/build/rollup.config.lib.js
@@ -11,8 +11,8 @@ import componentsConfig from '../components.json';
 const extensions = ['.js', '.vue'];
 
 // 打包时排除 mixins、utils、其他组件
-const utilsPath = path.resolve(__dirname, '../packages/common/utils/');
-const mixinsPath = path.resolve(__dirname, '../packages/common/mixins/');
+const utilsPath = path.resolve(__dirname, '../packages/utils/');
+const mixinsPath = path.resolve(__dirname, '../packages/mixins/');
 const external = [
   ...fs.readdirSync(utilsPath).map(item => path.resolve(utilsPath, item)),
   ...fs.readdirSync(mixinsPath).map(item => path.resolve(mixinsPath, item)),
@@ -22,7 +22,7 @@ const external = [
 ];
 
 export default Object.keys(componentsConfig).map(component => {
-  return {
+  const config = {
     entry: componentsConfig[component],
     targets: [
       {
@@ -33,29 +33,33 @@ export default Object.keys(componentsConfig).map(component => {
     external: [
       'vue',
       'vue-lazyload',
-      path.resolve(__dirname, '../packages/common/mixins/popup/index.js'),
+      path.resolve(__dirname, '../packages/mixins/popup/index.js'),
       ...external
     ],
     plugins: [
       vue(),
       filesize(),
-      babel({
-        externalHelpers: true
+      commonjs({
+        extensions
       }),
       resolve({
         main: true,
         jsnext: true,
         extensions
       }),
-      commonjs({
-        extensions
-      }),
       alias({
         resolve: extensions,
-        'src/mixins': path.resolve(__dirname, '../packages/common/mixins'),
-        'src/utils': path.resolve(__dirname, '../packages/common/utils'),
         packages: path.resolve(__dirname, '../packages')
       })
     ]
   };
+
+  // button 使用 jsx，需要借助 babel
+  if (component === 'button') {
+    config.plugins.unshift(babel({
+      runtimeHelpers: true
+    }));
+  }
+
+  return config;
 });
diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js
index 5e3ccf985..6b8a482da 100644
--- a/build/webpack.config.dev.js
+++ b/build/webpack.config.dev.js
@@ -38,8 +38,6 @@ module.exports = {
     extensions: ['.js', '.vue', '.css'],
     alias: {
       vue: 'vue/dist/vue.runtime.esm.js',
-      'src/mixins': path.resolve(__dirname, '../packages/common/mixins'),
-      'src/utils': path.resolve(__dirname, '../packages/common/utils'),
       packages: path.join(__dirname, '../packages'),
       lib: path.join(__dirname, '../lib'),
       components: path.join(__dirname, '../docs/src/components')
diff --git a/docs/examples-docs/actionsheet.md b/docs/examples-docs/actionsheet.md
index bb7a56f26..a3e353a49 100644
--- a/docs/examples-docs/actionsheet.md
+++ b/docs/examples-docs/actionsheet.md
@@ -53,7 +53,7 @@ export default {
 }
 </script>
 
-## ActionSheet 行动按钮
+## Actionsheet 行动按钮
 
 ### 代码演示
 
@@ -106,11 +106,11 @@ export default {
 ```
 :::
 
-#### 带取消按钮的ActionSheet
+#### 带取消按钮的 Actionsheet
 
-如果传入了`cancelText`属性，且不为空，则会在下方显示一个取消按钮，点击会将当前`ActionSheet`关闭。
+如果传入了`cancelText`属性，且不为空，则会在下方显示一个取消按钮，点击会将当前`Actionsheet`关闭。
 
-:::demo 带取消按钮的ActionSheet
+:::demo 带取消按钮的 Actionsheet
 ```html
 <van-button @click="show2 = true">弹出带取消按钮的actionsheet</van-button>
 <van-actionsheet v-model="show2" :actions="actions1" cancel-text="取消">
@@ -149,11 +149,11 @@ export default {
 ```
 :::
 
-#### 带标题的ActionSheet
+#### 带标题的 Actionsheet
 
-如果传入了`title`属性，且不为空，则另外一种样式的`ActionSheet`，里面内容需要自定义。
+如果传入了`title`属性，且不为空，则另外一种样式的`Actionsheet`，里面内容需要自定义。
 
-:::demo 带标题的ActionSheet
+:::demo 带标题的 Actionsheet
 ```html
 <van-button @click="show3 = true">弹出带标题的actionsheet</van-button>
 <van-actionsheet v-model="show3" title="支持以下配送方式" class="title-actionsheet">
@@ -170,10 +170,11 @@ export default {
 | title | 标题 | `String`  |  |    |
 | cancelText | 取消按钮文案 | `String`  |  |    |
 | overlay | 是否显示遮罩 | `Boolean`  |  |    |
-| closeOnClickOverlay | 点击遮罩是否关闭`ActionSheet` | `Boolean`  |  |    |
+| closeOnClickOverlay | 点击遮罩是否关闭`Actionsheet` | `Boolean`  |  |    |
 
 ### actions
 
+
 `API`中的`actions`为一个对象数组，数组中的每一个对象配置每一列，每一列有以下`key`：
 
 | key       | 说明      |
diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index 3255b8fc7..e168e0f9a 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -90,7 +90,7 @@
 
 **非兼容更新和新特性:**
 
-- src/utils目录支持SSR [\#51](https://github.com/youzan/vant/pull/51) ([cookfront](https://github.com/cookfront))
+- packages/utils目录支持SSR [\#51](https://github.com/youzan/vant/pull/51) ([cookfront](https://github.com/cookfront))
 
 ## [v0.6.3](https://github.com/youzan/vant/tree/v0.6.3) (2017-07-04)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.6.2...v0.6.3)
diff --git a/package.json b/package.json
index 47746ed11..49a93029a 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,8 @@
     "bootstrap": "yarn || npm i && cd ./packages/vant-css/ && yarn || npm i && cd ../../",
     "dev": "npm run build:file && webpack-dev-server --inline --config build/webpack.config.dev.js --content-base ./",
     "build:file": "node build/bin/build-entry.js",
-    "build:utils": "cross-env BABEL_ENV=utils babel packages/common --out-dir lib/common --presets=es2015",
     "build:components": "rollup -c ./build/rollup.config.lib.js --color",
-    "build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color && cp -R packages/vant-css/lib/ lib/vant-css",
+    "build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color && mkdir lib/vant-css && cp -R packages/vant-css/lib/ lib/vant-css",
     "build:vant": "cross-env NODE_ENV=production webpack --progress --hide-modules --color --config build/webpack.build.js && cross-env NODE_ENV=production webpack -p --progress --hide-modules --color --config build/webpack.build.js",
     "deploy": "npm run deploy:docs && npm run deploy:cdn && gh-pages -d docs/dist --remote youzan && rimraf docs/dist",
     "deploy:cdn": "superman cdn /zanui/vue docs/dist/*.js docs/dist/*.css",
@@ -41,6 +40,7 @@
   "author": "youzanfe",
   "license": "ISC",
   "dependencies": {
+    "babel-runtime": "6.x",
     "raf.js": "0.0.4",
     "vue-lazyload": "^1.0.6"
   },
@@ -60,7 +60,6 @@
     "babel-plugin-transform-vue-jsx": "^3.5.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-es2015": "^6.16.0",
-    "babel-runtime": "^6.25.0",
     "babelrc-rollup": "^3.0.0",
     "chai": "^4.1.1",
     "cheerio": "^0.22.0",
diff --git a/packages/actionsheet/src/actionsheet.vue b/packages/actionsheet/src/actionsheet.vue
index 1c9117bf2..a2544e129 100644
--- a/packages/actionsheet/src/actionsheet.vue
+++ b/packages/actionsheet/src/actionsheet.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import Popup from 'src/mixins/popup';
+import Popup from 'packages/mixins/popup';
 import VanLoading from 'packages/loading';
 import VanIcon from 'packages/icon';
 
diff --git a/packages/cell-swipe/src/cell-swipe.vue b/packages/cell-swipe/src/cell-swipe.vue
index ad7614ecf..773a16ac6 100644
--- a/packages/cell-swipe/src/cell-swipe.vue
+++ b/packages/cell-swipe/src/cell-swipe.vue
@@ -24,8 +24,8 @@
 </template>
 
 <script>
-  import {once} from 'src/utils/dom';
-  import Clickoutside from 'src/utils/clickoutside';
+  import {once} from 'packages/utils/dom';
+  import Clickoutside from 'packages/utils/clickoutside';
   
   export default {
     name: 'van-cell-swipe',
diff --git a/packages/checkbox/src/checkbox.vue b/packages/checkbox/src/checkbox.vue
index 816d5f6d1..83b116301 100644
--- a/packages/checkbox/src/checkbox.vue
+++ b/packages/checkbox/src/checkbox.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import findParent from 'src/mixins/findParent';
+import findParent from 'packages/mixins/findParent';
 
 export default {
   name: 'van-checkbox',
diff --git a/packages/dialog/src/dialog.js b/packages/dialog/src/dialog.js
index 962d8a950..28f09c09f 100644
--- a/packages/dialog/src/dialog.js
+++ b/packages/dialog/src/dialog.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import Dialog from './dialog.vue';
-import merge from 'src/utils/merge';
+import merge from 'packages/utils/merge';
 
 const DialogConstructor = Vue.extend(Dialog);
 
diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/src/dialog.vue
index 47849b3eb..6a28015d2 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/src/dialog.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import Popup from 'src/mixins/popup';
+import Popup from 'packages/mixins/popup';
 
 const CANCEL_TEXT = '取消';
 const CONFIRM_TEXT = '确定';
diff --git a/packages/image-preview/src/image-preview.vue b/packages/image-preview/src/image-preview.vue
index 570833330..a7740cb82 100644
--- a/packages/image-preview/src/image-preview.vue
+++ b/packages/image-preview/src/image-preview.vue
@@ -12,7 +12,7 @@
 
 <script>
 import Vue from 'vue';
-import Popup from 'src/mixins/popup';
+import Popup from 'packages/mixins/popup';
 import VanSwipe from 'packages/swipe';
 import VanSwipeItem from 'packages/swipe-item';
 
diff --git a/packages/common/mixins/findParent.js b/packages/mixins/findParent.js
similarity index 100%
rename from packages/common/mixins/findParent.js
rename to packages/mixins/findParent.js
diff --git a/packages/common/mixins/popup/index.js b/packages/mixins/popup/index.js
similarity index 100%
rename from packages/common/mixins/popup/index.js
rename to packages/mixins/popup/index.js
diff --git a/packages/common/mixins/popup/popup-context.js b/packages/mixins/popup/popup-context.js
similarity index 100%
rename from packages/common/mixins/popup/popup-context.js
rename to packages/mixins/popup/popup-context.js
diff --git a/packages/common/mixins/popup/popup-manager.js b/packages/mixins/popup/popup-manager.js
similarity index 100%
rename from packages/common/mixins/popup/popup-manager.js
rename to packages/mixins/popup/popup-manager.js
diff --git a/packages/picker/src/picker-column.vue b/packages/picker/src/picker-column.vue
index 8dc8e8715..de96de1d8 100644
--- a/packages/picker/src/picker-column.vue
+++ b/packages/picker/src/picker-column.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import translateUtil from 'src/utils/transition';
+import translateUtil from 'packages/utils/transition';
 import draggable from './draggable';
 
 const DEFAULT_ITEM_HEIGHT = 44;
diff --git a/packages/popup/src/popup.vue b/packages/popup/src/popup.vue
index a8ae28861..744ecf22e 100644
--- a/packages/popup/src/popup.vue
+++ b/packages/popup/src/popup.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import Popup from 'src/mixins/popup';
+import Popup from 'packages/mixins/popup';
 export default {
   name: 'van-popup',
 
diff --git a/packages/radio/src/radio.vue b/packages/radio/src/radio.vue
index 41a0a4d6d..92905af36 100644
--- a/packages/radio/src/radio.vue
+++ b/packages/radio/src/radio.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import findParent from 'src/mixins/findParent';
+import findParent from 'packages/mixins/findParent';
 
 export default {
   name: 'van-radio',
diff --git a/packages/search/src/search.vue b/packages/search/src/search.vue
index 1fa344e14..0128ceac6 100644
--- a/packages/search/src/search.vue
+++ b/packages/search/src/search.vue
@@ -21,7 +21,7 @@
 
 <script>
   import VanIcon from 'packages/icon';
-  import Clickoutside from 'src/utils/clickoutside';
+  import Clickoutside from 'packages/utils/clickoutside';
 
   export default {
     name: 'van-search',
diff --git a/packages/tab/src/tabs.vue b/packages/tab/src/tabs.vue
index 3d88981ac..a53e97cb2 100644
--- a/packages/tab/src/tabs.vue
+++ b/packages/tab/src/tabs.vue
@@ -42,7 +42,7 @@
 
 <script>
   import swipe from './swipe';
-  import translateUtil from 'src/utils/transition';
+  import translateUtil from 'packages/utils/transition';
 
   export default {
     name: 'van-tabs',
diff --git a/packages/toast/src/toast.js b/packages/toast/src/toast.js
index 727b6a315..bf1be2bb6 100644
--- a/packages/toast/src/toast.js
+++ b/packages/toast/src/toast.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import merge from 'src/utils/merge';
+import merge from 'packages/utils/merge';
 import ToastComponent from './toast.vue';
 
 const ToastConstructor = Vue.extend(ToastComponent);
diff --git a/packages/common/utils/clickoutside.js b/packages/utils/clickoutside.js
similarity index 100%
rename from packages/common/utils/clickoutside.js
rename to packages/utils/clickoutside.js
diff --git a/packages/common/utils/dom.js b/packages/utils/dom.js
similarity index 100%
rename from packages/common/utils/dom.js
rename to packages/utils/dom.js
diff --git a/packages/common/utils/merge.js b/packages/utils/merge.js
similarity index 100%
rename from packages/common/utils/merge.js
rename to packages/utils/merge.js
diff --git a/packages/common/utils/scroll.js b/packages/utils/scroll.js
similarity index 100%
rename from packages/common/utils/scroll.js
rename to packages/utils/scroll.js
diff --git a/packages/common/utils/transition.js b/packages/utils/transition.js
similarity index 100%
rename from packages/common/utils/transition.js
rename to packages/utils/transition.js
diff --git a/packages/waterfall/src/directive.js b/packages/waterfall/src/directive.js
index 5edae9d5c..648c294e5 100644
--- a/packages/waterfall/src/directive.js
+++ b/packages/waterfall/src/directive.js
@@ -1,4 +1,4 @@
-import Utils from 'src/utils/scroll.js';
+import Utils from 'packages/utils/scroll.js';
 
 const CONTEXT = '@@Waterfall';
 const OFFSET = 300;
diff --git a/yarn.lock b/yarn.lock
index b2a5d91d1..2fe5b752b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -790,13 +790,20 @@ babel-register@^6.24.1:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.25.0:
+babel-runtime@^6.18.0, babel-runtime@^6.22.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.25.0.tgz#33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
+babel-runtime@^6.25.0:
+  version "6.25.0"
+  resolved "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.25.0.tgz#33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.10.0"
+
 babel-template@^6.24.1, babel-template@^6.25.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"

From a0167b734d39fda62eb1cb891b9d308eab8682dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 15 Aug 2017 20:57:14 +0800
Subject: [PATCH 025/126] update yarn.lock

---
 packages/vant-css/yarn.lock | 810 +++++++++++++++++++-----------------
 yarn.lock                   | 466 ++++++++++-----------
 2 files changed, 648 insertions(+), 628 deletions(-)

diff --git a/packages/vant-css/yarn.lock b/packages/vant-css/yarn.lock
index 4ee189a21..495a0d072 100644
--- a/packages/vant-css/yarn.lock
+++ b/packages/vant-css/yarn.lock
@@ -4,23 +4,23 @@
 
 amdefine@>=0.0.4:
   version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/amdefine/download/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
 ansi-regex@^0.2.0, ansi-regex@^0.2.1:
   version "0.2.1"
-  resolved "http://registry.npm.qima-inc.com/ansi-regex/download/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "http://registry.npm.qima-inc.com/ansi-regex/download/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
 ansi-styles@^1.1.0:
   version "1.1.0"
-  resolved "http://registry.npm.qima-inc.com/ansi-styles/download/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
 
 ansi-styles@^2.2.1:
   version "2.2.1"
-  resolved "http://registry.npm.qima-inc.com/ansi-styles/download/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
 ansi-styles@^3.1.0:
   version "3.2.0"
@@ -30,49 +30,57 @@ ansi-styles@^3.1.0:
 
 any-promise@^0.1.0:
   version "0.1.0"
-  resolved "http://registry.npm.qima-inc.com/any-promise/download/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
 
 archy@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/archy/download/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
 
 argparse@^1.0.7:
   version "1.0.9"
-  resolved "http://registry.npm.qima-inc.com/argparse/download/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.qima-inc.com/arr-diff/download/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-flatten@^1.0.1:
-  version "1.0.3"
-  resolved "http://registry.npm.qima-inc.com/arr-flatten/download/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
 array-differ@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/array-differ/download/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+
+array-each@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
 
 array-find-index@^1.0.1:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/array-find-index/download/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+
+array-slice@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.0.0.tgz#e73034f00dcc1f40876008fd20feae77bd4b7c2f"
 
 array-union@^1.0.1:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/array-union/download/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1, array-uniq@^1.0.2:
   version "1.0.3"
-  resolved "http://registry.npm.qima-inc.com/array-uniq/download/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
 array-unique@^0.2.1:
   version "0.2.1"
-  resolved "http://registry.npm.qima-inc.com/array-unique/download/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
 autoprefixer@^7.1.2:
   version "7.1.2"
@@ -87,11 +95,11 @@ autoprefixer@^7.1.2:
 
 balanced-match@0.1.0:
   version "0.1.0"
-  resolved "http://registry.npm.qima-inc.com/balanced-match/download/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
 
-balanced-match@^0.4.1, balanced-match@^0.4.2:
+balanced-match@^0.4.2:
   version "0.4.2"
-  resolved "http://registry.npm.qima-inc.com/balanced-match/download/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -99,37 +107,33 @@ balanced-match@^1.0.0:
 
 beeper@^1.0.0:
   version "1.1.1"
-  resolved "http://registry.npm.qima-inc.com/beeper/download/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
+  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
 
-brace-expansion@^1.0.0:
-  version "1.1.7"
-  resolved "http://registry.npm.qima-inc.com/brace-expansion/download/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
+brace-expansion@^1.0.0, brace-expansion@^1.1.7:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
   dependencies:
-    balanced-match "^0.4.1"
+    balanced-match "^1.0.0"
     concat-map "0.0.1"
 
 braces@^1.8.2:
   version "1.8.5"
-  resolved "http://registry.npm.qima-inc.com/braces/download/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
 browserslist@^2.1.5:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.3.0.tgz#b2aa76415c71643fe2368f6243b43bbbb4211752"
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.3.3.tgz#2b0cabc4d28489f682598605858a0782f14b154c"
   dependencies:
-    caniuse-lite "^1.0.30000710"
-    electron-to-chromium "^1.3.17"
-
-buffer-shims@~1.0.0:
-  version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/buffer-shims/download/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+    caniuse-lite "^1.0.30000715"
+    electron-to-chromium "^1.3.18"
 
 builtin-modules@^1.0.0:
   version "1.1.1"
-  resolved "http://registry.npm.qima-inc.com/builtin-modules/download/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
 camelcase-css@^1.0.1:
   version "1.0.1"
@@ -137,22 +141,22 @@ camelcase-css@^1.0.1:
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
-  resolved "http://registry.npm.qima-inc.com/camelcase-keys/download/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
 camelcase@^2.0.0:
   version "2.1.1"
-  resolved "http://registry.npm.qima-inc.com/camelcase/download/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
-caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000710:
-  version "1.0.30000712"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000712.tgz#b4732def2459224f3f78c6a9ba103abfcc705670"
+caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000715:
+  version "1.0.30000715"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000715.tgz#c327f5e6d907ebcec62cde598c3bf0dd793fb9a0"
 
 chalk@^0.5.0:
   version "0.5.1"
-  resolved "http://registry.npm.qima-inc.com/chalk/download/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
   dependencies:
     ansi-styles "^1.1.0"
     escape-string-regexp "^1.0.0"
@@ -162,7 +166,7 @@ chalk@^0.5.0:
 
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
-  resolved "http://registry.npm.qima-inc.com/chalk/download/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -170,7 +174,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.1:
+chalk@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
   dependencies:
@@ -179,43 +183,43 @@ chalk@^2.0.1:
     supports-color "^4.0.0"
 
 clean-css@^3.1.9:
-  version "3.4.25"
-  resolved "http://registry.npm.qima-inc.com/clean-css/download/clean-css-3.4.25.tgz#9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"
+  version "3.4.28"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
   dependencies:
     commander "2.8.x"
     source-map "0.4.x"
 
 clone-stats@^0.0.1, clone-stats@~0.0.1:
   version "0.0.1"
-  resolved "http://registry.npm.qima-inc.com/clone-stats/download/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
 
 clone@^0.2.0:
   version "0.2.0"
-  resolved "http://registry.npm.qima-inc.com/clone/download/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
 
 clone@^1.0.0, clone@^1.0.2:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/clone/download/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
 
 color-convert@^1.3.0, color-convert@^1.9.0:
   version "1.9.0"
-  resolved "http://registry.npm.qima-inc.com/color-convert/download/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
   dependencies:
     color-name "^1.1.1"
 
 color-name@^1.0.0, color-name@^1.1.1:
-  version "1.1.2"
-  resolved "http://registry.npm.qima-inc.com/color-name/download/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
 color-string@^0.3.0:
   version "0.3.0"
-  resolved "http://registry.npm.qima-inc.com/color-string/download/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
   dependencies:
     color-name "^1.0.0"
 
 color@^0.11.0:
   version "0.11.4"
-  resolved "http://registry.npm.qima-inc.com/color/download/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
   dependencies:
     clone "^1.0.2"
     color-convert "^1.3.0"
@@ -223,22 +227,23 @@ color@^0.11.0:
 
 commander@2.8.x:
   version "2.8.1"
-  resolved "http://registry.npm.qima-inc.com/commander/download/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
   dependencies:
     graceful-readlink ">= 1.0.0"
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "http://registry.npm.qima-inc.com/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
 core-util-is@~1.0.0:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/core-util-is/download/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
 cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
-  version "2.1.1"
-  resolved "http://registry.npm.qima-inc.com/cosmiconfig/download/cosmiconfig-2.1.1.tgz#817f2c2039347a1e9bf7d090c0923e53f749ca82"
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
   dependencies:
+    is-directory "^0.3.1"
     js-yaml "^3.4.3"
     minimist "^1.2.0"
     object-assign "^4.1.0"
@@ -257,121 +262,127 @@ css-color-function@^1.3.0:
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
-  resolved "http://registry.npm.qima-inc.com/currently-unhandled/download/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
   dependencies:
     array-find-index "^1.0.1"
 
 dateformat@^1.0.7-1.2.3:
   version "1.0.12"
-  resolved "http://registry.npm.qima-inc.com/dateformat/download/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
   dependencies:
     get-stdin "^4.0.1"
     meow "^3.3.0"
 
 dateformat@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.qima-inc.com/dateformat/download/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
 
 debug@~0.7.4:
   version "0.7.4"
-  resolved "http://registry.npm.qima-inc.com/debug/download/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
 
 decamelize@^1.1.2:
   version "1.2.0"
-  resolved "http://registry.npm.qima-inc.com/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
 defaults@^1.0.0:
   version "1.0.3"
-  resolved "http://registry.npm.qima-inc.com/defaults/download/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
   dependencies:
     clone "^1.0.2"
 
 deprecated@^0.0.1:
   version "0.0.1"
-  resolved "http://registry.npm.qima-inc.com/deprecated/download/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
+  resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
 
 detect-file@^0.1.0:
   version "0.1.0"
-  resolved "http://registry.npm.qima-inc.com/detect-file/download/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
   dependencies:
     fs-exists-sync "^0.1.0"
 
 duplexer2@0.0.2:
   version "0.0.2"
-  resolved "http://registry.npm.qima-inc.com/duplexer2/download/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
   dependencies:
     readable-stream "~1.1.9"
 
-electron-to-chromium@^1.3.17:
-  version "1.3.17"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.17.tgz#41c13457cc7166c5c15e767ae61d86a8cacdee5d"
+electron-to-chromium@^1.3.18:
+  version "1.3.18"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz#3dcc99da3e6b665f6abbc71c28ad51a2cd731a9c"
 
 end-of-stream@~0.1.5:
   version "0.1.5"
-  resolved "http://registry.npm.qima-inc.com/end-of-stream/download/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
   dependencies:
     once "~1.3.0"
 
 error-ex@^1.2.0:
   version "1.3.1"
-  resolved "http://registry.npm.qima-inc.com/error-ex/download/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
     is-arrayish "^0.2.1"
 
 escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "http://registry.npm.qima-inc.com/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-esprima@^3.1.1:
-  version "3.1.3"
-  resolved "http://registry.npm.qima-inc.com/esprima/download/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
 expand-brackets@^0.1.4:
   version "0.1.5"
-  resolved "http://registry.npm.qima-inc.com/expand-brackets/download/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-range@^1.8.1:
   version "1.8.2"
-  resolved "http://registry.npm.qima-inc.com/expand-range/download/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
   dependencies:
     fill-range "^2.1.0"
 
-expand-tilde@^1.2.1, expand-tilde@^1.2.2:
+expand-tilde@^1.2.2:
   version "1.2.2"
-  resolved "http://registry.npm.qima-inc.com/expand-tilde/download/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
   dependencies:
     os-homedir "^1.0.1"
 
+expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
 extend@^3.0.0:
-  version "3.0.0"
-  resolved "http://registry.npm.qima-inc.com/extend/download/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
 extglob@^0.3.1:
   version "0.3.2"
-  resolved "http://registry.npm.qima-inc.com/extglob/download/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
   dependencies:
     is-extglob "^1.0.0"
 
 fancy-log@^1.1.0:
   version "1.3.0"
-  resolved "http://registry.npm.qima-inc.com/fancy-log/download/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
   dependencies:
     chalk "^1.1.1"
     time-stamp "^1.0.0"
 
 filename-regex@^2.0.0:
-  version "2.0.0"
-  resolved "http://registry.npm.qima-inc.com/filename-regex/download/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
 filesize@~2.0.0:
   version "2.0.4"
-  resolved "http://registry.npm.qima-inc.com/filesize/download/filesize-2.0.4.tgz#7805941c60fcdfe63f46d7ea358c59ade11c1325"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-2.0.4.tgz#7805941c60fcdfe63f46d7ea358c59ade11c1325"
 
 fill-range@^2.1.0:
   version "2.2.3"
-  resolved "http://registry.npm.qima-inc.com/fill-range/download/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -381,18 +392,18 @@ fill-range@^2.1.0:
 
 find-index@^0.1.1:
   version "0.1.1"
-  resolved "http://registry.npm.qima-inc.com/find-index/download/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
+  resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
 
 find-up@^1.0.0:
   version "1.1.2"
-  resolved "http://registry.npm.qima-inc.com/find-up/download/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
 findup-sync@^0.4.2:
   version "0.4.3"
-  resolved "http://registry.npm.qima-inc.com/findup-sync/download/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
   dependencies:
     detect-file "^0.1.0"
     is-glob "^2.0.1"
@@ -400,24 +411,22 @@ findup-sync@^0.4.2:
     resolve-dir "^0.1.0"
 
 fined@^1.0.1:
-  version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/fined/download/fined-1.0.2.tgz#5b28424b760d7598960b7ef8480dff8ad3660e97"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.0.tgz#b37dc844b76a2f5e7081e884f7c0ae344f153476"
   dependencies:
-    expand-tilde "^1.2.1"
-    lodash.assignwith "^4.0.7"
-    lodash.isempty "^4.2.1"
-    lodash.isplainobject "^4.0.4"
-    lodash.isstring "^4.0.1"
-    lodash.pick "^4.2.1"
+    expand-tilde "^2.0.2"
+    is-plain-object "^2.0.3"
+    object.defaults "^1.1.0"
+    object.pick "^1.2.0"
     parse-filepath "^1.0.1"
 
 first-chunk-stream@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/first-chunk-stream/download/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
+  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
 
 flagged-respawn@^0.3.2:
   version "0.3.2"
-  resolved "http://registry.npm.qima-inc.com/flagged-respawn/download/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
+  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
 
 flatten@^1.0.2:
   version "1.0.2"
@@ -425,48 +434,54 @@ flatten@^1.0.2:
 
 for-in@^1.0.1:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/for-in/download/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
 for-own@^0.1.4:
   version "0.1.5"
-  resolved "http://registry.npm.qima-inc.com/for-own/download/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  dependencies:
+    for-in "^1.0.1"
+
+for-own@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
   dependencies:
     for-in "^1.0.1"
 
 fs-exists-sync@^0.1.0:
   version "0.1.0"
-  resolved "http://registry.npm.qima-inc.com/fs-exists-sync/download/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 gaze@^0.5.1:
   version "0.5.2"
-  resolved "http://registry.npm.qima-inc.com/gaze/download/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
+  resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
   dependencies:
     globule "~0.1.0"
 
 get-stdin@^4.0.1:
   version "4.0.1"
-  resolved "http://registry.npm.qima-inc.com/get-stdin/download/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
 glob-base@^0.3.0:
   version "0.3.0"
-  resolved "http://registry.npm.qima-inc.com/glob-base/download/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
 
 glob-parent@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.qima-inc.com/glob-parent/download/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
   dependencies:
     is-glob "^2.0.0"
 
 glob-stream@^3.1.5:
   version "3.1.18"
-  resolved "http://registry.npm.qima-inc.com/glob-stream/download/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
   dependencies:
     glob "^4.3.1"
     glob2base "^0.0.12"
@@ -477,19 +492,19 @@ glob-stream@^3.1.5:
 
 glob-watcher@^0.0.6:
   version "0.0.6"
-  resolved "http://registry.npm.qima-inc.com/glob-watcher/download/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
+  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
   dependencies:
     gaze "^0.5.1"
 
 glob2base@^0.0.12:
   version "0.0.12"
-  resolved "http://registry.npm.qima-inc.com/glob2base/download/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
+  resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
   dependencies:
     find-index "^0.1.1"
 
 glob@^4.3.1:
   version "4.5.3"
-  resolved "http://registry.npm.qima-inc.com/glob/download/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -497,19 +512,19 @@ glob@^4.3.1:
     once "^1.3.0"
 
 glob@^7.0.3, glob@^7.1.1:
-  version "7.1.1"
-  resolved "http://registry.npm.qima-inc.com/glob/download/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.2"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
 glob@~3.1.21:
   version "3.1.21"
-  resolved "http://registry.npm.qima-inc.com/glob/download/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
   dependencies:
     graceful-fs "~1.2.0"
     inherits "1"
@@ -517,14 +532,14 @@ glob@~3.1.21:
 
 global-modules@^0.2.3:
   version "0.2.3"
-  resolved "http://registry.npm.qima-inc.com/global-modules/download/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
   dependencies:
     global-prefix "^0.1.4"
     is-windows "^0.2.0"
 
 global-prefix@^0.1.4:
   version "0.1.5"
-  resolved "http://registry.npm.qima-inc.com/global-prefix/download/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
   dependencies:
     homedir-polyfill "^1.0.0"
     ini "^1.3.4"
@@ -543,7 +558,7 @@ globby@^6.1.0:
 
 globule@~0.1.0:
   version "0.1.0"
-  resolved "http://registry.npm.qima-inc.com/globule/download/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
   dependencies:
     glob "~3.1.21"
     lodash "~1.0.1"
@@ -551,31 +566,31 @@ globule@~0.1.0:
 
 glogg@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/glogg/download/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
+  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
   dependencies:
     sparkles "^1.0.0"
 
 graceful-fs@^3.0.0:
   version "3.0.11"
-  resolved "http://registry.npm.qima-inc.com/graceful-fs/download/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
   dependencies:
     natives "^1.1.0"
 
 graceful-fs@^4.1.2, graceful-fs@~4.1.4:
   version "4.1.11"
-  resolved "http://registry.npm.qima-inc.com/graceful-fs/download/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
 graceful-fs@~1.2.0:
   version "1.2.3"
-  resolved "http://registry.npm.qima-inc.com/graceful-fs/download/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
 
 graceful-fs@~2.0.0:
   version "2.0.3"
-  resolved "http://registry.npm.qima-inc.com/graceful-fs/download/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/graceful-readlink/download/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
 gulp-cssmin@^0.2.0:
   version "0.2.0"
@@ -600,13 +615,13 @@ gulp-postcss@^7.0.0:
 
 gulp-rename@~1.1.0:
   version "1.1.0"
-  resolved "http://registry.npm.qima-inc.com/gulp-rename/download/gulp-rename-1.1.0.tgz#93090aaaf4d386c07f20538a6888f15efba727a1"
+  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.1.0.tgz#93090aaaf4d386c07f20538a6888f15efba727a1"
   dependencies:
     map-stream ">=0.0.4"
 
 gulp-util@^3.0.0, gulp-util@^3.0.8:
   version "3.0.8"
-  resolved "http://registry.npm.qima-inc.com/gulp-util/download/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
+  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
   dependencies:
     array-differ "^1.0.0"
     array-uniq "^1.0.2"
@@ -629,7 +644,7 @@ gulp-util@^3.0.0, gulp-util@^3.0.8:
 
 gulp-util@~2.2.0:
   version "2.2.20"
-  resolved "http://registry.npm.qima-inc.com/gulp-util/download/gulp-util-2.2.20.tgz#d7146e5728910bd8f047a6b0b1e549bc22dbd64c"
+  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-2.2.20.tgz#d7146e5728910bd8f047a6b0b1e549bc22dbd64c"
   dependencies:
     chalk "^0.5.0"
     dateformat "^1.0.7-1.2.3"
@@ -642,7 +657,7 @@ gulp-util@~2.2.0:
 
 gulp@^3.9.1:
   version "3.9.1"
-  resolved "http://registry.npm.qima-inc.com/gulp/download/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
+  resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
   dependencies:
     archy "^1.0.0"
     chalk "^1.0.0"
@@ -660,25 +675,25 @@ gulp@^3.9.1:
 
 gulplog@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/gulplog/download/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
+  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
   dependencies:
     glogg "^1.0.0"
 
 has-ansi@^0.1.0:
   version "0.1.0"
-  resolved "http://registry.npm.qima-inc.com/has-ansi/download/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
   dependencies:
     ansi-regex "^0.2.0"
 
 has-ansi@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.qima-inc.com/has-ansi/download/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
   dependencies:
     ansi-regex "^2.0.0"
 
 has-flag@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/has-flag/download/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
 
 has-flag@^2.0.0:
   version "2.0.0"
@@ -686,23 +701,23 @@ has-flag@^2.0.0:
 
 has-gulplog@^0.1.0:
   version "0.1.0"
-  resolved "http://registry.npm.qima-inc.com/has-gulplog/download/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
+  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
   dependencies:
     sparkles "^1.0.0"
 
-homedir-polyfill@^1.0.0:
+homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
   version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/homedir-polyfill/download/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.4.2"
-  resolved "http://registry.npm.qima-inc.com/hosted-git-info/download/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
 
 indent-string@^2.1.0:
   version "2.1.0"
-  resolved "http://registry.npm.qima-inc.com/indent-string/download/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
   dependencies:
     repeating "^2.0.0"
 
@@ -712,65 +727,69 @@ indexes-of@^1.0.1:
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "http://registry.npm.qima-inc.com/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
 inherits@1:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/inherits/download/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
 
-inherits@2, inherits@~2.0.1:
+inherits@2, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
-  resolved "http://registry.npm.qima-inc.com/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
 ini@^1.3.4:
   version "1.3.4"
-  resolved "http://registry.npm.qima-inc.com/ini/download/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
 interpret@^1.0.0:
   version "1.0.3"
-  resolved "http://registry.npm.qima-inc.com/interpret/download/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
 
 is-absolute@^0.2.3:
   version "0.2.6"
-  resolved "http://registry.npm.qima-inc.com/is-absolute/download/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
   dependencies:
     is-relative "^0.2.1"
     is-windows "^0.2.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "http://registry.npm.qima-inc.com/is-arrayish/download/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
 
-is-buffer@^1.0.2:
+is-buffer@^1.1.5:
   version "1.1.5"
-  resolved "http://registry.npm.qima-inc.com/is-buffer/download/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/is-builtin-module/download/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
   dependencies:
     builtin-modules "^1.0.0"
 
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
 is-dotfile@^1.0.0:
-  version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/is-dotfile/download/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
-  resolved "http://registry.npm.qima-inc.com/is-equal-shallow/download/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
   dependencies:
     is-primitive "^2.0.0"
 
 is-extendable@^0.1.1:
   version "0.1.1"
-  resolved "http://registry.npm.qima-inc.com/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
 
 is-extglob@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/is-extglob/download/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
 is-extglob@^2.1.0:
   version "2.1.1"
@@ -778,13 +797,13 @@ is-extglob@^2.1.0:
 
 is-finite@^1.0.0:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/is-finite/download/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
   dependencies:
     number-is-nan "^1.0.0"
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
-  resolved "http://registry.npm.qima-inc.com/is-glob/download/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
   dependencies:
     is-extglob "^1.0.0"
 
@@ -794,78 +813,100 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-number@^2.0.2, is-number@^2.1.0:
+is-number@^2.1.0:
   version "2.1.0"
-  resolved "http://registry.npm.qima-inc.com/is-number/download/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-plain-object@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  dependencies:
+    isobject "^3.0.1"
+
 is-posix-bracket@^0.1.0:
   version "0.1.1"
-  resolved "http://registry.npm.qima-inc.com/is-posix-bracket/download/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
 
 is-primitive@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.qima-inc.com/is-primitive/download/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
 is-relative@^0.2.1:
   version "0.2.1"
-  resolved "http://registry.npm.qima-inc.com/is-relative/download/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
   dependencies:
     is-unc-path "^0.1.1"
 
 is-unc-path@^0.1.1:
   version "0.1.2"
-  resolved "http://registry.npm.qima-inc.com/is-unc-path/download/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9"
   dependencies:
     unc-path-regex "^0.1.0"
 
 is-utf8@^0.2.0:
   version "0.2.1"
-  resolved "http://registry.npm.qima-inc.com/is-utf8/download/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
 is-windows@^0.2.0:
   version "0.2.0"
-  resolved "http://registry.npm.qima-inc.com/is-windows/download/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
 
 isarray@0.0.1:
   version "0.0.1"
-  resolved "http://registry.npm.qima-inc.com/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.qima-inc.com/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
 
-isobject@^2.0.0:
+isobject@^2.0.0, isobject@^2.1.0:
   version "2.1.0"
-  resolved "http://registry.npm.qima-inc.com/isobject/download/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
   dependencies:
     isarray "1.0.0"
 
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+
 js-base64@^2.1.9:
   version "2.1.9"
-  resolved "http://registry.npm.qima-inc.com/js-base64/download/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
 js-yaml@^3.4.3:
-  version "3.8.3"
-  resolved "http://registry.npm.qima-inc.com/js-yaml/download/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766"
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
   dependencies:
     argparse "^1.0.7"
-    esprima "^3.1.1"
+    esprima "^4.0.0"
 
 kind-of@^3.0.2:
-  version "3.1.0"
-  resolved "http://registry.npm.qima-inc.com/kind-of/download/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
-    is-buffer "^1.0.2"
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
 
 liftoff@^2.1.0:
   version "2.3.0"
-  resolved "http://registry.npm.qima-inc.com/liftoff/download/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
   dependencies:
     extend "^3.0.0"
     findup-sync "^0.4.2"
@@ -879,7 +920,7 @@ liftoff@^2.1.0:
 
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "http://registry.npm.qima-inc.com/load-json-file/download/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -889,133 +930,125 @@ load-json-file@^1.0.0:
 
 lodash._basecopy@^3.0.0:
   version "3.0.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._basecopy/download/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
 
 lodash._basetostring@^3.0.0:
   version "3.0.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._basetostring/download/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
+  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
 
 lodash._basevalues@^3.0.0:
   version "3.0.0"
-  resolved "http://registry.npm.qima-inc.com/lodash._basevalues/download/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
+  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
 
 lodash._escapehtmlchar@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._escapehtmlchar/download/lodash._escapehtmlchar-2.4.1.tgz#df67c3bb6b7e8e1e831ab48bfa0795b92afe899d"
+  resolved "https://registry.yarnpkg.com/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz#df67c3bb6b7e8e1e831ab48bfa0795b92afe899d"
   dependencies:
     lodash._htmlescapes "~2.4.1"
 
 lodash._escapestringchar@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._escapestringchar/download/lodash._escapestringchar-2.4.1.tgz#ecfe22618a2ade50bfeea43937e51df66f0edb72"
+  resolved "https://registry.yarnpkg.com/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz#ecfe22618a2ade50bfeea43937e51df66f0edb72"
 
 lodash._getnative@^3.0.0:
   version "3.9.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._getnative/download/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
 
 lodash._htmlescapes@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._htmlescapes/download/lodash._htmlescapes-2.4.1.tgz#32d14bf0844b6de6f8b62a051b4f67c228b624cb"
+  resolved "https://registry.yarnpkg.com/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz#32d14bf0844b6de6f8b62a051b4f67c228b624cb"
 
 lodash._isiterateecall@^3.0.0:
   version "3.0.9"
-  resolved "http://registry.npm.qima-inc.com/lodash._isiterateecall/download/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
 
 lodash._isnative@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._isnative/download/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c"
+  resolved "https://registry.yarnpkg.com/lodash._isnative/-/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c"
 
 lodash._objecttypes@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._objecttypes/download/lodash._objecttypes-2.4.1.tgz#7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"
+  resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz#7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"
 
 lodash._reescape@^3.0.0:
   version "3.0.0"
-  resolved "http://registry.npm.qima-inc.com/lodash._reescape/download/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
+  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
 
 lodash._reevaluate@^3.0.0:
   version "3.0.0"
-  resolved "http://registry.npm.qima-inc.com/lodash._reevaluate/download/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
+  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
 
 lodash._reinterpolate@^2.4.1, lodash._reinterpolate@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._reinterpolate/download/lodash._reinterpolate-2.4.1.tgz#4f1227aa5a8711fc632f5b07a1f4607aab8b3222"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz#4f1227aa5a8711fc632f5b07a1f4607aab8b3222"
 
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
-  resolved "http://registry.npm.qima-inc.com/lodash._reinterpolate/download/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
 
 lodash._reunescapedhtml@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._reunescapedhtml/download/lodash._reunescapedhtml-2.4.1.tgz#747c4fc40103eb3bb8a0976e571f7a2659e93ba7"
+  resolved "https://registry.yarnpkg.com/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz#747c4fc40103eb3bb8a0976e571f7a2659e93ba7"
   dependencies:
     lodash._htmlescapes "~2.4.1"
     lodash.keys "~2.4.1"
 
 lodash._root@^3.0.0:
   version "3.0.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._root/download/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
+  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
 
 lodash._shimkeys@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash._shimkeys/download/lodash._shimkeys-2.4.1.tgz#6e9cc9666ff081f0b5a6c978b83e242e6949d203"
+  resolved "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz#6e9cc9666ff081f0b5a6c978b83e242e6949d203"
   dependencies:
     lodash._objecttypes "~2.4.1"
 
-lodash.assignwith@^4.0.7:
-  version "4.2.0"
-  resolved "http://registry.npm.qima-inc.com/lodash.assignwith/download/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb"
-
 lodash.defaults@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash.defaults/download/lodash.defaults-2.4.1.tgz#a7e8885f05e68851144b6e12a8f3678026bc4c54"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-2.4.1.tgz#a7e8885f05e68851144b6e12a8f3678026bc4c54"
   dependencies:
     lodash._objecttypes "~2.4.1"
     lodash.keys "~2.4.1"
 
 lodash.escape@^3.0.0:
   version "3.2.0"
-  resolved "http://registry.npm.qima-inc.com/lodash.escape/download/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
+  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
   dependencies:
     lodash._root "^3.0.0"
 
 lodash.escape@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash.escape/download/lodash.escape-2.4.1.tgz#2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4"
+  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-2.4.1.tgz#2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4"
   dependencies:
     lodash._escapehtmlchar "~2.4.1"
     lodash._reunescapedhtml "~2.4.1"
     lodash.keys "~2.4.1"
 
 lodash.isarguments@^3.0.0:
-  version "3.0.9"
-  resolved "http://registry.npm.qima-inc.com/lodash.isarguments/download/lodash.isarguments-3.0.9.tgz#3c4994a4210f340d49ccfafa62176296207d8675"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
 
 lodash.isarray@^3.0.0:
   version "3.0.4"
-  resolved "http://registry.npm.qima-inc.com/lodash.isarray/download/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-
-lodash.isempty@^4.2.1:
-  version "4.4.0"
-  resolved "http://registry.npm.qima-inc.com/lodash.isempty/download/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
 lodash.isobject@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash.isobject/download/lodash.isobject-2.4.1.tgz#5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"
+  resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.4.1.tgz#5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"
   dependencies:
     lodash._objecttypes "~2.4.1"
 
 lodash.isplainobject@^4.0.4:
   version "4.0.6"
-  resolved "http://registry.npm.qima-inc.com/lodash.isplainobject/download/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
 
 lodash.isstring@^4.0.1:
   version "4.0.1"
-  resolved "http://registry.npm.qima-inc.com/lodash.isstring/download/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
 
 lodash.keys@^3.0.0:
   version "3.1.2"
-  resolved "http://registry.npm.qima-inc.com/lodash.keys/download/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
   dependencies:
     lodash._getnative "^3.0.0"
     lodash.isarguments "^3.0.0"
@@ -1023,7 +1056,7 @@ lodash.keys@^3.0.0:
 
 lodash.keys@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash.keys/download/lodash.keys-2.4.1.tgz#48dea46df8ff7632b10d706b8acb26591e2b3727"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.4.1.tgz#48dea46df8ff7632b10d706b8acb26591e2b3727"
   dependencies:
     lodash._isnative "~2.4.1"
     lodash._shimkeys "~2.4.1"
@@ -1031,19 +1064,15 @@ lodash.keys@~2.4.1:
 
 lodash.mapvalues@^4.4.0:
   version "4.6.0"
-  resolved "http://registry.npm.qima-inc.com/lodash.mapvalues/download/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
-
-lodash.pick@^4.2.1:
-  version "4.4.0"
-  resolved "http://registry.npm.qima-inc.com/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
 
 lodash.restparam@^3.0.0:
   version "3.6.1"
-  resolved "http://registry.npm.qima-inc.com/lodash.restparam/download/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
 
 lodash.template@^2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash.template/download/lodash.template-2.4.1.tgz#9e611007edf629129a974ab3c48b817b3e1cf20d"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-2.4.1.tgz#9e611007edf629129a974ab3c48b817b3e1cf20d"
   dependencies:
     lodash._escapestringchar "~2.4.1"
     lodash._reinterpolate "~2.4.1"
@@ -1055,7 +1084,7 @@ lodash.template@^2.4.1:
 
 lodash.template@^3.0.0:
   version "3.6.2"
-  resolved "http://registry.npm.qima-inc.com/lodash.template/download/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
   dependencies:
     lodash._basecopy "^3.0.0"
     lodash._basetostring "^3.0.0"
@@ -1069,21 +1098,21 @@ lodash.template@^3.0.0:
 
 lodash.templatesettings@^3.0.0:
   version "3.1.1"
-  resolved "http://registry.npm.qima-inc.com/lodash.templatesettings/download/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
   dependencies:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
 lodash.templatesettings@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash.templatesettings/download/lodash.templatesettings-2.4.1.tgz#ea76c75d11eb86d4dbe89a83893bb861929ac699"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz#ea76c75d11eb86d4dbe89a83893bb861929ac699"
   dependencies:
     lodash._reinterpolate "~2.4.1"
     lodash.escape "~2.4.1"
 
 lodash.values@~2.4.1:
   version "2.4.1"
-  resolved "http://registry.npm.qima-inc.com/lodash.values/download/lodash.values-2.4.1.tgz#abf514436b3cb705001627978cbcf30b1280eea4"
+  resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-2.4.1.tgz#abf514436b3cb705001627978cbcf30b1280eea4"
   dependencies:
     lodash.keys "~2.4.1"
 
@@ -1093,34 +1122,38 @@ lodash@^4.17.4:
 
 lodash@~1.0.1:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/lodash/download/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
 
 loud-rejection@^1.0.0:
   version "1.6.0"
-  resolved "http://registry.npm.qima-inc.com/loud-rejection/download/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
 lru-cache@2:
   version "2.7.3"
-  resolved "http://registry.npm.qima-inc.com/lru-cache/download/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
 
 map-cache@^0.2.0:
   version "0.2.2"
-  resolved "http://registry.npm.qima-inc.com/map-cache/download/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/map-obj/download/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
-map-stream@0.0.4, map-stream@>=0.0.4:
+map-stream@0.0.4:
   version "0.0.4"
-  resolved "http://registry.npm.qima-inc.com/map-stream/download/map-stream-0.0.4.tgz#5ec6de90213ef6c7b2eb9367e9ade8da4efdb68b"
+  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.4.tgz#5ec6de90213ef6c7b2eb9367e9ade8da4efdb68b"
+
+map-stream@>=0.0.4:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
 
 meow@^3.3.0:
   version "3.7.0"
-  resolved "http://registry.npm.qima-inc.com/meow/download/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -1135,7 +1168,7 @@ meow@^3.3.0:
 
 micromatch@^2.3.7:
   version "2.3.11"
-  resolved "http://registry.npm.qima-inc.com/micromatch/download/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -1153,54 +1186,54 @@ micromatch@^2.3.7:
 
 minimatch@^2.0.1:
   version "2.0.10"
-  resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
   dependencies:
     brace-expansion "^1.0.0"
 
-minimatch@^3.0.2:
-  version "3.0.3"
-  resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
-    brace-expansion "^1.0.0"
+    brace-expansion "^1.1.7"
 
 minimatch@~0.2.11:
   version "0.2.14"
-  resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
   dependencies:
     lru-cache "2"
     sigmund "~1.0.0"
 
 minimist@0.0.8:
   version "0.0.8"
-  resolved "http://registry.npm.qima-inc.com/minimist/download/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
 minimist@^0.2.0:
   version "0.2.0"
-  resolved "http://registry.npm.qima-inc.com/minimist/download/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce"
 
 minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
-  resolved "http://registry.npm.qima-inc.com/minimist/download/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
 mkdirp@^0.5.0:
   version "0.5.1"
-  resolved "http://registry.npm.qima-inc.com/mkdirp/download/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
 multipipe@^0.1.0, multipipe@^0.1.2:
   version "0.1.2"
-  resolved "http://registry.npm.qima-inc.com/multipipe/download/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
+  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
   dependencies:
     duplexer2 "0.0.2"
 
 natives@^1.1.0:
   version "1.1.0"
-  resolved "http://registry.npm.qima-inc.com/natives/download/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
+  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.3.6"
-  resolved "http://registry.npm.qima-inc.com/normalize-package-data/download/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -1209,46 +1242,67 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
 
 normalize-path@^2.0.1:
   version "2.1.1"
-  resolved "http://registry.npm.qima-inc.com/normalize-path/download/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-range@^0.1.2:
   version "0.1.2"
-  resolved "http://registry.npm.qima-inc.com/normalize-range/download/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
 num2fraction@^1.2.2:
   version "1.2.2"
-  resolved "http://registry.npm.qima-inc.com/num2fraction/download/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
 
 number-is-nan@^1.0.0:
   version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/number-is-nan/download/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
 object-assign@^3.0.0:
   version "3.0.0"
-  resolved "http://registry.npm.qima-inc.com/object-assign/download/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
 
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
-  resolved "http://registry.npm.qima-inc.com/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object.defaults@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
+  dependencies:
+    array-each "^1.0.1"
+    array-slice "^1.0.0"
+    for-own "^1.0.0"
+    isobject "^3.0.0"
 
 object.omit@^2.0.0:
   version "2.0.1"
-  resolved "http://registry.npm.qima-inc.com/object.omit/download/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
-once@^1.3.0, once@~1.3.0:
+object.pick@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.2.0.tgz#b5392bee9782da6d9fb7d6afaf539779f1234c2b"
+  dependencies:
+    isobject "^2.1.0"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+once@~1.3.0:
   version "1.3.3"
-  resolved "http://registry.npm.qima-inc.com/once/download/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
   dependencies:
     wrappy "1"
 
 orchestrator@^0.3.0:
   version "0.3.8"
-  resolved "http://registry.npm.qima-inc.com/orchestrator/download/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
+  resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
   dependencies:
     end-of-stream "~0.1.5"
     sequencify "~0.0.7"
@@ -1256,15 +1310,15 @@ orchestrator@^0.3.0:
 
 ordered-read-streams@^0.1.0:
   version "0.1.0"
-  resolved "http://registry.npm.qima-inc.com/ordered-read-streams/download/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
+  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
 
 os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/os-homedir/download/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
 parse-filepath@^1.0.1:
   version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/parse-filepath/download/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
+  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
   dependencies:
     is-absolute "^0.2.3"
     map-cache "^0.2.0"
@@ -1272,7 +1326,7 @@ parse-filepath@^1.0.1:
 
 parse-glob@^3.0.4:
   version "3.0.4"
-  resolved "http://registry.npm.qima-inc.com/parse-glob/download/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -1281,41 +1335,41 @@ parse-glob@^3.0.4:
 
 parse-json@^2.2.0:
   version "2.2.0"
-  resolved "http://registry.npm.qima-inc.com/parse-json/download/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
   dependencies:
     error-ex "^1.2.0"
 
 parse-passwd@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/parse-passwd/download/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
 path-exists@^2.0.0:
   version "2.1.0"
-  resolved "http://registry.npm.qima-inc.com/path-exists/download/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/path-is-absolute/download/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
 path-parse@^1.0.5:
   version "1.0.5"
-  resolved "http://registry.npm.qima-inc.com/path-parse/download/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
 path-root-regex@^0.1.0:
   version "0.1.2"
-  resolved "http://registry.npm.qima-inc.com/path-root-regex/download/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
 
 path-root@^0.1.1:
   version "0.1.1"
-  resolved "http://registry.npm.qima-inc.com/path-root/download/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
   dependencies:
     path-root-regex "^0.1.0"
 
 path-type@^1.0.0:
   version "1.1.0"
-  resolved "http://registry.npm.qima-inc.com/path-type/download/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -1323,21 +1377,21 @@ path-type@^1.0.0:
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
-  resolved "http://registry.npm.qima-inc.com/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
-  resolved "http://registry.npm.qima-inc.com/pinkie-promise/download/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
-  resolved "http://registry.npm.qima-inc.com/pinkie/download/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
 postcss-advanced-variables@1.2.2:
   version "1.2.2"
-  resolved "http://registry.npm.qima-inc.com/postcss-advanced-variables/download/postcss-advanced-variables-1.2.2.tgz#90a6213262e66a050a368b4a9c5d4778d72dbd74"
+  resolved "https://registry.yarnpkg.com/postcss-advanced-variables/-/postcss-advanced-variables-1.2.2.tgz#90a6213262e66a050a368b4a9c5d4778d72dbd74"
   dependencies:
     postcss "^5.0.10"
 
@@ -1425,7 +1479,7 @@ postcss-js@^1.0.0:
 
 postcss-load-config@^1.2.0:
   version "1.2.0"
-  resolved "http://registry.npm.qima-inc.com/postcss-load-config/download/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
   dependencies:
     cosmiconfig "^2.1.0"
     object-assign "^4.1.0"
@@ -1434,14 +1488,14 @@ postcss-load-config@^1.2.0:
 
 postcss-load-options@^1.2.0:
   version "1.2.0"
-  resolved "http://registry.npm.qima-inc.com/postcss-load-options/download/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
+  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
   dependencies:
     cosmiconfig "^2.1.0"
     object-assign "^4.1.0"
 
 postcss-load-plugins@^2.3.0:
   version "2.3.0"
-  resolved "http://registry.npm.qima-inc.com/postcss-load-plugins/download/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
+  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
   dependencies:
     cosmiconfig "^2.1.1"
     object-assign "^4.1.0"
@@ -1454,7 +1508,7 @@ postcss-media-minmax@^3.0.0:
 
 postcss-message-helpers@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.qima-inc.com/postcss-message-helpers/download/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
 
 postcss-mixins@^6.0.1:
   version "6.0.1"
@@ -1467,10 +1521,10 @@ postcss-mixins@^6.0.1:
     sugarss "^1.0.0"
 
 postcss-nested@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.1.0.tgz#72661d79463f5894a8c4b890479baec689d1c693"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.1.2.tgz#04057281f9631fef684857fb0119bae04ede03c6"
   dependencies:
-    postcss "^6.0.8"
+    postcss "^6.0.9"
     postcss-selector-parser "^2.2.3"
 
 postcss-nesting@^4.0.1:
@@ -1524,24 +1578,24 @@ postcss-simple-vars@^4.0.0:
 
 postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
   version "3.3.0"
-  resolved "http://registry.npm.qima-inc.com/postcss-value-parser/download/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
 
 postcss@^5.0.10, postcss@^5.0.14, postcss@^5.0.15, postcss@^5.0.4, postcss@^5.0.5:
   version "5.2.17"
-  resolved "http://registry.npm.qima-inc.com/postcss/download/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
     chalk "^1.1.3"
     js-base64 "^2.1.9"
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.8:
-  version "6.0.8"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.8.tgz#89067a9ce8b11f8a84cbc5117efc30419a0857b3"
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.9:
+  version "6.0.9"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.9.tgz#54819766784a51c65b1ec4d54c2f93765438c35a"
   dependencies:
-    chalk "^2.0.1"
+    chalk "^2.1.0"
     source-map "^0.5.6"
-    supports-color "^4.2.0"
+    supports-color "^4.2.1"
 
 precss@^2.0.0:
   version "2.0.0"
@@ -1566,15 +1620,15 @@ precss@^2.0.0:
 
 preserve@^0.2.0:
   version "0.2.0"
-  resolved "http://registry.npm.qima-inc.com/preserve/download/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 pretty-hrtime@^1.0.0:
   version "1.0.3"
-  resolved "http://registry.npm.qima-inc.com/pretty-hrtime/download/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
+  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
-  resolved "http://registry.npm.qima-inc.com/process-nextick-args/download/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
 promise-each@^2.2.0:
   version "2.2.0"
@@ -1583,28 +1637,28 @@ promise-each@^2.2.0:
     any-promise "^0.1.0"
 
 randomatic@^1.1.3:
-  version "1.1.6"
-  resolved "http://registry.npm.qima-inc.com/randomatic/download/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
   dependencies:
-    is-number "^2.0.2"
-    kind-of "^3.0.2"
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
 
 read-cache@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
   dependencies:
     pify "^2.3.0"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/read-pkg-up/download/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
 read-pkg@^1.0.0:
   version "1.1.0"
-  resolved "http://registry.npm.qima-inc.com/read-pkg/download/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -1612,7 +1666,7 @@ read-pkg@^1.0.0:
 
 "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17:
   version "1.0.34"
-  resolved "http://registry.npm.qima-inc.com/readable-stream/download/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -1620,20 +1674,20 @@ read-pkg@^1.0.0:
     string_decoder "~0.10.x"
 
 readable-stream@^2.1.5:
-  version "2.2.9"
-  resolved "http://registry.npm.qima-inc.com/readable-stream/download/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies:
-    buffer-shims "~1.0.0"
     core-util-is "~1.0.0"
-    inherits "~2.0.1"
+    inherits "~2.0.3"
     isarray "~1.0.0"
     process-nextick-args "~1.0.6"
-    string_decoder "~1.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
 readable-stream@~1.1.9:
   version "1.1.14"
-  resolved "http://registry.npm.qima-inc.com/readable-stream/download/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -1642,157 +1696,165 @@ readable-stream@~1.1.9:
 
 rechoir@^0.6.2:
   version "0.6.2"
-  resolved "http://registry.npm.qima-inc.com/rechoir/download/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/redent/download/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
 regex-cache@^0.4.2:
   version "0.4.3"
-  resolved "http://registry.npm.qima-inc.com/regex-cache/download/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
   dependencies:
     is-equal-shallow "^0.1.3"
     is-primitive "^2.0.0"
 
 remove-trailing-separator@^1.0.1:
-  version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/remove-trailing-separator/download/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz#69b062d978727ad14dc6b56ba4ab772fd8d70511"
 
 repeat-element@^1.1.2:
   version "1.1.2"
-  resolved "http://registry.npm.qima-inc.com/repeat-element/download/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
 
 repeat-string@^1.5.2:
   version "1.6.1"
-  resolved "http://registry.npm.qima-inc.com/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
 repeating@^2.0.0:
   version "2.0.1"
-  resolved "http://registry.npm.qima-inc.com/repeating/download/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
   dependencies:
     is-finite "^1.0.0"
 
 replace-ext@0.0.1:
   version "0.0.1"
-  resolved "http://registry.npm.qima-inc.com/replace-ext/download/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
 
 require-from-string@^1.1.0:
   version "1.2.1"
-  resolved "http://registry.npm.qima-inc.com/require-from-string/download/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
 
 resolve-dir@^0.1.0:
   version "0.1.1"
-  resolved "http://registry.npm.qima-inc.com/resolve-dir/download/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
   dependencies:
     expand-tilde "^1.2.2"
     global-modules "^0.2.3"
 
 resolve@^1.1.6, resolve@^1.1.7:
-  version "1.3.2"
-  resolved "http://registry.npm.qima-inc.com/resolve/download/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
   dependencies:
     path-parse "^1.0.5"
 
 rgb@~0.1.0:
   version "0.1.0"
-  resolved "http://registry.npm.qima-inc.com/rgb/download/rgb-0.1.0.tgz#be27b291e8feffeac1bd99729721bfa40fc037b5"
+  resolved "https://registry.yarnpkg.com/rgb/-/rgb-0.1.0.tgz#be27b291e8feffeac1bd99729721bfa40fc037b5"
 
-"semver@2 || 3 || 4 || 5", semver@^4.1.0:
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+
+"semver@2 || 3 || 4 || 5":
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+
+semver@^4.1.0:
   version "4.3.6"
-  resolved "http://registry.npm.qima-inc.com/semver/download/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
 
 sequencify@~0.0.7:
   version "0.0.7"
-  resolved "http://registry.npm.qima-inc.com/sequencify/download/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
+  resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
 
 sigmund@~1.0.0:
   version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/sigmund/download/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
 
 signal-exit@^3.0.0:
   version "3.0.2"
-  resolved "http://registry.npm.qima-inc.com/signal-exit/download/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
 source-map@0.4.x:
   version "0.4.4"
-  resolved "http://registry.npm.qima-inc.com/source-map/download/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.1, source-map@^0.5.6:
   version "0.5.6"
-  resolved "http://registry.npm.qima-inc.com/source-map/download/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
 sparkles@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/sparkles/download/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
+  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
 
 spdx-correct@~1.0.0:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/spdx-correct/download/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
   dependencies:
     spdx-license-ids "^1.0.2"
 
 spdx-expression-parse@~1.0.0:
   version "1.0.4"
-  resolved "http://registry.npm.qima-inc.com/spdx-expression-parse/download/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
 
 spdx-license-ids@^1.0.2:
   version "1.2.2"
-  resolved "http://registry.npm.qima-inc.com/spdx-license-ids/download/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "http://registry.npm.qima-inc.com/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
 stream-consume@~0.1.0:
   version "0.1.0"
-  resolved "http://registry.npm.qima-inc.com/stream-consume/download/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
+  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
 
 string_decoder@~0.10.x:
   version "0.10.31"
-  resolved "http://registry.npm.qima-inc.com/string_decoder/download/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.0:
-  version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/string_decoder/download/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
+string_decoder@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:
-    buffer-shims "~1.0.0"
+    safe-buffer "~5.1.0"
 
 strip-ansi@^0.3.0:
   version "0.3.0"
-  resolved "http://registry.npm.qima-inc.com/strip-ansi/download/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
   dependencies:
     ansi-regex "^0.2.1"
 
 strip-ansi@^3.0.0:
   version "3.0.1"
-  resolved "http://registry.npm.qima-inc.com/strip-ansi/download/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-bom@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/strip-bom/download/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
   dependencies:
     first-chunk-stream "^1.0.0"
     is-utf8 "^0.2.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.qima-inc.com/strip-bom/download/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-indent@^1.0.1:
   version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/strip-indent/download/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
   dependencies:
     get-stdin "^4.0.1"
 
@@ -1804,19 +1866,19 @@ sugarss@^1.0.0:
 
 supports-color@^0.2.0:
   version "0.2.0"
-  resolved "http://registry.npm.qima-inc.com/supports-color/download/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
 
 supports-color@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.qima-inc.com/supports-color/download/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
 supports-color@^3.2.3:
   version "3.2.3"
-  resolved "http://registry.npm.qima-inc.com/supports-color/download/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0, supports-color@^4.2.0:
+supports-color@^4.0.0, supports-color@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
   dependencies:
@@ -1824,59 +1886,59 @@ supports-color@^4.0.0, supports-color@^4.2.0:
 
 tcomb@^2.5.1:
   version "2.7.0"
-  resolved "http://registry.npm.qima-inc.com/tcomb/download/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
+  resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
 
 temp-write@~0.1.0:
   version "0.1.1"
-  resolved "http://registry.npm.qima-inc.com/temp-write/download/temp-write-0.1.1.tgz#0b6467838dd77fbf7f62a0c93da879732ffda932"
+  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-0.1.1.tgz#0b6467838dd77fbf7f62a0c93da879732ffda932"
   dependencies:
     graceful-fs "~2.0.0"
     tempfile "~0.1.2"
 
 tempfile@~0.1.2:
   version "0.1.3"
-  resolved "http://registry.npm.qima-inc.com/tempfile/download/tempfile-0.1.3.tgz#7d6b710047339d39f847327a056dadf183103010"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-0.1.3.tgz#7d6b710047339d39f847327a056dadf183103010"
   dependencies:
     uuid "~1.4.0"
 
 through2@^0.5.0:
   version "0.5.1"
-  resolved "http://registry.npm.qima-inc.com/through2/download/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7"
   dependencies:
     readable-stream "~1.0.17"
     xtend "~3.0.0"
 
 through2@^0.6.1:
   version "0.6.5"
-  resolved "http://registry.npm.qima-inc.com/through2/download/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
   dependencies:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
 through2@^2.0.0:
   version "2.0.3"
-  resolved "http://registry.npm.qima-inc.com/through2/download/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
 tildify@^1.0.0:
   version "1.2.0"
-  resolved "http://registry.npm.qima-inc.com/tildify/download/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
+  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
   dependencies:
     os-homedir "^1.0.0"
 
 time-stamp@^1.0.0:
-  version "1.0.1"
-  resolved "http://registry.npm.qima-inc.com/time-stamp/download/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
 
 trim-newlines@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/trim-newlines/download/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
 unc-path-regex@^0.1.0:
   version "0.1.2"
-  resolved "http://registry.npm.qima-inc.com/unc-path-regex/download/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
 uniq@^1.0.1:
   version "1.0.1"
@@ -1884,36 +1946,36 @@ uniq@^1.0.1:
 
 unique-stream@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/unique-stream/download/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
+  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
 
 user-home@^1.1.1:
   version "1.1.1"
-  resolved "http://registry.npm.qima-inc.com/user-home/download/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
 
 util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
 uuid@~1.4.0:
   version "1.4.2"
-  resolved "http://registry.npm.qima-inc.com/uuid/download/uuid-1.4.2.tgz#453019f686966a6df83cdc5244e7c990ecc332fc"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-1.4.2.tgz#453019f686966a6df83cdc5244e7c990ecc332fc"
 
 v8flags@^2.0.2:
   version "2.1.1"
-  resolved "http://registry.npm.qima-inc.com/v8flags/download/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
   dependencies:
     user-home "^1.1.1"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.1"
-  resolved "http://registry.npm.qima-inc.com/validate-npm-package-license/download/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
   dependencies:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
 vinyl-fs@^0.3.0:
   version "0.3.14"
-  resolved "http://registry.npm.qima-inc.com/vinyl-fs/download/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
+  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
   dependencies:
     defaults "^1.0.0"
     glob-stream "^3.1.5"
@@ -1926,45 +1988,45 @@ vinyl-fs@^0.3.0:
 
 vinyl-sourcemaps-apply@^0.2.1:
   version "0.2.1"
-  resolved "http://registry.npm.qima-inc.com/vinyl-sourcemaps-apply/download/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
+  resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
   dependencies:
     source-map "^0.5.1"
 
 vinyl@^0.2.1:
   version "0.2.3"
-  resolved "http://registry.npm.qima-inc.com/vinyl/download/vinyl-0.2.3.tgz#bca938209582ec5a49ad538a00fa1f125e513252"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.2.3.tgz#bca938209582ec5a49ad538a00fa1f125e513252"
   dependencies:
     clone-stats "~0.0.1"
 
 vinyl@^0.4.0:
   version "0.4.6"
-  resolved "http://registry.npm.qima-inc.com/vinyl/download/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
   dependencies:
     clone "^0.2.0"
     clone-stats "^0.0.1"
 
 vinyl@^0.5.0:
   version "0.5.3"
-  resolved "http://registry.npm.qima-inc.com/vinyl/download/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
   dependencies:
     clone "^1.0.0"
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
 which@^1.2.12:
-  version "1.2.14"
-  resolved "http://registry.npm.qima-inc.com/which/download/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
     isexe "^2.0.0"
 
 wrappy@1:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
 "xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1:
   version "4.0.1"
-  resolved "http://registry.npm.qima-inc.com/xtend/download/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
 xtend@~3.0.0:
   version "3.0.0"
-  resolved "http://registry.npm.qima-inc.com/xtend/download/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
diff --git a/yarn.lock b/yarn.lock
index 2fe5b752b..264ead5b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6,7 +6,11 @@ abab@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
 
-abbrev@1, abbrev@1.0.x:
+abbrev@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+
+abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
 
@@ -31,7 +35,7 @@ acorn-globals@^1.0.4:
 
 acorn-globals@^3.0.0:
   version "3.1.0"
-  resolved "http://registry.npm.qima-inc.com/acorn-globals/download/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
   dependencies:
     acorn "^4.0.4"
 
@@ -103,7 +107,7 @@ amdefine@>=0.0.4:
 
 ansi-align@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.taobao.org/ansi-align/download/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
   dependencies:
     string-width "^2.0.0"
 
@@ -209,6 +213,13 @@ array-flatten@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
 
+array-includes@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
@@ -248,7 +259,7 @@ arrify@^1.0.0:
 
 asap@~2.0.3:
   version "2.0.6"
-  resolved "http://registry.npm.qima-inc.com/asap/download/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
 asn1.js@^4.0.0:
   version "4.9.1"
@@ -294,7 +305,7 @@ async-each@^1.0.0:
 
 async-foreach@^0.1.3:
   version "0.1.3"
-  resolved "http://registry.npm.qima-inc.com/async-foreach/download/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
 
 async@1.x, async@^1.4.0, async@^1.5.2:
   version "1.5.2"
@@ -790,20 +801,13 @@ babel-register@^6.24.1:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@^6.18.0, babel-runtime@^6.22.0:
+babel-runtime@6.x, babel-runtime@^6.18.0, babel-runtime@^6.22.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.25.0.tgz#33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-runtime@^6.25.0:
-  version "6.25.0"
-  resolved "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.25.0.tgz#33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
 babel-template@^6.24.1, babel-template@^6.25.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
@@ -839,7 +843,7 @@ babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25
 
 babelrc-rollup@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/babelrc-rollup/-/babelrc-rollup-3.0.0.tgz#fcecdbe3eb6400cf4e769233c1786a2fafe8b56c"
+  resolved "https://registry.yarnpkg.com/babelrc-rollup/-/babelrc-rollup-3.0.0.tgz#fcecdbe3eb6400cf4e769233c1786a2fafe8b56c"
   dependencies:
     resolve "^1.1.7"
 
@@ -904,8 +908,8 @@ big.js@^3.1.3:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
 
 binary-extensions@^1.0.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.9.0.tgz#66506c16ce6f4d6928a5b3cd6a33ca41e941e37b"
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"
 
 blob@0.0.4:
   version "0.0.4"
@@ -963,7 +967,7 @@ boom@2.x.x:
 
 boxen@^1.1.0:
   version "1.2.1"
-  resolved "http://registry.npm.taobao.org/boxen/download/boxen-1.2.1.tgz#0f11e7fe344edb9397977fc13ede7f64d956481d"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.2.1.tgz#0f11e7fe344edb9397977fc13ede7f64d956481d"
   dependencies:
     ansi-align "^2.0.0"
     camelcase "^4.0.0"
@@ -1000,7 +1004,7 @@ brorand@^1.0.1:
 
 browser-resolve@^1.11.0:
   version "1.11.2"
-  resolved "http://registry.npm.qima-inc.com/browser-resolve/download/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
   dependencies:
     resolve "1.1.7"
 
@@ -1067,11 +1071,11 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     electron-to-chromium "^1.2.7"
 
 browserslist@^2.1.5:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.3.1.tgz#39500a2090330b2a090120ea6c7fc78b6e091c5e"
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.3.3.tgz#2b0cabc4d28489f682598605858a0782f14b154c"
   dependencies:
-    caniuse-lite "^1.0.30000712"
-    electron-to-chromium "^1.3.17"
+    caniuse-lite "^1.0.30000715"
+    electron-to-chromium "^1.3.18"
 
 buffer-indexof@^1.0.0:
   version "1.1.0"
@@ -1163,16 +1167,12 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000713"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000713.tgz#ea01761840b5f148faf94ec5f34d0aa1d321966f"
+  version "1.0.30000715"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000715.tgz#0b9b5c795950dfbaf301a8806bafe87f126da8ca"
 
-caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000712:
-  version "1.0.30000713"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000713.tgz#33957ecb4a2154a5d40a60d13d8bf1cfa0881a8a"
-
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000715:
+  version "1.0.30000715"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000715.tgz#c327f5e6d907ebcec62cde598c3bf0dd793fb9a0"
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -1206,7 +1206,7 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.1:
+chalk@^2.0.1, chalk@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
   dependencies:
@@ -1247,7 +1247,7 @@ change-case@3.0.x:
 
 character-parser@^2.1.1:
   version "2.2.0"
-  resolved "http://registry.npm.qima-inc.com/character-parser/download/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
   dependencies:
     is-regex "^1.0.3"
 
@@ -1335,7 +1335,7 @@ clean-css@4.1.x:
 
 cli-boxes@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.taobao.org/cli-boxes/download/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
 
 cli-cursor@^1.0.1:
   version "1.0.2"
@@ -1399,11 +1399,11 @@ codecov@^2.2.0:
 
 coffee-script@^1.12.4:
   version "1.12.7"
-  resolved "http://registry.npm.qima-inc.com/coffee-script/download/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
+  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
 
 coffeescript-compiler@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/coffeescript-compiler/-/coffeescript-compiler-0.1.1.tgz#81a8bd44a78bda421f7e0b51f28d13c853beb805"
+  resolved "https://registry.yarnpkg.com/coffeescript-compiler/-/coffeescript-compiler-0.1.1.tgz#81a8bd44a78bda421f7e0b51f28d13c853beb805"
 
 color-convert@^1.3.0, color-convert@^1.9.0:
   version "1.9.0"
@@ -1511,15 +1511,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611"
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "~2.0.0"
-    typedarray "~0.0.5"
-
-concat-stream@^1.5.2:
+concat-stream@1.6.0, concat-stream@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -1572,7 +1564,7 @@ constant-case@^2.0.0:
 
 constantinople@^3.0.1:
   version "3.1.0"
-  resolved "http://registry.npm.qima-inc.com/constantinople/download/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"
+  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"
   dependencies:
     acorn "^3.1.0"
     is-expression "^2.0.1"
@@ -1661,7 +1653,7 @@ cross-env@^5.0.5:
 
 cross-spawn@^3.0.0:
   version "3.0.1"
-  resolved "http://registry.npm.qima-inc.com/cross-spawn/download/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
@@ -1729,7 +1721,7 @@ css-loader@^0.28.4:
 
 css-modules-loader-core@^1.0.1:
   version "1.1.0"
-  resolved "http://registry.npm.qima-inc.com/css-modules-loader-core/download/css-modules-loader-core-1.1.0.tgz#5908668294a1becd261ae0a4ce21b0b551f21d16"
+  resolved "https://registry.yarnpkg.com/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz#5908668294a1becd261ae0a4ce21b0b551f21d16"
   dependencies:
     icss-replace-symbols "1.1.0"
     postcss "6.0.1"
@@ -1740,7 +1732,7 @@ css-modules-loader-core@^1.0.1:
 
 css-parse@1.7.x:
   version "1.7.0"
-  resolved "http://registry.npm.qima-inc.com/css-parse/download/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
 
 css-select@^1.1.0, css-select@~1.2.0:
   version "1.2.0"
@@ -1868,14 +1860,10 @@ de-indent@^1.0.2:
 
 debug@*:
   version "3.0.0"
-  resolved "http://registry.npm.qima-inc.com/debug/download/debug-3.0.0.tgz#1d2feae53349047b08b264ec41906ba17a8516e4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.0.tgz#1d2feae53349047b08b264ec41906ba17a8516e4"
   dependencies:
     ms "2.0.0"
 
-debug@0.7.4, debug@~0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
-
 debug@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
@@ -1900,13 +1888,17 @@ debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.0, debug@^2.6.6, debug@^2.6.
   dependencies:
     ms "2.0.0"
 
+debug@~0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
+
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
 deep-assign@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.taobao.org/deep-assign/download/deep-assign-2.0.0.tgz#ebe06b1f07f08dae597620e3dd1622f371a1c572"
+  resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-2.0.0.tgz#ebe06b1f07f08dae597620e3dd1622f371a1c572"
   dependencies:
     is-obj "^1.0.0"
 
@@ -2015,10 +2007,14 @@ di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
 
-diff@3.2.0, diff@^3.1.0:
+diff@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
 
+diff@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.0.tgz#056695150d7aa93237ca7e378ac3b1682b7963b9"
+
 diffie-hellman@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
@@ -2032,8 +2028,8 @@ dns-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
 
 dns-packet@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.1.1.tgz#2369d45038af045f3898e6fa56862aed3f40296c"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.2.1.tgz#d0124c651d0efb969a80481dddeb25e6c2c12b44"
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -2060,7 +2056,7 @@ doctrine@^2.0.0:
 
 doctypes@^1.1.0:
   version "1.1.0"
-  resolved "http://registry.npm.qima-inc.com/doctypes/download/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
 
 dom-converter@~0.1:
   version "0.1.4"
@@ -2084,10 +2080,6 @@ dom-serializer@0, dom-serializer@~0.1.0:
     domelementtype "~1.1.1"
     entities "~1.1.1"
 
-dom-walk@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
-
 domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
@@ -2124,13 +2116,20 @@ domutils@1.1:
   dependencies:
     domelementtype "1"
 
-domutils@1.5, domutils@1.5.1, domutils@^1.5.1:
+domutils@1.5, domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
+domutils@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
 dot-case@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-2.1.1.tgz#34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"
@@ -2145,7 +2144,7 @@ duplexer2@0.0.2:
 
 duplexer@^0.1.1:
   version "0.1.1"
-  resolved "http://registry.npm.taobao.org/duplexer/download/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
 ecc-jsbn@~0.1.1:
   version "0.1.1"
@@ -2154,21 +2153,22 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
 
 editorconfig@^0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.2.tgz#8e57926d9ee69ab6cb999f027c2171467acceb35"
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34"
   dependencies:
     bluebird "^3.0.5"
     commander "^2.9.0"
     lru-cache "^3.2.0"
+    semver "^5.1.0"
     sigmund "^1.0.1"
 
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.17:
-  version "1.3.17"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.17.tgz#41c13457cc7166c5c15e767ae61d86a8cacdee5d"
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.18:
+  version "1.3.18"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz#3dcc99da3e6b665f6abbc71c28ad51a2cd731a9c"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -2297,8 +2297,8 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.26"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.26.tgz#51b2128a531b70c4f6764093a73cbebb82186372"
+  version "0.10.27"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.27.tgz#bf926b058c62b1cb5de1a887930673b6aa6d9a66"
   dependencies:
     es6-iterator "2"
     es6-symbol "~3.1"
@@ -2414,8 +2414,8 @@ eslint-module-utils@^2.1.1:
     pkg-dir "^1.0.0"
 
 eslint-plugin-html@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-3.1.1.tgz#d6c03796e89ac6b735da6fef9ca9162b423daee3"
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-3.2.0.tgz#fb64c2789e9582b97f580a38814a57966f91a7b2"
   dependencies:
     htmlparser2 "^3.8.2"
 
@@ -2460,12 +2460,12 @@ eslint-plugin-react@^6.10.3:
     object.assign "^4.0.4"
 
 eslint-plugin-react@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.1.0.tgz#27770acf39f5fd49cd0af4083ce58104eb390d4c"
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.2.1.tgz#c2673526ed6571b08c69c5f453d03f5f13e8ddbe"
   dependencies:
     doctrine "^2.0.0"
     has "^1.0.1"
-    jsx-ast-utils "^1.4.1"
+    jsx-ast-utils "^2.0.0"
 
 eslint-plugin-vue@^2.1.0:
   version "2.1.0"
@@ -2560,11 +2560,11 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
 
 estree-walker@^0.2.1:
   version "0.2.1"
-  resolved "http://registry.npm.qima-inc.com/estree-walker/download/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
 
 estree-walker@^0.3.0:
   version "0.3.1"
-  resolved "http://registry.npm.qima-inc.com/estree-walker/download/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
 
 esutils@^2.0.2:
   version "2.0.2"
@@ -2708,12 +2708,12 @@ extract-text-webpack-plugin@2.1.2:
     schema-utils "^0.3.0"
     webpack-sources "^1.0.1"
 
-extract-zip@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.5.0.tgz#92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"
+extract-zip@~1.6.5:
+  version "1.6.5"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.5.tgz#99a06735b6ea20ea9b705d779acffcc87cff0440"
   dependencies:
-    concat-stream "1.5.0"
-    debug "0.7.4"
+    concat-stream "1.6.0"
+    debug "2.2.0"
     mkdirp "0.5.0"
     yauzl "2.4.1"
 
@@ -2799,7 +2799,7 @@ filename-regex@^2.0.0:
 
 filesize@^3.5.6:
   version "3.5.10"
-  resolved "http://registry.npm.taobao.org/filesize/download/filesize-3.5.10.tgz#fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.10.tgz#fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f"
 
 fill-range@^2.1.0:
   version "2.2.3"
@@ -3032,7 +3032,7 @@ gaze@^0.5.1:
 
 gaze@^1.0.0:
   version "1.1.2"
-  resolved "http://registry.npm.qima-inc.com/gaze/download/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105"
+  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105"
   dependencies:
     globule "^1.0.0"
 
@@ -3048,7 +3048,7 @@ generate-object-property@^1.1.0:
 
 generic-names@^1.0.2:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/generic-names/download/generic-names-1.0.2.tgz#e25b7feceb5b5a8f28f5f972a7ccfe57e562adcd"
+  resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-1.0.2.tgz#e25b7feceb5b5a8f28f5f972a7ccfe57e562adcd"
   dependencies:
     loader-utils "^0.2.16"
 
@@ -3124,7 +3124,7 @@ glob2base@^0.0.12:
 
 glob@7.0.x:
   version "7.0.6"
-  resolved "http://registry.npm.qima-inc.com/glob/download/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -3198,13 +3198,6 @@ global-prefix@^0.1.4:
     is-windows "^0.2.0"
     which "^1.2.12"
 
-global@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
-  dependencies:
-    min-document "^2.19.0"
-    process "~0.5.1"
-
 globals@^9.0.0, globals@^9.14.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -3232,7 +3225,7 @@ globby@^6.1.0:
 
 globule@^1.0.0:
   version "1.2.0"
-  resolved "http://registry.npm.qima-inc.com/globule/download/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
   dependencies:
     glob "~7.1.1"
     lodash "~4.17.4"
@@ -3323,7 +3316,7 @@ gulplog@^1.0.0:
 
 gzip-size@^3.0.0:
   version "3.0.0"
-  resolved "http://registry.npm.taobao.org/gzip-size/download/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
   dependencies:
     duplexer "^0.1.1"
 
@@ -3345,15 +3338,6 @@ har-schema@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
 
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
-
 har-validator@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
@@ -3630,7 +3614,7 @@ ignore@^3.2.0:
 
 image-size@~0.5.0:
   version "0.5.5"
-  resolved "http://registry.npm.qima-inc.com/image-size/download/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -3638,7 +3622,7 @@ imurmurhash@^0.1.4:
 
 in-publish@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npm.qima-inc.com/in-publish/download/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
 
 indent-string@^2.1.0:
   version "2.1.0"
@@ -3778,14 +3762,14 @@ is-equal-shallow@^0.1.3:
 
 is-expression@^2.0.1:
   version "2.1.0"
-  resolved "http://registry.npm.qima-inc.com/is-expression/download/is-expression-2.1.0.tgz#91be9d47debcfef077977e9722be6dcfb4465ef0"
+  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-2.1.0.tgz#91be9d47debcfef077977e9722be6dcfb4465ef0"
   dependencies:
     acorn "~3.3.0"
     object-assign "^4.0.1"
 
 is-expression@^3.0.0:
   version "3.0.0"
-  resolved "http://registry.npm.qima-inc.com/is-expression/download/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
+  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
   dependencies:
     acorn "~4.0.2"
     object-assign "^4.0.1"
@@ -3838,9 +3822,9 @@ is-lower-case@^1.1.0:
 
 is-module@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/is-module/download/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
 
-is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
+is-my-json-valid@^2.10.0:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
   dependencies:
@@ -3867,7 +3851,7 @@ is-number@^3.0.0:
 
 is-obj@^1.0.0:
   version "1.0.1"
-  resolved "http://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
 is-path-cwd@^1.0.0:
   version "1.0.0"
@@ -4055,7 +4039,7 @@ js-beautify@^1.6.14:
 
 js-stringify@^1.0.1:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/js-stringify/download/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
 
 js-tokens@^3.0.0:
   version "3.0.2"
@@ -4172,15 +4156,21 @@ jsprim@^1.2.2:
 
 jstransformer@1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.qima-inc.com/jstransformer/download/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
   dependencies:
     is-promise "^2.0.0"
     promise "^7.0.1"
 
-jsx-ast-utils@^1.0.0, jsx-ast-utils@^1.3.4, jsx-ast-utils@^1.4.1:
+jsx-ast-utils@^1.0.0, jsx-ast-utils@^1.3.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
 
+jsx-ast-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.0.tgz#ec06a3d60cf307e5e119dac7bad81e89f096f0f8"
+  dependencies:
+    array-includes "^3.0.3"
+
 karma-chrome-launcher@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
@@ -4312,7 +4302,7 @@ lcid@^1.0.0:
 
 less@^2.7.2:
   version "2.7.2"
-  resolved "http://registry.npm.qima-inc.com/less/download/less-2.7.2.tgz#368d6cc73e1fb03981183280918743c5dcf9b3df"
+  resolved "https://registry.yarnpkg.com/less/-/less-2.7.2.tgz#368d6cc73e1fb03981183280918743c5dcf9b3df"
   optionalDependencies:
     errno "^0.1.1"
     graceful-fs "^4.1.2"
@@ -4452,7 +4442,7 @@ lodash._root@^3.0.0:
 
 lodash.assign@^4.2.0:
   version "4.2.0"
-  resolved "http://registry.npm.qima-inc.com/lodash.assign/download/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
 
 lodash.assignin@^4.0.9:
   version "4.2.0"
@@ -4468,7 +4458,7 @@ lodash.camelcase@^4.3.0:
 
 lodash.clonedeep@^4.3.2:
   version "4.5.0"
-  resolved "http://registry.npm.qima-inc.com/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
 lodash.cond@^4.3.0:
   version "4.5.2"
@@ -4546,7 +4536,7 @@ lodash.merge@^4.4.0:
 
 lodash.mergewith@^4.6.0:
   version "4.6.0"
-  resolved "http://registry.npm.qima-inc.com/lodash.mergewith/download/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
 
 lodash.pick@^4.2.1:
   version "4.4.0"
@@ -4647,7 +4637,11 @@ lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
-lru-cache@2, lru-cache@2.2.x:
+lru-cache@2:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+
+lru-cache@2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
 
@@ -4670,7 +4664,7 @@ macaddress@^0.2.8:
 
 magic-string@^0.19.0:
   version "0.19.1"
-  resolved "http://registry.npm.qima-inc.com/magic-string/download/magic-string-0.19.1.tgz#14d768013caf2ec8fdea16a49af82fc377e75201"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.19.1.tgz#14d768013caf2ec8fdea16a49af82fc377e75201"
   dependencies:
     vlq "^0.2.1"
 
@@ -4758,7 +4752,7 @@ merge-descriptors@1.0.1:
 
 merge-options@0.0.64:
   version "0.0.64"
-  resolved "http://registry.npm.qima-inc.com/merge-options/download/merge-options-0.0.64.tgz#cbe04f594a6985eaf27f7f8f0b2a3acf6f9d562d"
+  resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-0.0.64.tgz#cbe04f594a6985eaf27f7f8f0b2a3acf6f9d562d"
   dependencies:
     is-plain-obj "^1.1.0"
 
@@ -4813,12 +4807,6 @@ mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
-min-document@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
-  dependencies:
-    dom-walk "^0.1.0"
-
 minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
@@ -4846,7 +4834,7 @@ minimatch@~0.2.11:
     lru-cache "2"
     sigmund "~1.0.0"
 
-minimist@0.0.8, minimist@~0.0.1:
+minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -4854,6 +4842,10 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
 mkdirp@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
@@ -4953,7 +4945,7 @@ node-forge@0.6.33:
 
 node-gyp@^3.3.1:
   version "3.6.2"
-  resolved "http://registry.npm.qima-inc.com/node-gyp/download/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
   dependencies:
     fstream "^1.0.0"
     glob "^7.0.3"
@@ -5013,7 +5005,7 @@ node-pre-gyp@^0.6.36:
 
 node-sass@^4.5.0:
   version "4.5.3"
-  resolved "http://registry.npm.qima-inc.com/node-sass/download/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568"
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -5283,7 +5275,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -5373,7 +5365,7 @@ parse5@^1.5.1:
 
 parse5@^2.1.0:
   version "2.2.3"
-  resolved "http://registry.npm.qima-inc.com/parse5/download/parse5-2.2.3.tgz#0c4fc41c1000c5e6b93d48b03f8083837834e9f6"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-2.2.3.tgz#0c4fc41c1000c5e6b93d48b03f8083837834e9f6"
 
 parsejson@0.0.3:
   version "0.0.3"
@@ -5497,16 +5489,16 @@ performance-now@^0.2.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
 
 phantomjs-prebuilt@^2.1.7:
-  version "2.1.14"
-  resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0"
+  version "2.1.15"
+  resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.15.tgz#20f86e82d3349c505917527745b7a411e08b3903"
   dependencies:
     es6-promise "~4.0.3"
-    extract-zip "~1.5.0"
+    extract-zip "~1.6.5"
     fs-extra "~1.0.0"
     hasha "~2.2.0"
     kew "~0.7.0"
     progress "~1.1.8"
-    request "~2.79.0"
+    request "~2.81.0"
     request-progress "~2.0.1"
     which "~1.2.10"
 
@@ -5812,7 +5804,7 @@ postcss-mixins@^6.0.1:
 
 postcss-modules-extract-imports@1.1.0:
   version "1.1.0"
-  resolved "http://registry.npm.qima-inc.com/postcss-modules-extract-imports/download/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb"
   dependencies:
     postcss "^6.0.1"
 
@@ -5845,7 +5837,7 @@ postcss-modules-values@1.3.0, postcss-modules-values@^1.1.0:
 
 postcss-modules@^0.6.4:
   version "0.6.4"
-  resolved "http://registry.npm.qima-inc.com/postcss-modules/download/postcss-modules-0.6.4.tgz#77a58bb77ba1b4392b270c0b59852fd75e89a8b4"
+  resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-0.6.4.tgz#77a58bb77ba1b4392b270c0b59852fd75e89a8b4"
   dependencies:
     css-modules-loader-core "^1.0.1"
     generic-names "^1.0.2"
@@ -5853,10 +5845,10 @@ postcss-modules@^0.6.4:
     string-hash "^1.1.1"
 
 postcss-nested@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.1.0.tgz#72661d79463f5894a8c4b890479baec689d1c693"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.1.2.tgz#04057281f9631fef684857fb0119bae04ede03c6"
   dependencies:
-    postcss "^6.0.8"
+    postcss "^6.0.9"
     postcss-selector-parser "^2.2.3"
 
 postcss-nesting@^4.0.1:
@@ -5982,7 +5974,7 @@ postcss-zindex@^2.0.1:
 
 postcss@6.0.1:
   version "6.0.1"
-  resolved "http://registry.npm.qima-inc.com/postcss/download/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
   dependencies:
     chalk "^1.1.3"
     source-map "^0.5.6"
@@ -5997,34 +5989,34 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.8:
-  version "6.0.8"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.8.tgz#89067a9ce8b11f8a84cbc5117efc30419a0857b3"
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.8, postcss@^6.0.9:
+  version "6.0.9"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.9.tgz#54819766784a51c65b1ec4d54c2f93765438c35a"
   dependencies:
-    chalk "^2.0.1"
+    chalk "^2.1.0"
     source-map "^0.5.6"
-    supports-color "^4.2.0"
+    supports-color "^4.2.1"
 
 posthtml-attrs-parser@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/posthtml-attrs-parser/-/posthtml-attrs-parser-0.1.1.tgz#cc33e00155fb99ba96f67e25e330461f05742ac8"
+  resolved "https://registry.yarnpkg.com/posthtml-attrs-parser/-/posthtml-attrs-parser-0.1.1.tgz#cc33e00155fb99ba96f67e25e330461f05742ac8"
   dependencies:
     object-assign "^4.0.1"
 
 posthtml-parser@^0.2.0:
   version "0.2.1"
-  resolved "http://registry.npm.qima-inc.com/posthtml-parser/download/posthtml-parser-0.2.1.tgz#35d530de386740c2ba24ff2eb2faf39ccdf271dd"
+  resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.2.1.tgz#35d530de386740c2ba24ff2eb2faf39ccdf271dd"
   dependencies:
     htmlparser2 "^3.8.3"
     isobject "^2.1.0"
 
 posthtml-render@^1.0.5:
   version "1.0.6"
-  resolved "http://registry.npm.qima-inc.com/posthtml-render/download/posthtml-render-1.0.6.tgz#1b88b8e7860a8ebdfe2f2a1310a4642a55cf5bda"
+  resolved "https://registry.yarnpkg.com/posthtml-render/-/posthtml-render-1.0.6.tgz#1b88b8e7860a8ebdfe2f2a1310a4642a55cf5bda"
 
 posthtml@^0.9.2:
   version "0.9.2"
-  resolved "http://registry.npm.qima-inc.com/posthtml/download/posthtml-0.9.2.tgz#f4c06db9f67b61fd17c4e256e7e3d9515bf726fd"
+  resolved "https://registry.yarnpkg.com/posthtml/-/posthtml-0.9.2.tgz#f4c06db9f67b61fd17c4e256e7e3d9515bf726fd"
   dependencies:
     posthtml-parser "^0.2.0"
     posthtml-render "^1.0.5"
@@ -6085,10 +6077,6 @@ process@^0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
-process@~0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
-
 progress-bar-webpack-plugin@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.10.0.tgz#e0b1063aa03c79e298a9340598590bb61efef9a4"
@@ -6109,7 +6097,7 @@ promise-each@^2.2.0:
 
 promise@^7.0.1, promise@^7.1.1:
   version "7.3.1"
-  resolved "http://registry.npm.qima-inc.com/promise/download/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
   dependencies:
     asap "~2.0.3"
 
@@ -6144,7 +6132,7 @@ public-encrypt@^4.0.0:
 
 pug-attrs@^2.0.2:
   version "2.0.2"
-  resolved "http://registry.npm.qima-inc.com/pug-attrs/download/pug-attrs-2.0.2.tgz#8be2b2225568ffa75d1b866982bff9f4111affcb"
+  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.2.tgz#8be2b2225568ffa75d1b866982bff9f4111affcb"
   dependencies:
     constantinople "^3.0.1"
     js-stringify "^1.0.1"
@@ -6152,7 +6140,7 @@ pug-attrs@^2.0.2:
 
 pug-code-gen@^1.1.1:
   version "1.1.1"
-  resolved "http://registry.npm.qima-inc.com/pug-code-gen/download/pug-code-gen-1.1.1.tgz#1cf72744ef2a039eae6a3340caaa1105871258e8"
+  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-1.1.1.tgz#1cf72744ef2a039eae6a3340caaa1105871258e8"
   dependencies:
     constantinople "^3.0.1"
     doctypes "^1.1.0"
@@ -6165,11 +6153,11 @@ pug-code-gen@^1.1.1:
 
 pug-error@^1.3.2:
   version "1.3.2"
-  resolved "http://registry.npm.qima-inc.com/pug-error/download/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
+  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
 
 pug-filters@^2.1.4:
   version "2.1.4"
-  resolved "http://registry.npm.qima-inc.com/pug-filters/download/pug-filters-2.1.4.tgz#ab247c0f58765414b61be7b54fe979e9f6fc898f"
+  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-2.1.4.tgz#ab247c0f58765414b61be7b54fe979e9f6fc898f"
   dependencies:
     clean-css "^3.3.0"
     constantinople "^3.0.1"
@@ -6181,7 +6169,7 @@ pug-filters@^2.1.4:
 
 pug-lexer@^3.1.0:
   version "3.1.0"
-  resolved "http://registry.npm.qima-inc.com/pug-lexer/download/pug-lexer-3.1.0.tgz#fd087376d4a675b4f59f8fef422883434e9581a2"
+  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-3.1.0.tgz#fd087376d4a675b4f59f8fef422883434e9581a2"
   dependencies:
     character-parser "^2.1.1"
     is-expression "^3.0.0"
@@ -6189,42 +6177,42 @@ pug-lexer@^3.1.0:
 
 pug-linker@^3.0.2:
   version "3.0.2"
-  resolved "http://registry.npm.qima-inc.com/pug-linker/download/pug-linker-3.0.2.tgz#cc0780cf9f3f5522b270871785492b99588d3142"
+  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.2.tgz#cc0780cf9f3f5522b270871785492b99588d3142"
   dependencies:
     pug-error "^1.3.2"
     pug-walk "^1.1.4"
 
 pug-load@^2.0.8:
   version "2.0.8"
-  resolved "http://registry.npm.qima-inc.com/pug-load/download/pug-load-2.0.8.tgz#1df1c1716f3e68c70d71699cff9458472dc38b9b"
+  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.8.tgz#1df1c1716f3e68c70d71699cff9458472dc38b9b"
   dependencies:
     object-assign "^4.1.0"
     pug-walk "^1.1.4"
 
 pug-parser@^3.0.1:
   version "3.0.1"
-  resolved "http://registry.npm.qima-inc.com/pug-parser/download/pug-parser-3.0.1.tgz#dc0c5dd6c9c2d89da6105abbdf3d1b0fb4d39b5e"
+  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-3.0.1.tgz#dc0c5dd6c9c2d89da6105abbdf3d1b0fb4d39b5e"
   dependencies:
     pug-error "^1.3.2"
     token-stream "0.0.1"
 
 pug-runtime@^2.0.3:
   version "2.0.3"
-  resolved "http://registry.npm.qima-inc.com/pug-runtime/download/pug-runtime-2.0.3.tgz#98162607b0fce9e254d427f33987a5aee7168bda"
+  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.3.tgz#98162607b0fce9e254d427f33987a5aee7168bda"
 
 pug-strip-comments@^1.0.2:
   version "1.0.2"
-  resolved "http://registry.npm.qima-inc.com/pug-strip-comments/download/pug-strip-comments-1.0.2.tgz#d313afa01bcc374980e1399e23ebf2eb9bdc8513"
+  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz#d313afa01bcc374980e1399e23ebf2eb9bdc8513"
   dependencies:
     pug-error "^1.3.2"
 
 pug-walk@^1.1.4:
   version "1.1.4"
-  resolved "http://registry.npm.qima-inc.com/pug-walk/download/pug-walk-1.1.4.tgz#29e5174af43b67e99c31b448632e1ff86ddd671c"
+  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.4.tgz#29e5174af43b67e99c31b448632e1ff86ddd671c"
 
 pug@^2.0.0-beta11:
   version "2.0.0-rc.3"
-  resolved "http://registry.npm.qima-inc.com/pug/download/pug-2.0.0-rc.3.tgz#553cb3c3a97bb54ec3cb1e08591dcae3b6f58891"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.0-rc.3.tgz#553cb3c3a97bb54ec3cb1e08591dcae3b6f58891"
   dependencies:
     pug-code-gen "^1.1.1"
     pug-filters "^2.1.4"
@@ -6259,10 +6247,6 @@ qs@6.5.0:
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.0.tgz#8d04954d364def3efc55b5a0793e1e2c8b1e6e49"
 
-qs@~6.3.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
-
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -6369,9 +6353,9 @@ readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@1.1, readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+readable-stream@1.1:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -6390,16 +6374,14 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
-readable-stream@~2.0.0:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
+    isarray "0.0.1"
     string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
 
 readdirp@^2.0.0:
   version "2.1.0"
@@ -6549,7 +6531,7 @@ request-progress@~2.0.1:
   dependencies:
     throttleit "^1.0.0"
 
-request@2, request@2.81.0, request@^2.55.0, request@^2.72.0, request@^2.79.0, request@^2.81.0:
+request@2, request@2.81.0, request@^2.55.0, request@^2.72.0, request@^2.79.0, request@^2.81.0, request@~2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   dependencies:
@@ -6576,31 +6558,6 @@ request@2, request@2.81.0, request@^2.55.0, request@^2.72.0, request@^2.79.0, re
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@~2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -6677,13 +6634,13 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
 
 rollup-plugin-babel@^3.0.1:
   version "3.0.1"
-  resolved "http://registry.npm.qima-inc.com/rollup-plugin-babel/download/rollup-plugin-babel-3.0.1.tgz#e1b75bc3a6ea876bb8ec747562b344b15e27c94e"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.1.tgz#e1b75bc3a6ea876bb8ec747562b344b15e27c94e"
   dependencies:
     rollup-pluginutils "^1.5.0"
 
 rollup-plugin-commonjs@^8.1.0:
   version "8.1.0"
-  resolved "http://registry.npm.qima-inc.com/rollup-plugin-commonjs/download/rollup-plugin-commonjs-8.1.0.tgz#8ac9a87e6ea4c0d136e3e0e25ef41058957622b0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.1.0.tgz#8ac9a87e6ea4c0d136e3e0e25ef41058957622b0"
   dependencies:
     acorn "^4.0.1"
     estree-walker "^0.3.0"
@@ -6693,7 +6650,7 @@ rollup-plugin-commonjs@^8.1.0:
 
 rollup-plugin-filesize@^1.4.2:
   version "1.4.2"
-  resolved "http://registry.npm.taobao.org/rollup-plugin-filesize/download/rollup-plugin-filesize-1.4.2.tgz#eebdf571217e2fe14ab14a6534bf21f771a053b1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-filesize/-/rollup-plugin-filesize-1.4.2.tgz#eebdf571217e2fe14ab14a6534bf21f771a053b1"
   dependencies:
     boxen "^1.1.0"
     colors "^1.1.2"
@@ -6703,7 +6660,7 @@ rollup-plugin-filesize@^1.4.2:
 
 rollup-plugin-node-resolve@^3.0.0:
   version "3.0.0"
-  resolved "http://registry.npm.qima-inc.com/rollup-plugin-node-resolve/download/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
   dependencies:
     browser-resolve "^1.11.0"
     builtin-modules "^1.1.0"
@@ -6712,7 +6669,7 @@ rollup-plugin-node-resolve@^3.0.0:
 
 rollup-plugin-vue@^2.4.1:
   version "2.4.1"
-  resolved "https://registry.npmjs.org/rollup-plugin-vue/-/rollup-plugin-vue-2.4.1.tgz#a8780c8f3163880e70631d84019b6183b4198a97"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-vue/-/rollup-plugin-vue-2.4.1.tgz#a8780c8f3163880e70631d84019b6183b4198a97"
   dependencies:
     babel-runtime "^6.22.0"
     camelcase "^4.0.0"
@@ -6743,21 +6700,21 @@ rollup-plugin-vue@^2.4.1:
 
 rollup-pluginutils@^1.5.0:
   version "1.5.2"
-  resolved "http://registry.npm.qima-inc.com/rollup-pluginutils/download/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
   dependencies:
     estree-walker "^0.2.1"
     minimatch "^3.0.2"
 
 rollup-pluginutils@^2.0.1:
   version "2.0.1"
-  resolved "http://registry.npm.qima-inc.com/rollup-pluginutils/download/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
   dependencies:
     estree-walker "^0.3.0"
     micromatch "^2.3.11"
 
 rollup@^0.47.4:
   version "0.47.4"
-  resolved "http://registry.npm.taobao.org/rollup/download/rollup-0.47.4.tgz#e3a55de83a78221d232ce29619a8d68189ae845e"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.47.4.tgz#e3a55de83a78221d232ce29619a8d68189ae845e"
 
 run-async@^0.1.0:
   version "0.1.0"
@@ -6786,7 +6743,7 @@ samsam@1.x, samsam@^1.1.3:
 
 sass-graph@^2.1.1:
   version "2.2.4"
-  resolved "http://registry.npm.qima-inc.com/sass-graph/download/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
   dependencies:
     glob "^7.0.0"
     lodash "^4.0.0"
@@ -6795,7 +6752,7 @@ sass-graph@^2.1.1:
 
 sax@0.5.x:
   version "0.5.8"
-  resolved "http://registry.npm.qima-inc.com/sax/download/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
 
 sax@^1.1.4, sax@~1.2.1:
   version "1.2.4"
@@ -6809,7 +6766,7 @@ schema-utils@^0.3.0:
 
 scss-tokenizer@^0.2.3:
   version "0.2.3"
-  resolved "http://registry.npm.qima-inc.com/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
   dependencies:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
@@ -6819,12 +6776,12 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
 
 selfsigned@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.9.1.tgz#cdda4492d70d486570f87c65546023558e1dfa5a"
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.1.tgz#bf8cb7b83256c4551e31347c6311778db99eec52"
   dependencies:
     node-forge "0.6.33"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
@@ -6834,7 +6791,7 @@ semver@^4.1.0, semver@~4.3.3:
 
 semver@~5.3.0:
   version "5.3.0"
-  resolved "http://registry.npm.qima-inc.com/semver/download/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
 send@0.15.4:
   version "0.15.4"
@@ -6935,8 +6892,8 @@ signal-exit@^3.0.0:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
 sinon-chai@^2.12.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-2.12.0.tgz#da71e9642ef7b893ba3cf2af806396a00aa45927"
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-2.13.0.tgz#b9a42e801c20234bfc2f43b29e6f4f61b60990c4"
 
 sinon@^2.4.1:
   version "2.4.1"
@@ -7135,8 +7092,8 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 stackframe@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.3.tgz#fe64ab20b170e4ce49044b126c119dfa0e5dc7cc"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
 
 "statuses@>= 1.3.1 < 2", statuses@~1.3.1:
   version "1.3.1"
@@ -7144,7 +7101,7 @@ stackframe@^1.0.3:
 
 stdout-stream@^1.4.0:
   version "1.4.0"
-  resolved "http://registry.npm.qima-inc.com/stdout-stream/download/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
+  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
   dependencies:
     readable-stream "^2.0.1"
 
@@ -7175,7 +7132,7 @@ strict-uri-encode@^1.0.0:
 
 string-hash@^1.1.1:
   version "1.1.3"
-  resolved "http://registry.npm.qima-inc.com/string-hash/download/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
+  resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
 
 string-length@^1.0.1:
   version "1.0.1"
@@ -7268,7 +7225,7 @@ style-loader@^0.18.2:
 
 stylus@^0.54.5:
   version "0.54.5"
-  resolved "http://registry.npm.qima-inc.com/stylus/download/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
   dependencies:
     css-parse "1.7.x"
     debug "*"
@@ -7283,7 +7240,7 @@ sugarss@^1.0.0:
   dependencies:
     postcss "^6.0.0"
 
-supports-color@3.1.2, supports-color@^3.1.1:
+supports-color@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
@@ -7293,13 +7250,13 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.2.3:
+supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0, supports-color@^4.2.0, supports-color@^4.2.1:
+supports-color@^4.0.0, supports-color@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
   dependencies:
@@ -7370,7 +7327,7 @@ tcomb@^2.5.1:
 
 term-size@^1.2.0:
   version "1.2.0"
-  resolved "http://registry.npm.taobao.org/term-size/download/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
+  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
   dependencies:
     execa "^0.7.0"
 
@@ -7423,10 +7380,9 @@ time-stamp@^2.0.0:
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
 
 timers-browserify@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.3.tgz#41fd0bdc926a5feedc33a17a8e1f7d491925f7fc"
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6"
   dependencies:
-    global "^4.3.2"
     setimmediate "^1.0.4"
 
 title-case@^2.1.0:
@@ -7436,12 +7392,18 @@ title-case@^2.1.0:
     no-case "^2.2.0"
     upper-case "^1.0.3"
 
-tmp@0.0.31, tmp@0.0.x:
+tmp@0.0.31:
   version "0.0.31"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
   dependencies:
     os-tmpdir "~1.0.1"
 
+tmp@0.0.x:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  dependencies:
+    os-tmpdir "~1.0.2"
+
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
@@ -7456,7 +7418,7 @@ to-fast-properties@^1.0.1:
 
 token-stream@0.0.1:
   version "0.0.1"
-  resolved "http://registry.npm.qima-inc.com/token-stream/download/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
+  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
 
 toposort@^1.0.0:
   version "1.0.3"
@@ -7494,10 +7456,6 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@@ -7523,13 +7481,13 @@ type-is@~1.6.15:
     media-typer "0.3.0"
     mime-types "~2.1.15"
 
-typedarray@^0.0.6, typedarray@~0.0.5:
+typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
 typescript@^2.4.1:
   version "2.4.2"
-  resolved "http://registry.npm.qima-inc.com/typescript/download/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
 
 uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
@@ -7768,7 +7726,7 @@ vinyl@^0.5.0:
 
 vlq@^0.2.1:
   version "0.2.2"
-  resolved "http://registry.npm.qima-inc.com/vlq/download/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1"
 
 vm-browserify@0.0.4:
   version "0.0.4"
@@ -7853,7 +7811,7 @@ vue-template-es2015-compiler@^1.5.0, vue-template-es2015-compiler@^1.5.3:
 
 vue-template-validator@^1.1.5:
   version "1.1.5"
-  resolved "http://registry.npm.qima-inc.com/vue-template-validator/download/vue-template-validator-1.1.5.tgz#22d1ee77d0647c1ab14ff7eb01865942d9b3c458"
+  resolved "https://registry.yarnpkg.com/vue-template-validator/-/vue-template-validator-1.1.5.tgz#22d1ee77d0647c1ab14ff7eb01865942d9b3c458"
   dependencies:
     chalk "^1.1.1"
 
@@ -7932,7 +7890,7 @@ webpack-sources@^1.0.1:
 
 webpack@^3.5.4:
   version "3.5.4"
-  resolved "http://registry.npm.taobao.org/webpack/download/webpack-3.5.4.tgz#5583eb263ed27b78b5bd17bfdfb0eb1b1cd1bf81"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.4.tgz#5583eb263ed27b78b5bd17bfdfb0eb1b1cd1bf81"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
@@ -8005,7 +7963,7 @@ wide-align@^1.1.0:
 
 widest-line@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npm.taobao.org/widest-line/download/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
   dependencies:
     string-width "^1.0.1"
 
@@ -8015,7 +7973,7 @@ window-size@0.1.0:
 
 with@^5.0.0:
   version "5.1.1"
-  resolved "http://registry.npm.qima-inc.com/with/download/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
+  resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
   dependencies:
     acorn "^3.1.0"
     acorn-globals "^3.0.0"
@@ -8092,7 +8050,7 @@ yargs-parser@^4.2.0:
 
 yargs-parser@^5.0.0:
   version "5.0.0"
-  resolved "http://registry.npm.qima-inc.com/yargs-parser/download/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
   dependencies:
     camelcase "^3.0.0"
 
@@ -8122,7 +8080,7 @@ yargs@^6.0.0:
 
 yargs@^7.0.0:
   version "7.1.0"
-  resolved "http://registry.npm.qima-inc.com/yargs/download/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -8187,6 +8145,6 @@ zan-doc@0.1.12:
 
 zan-rollup-plugin-alias@1.0.1:
   version "1.0.1"
-  resolved "http://registry.npm.taobao.org/zan-rollup-plugin-alias/download/zan-rollup-plugin-alias-1.0.1.tgz#5004b659cdac960a83d75d4b3f8480b3982fbdd8"
+  resolved "https://registry.yarnpkg.com/zan-rollup-plugin-alias/-/zan-rollup-plugin-alias-1.0.1.tgz#5004b659cdac960a83d75d4b3f8480b3982fbdd8"
   dependencies:
     slash "^1.0.0"

From 74d04f69354a03a51ac8b06cdb386f3730160344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 15 Aug 2017 21:56:45 +0800
Subject: [PATCH 026/126] fix: test coverage

---
 test/unit/get-webpack-conf.js | 1 +
 test/unit/index.js            | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/unit/get-webpack-conf.js b/test/unit/get-webpack-conf.js
index 550c50d8b..a1b201c4d 100644
--- a/test/unit/get-webpack-conf.js
+++ b/test/unit/get-webpack-conf.js
@@ -26,6 +26,7 @@ const webpackConfig = {
       }
     })
   ],
+  stats: 'errors-only',
   resolve: {
     modules: [
       path.resolve(process.cwd(), 'node_modules'),
diff --git a/test/unit/index.js b/test/unit/index.js
index 3a8c88393..fc003e86e 100644
--- a/test/unit/index.js
+++ b/test/unit/index.js
@@ -3,9 +3,3 @@ require('packages/vant-css/src/index.css');
 // require all test files (files that ends with .spec.js)
 const testsReq = require.context('./specs', true, /\.spec$/);
 testsReq.keys().forEach(testsReq);
-
-// require all src files except main.js for coverage.
-// you can also change this to match only the subset of files that
-// you want coverage for.
-const srcReq = require.context('../../src', true, /^\.\/(?!main(\.js)?$)/);
-srcReq.keys().forEach(srcReq);

From f9f01e5568f5cbf3518d6c771536cbab91112620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 16 Aug 2017 17:59:50 +0800
Subject: [PATCH 027/126] feat: use sfc-compiler instead of rollup

---
 .babelrc                      |   8 +-
 build/bin/build-components.js |  37 ++
 build/bin/build-lib.js        |  31 +-
 build/bin/compile-vue.js      |  91 ++++
 build/rollup.config.lib.js    |  65 ---
 package.json                  |  13 +-
 packages/vant-css/yarn.lock   | 810 +++++++++++++++-----------------
 test/unit/get-webpack-conf.js |   2 +-
 test/unit/karma.conf.js       |   2 +-
 yarn.lock                     | 862 ++++++----------------------------
 10 files changed, 673 insertions(+), 1248 deletions(-)
 create mode 100644 build/bin/build-components.js
 create mode 100644 build/bin/compile-vue.js
 delete mode 100644 build/rollup.config.lib.js

diff --git a/.babelrc b/.babelrc
index 9b6775200..e3a543196 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,9 +1,9 @@
 {
-  "presets": [["es2015", { "modules": false }]],
-  "plugins": ["transform-vue-jsx", "transform-runtime"],
+  "presets": [["env", { "modules": false, "loose": true }]],
+  "plugins": ["transform-vue-jsx", "transform-runtime", "transform-object-rest-spread"],
   "env": {
-    "utils": {
-      "presets": [["es2015", { "modules": "commonjs" }]]
+    "commonjs": {
+      "presets": [["env", { "modules": "commonjs", "loose": true }]]
     }
   }
 }
diff --git a/build/bin/build-components.js b/build/bin/build-components.js
new file mode 100644
index 000000000..5eb773e88
--- /dev/null
+++ b/build/bin/build-components.js
@@ -0,0 +1,37 @@
+const fs = require('fs-extra');
+const path = require('path');
+const compileVue = require('./compile-vue');
+const libDir = path.resolve(__dirname, '../../lib');
+const srcDir = path.resolve(__dirname, '../../packages');
+require('shelljs/global');
+
+fs.emptyDirSync(libDir);
+fs.copySync(srcDir, libDir);
+compileVueFiles(libDir);
+exec('cross-env BABEL_ENV=commonjs babel lib --out-dir lib');
+
+function compileVueFiles(dir) {
+  const files = fs.readdirSync(dir);
+
+  files.forEach(file => {
+    const absolutePath = path.resolve(dir, file);
+
+    if (file.indexOf('vant-css') !== -1) {
+      fs.removeSync(absolutePath);
+    } else if (isDir(absolutePath)) {
+      return compileVueFiles(absolutePath);
+    } else if (/\.vue$/.test(file)) {
+      const source = fs.readFileSync(absolutePath, 'utf-8');
+      fs.removeSync(absolutePath);
+
+      const outputVuePath = absolutePath + '.js';
+      const outputJsPath = absolutePath.replace('.vue', '.js');
+      const output = fs.existsSync(outputJsPath) ? outputVuePath : outputJsPath;
+      fs.outputFileSync(output, compileVue(source));
+    }
+  });
+}
+
+function isDir(dir) {
+  return fs.lstatSync(dir).isDirectory();
+}
diff --git a/build/bin/build-lib.js b/build/bin/build-lib.js
index 09d99b5b2..0f59e218f 100644
--- a/build/bin/build-lib.js
+++ b/build/bin/build-lib.js
@@ -7,8 +7,7 @@
  * 4. 构建每个组件对应的 [component].js
  * 5. 构建 vant-css
  * 6. 生成每个组件目录下的 style 入口
- * 7. 编译 utils
- * 8. 打包 JS 文件：vant.js && vant.min.js
+ * 7. 打包 JS 文件：vant.js && vant.min.js
  */
 
 const fs = require('fs');
@@ -17,32 +16,27 @@ const components = require('../../components.json');
 const chalk = require('chalk');
 require('shelljs/global');
 
-// 1. clean dir
-log('Starting', 'clean');
-exec('npm run clean --silent');
-log('Finished', 'clean');
+// 1. lint 
+log('Starting', 'lint');
+exec('npm run lint --silent');
+log('Finished', 'lint');
 
 // 2. build entry
 log('Starting', 'build:entry');
 exec('npm run build:file --silent');
 log('Finished', 'build:entry');
 
-// 3. lint 
-log('Starting', 'lint');
-exec('npm run lint --silent');
-log('Finished', 'lint');
-
-// 4. build [component].js
+// 3. build [component].js
 log('Starting', 'build:component');
 exec('npm run build:components --silent');
 log('Finished', 'build:component');
 
-// 5. build vant-css
+// 4. build vant-css
 log('Starting', 'build:vant-css');
 exec('npm run build:vant-css --silent');
 log('Finished', 'build:vant-css');
 
-// 6. build style entrys
+// 5. build style entrys
 log('Starting', 'build:style-entries');
 Object.keys(components).forEach((componentName) => {
   const dir = path.join(__dirname, '../../lib/', componentName, '/style');
@@ -57,18 +51,11 @@ Object.keys(components).forEach((componentName) => {
 });
 log('Finished', 'build:style-entries');
 
-// 7. build utils 
-log('Starting', 'build:utils');
-exec('cross-env BABEL_ENV=utils babel packages/utils --out-dir lib/utils');
-exec('cross-env BABEL_ENV=utils babel packages/mixins --out-dir lib/mixins');
-log('Finished', 'build:utils');
-
-// 8. build vant.js 
+// 6. build vant.js 
 log('Starting', 'build:vant');
 exec('npm run build:vant --silent');
 log('Finished', 'build:vant');
 
-
 // helpers
 function log(status, action, breakLine) {
   const now = new Date();
diff --git a/build/bin/compile-vue.js b/build/bin/compile-vue.js
new file mode 100644
index 000000000..266613a44
--- /dev/null
+++ b/build/bin/compile-vue.js
@@ -0,0 +1,91 @@
+const templateCompiler = require('vue-template-compiler');
+const templateCompilerES2015 = require('vue-template-es2015-compiler');
+const templateCompilerConfig = { preserveWhitespace: false };
+
+module.exports = function(code) {
+  const { script, template } = templateCompiler.parseComponent(code);
+  const renderFunction = parseTemplate(template.content);
+  return renderJs(script.content, renderFunction);
+}
+
+// 将 template html 解析为 render 函数
+function parseTemplate(template) {
+  const compiled = templateCompiler.compile(template, templateCompilerConfig);
+
+  if (compiled.errors.length) {
+    throw new Error(
+      `\n  Error compiling template:\n${pad(html)}\n` +
+        compiled.errors.map(e => `  - ${e}`).join('\n') +
+        '\n'
+    );
+  }
+
+  return {
+    render: templateCompilerES2015(
+      `var TEMP_VAR = ${toFunction(compiled.render)}`
+    ).replace('var TEMP_VAR = ', ''),
+    staticRenderFns: `[${compiled.staticRenderFns.map(toFunction).join(',')}]`
+  };
+}
+
+function pad(html) {
+  return html.split(/\r?\n/).map(line => `  ${line}`).join('\n');
+}
+
+function toFunction(code) {
+  return `function (){${code}}`;
+}
+
+// 寻找 render 函数插入位置
+function findInjectionPosition(script) {
+  const hasDefaultExportObject = /(export default[^{]*\{)/g.exec(script);
+
+  if (hasDefaultExportObject)
+    return { script, matches: hasDefaultExportObject };
+
+  const hasDefaultExportReference = /(export default[\s]+((?!(?:do|if|in|for|let|new|try|var|case|else|enum|eval|false|null|this|true|void|with|break|catch|class|const|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$)[$A-Z_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc][$A-Z_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc0-9\u0300-\u036f\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e4-\u08fe\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d02\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19b0-\u19c0\u19c8\u19c9\u19d0-\u19d9\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2-\u1cf4\u1dc0-\u1de6\u1dfc-\u1dff\u200c\u200d\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c4\ua8d0-\ua8d9\ua8e0-\ua8f1\ua900-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f]*))/g.exec(
+    script
+  );
+
+  if (!hasDefaultExportReference) return { script, matches: null };
+
+  const name = hasDefaultExportReference[2].replace('$', '\\$');
+
+  const result = new RegExp(`(${name}[\\s]=[^{]*\\{)`, 'g').exec(script);
+  if (result) return { script, matches: result };
+
+  const lit = new RegExp(`export\\s+default\\s+${name}`, 'g');
+  script = script.replace(
+    lit,
+    `;
+  var __$${name} = Object.assign(${name}, {})
+  __$${name}.prototype = ${name}.prototype
+  export default __$${name}
+  `
+  );
+  const data = {
+    matches: new RegExp(
+      `(__\\$${name} = Object\\.assign\\(${name}, \\{)`,
+      'g'
+    ).exec(script),
+    script
+  };
+  return data;
+}
+
+// 插入 render 函数
+function renderJs(rawScript, render) {
+  const { matches, script } = findInjectionPosition(rawScript);
+
+  if (matches && matches.length) {
+    let renderScript = `module.exports={\n  render: ${render.render},\n\n  staticRenderFns: ${render.staticRenderFns}, \n`;
+
+    return script
+      .split(matches[1])
+      .join(
+        renderScript.replace('module.exports={', matches[1]).replace(/\}$/, '')
+      );
+  }
+
+  throw new Error(`cannot find 'export defaults'.`);
+}
diff --git a/build/rollup.config.lib.js b/build/rollup.config.lib.js
deleted file mode 100644
index bcc58c750..000000000
--- a/build/rollup.config.lib.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import vue from 'rollup-plugin-vue';
-import alias from 'zan-rollup-plugin-alias';
-import babel from 'rollup-plugin-babel';
-import resolve from 'rollup-plugin-node-resolve';
-import filesize from 'rollup-plugin-filesize';
-import commonjs from 'rollup-plugin-commonjs';
-import componentsConfig from '../components.json';
-
-const extensions = ['.js', '.vue'];
-
-// 打包时排除 mixins、utils、其他组件
-const utilsPath = path.resolve(__dirname, '../packages/utils/');
-const mixinsPath = path.resolve(__dirname, '../packages/mixins/');
-const external = [
-  ...fs.readdirSync(utilsPath).map(item => path.resolve(utilsPath, item)),
-  ...fs.readdirSync(mixinsPath).map(item => path.resolve(mixinsPath, item)),
-  ...Object.keys(componentsConfig).map(component =>
-    path.resolve(__dirname, '../packages', component, 'index.js')
-  )
-];
-
-export default Object.keys(componentsConfig).map(component => {
-  const config = {
-    entry: componentsConfig[component],
-    targets: [
-      {
-        dest: path.resolve(__dirname, `../lib/${component}/index.js`),
-        format: 'cjs'
-      }
-    ],
-    external: [
-      'vue',
-      'vue-lazyload',
-      path.resolve(__dirname, '../packages/mixins/popup/index.js'),
-      ...external
-    ],
-    plugins: [
-      vue(),
-      filesize(),
-      commonjs({
-        extensions
-      }),
-      resolve({
-        main: true,
-        jsnext: true,
-        extensions
-      }),
-      alias({
-        resolve: extensions,
-        packages: path.resolve(__dirname, '../packages')
-      })
-    ]
-  };
-
-  // button 使用 jsx，需要借助 babel
-  if (component === 'button') {
-    config.plugins.unshift(babel({
-      runtimeHelpers: true
-    }));
-  }
-
-  return config;
-});
diff --git a/package.json b/package.json
index 49a93029a..b82ed60ea 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "bootstrap": "yarn || npm i && cd ./packages/vant-css/ && yarn || npm i && cd ../../",
     "dev": "npm run build:file && webpack-dev-server --inline --config build/webpack.config.dev.js --content-base ./",
     "build:file": "node build/bin/build-entry.js",
-    "build:components": "rollup -c ./build/rollup.config.lib.js --color",
+    "build:components": "node build/bin/build-components.js --color",
     "build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color && mkdir lib/vant-css && cp -R packages/vant-css/lib/ lib/vant-css",
     "build:vant": "cross-env NODE_ENV=production webpack --progress --hide-modules --color --config build/webpack.build.js && cross-env NODE_ENV=production webpack -p --progress --hide-modules --color --config build/webpack.build.js",
     "deploy": "npm run deploy:docs && npm run deploy:cdn && gh-pages -d docs/dist --remote youzan && rimraf docs/dist",
@@ -41,7 +41,6 @@
   "license": "ISC",
   "dependencies": {
     "babel-runtime": "6.x",
-    "raf.js": "0.0.4",
     "vue-lazyload": "^1.0.6"
   },
   "peerDependencies": {
@@ -56,11 +55,11 @@
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-module-resolver": "^2.7.1",
     "babel-plugin-syntax-jsx": "^6.18.0",
+    "babel-plugin-transform-object-rest-spread": "^6.23.0",
     "babel-plugin-transform-runtime": "^6.15.0",
     "babel-plugin-transform-vue-jsx": "^3.5.0",
     "babel-polyfill": "^6.23.0",
-    "babel-preset-es2015": "^6.16.0",
-    "babelrc-rollup": "^3.0.0",
+    "babel-preset-env": "^1.6.0",
     "chai": "^4.1.1",
     "cheerio": "^0.22.0",
     "codecov": "^2.2.0",
@@ -97,12 +96,6 @@
     "precss": "^2.0.0",
     "progress-bar-webpack-plugin": "^1.10.0",
     "rimraf": "^2.5.4",
-    "rollup": "^0.47.4",
-    "rollup-plugin-babel": "^3.0.1",
-    "rollup-plugin-commonjs": "^8.1.0",
-    "rollup-plugin-filesize": "^1.4.2",
-    "rollup-plugin-node-resolve": "^3.0.0",
-    "rollup-plugin-vue": "^2.4.1",
     "run-sequence": "^2.1.0",
     "sinon": "^2.4.1",
     "sinon-chai": "^2.12.0",
diff --git a/packages/vant-css/yarn.lock b/packages/vant-css/yarn.lock
index 495a0d072..4ee189a21 100644
--- a/packages/vant-css/yarn.lock
+++ b/packages/vant-css/yarn.lock
@@ -4,23 +4,23 @@
 
 amdefine@>=0.0.4:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  resolved "http://registry.npm.qima-inc.com/amdefine/download/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
 ansi-regex@^0.2.0, ansi-regex@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
+  resolved "http://registry.npm.qima-inc.com/ansi-regex/download/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  resolved "http://registry.npm.qima-inc.com/ansi-regex/download/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
 ansi-styles@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
+  resolved "http://registry.npm.qima-inc.com/ansi-styles/download/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
 
 ansi-styles@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  resolved "http://registry.npm.qima-inc.com/ansi-styles/download/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
 ansi-styles@^3.1.0:
   version "3.2.0"
@@ -30,57 +30,49 @@ ansi-styles@^3.1.0:
 
 any-promise@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
+  resolved "http://registry.npm.qima-inc.com/any-promise/download/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
 
 archy@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  resolved "http://registry.npm.qima-inc.com/archy/download/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
 
 argparse@^1.0.7:
   version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  resolved "http://registry.npm.qima-inc.com/argparse/download/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  resolved "http://registry.npm.qima-inc.com/arr-diff/download/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-flatten@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  version "1.0.3"
+  resolved "http://registry.npm.qima-inc.com/arr-flatten/download/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
 
 array-differ@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-
-array-each@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
+  resolved "http://registry.npm.qima-inc.com/array-differ/download/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
 
 array-find-index@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-
-array-slice@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.0.0.tgz#e73034f00dcc1f40876008fd20feae77bd4b7c2f"
+  resolved "http://registry.npm.qima-inc.com/array-find-index/download/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
 
 array-union@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  resolved "http://registry.npm.qima-inc.com/array-union/download/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1, array-uniq@^1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  resolved "http://registry.npm.qima-inc.com/array-uniq/download/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
 array-unique@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  resolved "http://registry.npm.qima-inc.com/array-unique/download/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
 autoprefixer@^7.1.2:
   version "7.1.2"
@@ -95,11 +87,11 @@ autoprefixer@^7.1.2:
 
 balanced-match@0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
+  resolved "http://registry.npm.qima-inc.com/balanced-match/download/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
 
-balanced-match@^0.4.2:
+balanced-match@^0.4.1, balanced-match@^0.4.2:
   version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+  resolved "http://registry.npm.qima-inc.com/balanced-match/download/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -107,33 +99,37 @@ balanced-match@^1.0.0:
 
 beeper@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
+  resolved "http://registry.npm.qima-inc.com/beeper/download/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
 
-brace-expansion@^1.0.0, brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+brace-expansion@^1.0.0:
+  version "1.1.7"
+  resolved "http://registry.npm.qima-inc.com/brace-expansion/download/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
   dependencies:
-    balanced-match "^1.0.0"
+    balanced-match "^0.4.1"
     concat-map "0.0.1"
 
 braces@^1.8.2:
   version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  resolved "http://registry.npm.qima-inc.com/braces/download/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
 browserslist@^2.1.5:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.3.3.tgz#2b0cabc4d28489f682598605858a0782f14b154c"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.3.0.tgz#b2aa76415c71643fe2368f6243b43bbbb4211752"
   dependencies:
-    caniuse-lite "^1.0.30000715"
-    electron-to-chromium "^1.3.18"
+    caniuse-lite "^1.0.30000710"
+    electron-to-chromium "^1.3.17"
+
+buffer-shims@~1.0.0:
+  version "1.0.0"
+  resolved "http://registry.npm.qima-inc.com/buffer-shims/download/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
 
 builtin-modules@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  resolved "http://registry.npm.qima-inc.com/builtin-modules/download/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
 camelcase-css@^1.0.1:
   version "1.0.1"
@@ -141,22 +137,22 @@ camelcase-css@^1.0.1:
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  resolved "http://registry.npm.qima-inc.com/camelcase-keys/download/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
 camelcase@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  resolved "http://registry.npm.qima-inc.com/camelcase/download/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
-caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000715:
-  version "1.0.30000715"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000715.tgz#c327f5e6d907ebcec62cde598c3bf0dd793fb9a0"
+caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000710:
+  version "1.0.30000712"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000712.tgz#b4732def2459224f3f78c6a9ba103abfcc705670"
 
 chalk@^0.5.0:
   version "0.5.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
+  resolved "http://registry.npm.qima-inc.com/chalk/download/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
   dependencies:
     ansi-styles "^1.1.0"
     escape-string-regexp "^1.0.0"
@@ -166,7 +162,7 @@ chalk@^0.5.0:
 
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  resolved "http://registry.npm.qima-inc.com/chalk/download/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -174,7 +170,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.1.0:
+chalk@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
   dependencies:
@@ -183,43 +179,43 @@ chalk@^2.1.0:
     supports-color "^4.0.0"
 
 clean-css@^3.1.9:
-  version "3.4.28"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
+  version "3.4.25"
+  resolved "http://registry.npm.qima-inc.com/clean-css/download/clean-css-3.4.25.tgz#9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"
   dependencies:
     commander "2.8.x"
     source-map "0.4.x"
 
 clone-stats@^0.0.1, clone-stats@~0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
+  resolved "http://registry.npm.qima-inc.com/clone-stats/download/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
 
 clone@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
+  resolved "http://registry.npm.qima-inc.com/clone/download/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
 
 clone@^1.0.0, clone@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+  resolved "http://registry.npm.qima-inc.com/clone/download/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
 
 color-convert@^1.3.0, color-convert@^1.9.0:
   version "1.9.0"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+  resolved "http://registry.npm.qima-inc.com/color-convert/download/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
   dependencies:
     color-name "^1.1.1"
 
 color-name@^1.0.0, color-name@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  version "1.1.2"
+  resolved "http://registry.npm.qima-inc.com/color-name/download/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
 
 color-string@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  resolved "http://registry.npm.qima-inc.com/color-string/download/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
   dependencies:
     color-name "^1.0.0"
 
 color@^0.11.0:
   version "0.11.4"
-  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  resolved "http://registry.npm.qima-inc.com/color/download/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
   dependencies:
     clone "^1.0.2"
     color-convert "^1.3.0"
@@ -227,23 +223,22 @@ color@^0.11.0:
 
 commander@2.8.x:
   version "2.8.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  resolved "http://registry.npm.qima-inc.com/commander/download/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
   dependencies:
     graceful-readlink ">= 1.0.0"
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "http://registry.npm.qima-inc.com/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
 core-util-is@~1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  resolved "http://registry.npm.qima-inc.com/core-util-is/download/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
 cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
+  version "2.1.1"
+  resolved "http://registry.npm.qima-inc.com/cosmiconfig/download/cosmiconfig-2.1.1.tgz#817f2c2039347a1e9bf7d090c0923e53f749ca82"
   dependencies:
-    is-directory "^0.3.1"
     js-yaml "^3.4.3"
     minimist "^1.2.0"
     object-assign "^4.1.0"
@@ -262,127 +257,121 @@ css-color-function@^1.3.0:
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  resolved "http://registry.npm.qima-inc.com/currently-unhandled/download/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
   dependencies:
     array-find-index "^1.0.1"
 
 dateformat@^1.0.7-1.2.3:
   version "1.0.12"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
+  resolved "http://registry.npm.qima-inc.com/dateformat/download/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
   dependencies:
     get-stdin "^4.0.1"
     meow "^3.3.0"
 
 dateformat@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
+  resolved "http://registry.npm.qima-inc.com/dateformat/download/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
 
 debug@~0.7.4:
   version "0.7.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
+  resolved "http://registry.npm.qima-inc.com/debug/download/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
 
 decamelize@^1.1.2:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  resolved "http://registry.npm.qima-inc.com/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
 defaults@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  resolved "http://registry.npm.qima-inc.com/defaults/download/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
   dependencies:
     clone "^1.0.2"
 
 deprecated@^0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
+  resolved "http://registry.npm.qima-inc.com/deprecated/download/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
 
 detect-file@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
+  resolved "http://registry.npm.qima-inc.com/detect-file/download/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
   dependencies:
     fs-exists-sync "^0.1.0"
 
 duplexer2@0.0.2:
   version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  resolved "http://registry.npm.qima-inc.com/duplexer2/download/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
   dependencies:
     readable-stream "~1.1.9"
 
-electron-to-chromium@^1.3.18:
-  version "1.3.18"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz#3dcc99da3e6b665f6abbc71c28ad51a2cd731a9c"
+electron-to-chromium@^1.3.17:
+  version "1.3.17"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.17.tgz#41c13457cc7166c5c15e767ae61d86a8cacdee5d"
 
 end-of-stream@~0.1.5:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
+  resolved "http://registry.npm.qima-inc.com/end-of-stream/download/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
   dependencies:
     once "~1.3.0"
 
 error-ex@^1.2.0:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  resolved "http://registry.npm.qima-inc.com/error-ex/download/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
     is-arrayish "^0.2.1"
 
 escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  resolved "http://registry.npm.qima-inc.com/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+esprima@^3.1.1:
+  version "3.1.3"
+  resolved "http://registry.npm.qima-inc.com/esprima/download/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
 expand-brackets@^0.1.4:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  resolved "http://registry.npm.qima-inc.com/expand-brackets/download/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-range@^1.8.1:
   version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  resolved "http://registry.npm.qima-inc.com/expand-range/download/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
   dependencies:
     fill-range "^2.1.0"
 
-expand-tilde@^1.2.2:
+expand-tilde@^1.2.1, expand-tilde@^1.2.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
+  resolved "http://registry.npm.qima-inc.com/expand-tilde/download/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
   dependencies:
     os-homedir "^1.0.1"
 
-expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
 extend@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+  version "3.0.0"
+  resolved "http://registry.npm.qima-inc.com/extend/download/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
 
 extglob@^0.3.1:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  resolved "http://registry.npm.qima-inc.com/extglob/download/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
   dependencies:
     is-extglob "^1.0.0"
 
 fancy-log@^1.1.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
+  resolved "http://registry.npm.qima-inc.com/fancy-log/download/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
   dependencies:
     chalk "^1.1.1"
     time-stamp "^1.0.0"
 
 filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  version "2.0.0"
+  resolved "http://registry.npm.qima-inc.com/filename-regex/download/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
 
 filesize@~2.0.0:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-2.0.4.tgz#7805941c60fcdfe63f46d7ea358c59ade11c1325"
+  resolved "http://registry.npm.qima-inc.com/filesize/download/filesize-2.0.4.tgz#7805941c60fcdfe63f46d7ea358c59ade11c1325"
 
 fill-range@^2.1.0:
   version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  resolved "http://registry.npm.qima-inc.com/fill-range/download/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -392,18 +381,18 @@ fill-range@^2.1.0:
 
 find-index@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
+  resolved "http://registry.npm.qima-inc.com/find-index/download/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
 
 find-up@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  resolved "http://registry.npm.qima-inc.com/find-up/download/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
 findup-sync@^0.4.2:
   version "0.4.3"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
+  resolved "http://registry.npm.qima-inc.com/findup-sync/download/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
   dependencies:
     detect-file "^0.1.0"
     is-glob "^2.0.1"
@@ -411,22 +400,24 @@ findup-sync@^0.4.2:
     resolve-dir "^0.1.0"
 
 fined@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.0.tgz#b37dc844b76a2f5e7081e884f7c0ae344f153476"
+  version "1.0.2"
+  resolved "http://registry.npm.qima-inc.com/fined/download/fined-1.0.2.tgz#5b28424b760d7598960b7ef8480dff8ad3660e97"
   dependencies:
-    expand-tilde "^2.0.2"
-    is-plain-object "^2.0.3"
-    object.defaults "^1.1.0"
-    object.pick "^1.2.0"
+    expand-tilde "^1.2.1"
+    lodash.assignwith "^4.0.7"
+    lodash.isempty "^4.2.1"
+    lodash.isplainobject "^4.0.4"
+    lodash.isstring "^4.0.1"
+    lodash.pick "^4.2.1"
     parse-filepath "^1.0.1"
 
 first-chunk-stream@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
+  resolved "http://registry.npm.qima-inc.com/first-chunk-stream/download/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
 
 flagged-respawn@^0.3.2:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
+  resolved "http://registry.npm.qima-inc.com/flagged-respawn/download/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
 
 flatten@^1.0.2:
   version "1.0.2"
@@ -434,54 +425,48 @@ flatten@^1.0.2:
 
 for-in@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  resolved "http://registry.npm.qima-inc.com/for-in/download/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
 for-own@^0.1.4:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  dependencies:
-    for-in "^1.0.1"
-
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  resolved "http://registry.npm.qima-inc.com/for-own/download/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
   dependencies:
     for-in "^1.0.1"
 
 fs-exists-sync@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+  resolved "http://registry.npm.qima-inc.com/fs-exists-sync/download/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "http://registry.npm.qima-inc.com/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 gaze@^0.5.1:
   version "0.5.2"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
+  resolved "http://registry.npm.qima-inc.com/gaze/download/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
   dependencies:
     globule "~0.1.0"
 
 get-stdin@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  resolved "http://registry.npm.qima-inc.com/get-stdin/download/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
 glob-base@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  resolved "http://registry.npm.qima-inc.com/glob-base/download/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
 
 glob-parent@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  resolved "http://registry.npm.qima-inc.com/glob-parent/download/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
   dependencies:
     is-glob "^2.0.0"
 
 glob-stream@^3.1.5:
   version "3.1.18"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
+  resolved "http://registry.npm.qima-inc.com/glob-stream/download/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
   dependencies:
     glob "^4.3.1"
     glob2base "^0.0.12"
@@ -492,19 +477,19 @@ glob-stream@^3.1.5:
 
 glob-watcher@^0.0.6:
   version "0.0.6"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
+  resolved "http://registry.npm.qima-inc.com/glob-watcher/download/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
   dependencies:
     gaze "^0.5.1"
 
 glob2base@^0.0.12:
   version "0.0.12"
-  resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
+  resolved "http://registry.npm.qima-inc.com/glob2base/download/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
   dependencies:
     find-index "^0.1.1"
 
 glob@^4.3.1:
   version "4.5.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
+  resolved "http://registry.npm.qima-inc.com/glob/download/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -512,19 +497,19 @@ glob@^4.3.1:
     once "^1.3.0"
 
 glob@^7.0.3, glob@^7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  version "7.1.1"
+  resolved "http://registry.npm.qima-inc.com/glob/download/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.0.2"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
 glob@~3.1.21:
   version "3.1.21"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
+  resolved "http://registry.npm.qima-inc.com/glob/download/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
   dependencies:
     graceful-fs "~1.2.0"
     inherits "1"
@@ -532,14 +517,14 @@ glob@~3.1.21:
 
 global-modules@^0.2.3:
   version "0.2.3"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
+  resolved "http://registry.npm.qima-inc.com/global-modules/download/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
   dependencies:
     global-prefix "^0.1.4"
     is-windows "^0.2.0"
 
 global-prefix@^0.1.4:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
+  resolved "http://registry.npm.qima-inc.com/global-prefix/download/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
   dependencies:
     homedir-polyfill "^1.0.0"
     ini "^1.3.4"
@@ -558,7 +543,7 @@ globby@^6.1.0:
 
 globule@~0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
+  resolved "http://registry.npm.qima-inc.com/globule/download/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
   dependencies:
     glob "~3.1.21"
     lodash "~1.0.1"
@@ -566,31 +551,31 @@ globule@~0.1.0:
 
 glogg@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
+  resolved "http://registry.npm.qima-inc.com/glogg/download/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
   dependencies:
     sparkles "^1.0.0"
 
 graceful-fs@^3.0.0:
   version "3.0.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
+  resolved "http://registry.npm.qima-inc.com/graceful-fs/download/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
   dependencies:
     natives "^1.1.0"
 
 graceful-fs@^4.1.2, graceful-fs@~4.1.4:
   version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  resolved "http://registry.npm.qima-inc.com/graceful-fs/download/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
 graceful-fs@~1.2.0:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
+  resolved "http://registry.npm.qima-inc.com/graceful-fs/download/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
 
 graceful-fs@~2.0.0:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"
+  resolved "http://registry.npm.qima-inc.com/graceful-fs/download/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  resolved "http://registry.npm.qima-inc.com/graceful-readlink/download/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
 gulp-cssmin@^0.2.0:
   version "0.2.0"
@@ -615,13 +600,13 @@ gulp-postcss@^7.0.0:
 
 gulp-rename@~1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.1.0.tgz#93090aaaf4d386c07f20538a6888f15efba727a1"
+  resolved "http://registry.npm.qima-inc.com/gulp-rename/download/gulp-rename-1.1.0.tgz#93090aaaf4d386c07f20538a6888f15efba727a1"
   dependencies:
     map-stream ">=0.0.4"
 
 gulp-util@^3.0.0, gulp-util@^3.0.8:
   version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
+  resolved "http://registry.npm.qima-inc.com/gulp-util/download/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
   dependencies:
     array-differ "^1.0.0"
     array-uniq "^1.0.2"
@@ -644,7 +629,7 @@ gulp-util@^3.0.0, gulp-util@^3.0.8:
 
 gulp-util@~2.2.0:
   version "2.2.20"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-2.2.20.tgz#d7146e5728910bd8f047a6b0b1e549bc22dbd64c"
+  resolved "http://registry.npm.qima-inc.com/gulp-util/download/gulp-util-2.2.20.tgz#d7146e5728910bd8f047a6b0b1e549bc22dbd64c"
   dependencies:
     chalk "^0.5.0"
     dateformat "^1.0.7-1.2.3"
@@ -657,7 +642,7 @@ gulp-util@~2.2.0:
 
 gulp@^3.9.1:
   version "3.9.1"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
+  resolved "http://registry.npm.qima-inc.com/gulp/download/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
   dependencies:
     archy "^1.0.0"
     chalk "^1.0.0"
@@ -675,25 +660,25 @@ gulp@^3.9.1:
 
 gulplog@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
+  resolved "http://registry.npm.qima-inc.com/gulplog/download/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
   dependencies:
     glogg "^1.0.0"
 
 has-ansi@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
+  resolved "http://registry.npm.qima-inc.com/has-ansi/download/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
   dependencies:
     ansi-regex "^0.2.0"
 
 has-ansi@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  resolved "http://registry.npm.qima-inc.com/has-ansi/download/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
   dependencies:
     ansi-regex "^2.0.0"
 
 has-flag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  resolved "http://registry.npm.qima-inc.com/has-flag/download/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
 
 has-flag@^2.0.0:
   version "2.0.0"
@@ -701,23 +686,23 @@ has-flag@^2.0.0:
 
 has-gulplog@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
+  resolved "http://registry.npm.qima-inc.com/has-gulplog/download/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
   dependencies:
     sparkles "^1.0.0"
 
-homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
+homedir-polyfill@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
+  resolved "http://registry.npm.qima-inc.com/homedir-polyfill/download/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+  version "2.4.2"
+  resolved "http://registry.npm.qima-inc.com/hosted-git-info/download/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
 
 indent-string@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  resolved "http://registry.npm.qima-inc.com/indent-string/download/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
   dependencies:
     repeating "^2.0.0"
 
@@ -727,69 +712,65 @@ indexes-of@^1.0.1:
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "http://registry.npm.qima-inc.com/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
 inherits@1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
+  resolved "http://registry.npm.qima-inc.com/inherits/download/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
 
-inherits@2, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@~2.0.1:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  resolved "http://registry.npm.qima-inc.com/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
 ini@^1.3.4:
   version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+  resolved "http://registry.npm.qima-inc.com/ini/download/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
 interpret@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
+  resolved "http://registry.npm.qima-inc.com/interpret/download/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
 
 is-absolute@^0.2.3:
   version "0.2.6"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
+  resolved "http://registry.npm.qima-inc.com/is-absolute/download/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
   dependencies:
     is-relative "^0.2.1"
     is-windows "^0.2.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  resolved "http://registry.npm.qima-inc.com/is-arrayish/download/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
 
-is-buffer@^1.1.5:
+is-buffer@^1.0.2:
   version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+  resolved "http://registry.npm.qima-inc.com/is-buffer/download/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  resolved "http://registry.npm.qima-inc.com/is-builtin-module/download/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
   dependencies:
     builtin-modules "^1.0.0"
 
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-
 is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  version "1.0.2"
+  resolved "http://registry.npm.qima-inc.com/is-dotfile/download/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  resolved "http://registry.npm.qima-inc.com/is-equal-shallow/download/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
   dependencies:
     is-primitive "^2.0.0"
 
 is-extendable@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  resolved "http://registry.npm.qima-inc.com/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
 
 is-extglob@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  resolved "http://registry.npm.qima-inc.com/is-extglob/download/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
 is-extglob@^2.1.0:
   version "2.1.1"
@@ -797,13 +778,13 @@ is-extglob@^2.1.0:
 
 is-finite@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  resolved "http://registry.npm.qima-inc.com/is-finite/download/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
   dependencies:
     number-is-nan "^1.0.0"
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  resolved "http://registry.npm.qima-inc.com/is-glob/download/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
   dependencies:
     is-extglob "^1.0.0"
 
@@ -813,100 +794,78 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-number@^2.1.0:
+is-number@^2.0.2, is-number@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  resolved "http://registry.npm.qima-inc.com/is-number/download/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
   dependencies:
     kind-of "^3.0.2"
 
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  dependencies:
-    kind-of "^3.0.2"
-
-is-plain-object@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  dependencies:
-    isobject "^3.0.1"
-
 is-posix-bracket@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  resolved "http://registry.npm.qima-inc.com/is-posix-bracket/download/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
 
 is-primitive@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  resolved "http://registry.npm.qima-inc.com/is-primitive/download/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
 is-relative@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
+  resolved "http://registry.npm.qima-inc.com/is-relative/download/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
   dependencies:
     is-unc-path "^0.1.1"
 
 is-unc-path@^0.1.1:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9"
+  resolved "http://registry.npm.qima-inc.com/is-unc-path/download/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9"
   dependencies:
     unc-path-regex "^0.1.0"
 
 is-utf8@^0.2.0:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  resolved "http://registry.npm.qima-inc.com/is-utf8/download/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
 is-windows@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
+  resolved "http://registry.npm.qima-inc.com/is-windows/download/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
 
 isarray@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  resolved "http://registry.npm.qima-inc.com/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  resolved "http://registry.npm.qima-inc.com/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  resolved "http://registry.npm.qima-inc.com/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
 
-isobject@^2.0.0, isobject@^2.1.0:
+isobject@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  resolved "http://registry.npm.qima-inc.com/isobject/download/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
   dependencies:
     isarray "1.0.0"
 
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-
 js-base64@^2.1.9:
   version "2.1.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+  resolved "http://registry.npm.qima-inc.com/js-base64/download/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
 js-yaml@^3.4.3:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
+  version "3.8.3"
+  resolved "http://registry.npm.qima-inc.com/js-yaml/download/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766"
   dependencies:
     argparse "^1.0.7"
-    esprima "^4.0.0"
+    esprima "^3.1.1"
 
 kind-of@^3.0.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  version "3.1.0"
+  resolved "http://registry.npm.qima-inc.com/kind-of/download/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
   dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  dependencies:
-    is-buffer "^1.1.5"
+    is-buffer "^1.0.2"
 
 liftoff@^2.1.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
+  resolved "http://registry.npm.qima-inc.com/liftoff/download/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
   dependencies:
     extend "^3.0.0"
     findup-sync "^0.4.2"
@@ -920,7 +879,7 @@ liftoff@^2.1.0:
 
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "http://registry.npm.qima-inc.com/load-json-file/download/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -930,125 +889,133 @@ load-json-file@^1.0.0:
 
 lodash._basecopy@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+  resolved "http://registry.npm.qima-inc.com/lodash._basecopy/download/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
 
 lodash._basetostring@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
+  resolved "http://registry.npm.qima-inc.com/lodash._basetostring/download/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
 
 lodash._basevalues@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
+  resolved "http://registry.npm.qima-inc.com/lodash._basevalues/download/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
 
 lodash._escapehtmlchar@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz#df67c3bb6b7e8e1e831ab48bfa0795b92afe899d"
+  resolved "http://registry.npm.qima-inc.com/lodash._escapehtmlchar/download/lodash._escapehtmlchar-2.4.1.tgz#df67c3bb6b7e8e1e831ab48bfa0795b92afe899d"
   dependencies:
     lodash._htmlescapes "~2.4.1"
 
 lodash._escapestringchar@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz#ecfe22618a2ade50bfeea43937e51df66f0edb72"
+  resolved "http://registry.npm.qima-inc.com/lodash._escapestringchar/download/lodash._escapestringchar-2.4.1.tgz#ecfe22618a2ade50bfeea43937e51df66f0edb72"
 
 lodash._getnative@^3.0.0:
   version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+  resolved "http://registry.npm.qima-inc.com/lodash._getnative/download/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
 
 lodash._htmlescapes@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz#32d14bf0844b6de6f8b62a051b4f67c228b624cb"
+  resolved "http://registry.npm.qima-inc.com/lodash._htmlescapes/download/lodash._htmlescapes-2.4.1.tgz#32d14bf0844b6de6f8b62a051b4f67c228b624cb"
 
 lodash._isiterateecall@^3.0.0:
   version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+  resolved "http://registry.npm.qima-inc.com/lodash._isiterateecall/download/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
 
 lodash._isnative@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._isnative/-/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c"
+  resolved "http://registry.npm.qima-inc.com/lodash._isnative/download/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c"
 
 lodash._objecttypes@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz#7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"
+  resolved "http://registry.npm.qima-inc.com/lodash._objecttypes/download/lodash._objecttypes-2.4.1.tgz#7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"
 
 lodash._reescape@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
+  resolved "http://registry.npm.qima-inc.com/lodash._reescape/download/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
 
 lodash._reevaluate@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
+  resolved "http://registry.npm.qima-inc.com/lodash._reevaluate/download/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
 
 lodash._reinterpolate@^2.4.1, lodash._reinterpolate@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz#4f1227aa5a8711fc632f5b07a1f4607aab8b3222"
+  resolved "http://registry.npm.qima-inc.com/lodash._reinterpolate/download/lodash._reinterpolate-2.4.1.tgz#4f1227aa5a8711fc632f5b07a1f4607aab8b3222"
 
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  resolved "http://registry.npm.qima-inc.com/lodash._reinterpolate/download/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
 
 lodash._reunescapedhtml@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz#747c4fc40103eb3bb8a0976e571f7a2659e93ba7"
+  resolved "http://registry.npm.qima-inc.com/lodash._reunescapedhtml/download/lodash._reunescapedhtml-2.4.1.tgz#747c4fc40103eb3bb8a0976e571f7a2659e93ba7"
   dependencies:
     lodash._htmlescapes "~2.4.1"
     lodash.keys "~2.4.1"
 
 lodash._root@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
+  resolved "http://registry.npm.qima-inc.com/lodash._root/download/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
 
 lodash._shimkeys@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz#6e9cc9666ff081f0b5a6c978b83e242e6949d203"
+  resolved "http://registry.npm.qima-inc.com/lodash._shimkeys/download/lodash._shimkeys-2.4.1.tgz#6e9cc9666ff081f0b5a6c978b83e242e6949d203"
   dependencies:
     lodash._objecttypes "~2.4.1"
 
+lodash.assignwith@^4.0.7:
+  version "4.2.0"
+  resolved "http://registry.npm.qima-inc.com/lodash.assignwith/download/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb"
+
 lodash.defaults@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-2.4.1.tgz#a7e8885f05e68851144b6e12a8f3678026bc4c54"
+  resolved "http://registry.npm.qima-inc.com/lodash.defaults/download/lodash.defaults-2.4.1.tgz#a7e8885f05e68851144b6e12a8f3678026bc4c54"
   dependencies:
     lodash._objecttypes "~2.4.1"
     lodash.keys "~2.4.1"
 
 lodash.escape@^3.0.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
+  resolved "http://registry.npm.qima-inc.com/lodash.escape/download/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
   dependencies:
     lodash._root "^3.0.0"
 
 lodash.escape@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-2.4.1.tgz#2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4"
+  resolved "http://registry.npm.qima-inc.com/lodash.escape/download/lodash.escape-2.4.1.tgz#2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4"
   dependencies:
     lodash._escapehtmlchar "~2.4.1"
     lodash._reunescapedhtml "~2.4.1"
     lodash.keys "~2.4.1"
 
 lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+  version "3.0.9"
+  resolved "http://registry.npm.qima-inc.com/lodash.isarguments/download/lodash.isarguments-3.0.9.tgz#3c4994a4210f340d49ccfafa62176296207d8675"
 
 lodash.isarray@^3.0.0:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+  resolved "http://registry.npm.qima-inc.com/lodash.isarray/download/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+
+lodash.isempty@^4.2.1:
+  version "4.4.0"
+  resolved "http://registry.npm.qima-inc.com/lodash.isempty/download/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
 
 lodash.isobject@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.4.1.tgz#5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"
+  resolved "http://registry.npm.qima-inc.com/lodash.isobject/download/lodash.isobject-2.4.1.tgz#5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"
   dependencies:
     lodash._objecttypes "~2.4.1"
 
 lodash.isplainobject@^4.0.4:
   version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  resolved "http://registry.npm.qima-inc.com/lodash.isplainobject/download/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
 
 lodash.isstring@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  resolved "http://registry.npm.qima-inc.com/lodash.isstring/download/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
 
 lodash.keys@^3.0.0:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  resolved "http://registry.npm.qima-inc.com/lodash.keys/download/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
   dependencies:
     lodash._getnative "^3.0.0"
     lodash.isarguments "^3.0.0"
@@ -1056,7 +1023,7 @@ lodash.keys@^3.0.0:
 
 lodash.keys@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.4.1.tgz#48dea46df8ff7632b10d706b8acb26591e2b3727"
+  resolved "http://registry.npm.qima-inc.com/lodash.keys/download/lodash.keys-2.4.1.tgz#48dea46df8ff7632b10d706b8acb26591e2b3727"
   dependencies:
     lodash._isnative "~2.4.1"
     lodash._shimkeys "~2.4.1"
@@ -1064,15 +1031,19 @@ lodash.keys@~2.4.1:
 
 lodash.mapvalues@^4.4.0:
   version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
+  resolved "http://registry.npm.qima-inc.com/lodash.mapvalues/download/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
+
+lodash.pick@^4.2.1:
+  version "4.4.0"
+  resolved "http://registry.npm.qima-inc.com/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
 
 lodash.restparam@^3.0.0:
   version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  resolved "http://registry.npm.qima-inc.com/lodash.restparam/download/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
 
 lodash.template@^2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-2.4.1.tgz#9e611007edf629129a974ab3c48b817b3e1cf20d"
+  resolved "http://registry.npm.qima-inc.com/lodash.template/download/lodash.template-2.4.1.tgz#9e611007edf629129a974ab3c48b817b3e1cf20d"
   dependencies:
     lodash._escapestringchar "~2.4.1"
     lodash._reinterpolate "~2.4.1"
@@ -1084,7 +1055,7 @@ lodash.template@^2.4.1:
 
 lodash.template@^3.0.0:
   version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
+  resolved "http://registry.npm.qima-inc.com/lodash.template/download/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
   dependencies:
     lodash._basecopy "^3.0.0"
     lodash._basetostring "^3.0.0"
@@ -1098,21 +1069,21 @@ lodash.template@^3.0.0:
 
 lodash.templatesettings@^3.0.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
+  resolved "http://registry.npm.qima-inc.com/lodash.templatesettings/download/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
   dependencies:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
 lodash.templatesettings@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz#ea76c75d11eb86d4dbe89a83893bb861929ac699"
+  resolved "http://registry.npm.qima-inc.com/lodash.templatesettings/download/lodash.templatesettings-2.4.1.tgz#ea76c75d11eb86d4dbe89a83893bb861929ac699"
   dependencies:
     lodash._reinterpolate "~2.4.1"
     lodash.escape "~2.4.1"
 
 lodash.values@~2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-2.4.1.tgz#abf514436b3cb705001627978cbcf30b1280eea4"
+  resolved "http://registry.npm.qima-inc.com/lodash.values/download/lodash.values-2.4.1.tgz#abf514436b3cb705001627978cbcf30b1280eea4"
   dependencies:
     lodash.keys "~2.4.1"
 
@@ -1122,38 +1093,34 @@ lodash@^4.17.4:
 
 lodash@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
+  resolved "http://registry.npm.qima-inc.com/lodash/download/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
 
 loud-rejection@^1.0.0:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  resolved "http://registry.npm.qima-inc.com/loud-rejection/download/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
 lru-cache@2:
   version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+  resolved "http://registry.npm.qima-inc.com/lru-cache/download/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
 
 map-cache@^0.2.0:
   version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  resolved "http://registry.npm.qima-inc.com/map-cache/download/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  resolved "http://registry.npm.qima-inc.com/map-obj/download/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
-map-stream@0.0.4:
+map-stream@0.0.4, map-stream@>=0.0.4:
   version "0.0.4"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.4.tgz#5ec6de90213ef6c7b2eb9367e9ade8da4efdb68b"
-
-map-stream@>=0.0.4:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
+  resolved "http://registry.npm.qima-inc.com/map-stream/download/map-stream-0.0.4.tgz#5ec6de90213ef6c7b2eb9367e9ade8da4efdb68b"
 
 meow@^3.3.0:
   version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  resolved "http://registry.npm.qima-inc.com/meow/download/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -1168,7 +1135,7 @@ meow@^3.3.0:
 
 micromatch@^2.3.7:
   version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  resolved "http://registry.npm.qima-inc.com/micromatch/download/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -1186,54 +1153,54 @@ micromatch@^2.3.7:
 
 minimatch@^2.0.1:
   version "2.0.10"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
+  resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
   dependencies:
     brace-expansion "^1.0.0"
 
-minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+minimatch@^3.0.2:
+  version "3.0.3"
+  resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
-    brace-expansion "^1.1.7"
+    brace-expansion "^1.0.0"
 
 minimatch@~0.2.11:
   version "0.2.14"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
+  resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
   dependencies:
     lru-cache "2"
     sigmund "~1.0.0"
 
 minimist@0.0.8:
   version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "http://registry.npm.qima-inc.com/minimist/download/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
 minimist@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce"
+  resolved "http://registry.npm.qima-inc.com/minimist/download/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce"
 
 minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "http://registry.npm.qima-inc.com/minimist/download/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
 mkdirp@^0.5.0:
   version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "http://registry.npm.qima-inc.com/mkdirp/download/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
 multipipe@^0.1.0, multipipe@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
+  resolved "http://registry.npm.qima-inc.com/multipipe/download/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
   dependencies:
     duplexer2 "0.0.2"
 
 natives@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
+  resolved "http://registry.npm.qima-inc.com/natives/download/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  version "2.3.6"
+  resolved "http://registry.npm.qima-inc.com/normalize-package-data/download/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff"
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -1242,67 +1209,46 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
 
 normalize-path@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  resolved "http://registry.npm.qima-inc.com/normalize-path/download/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-range@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  resolved "http://registry.npm.qima-inc.com/normalize-range/download/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
 num2fraction@^1.2.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  resolved "http://registry.npm.qima-inc.com/num2fraction/download/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
 
 number-is-nan@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  resolved "http://registry.npm.qima-inc.com/number-is-nan/download/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
 object-assign@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
+  resolved "http://registry.npm.qima-inc.com/object-assign/download/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
 
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
-object.defaults@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
-  dependencies:
-    array-each "^1.0.1"
-    array-slice "^1.0.0"
-    for-own "^1.0.0"
-    isobject "^3.0.0"
+  resolved "http://registry.npm.qima-inc.com/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
 object.omit@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  resolved "http://registry.npm.qima-inc.com/object.omit/download/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
-object.pick@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.2.0.tgz#b5392bee9782da6d9fb7d6afaf539779f1234c2b"
-  dependencies:
-    isobject "^2.1.0"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-once@~1.3.0:
+once@^1.3.0, once@~1.3.0:
   version "1.3.3"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
+  resolved "http://registry.npm.qima-inc.com/once/download/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
   dependencies:
     wrappy "1"
 
 orchestrator@^0.3.0:
   version "0.3.8"
-  resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
+  resolved "http://registry.npm.qima-inc.com/orchestrator/download/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
   dependencies:
     end-of-stream "~0.1.5"
     sequencify "~0.0.7"
@@ -1310,15 +1256,15 @@ orchestrator@^0.3.0:
 
 ordered-read-streams@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
+  resolved "http://registry.npm.qima-inc.com/ordered-read-streams/download/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
 
 os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  resolved "http://registry.npm.qima-inc.com/os-homedir/download/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
 parse-filepath@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
+  resolved "http://registry.npm.qima-inc.com/parse-filepath/download/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
   dependencies:
     is-absolute "^0.2.3"
     map-cache "^0.2.0"
@@ -1326,7 +1272,7 @@ parse-filepath@^1.0.1:
 
 parse-glob@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  resolved "http://registry.npm.qima-inc.com/parse-glob/download/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -1335,41 +1281,41 @@ parse-glob@^3.0.4:
 
 parse-json@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  resolved "http://registry.npm.qima-inc.com/parse-json/download/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
   dependencies:
     error-ex "^1.2.0"
 
 parse-passwd@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  resolved "http://registry.npm.qima-inc.com/parse-passwd/download/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
 path-exists@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  resolved "http://registry.npm.qima-inc.com/path-exists/download/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  resolved "http://registry.npm.qima-inc.com/path-is-absolute/download/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
 path-parse@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+  resolved "http://registry.npm.qima-inc.com/path-parse/download/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
 path-root-regex@^0.1.0:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  resolved "http://registry.npm.qima-inc.com/path-root-regex/download/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
 
 path-root@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  resolved "http://registry.npm.qima-inc.com/path-root/download/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
   dependencies:
     path-root-regex "^0.1.0"
 
 path-type@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  resolved "http://registry.npm.qima-inc.com/path-type/download/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -1377,21 +1323,21 @@ path-type@^1.0.0:
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  resolved "http://registry.npm.qima-inc.com/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  resolved "http://registry.npm.qima-inc.com/pinkie-promise/download/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  resolved "http://registry.npm.qima-inc.com/pinkie/download/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
 postcss-advanced-variables@1.2.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-advanced-variables/-/postcss-advanced-variables-1.2.2.tgz#90a6213262e66a050a368b4a9c5d4778d72dbd74"
+  resolved "http://registry.npm.qima-inc.com/postcss-advanced-variables/download/postcss-advanced-variables-1.2.2.tgz#90a6213262e66a050a368b4a9c5d4778d72dbd74"
   dependencies:
     postcss "^5.0.10"
 
@@ -1479,7 +1425,7 @@ postcss-js@^1.0.0:
 
 postcss-load-config@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
+  resolved "http://registry.npm.qima-inc.com/postcss-load-config/download/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
   dependencies:
     cosmiconfig "^2.1.0"
     object-assign "^4.1.0"
@@ -1488,14 +1434,14 @@ postcss-load-config@^1.2.0:
 
 postcss-load-options@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
+  resolved "http://registry.npm.qima-inc.com/postcss-load-options/download/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
   dependencies:
     cosmiconfig "^2.1.0"
     object-assign "^4.1.0"
 
 postcss-load-plugins@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
+  resolved "http://registry.npm.qima-inc.com/postcss-load-plugins/download/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
   dependencies:
     cosmiconfig "^2.1.1"
     object-assign "^4.1.0"
@@ -1508,7 +1454,7 @@ postcss-media-minmax@^3.0.0:
 
 postcss-message-helpers@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+  resolved "http://registry.npm.qima-inc.com/postcss-message-helpers/download/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
 
 postcss-mixins@^6.0.1:
   version "6.0.1"
@@ -1521,10 +1467,10 @@ postcss-mixins@^6.0.1:
     sugarss "^1.0.0"
 
 postcss-nested@^2.0.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.1.2.tgz#04057281f9631fef684857fb0119bae04ede03c6"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.1.0.tgz#72661d79463f5894a8c4b890479baec689d1c693"
   dependencies:
-    postcss "^6.0.9"
+    postcss "^6.0.8"
     postcss-selector-parser "^2.2.3"
 
 postcss-nesting@^4.0.1:
@@ -1578,24 +1524,24 @@ postcss-simple-vars@^4.0.0:
 
 postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+  resolved "http://registry.npm.qima-inc.com/postcss-value-parser/download/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
 
 postcss@^5.0.10, postcss@^5.0.14, postcss@^5.0.15, postcss@^5.0.4, postcss@^5.0.5:
   version "5.2.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
+  resolved "http://registry.npm.qima-inc.com/postcss/download/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
     chalk "^1.1.3"
     js-base64 "^2.1.9"
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.9:
-  version "6.0.9"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.9.tgz#54819766784a51c65b1ec4d54c2f93765438c35a"
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.8:
+  version "6.0.8"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.8.tgz#89067a9ce8b11f8a84cbc5117efc30419a0857b3"
   dependencies:
-    chalk "^2.1.0"
+    chalk "^2.0.1"
     source-map "^0.5.6"
-    supports-color "^4.2.1"
+    supports-color "^4.2.0"
 
 precss@^2.0.0:
   version "2.0.0"
@@ -1620,15 +1566,15 @@ precss@^2.0.0:
 
 preserve@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  resolved "http://registry.npm.qima-inc.com/preserve/download/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 pretty-hrtime@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
+  resolved "http://registry.npm.qima-inc.com/pretty-hrtime/download/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+  resolved "http://registry.npm.qima-inc.com/process-nextick-args/download/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
 promise-each@^2.2.0:
   version "2.2.0"
@@ -1637,28 +1583,28 @@ promise-each@^2.2.0:
     any-promise "^0.1.0"
 
 randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+  version "1.1.6"
+  resolved "http://registry.npm.qima-inc.com/randomatic/download/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
   dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
+    is-number "^2.0.2"
+    kind-of "^3.0.2"
 
 read-cache@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  resolved "http://registry.npm.qima-inc.com/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
   dependencies:
     pify "^2.3.0"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  resolved "http://registry.npm.qima-inc.com/read-pkg-up/download/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
 read-pkg@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  resolved "http://registry.npm.qima-inc.com/read-pkg/download/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -1666,7 +1612,7 @@ read-pkg@^1.0.0:
 
 "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17:
   version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  resolved "http://registry.npm.qima-inc.com/readable-stream/download/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -1674,20 +1620,20 @@ read-pkg@^1.0.0:
     string_decoder "~0.10.x"
 
 readable-stream@^2.1.5:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
+  version "2.2.9"
+  resolved "http://registry.npm.qima-inc.com/readable-stream/download/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
   dependencies:
+    buffer-shims "~1.0.0"
     core-util-is "~1.0.0"
-    inherits "~2.0.3"
+    inherits "~2.0.1"
     isarray "~1.0.0"
     process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
+    string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
 readable-stream@~1.1.9:
   version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  resolved "http://registry.npm.qima-inc.com/readable-stream/download/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -1696,165 +1642,157 @@ readable-stream@~1.1.9:
 
 rechoir@^0.6.2:
   version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  resolved "http://registry.npm.qima-inc.com/rechoir/download/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  resolved "http://registry.npm.qima-inc.com/redent/download/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
 regex-cache@^0.4.2:
   version "0.4.3"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  resolved "http://registry.npm.qima-inc.com/regex-cache/download/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
   dependencies:
     is-equal-shallow "^0.1.3"
     is-primitive "^2.0.0"
 
 remove-trailing-separator@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz#69b062d978727ad14dc6b56ba4ab772fd8d70511"
+  version "1.0.1"
+  resolved "http://registry.npm.qima-inc.com/remove-trailing-separator/download/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
 
 repeat-element@^1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+  resolved "http://registry.npm.qima-inc.com/repeat-element/download/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
 
 repeat-string@^1.5.2:
   version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  resolved "http://registry.npm.qima-inc.com/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
 repeating@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  resolved "http://registry.npm.qima-inc.com/repeating/download/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
   dependencies:
     is-finite "^1.0.0"
 
 replace-ext@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
+  resolved "http://registry.npm.qima-inc.com/replace-ext/download/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
 
 require-from-string@^1.1.0:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+  resolved "http://registry.npm.qima-inc.com/require-from-string/download/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
 
 resolve-dir@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
+  resolved "http://registry.npm.qima-inc.com/resolve-dir/download/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
   dependencies:
     expand-tilde "^1.2.2"
     global-modules "^0.2.3"
 
 resolve@^1.1.6, resolve@^1.1.7:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
+  version "1.3.2"
+  resolved "http://registry.npm.qima-inc.com/resolve/download/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
   dependencies:
     path-parse "^1.0.5"
 
 rgb@~0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/rgb/-/rgb-0.1.0.tgz#be27b291e8feffeac1bd99729721bfa40fc037b5"
+  resolved "http://registry.npm.qima-inc.com/rgb/download/rgb-0.1.0.tgz#be27b291e8feffeac1bd99729721bfa40fc037b5"
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
-"semver@2 || 3 || 4 || 5":
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
-semver@^4.1.0:
+"semver@2 || 3 || 4 || 5", semver@^4.1.0:
   version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+  resolved "http://registry.npm.qima-inc.com/semver/download/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
 
 sequencify@~0.0.7:
   version "0.0.7"
-  resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
+  resolved "http://registry.npm.qima-inc.com/sequencify/download/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
 
 sigmund@~1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  resolved "http://registry.npm.qima-inc.com/sigmund/download/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
 
 signal-exit@^3.0.0:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  resolved "http://registry.npm.qima-inc.com/signal-exit/download/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
 source-map@0.4.x:
   version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  resolved "http://registry.npm.qima-inc.com/source-map/download/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.1, source-map@^0.5.6:
   version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  resolved "http://registry.npm.qima-inc.com/source-map/download/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
 sparkles@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
+  resolved "http://registry.npm.qima-inc.com/sparkles/download/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
 
 spdx-correct@~1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  resolved "http://registry.npm.qima-inc.com/spdx-correct/download/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
   dependencies:
     spdx-license-ids "^1.0.2"
 
 spdx-expression-parse@~1.0.0:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+  resolved "http://registry.npm.qima-inc.com/spdx-expression-parse/download/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
 
 spdx-license-ids@^1.0.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+  resolved "http://registry.npm.qima-inc.com/spdx-license-ids/download/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  resolved "http://registry.npm.qima-inc.com/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
 stream-consume@~0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
+  resolved "http://registry.npm.qima-inc.com/stream-consume/download/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
 
 string_decoder@~0.10.x:
   version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  resolved "http://registry.npm.qima-inc.com/string_decoder/download/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+string_decoder@~1.0.0:
+  version "1.0.0"
+  resolved "http://registry.npm.qima-inc.com/string_decoder/download/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
   dependencies:
-    safe-buffer "~5.1.0"
+    buffer-shims "~1.0.0"
 
 strip-ansi@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
+  resolved "http://registry.npm.qima-inc.com/strip-ansi/download/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
   dependencies:
     ansi-regex "^0.2.1"
 
 strip-ansi@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "http://registry.npm.qima-inc.com/strip-ansi/download/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-bom@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
+  resolved "http://registry.npm.qima-inc.com/strip-bom/download/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
   dependencies:
     first-chunk-stream "^1.0.0"
     is-utf8 "^0.2.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  resolved "http://registry.npm.qima-inc.com/strip-bom/download/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-indent@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  resolved "http://registry.npm.qima-inc.com/strip-indent/download/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
   dependencies:
     get-stdin "^4.0.1"
 
@@ -1866,19 +1804,19 @@ sugarss@^1.0.0:
 
 supports-color@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
+  resolved "http://registry.npm.qima-inc.com/supports-color/download/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
 
 supports-color@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  resolved "http://registry.npm.qima-inc.com/supports-color/download/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
 supports-color@^3.2.3:
   version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  resolved "http://registry.npm.qima-inc.com/supports-color/download/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0, supports-color@^4.2.1:
+supports-color@^4.0.0, supports-color@^4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
   dependencies:
@@ -1886,59 +1824,59 @@ supports-color@^4.0.0, supports-color@^4.2.1:
 
 tcomb@^2.5.1:
   version "2.7.0"
-  resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
+  resolved "http://registry.npm.qima-inc.com/tcomb/download/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
 
 temp-write@~0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-0.1.1.tgz#0b6467838dd77fbf7f62a0c93da879732ffda932"
+  resolved "http://registry.npm.qima-inc.com/temp-write/download/temp-write-0.1.1.tgz#0b6467838dd77fbf7f62a0c93da879732ffda932"
   dependencies:
     graceful-fs "~2.0.0"
     tempfile "~0.1.2"
 
 tempfile@~0.1.2:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-0.1.3.tgz#7d6b710047339d39f847327a056dadf183103010"
+  resolved "http://registry.npm.qima-inc.com/tempfile/download/tempfile-0.1.3.tgz#7d6b710047339d39f847327a056dadf183103010"
   dependencies:
     uuid "~1.4.0"
 
 through2@^0.5.0:
   version "0.5.1"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7"
+  resolved "http://registry.npm.qima-inc.com/through2/download/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7"
   dependencies:
     readable-stream "~1.0.17"
     xtend "~3.0.0"
 
 through2@^0.6.1:
   version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
+  resolved "http://registry.npm.qima-inc.com/through2/download/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
   dependencies:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
 through2@^2.0.0:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  resolved "http://registry.npm.qima-inc.com/through2/download/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
 tildify@^1.0.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
+  resolved "http://registry.npm.qima-inc.com/tildify/download/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
   dependencies:
     os-homedir "^1.0.0"
 
 time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  version "1.0.1"
+  resolved "http://registry.npm.qima-inc.com/time-stamp/download/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
 
 trim-newlines@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  resolved "http://registry.npm.qima-inc.com/trim-newlines/download/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
 unc-path-regex@^0.1.0:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  resolved "http://registry.npm.qima-inc.com/unc-path-regex/download/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
 uniq@^1.0.1:
   version "1.0.1"
@@ -1946,36 +1884,36 @@ uniq@^1.0.1:
 
 unique-stream@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
+  resolved "http://registry.npm.qima-inc.com/unique-stream/download/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
 
 user-home@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
+  resolved "http://registry.npm.qima-inc.com/user-home/download/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
 
 util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  resolved "http://registry.npm.qima-inc.com/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
 uuid@~1.4.0:
   version "1.4.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-1.4.2.tgz#453019f686966a6df83cdc5244e7c990ecc332fc"
+  resolved "http://registry.npm.qima-inc.com/uuid/download/uuid-1.4.2.tgz#453019f686966a6df83cdc5244e7c990ecc332fc"
 
 v8flags@^2.0.2:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
+  resolved "http://registry.npm.qima-inc.com/v8flags/download/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
   dependencies:
     user-home "^1.1.1"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  resolved "http://registry.npm.qima-inc.com/validate-npm-package-license/download/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
   dependencies:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
 vinyl-fs@^0.3.0:
   version "0.3.14"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
+  resolved "http://registry.npm.qima-inc.com/vinyl-fs/download/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
   dependencies:
     defaults "^1.0.0"
     glob-stream "^3.1.5"
@@ -1988,45 +1926,45 @@ vinyl-fs@^0.3.0:
 
 vinyl-sourcemaps-apply@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
+  resolved "http://registry.npm.qima-inc.com/vinyl-sourcemaps-apply/download/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
   dependencies:
     source-map "^0.5.1"
 
 vinyl@^0.2.1:
   version "0.2.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.2.3.tgz#bca938209582ec5a49ad538a00fa1f125e513252"
+  resolved "http://registry.npm.qima-inc.com/vinyl/download/vinyl-0.2.3.tgz#bca938209582ec5a49ad538a00fa1f125e513252"
   dependencies:
     clone-stats "~0.0.1"
 
 vinyl@^0.4.0:
   version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
+  resolved "http://registry.npm.qima-inc.com/vinyl/download/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
   dependencies:
     clone "^0.2.0"
     clone-stats "^0.0.1"
 
 vinyl@^0.5.0:
   version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
+  resolved "http://registry.npm.qima-inc.com/vinyl/download/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
   dependencies:
     clone "^1.0.0"
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
 which@^1.2.12:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  version "1.2.14"
+  resolved "http://registry.npm.qima-inc.com/which/download/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
   dependencies:
     isexe "^2.0.0"
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "http://registry.npm.qima-inc.com/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
 "xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  resolved "http://registry.npm.qima-inc.com/xtend/download/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
 xtend@~3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
+  resolved "http://registry.npm.qima-inc.com/xtend/download/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
diff --git a/test/unit/get-webpack-conf.js b/test/unit/get-webpack-conf.js
index a1b201c4d..0ef3fc5d4 100644
--- a/test/unit/get-webpack-conf.js
+++ b/test/unit/get-webpack-conf.js
@@ -16,7 +16,7 @@ const webpackConfig = {
       minimize: true,
       options: {
         babel: {
-          presets: ['es2015'],
+          presets: ['env'],
           plugins: ['transform-runtime', 'transform-vue-jsx']
         },
         vue: {
diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
index 8deb01ebb..e94bd9532 100644
--- a/test/unit/karma.conf.js
+++ b/test/unit/karma.conf.js
@@ -1,7 +1,7 @@
 require('babel-polyfill');
 
 require('babel-core/register')({
-  presets: [require('babel-preset-es2015')]
+  presets: [require('babel-preset-env')]
 });
 
 var webpackConfig = require('./get-webpack-conf');
diff --git a/yarn.lock b/yarn.lock
index 264ead5b4..0d95113cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -33,12 +33,6 @@ acorn-globals@^1.0.4:
   dependencies:
     acorn "^2.1.0"
 
-acorn-globals@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
-  dependencies:
-    acorn "^4.0.4"
-
 acorn-jsx@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
@@ -49,11 +43,11 @@ acorn@^2.1.0, acorn@^2.4.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
 
-acorn@^3.0.4, acorn@^3.1.0, acorn@~3.3.0:
+acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.1, acorn@^4.0.3, acorn@^4.0.4, acorn@~4.0.2:
+acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
@@ -105,12 +99,6 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
-ansi-align@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
-  dependencies:
-    string-width "^2.0.0"
-
 ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
@@ -257,10 +245,6 @@ arrify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
-asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-
 asn1.js@^4.0.0:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
@@ -303,10 +287,6 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-
 async@1.x, async@^1.4.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@@ -446,6 +426,14 @@ babel-generator@^6.25.0:
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
 babel-helper-call-delegate@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
@@ -464,6 +452,14 @@ babel-helper-define-map@^6.24.1:
     babel-types "^6.24.1"
     lodash "^4.2.0"
 
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
 babel-helper-function-name@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
@@ -503,6 +499,16 @@ babel-helper-regex@^6.24.1:
     babel-types "^6.24.1"
     lodash "^4.2.0"
 
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
 babel-helper-replace-supers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
@@ -555,10 +561,34 @@ babel-plugin-module-resolver@^2.7.1:
     glob "^7.1.1"
     resolve "^1.2.0"
 
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+
 babel-plugin-syntax-jsx@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
 
+babel-plugin-syntax-object-rest-spread@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+
+babel-plugin-transform-async-to-generator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-es2015-arrow-functions@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
@@ -571,7 +601,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.24.1:
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576"
   dependencies:
@@ -581,7 +611,7 @@ babel-plugin-transform-es2015-block-scoping@^6.24.1:
     babel-types "^6.24.1"
     lodash "^4.2.0"
 
-babel-plugin-transform-es2015-classes@^6.24.1:
+babel-plugin-transform-es2015-classes@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
   dependencies:
@@ -595,33 +625,33 @@ babel-plugin-transform-es2015-classes@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-computed-properties@^6.24.1:
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-destructuring@^6.22.0:
+babel-plugin-transform-es2015-destructuring@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-for-of@^6.22.0:
+babel-plugin-transform-es2015-for-of@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-function-name@^6.24.1:
+babel-plugin-transform-es2015-function-name@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
   dependencies:
@@ -635,7 +665,7 @@ babel-plugin-transform-es2015-literals@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-modules-amd@^6.24.1:
+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
   dependencies:
@@ -643,7 +673,7 @@ babel-plugin-transform-es2015-modules-amd@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
   dependencies:
@@ -652,7 +682,7 @@ babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
     babel-template "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
   dependencies:
@@ -660,7 +690,7 @@ babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-umd@^6.24.1:
+babel-plugin-transform-es2015-modules-umd@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
   dependencies:
@@ -668,14 +698,14 @@ babel-plugin-transform-es2015-modules-umd@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-object-super@^6.24.1:
+babel-plugin-transform-es2015-object-super@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
   dependencies:
     babel-helper-replace-supers "^6.24.1"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-parameters@^6.24.1:
+babel-plugin-transform-es2015-parameters@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
   dependencies:
@@ -686,7 +716,7 @@ babel-plugin-transform-es2015-parameters@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
   dependencies:
@@ -699,7 +729,7 @@ babel-plugin-transform-es2015-spread@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-sticky-regex@^6.24.1:
+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
   dependencies:
@@ -713,13 +743,13 @@ babel-plugin-transform-es2015-template-literals@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
+babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-unicode-regex@^6.24.1:
+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
   dependencies:
@@ -727,7 +757,22 @@ babel-plugin-transform-es2015-unicode-regex@^6.24.1:
     babel-runtime "^6.22.0"
     regexpu-core "^2.0.0"
 
-babel-plugin-transform-regenerator@^6.24.1:
+babel-plugin-transform-exponentiation-operator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-object-rest-spread@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418"
   dependencies:
@@ -760,34 +805,40 @@ babel-polyfill@^6.23.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-preset-es2015@^6.16.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
+babel-preset-env@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
     babel-plugin-transform-es2015-arrow-functions "^6.22.0"
     babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.24.1"
-    babel-plugin-transform-es2015-classes "^6.24.1"
-    babel-plugin-transform-es2015-computed-properties "^6.24.1"
-    babel-plugin-transform-es2015-destructuring "^6.22.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.24.1"
-    babel-plugin-transform-es2015-for-of "^6.22.0"
-    babel-plugin-transform-es2015-function-name "^6.24.1"
+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
     babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-plugin-transform-es2015-modules-systemjs "^6.24.1"
-    babel-plugin-transform-es2015-modules-umd "^6.24.1"
-    babel-plugin-transform-es2015-object-super "^6.24.1"
-    babel-plugin-transform-es2015-parameters "^6.24.1"
-    babel-plugin-transform-es2015-shorthand-properties "^6.24.1"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
     babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.24.1"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
     babel-plugin-transform-es2015-template-literals "^6.22.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.24.1"
-    babel-plugin-transform-regenerator "^6.24.1"
+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^2.1.2"
+    invariant "^2.2.2"
+    semver "^5.3.0"
 
 babel-register@^6.24.1:
   version "6.24.1"
@@ -841,12 +892,6 @@ babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
-babelrc-rollup@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/babelrc-rollup/-/babelrc-rollup-3.0.0.tgz#fcecdbe3eb6400cf4e769233c1786a2fafe8b56c"
-  dependencies:
-    resolve "^1.1.7"
-
 babylon@^6.17.0, babylon@^6.17.2:
   version "6.17.4"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
@@ -965,18 +1010,6 @@ boom@2.x.x:
   dependencies:
     hoek "2.x.x"
 
-boxen@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.2.1.tgz#0f11e7fe344edb9397977fc13ede7f64d956481d"
-  dependencies:
-    ansi-align "^2.0.0"
-    camelcase "^4.0.0"
-    chalk "^2.0.1"
-    cli-boxes "^1.0.0"
-    string-width "^2.0.0"
-    term-size "^1.2.0"
-    widest-line "^1.0.0"
-
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
@@ -1002,12 +1035,6 @@ brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
-browser-resolve@^1.11.0:
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
-  dependencies:
-    resolve "1.1.7"
-
 browser-stdout@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
@@ -1070,7 +1097,7 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^2.1.5:
+browserslist@^2.1.2, browserslist@^2.1.5:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.3.3.tgz#2b0cabc4d28489f682598605858a0782f14b154c"
   dependencies:
@@ -1093,7 +1120,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.0, builtin-modules@^1.1.1:
+builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
@@ -1153,7 +1180,7 @@ camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
-camelcase@^4.0.0, camelcase@^4.1.0:
+camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
@@ -1206,7 +1233,7 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.1, chalk@^2.1.0:
+chalk@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e"
   dependencies:
@@ -1245,12 +1272,6 @@ change-case@3.0.x:
     upper-case "^1.1.1"
     upper-case-first "^1.1.0"
 
-character-parser@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
-  dependencies:
-    is-regex "^1.0.3"
-
 check-error@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
@@ -1320,7 +1341,7 @@ clap@^1.0.9:
   dependencies:
     chalk "^1.1.3"
 
-clean-css@3.4.x, clean-css@^3.3.0:
+clean-css@3.4.x:
   version "3.4.28"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
   dependencies:
@@ -1333,10 +1354,6 @@ clean-css@4.1.x:
   dependencies:
     source-map "0.5.x"
 
-cli-boxes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
-
 cli-cursor@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
@@ -1397,14 +1414,6 @@ codecov@^2.2.0:
     request "2.81.0"
     urlgrey "0.4.4"
 
-coffee-script@^1.12.4:
-  version "1.12.7"
-  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
-
-coffeescript-compiler@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/coffeescript-compiler/-/coffeescript-compiler-0.1.1.tgz#81a8bd44a78bda421f7e0b51f28d13c853beb805"
-
 color-convert@^1.3.0, color-convert@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
@@ -1562,13 +1571,6 @@ constant-case@^2.0.0:
     snake-case "^2.1.0"
     upper-case "^1.1.1"
 
-constantinople@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"
-  dependencies:
-    acorn "^3.1.0"
-    is-expression "^2.0.1"
-
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -1651,13 +1653,6 @@ cross-env@^5.0.5:
     cross-spawn "^5.1.0"
     is-windows "^1.0.0"
 
-cross-spawn@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
 cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -1719,21 +1714,6 @@ css-loader@^0.28.4:
     postcss-value-parser "^3.3.0"
     source-list-map "^0.1.7"
 
-css-modules-loader-core@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz#5908668294a1becd261ae0a4ce21b0b551f21d16"
-  dependencies:
-    icss-replace-symbols "1.1.0"
-    postcss "6.0.1"
-    postcss-modules-extract-imports "1.1.0"
-    postcss-modules-local-by-default "1.2.0"
-    postcss-modules-scope "1.1.0"
-    postcss-modules-values "1.3.0"
-
-css-parse@1.7.x:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
-
 css-select@^1.1.0, css-select@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
@@ -1858,12 +1838,6 @@ de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
 
-debug@*:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.0.tgz#1d2feae53349047b08b264ec41906ba17a8516e4"
-  dependencies:
-    ms "2.0.0"
-
 debug@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
@@ -1882,7 +1856,7 @@ debug@2.6.7:
   dependencies:
     ms "2.0.0"
 
-debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8:
+debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.6, debug@^2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
@@ -1896,12 +1870,6 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
-deep-assign@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/deep-assign/-/deep-assign-2.0.0.tgz#ebe06b1f07f08dae597620e3dd1622f371a1c572"
-  dependencies:
-    is-obj "^1.0.0"
-
 deep-eql@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-2.0.2.tgz#b1bac06e56f0a76777686d50c9feb75c2ed7679a"
@@ -2054,10 +2022,6 @@ doctrine@^2.0.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctypes@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
-
 dom-converter@~0.1:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
@@ -2142,10 +2106,6 @@ duplexer2@0.0.2:
   dependencies:
     readable-stream "~1.1.9"
 
-duplexer@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -2260,7 +2220,7 @@ entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-errno@^0.1.1, errno@^0.1.3:
+errno@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
   dependencies:
@@ -2558,14 +2518,6 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
-estree-walker@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
-
-estree-walker@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
-
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -2797,10 +2749,6 @@ filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
-filesize@^3.5.6:
-  version "3.5.10"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.10.tgz#fc8fa23ddb4ef9e5e0ab6e1e64f679a24a56761f"
-
 fill-range@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
@@ -3030,12 +2978,6 @@ gaze@^0.5.1:
   dependencies:
     globule "~0.1.0"
 
-gaze@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105"
-  dependencies:
-    globule "^1.0.0"
-
 generate-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
@@ -3046,12 +2988,6 @@ generate-object-property@^1.1.0:
   dependencies:
     is-property "^1.0.0"
 
-generic-names@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-1.0.2.tgz#e25b7feceb5b5a8f28f5f972a7ccfe57e562adcd"
-  dependencies:
-    loader-utils "^0.2.16"
-
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -3122,17 +3058,6 @@ glob2base@^0.0.12:
   dependencies:
     find-index "^0.1.1"
 
-glob@7.0.x:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
@@ -3163,7 +3088,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -3223,14 +3148,6 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globule@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.4"
-    minimatch "~3.0.2"
-
 globule@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
@@ -3314,12 +3231,6 @@ gulplog@^1.0.0:
   dependencies:
     glogg "^1.0.0"
 
-gzip-size@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
-  dependencies:
-    duplexer "^0.1.1"
-
 handle-thing@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
@@ -3519,7 +3430,7 @@ html-webpack-plugin@^2.29.0:
     pretty-error "^2.0.2"
     toposort "^1.0.0"
 
-htmlparser2@^3.8.2, htmlparser2@^3.8.3, htmlparser2@^3.9.1:
+htmlparser2@^3.8.2, htmlparser2@^3.9.1:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
   dependencies:
@@ -3594,7 +3505,7 @@ iconv-lite@0.4.15:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
-icss-replace-symbols@1.1.0, icss-replace-symbols@^1.1.0:
+icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
 
@@ -3612,18 +3523,10 @@ ignore@^3.2.0:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
 
-image-size@~0.5.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
-in-publish@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
-
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -3689,7 +3592,7 @@ interpret@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
 
-invariant@^2.2.0:
+invariant@^2.2.0, invariant@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
@@ -3760,20 +3663,6 @@ is-equal-shallow@^0.1.3:
   dependencies:
     is-primitive "^2.0.0"
 
-is-expression@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-2.1.0.tgz#91be9d47debcfef077977e9722be6dcfb4465ef0"
-  dependencies:
-    acorn "~3.3.0"
-    object-assign "^4.0.1"
-
-is-expression@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
-  dependencies:
-    acorn "~4.0.2"
-    object-assign "^4.0.1"
-
 is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -3820,10 +3709,6 @@ is-lower-case@^1.1.0:
   dependencies:
     lower-case "^1.1.0"
 
-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-
 is-my-json-valid@^2.10.0:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
@@ -3849,10 +3734,6 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -3869,7 +3750,7 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
+is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
@@ -3887,15 +3768,11 @@ is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-
 is-property@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
 
-is-regex@^1.0.3, is-regex@^1.0.4:
+is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
   dependencies:
@@ -4024,7 +3901,7 @@ istanbul@^0.4.0:
     which "^1.1.1"
     wordwrap "^1.0.0"
 
-js-base64@^2.1.8, js-base64@^2.1.9:
+js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
@@ -4037,10 +3914,6 @@ js-beautify@^1.6.14:
     mkdirp "~0.5.0"
     nopt "~3.0.1"
 
-js-stringify@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
-
 js-tokens@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -4154,13 +4027,6 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jstransformer@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
-  dependencies:
-    is-promise "^2.0.0"
-    promise "^7.0.1"
-
 jsx-ast-utils@^1.0.0, jsx-ast-utils@^1.3.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
@@ -4300,19 +4166,6 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
-less@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/less/-/less-2.7.2.tgz#368d6cc73e1fb03981183280918743c5dcf9b3df"
-  optionalDependencies:
-    errno "^0.1.1"
-    graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    mime "^1.2.11"
-    mkdirp "^0.5.0"
-    promise "^7.1.1"
-    request "^2.72.0"
-    source-map "^0.5.3"
-
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -4440,10 +4293,6 @@ lodash._root@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
 
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
 lodash.assignin@^4.0.9:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
@@ -4456,10 +4305,6 @@ lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
 
-lodash.clonedeep@^4.3.2:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-
 lodash.cond@^4.3.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
@@ -4534,10 +4379,6 @@ lodash.merge@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
-lodash.mergewith@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
-
 lodash.pick@^4.2.1:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
@@ -4587,7 +4428,7 @@ lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.4:
+lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -4662,12 +4503,6 @@ macaddress@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
 
-magic-string@^0.19.0:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.19.1.tgz#14d768013caf2ec8fdea16a49af82fc377e75201"
-  dependencies:
-    vlq "^0.2.1"
-
 make-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
@@ -4731,7 +4566,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.3.0, meow@^3.7.0:
+meow@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   dependencies:
@@ -4750,12 +4585,6 @@ merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
-merge-options@0.0.64:
-  version "0.0.64"
-  resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-0.0.64.tgz#cbe04f594a6985eaf27f7f8f0b2a3acf6f9d562d"
-  dependencies:
-    is-plain-obj "^1.1.0"
-
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -4799,7 +4628,7 @@ mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-mime@1.3.x, mime@^1.2.11, mime@^1.3.4:
+mime@1.3.x, mime@^1.3.4:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
 
@@ -4815,7 +4644,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -4907,7 +4736,7 @@ mute-stream@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
 
-nan@^2.3.0, nan@^2.3.2:
+nan@^2.3.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
 
@@ -4943,24 +4772,6 @@ node-forge@0.6.33:
   version "0.6.33"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc"
 
-node-gyp@^3.3.1:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "2"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
-
 node-libs-browser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
@@ -5003,29 +4814,6 @@ node-pre-gyp@^0.6.36:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-node-sass@^4.5.0:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568"
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.3.2"
-    node-gyp "^3.3.1"
-    npmlog "^4.0.0"
-    request "^2.79.0"
-    sass-graph "^2.1.1"
-    stdout-stream "^1.4.0"
-
 node-watch@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.5.5.tgz#34865ba8bc6861ab086acdcc3403e40ed55c3274"
@@ -5037,7 +4825,7 @@ nomnomnomnom@^2.0.0:
     chalk "~0.4.0"
     underscore "~1.6.0"
 
-"nopt@2 || 3", nopt@3.x, nopt@~3.0.1:
+nopt@3.x, nopt@~3.0.1:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
@@ -5084,7 +4872,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
+npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -5279,7 +5067,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@0, osenv@^0.1.4:
+osenv@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
   dependencies:
@@ -5363,10 +5151,6 @@ parse5@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
 
-parse5@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-2.2.3.tgz#0c4fc41c1000c5e6b93d48b03f8083837834e9f6"
-
 parsejson@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
@@ -5802,48 +5586,33 @@ postcss-mixins@^6.0.1:
     postcss-simple-vars "^4.0.0"
     sugarss "^1.0.0"
 
-postcss-modules-extract-imports@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb"
-  dependencies:
-    postcss "^6.0.1"
-
 postcss-modules-extract-imports@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
   dependencies:
     postcss "^6.0.1"
 
-postcss-modules-local-by-default@1.2.0, postcss-modules-local-by-default@^1.0.1:
+postcss-modules-local-by-default@^1.0.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
 
-postcss-modules-scope@1.1.0, postcss-modules-scope@^1.0.0:
+postcss-modules-scope@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
   dependencies:
     css-selector-tokenizer "^0.7.0"
     postcss "^6.0.1"
 
-postcss-modules-values@1.3.0, postcss-modules-values@^1.1.0:
+postcss-modules-values@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
   dependencies:
     icss-replace-symbols "^1.1.0"
     postcss "^6.0.1"
 
-postcss-modules@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-0.6.4.tgz#77a58bb77ba1b4392b270c0b59852fd75e89a8b4"
-  dependencies:
-    css-modules-loader-core "^1.0.1"
-    generic-names "^1.0.2"
-    postcss "^5.2.8"
-    string-hash "^1.1.1"
-
 postcss-nested@^2.0.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.1.2.tgz#04057281f9631fef684857fb0119bae04ede03c6"
@@ -5972,15 +5741,7 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
-  dependencies:
-    chalk "^1.1.3"
-    source-map "^0.5.6"
-    supports-color "^3.2.3"
-
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.15, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.11, postcss@^5.2.16, postcss@^5.2.8:
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.15, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
   version "5.2.17"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
@@ -5997,30 +5758,6 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.6,
     source-map "^0.5.6"
     supports-color "^4.2.1"
 
-posthtml-attrs-parser@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posthtml-attrs-parser/-/posthtml-attrs-parser-0.1.1.tgz#cc33e00155fb99ba96f67e25e330461f05742ac8"
-  dependencies:
-    object-assign "^4.0.1"
-
-posthtml-parser@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.2.1.tgz#35d530de386740c2ba24ff2eb2faf39ccdf271dd"
-  dependencies:
-    htmlparser2 "^3.8.3"
-    isobject "^2.1.0"
-
-posthtml-render@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/posthtml-render/-/posthtml-render-1.0.6.tgz#1b88b8e7860a8ebdfe2f2a1310a4642a55cf5bda"
-
-posthtml@^0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/posthtml/-/posthtml-0.9.2.tgz#f4c06db9f67b61fd17c4e256e7e3d9515bf726fd"
-  dependencies:
-    posthtml-parser "^0.2.0"
-    posthtml-render "^1.0.5"
-
 precss@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/precss/-/precss-2.0.0.tgz#7f567e3318e06d44c8fdbf9e58452e8358bf4b71"
@@ -6095,12 +5832,6 @@ promise-each@^2.2.0:
   dependencies:
     any-promise "^0.1.0"
 
-promise@^7.0.1, promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  dependencies:
-    asap "~2.0.3"
-
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -6130,99 +5861,6 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-pug-attrs@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.2.tgz#8be2b2225568ffa75d1b866982bff9f4111affcb"
-  dependencies:
-    constantinople "^3.0.1"
-    js-stringify "^1.0.1"
-    pug-runtime "^2.0.3"
-
-pug-code-gen@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-1.1.1.tgz#1cf72744ef2a039eae6a3340caaa1105871258e8"
-  dependencies:
-    constantinople "^3.0.1"
-    doctypes "^1.1.0"
-    js-stringify "^1.0.1"
-    pug-attrs "^2.0.2"
-    pug-error "^1.3.2"
-    pug-runtime "^2.0.3"
-    void-elements "^2.0.1"
-    with "^5.0.0"
-
-pug-error@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
-
-pug-filters@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-2.1.4.tgz#ab247c0f58765414b61be7b54fe979e9f6fc898f"
-  dependencies:
-    clean-css "^3.3.0"
-    constantinople "^3.0.1"
-    jstransformer "1.0.0"
-    pug-error "^1.3.2"
-    pug-walk "^1.1.4"
-    resolve "^1.1.6"
-    uglify-js "^2.6.1"
-
-pug-lexer@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-3.1.0.tgz#fd087376d4a675b4f59f8fef422883434e9581a2"
-  dependencies:
-    character-parser "^2.1.1"
-    is-expression "^3.0.0"
-    pug-error "^1.3.2"
-
-pug-linker@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.2.tgz#cc0780cf9f3f5522b270871785492b99588d3142"
-  dependencies:
-    pug-error "^1.3.2"
-    pug-walk "^1.1.4"
-
-pug-load@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.8.tgz#1df1c1716f3e68c70d71699cff9458472dc38b9b"
-  dependencies:
-    object-assign "^4.1.0"
-    pug-walk "^1.1.4"
-
-pug-parser@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-3.0.1.tgz#dc0c5dd6c9c2d89da6105abbdf3d1b0fb4d39b5e"
-  dependencies:
-    pug-error "^1.3.2"
-    token-stream "0.0.1"
-
-pug-runtime@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.3.tgz#98162607b0fce9e254d427f33987a5aee7168bda"
-
-pug-strip-comments@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz#d313afa01bcc374980e1399e23ebf2eb9bdc8513"
-  dependencies:
-    pug-error "^1.3.2"
-
-pug-walk@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.4.tgz#29e5174af43b67e99c31b448632e1ff86ddd671c"
-
-pug@^2.0.0-beta11:
-  version "2.0.0-rc.3"
-  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.0-rc.3.tgz#553cb3c3a97bb54ec3cb1e08591dcae3b6f58891"
-  dependencies:
-    pug-code-gen "^1.1.1"
-    pug-filters "^2.1.4"
-    pug-lexer "^3.1.0"
-    pug-linker "^3.0.2"
-    pug-load "^2.0.8"
-    pug-parser "^3.0.1"
-    pug-runtime "^2.0.3"
-    pug-strip-comments "^1.0.2"
-
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
@@ -6270,10 +5908,6 @@ querystringify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
 
-raf.js@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/raf.js/-/raf.js-0.0.4.tgz#f15af445d241b27fa7131a57450b67ef9c402fec"
-
 randomatic@^1.1.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
@@ -6531,7 +6165,7 @@ request-progress@~2.0.1:
   dependencies:
     throttleit "^1.0.0"
 
-request@2, request@2.81.0, request@^2.55.0, request@^2.72.0, request@^2.79.0, request@^2.81.0, request@~2.81.0:
+request@2.81.0, request@^2.55.0, request@^2.81.0, request@~2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   dependencies:
@@ -6592,7 +6226,7 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
-resolve@1.1.7, resolve@1.1.x:
+resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
@@ -6632,90 +6266,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
-rollup-plugin-babel@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.1.tgz#e1b75bc3a6ea876bb8ec747562b344b15e27c94e"
-  dependencies:
-    rollup-pluginutils "^1.5.0"
-
-rollup-plugin-commonjs@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.1.0.tgz#8ac9a87e6ea4c0d136e3e0e25ef41058957622b0"
-  dependencies:
-    acorn "^4.0.1"
-    estree-walker "^0.3.0"
-    magic-string "^0.19.0"
-    resolve "^1.1.7"
-    rollup-pluginutils "^2.0.1"
-
-rollup-plugin-filesize@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-filesize/-/rollup-plugin-filesize-1.4.2.tgz#eebdf571217e2fe14ab14a6534bf21f771a053b1"
-  dependencies:
-    boxen "^1.1.0"
-    colors "^1.1.2"
-    deep-assign "^2.0.0"
-    filesize "^3.5.6"
-    gzip-size "^3.0.0"
-
-rollup-plugin-node-resolve@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
-  dependencies:
-    browser-resolve "^1.11.0"
-    builtin-modules "^1.1.0"
-    is-module "^1.0.0"
-    resolve "^1.1.6"
-
-rollup-plugin-vue@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-vue/-/rollup-plugin-vue-2.4.1.tgz#a8780c8f3163880e70631d84019b6183b4198a97"
-  dependencies:
-    babel-runtime "^6.22.0"
-    camelcase "^4.0.0"
-    de-indent "^1.0.2"
-    debug "^2.6.0"
-    hash-sum "^1.0.2"
-    html-minifier "^3.2.3"
-    magic-string "^0.19.0"
-    merge-options "0.0.64"
-    parse5 "^2.1.0"
-    postcss "^5.2.11"
-    postcss-modules "^0.6.4"
-    postcss-selector-parser "^2.2.3"
-    posthtml "^0.9.2"
-    posthtml-attrs-parser "^0.1.1"
-    rollup-pluginutils "^2.0.1"
-    typescript "^2.4.1"
-    vue-template-compiler "*"
-    vue-template-es2015-compiler "^1.5.0"
-    vue-template-validator "^1.1.5"
-  optionalDependencies:
-    coffee-script "^1.12.4"
-    coffeescript-compiler "^0.1.1"
-    less "^2.7.2"
-    node-sass "^4.5.0"
-    pug "^2.0.0-beta11"
-    stylus "^0.54.5"
-
-rollup-pluginutils@^1.5.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
-  dependencies:
-    estree-walker "^0.2.1"
-    minimatch "^3.0.2"
-
-rollup-pluginutils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
-  dependencies:
-    estree-walker "^0.3.0"
-    micromatch "^2.3.11"
-
-rollup@^0.47.4:
-  version "0.47.4"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.47.4.tgz#e3a55de83a78221d232ce29619a8d68189ae845e"
-
 run-async@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
@@ -6741,19 +6291,6 @@ samsam@1.x, samsam@^1.1.3:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
 
-sass-graph@^2.1.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
-  dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^7.0.0"
-
-sax@0.5.x:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
-
 sax@^1.1.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -6764,13 +6301,6 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
-
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -6789,10 +6319,6 @@ semver@^4.1.0, semver@~4.3.3:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
 send@0.15.4:
   version "0.15.4"
   resolved "https://registry.yarnpkg.com/send/-/send-0.15.4.tgz#985faa3e284b0273c793364a35c6737bd93905b9"
@@ -7010,13 +6536,7 @@ source-map-support@^0.4.2:
   dependencies:
     source-map "^0.5.6"
 
-source-map@0.1.x, source-map@^0.1.41:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@0.4.x, source-map@^0.4.2, source-map@^0.4.4:
+source-map@0.4.x, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
@@ -7026,6 +6546,12 @@ source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, sourc
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
+source-map@^0.1.41:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
@@ -7099,12 +6625,6 @@ stackframe@^1.0.3:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
-stdout-stream@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
-  dependencies:
-    readable-stream "^2.0.1"
-
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -7130,10 +6650,6 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
-string-hash@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
-
 string-length@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
@@ -7223,17 +6739,6 @@ style-loader@^0.18.2:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"
 
-stylus@^0.54.5:
-  version "0.54.5"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
-  dependencies:
-    css-parse "1.7.x"
-    debug "*"
-    glob "7.0.x"
-    mkdirp "0.5.x"
-    sax "0.5.x"
-    source-map "0.1.x"
-
 sugarss@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.0.tgz#65e51b3958432fb70d5451a68bb33e32d0cf1ef7"
@@ -7313,7 +6818,7 @@ tar-pack@^3.4.0:
     tar "^2.2.1"
     uid-number "^0.0.6"
 
-tar@^2.0.0, tar@^2.2.1:
+tar@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
   dependencies:
@@ -7325,12 +6830,6 @@ tcomb@^2.5.1:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
 
-term-size@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
-  dependencies:
-    execa "^0.7.0"
-
 text-encoding@0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
@@ -7416,10 +6915,6 @@ to-fast-properties@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
-token-stream@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
-
 toposort@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.3.tgz#f02cd8a74bd8be2fc0e98611c3bacb95a171869c"
@@ -7485,10 +6980,6 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@^2.4.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
-
 uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
@@ -7509,7 +7000,7 @@ uglify-js@3.0.x:
     commander "~2.11.0"
     source-map "~0.5.1"
 
-uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@^2.8.29:
+uglify-js@^2.6, uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -7724,17 +7215,13 @@ vinyl@^0.5.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
-vlq@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1"
-
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
   dependencies:
     indexof "0.0.1"
 
-void-elements@^2.0.0, void-elements@^2.0.1:
+void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
@@ -7798,23 +7285,17 @@ vue-style-loader@^3.0.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@*, vue-template-compiler@^2.4.2:
+vue-template-compiler@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz#5a45d843f148b098f6c1d1e35ac20c4956d30ad1"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
 
-vue-template-es2015-compiler@^1.5.0, vue-template-es2015-compiler@^1.5.3:
+vue-template-es2015-compiler@^1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
 
-vue-template-validator@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/vue-template-validator/-/vue-template-validator-1.1.5.tgz#22d1ee77d0647c1ab14ff7eb01865942d9b3c458"
-  dependencies:
-    chalk "^1.1.1"
-
 vue@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c"
@@ -7943,7 +7424,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@1, which@^1.0.9, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.9:
+which@^1.0.9, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.9:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -7961,23 +7442,10 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2"
 
-widest-line@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-1.0.0.tgz#0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"
-  dependencies:
-    string-width "^1.0.1"
-
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-with@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
-  dependencies:
-    acorn "^3.1.0"
-    acorn-globals "^3.0.0"
-
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
@@ -8048,12 +7516,6 @@ yargs-parser@^4.2.0:
   dependencies:
     camelcase "^3.0.0"
 
-yargs-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
-  dependencies:
-    camelcase "^3.0.0"
-
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
@@ -8078,24 +7540,6 @@ yargs@^6.0.0:
     y18n "^3.2.1"
     yargs-parser "^4.2.0"
 
-yargs@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^5.0.0"
-
 yargs@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"

From 6b1f38a382b3172f70f9f1688c07b06c32db4cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 16 Aug 2017 18:00:04 +0800
Subject: [PATCH 028/126] delete unused files

---
 build/bin/build-components.js                    |  4 ++--
 build/bin/{compile-vue.js => sfc-compiler.js}    |  0
 packages/actionsheet/CHANGELOG.md                |  8 --------
 packages/actionsheet/README.md                   |  0
 packages/actionsheet/package.json                | 10 ----------
 packages/actionsheet/src/actionsheet.vue         |  6 +++---
 packages/badge/CHANGELOG.md                      |  8 --------
 packages/badge/README.md                         |  0
 packages/badge/package.json                      | 10 ----------
 packages/button/CHANGELOG.md                     |  8 --------
 packages/button/README.md                        |  0
 packages/button/package.json                     | 10 ----------
 packages/button/src/button.js                    |  2 +-
 packages/card/CHANGELOG.md                       |  8 --------
 packages/card/README.md                          |  0
 packages/card/package.json                       | 10 ----------
 packages/cell-swipe/src/cell-swipe.vue           |  9 +++++++--
 packages/cell/CHANGELOG.md                       |  8 --------
 packages/cell/README.md                          |  0
 packages/cell/package.json                       | 10 ----------
 packages/checkbox-group/index.js                 |  2 +-
 packages/checkbox/CHANGELOG.md                   |  8 --------
 packages/checkbox/README.md                      |  0
 packages/checkbox/package.json                   | 10 ----------
 packages/checkbox/src/checkbox.vue               |  2 +-
 packages/col/CHANGELOG.md                        |  8 --------
 packages/col/README.md                           |  0
 packages/col/package.json                        | 10 ----------
 packages/datetime-picker/CHANGELOG.md            |  8 --------
 packages/datetime-picker/README.md               |  0
 packages/datetime-picker/package.json            | 10 ----------
 packages/datetime-picker/src/datetime-picker.vue |  2 +-
 packages/dialog/CHANGELOG.md                     |  8 --------
 packages/dialog/README.md                        |  0
 packages/dialog/package.json                     | 10 ----------
 packages/dialog/src/dialog.js                    |  4 ++--
 packages/dialog/src/dialog.vue                   |  2 +-
 packages/field/CHANGELOG.md                      |  8 --------
 packages/field/README.md                         |  0
 packages/field/package.json                      | 10 ----------
 packages/field/src/field.vue                     |  4 ++--
 packages/icon/CHANGELOG.md                       |  8 --------
 packages/icon/README.md                          |  0
 packages/icon/package.json                       |  9 ---------
 packages/image-preview/CHANGELOG.md              |  8 --------
 packages/image-preview/README.md                 |  0
 packages/image-preview/package.json              | 10 ----------
 packages/image-preview/src/image-preview.vue     |  6 +++---
 packages/lazyload/CHANGELOG.md                   |  8 --------
 packages/lazyload/README.md                      |  0
 packages/lazyload/package.json                   | 10 ----------
 packages/loading/CHANGELOG.md                    |  8 --------
 packages/loading/README.md                       |  0
 packages/loading/package.json                    | 10 ----------
 packages/panel/CHANGELOG.md                      |  8 --------
 packages/panel/README.md                         |  0
 packages/panel/package.json                      | 10 ----------
 packages/picker/CHANGELOG.md                     |  8 --------
 packages/picker/README.md                        |  0
 packages/picker/package.json                     | 10 ----------
 packages/picker/src/picker-column.vue            |  2 +-
 packages/popup/CHANGELOG.md                      |  8 --------
 packages/popup/README.md                         |  0
 packages/popup/package.json                      | 10 ----------
 packages/popup/src/popup.vue                     |  2 +-
 packages/progress/README.md                      |  0
 packages/progress/package.json                   | 10 ----------
 packages/quantity/CHANGELOG.md                   |  8 --------
 packages/quantity/README.md                      |  0
 packages/quantity/package.json                   | 10 ----------
 packages/radio-group/index.js                    |  2 +-
 packages/radio/CHANGELOG.md                      |  8 --------
 packages/radio/README.md                         |  0
 packages/radio/package.json                      | 10 ----------
 packages/radio/src/radio.vue                     |  2 +-
 packages/row/CHANGELOG.md                        |  8 --------
 packages/row/README.md                           |  0
 packages/row/package.json                        | 10 ----------
 packages/search/CHANGELOG.md                     |  8 --------
 packages/search/README.md                        |  0
 packages/search/package.json                     | 10 ----------
 packages/search/src/search.vue                   |  4 ++--
 packages/step/index.js                           |  2 +-
 packages/steps/CHANGELOG.md                      |  8 --------
 packages/steps/README.md                         |  0
 packages/steps/package.json                      | 10 ----------
 packages/steps/src/steps.vue                     |  2 +-
 packages/swipe-item/index.js                     |  2 +-
 packages/swipe/CHANGELOG.md                      |  8 --------
 packages/swipe/README.md                         |  0
 packages/swipe/package.json                      | 10 ----------
 packages/switch/README.md                        |  0
 packages/switch/package.json                     | 10 ----------
 packages/switch/src/switch.vue                   |  2 +-
 packages/tab/CHANGELOG.md                        |  8 --------
 packages/tab/README.md                           |  0
 packages/tab/package.json                        | 10 ----------
 packages/tab/src/tabs.vue                        |  2 +-
 packages/tag/CHANGELOG.md                        |  8 --------
 packages/tag/README.md                           |  0
 packages/tag/package.json                        | 10 ----------
 packages/toast/README.md                         |  0
 packages/toast/package.json                      | 10 ----------
 packages/toast/src/toast.js                      |  2 +-
 packages/toast/src/toast.vue                     |  4 ++--
 packages/waterfall/CHANGELOG.md                  |  8 --------
 packages/waterfall/README.md                     |  0
 packages/waterfall/package.json                  | 10 ----------
 packages/waterfall/src/directive.js              |  2 +-
 109 files changed, 39 insertions(+), 531 deletions(-)
 rename build/bin/{compile-vue.js => sfc-compiler.js} (100%)
 delete mode 100644 packages/actionsheet/CHANGELOG.md
 delete mode 100644 packages/actionsheet/README.md
 delete mode 100644 packages/actionsheet/package.json
 delete mode 100644 packages/badge/CHANGELOG.md
 delete mode 100644 packages/badge/README.md
 delete mode 100644 packages/badge/package.json
 delete mode 100644 packages/button/CHANGELOG.md
 delete mode 100644 packages/button/README.md
 delete mode 100644 packages/button/package.json
 delete mode 100644 packages/card/CHANGELOG.md
 delete mode 100644 packages/card/README.md
 delete mode 100644 packages/card/package.json
 delete mode 100644 packages/cell/CHANGELOG.md
 delete mode 100644 packages/cell/README.md
 delete mode 100644 packages/cell/package.json
 delete mode 100644 packages/checkbox/CHANGELOG.md
 delete mode 100644 packages/checkbox/README.md
 delete mode 100644 packages/checkbox/package.json
 delete mode 100644 packages/col/CHANGELOG.md
 delete mode 100644 packages/col/README.md
 delete mode 100644 packages/col/package.json
 delete mode 100644 packages/datetime-picker/CHANGELOG.md
 delete mode 100644 packages/datetime-picker/README.md
 delete mode 100644 packages/datetime-picker/package.json
 delete mode 100644 packages/dialog/CHANGELOG.md
 delete mode 100644 packages/dialog/README.md
 delete mode 100644 packages/dialog/package.json
 delete mode 100644 packages/field/CHANGELOG.md
 delete mode 100644 packages/field/README.md
 delete mode 100644 packages/field/package.json
 delete mode 100644 packages/icon/CHANGELOG.md
 delete mode 100644 packages/icon/README.md
 delete mode 100644 packages/icon/package.json
 delete mode 100644 packages/image-preview/CHANGELOG.md
 delete mode 100644 packages/image-preview/README.md
 delete mode 100644 packages/image-preview/package.json
 delete mode 100644 packages/lazyload/CHANGELOG.md
 delete mode 100644 packages/lazyload/README.md
 delete mode 100644 packages/lazyload/package.json
 delete mode 100644 packages/loading/CHANGELOG.md
 delete mode 100644 packages/loading/README.md
 delete mode 100644 packages/loading/package.json
 delete mode 100644 packages/panel/CHANGELOG.md
 delete mode 100644 packages/panel/README.md
 delete mode 100644 packages/panel/package.json
 delete mode 100644 packages/picker/CHANGELOG.md
 delete mode 100644 packages/picker/README.md
 delete mode 100644 packages/picker/package.json
 delete mode 100644 packages/popup/CHANGELOG.md
 delete mode 100644 packages/popup/README.md
 delete mode 100644 packages/popup/package.json
 delete mode 100644 packages/progress/README.md
 delete mode 100644 packages/progress/package.json
 delete mode 100644 packages/quantity/CHANGELOG.md
 delete mode 100644 packages/quantity/README.md
 delete mode 100644 packages/quantity/package.json
 delete mode 100644 packages/radio/CHANGELOG.md
 delete mode 100644 packages/radio/README.md
 delete mode 100644 packages/radio/package.json
 delete mode 100644 packages/row/CHANGELOG.md
 delete mode 100644 packages/row/README.md
 delete mode 100644 packages/row/package.json
 delete mode 100644 packages/search/CHANGELOG.md
 delete mode 100644 packages/search/README.md
 delete mode 100644 packages/search/package.json
 delete mode 100644 packages/steps/CHANGELOG.md
 delete mode 100644 packages/steps/README.md
 delete mode 100644 packages/steps/package.json
 delete mode 100644 packages/swipe/CHANGELOG.md
 delete mode 100644 packages/swipe/README.md
 delete mode 100644 packages/swipe/package.json
 delete mode 100644 packages/switch/README.md
 delete mode 100644 packages/switch/package.json
 delete mode 100644 packages/tab/CHANGELOG.md
 delete mode 100644 packages/tab/README.md
 delete mode 100644 packages/tab/package.json
 delete mode 100644 packages/tag/CHANGELOG.md
 delete mode 100644 packages/tag/README.md
 delete mode 100644 packages/tag/package.json
 delete mode 100644 packages/toast/README.md
 delete mode 100644 packages/toast/package.json
 delete mode 100644 packages/waterfall/CHANGELOG.md
 delete mode 100644 packages/waterfall/README.md
 delete mode 100644 packages/waterfall/package.json

diff --git a/build/bin/build-components.js b/build/bin/build-components.js
index 5eb773e88..40e6c160a 100644
--- a/build/bin/build-components.js
+++ b/build/bin/build-components.js
@@ -1,6 +1,6 @@
 const fs = require('fs-extra');
 const path = require('path');
-const compileVue = require('./compile-vue');
+const compiler = require('./sfc-compiler');
 const libDir = path.resolve(__dirname, '../../lib');
 const srcDir = path.resolve(__dirname, '../../packages');
 require('shelljs/global');
@@ -27,7 +27,7 @@ function compileVueFiles(dir) {
       const outputVuePath = absolutePath + '.js';
       const outputJsPath = absolutePath.replace('.vue', '.js');
       const output = fs.existsSync(outputJsPath) ? outputVuePath : outputJsPath;
-      fs.outputFileSync(output, compileVue(source));
+      fs.outputFileSync(output, compiler(source));
     }
   });
 }
diff --git a/build/bin/compile-vue.js b/build/bin/sfc-compiler.js
similarity index 100%
rename from build/bin/compile-vue.js
rename to build/bin/sfc-compiler.js
diff --git a/packages/actionsheet/CHANGELOG.md b/packages/actionsheet/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/actionsheet/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/actionsheet/README.md b/packages/actionsheet/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/actionsheet/package.json b/packages/actionsheet/package.json
deleted file mode 100644
index 7dbfa2900..000000000
--- a/packages/actionsheet/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "<%= version %>",
-  "description": "<%= description %>",
-  "main": "./lib/index.js",
-  "author": "<%= author %>",
-  "license": "<%= license %>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/actionsheet/src/actionsheet.vue b/packages/actionsheet/src/actionsheet.vue
index a2544e129..cfd6ffb4a 100644
--- a/packages/actionsheet/src/actionsheet.vue
+++ b/packages/actionsheet/src/actionsheet.vue
@@ -34,9 +34,9 @@
 </template>
 
 <script>
-import Popup from 'packages/mixins/popup';
-import VanLoading from 'packages/loading';
-import VanIcon from 'packages/icon';
+import Popup from '../../mixins/popup';
+import VanLoading from '../../loading';
+import VanIcon from '../../icon';
 
 export default {
   name: 'van-actionsheet',
diff --git a/packages/badge/CHANGELOG.md b/packages/badge/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/badge/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/badge/README.md b/packages/badge/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/badge/package.json b/packages/badge/package.json
deleted file mode 100644
index 7dbfa2900..000000000
--- a/packages/badge/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "<%= version %>",
-  "description": "<%= description %>",
-  "main": "./lib/index.js",
-  "author": "<%= author %>",
-  "license": "<%= license %>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/button/CHANGELOG.md b/packages/button/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/button/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/button/README.md b/packages/button/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/button/package.json b/packages/button/package.json
deleted file mode 100644
index 4f230384c..000000000
--- a/packages/button/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-button",
-  "version": "0.0.1",
-  "description": "button component",
-  "main": "./index.js",
-  "author": "niunai",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/button/src/button.js b/packages/button/src/button.js
index 190d42bbe..9c213c2a1 100644
--- a/packages/button/src/button.js
+++ b/packages/button/src/button.js
@@ -11,7 +11,7 @@
  * <van-button size="large" type="primary">按钮</van-button>
  */
 
-import VanLoading from 'packages/loading';
+import VanLoading from '../../loading';
 
 const ALLOWED_SIZE = ['mini', 'small', 'normal', 'large'];
 const ALLOWED_TYPE = ['default', 'danger', 'primary'];
diff --git a/packages/card/CHANGELOG.md b/packages/card/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/card/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/card/README.md b/packages/card/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/card/package.json b/packages/card/package.json
deleted file mode 100644
index 4e0bc7d28..000000000
--- a/packages/card/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-card",
-  "version": "0.0.1",
-  "description": "card component",
-  "main": "./index.js",
-  "author": "zhangmin <zhangmin@youzan.com>",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/cell-swipe/src/cell-swipe.vue b/packages/cell-swipe/src/cell-swipe.vue
index 773a16ac6..21eb446f3 100644
--- a/packages/cell-swipe/src/cell-swipe.vue
+++ b/packages/cell-swipe/src/cell-swipe.vue
@@ -24,8 +24,8 @@
 </template>
 
 <script>
-  import {once} from 'packages/utils/dom';
-  import Clickoutside from 'packages/utils/clickoutside';
+  import {once} from '../../utils/dom';
+  import Clickoutside from '../../utils/clickoutside';
   
   export default {
     name: 'van-cell-swipe',
@@ -51,10 +51,12 @@
       this.wrap = this.$refs.cell.querySelector('.van-cell-wrapper');
       this.leftElm = this.$refs.left;
       this.leftWrapElm = this.leftElm.parentNode;
+      this.leftDefaultTransform = this.translate3d(-this.leftWidth - 1);
       this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
 
       this.rightElm = this.$refs.right;
       this.rightWrapElm = this.rightElm.parentNode;
+      this.rightDefaultTransform = this.translate3d(this.rightWidth);
       this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
     },
     methods: {
@@ -98,12 +100,14 @@
         }, 0);
       },
       startDrag(evt) {
+        console.log('startDrag')
         evt = evt.changedTouches ? evt.changedTouches[0] : evt;
         this.dragging = true;
         this.start.x = evt.pageX;
         this.start.y = evt.pageY;
       },
       onDrag(evt) {
+        console.log('onDrag')
         if (this.opened) {
           !this.swiping && this.swipeMove(0);
           this.opened = false;
@@ -128,6 +132,7 @@
         this.swipeMove(offsetLeft);
       },
       endDrag() {
+        console.log('endDrag')
         if (!this.swiping) return;
         this.swipeLeaveTransition(this.offsetLeft > 0 ? -1 : 1);
       }
diff --git a/packages/cell/CHANGELOG.md b/packages/cell/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/cell/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/cell/README.md b/packages/cell/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/cell/package.json b/packages/cell/package.json
deleted file mode 100644
index 0acbfd4e2..000000000
--- a/packages/cell/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-cell",
-  "version": "0.0.1",
-  "description": "cell component",
-  "main": "./index.js",
-  "author": "zhangmin <zhangmin@youzan.com>",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/checkbox-group/index.js b/packages/checkbox-group/index.js
index b6265c833..5688b4ee1 100644
--- a/packages/checkbox-group/index.js
+++ b/packages/checkbox-group/index.js
@@ -1,3 +1,3 @@
-import CheckboxGroup from 'packages/checkbox/src/checkbox-group';
+import CheckboxGroup from '../checkbox/src/checkbox-group';
 
 export default CheckboxGroup;
diff --git a/packages/checkbox/CHANGELOG.md b/packages/checkbox/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/checkbox/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/checkbox/README.md b/packages/checkbox/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/checkbox/package.json b/packages/checkbox/package.json
deleted file mode 100644
index 940851257..000000000
--- a/packages/checkbox/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-checkbox",
-  "version": "0.0.1",
-  "description": "checkbox component",
-  "main": "./index.js",
-  "author": "zhangmin <zhangmin@youzan.com>",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/checkbox/src/checkbox.vue b/packages/checkbox/src/checkbox.vue
index 83b116301..c2d46e349 100644
--- a/packages/checkbox/src/checkbox.vue
+++ b/packages/checkbox/src/checkbox.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import findParent from 'packages/mixins/findParent';
+import findParent from '../../mixins/findParent';
 
 export default {
   name: 'van-checkbox',
diff --git a/packages/col/CHANGELOG.md b/packages/col/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/col/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/col/README.md b/packages/col/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/col/package.json b/packages/col/package.json
deleted file mode 100644
index 7dbfa2900..000000000
--- a/packages/col/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "<%= version %>",
-  "description": "<%= description %>",
-  "main": "./lib/index.js",
-  "author": "<%= author %>",
-  "license": "<%= license %>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/datetime-picker/CHANGELOG.md b/packages/datetime-picker/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/datetime-picker/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/datetime-picker/README.md b/packages/datetime-picker/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/datetime-picker/package.json b/packages/datetime-picker/package.json
deleted file mode 100644
index 7b747cbdf..000000000
--- a/packages/datetime-picker/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-datetime-picker",
-  "version": "0.0.1",
-  "description": "datetime picker component",
-  "main": "./index.js",
-  "author": "niunai <niunai@youzan.com>",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/datetime-picker/src/datetime-picker.vue b/packages/datetime-picker/src/datetime-picker.vue
index 5569efd63..4b2429e5d 100644
--- a/packages/datetime-picker/src/datetime-picker.vue
+++ b/packages/datetime-picker/src/datetime-picker.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import Picker from 'packages/picker';
+import Picker from '../../picker';
 
 const allowedType = ['time', 'date', 'datetime'];
 
diff --git a/packages/dialog/CHANGELOG.md b/packages/dialog/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/dialog/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/dialog/README.md b/packages/dialog/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/dialog/package.json b/packages/dialog/package.json
deleted file mode 100644
index dbbc335ff..000000000
--- a/packages/dialog/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-dialog",
-  "version": "0.0.1",
-  "description": "dialog component",
-  "main": "./index.js",
-  "author": "zhangmin <zhangmin@youzan.com>",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/dialog/src/dialog.js b/packages/dialog/src/dialog.js
index 28f09c09f..c14ecbab9 100644
--- a/packages/dialog/src/dialog.js
+++ b/packages/dialog/src/dialog.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import Dialog from './dialog.vue';
-import merge from 'packages/utils/merge';
+import merge from '../../utils/merge';
 
 const DialogConstructor = Vue.extend(Dialog);
 
@@ -60,7 +60,7 @@ const showNextDialog = () => {
 var DialogBox = options => {
   return new Promise((resolve, reject) => { // eslint-disable-line
     dialogQueue.push({
-      options: merge({}, options),
+      options: merge({ ...options }),
       callback: options.callback,
       resolve: resolve,
       reject: reject
diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/src/dialog.vue
index 6a28015d2..cdc5796d8 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/src/dialog.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import Popup from 'packages/mixins/popup';
+import Popup from '../../mixins/popup';
 
 const CANCEL_TEXT = '取消';
 const CONFIRM_TEXT = '确定';
diff --git a/packages/field/CHANGELOG.md b/packages/field/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/field/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/field/README.md b/packages/field/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/field/package.json b/packages/field/package.json
deleted file mode 100644
index 85521ad45..000000000
--- a/packages/field/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-field",
-  "version": "0.0.1",
-  "description": "form field component",
-  "main": "./index.js",
-  "author": "zhangmin <zhangmin@youzan.com>",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/field/src/field.vue b/packages/field/src/field.vue
index f2c542e27..7517345dd 100644
--- a/packages/field/src/field.vue
+++ b/packages/field/src/field.vue
@@ -43,8 +43,8 @@
 
 <script>
 const VALID_TYPES = ['text', 'number', 'email', 'url', 'tel', 'date', 'time', 'datetime', 'password', 'textarea'];
-import vanCell from 'packages/cell';
-import vanIcon from 'packages/icon';
+import vanCell from '../../cell';
+import vanIcon from '../../icon';
 
 export default {
   name: 'van-field',
diff --git a/packages/icon/CHANGELOG.md b/packages/icon/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/icon/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/icon/README.md b/packages/icon/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/icon/package.json b/packages/icon/package.json
deleted file mode 100644
index 28624a787..000000000
--- a/packages/icon/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "@youzan/van-icon",
-  "version": "0.0.1",
-  "description": "van-icon",
-  "main": "index.js",
-  "author": "zhangmin <zhangmin@youzan.com>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/image-preview/CHANGELOG.md b/packages/image-preview/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/image-preview/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/image-preview/README.md b/packages/image-preview/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/image-preview/package.json b/packages/image-preview/package.json
deleted file mode 100644
index c0f6485ac..000000000
--- a/packages/image-preview/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-image-pewview",
-  "version": "0.0.1",
-  "description": "image preview component",
-  "main": "./index.js",
-  "author": "zhangmin <zhangmin@youzan.com>",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/image-preview/src/image-preview.vue b/packages/image-preview/src/image-preview.vue
index a7740cb82..26c2c62ad 100644
--- a/packages/image-preview/src/image-preview.vue
+++ b/packages/image-preview/src/image-preview.vue
@@ -12,9 +12,9 @@
 
 <script>
 import Vue from 'vue';
-import Popup from 'packages/mixins/popup';
-import VanSwipe from 'packages/swipe';
-import VanSwipeItem from 'packages/swipe-item';
+import Popup from '../../mixins/popup';
+import VanSwipe from '../../swipe';
+import VanSwipeItem from '../../swipe-item';
 
 export default {
   name: 'van-image-preview',
diff --git a/packages/lazyload/CHANGELOG.md b/packages/lazyload/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/lazyload/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/lazyload/README.md b/packages/lazyload/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/lazyload/package.json b/packages/lazyload/package.json
deleted file mode 100644
index 7dbfa2900..000000000
--- a/packages/lazyload/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "<%= version %>",
-  "description": "<%= description %>",
-  "main": "./lib/index.js",
-  "author": "<%= author %>",
-  "license": "<%= license %>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/loading/CHANGELOG.md b/packages/loading/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/loading/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/loading/README.md b/packages/loading/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/loading/package.json b/packages/loading/package.json
deleted file mode 100644
index 3a392b555..000000000
--- a/packages/loading/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-loading",
-  "version": "0.0.1",
-  "description": "loading component",
-  "main": "./lib/index.js",
-  "author": "jiangruowei",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
\ No newline at end of file
diff --git a/packages/panel/CHANGELOG.md b/packages/panel/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/panel/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/panel/README.md b/packages/panel/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/panel/package.json b/packages/panel/package.json
deleted file mode 100644
index 623429d21..000000000
--- a/packages/panel/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-panel",
-  "version": "0.0.1",
-  "description": "panel component",
-  "main": "./index.js",
-  "author": "zhangmin <zhangmin@youzan.com>",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/picker/CHANGELOG.md b/packages/picker/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/picker/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/picker/README.md b/packages/picker/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/picker/package.json b/packages/picker/package.json
deleted file mode 100644
index d5e6c27a3..000000000
--- a/packages/picker/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-picker",
-  "version": "0.0.1",
-  "description": "picker component",
-  "main": "./index.js",
-  "author": "zhangmin <zhangmin@youzan.com>",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/picker/src/picker-column.vue b/packages/picker/src/picker-column.vue
index de96de1d8..e69af8dc2 100644
--- a/packages/picker/src/picker-column.vue
+++ b/packages/picker/src/picker-column.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import translateUtil from 'packages/utils/transition';
+import translateUtil from '../../utils/transition';
 import draggable from './draggable';
 
 const DEFAULT_ITEM_HEIGHT = 44;
diff --git a/packages/popup/CHANGELOG.md b/packages/popup/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/popup/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/popup/README.md b/packages/popup/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/popup/package.json b/packages/popup/package.json
deleted file mode 100644
index f923cd5be..000000000
--- a/packages/popup/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-popup",
-  "version": "0.0.1",
-  "description": "popup component",
-  "main": "./index.js",
-  "author": "zhangmin <zhangmin@youzan.com>",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/popup/src/popup.vue b/packages/popup/src/popup.vue
index 744ecf22e..526036b82 100644
--- a/packages/popup/src/popup.vue
+++ b/packages/popup/src/popup.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import Popup from 'packages/mixins/popup';
+import Popup from '../../mixins/popup';
 export default {
   name: 'van-popup',
 
diff --git a/packages/progress/README.md b/packages/progress/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/progress/package.json b/packages/progress/package.json
deleted file mode 100644
index e723ee514..000000000
--- a/packages/progress/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-progress",
-  "version": "0.0.1",
-  "description": "progress component",
-  "main": "./index.js",
-  "author": "jiangruowei",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/quantity/CHANGELOG.md b/packages/quantity/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/quantity/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/quantity/README.md b/packages/quantity/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/quantity/package.json b/packages/quantity/package.json
deleted file mode 100644
index 7dbfa2900..000000000
--- a/packages/quantity/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "<%= version %>",
-  "description": "<%= description %>",
-  "main": "./lib/index.js",
-  "author": "<%= author %>",
-  "license": "<%= license %>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/radio-group/index.js b/packages/radio-group/index.js
index 6f65c1c39..7f39d43e7 100644
--- a/packages/radio-group/index.js
+++ b/packages/radio-group/index.js
@@ -1,3 +1,3 @@
-import RadioGroup from 'packages/radio/src/radio-group';
+import RadioGroup from '../radio/src/radio-group';
 
 export default RadioGroup;
diff --git a/packages/radio/CHANGELOG.md b/packages/radio/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/radio/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/radio/README.md b/packages/radio/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/radio/package.json b/packages/radio/package.json
deleted file mode 100644
index 20bb1d44a..000000000
--- a/packages/radio/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-radio",
-  "version": "0.0.1",
-  "description": "radio component",
-  "main": "./index.js",
-  "author": "zhangmin <zhangmin@youzan.com>",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/radio/src/radio.vue b/packages/radio/src/radio.vue
index 92905af36..1633bfc15 100644
--- a/packages/radio/src/radio.vue
+++ b/packages/radio/src/radio.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import findParent from 'packages/mixins/findParent';
+import findParent from '../../mixins/findParent';
 
 export default {
   name: 'van-radio',
diff --git a/packages/row/CHANGELOG.md b/packages/row/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/row/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/row/README.md b/packages/row/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/row/package.json b/packages/row/package.json
deleted file mode 100644
index 7dbfa2900..000000000
--- a/packages/row/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "<%= version %>",
-  "description": "<%= description %>",
-  "main": "./lib/index.js",
-  "author": "<%= author %>",
-  "license": "<%= license %>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/search/CHANGELOG.md b/packages/search/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/search/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/search/README.md b/packages/search/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/search/package.json b/packages/search/package.json
deleted file mode 100644
index 7dbfa2900..000000000
--- a/packages/search/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "<%= version %>",
-  "description": "<%= description %>",
-  "main": "./lib/index.js",
-  "author": "<%= author %>",
-  "license": "<%= license %>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/search/src/search.vue b/packages/search/src/search.vue
index 0128ceac6..7363a51f5 100644
--- a/packages/search/src/search.vue
+++ b/packages/search/src/search.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script>
-  import VanIcon from 'packages/icon';
-  import Clickoutside from 'packages/utils/clickoutside';
+  import VanIcon from '../../icon';
+  import Clickoutside from '../../utils/clickoutside';
 
   export default {
     name: 'van-search',
diff --git a/packages/step/index.js b/packages/step/index.js
index 2201de371..5ec38e896 100644
--- a/packages/step/index.js
+++ b/packages/step/index.js
@@ -1,3 +1,3 @@
-import Step from 'packages/steps/src/step';
+import Step from '../steps/src/step';
 
 export default Step;
diff --git a/packages/steps/CHANGELOG.md b/packages/steps/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/steps/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/steps/README.md b/packages/steps/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/steps/package.json b/packages/steps/package.json
deleted file mode 100644
index 7dbfa2900..000000000
--- a/packages/steps/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "<%= version %>",
-  "description": "<%= description %>",
-  "main": "./lib/index.js",
-  "author": "<%= author %>",
-  "license": "<%= license %>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/steps/src/steps.vue b/packages/steps/src/steps.vue
index bfca083fa..7a533f938 100644
--- a/packages/steps/src/steps.vue
+++ b/packages/steps/src/steps.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import Icon from 'packages/icon';
+import Icon from '../../icon';
 
 export default {
   name: 'van-steps',
diff --git a/packages/swipe-item/index.js b/packages/swipe-item/index.js
index a420315e3..1fa974908 100644
--- a/packages/swipe-item/index.js
+++ b/packages/swipe-item/index.js
@@ -1,3 +1,3 @@
-import SwipeItem from 'packages/swipe/src/swipe-item';
+import SwipeItem from '../swipe/src/swipe-item';
 
 export default SwipeItem;
diff --git a/packages/swipe/CHANGELOG.md b/packages/swipe/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/swipe/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/swipe/README.md b/packages/swipe/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/swipe/package.json b/packages/swipe/package.json
deleted file mode 100644
index 7dbfa2900..000000000
--- a/packages/swipe/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "<%= version %>",
-  "description": "<%= description %>",
-  "main": "./lib/index.js",
-  "author": "<%= author %>",
-  "license": "<%= license %>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/switch/README.md b/packages/switch/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/switch/package.json b/packages/switch/package.json
deleted file mode 100644
index 919856cd8..000000000
--- a/packages/switch/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-switch",
-  "version": "0.0.1",
-  "description": "switch component",
-  "main": "./index.js",
-  "author": "jiangruowei",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/switch/src/switch.vue b/packages/switch/src/switch.vue
index 80aa93649..4a4f4e6e6 100644
--- a/packages/switch/src/switch.vue
+++ b/packages/switch/src/switch.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import VanLoading from 'packages/loading';
+import VanLoading from '../../loading';
 /**
  * van-switch
  * @module components/switch
diff --git a/packages/tab/CHANGELOG.md b/packages/tab/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/tab/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/tab/README.md b/packages/tab/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/tab/package.json b/packages/tab/package.json
deleted file mode 100644
index 7dbfa2900..000000000
--- a/packages/tab/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "<%= version %>",
-  "description": "<%= description %>",
-  "main": "./lib/index.js",
-  "author": "<%= author %>",
-  "license": "<%= license %>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/tab/src/tabs.vue b/packages/tab/src/tabs.vue
index a53e97cb2..e38628d46 100644
--- a/packages/tab/src/tabs.vue
+++ b/packages/tab/src/tabs.vue
@@ -42,7 +42,7 @@
 
 <script>
   import swipe from './swipe';
-  import translateUtil from 'packages/utils/transition';
+  import translateUtil from '../../utils/transition';
 
   export default {
     name: 'van-tabs',
diff --git a/packages/tag/CHANGELOG.md b/packages/tag/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/tag/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/tag/README.md b/packages/tag/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/tag/package.json b/packages/tag/package.json
deleted file mode 100644
index 7dbfa2900..000000000
--- a/packages/tag/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "<%= name %>",
-  "version": "<%= version %>",
-  "description": "<%= description %>",
-  "main": "./lib/index.js",
-  "author": "<%= author %>",
-  "license": "<%= license %>",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/toast/README.md b/packages/toast/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/toast/package.json b/packages/toast/package.json
deleted file mode 100644
index d3843cd90..000000000
--- a/packages/toast/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/van-toast",
-  "version": "0.0.1",
-  "description": "toast component",
-  "main": "./index.js",
-  "author": "jiangruowei",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/toast/src/toast.js b/packages/toast/src/toast.js
index bf1be2bb6..e0ef93b2b 100644
--- a/packages/toast/src/toast.js
+++ b/packages/toast/src/toast.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import merge from 'packages/utils/merge';
+import merge from '../../utils/merge';
 import ToastComponent from './toast.vue';
 
 const ToastConstructor = Vue.extend(ToastComponent);
diff --git a/packages/toast/src/toast.vue b/packages/toast/src/toast.vue
index b288f510a..b34ce4313 100644
--- a/packages/toast/src/toast.vue
+++ b/packages/toast/src/toast.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script>
-import vanLoading from 'packages/loading';
-import vanIcon from 'packages/icon';
+import vanLoading from '../../loading';
+import vanIcon from '../../icon';
 
 const TOAST_TYPES = ['text', 'html', 'loading', 'success', 'fail'];
 const DEFAULT_STYLE_LIST = ['success', 'fail'];
diff --git a/packages/waterfall/CHANGELOG.md b/packages/waterfall/CHANGELOG.md
deleted file mode 100644
index e88c472b3..000000000
--- a/packages/waterfall/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.0.2 (2017-01-20)
-
-* 改了bug A
-* 加了功能B
-
-## 0.0.1 (2017-01-10)
-
-* 第一版
diff --git a/packages/waterfall/README.md b/packages/waterfall/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/waterfall/package.json b/packages/waterfall/package.json
deleted file mode 100644
index 555ba5460..000000000
--- a/packages/waterfall/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "@youzan/waterfall",
-  "version": "0.0.1",
-  "description": "瀑布流",
-  "main": "./lib/index.js",
-  "author": "pangxie1991",
-  "license": "MIT",
-  "devDependencies": {},
-  "dependencies": {}
-}
diff --git a/packages/waterfall/src/directive.js b/packages/waterfall/src/directive.js
index 648c294e5..0ff4a4fd4 100644
--- a/packages/waterfall/src/directive.js
+++ b/packages/waterfall/src/directive.js
@@ -1,4 +1,4 @@
-import Utils from 'packages/utils/scroll.js';
+import Utils from '../../utils/scroll.js';
 
 const CONTEXT = '@@Waterfall';
 const OFFSET = 300;

From f613214965d5b85cd12249eb8d244a55a10299f9 Mon Sep 17 00:00:00 2001
From: Yao <chenyao1102@gmail.com>
Date: Wed, 16 Aug 2017 21:34:44 +0800
Subject: [PATCH 029/126] fix: dialog base z-index to 2500 (#75)

---
 packages/dialog/src/dialog.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/src/dialog.vue
index 47849b3eb..19c6b0c91 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/src/dialog.vue
@@ -37,6 +37,10 @@ export default {
     },
     lockOnScroll: {
       default: true
+    },
+    zIndex: {
+      type: [String, Number],
+      default: 2500
     }
   },
 

From 7b87ccd2aa22402980831d1452adb2201fdb5b4a Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Wed, 16 Aug 2017 21:42:39 +0800
Subject: [PATCH 030/126] [build] 0.7.10

---
 packages/vant-css/package.json | 2 +-
 src/index.js                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index ac56dc9ea..983538af0 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",
diff --git a/src/index.js b/src/index.js
index 5da7dba2d..6ef601df2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -37,7 +37,7 @@ import Swipe from '../packages/swipe/index.js';
 import SwipeItem from '../packages/swipe-item/index.js';
 import DatetimePicker from '../packages/datetime-picker/index.js';
 
-const version = '0.7.9';
+const version = '0.7.10';
 const components = [
   Button,
   Switch,

From c356185b6e9732ceac851e8a472e9a58abe6092b Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Wed, 16 Aug 2017 21:42:40 +0800
Subject: [PATCH 031/126] [release] 0.7.10

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c26cf675e..6353849a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From f828d14d0e1923f2e8c718c47aa61f60a4aa397e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 16 Aug 2017 22:34:25 +0800
Subject: [PATCH 032/126] fix: dialog animation not work

---
 packages/actionsheet/src/actionsheet.vue |  6 +-
 packages/badge/src/badge.vue             | 18 +++---
 packages/dialog/src/dialog.js            | 35 ++++++------
 packages/dialog/src/dialog.vue           | 58 ++++++-------------
 packages/vant-css/src/dialog.css         | 71 ++++++++----------------
 5 files changed, 70 insertions(+), 118 deletions(-)

diff --git a/packages/actionsheet/src/actionsheet.vue b/packages/actionsheet/src/actionsheet.vue
index cfd6ffb4a..7d6e4398d 100644
--- a/packages/actionsheet/src/actionsheet.vue
+++ b/packages/actionsheet/src/actionsheet.vue
@@ -1,6 +1,6 @@
 <template>
   <transition name="actionsheet-float">
-    <div class="van-actionsheet" :class="[ title ? 'van-actionsheet--withtitle' : '' ]" v-show="currentValue">
+    <div class="van-actionsheet" :class="{ 'van-actionsheet--withtitle': title }" v-show="currentValue">
       <div class="van-actionsheet__header" v-if="title">
         <h3 v-text="title"></h3>
         <van-icon name="close" @click.stop="currentValue = false"></van-icon>
@@ -17,9 +17,7 @@
               <span class="van-actionsheet__name">{{ item.name }}</span>
               <span class="van-actionsheet__subname" v-if="item.subname">{{ item.subname }}</span>
             </template>
-            <template v-else>
-              <van-loading class="van-actionsheet__loading" type="circle" color="black"></van-loading>
-            </template>
+            <van-loading v-else class="van-actionsheet__loading" type="circle" color="black" />
           </li>
         </ul>
         <a class="van-actionsheet__button" @click.stop="currentValue = false" v-if="cancelText">{{ cancelText }}</a>
diff --git a/packages/badge/src/badge.vue b/packages/badge/src/badge.vue
index 6103c1440..7808d6755 100644
--- a/packages/badge/src/badge.vue
+++ b/packages/badge/src/badge.vue
@@ -1,13 +1,13 @@
 <template>
-    <a
-      class="van-badge"
-      :class="{ 'van-badge--select': isSelect }"
-      :href="url"
-      @click="handleClick">
-      <div class="van-badge__active"></div>
-      <div v-if="info" class="van-badge__info">{{info}}</div>
-      {{title}}
-    </a>
+  <a
+    class="van-badge"
+    :class="{ 'van-badge--select': isSelect }"
+    :href="url"
+    @click="handleClick">
+    <div class="van-badge__active"></div>
+    <div v-if="info" class="van-badge__info">{{info}}</div>
+    {{title}}
+  </a>
 </template>
 
 <script>
diff --git a/packages/dialog/src/dialog.js b/packages/dialog/src/dialog.js
index c14ecbab9..bb1fed2f4 100644
--- a/packages/dialog/src/dialog.js
+++ b/packages/dialog/src/dialog.js
@@ -1,6 +1,5 @@
 import Vue from 'vue';
 import Dialog from './dialog.vue';
-import merge from '../../utils/merge';
 
 const DialogConstructor = Vue.extend(Dialog);
 
@@ -20,10 +19,14 @@ const defaultCallback = action => {
 };
 
 const initInstance = () => {
+  console.log('init instance');
   instance = new DialogConstructor({
     el: document.createElement('div')
   });
 
+  instance.$on('input', value => {
+    instance.value = value;
+  })
   instance.callback = defaultCallback;
 };
 
@@ -34,9 +37,10 @@ const showNextDialog = () => {
 
   /* istanbul ignore else */
   if (!instance.value && dialogQueue.length > 0) {
+    console.log('shift instance');
     currentDialog = dialogQueue.shift();
 
-    const options = currentDialog.options;
+    const { options } = currentDialog;
 
     for (const prop in options) {
       /* istanbul ignore else */
@@ -45,22 +49,17 @@ const showNextDialog = () => {
       }
     }
 
-    if (options.callback === undefined) {
-      instance.callback = defaultCallback;
-    }
-
+    instance.callback = options.callback || defaultCallback;
+    instance.value = true;
     document.body.appendChild(instance.$el);
-
-    Vue.nextTick(() => {
-      instance.value = true;
-    });
   }
 };
 
 var DialogBox = options => {
   return new Promise((resolve, reject) => { // eslint-disable-line
+    console.log('push instance');
     dialogQueue.push({
-      options: merge({ ...options }),
+      options: { ...options },
       callback: options.callback,
       resolve: resolve,
       reject: reject
@@ -71,23 +70,25 @@ var DialogBox = options => {
 };
 
 DialogBox.alert = function(options) {
-  return DialogBox(merge({
+  return DialogBox({
     type: 'alert',
     title: '',
     message: '',
     closeOnClickOverlay: false,
-    showCancelButton: false
-  }, options));
+    showCancelButton: false,
+    ...options
+  });
 };
 
 DialogBox.confirm = function(options) {
-  return DialogBox(merge({
+  return DialogBox({
     type: 'confirm',
     title: '',
     message: '',
     closeOnClickOverlay: true,
-    showCancelButton: true
-  }, options));
+    showCancelButton: true,
+    ...options
+  });
 };
 
 DialogBox.close = function() {
diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/src/dialog.vue
index cdc5796d8..35e21af78 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/src/dialog.vue
@@ -1,31 +1,29 @@
 <template>
-  <transition name="dialog-bounce">
-    <div class="van-dialog-wrapper">
-      <div class="van-dialog" v-show="value">
-        <div class="van-dialog__header" v-if="title">
-          <div class="van-dialog__title" v-text="title"></div>
-        </div>
-        <div class="van-dialog__content" v-if="message">
-          <div class="van-dialog__message" :class="{ 'van-dialog__message--notitle': !title }" v-html="message"></div>
-        </div>
-        <div class="van-dialog__footer" :class="{ 'is-twobtn': showCancelButton && showConfirmButton }">
-          <button class="van-dialog__btn van-dialog__cancel" v-show="showCancelButton" @click="handleAction('cancel')">{{ cancelButtonText }}</button>
-          <button class="van-dialog__btn van-dialog__confirm" v-show="showConfirmButton" @click="handleAction('confirm')">{{ confirmButtonText }}</button>
-        </div>
+  <transition name="van-dialog-bounce">
+    <div class="van-dialog" v-show="value">
+      <div class="van-dialog__header" v-if="title" v-text="title" />
+      <div class="van-dialog__content" v-if="message">
+        <div class="van-dialog__message" :class="{ 'van-dialog__message--withtitle': title }" v-html="message" />
+      </div>
+      <div class="van-dialog__footer" :class="{ 'is-twobtn': showCancelButton && showConfirmButton }">
+        <van-button size="large" class="van-dialog__cancel" v-show="showCancelButton" @click="handleAction('cancel')">{{ cancelButtonText }}</van-button>
+        <van-button size="large" class="van-dialog__confirm" v-show="showConfirmButton" @click="handleAction('confirm')">{{ confirmButtonText }}</van-button>
       </div>
     </div>
   </transition>
 </template>
 
 <script>
+import Button from '../../button';
 import Popup from '../../mixins/popup';
 
-const CANCEL_TEXT = '取消';
-const CONFIRM_TEXT = '确定';
-
 export default {
   name: 'van-dialog',
 
+  components: {
+    [Button.name]: Button
+  },
+
   mixins: [Popup],
 
   props: {
@@ -47,38 +45,16 @@ export default {
       type: '',
       showConfirmButton: true,
       showCancelButton: false,
-      confirmButtonText: CONFIRM_TEXT,
-      cancelButtonText: CANCEL_TEXT,
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
       callback: null
     };
   },
 
   methods: {
     handleAction(action) {
-      this.value = false;
+      this.$emit('input', false);
       this.callback && this.callback(action);
-    },
-
-    close() {
-      /* istanbul ignore if */
-      if (this.closing) return;
-
-      this.closing = true;
-
-      this.value = false;
-
-      /* istanbul ignore else */
-      if (this.lockOnScroll) {
-        setTimeout(() => {
-          if (this.overlay && this.bodyOverflow !== 'hidden') {
-            document.body.style.overflow = this.bodyOverflow;
-          }
-          this.bodyOverflow = null;
-        }, 200);
-      }
-
-      this.opened = false;
-      this.doAfterClose();
     }
   }
 };
diff --git a/packages/vant-css/src/dialog.css b/packages/vant-css/src/dialog.css
index eac08827a..a7f77a619 100644
--- a/packages/vant-css/src/dialog.css
+++ b/packages/vant-css/src/dialog.css
@@ -5,17 +5,19 @@
   position: fixed;
   top: 50%;
   left: 50%;
-  transform: translate3d(-50%, -50%, 0);
-  background-color: #fff;
   width: 85%;
-  border-radius: 4px;
   font-size: 16px;
   overflow: hidden;
-  backface-visibility: hidden;
   transition: .2s;
+  border-radius: 4px;
+  background-color: #fff;
+  backface-visibility: hidden;
+  transform: translate3d(-50%, -50%, 0);
+  
 
   &__header {
     padding: 15px 0 0;
+    text-align: center;
   }
 
   &__content {
@@ -27,75 +29,50 @@
     }
   }
 
-  &__title {
-    text-align: center;
-    padding-left: 0;
-    margin-bottom: 0;
-    font-size: 16px;
-    color: #333;
-  }
-
   &__message {
-    color: #999;
-    margin: 0;
-    font-size: 14px;
     line-height: 1.5;
 
-    &--notitle {
-      color: #333;
-      font-size: 16px;
+    &--withtitle {
+      color: #999;
+      font-size: 14px;
     }
   }
 
   &__footer {
-    font-size: 14px;
     overflow: hidden;
 
     &.is-twobtn {
-      .van-dialog__btn {
+      .van-button {
         width: 50%;
+        float: left;
       }
 
       .van-dialog__cancel {
-        &::after {
+        position: relative;
+
+        &::before {
           @mixin border-retina (right);
+          left: -2px;
         }
       }
     }
   }
 
-  &__btn {
-    font-size: 16px;
-    line-height: 52px;
+  .van-button {
     border: 0;
-    padding: 0;
-    background-color: #fff;
-    float: left;
-    box-sizing: border-box;
-    text-align: center;
-    position: relative;
-  }
-
-  &__cancel {
-    color: #333;
   }
 
   &__confirm {
     color: #00C000;
-    width: 100%;
   }
 
-  &-wrapper {
-    position: absolute;
+  &-bounce-enter {
+    opacity: 0;
+    transform: translate3d(-50%, -50%, 0) scale(0.7);
+  }
+
+  &-bounce-leave-active {
+    opacity: 0;
+    transform: translate3d(-50%, -50%, 0) scale(0.9);
   }
 }
-
-.dialog-bounce-enter {
-  opacity: 0;
-  transform: translate3d(-50%, -50%, 0) scale(0.7);
-}
-
-.dialog-bounce-leave-active {
-  opacity: 0;
-  transform: translate3d(-50%, -50%, 0) scale(0.9);
-}

From 7636f26c27447540b755bab5004940b94f713c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 16 Aug 2017 22:38:17 +0800
Subject: [PATCH 033/126] extract vue-sfc-compiler module

---
 build/bin/build-components.js |  2 +-
 build/bin/sfc-compiler.js     | 91 -----------------------------------
 package.json                  |  1 +
 yarn.lock                     |  7 +++
 4 files changed, 9 insertions(+), 92 deletions(-)
 delete mode 100644 build/bin/sfc-compiler.js

diff --git a/build/bin/build-components.js b/build/bin/build-components.js
index 40e6c160a..0d48bbcf0 100644
--- a/build/bin/build-components.js
+++ b/build/bin/build-components.js
@@ -1,6 +1,6 @@
 const fs = require('fs-extra');
 const path = require('path');
-const compiler = require('./sfc-compiler');
+const compiler = require('vue-sfc-compiler');
 const libDir = path.resolve(__dirname, '../../lib');
 const srcDir = path.resolve(__dirname, '../../packages');
 require('shelljs/global');
diff --git a/build/bin/sfc-compiler.js b/build/bin/sfc-compiler.js
deleted file mode 100644
index 266613a44..000000000
--- a/build/bin/sfc-compiler.js
+++ /dev/null
@@ -1,91 +0,0 @@
-const templateCompiler = require('vue-template-compiler');
-const templateCompilerES2015 = require('vue-template-es2015-compiler');
-const templateCompilerConfig = { preserveWhitespace: false };
-
-module.exports = function(code) {
-  const { script, template } = templateCompiler.parseComponent(code);
-  const renderFunction = parseTemplate(template.content);
-  return renderJs(script.content, renderFunction);
-}
-
-// 将 template html 解析为 render 函数
-function parseTemplate(template) {
-  const compiled = templateCompiler.compile(template, templateCompilerConfig);
-
-  if (compiled.errors.length) {
-    throw new Error(
-      `\n  Error compiling template:\n${pad(html)}\n` +
-        compiled.errors.map(e => `  - ${e}`).join('\n') +
-        '\n'
-    );
-  }
-
-  return {
-    render: templateCompilerES2015(
-      `var TEMP_VAR = ${toFunction(compiled.render)}`
-    ).replace('var TEMP_VAR = ', ''),
-    staticRenderFns: `[${compiled.staticRenderFns.map(toFunction).join(',')}]`
-  };
-}
-
-function pad(html) {
-  return html.split(/\r?\n/).map(line => `  ${line}`).join('\n');
-}
-
-function toFunction(code) {
-  return `function (){${code}}`;
-}
-
-// 寻找 render 函数插入位置
-function findInjectionPosition(script) {
-  const hasDefaultExportObject = /(export default[^{]*\{)/g.exec(script);
-
-  if (hasDefaultExportObject)
-    return { script, matches: hasDefaultExportObject };
-
-  const hasDefaultExportReference = /(export default[\s]+((?!(?:do|if|in|for|let|new|try|var|case|else|enum|eval|false|null|this|true|void|with|break|catch|class|const|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$)[$A-Z_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc][$A-Z_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc0-9\u0300-\u036f\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e4-\u08fe\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d02\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19b0-\u19c0\u19c8\u19c9\u19d0-\u19d9\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2-\u1cf4\u1dc0-\u1de6\u1dfc-\u1dff\u200c\u200d\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c4\ua8d0-\ua8d9\ua8e0-\ua8f1\ua900-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f]*))/g.exec(
-    script
-  );
-
-  if (!hasDefaultExportReference) return { script, matches: null };
-
-  const name = hasDefaultExportReference[2].replace('$', '\\$');
-
-  const result = new RegExp(`(${name}[\\s]=[^{]*\\{)`, 'g').exec(script);
-  if (result) return { script, matches: result };
-
-  const lit = new RegExp(`export\\s+default\\s+${name}`, 'g');
-  script = script.replace(
-    lit,
-    `;
-  var __$${name} = Object.assign(${name}, {})
-  __$${name}.prototype = ${name}.prototype
-  export default __$${name}
-  `
-  );
-  const data = {
-    matches: new RegExp(
-      `(__\\$${name} = Object\\.assign\\(${name}, \\{)`,
-      'g'
-    ).exec(script),
-    script
-  };
-  return data;
-}
-
-// 插入 render 函数
-function renderJs(rawScript, render) {
-  const { matches, script } = findInjectionPosition(rawScript);
-
-  if (matches && matches.length) {
-    let renderScript = `module.exports={\n  render: ${render.render},\n\n  staticRenderFns: ${render.staticRenderFns}, \n`;
-
-    return script
-      .split(matches[1])
-      .join(
-        renderScript.replace('module.exports={', matches[1]).replace(/\}$/, '')
-      );
-  }
-
-  throw new Error(`cannot find 'export defaults'.`);
-}
diff --git a/package.json b/package.json
index b82ed60ea..e5752e03c 100644
--- a/package.json
+++ b/package.json
@@ -108,6 +108,7 @@
     "vue-loader": "^13.0.4",
     "vue-markdown-loader": "^2.0.0",
     "vue-router": "^2.7.0",
+    "vue-sfc-compiler": "^0.0.1",
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.4.2",
     "vue-template-es2015-compiler": "^1.5.3",
diff --git a/yarn.lock b/yarn.lock
index 0d95113cf..b5405d2db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7278,6 +7278,13 @@ vue-router@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.7.0.tgz#16d424493aa51c3c8cce8b7c7210ea4c3a89aff1"
 
+vue-sfc-compiler@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/vue-sfc-compiler/-/vue-sfc-compiler-0.0.1.tgz#389221eb198efaa8d7ad6a7e8c3f57d10ea952ed"
+  dependencies:
+    vue-template-compiler "^2.4.2"
+    vue-template-es2015-compiler "^1.5.3"
+
 vue-style-loader@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.1.tgz#c8b639bb2f24baf9d78274dc17e4f264c1deda08"

From f27fa0122d6e5549c04d557ac2e7c7778f21439a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 16 Aug 2017 23:06:28 +0800
Subject: [PATCH 034/126] Clear up warnings when running test cases.

---
 build/bin/build-components.js          | 19 +++++++++++++++++--
 build/webpack.config.dev.js            |  2 +-
 package.json                           |  6 +-----
 packages/cell-swipe/src/cell-swipe.vue |  5 -----
 packages/dialog/src/dialog.js          |  3 ---
 test/unit/components/checkbox.vue      |  2 +-
 test/unit/get-webpack-conf.js          |  4 ++--
 test/unit/specs/dialog.spec.js         |  8 ++++----
 yarn.lock                              | 12 ------------
 9 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/build/bin/build-components.js b/build/bin/build-components.js
index 0d48bbcf0..84a81f81c 100644
--- a/build/bin/build-components.js
+++ b/build/bin/build-components.js
@@ -1,3 +1,6 @@
+/**
+ * 编译 components 到 lib 目录
+ */
 const fs = require('fs-extra');
 const path = require('path');
 const compiler = require('vue-sfc-compiler');
@@ -5,9 +8,16 @@ const libDir = path.resolve(__dirname, '../../lib');
 const srcDir = path.resolve(__dirname, '../../packages');
 require('shelljs/global');
 
+// 清空 lib 目录
 fs.emptyDirSync(libDir);
+
+// 复制 packages
 fs.copySync(srcDir, libDir);
+
+// 编译所有 .vue 文件到 .js
 compileVueFiles(libDir);
+
+// babel 编译
 exec('cross-env BABEL_ENV=commonjs babel lib --out-dir lib');
 
 function compileVueFiles(dir) {
@@ -16,11 +26,16 @@ function compileVueFiles(dir) {
   files.forEach(file => {
     const absolutePath = path.resolve(dir, file);
 
+    // 移除 vant-css
     if (file.indexOf('vant-css') !== -1) {
       fs.removeSync(absolutePath);
-    } else if (isDir(absolutePath)) {
+    }
+    // 遍历文件夹
+    else if (isDir(absolutePath)) {
       return compileVueFiles(absolutePath);
-    } else if (/\.vue$/.test(file)) {
+    }
+    // 编译 .vue 文件
+    else if (/\.vue$/.test(file)) {
       const source = fs.readFileSync(absolutePath, 'utf-8');
       fs.removeSync(absolutePath);
 
diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js
index 6b8a482da..737712be8 100644
--- a/build/webpack.config.dev.js
+++ b/build/webpack.config.dev.js
@@ -67,7 +67,7 @@ module.exports = {
       },
       {
         test: /\.js$/,
-        exclude: /node_modules|vue-router\/|vue-loader\/|vue-hot-reload-api\//,
+        exclude: /node_modules|vue-router\/|vue-loader\//,
         loader: 'babel-loader'
       },
       {
diff --git a/package.json b/package.json
index e5752e03c..0989f64e9 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,6 @@
     "babel-cli": "^6.14.0",
     "babel-core": "^6.25.0",
     "babel-loader": "^7.1.1",
-    "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-module-resolver": "^2.7.1",
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
@@ -103,7 +102,6 @@
     "uppercamelcase": "^3.0.0",
     "url-loader": "^0.5.9",
     "vue": "^2.4.2",
-    "vue-hot-reload-api": "^2.1.0",
     "vue-html-loader": "^1.2.4",
     "vue-loader": "^13.0.4",
     "vue-markdown-loader": "^2.0.0",
@@ -111,11 +109,9 @@
     "vue-sfc-compiler": "^0.0.1",
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.4.2",
-    "vue-template-es2015-compiler": "^1.5.3",
     "webpack": "^3.5.4",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "0.1.12",
-    "zan-rollup-plugin-alias": "1.0.1"
+    "zan-doc": "0.1.12"
   }
 }
diff --git a/packages/cell-swipe/src/cell-swipe.vue b/packages/cell-swipe/src/cell-swipe.vue
index 21eb446f3..00acbfe11 100644
--- a/packages/cell-swipe/src/cell-swipe.vue
+++ b/packages/cell-swipe/src/cell-swipe.vue
@@ -51,12 +51,10 @@
       this.wrap = this.$refs.cell.querySelector('.van-cell-wrapper');
       this.leftElm = this.$refs.left;
       this.leftWrapElm = this.leftElm.parentNode;
-      this.leftDefaultTransform = this.translate3d(-this.leftWidth - 1);
       this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
 
       this.rightElm = this.$refs.right;
       this.rightWrapElm = this.rightElm.parentNode;
-      this.rightDefaultTransform = this.translate3d(this.rightWidth);
       this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
     },
     methods: {
@@ -100,14 +98,12 @@
         }, 0);
       },
       startDrag(evt) {
-        console.log('startDrag')
         evt = evt.changedTouches ? evt.changedTouches[0] : evt;
         this.dragging = true;
         this.start.x = evt.pageX;
         this.start.y = evt.pageY;
       },
       onDrag(evt) {
-        console.log('onDrag')
         if (this.opened) {
           !this.swiping && this.swipeMove(0);
           this.opened = false;
@@ -132,7 +128,6 @@
         this.swipeMove(offsetLeft);
       },
       endDrag() {
-        console.log('endDrag')
         if (!this.swiping) return;
         this.swipeLeaveTransition(this.offsetLeft > 0 ? -1 : 1);
       }
diff --git a/packages/dialog/src/dialog.js b/packages/dialog/src/dialog.js
index bb1fed2f4..d82f3e9b2 100644
--- a/packages/dialog/src/dialog.js
+++ b/packages/dialog/src/dialog.js
@@ -19,7 +19,6 @@ const defaultCallback = action => {
 };
 
 const initInstance = () => {
-  console.log('init instance');
   instance = new DialogConstructor({
     el: document.createElement('div')
   });
@@ -37,7 +36,6 @@ const showNextDialog = () => {
 
   /* istanbul ignore else */
   if (!instance.value && dialogQueue.length > 0) {
-    console.log('shift instance');
     currentDialog = dialogQueue.shift();
 
     const { options } = currentDialog;
@@ -57,7 +55,6 @@ const showNextDialog = () => {
 
 var DialogBox = options => {
   return new Promise((resolve, reject) => { // eslint-disable-line
-    console.log('push instance');
     dialogQueue.push({
       options: { ...options },
       callback: options.callback,
diff --git a/test/unit/components/checkbox.vue b/test/unit/components/checkbox.vue
index f74a62a12..f3d5d7484 100644
--- a/test/unit/components/checkbox.vue
+++ b/test/unit/components/checkbox.vue
@@ -1,6 +1,6 @@
 <template>
   <van-checkbox-group v-model="result">
-    <van-checkbox v-for="item in list" :name="item">复选框{{item}}</van-checkbox>
+    <van-checkbox v-for="(item, index) in list" :key="index" :name="item">复选框{{item}}</van-checkbox>
   </van-checkbox-group>
 </template>
 
diff --git a/test/unit/get-webpack-conf.js b/test/unit/get-webpack-conf.js
index 0ef3fc5d4..09fad3cbe 100644
--- a/test/unit/get-webpack-conf.js
+++ b/test/unit/get-webpack-conf.js
@@ -45,12 +45,12 @@ const webpackConfig = {
       {
         enforce: 'pre',
         test: /\.js$/,
-        exclude: /node_modules|vue-router\/|vue-loader\/|vue-hot-reload-api\/|docs|test|src\/index|src\/utils|src\/mixins|packages\/swipe/,
+        exclude: /node_modules|vue-router\/|vue-loader\/|docs|test|src\/index|src\/utils|src\/mixins|packages\/swipe/,
         use: ['isparta-loader']
       },
       {
         test: /\.js$/,
-        exclude: /node_modules|vue-router\/|vue-loader\/|vue-hot-reload-api\//,
+        exclude: /node_modules|vue-router\/|vue-loader\//,
         use: ['babel-loader']
       },
       {
diff --git a/test/unit/specs/dialog.spec.js b/test/unit/specs/dialog.spec.js
index aa006b88f..be92b4e3c 100644
--- a/test/unit/specs/dialog.spec.js
+++ b/test/unit/specs/dialog.spec.js
@@ -3,7 +3,7 @@ import Vue from 'vue';
 
 describe('Dialog', () => {
   afterEach(() => {
-    const el = document.querySelector('.van-dialog-wrapper');
+    const el = document.querySelector('.van-dialog');
     if (!el) return;
     if (el.parentNode) {
       el.parentNode.removeChild(el);
@@ -20,7 +20,7 @@ describe('Dialog', () => {
       done();
     });
 
-    expect(document.querySelector('.van-dialog-wrapper')).to.exist;
+    expect(document.querySelector('.van-dialog')).to.exist;
     expect(document.querySelector('.van-dialog__cancel').style.display).to.equal('none');
 
     setTimeout(() => {
@@ -34,7 +34,7 @@ describe('Dialog', () => {
       message: 'message'
     });
 
-    expect(document.querySelector('.van-dialog-wrapper')).to.exist;
+    expect(document.querySelector('.van-dialog')).to.exist;
   });
 
   it('create a confirm dialog with callback', (done) => {
@@ -47,7 +47,7 @@ describe('Dialog', () => {
       }
     });
 
-    expect(document.querySelector('.van-dialog-wrapper')).to.exist;
+    expect(document.querySelector('.van-dialog')).to.exist;
     setTimeout(() => {
       document.querySelector('.van-dialog__cancel').click();
       expect(dialogAction).to.equal('cancel');
diff --git a/yarn.lock b/yarn.lock
index b5405d2db..2c5df0a93 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -547,12 +547,6 @@ babel-plugin-check-es2015-constants@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-external-helpers@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-external-helpers/-/babel-plugin-external-helpers-6.22.0.tgz#2285f48b02bd5dede85175caf8c62e86adccefa1"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-module-resolver@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-2.7.1.tgz#18be3c42ddf59f7a456c9e0512cd91394f6e4be1"
@@ -7593,9 +7587,3 @@ zan-doc@0.1.12:
     markdown-it "^8.3.1"
     markdown-it-container "^2.0.0"
     node-watch "^0.5.5"
-
-zan-rollup-plugin-alias@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/zan-rollup-plugin-alias/-/zan-rollup-plugin-alias-1.0.1.tgz#5004b659cdac960a83d75d4b3f8480b3982fbdd8"
-  dependencies:
-    slash "^1.0.0"

From a9f34155982199c373e4e7be7b5f8d27b94707b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 17 Aug 2017 13:10:32 +0800
Subject: [PATCH 035/126] [build] 0.8.0

---
 docs/examples-docs/changelog.md | 10 +++++++++-
 packages/index.js               |  2 +-
 packages/vant-css/package.json  |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index e168e0f9a..4bbe62f87 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -1,5 +1,13 @@
 ## 更新日志
 
+## [v0.7.10](https://github.com/youzan/vant/tree/v0.7.10) (2017-08-16)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.7.8...v0.7.10)
+
+**合并的 Pull Request (可能有不兼容改动):**
+
+- fix: 修复popup和dialog同时出现时，几率出现dialog被挡住的情况 [\#75](https://github.com/youzan/vant/pull/75) ([pangxie1991](https://github.com/pangxie1991))
+- 修复：popup滚动穿透 [\#73](https://github.com/youzan/vant/pull/73) ([cookfront](https://github.com/cookfront))
+
 ## [v0.7.8](https://github.com/youzan/vant/tree/v0.7.8) (2017-08-10)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.7.7...v0.7.8)
 
@@ -90,7 +98,7 @@
 
 **非兼容更新和新特性:**
 
-- packages/utils目录支持SSR [\#51](https://github.com/youzan/vant/pull/51) ([cookfront](https://github.com/cookfront))
+- src/utils目录支持SSR [\#51](https://github.com/youzan/vant/pull/51) ([cookfront](https://github.com/cookfront))
 
 ## [v0.6.3](https://github.com/youzan/vant/tree/v0.6.3) (2017-07-04)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.6.2...v0.6.3)
diff --git a/packages/index.js b/packages/index.js
index f5db1aa8d..a8e6dc253 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -37,7 +37,7 @@ import Swipe from './swipe';
 import SwipeItem from './swipe-item';
 import DatetimePicker from './datetime-picker';
 
-const version = '0.7.9';
+const version = '0.8.0';
 const components = [
   Button,
   Switch,
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index 983538af0..fe2e3f4f5 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.7.10",
+  "version": "0.8.0",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

From 14b5c0a9e47e7830406ed34ff31a1c4408bfe29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 17 Aug 2017 13:10:33 +0800
Subject: [PATCH 036/126] [release] 0.8.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1f3b84d8c..a4e7ff63d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.7.10",
+  "version": "0.8.0",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From 2ac22d754edf4ecb33f755c1e1142ffd83b9f6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 17 Aug 2017 14:08:21 +0800
Subject: [PATCH 037/126] actionsheet code review

---
 packages/actionsheet/src/actionsheet.vue | 78 ++++++++----------------
 packages/vant-css/src/actionsheet.css    | 39 +++++-------
 test/unit/specs/actionsheet.spec.js      | 29 +++++++--
 test/unit/utils.js                       | 46 ++++++++++++++
 4 files changed, 111 insertions(+), 81 deletions(-)
 create mode 100644 test/unit/utils.js

diff --git a/packages/actionsheet/src/actionsheet.vue b/packages/actionsheet/src/actionsheet.vue
index 7d6e4398d..6a3a9c170 100644
--- a/packages/actionsheet/src/actionsheet.vue
+++ b/packages/actionsheet/src/actionsheet.vue
@@ -1,40 +1,35 @@
 <template>
-  <transition name="actionsheet-float">
-    <div class="van-actionsheet" :class="{ 'van-actionsheet--withtitle': title }" v-show="currentValue">
+  <transition name="van-actionsheet-float">
+    <div :class="['van-actionsheet', { 'van-actionsheet--withtitle': title }]" v-show="value">
       <div class="van-actionsheet__header" v-if="title">
-        <h3 v-text="title"></h3>
-        <van-icon name="close" @click.stop="currentValue = false"></van-icon>
+        <h3 v-text="title" />
+        <van-icon name="close" @click.stop="$emit('input', false)" />
+      </div>
+      <ul v-if="!title" class="van-actionsheet__list">
+        <li
+          v-for="(item, index) in actions"
+          :key="index"
+          :class="['van-actionsheet__item', item.className, { 'van-actionsheet__item--loading': item.loading }]"
+          @click.stop="handleItemClick(item)">
+          <template v-if="!item.loading">
+            <span class="van-actionsheet__name">{{ item.name }}</span>
+            <span class="van-actionsheet__subname" v-if="item.subname">{{ item.subname }}</span>
+          </template>
+          <van-loading v-else class="van-actionsheet__loading" type="circle" color="black" />
+        </li>
+      </ul>
+      <div class="van-actionsheet__item van-actionsheet__cancel" @click.stop="$emit('input', false)" v-if="cancelText">{{ cancelText }}</div>
+      <div class="van-actionsheet__content" v-else>
+        <slot></slot>
       </div>
-      <template v-if="!title">
-        <ul class="van-actionsheet__list">
-          <li
-            v-for="(item, index) in actions"
-            :key="index"
-            class="van-actionsheet__item"
-            :class="[item.className, item.loading ? 'van-actionsheet__item--loading' : '']"
-            @click.stop="handleItemClick(item)">
-            <template v-if="!item.loading">
-              <span class="van-actionsheet__name">{{ item.name }}</span>
-              <span class="van-actionsheet__subname" v-if="item.subname">{{ item.subname }}</span>
-            </template>
-            <van-loading v-else class="van-actionsheet__loading" type="circle" color="black" />
-          </li>
-        </ul>
-        <a class="van-actionsheet__button" @click.stop="currentValue = false" v-if="cancelText">{{ cancelText }}</a>
-      </template>
-      <template v-else>
-        <div class="van-actionsheet__content">
-          <slot></slot>
-        </div>
-      </template>
     </div>
   </transition>
 </template>
 
 <script>
 import Popup from '../../mixins/popup';
-import VanLoading from '../../loading';
 import VanIcon from '../../icon';
+import VanLoading from '../../loading';
 
 export default {
   name: 'van-actionsheet',
@@ -42,12 +37,12 @@ export default {
   mixins: [Popup],
 
   components: {
-    VanLoading,
-    VanIcon
+    [VanIcon.name]: VanIcon,
+    [VanLoading.name]: VanLoading
   },
 
   props: {
-    value: {},
+    value: Boolean,
     actions: {
       type: Array,
       default: () => []
@@ -64,32 +59,13 @@ export default {
     }
   },
 
-  data() {
-    return {
-      currentValue: this.value
-    };
-  },
-
-  watch: {
-    currentValue(val) {
-      this.$emit('input', val);
-    },
-
-    value(val) {
-      this.currentValue = val;
-    }
-  },
-
   mounted() {
-    if (this.value) {
-      this.currentValue = true;
-      this.open();
-    }
+    this.value && this.open();
   },
 
   methods: {
     handleItemClick(item) {
-      if (item.callback && typeof item.callback === 'function') {
+      if (typeof item.callback === 'function') {
         item.callback(item);
       }
     }
diff --git a/packages/vant-css/src/actionsheet.css b/packages/vant-css/src/actionsheet.css
index 2f37bbfd9..ffae808ff 100644
--- a/packages/vant-css/src/actionsheet.css
+++ b/packages/vant-css/src/actionsheet.css
@@ -4,26 +4,23 @@
 
 .van-actionsheet {
   position: fixed;
-  width: 100%;
-  top: auto;
+  left: 0;
+  right: 0;
   bottom: 0;
-  right: auto;
-  left: 50%;
-  transform: translate3d(-50%, 0, 0);
-  backface-visibility: hidden;
+  color: $c-black;
   transition: .2s ease-out;
   background-color: #e0e0e0;
+  backface-visibility: hidden;
 
   &--withtitle {
     background-color: $c-white;
   }
 
   &__item {
-    line-height: 50px;
     height: 50px;
-    text-align: center;
-    color: $c-black;
+    line-height: 50px;
     font-size: 16px;
+    text-align: center;
     position: relative;
     background-color: $c-white;
 
@@ -33,28 +30,20 @@
   }
 
   &__subname {
-    color: $c-gray-darker;
     font-size: 12px;
+    color: $c-gray-darker;
   }
 
   &__loading {
-    margin: 0 auto;
     display: inline-block;
   }
 
-  &__button {
-    display: block;
+  &__cancel {
     margin-top: 5px;
-    line-height: 50px;
-    color: $c-black;
-    font-size: 16px;
-    text-align: center;
-    background-color: $c-white;
   }
 
   &__header {
     line-height: 44px;
-    color: $c-black;
     text-align: center;
     position: relative;
 
@@ -63,16 +52,16 @@
     }
 
     .van-icon-close {
+      top: 11px;
+      right: 15px;
       position: absolute;
       font-size: 22px;
       line-height: 22px;
-      top: 11px;
-      right: 15px;
     }
   }
-}
 
-.actionsheet-float-enter,
-.actionsheet-float-leave-active {
-  transform: translate3d(-50%, 100%, 0);
+  &-float-enter,
+  &-float-leave-active {
+    transform: translate3d(0, 100%, 0);
+  }
 }
diff --git a/test/unit/specs/actionsheet.spec.js b/test/unit/specs/actionsheet.spec.js
index 8db863831..cd6a1d942 100644
--- a/test/unit/specs/actionsheet.spec.js
+++ b/test/unit/specs/actionsheet.spec.js
@@ -1,5 +1,6 @@
 import ActionSheet from 'packages/actionsheet';
 import { mount } from 'avoriaz';
+import { DOMChecker } from '../utils';
 
 describe('ActionSheet', () => {
   let wrapper;
@@ -26,7 +27,13 @@ describe('ActionSheet', () => {
       }
     });
 
-    expect(wrapper.instance().currentValue).to.be.true;
+    DOMChecker(wrapper, {
+      noStyle: {
+        '.van-actionsheet': {
+          display: 'none'
+        }
+      }
+    });
   });
 
   it('create title type actionsheet', () => {
@@ -98,8 +105,8 @@ describe('ActionSheet', () => {
       }
     });
 
-    const cancelButton = wrapper.find('.van-actionsheet__button')[0];
-    expect(wrapper.contains('.van-actionsheet__button')).to.be.true;
+    const cancelButton = wrapper.find('.van-actionsheet__cancel')[0];
+    expect(wrapper.contains('.van-actionsheet__cancel')).to.be.true;
     expect(cancelButton.text()).to.equal('cancel');
   });
 
@@ -111,12 +118,24 @@ describe('ActionSheet', () => {
     });
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
-    expect(wrapper.data().currentValue).to.be.false;
+    DOMChecker(wrapper, {
+      style: {
+        '.van-actionsheet': {
+          display: 'none'
+        }
+      }
+    });
 
     wrapper.vm.value = true;
     wrapper.update();
     wrapper.vm.$nextTick(() => {
-      expect(wrapper.data().currentValue).to.be.true;
+      DOMChecker(wrapper, {
+        noStyle: {
+          '.van-actionsheet': {
+            display: 'none'
+          }
+        }
+      });
       expect(eventStub.calledWith('input'));
       done();
     });
diff --git a/test/unit/utils.js b/test/unit/utils.js
new file mode 100644
index 000000000..b8d768787
--- /dev/null
+++ b/test/unit/utils.js
@@ -0,0 +1,46 @@
+/**
+ * 按照一定的规则进行匹配
+ */
+export function DOMChecker(wrapper, rules) {
+  const { text, count, src, style, noStyle, value } = rules;
+
+  if (text) {
+    Object.keys(text).forEach(key => {
+      expect(wrapper.find(key)[0].text().trim()).to.equal(text[key]);
+    });
+  }
+
+  if (count) {
+    Object.keys(count).forEach(key => {
+      expect(wrapper.find(key).length).to.equal(count[key]);
+    });
+  }
+
+  if (src) {
+    Object.keys(src).forEach(key => {
+      expect(wrapper.find(key)[0].element.src).to.equal(src[key]);
+    });
+  }
+
+  if (value) {
+    Object.keys(value).forEach(key => {
+      expect(wrapper.find(key)[0].element.value).to.equal(value[key]);
+    });
+  }
+
+  if (style) {
+    Object.keys(style).forEach(key => {
+      Object.keys(style[key]).forEach(prop => {
+        expect(wrapper.find(key)[0].hasStyle(prop, style[key][prop])).to.equal(true);
+      });
+    });
+  }
+
+  if (noStyle) {
+    Object.keys(noStyle).forEach(key => {
+      Object.keys(noStyle[key]).forEach(prop => {
+        expect(wrapper.find(key)[0].hasStyle(prop, noStyle[key][prop])).to.equal(false);
+      });
+    });
+  }
+}

From b239adfca9b22e82422399ced689cd7a5a46de70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 17 Aug 2017 14:17:32 +0800
Subject: [PATCH 038/126] upgrade vue-sfc-compiler

---
 package.json                             | 2 +-
 packages/actionsheet/src/actionsheet.vue | 4 ++--
 yarn.lock                                | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index a4e7ff63d..6b0a78dc0 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "vue-loader": "^13.0.4",
     "vue-markdown-loader": "^2.0.0",
     "vue-router": "^2.7.0",
-    "vue-sfc-compiler": "^0.0.1",
+    "vue-sfc-compiler": "^0.0.2",
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.4.2",
     "webpack": "^3.5.4",
diff --git a/packages/actionsheet/src/actionsheet.vue b/packages/actionsheet/src/actionsheet.vue
index 6a3a9c170..852c821f8 100644
--- a/packages/actionsheet/src/actionsheet.vue
+++ b/packages/actionsheet/src/actionsheet.vue
@@ -10,7 +10,7 @@
           v-for="(item, index) in actions"
           :key="index"
           :class="['van-actionsheet__item', item.className, { 'van-actionsheet__item--loading': item.loading }]"
-          @click.stop="handleItemClick(item)">
+          @click.stop="onClickItem(item)">
           <template v-if="!item.loading">
             <span class="van-actionsheet__name">{{ item.name }}</span>
             <span class="van-actionsheet__subname" v-if="item.subname">{{ item.subname }}</span>
@@ -64,7 +64,7 @@ export default {
   },
 
   methods: {
-    handleItemClick(item) {
+    onClickItem(item) {
       if (typeof item.callback === 'function') {
         item.callback(item);
       }
diff --git a/yarn.lock b/yarn.lock
index 2c5df0a93..ed4ee70da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7272,9 +7272,9 @@ vue-router@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.7.0.tgz#16d424493aa51c3c8cce8b7c7210ea4c3a89aff1"
 
-vue-sfc-compiler@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/vue-sfc-compiler/-/vue-sfc-compiler-0.0.1.tgz#389221eb198efaa8d7ad6a7e8c3f57d10ea952ed"
+vue-sfc-compiler@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/vue-sfc-compiler/-/vue-sfc-compiler-0.0.2.tgz#f6b4c16f4449459cce83a9852266b753565e7b7c"
   dependencies:
     vue-template-compiler "^2.4.2"
     vue-template-es2015-compiler "^1.5.3"

From 686b497c5815cabb6c4d66f42748a7502cc6ccd1 Mon Sep 17 00:00:00 2001
From: Yao <chenyao1102@gmail.com>
Date: Fri, 18 Aug 2017 11:15:48 +0800
Subject: [PATCH 039/126] =?UTF-8?q?field=20=E5=A2=9E=E5=8A=A0icon=20slot?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20(#76)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* field 增加icon slot支持
---
 docs/examples-docs/field.md     | 16 +++++++++++++++-
 packages/field/src/field.vue    | 20 ++++++++++++++++++--
 packages/vant-css/src/field.css |  6 ++++++
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/docs/examples-docs/field.md b/docs/examples-docs/field.md
index 560722d85..f8789446d 100644
--- a/docs/examples-docs/field.md
+++ b/docs/examples-docs/field.md
@@ -47,7 +47,15 @@ export default {
     :on-icon-click="onIconClick"
     @blur="onFieldBlur"
     required></van-field>
-  <van-field type="password" label="密码：" placeholder="请输入密码" required></van-field>
+  <van-field
+    type="password"
+    label="密码："
+    placeholder="请输入密码"
+    required>
+    <template slot="icon">
+      <van-icon name="search"></van-icon>
+    </template>
+  </van-field>
   <van-field type="textarea" label="个人介绍：" placeholder="请输入个人介绍" required></van-field>
 </van-cell-group>
 ```
@@ -132,3 +140,9 @@ export default {
 | icon | 输入框尾部图标 | `string`  |  |  icon中支持的类型 |
 | onIconClick | 点击图标的回调函数 | `function`  |  |  |
 
+### Slot
+
+| name       | 描述      |
+|-----------|-----------|
+| icon | 自定义icon |
+
diff --git a/packages/field/src/field.vue b/packages/field/src/field.vue
index 7517345dd..4faedd9c9 100644
--- a/packages/field/src/field.vue
+++ b/packages/field/src/field.vue
@@ -9,7 +9,8 @@
       'van-field--disabled': disabled,
       'van-field--error': error,
       'van-field--border': border,
-      'van-field--autosize': autosize
+      'van-field--autosize': autosize,
+      'van-field--has-icon': showIcon
     }">
     <textarea
       v-if="type === 'textarea'"
@@ -37,7 +38,11 @@
       :maxlength="maxlength"
       :disabled="disabled"
       :readonly="readonly">
-    <van-icon v-if="icon && currentValue" :name="icon" class="van-field__icon" @click="onIconClick"></van-icon>
+    <div v-if="showIcon" class="van-field__icon" @click="onIconClick">
+      <slot name="icon">
+        <van-icon :name="icon"></van-icon>
+      </slot>
+    </div>
   </van-cell>
 </template>
 
@@ -101,6 +106,17 @@ export default {
     }
   },
 
+  computed: {
+    showIcon() {
+      // 有icon的slot，就认为一直展示
+      if (this.$slots.icon) {
+        return true;
+      }
+
+      return this.icon && this.currentValue;
+    }
+  },
+
   methods: {
     handleInput(event) {
       this.currentValue = event.target.value;
diff --git a/packages/vant-css/src/field.css b/packages/vant-css/src/field.css
index e40d6aaa3..6bc7cac56 100644
--- a/packages/vant-css/src/field.css
+++ b/packages/vant-css/src/field.css
@@ -78,6 +78,12 @@
     }
   }
 
+  &--has-icon {
+    .van-field__control {
+      width: 90%;
+    }
+  }
+
   &__control {
     border: 0;
     font-size: 14px;

From dd6fd650774f704d3c67a440df1e8be97155f6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 11:17:27 +0800
Subject: [PATCH 040/126] [build] 0.8.1

---
 docs/examples-docs/changelog.md | 7 +++++++
 packages/index.js               | 2 +-
 packages/vant-css/package.json  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index 4bbe62f87..b7995333c 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -1,5 +1,12 @@
 ## 更新日志
 
+## [v0.8.0](https://github.com/youzan/vant/tree/v0.8.0) (2017-08-17)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.7.10...v0.8.0)
+
+**合并的 Pull Request (可能有不兼容改动):**
+
+- Optimize component building, reduce dist file size  [\#74](https://github.com/youzan/vant/pull/74) ([chenjiahan](https://github.com/chenjiahan))
+
 ## [v0.7.10](https://github.com/youzan/vant/tree/v0.7.10) (2017-08-16)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.7.8...v0.7.10)
 
diff --git a/packages/index.js b/packages/index.js
index a8e6dc253..cb65c9f82 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -37,7 +37,7 @@ import Swipe from './swipe';
 import SwipeItem from './swipe-item';
 import DatetimePicker from './datetime-picker';
 
-const version = '0.8.0';
+const version = '0.8.1';
 const components = [
   Button,
   Switch,
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index fe2e3f4f5..4a60011c0 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

From 4a55f341ab320a3e636221d8e1f72e7f13a26272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 11:17:27 +0800
Subject: [PATCH 041/126] [release] 0.8.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a4e7ff63d..0eac4d48d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From 48544ab82b1bd3c31f7247ec5202076e33d18405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 11:28:13 +0800
Subject: [PATCH 042/126] fix: Button mask border radius

---
 packages/datetime-picker/index.js | 4 ++--
 packages/vant-css/src/button.css  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/datetime-picker/index.js b/packages/datetime-picker/index.js
index c6ad7f9b3..ca80ede95 100644
--- a/packages/datetime-picker/index.js
+++ b/packages/datetime-picker/index.js
@@ -1,3 +1,3 @@
-import DateTimePicker from './src/datetime-picker';
+import DatetimePicker from './src/datetime-picker';
 
-export default DateTimePicker;
+export default DatetimePicker;
diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css
index 99883b371..617c7de6d 100644
--- a/packages/vant-css/src/button.css
+++ b/packages/vant-css/src/button.css
@@ -24,6 +24,7 @@
     bottom: 0;
     background-color: #000;
     opacity: 0;
+    border-radius: inherit; /* inherit parent's border radius */
   }
 
   &:not(.is-disabled):active::after {

From fdade73ee4d768b28dfba7dbe27944dbafc51300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 15:19:56 +0800
Subject: [PATCH 043/126] fix: delete dialog 2500 z-index

---
 build/release.sh                      |   1 -
 docs/examples-docs/datetime-picker.md |   2 +-
 docs/src/doc.config.js                |   4 +-
 package.json                          |  16 +-
 packages/dialog/src/dialog.vue        |   4 -
 yarn.lock                             | 217 ++++++++++++++++++++------
 6 files changed, 179 insertions(+), 65 deletions(-)

diff --git a/build/release.sh b/build/release.sh
index 463c07e92..861a34035 100644
--- a/build/release.sh
+++ b/build/release.sh
@@ -43,7 +43,6 @@ then
 
   # commit
   git add -A
-  git commit -m "[build] $VERSION"
   npm version $VERSION --message "[release] $VERSION"
 
   # publish
diff --git a/docs/examples-docs/datetime-picker.md b/docs/examples-docs/datetime-picker.md
index 1d90f56c3..f1b8f0dd2 100644
--- a/docs/examples-docs/datetime-picker.md
+++ b/docs/examples-docs/datetime-picker.md
@@ -25,7 +25,7 @@ export default {
 };
 </script>
 
-## Datetime Picker 时间选择
+## DatetimePicker 时间选择
 
 ### 代码演示
 
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index d77c272c0..6a2a62c5d 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -64,7 +64,7 @@ module.exports = {
               },
               {
                 "path": "/cell-swipe",
-                "title": "Cell Swipe 滑动单元格"
+                "title": "CellSwipe 滑动单元格"
               },
               {
                 "path": "/progress",
@@ -170,7 +170,7 @@ module.exports = {
               },
               {
                 "path": "/datetime-picker",
-                "title": "Datetime Picker 时间选择"
+                "title": "DatetimePicker 时间选择"
               },
               {
                 "path": "/dialog",
diff --git a/package.json b/package.json
index ddba2103f..4eccaab16 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
   "author": "youzanfe",
   "license": "ISC",
   "dependencies": {
-    "babel-runtime": "6.x",
+    "babel-runtime": "^6.26.0",
     "vue-lazyload": "^1.0.6"
   },
   "peerDependencies": {
@@ -49,24 +49,26 @@
   "devDependencies": {
     "autoprefixer": "^7.1.2",
     "avoriaz": "2.0.0",
-    "babel-cli": "^6.14.0",
-    "babel-core": "^6.25.0",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.0",
+    "babel-helper-vue-jsx-merge-props": "^2.0.2",
     "babel-loader": "^7.1.1",
     "babel-plugin-module-resolver": "^2.7.1",
     "babel-plugin-syntax-jsx": "^6.18.0",
-    "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.15.0",
     "babel-plugin-transform-vue-jsx": "^3.5.0",
-    "babel-polyfill": "^6.23.0",
+    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.0",
     "chai": "^4.1.1",
     "cheerio": "^0.22.0",
     "codecov": "^2.2.0",
     "cross-env": "^5.0.5",
-    "css-loader": "^0.28.4",
+    "css-loader": "^0.28.5",
     "eslint-plugin-vue": "^2.1.0",
     "extract-text-webpack-plugin": "2.1.2",
     "felint": "^0.5.0-alpha.3",
+    "file-loader": "^0.11.2",
     "file-save": "^0.2.0",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "gh-pages": "^1.0.0",
@@ -109,7 +111,7 @@
     "vue-sfc-compiler": "^0.0.2",
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.4.2",
-    "webpack": "^3.5.4",
+    "webpack": "^3.5.5",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
     "zan-doc": "0.1.12"
diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/src/dialog.vue
index c36233f79..35e21af78 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/src/dialog.vue
@@ -35,10 +35,6 @@ export default {
     },
     lockOnScroll: {
       default: true
-    },
-    zIndex: {
-      type: [String, Number],
-      default: 2500
     }
   },
 
diff --git a/yarn.lock b/yarn.lock
index ed4ee70da..56493cf0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -351,24 +351,24 @@ aws4@^1.2.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-babel-cli@^6.14.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.24.1.tgz#207cd705bba61489b2ea41b5312341cf6aca2283"
+babel-cli@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
   dependencies:
-    babel-core "^6.24.1"
-    babel-polyfill "^6.23.0"
-    babel-register "^6.24.1"
-    babel-runtime "^6.22.0"
-    commander "^2.8.1"
-    convert-source-map "^1.1.0"
+    babel-core "^6.26.0"
+    babel-polyfill "^6.26.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    commander "^2.11.0"
+    convert-source-map "^1.5.0"
     fs-readdir-recursive "^1.0.0"
-    glob "^7.0.0"
-    lodash "^4.2.0"
-    output-file-sync "^1.1.0"
-    path-is-absolute "^1.0.0"
+    glob "^7.1.2"
+    lodash "^4.17.4"
+    output-file-sync "^1.1.2"
+    path-is-absolute "^1.0.1"
     slash "^1.0.0"
-    source-map "^0.5.0"
-    v8flags "^2.0.10"
+    source-map "^0.5.6"
+    v8flags "^2.1.1"
   optionalDependencies:
     chokidar "^1.6.1"
 
@@ -380,7 +380,15 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.1.4, babel-core@^6.24.1, babel-core@^6.25.0:
+babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.1.4, babel-core@^6.24.1:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
   dependencies:
@@ -404,6 +412,30 @@ babel-core@^6.1.4, babel-core@^6.24.1, babel-core@^6.25.0:
     slash "^1.0.0"
     source-map "^0.5.0"
 
+babel-core@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.0"
+    debug "^2.6.8"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.7"
+    slash "^1.0.0"
+    source-map "^0.5.6"
+
 babel-eslint@^7.2.1:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
@@ -426,6 +458,19 @@ babel-generator@^6.25.0:
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+babel-generator@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.6"
+    trim-right "^1.0.1"
+
 babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
@@ -520,6 +565,10 @@ babel-helper-replace-supers@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
+babel-helper-vue-jsx-merge-props@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.2.tgz#aceb1c373588279e2755ea1cfd35c22394fd33f8"
+
 babel-helpers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
@@ -759,12 +808,12 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-object-rest-spread@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
+babel-plugin-transform-object-rest-spread@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.22.0"
+    babel-runtime "^6.26.0"
 
 babel-plugin-transform-regenerator@^6.22.0:
   version "6.24.1"
@@ -791,13 +840,13 @@ babel-plugin-transform-vue-jsx@^3.5.0:
   dependencies:
     esutils "^2.0.2"
 
-babel-polyfill@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
+babel-polyfill@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
   dependencies:
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
 
 babel-preset-env@^1.6.0:
   version "1.6.0"
@@ -846,13 +895,32 @@ babel-register@^6.24.1:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@6.x, babel-runtime@^6.18.0, babel-runtime@^6.22.0:
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@^6.18.0, babel-runtime@^6.22.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.25.0.tgz#33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
+babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
 babel-template@^6.24.1, babel-template@^6.25.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
@@ -863,6 +931,16 @@ babel-template@^6.24.1, babel-template@^6.25.0:
     babylon "^6.17.2"
     lodash "^4.2.0"
 
+babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
 babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.25.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.25.0.tgz#2257497e2fcd19b89edc13c4c91381f9512496f1"
@@ -877,6 +955,20 @@ babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.25.0:
     invariant "^2.2.0"
     lodash "^4.2.0"
 
+babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
 babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e"
@@ -886,10 +978,23 @@ babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
+babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
 babylon@^6.17.0, babylon@^6.17.2:
   version "6.17.4"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
 
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
@@ -1456,7 +1561,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.11.x, commander@^2.8.1, commander@^2.9.0, commander@~2.11.0:
+commander@2.11.x, commander@^2.11.0, commander@^2.9.0, commander@~2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
@@ -1581,7 +1686,7 @@ content-type@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
 
-convert-source-map@^1.1.0:
+convert-source-map@^1.1.0, convert-source-map@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
@@ -1593,7 +1698,7 @@ cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
-core-js@^2.2.0, core-js@^2.4.0:
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.0.tgz#569c050918be6486b3837552028ae0466b717086"
 
@@ -1689,9 +1794,9 @@ css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
-css-loader@^0.28.4:
-  version "0.28.4"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.4.tgz#6cf3579192ce355e8b38d5f42dd7a1f2ec898d0f"
+css-loader@^0.28.5:
+  version "0.28.5"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.5.tgz#dd02bb91b94545710212ef7f6aaa66663113d754"
   dependencies:
     babel-code-frame "^6.11.0"
     css-selector-tokenizer "^0.7.0"
@@ -1706,7 +1811,7 @@ css-loader@^0.28.4:
     postcss-modules-scope "^1.0.0"
     postcss-modules-values "^1.1.0"
     postcss-value-parser "^3.3.0"
-    source-list-map "^0.1.7"
+    source-list-map "^2.0.0"
 
 css-select@^1.1.0, css-select@~1.2.0:
   version "1.2.0"
@@ -2733,6 +2838,12 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
+file-loader@^0.11.2:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
+  dependencies:
+    loader-utils "^1.0.2"
+
 file-save@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/file-save/-/file-save-0.2.0.tgz#39b20d0214e656b1417faa3c32d317b678545db7"
@@ -3082,7 +3193,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -3117,7 +3228,7 @@ global-prefix@^0.1.4:
     is-windows "^0.2.0"
     which "^1.2.12"
 
-globals@^9.0.0, globals@^9.14.0:
+globals@^9.0.0, globals@^9.14.0, globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
@@ -3908,7 +4019,7 @@ js-beautify@^1.6.14:
     mkdirp "~0.5.0"
     nopt "~3.0.1"
 
-js-tokens@^3.0.0:
+js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
@@ -5068,7 +5179,7 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-output-file-sync@^1.1.0:
+output-file-sync@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
   dependencies:
@@ -5194,7 +5305,7 @@ path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
 
-path-is-absolute@^1.0.0:
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
@@ -5796,7 +5907,7 @@ pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
-private@^0.1.6, private@~0.1.5:
+private@^0.1.6, private@^0.1.7, private@~0.1.5:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
 
@@ -6068,10 +6179,14 @@ regenerate@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
 
-regenerator-runtime@^0.10.0:
+regenerator-runtime@^0.10.0, regenerator-runtime@^0.10.5:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
 
+regenerator-runtime@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
+
 regenerator-transform@0.9.11:
   version "0.9.11"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
@@ -6516,14 +6631,16 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
-
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
+source-map-support@^0.4.15:
+  version "0.4.16"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.16.tgz#16fecf98212467d017d586a2af68d628b9421cd8"
+  dependencies:
+    source-map "^0.5.6"
+
 source-map-support@^0.4.2:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
@@ -6905,7 +7022,7 @@ to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
-to-fast-properties@^1.0.1:
+to-fast-properties@^1.0.1, to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
@@ -7152,7 +7269,7 @@ uuid@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
-v8flags@^2.0.10, v8flags@^2.0.2:
+v8flags@^2.0.2, v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
   dependencies:
@@ -7370,9 +7487,9 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.4.tgz#5583eb263ed27b78b5bd17bfdfb0eb1b1cd1bf81"
+webpack@^3.5.5:
+  version "3.5.5"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.5.tgz#3226f09fc8b3e435ff781e7af34f82b68b26996c"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"

From 32d35a3dcfb2c059b1ad753b6612a89cb8a91f12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 15:22:58 +0800
Subject: [PATCH 044/126] fix: babel-runtime version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4eccaab16..216147039 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
   "author": "youzanfe",
   "license": "ISC",
   "dependencies": {
-    "babel-runtime": "^6.26.0",
+    "babel-runtime": "6.x",
     "vue-lazyload": "^1.0.6"
   },
   "peerDependencies": {

From 2ba123ed93d81a81463437bf068ec7e56c38bfe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 17 Aug 2017 14:08:21 +0800
Subject: [PATCH 045/126] actionsheet code review

---
 packages/actionsheet/src/actionsheet.vue | 78 ++++++++----------------
 packages/vant-css/src/actionsheet.css    | 39 +++++-------
 test/unit/specs/actionsheet.spec.js      | 29 +++++++--
 test/unit/utils.js                       | 46 ++++++++++++++
 4 files changed, 111 insertions(+), 81 deletions(-)
 create mode 100644 test/unit/utils.js

diff --git a/packages/actionsheet/src/actionsheet.vue b/packages/actionsheet/src/actionsheet.vue
index 7d6e4398d..6a3a9c170 100644
--- a/packages/actionsheet/src/actionsheet.vue
+++ b/packages/actionsheet/src/actionsheet.vue
@@ -1,40 +1,35 @@
 <template>
-  <transition name="actionsheet-float">
-    <div class="van-actionsheet" :class="{ 'van-actionsheet--withtitle': title }" v-show="currentValue">
+  <transition name="van-actionsheet-float">
+    <div :class="['van-actionsheet', { 'van-actionsheet--withtitle': title }]" v-show="value">
       <div class="van-actionsheet__header" v-if="title">
-        <h3 v-text="title"></h3>
-        <van-icon name="close" @click.stop="currentValue = false"></van-icon>
+        <h3 v-text="title" />
+        <van-icon name="close" @click.stop="$emit('input', false)" />
+      </div>
+      <ul v-if="!title" class="van-actionsheet__list">
+        <li
+          v-for="(item, index) in actions"
+          :key="index"
+          :class="['van-actionsheet__item', item.className, { 'van-actionsheet__item--loading': item.loading }]"
+          @click.stop="handleItemClick(item)">
+          <template v-if="!item.loading">
+            <span class="van-actionsheet__name">{{ item.name }}</span>
+            <span class="van-actionsheet__subname" v-if="item.subname">{{ item.subname }}</span>
+          </template>
+          <van-loading v-else class="van-actionsheet__loading" type="circle" color="black" />
+        </li>
+      </ul>
+      <div class="van-actionsheet__item van-actionsheet__cancel" @click.stop="$emit('input', false)" v-if="cancelText">{{ cancelText }}</div>
+      <div class="van-actionsheet__content" v-else>
+        <slot></slot>
       </div>
-      <template v-if="!title">
-        <ul class="van-actionsheet__list">
-          <li
-            v-for="(item, index) in actions"
-            :key="index"
-            class="van-actionsheet__item"
-            :class="[item.className, item.loading ? 'van-actionsheet__item--loading' : '']"
-            @click.stop="handleItemClick(item)">
-            <template v-if="!item.loading">
-              <span class="van-actionsheet__name">{{ item.name }}</span>
-              <span class="van-actionsheet__subname" v-if="item.subname">{{ item.subname }}</span>
-            </template>
-            <van-loading v-else class="van-actionsheet__loading" type="circle" color="black" />
-          </li>
-        </ul>
-        <a class="van-actionsheet__button" @click.stop="currentValue = false" v-if="cancelText">{{ cancelText }}</a>
-      </template>
-      <template v-else>
-        <div class="van-actionsheet__content">
-          <slot></slot>
-        </div>
-      </template>
     </div>
   </transition>
 </template>
 
 <script>
 import Popup from '../../mixins/popup';
-import VanLoading from '../../loading';
 import VanIcon from '../../icon';
+import VanLoading from '../../loading';
 
 export default {
   name: 'van-actionsheet',
@@ -42,12 +37,12 @@ export default {
   mixins: [Popup],
 
   components: {
-    VanLoading,
-    VanIcon
+    [VanIcon.name]: VanIcon,
+    [VanLoading.name]: VanLoading
   },
 
   props: {
-    value: {},
+    value: Boolean,
     actions: {
       type: Array,
       default: () => []
@@ -64,32 +59,13 @@ export default {
     }
   },
 
-  data() {
-    return {
-      currentValue: this.value
-    };
-  },
-
-  watch: {
-    currentValue(val) {
-      this.$emit('input', val);
-    },
-
-    value(val) {
-      this.currentValue = val;
-    }
-  },
-
   mounted() {
-    if (this.value) {
-      this.currentValue = true;
-      this.open();
-    }
+    this.value && this.open();
   },
 
   methods: {
     handleItemClick(item) {
-      if (item.callback && typeof item.callback === 'function') {
+      if (typeof item.callback === 'function') {
         item.callback(item);
       }
     }
diff --git a/packages/vant-css/src/actionsheet.css b/packages/vant-css/src/actionsheet.css
index 2f37bbfd9..ffae808ff 100644
--- a/packages/vant-css/src/actionsheet.css
+++ b/packages/vant-css/src/actionsheet.css
@@ -4,26 +4,23 @@
 
 .van-actionsheet {
   position: fixed;
-  width: 100%;
-  top: auto;
+  left: 0;
+  right: 0;
   bottom: 0;
-  right: auto;
-  left: 50%;
-  transform: translate3d(-50%, 0, 0);
-  backface-visibility: hidden;
+  color: $c-black;
   transition: .2s ease-out;
   background-color: #e0e0e0;
+  backface-visibility: hidden;
 
   &--withtitle {
     background-color: $c-white;
   }
 
   &__item {
-    line-height: 50px;
     height: 50px;
-    text-align: center;
-    color: $c-black;
+    line-height: 50px;
     font-size: 16px;
+    text-align: center;
     position: relative;
     background-color: $c-white;
 
@@ -33,28 +30,20 @@
   }
 
   &__subname {
-    color: $c-gray-darker;
     font-size: 12px;
+    color: $c-gray-darker;
   }
 
   &__loading {
-    margin: 0 auto;
     display: inline-block;
   }
 
-  &__button {
-    display: block;
+  &__cancel {
     margin-top: 5px;
-    line-height: 50px;
-    color: $c-black;
-    font-size: 16px;
-    text-align: center;
-    background-color: $c-white;
   }
 
   &__header {
     line-height: 44px;
-    color: $c-black;
     text-align: center;
     position: relative;
 
@@ -63,16 +52,16 @@
     }
 
     .van-icon-close {
+      top: 11px;
+      right: 15px;
       position: absolute;
       font-size: 22px;
       line-height: 22px;
-      top: 11px;
-      right: 15px;
     }
   }
-}
 
-.actionsheet-float-enter,
-.actionsheet-float-leave-active {
-  transform: translate3d(-50%, 100%, 0);
+  &-float-enter,
+  &-float-leave-active {
+    transform: translate3d(0, 100%, 0);
+  }
 }
diff --git a/test/unit/specs/actionsheet.spec.js b/test/unit/specs/actionsheet.spec.js
index 8db863831..cd6a1d942 100644
--- a/test/unit/specs/actionsheet.spec.js
+++ b/test/unit/specs/actionsheet.spec.js
@@ -1,5 +1,6 @@
 import ActionSheet from 'packages/actionsheet';
 import { mount } from 'avoriaz';
+import { DOMChecker } from '../utils';
 
 describe('ActionSheet', () => {
   let wrapper;
@@ -26,7 +27,13 @@ describe('ActionSheet', () => {
       }
     });
 
-    expect(wrapper.instance().currentValue).to.be.true;
+    DOMChecker(wrapper, {
+      noStyle: {
+        '.van-actionsheet': {
+          display: 'none'
+        }
+      }
+    });
   });
 
   it('create title type actionsheet', () => {
@@ -98,8 +105,8 @@ describe('ActionSheet', () => {
       }
     });
 
-    const cancelButton = wrapper.find('.van-actionsheet__button')[0];
-    expect(wrapper.contains('.van-actionsheet__button')).to.be.true;
+    const cancelButton = wrapper.find('.van-actionsheet__cancel')[0];
+    expect(wrapper.contains('.van-actionsheet__cancel')).to.be.true;
     expect(cancelButton.text()).to.equal('cancel');
   });
 
@@ -111,12 +118,24 @@ describe('ActionSheet', () => {
     });
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
-    expect(wrapper.data().currentValue).to.be.false;
+    DOMChecker(wrapper, {
+      style: {
+        '.van-actionsheet': {
+          display: 'none'
+        }
+      }
+    });
 
     wrapper.vm.value = true;
     wrapper.update();
     wrapper.vm.$nextTick(() => {
-      expect(wrapper.data().currentValue).to.be.true;
+      DOMChecker(wrapper, {
+        noStyle: {
+          '.van-actionsheet': {
+            display: 'none'
+          }
+        }
+      });
       expect(eventStub.calledWith('input'));
       done();
     });
diff --git a/test/unit/utils.js b/test/unit/utils.js
new file mode 100644
index 000000000..b8d768787
--- /dev/null
+++ b/test/unit/utils.js
@@ -0,0 +1,46 @@
+/**
+ * 按照一定的规则进行匹配
+ */
+export function DOMChecker(wrapper, rules) {
+  const { text, count, src, style, noStyle, value } = rules;
+
+  if (text) {
+    Object.keys(text).forEach(key => {
+      expect(wrapper.find(key)[0].text().trim()).to.equal(text[key]);
+    });
+  }
+
+  if (count) {
+    Object.keys(count).forEach(key => {
+      expect(wrapper.find(key).length).to.equal(count[key]);
+    });
+  }
+
+  if (src) {
+    Object.keys(src).forEach(key => {
+      expect(wrapper.find(key)[0].element.src).to.equal(src[key]);
+    });
+  }
+
+  if (value) {
+    Object.keys(value).forEach(key => {
+      expect(wrapper.find(key)[0].element.value).to.equal(value[key]);
+    });
+  }
+
+  if (style) {
+    Object.keys(style).forEach(key => {
+      Object.keys(style[key]).forEach(prop => {
+        expect(wrapper.find(key)[0].hasStyle(prop, style[key][prop])).to.equal(true);
+      });
+    });
+  }
+
+  if (noStyle) {
+    Object.keys(noStyle).forEach(key => {
+      Object.keys(noStyle[key]).forEach(prop => {
+        expect(wrapper.find(key)[0].hasStyle(prop, noStyle[key][prop])).to.equal(false);
+      });
+    });
+  }
+}

From 40ca68feaad2b3bc701587c41eadb3f7901b288b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 17 Aug 2017 14:17:32 +0800
Subject: [PATCH 046/126] upgrade vue-sfc-compiler

---
 package.json                             | 2 +-
 packages/actionsheet/src/actionsheet.vue | 4 ++--
 yarn.lock                                | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 0eac4d48d..ddba2103f 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "vue-loader": "^13.0.4",
     "vue-markdown-loader": "^2.0.0",
     "vue-router": "^2.7.0",
-    "vue-sfc-compiler": "^0.0.1",
+    "vue-sfc-compiler": "^0.0.2",
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.4.2",
     "webpack": "^3.5.4",
diff --git a/packages/actionsheet/src/actionsheet.vue b/packages/actionsheet/src/actionsheet.vue
index 6a3a9c170..852c821f8 100644
--- a/packages/actionsheet/src/actionsheet.vue
+++ b/packages/actionsheet/src/actionsheet.vue
@@ -10,7 +10,7 @@
           v-for="(item, index) in actions"
           :key="index"
           :class="['van-actionsheet__item', item.className, { 'van-actionsheet__item--loading': item.loading }]"
-          @click.stop="handleItemClick(item)">
+          @click.stop="onClickItem(item)">
           <template v-if="!item.loading">
             <span class="van-actionsheet__name">{{ item.name }}</span>
             <span class="van-actionsheet__subname" v-if="item.subname">{{ item.subname }}</span>
@@ -64,7 +64,7 @@ export default {
   },
 
   methods: {
-    handleItemClick(item) {
+    onClickItem(item) {
       if (typeof item.callback === 'function') {
         item.callback(item);
       }
diff --git a/yarn.lock b/yarn.lock
index 2c5df0a93..ed4ee70da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7272,9 +7272,9 @@ vue-router@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-2.7.0.tgz#16d424493aa51c3c8cce8b7c7210ea4c3a89aff1"
 
-vue-sfc-compiler@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/vue-sfc-compiler/-/vue-sfc-compiler-0.0.1.tgz#389221eb198efaa8d7ad6a7e8c3f57d10ea952ed"
+vue-sfc-compiler@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/vue-sfc-compiler/-/vue-sfc-compiler-0.0.2.tgz#f6b4c16f4449459cce83a9852266b753565e7b7c"
   dependencies:
     vue-template-compiler "^2.4.2"
     vue-template-es2015-compiler "^1.5.3"

From 88057495912ccaf56a3a45cc54e9b538103383e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 11:28:13 +0800
Subject: [PATCH 047/126] fix: Button mask border radius

---
 packages/datetime-picker/index.js | 4 ++--
 packages/vant-css/src/button.css  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/datetime-picker/index.js b/packages/datetime-picker/index.js
index c6ad7f9b3..ca80ede95 100644
--- a/packages/datetime-picker/index.js
+++ b/packages/datetime-picker/index.js
@@ -1,3 +1,3 @@
-import DateTimePicker from './src/datetime-picker';
+import DatetimePicker from './src/datetime-picker';
 
-export default DateTimePicker;
+export default DatetimePicker;
diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css
index 99883b371..617c7de6d 100644
--- a/packages/vant-css/src/button.css
+++ b/packages/vant-css/src/button.css
@@ -24,6 +24,7 @@
     bottom: 0;
     background-color: #000;
     opacity: 0;
+    border-radius: inherit; /* inherit parent's border radius */
   }
 
   &:not(.is-disabled):active::after {

From 234d594a7dc7680200ae35d0bb561d14abb6a41b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 15:19:56 +0800
Subject: [PATCH 048/126] fix: delete dialog 2500 z-index

---
 build/release.sh                      |   1 -
 docs/examples-docs/datetime-picker.md |   2 +-
 docs/src/doc.config.js                |   4 +-
 package.json                          |  16 +-
 packages/dialog/src/dialog.vue        |   4 -
 yarn.lock                             | 217 ++++++++++++++++++++------
 6 files changed, 179 insertions(+), 65 deletions(-)

diff --git a/build/release.sh b/build/release.sh
index 463c07e92..861a34035 100644
--- a/build/release.sh
+++ b/build/release.sh
@@ -43,7 +43,6 @@ then
 
   # commit
   git add -A
-  git commit -m "[build] $VERSION"
   npm version $VERSION --message "[release] $VERSION"
 
   # publish
diff --git a/docs/examples-docs/datetime-picker.md b/docs/examples-docs/datetime-picker.md
index 1d90f56c3..f1b8f0dd2 100644
--- a/docs/examples-docs/datetime-picker.md
+++ b/docs/examples-docs/datetime-picker.md
@@ -25,7 +25,7 @@ export default {
 };
 </script>
 
-## Datetime Picker 时间选择
+## DatetimePicker 时间选择
 
 ### 代码演示
 
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index d77c272c0..6a2a62c5d 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -64,7 +64,7 @@ module.exports = {
               },
               {
                 "path": "/cell-swipe",
-                "title": "Cell Swipe 滑动单元格"
+                "title": "CellSwipe 滑动单元格"
               },
               {
                 "path": "/progress",
@@ -170,7 +170,7 @@ module.exports = {
               },
               {
                 "path": "/datetime-picker",
-                "title": "Datetime Picker 时间选择"
+                "title": "DatetimePicker 时间选择"
               },
               {
                 "path": "/dialog",
diff --git a/package.json b/package.json
index ddba2103f..4eccaab16 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
   "author": "youzanfe",
   "license": "ISC",
   "dependencies": {
-    "babel-runtime": "6.x",
+    "babel-runtime": "^6.26.0",
     "vue-lazyload": "^1.0.6"
   },
   "peerDependencies": {
@@ -49,24 +49,26 @@
   "devDependencies": {
     "autoprefixer": "^7.1.2",
     "avoriaz": "2.0.0",
-    "babel-cli": "^6.14.0",
-    "babel-core": "^6.25.0",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.0",
+    "babel-helper-vue-jsx-merge-props": "^2.0.2",
     "babel-loader": "^7.1.1",
     "babel-plugin-module-resolver": "^2.7.1",
     "babel-plugin-syntax-jsx": "^6.18.0",
-    "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.15.0",
     "babel-plugin-transform-vue-jsx": "^3.5.0",
-    "babel-polyfill": "^6.23.0",
+    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.0",
     "chai": "^4.1.1",
     "cheerio": "^0.22.0",
     "codecov": "^2.2.0",
     "cross-env": "^5.0.5",
-    "css-loader": "^0.28.4",
+    "css-loader": "^0.28.5",
     "eslint-plugin-vue": "^2.1.0",
     "extract-text-webpack-plugin": "2.1.2",
     "felint": "^0.5.0-alpha.3",
+    "file-loader": "^0.11.2",
     "file-save": "^0.2.0",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "gh-pages": "^1.0.0",
@@ -109,7 +111,7 @@
     "vue-sfc-compiler": "^0.0.2",
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.4.2",
-    "webpack": "^3.5.4",
+    "webpack": "^3.5.5",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
     "zan-doc": "0.1.12"
diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/src/dialog.vue
index c36233f79..35e21af78 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/src/dialog.vue
@@ -35,10 +35,6 @@ export default {
     },
     lockOnScroll: {
       default: true
-    },
-    zIndex: {
-      type: [String, Number],
-      default: 2500
     }
   },
 
diff --git a/yarn.lock b/yarn.lock
index ed4ee70da..56493cf0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -351,24 +351,24 @@ aws4@^1.2.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-babel-cli@^6.14.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.24.1.tgz#207cd705bba61489b2ea41b5312341cf6aca2283"
+babel-cli@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
   dependencies:
-    babel-core "^6.24.1"
-    babel-polyfill "^6.23.0"
-    babel-register "^6.24.1"
-    babel-runtime "^6.22.0"
-    commander "^2.8.1"
-    convert-source-map "^1.1.0"
+    babel-core "^6.26.0"
+    babel-polyfill "^6.26.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    commander "^2.11.0"
+    convert-source-map "^1.5.0"
     fs-readdir-recursive "^1.0.0"
-    glob "^7.0.0"
-    lodash "^4.2.0"
-    output-file-sync "^1.1.0"
-    path-is-absolute "^1.0.0"
+    glob "^7.1.2"
+    lodash "^4.17.4"
+    output-file-sync "^1.1.2"
+    path-is-absolute "^1.0.1"
     slash "^1.0.0"
-    source-map "^0.5.0"
-    v8flags "^2.0.10"
+    source-map "^0.5.6"
+    v8flags "^2.1.1"
   optionalDependencies:
     chokidar "^1.6.1"
 
@@ -380,7 +380,15 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.1.4, babel-core@^6.24.1, babel-core@^6.25.0:
+babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.1.4, babel-core@^6.24.1:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
   dependencies:
@@ -404,6 +412,30 @@ babel-core@^6.1.4, babel-core@^6.24.1, babel-core@^6.25.0:
     slash "^1.0.0"
     source-map "^0.5.0"
 
+babel-core@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.0"
+    debug "^2.6.8"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.7"
+    slash "^1.0.0"
+    source-map "^0.5.6"
+
 babel-eslint@^7.2.1:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
@@ -426,6 +458,19 @@ babel-generator@^6.25.0:
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+babel-generator@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.6"
+    trim-right "^1.0.1"
+
 babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
@@ -520,6 +565,10 @@ babel-helper-replace-supers@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
+babel-helper-vue-jsx-merge-props@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.2.tgz#aceb1c373588279e2755ea1cfd35c22394fd33f8"
+
 babel-helpers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
@@ -759,12 +808,12 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-object-rest-spread@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
+babel-plugin-transform-object-rest-spread@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.22.0"
+    babel-runtime "^6.26.0"
 
 babel-plugin-transform-regenerator@^6.22.0:
   version "6.24.1"
@@ -791,13 +840,13 @@ babel-plugin-transform-vue-jsx@^3.5.0:
   dependencies:
     esutils "^2.0.2"
 
-babel-polyfill@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
+babel-polyfill@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
   dependencies:
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
 
 babel-preset-env@^1.6.0:
   version "1.6.0"
@@ -846,13 +895,32 @@ babel-register@^6.24.1:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@6.x, babel-runtime@^6.18.0, babel-runtime@^6.22.0:
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@^6.18.0, babel-runtime@^6.22.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.25.0.tgz#33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
+babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
 babel-template@^6.24.1, babel-template@^6.25.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
@@ -863,6 +931,16 @@ babel-template@^6.24.1, babel-template@^6.25.0:
     babylon "^6.17.2"
     lodash "^4.2.0"
 
+babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
 babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.25.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.25.0.tgz#2257497e2fcd19b89edc13c4c91381f9512496f1"
@@ -877,6 +955,20 @@ babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.25.0:
     invariant "^2.2.0"
     lodash "^4.2.0"
 
+babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
 babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e"
@@ -886,10 +978,23 @@ babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
+babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
 babylon@^6.17.0, babylon@^6.17.2:
   version "6.17.4"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
 
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
@@ -1456,7 +1561,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.11.x, commander@^2.8.1, commander@^2.9.0, commander@~2.11.0:
+commander@2.11.x, commander@^2.11.0, commander@^2.9.0, commander@~2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
@@ -1581,7 +1686,7 @@ content-type@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
 
-convert-source-map@^1.1.0:
+convert-source-map@^1.1.0, convert-source-map@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
@@ -1593,7 +1698,7 @@ cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
-core-js@^2.2.0, core-js@^2.4.0:
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.0.tgz#569c050918be6486b3837552028ae0466b717086"
 
@@ -1689,9 +1794,9 @@ css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
-css-loader@^0.28.4:
-  version "0.28.4"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.4.tgz#6cf3579192ce355e8b38d5f42dd7a1f2ec898d0f"
+css-loader@^0.28.5:
+  version "0.28.5"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.5.tgz#dd02bb91b94545710212ef7f6aaa66663113d754"
   dependencies:
     babel-code-frame "^6.11.0"
     css-selector-tokenizer "^0.7.0"
@@ -1706,7 +1811,7 @@ css-loader@^0.28.4:
     postcss-modules-scope "^1.0.0"
     postcss-modules-values "^1.1.0"
     postcss-value-parser "^3.3.0"
-    source-list-map "^0.1.7"
+    source-list-map "^2.0.0"
 
 css-select@^1.1.0, css-select@~1.2.0:
   version "1.2.0"
@@ -2733,6 +2838,12 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
+file-loader@^0.11.2:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
+  dependencies:
+    loader-utils "^1.0.2"
+
 file-save@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/file-save/-/file-save-0.2.0.tgz#39b20d0214e656b1417faa3c32d317b678545db7"
@@ -3082,7 +3193,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -3117,7 +3228,7 @@ global-prefix@^0.1.4:
     is-windows "^0.2.0"
     which "^1.2.12"
 
-globals@^9.0.0, globals@^9.14.0:
+globals@^9.0.0, globals@^9.14.0, globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
@@ -3908,7 +4019,7 @@ js-beautify@^1.6.14:
     mkdirp "~0.5.0"
     nopt "~3.0.1"
 
-js-tokens@^3.0.0:
+js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
@@ -5068,7 +5179,7 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-output-file-sync@^1.1.0:
+output-file-sync@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
   dependencies:
@@ -5194,7 +5305,7 @@ path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
 
-path-is-absolute@^1.0.0:
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
@@ -5796,7 +5907,7 @@ pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
-private@^0.1.6, private@~0.1.5:
+private@^0.1.6, private@^0.1.7, private@~0.1.5:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
 
@@ -6068,10 +6179,14 @@ regenerate@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
 
-regenerator-runtime@^0.10.0:
+regenerator-runtime@^0.10.0, regenerator-runtime@^0.10.5:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
 
+regenerator-runtime@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
+
 regenerator-transform@0.9.11:
   version "0.9.11"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
@@ -6516,14 +6631,16 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
-
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
+source-map-support@^0.4.15:
+  version "0.4.16"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.16.tgz#16fecf98212467d017d586a2af68d628b9421cd8"
+  dependencies:
+    source-map "^0.5.6"
+
 source-map-support@^0.4.2:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
@@ -6905,7 +7022,7 @@ to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
-to-fast-properties@^1.0.1:
+to-fast-properties@^1.0.1, to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
@@ -7152,7 +7269,7 @@ uuid@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
-v8flags@^2.0.10, v8flags@^2.0.2:
+v8flags@^2.0.2, v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
   dependencies:
@@ -7370,9 +7487,9 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.4.tgz#5583eb263ed27b78b5bd17bfdfb0eb1b1cd1bf81"
+webpack@^3.5.5:
+  version "3.5.5"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.5.5.tgz#3226f09fc8b3e435ff781e7af34f82b68b26996c"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"

From e4120786c28e5f2cec2501c7f682e575626ec9d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 15:22:58 +0800
Subject: [PATCH 049/126] fix: babel-runtime version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4eccaab16..216147039 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
   "author": "youzanfe",
   "license": "ISC",
   "dependencies": {
-    "babel-runtime": "^6.26.0",
+    "babel-runtime": "6.x",
     "vue-lazyload": "^1.0.6"
   },
   "peerDependencies": {

From f58f36bfd45d57248621ccce77d7421da00ed267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 15:38:16 +0800
Subject: [PATCH 050/126] [build] 0.8.3

---
 build/release.sh                |  1 +
 docs/examples-docs/changelog.md | 18 ++++++++++++++----
 packages/index.js               |  2 +-
 packages/vant-css/package.json  |  2 +-
 yarn.lock                       | 14 +++++++-------
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/build/release.sh b/build/release.sh
index 861a34035..463c07e92 100644
--- a/build/release.sh
+++ b/build/release.sh
@@ -43,6 +43,7 @@ then
 
   # commit
   git add -A
+  git commit -m "[build] $VERSION"
   npm version $VERSION --message "[release] $VERSION"
 
   # publish
diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index b7995333c..0a011b9fd 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -1,16 +1,23 @@
 ## 更新日志
 
+## [v0.8.1](https://github.com/youzan/vant/tree/v0.8.1) (2017-08-18)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.8.0...v0.8.1)
+
+**非兼容更新和新特性:**
+
+- field 增加icon slot支持 [\#76](https://github.com/youzan/vant/pull/76) ([pangxie1991](https://github.com/pangxie1991))
+
 ## [v0.8.0](https://github.com/youzan/vant/tree/v0.8.0) (2017-08-17)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.7.10...v0.8.0)
 
-**合并的 Pull Request (可能有不兼容改动):**
+**非兼容更新和新特性:**
 
 - Optimize component building, reduce dist file size  [\#74](https://github.com/youzan/vant/pull/74) ([chenjiahan](https://github.com/chenjiahan))
 
 ## [v0.7.10](https://github.com/youzan/vant/tree/v0.7.10) (2017-08-16)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.7.8...v0.7.10)
 
-**合并的 Pull Request (可能有不兼容改动):**
+**修复:**
 
 - fix: 修复popup和dialog同时出现时，几率出现dialog被挡住的情况 [\#75](https://github.com/youzan/vant/pull/75) ([pangxie1991](https://github.com/pangxie1991))
 - 修复：popup滚动穿透 [\#73](https://github.com/youzan/vant/pull/73) ([cookfront](https://github.com/cookfront))
@@ -18,10 +25,13 @@
 ## [v0.7.8](https://github.com/youzan/vant/tree/v0.7.8) (2017-08-10)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.7.7...v0.7.8)
 
-**合并的 Pull Request (可能有不兼容改动):**
+**非兼容更新和新特性:**
+
+- 补充 babel-plugin-import 文档 [\#71](https://github.com/youzan/vant/pull/71) ([chenjiahan](https://github.com/chenjiahan))
+
+**修复:**
 
 - not require reset.css by default [\#72](https://github.com/youzan/vant/pull/72) ([chenjiahan](https://github.com/chenjiahan))
-- 补充 babel-plugin-import 文档 [\#71](https://github.com/youzan/vant/pull/71) ([chenjiahan](https://github.com/chenjiahan))
 
 ## [v0.7.7](https://github.com/youzan/vant/tree/v0.7.7) (2017-08-09)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.7.6...v0.7.7)
diff --git a/packages/index.js b/packages/index.js
index cb65c9f82..a9d849596 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -37,7 +37,7 @@ import Swipe from './swipe';
 import SwipeItem from './swipe-item';
 import DatetimePicker from './datetime-picker';
 
-const version = '0.8.1';
+const version = '0.8.3';
 const components = [
   Button,
   Switch,
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index 4a60011c0..c732ceeba 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",
diff --git a/yarn.lock b/yarn.lock
index 56493cf0d..8cf7b7626 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -907,6 +907,13 @@ babel-register@^6.26.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.15"
 
+babel-runtime@6.x, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
 babel-runtime@^6.18.0, babel-runtime@^6.22.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.25.0.tgz#33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"
@@ -914,13 +921,6 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
 babel-template@^6.24.1, babel-template@^6.25.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"

From 86ee061c7beafcda10fb8bf418a22bf27ec1efc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 15:38:16 +0800
Subject: [PATCH 051/126] [release] 0.8.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 216147039..43892bca2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From 97c54d7f1324b3908dc295d0bdb285f36da59d9f Mon Sep 17 00:00:00 2001
From: Yao <chenyao1102@gmail.com>
Date: Fri, 18 Aug 2017 16:47:15 +0800
Subject: [PATCH 052/126] =?UTF-8?q?fix:=20field=20=E8=AE=A1=E7=AE=97autosi?=
 =?UTF-8?q?ze=EF=BC=8C=E9=9C=80=E8=A6=81nextTick=20(#78)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* textarea sizeAdjust 需要nextTick

* fix field unit test
---
 packages/field/src/field.vue  | 4 +++-
 test/unit/specs/field.spec.js | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/field/src/field.vue b/packages/field/src/field.vue
index 4faedd9c9..1a10aafbf 100644
--- a/packages/field/src/field.vue
+++ b/packages/field/src/field.vue
@@ -101,7 +101,9 @@ export default {
     },
 
     currentValue(val) {
-      if (this.autosize && this.type === 'textarea') this.sizeAdjust();
+      if (this.autosize && this.type === 'textarea') {
+        this.$nextTick(() => this.sizeAdjust());
+      }
       this.$emit('input', val);
     }
   },
diff --git a/test/unit/specs/field.spec.js b/test/unit/specs/field.spec.js
index be6d895d1..47e8a8b7d 100644
--- a/test/unit/specs/field.spec.js
+++ b/test/unit/specs/field.spec.js
@@ -120,10 +120,10 @@ describe('Field', () => {
     textarea.trigger('input');
 
     wrapper.update();
-    wrapper.vm.$nextTick(() => {
+    setTimeout(() => {
       expect(wrapper.data().currentValue).to.equal('test');
       expect(textareaElement.style.height).to.equal((textareaElement.scrollHeight - textAreaDiff) + 'px');
       done();
-    });
+    }, 500);
   });
 });

From 2c03e0d670918f9acb2a3322c6704e86a01ea3c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 16:50:02 +0800
Subject: [PATCH 053/126] [build] 0.8.4

---
 build/release.sh                | 1 +
 docs/examples-docs/changelog.md | 7 +++++++
 packages/index.js               | 2 +-
 packages/vant-css/package.json  | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build/release.sh b/build/release.sh
index 861a34035..463c07e92 100644
--- a/build/release.sh
+++ b/build/release.sh
@@ -43,6 +43,7 @@ then
 
   # commit
   git add -A
+  git commit -m "[build] $VERSION"
   npm version $VERSION --message "[release] $VERSION"
 
   # publish
diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index 0a011b9fd..25d98d8dc 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -1,5 +1,12 @@
 ## 更新日志
 
+## [v0.8.3](https://github.com/youzan/vant/tree/v0.8.3) (2017-08-18)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.8.1...v0.8.3)
+
+**修复:**
+
+- fix: dialog wrong z-index  [\#77](https://github.com/youzan/vant/pull/77) ([chenjiahan](https://github.com/chenjiahan))
+
 ## [v0.8.1](https://github.com/youzan/vant/tree/v0.8.1) (2017-08-18)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.8.0...v0.8.1)
 
diff --git a/packages/index.js b/packages/index.js
index a9d849596..b7ef72447 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -37,7 +37,7 @@ import Swipe from './swipe';
 import SwipeItem from './swipe-item';
 import DatetimePicker from './datetime-picker';
 
-const version = '0.8.3';
+const version = '0.8.4';
 const components = [
   Button,
   Switch,
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index c732ceeba..93029d11a 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

From f151a1cb46c05868f285ad60e41fcb4548847b37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 18 Aug 2017 16:50:20 +0800
Subject: [PATCH 054/126] [release] 0.8.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 43892bca2..5157ab4b4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From 893a19205603f24ae5bef06406a06ed84e8376d8 Mon Sep 17 00:00:00 2001
From: Yao <chenyao1102@gmail.com>
Date: Sat, 19 Aug 2017 12:27:05 +0800
Subject: [PATCH 055/126] fix: swipe sometimes will change to drag image (#81)

* swipe forbid dragstart
---
 docs/examples-docs/swipe.md | 27 +++++++++++++++++++++++++++
 package.json                |  2 ++
 packages/swipe/src/input.js |  1 +
 3 files changed, 30 insertions(+)

diff --git a/docs/examples-docs/swipe.md b/docs/examples-docs/swipe.md
index c76ecc9b8..6343fc1b8 100644
--- a/docs/examples-docs/swipe.md
+++ b/docs/examples-docs/swipe.md
@@ -64,6 +64,33 @@ export default {
 ```
 :::
 
+#### 隐藏指示器
+
+需要设置`show-indicators`属性为`false`，即会隐藏指示器。
+
+:::demo 隐藏指示器
+```html
+<van-swipe :show-indicators="false">
+  <van-swipe-item v-for="(img, index) in autoImages" :key="index">
+    <img v-lazy="img" alt="">
+  </van-swipe-item>
+</van-swipe>
+
+<script>
+export default {
+  data() {
+    return {
+      autoImages: [
+        'https://img.yzcdn.cn/upload_files/2017/03/09/FvkZahKoq1vkxLQFdVWeLf2UCqDz.png',
+        'https://img.yzcdn.cn/upload_files/2017/03/09/Fk0rpe_svu9d5Xk3MUCWd1QeMXOu.png'
+      ]
+    };
+  }
+};
+</script>
+```
+:::
+
 #### 自动轮播
 
 需要设置`auto-play`属性为`true`，即会自动轮播。
diff --git a/package.json b/package.json
index 5157ab4b4..8545ea148 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,8 @@
     "friendly-errors-webpack-plugin": "^1.6.1",
     "gh-pages": "^1.0.0",
     "gulp": "^3.9.1",
+    "gulp-cssmin": "^0.2.0",
+    "gulp-postcss": "^7.0.0",
     "gulp-util": "^3.0.8",
     "highlight.js": "^9.12.0",
     "html-webpack-plugin": "^2.29.0",
diff --git a/packages/swipe/src/input.js b/packages/swipe/src/input.js
index 5e2fe9658..9721af6a4 100755
--- a/packages/swipe/src/input.js
+++ b/packages/swipe/src/input.js
@@ -26,6 +26,7 @@ Input.prototype = Object.create(new EventEmitter());
 extend(Input.prototype, {
   bind: function(host) {
     if (Vue.prototype.$isServer) return;
+    bindEvents(host, 'dragstart', e => e.preventDefault());
     bindEvents(host, 'touchstart mousedown', this.onTouchStart);
     if (this.options.listenMoving) {
       bindEvents(window, 'touchmove mousemove', this.onTouchMove);

From 9f12a03771e551763ab3cb0e8099f319cdc4a8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 21 Aug 2017 10:05:29 +0800
Subject: [PATCH 056/126] Button: optimize doc

---
 docs/examples-docs/button.md  | 144 +++++++++++++---------------------
 package.json                  |   2 +-
 packages/button/src/button.js |  71 +++++++----------
 yarn.lock                     |  13 +--
 4 files changed, 85 insertions(+), 145 deletions(-)

diff --git a/docs/examples-docs/button.md b/docs/examples-docs/button.md
index fc4f506b5..2f57ec21f 100644
--- a/docs/examples-docs/button.md
+++ b/docs/examples-docs/button.md
@@ -1,20 +1,21 @@
 <style>
 .demo-button {
   .van-button {
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
     user-select: none;
-  }
-  .van-row {
-    padding: 0 15px;
-    margin-bottom: 20px;
-  }
-  .van-col-24 {
-    margin-bottom: 20px;
 
-    &:last-child {
-      margin-bottom: 0;
+    &--large,
+    &--bottom-action {
+      margin-bottom: 15px;
     }
   }
+
+  .zan-doc-demo-block {
+    padding: 0 15px;
+  }
+
+  .zan-doc-demo-block__subtitle {
+    padding-left: 0;
+  }
 }
 </style>
 
@@ -22,105 +23,67 @@
 
 ### 代码演示
 
-#### 按钮功能
+#### 按钮类型
 
-只接受`primary`, `default`, `danger`三种类型，默认`default`。
+支持`default`、`primary`、`danger`三种类型，默认为`default`
 
-:::demo 按钮功能
+:::demo 按钮类型
 ```html
-<van-row>
-  <van-col span="24">
-    <van-button block>default</van-button>
-  </van-col>
-  <van-col span="24">
-    <van-button type="primary" block>primary</van-button>
-  </van-col>
-  <van-col span="24">
-    <van-button type="danger" block>danger</van-button>
-  </van-col>
-</van-row>
-```
-:::
-
-#### 禁用状态
-
-在组件上加上`disabled`属性即可，此时按钮不可点击。
-
-:::demo 禁用状态
-```html
-<van-row>
-  <van-col span="24">
-    <van-button disabled block>diabled</van-button>
-  </van-col>
-</van-row>
+<van-button type="default">Default</van-button>
+<van-button type="primary">Primary</van-button>
+<van-button type="danger">Danger</van-button>
 ```
 :::
 
 #### 按钮尺寸
 
-只接受`large`, `normal`, `small`, `mini`四种尺寸，默认`normal`。`large`按钮默认100%宽度。
+支持`large`、`normal`、`small`、`mini`四种尺寸，默认为`normal`
 
 :::demo 按钮尺寸
 ```html 
-<van-row>
-  <van-col span="24">
-    <van-button size="large">large</van-button>
-  </van-col>
-  <van-col span="24">
-    <van-button size="normal">normal</van-button>
-  </van-col>
-  <van-col span="24">
-    <van-button size="small">small</van-button>
-  </van-col>
-  <van-col span="24">
-    <van-button size="mini">mini</van-button>
-  </van-col>
-</van-row>
+<van-button size="large">large</van-button>
+<van-button size="normal">normal</van-button>
+<van-button size="small">small</van-button>
+<van-button size="mini">mini</van-button>
+```
+:::
+
+#### 禁用状态
+
+通过`disabled`属性来禁用按钮，此时按钮不可点击
+
+:::demo 禁用状态
+```html
+<van-button disabled>diabled</van-button>
+```
+:::
+
+#### 加载状态
+
+:::demo 加载状态
+```html 
+<van-button loading />
 ```
 :::
 
 #### 自定义按钮标签
 
-按钮默认是`button`标签，可以使用`tag`属性修改为一个`a`标签。
+按钮标签默认为`button`，可以使用`tag`属性来修改按钮标签
 
 :::demo 自定义按钮标签
 ```html 
-<van-row>
-  <van-col span="24">
-    <van-button tag="a" type="primary" href="https://www.youzan.com" target="_blank">a标签按钮</van-button>
-  </van-col>
-</van-row>
-```
-:::
-
-#### loading按钮
-
-`loading`状态的按钮。
-
-:::demo loading按钮
-```html 
-<van-row>
-  <van-col span="24">
-    <van-button type="primary" loading block>loading</van-button>
-  </van-col>
-  <van-col span="24">
-    <van-button loading block></van-button>
-  </van-col>
-</van-row>
+<van-button tag="a" href="https://www.youzan.com" target="_blank">
+  a标签按钮
+</van-button>
 ```
 :::
 
 #### 页面底部操作按钮
 
-一般用于`fixed`在底部的区域或是`popup`弹层的底部，一般只使用`primary`和`normal`两种状态。
-
 :::demo 页面底部操作按钮
 ```html 
-<van-row>
-  <van-col span="24">
-    <van-button type="primary" bottom-action>立即购买</van-button>
-  </van-col>
-</van-row>
+<van-button type="primary" bottom-action>立即购买</van-button>
+
 <van-row>
   <van-col span="12">
     <van-button bottom-action>加入购物车</van-button>
@@ -136,10 +99,11 @@
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| type | 按钮类型 | `string`  | `default`          | `primary`, `danger`   |
-| size | 按钮尺寸 | `string`  | `normal`          | `large`, `small`, `mini`  |
-| tag | 按钮标签 | `string`  | `button`          | 任何有意义的`html`标签, 如`a`, `span`等  |
-| diabled | 按钮是否禁用 | `boolean`  |  `false`  |      |
-| block | 按钮是否显示为块级元素 | `boolean`  |   `false`   |      |
-| bottomAction | 按钮是否显示为底部行动按钮，一般显示在页面底部，有特殊样式 | `boolean`  |   `false`   |      |
-
+| type | 按钮类型 | `String`  | `default` | `primary` `danger` |
+| size | 按钮尺寸 | `String`  | `normal` | `large` `small` `mini` |
+| tag | 按钮标签 | `String`  | `button` | 任意`HTML`标签 |
+| nativeType | 按钮类型（原生） | `String`  | `''` | |
+| diabled | 是否禁用 | `Boolean`  |  `false`  | |
+| loading | 是否显示为加载状态 | `Boolean`  |  `false`  | |
+| block | 是否为块级元素 | `Boolean`  |   `false`   | |
+| bottomAction | 是否为底部行动按钮 | `Boolean` | `false` | |
diff --git a/package.json b/package.json
index 5157ab4b4..28c6c2f33 100644
--- a/package.json
+++ b/package.json
@@ -114,6 +114,6 @@
     "webpack": "^3.5.5",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "0.1.12"
+    "zan-doc": "0.1.13"
   }
 }
diff --git a/packages/button/src/button.js b/packages/button/src/button.js
index 9c213c2a1..a7bbe476e 100644
--- a/packages/button/src/button.js
+++ b/packages/button/src/button.js
@@ -1,17 +1,4 @@
-/**
- * @module components/button
- * @desc 按钮
- * @param {string} [type=default] - 显示类型，接受 default, primary, danger
- * @param {boolean} [disabled=false] - 禁用
- * @param {string} [size=normal] - 尺寸，接受 normal, mini, small, large
- * @param {string} [native-type] - 原生 type 属性
- * @param {slot} - 显示文本
- *
- * @example
- * <van-button size="large" type="primary">按钮</van-button>
- */
-
-import VanLoading from '../../loading';
+import Loading from '../../loading';
 
 const ALLOWED_SIZE = ['mini', 'small', 'normal', 'large'];
 const ALLOWED_TYPE = ['default', 'danger', 'primary'];
@@ -20,73 +7,69 @@ export default {
   name: 'van-button',
 
   components: {
-    'van-loading': VanLoading
+    [Loading.name]: Loading
   },
 
   props: {
-    disabled: Boolean,
-    loading: Boolean,
     block: Boolean,
+    loading: Boolean,
+    disabled: Boolean,
+    nativeType: String,
     bottomAction: Boolean,
     tag: {
       type: String,
       default: 'button'
     },
-    nativeType: String,
     type: {
       type: String,
       default: 'default',
-      validator(value) {
-        return ALLOWED_TYPE.indexOf(value) > -1;
-      }
+      validator: value => ALLOWED_TYPE.indexOf(value) > -1
     },
     size: {
       type: String,
       default: 'normal',
-      validator(value) {
-        return ALLOWED_SIZE.indexOf(value) > -1;
-      }
+      validator: value => ALLOWED_SIZE.indexOf(value) > -1
     }
   },
 
   methods: {
-    handleClick(e) {
-      if (this.loading || this.disabled) return;
-      this.$emit('click', e);
+    onClick(event) {
+      if (!this.loading && !this.disabled) {
+        this.$emit('click', event);
+      }
     }
   },
 
   render(h) {
-    const { type, nativeType, size, disabled, loading, block, bottomAction } = this;
-    const Tag = this.tag;
+    const { type, loading, disabled, tag: Tag } = this;
 
     return (
       <Tag
-        type={nativeType}
+        type={this.nativeType}
         disabled={disabled}
         class={[
           'van-button',
           'van-button--' + type,
-          'van-button--' + size,
+          'van-button--' + this.size,
           {
             'van-button--disabled': disabled,
             'van-button--loading': loading,
-            'van-button--block': block,
-            'van-button--bottom-action': bottomAction
+            'van-button--block': this.block,
+            'van-button--bottom-action': this.bottomAction
           }
         ]}
-        onClick={this.handleClick}
+        onClick={this.onClick}
       >
-        {
-          loading
-            ? <van-loading
-                class="van-button__icon-loading"
-                type="circle"
-                color={type === 'default' ? 'black' : 'white'}>
-              </van-loading>
-            : null
-        }
-        <span class="van-button__text">{this.$slots.default}</span>
+        {loading
+          ? <van-loading
+              class="van-button__icon-loading"
+              type="circle"
+              color={type === 'default' ? 'black' : 'white'}
+            />
+          : null}
+        <span class="van-button__text">
+          {this.$slots.default}
+        </span>
       </Tag>
     );
   }
diff --git a/yarn.lock b/yarn.lock
index d7b1c5855..69ddb1ec9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -921,13 +921,6 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
 babel-template@^6.24.1, babel-template@^6.25.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
@@ -7702,9 +7695,9 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-zan-doc@0.1.12:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.1.12.tgz#65b3d43c6a18dbb939c5ea28d6a4630697de6824"
+zan-doc@0.1.13:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.1.13.tgz#df532b538ba613a4fe39e436ec553de3e7c25918"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"

From c3c24d0b71e916093cad953f1ab159602e879bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 21 Aug 2017 10:55:54 +0800
Subject: [PATCH 057/126] Icon: optimzie doc

---
 docs/examples-docs/icon.md | 417 ++++++++++---------------------------
 1 file changed, 112 insertions(+), 305 deletions(-)

diff --git a/docs/examples-docs/icon.md b/docs/examples-docs/icon.md
index 29c333e71..2dfdb991c 100644
--- a/docs/examples-docs/icon.md
+++ b/docs/examples-docs/icon.md
@@ -1,5 +1,7 @@
 <style>
 .demo-icon {
+  font-size: 0;
+
   .examples {
     max-height: none;
   }
@@ -7,18 +9,50 @@
   .van-col {
     text-align: center;
     height: 120px;
+    float: none;
+    display: inline-block;
   }
 
   .van-icon {
     font-size: 45px;
-    display: block;
     margin: 15px 0;
+    display: block;
+  }
+
+  span {
+    font-size: 14px;
   }
 } 
 </style>
 
+<script>
+import Vue from 'vue';
+import { Icon } from 'packages';
+
+Vue.component('van-icon-inner', Icon);
+Vue.component('van-icon', {
+  props: ['name'],
+
+  render(h) {
+    return <van-col span="8">
+      <van-icon-inner name={this.name}></van-icon-inner>
+      <span>{this.name}</span>
+    </van-col>
+  }
+});
+
+export default {};
+</script>
+
 ## Icon 图标
 
+### 使用指南
+``` javascript
+import { Icon } from 'vant';
+
+Vue.component(Icon.name, Icon);
+```
+
 ### 代码演示
 
 #### 基础用法
@@ -27,318 +61,91 @@
 
 :::demo 基础用法
 ```html
-<van-icon name="qr-invalid" style="text-align: center"></van-icon>
+<van-icon name="success"></van-icon>
 ```
 :::
 
 #### 所有Icons
 
-以下目前有的所有图标及其名称：
+以下为目前所有的图标：
 
 :::demo 所有Icon
 ```html
-<van-row>
-  <van-col span="8">
-    <van-icon name="qr-invalid"></van-icon>
-    <span>qr-invalid</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="qr"></van-icon>
-    <span>qr</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="exchange"></van-icon>
-    <span>exchange</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="close"></van-icon>
-    <span>close</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="location"></van-icon>
-    <span>location</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="upgrade"></van-icon>
-    <span>upgrade</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="check"></van-icon>
-    <span>check</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="checked"></van-icon>
-    <span>checked</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="like-o"></van-icon>
-    <span>like-o</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="like" style="color: red;"></van-icon>
-    <span>like</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="chat"></van-icon>
-    <span>chat</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="shop"></van-icon>
-    <span>shop</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="photograph"></van-icon>
-    <span>photograph</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="add"></van-icon>
-    <span>add</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="add2"></van-icon>
-    <span>add2</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="photo"></van-icon>
-    <span>photo</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="edit"></van-icon>
-    <span>edit</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="passed"></van-icon>
-    <span>passed</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="cart"></van-icon>
-    <span>cart</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="arrow"></van-icon>
-    <span>arrow</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="gift"></van-icon>
-    <span>gift</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="search"></van-icon>
-    <span>search</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="clear"></van-icon>
-    <span>clear</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="success"></van-icon>
-    <span>success</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="fail"></van-icon>
-    <span>fail</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="contact"></van-icon>
-    <span>contact</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="wechat"></van-icon>
-    <span>wechat</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="alipay"></van-icon>
-    <span>alipay</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="password-view"></van-icon>
-    <span>password-view</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="wap-nav"></van-icon>
-    <span>wap-nav</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="password-not-view"></van-icon>
-    <span>password-not-view</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="wap-home"></van-icon>
-    <span>wap-home</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="ecard-pay"></van-icon>
-    <span>ecard-pay</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="balance-pay"></van-icon>
-    <span>balance-pay</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="peer-pay"></van-icon>
-    <span>peer-pay</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="credit-pay"></van-icon>
-    <span>credit-pay</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="debit-pay"></van-icon>
-    <span>debit-pay</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="other-pay"></van-icon>
-    <span>other-pay</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="cart"></van-icon>
-    <span>cart</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="browsing-history"></van-icon>
-    <span>browsing-history</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="goods-collect"></van-icon>
-    <span>goods-collect</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="shop-collect"></van-icon>
-    <span>shop-collect</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="receive-gift"></van-icon>
-    <span>receive-gift</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="send-gift"></van-icon>
-    <span>send-gift</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="setting"></van-icon>
-    <span>setting</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="points"></van-icon>
-    <span>points</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="coupon"></van-icon>
-    <span>coupon</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="free-postage"></van-icon>
-    <span>free-postage</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="discount"></van-icon>
-    <span>discount</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="birthday-privilege"></van-icon>
-    <span>birthday-privilege</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="member-day-privilege"></van-icon>
-    <span>member-day-privilege</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="balance-details"></van-icon>
-    <span>balance-details</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="cash-back-record"></van-icon>
-    <span>cash-back-record</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="points-mall"></van-icon>
-    <span>points-mall</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="exchange-record"></van-icon>
-    <span>exchange-record</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="pending-payment"></van-icon>
-    <span>pending-payment</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="pending-orders"></van-icon>
-    <span>pending-orders</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="pending-deliver"></van-icon>
-    <span>pending-deliver</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="logistics"></van-icon>
-    <span>logistics</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="pending-evaluate"></van-icon>
-    <span>pending-evaluate</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="cash-on-deliver"></van-icon>
-    <span>cash-on-deliver</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="gift-card-pay"></van-icon>
-    <span>gift-card-pay</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="underway"></van-icon>
-    <span>underway</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="point-gift"></van-icon>
-    <span>point-gift</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="after-sale"></van-icon>
-    <span>after-sale</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="edit-data"></van-icon>
-    <span>edit-data</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="question"></van-icon>
-    <span>question</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="delete"></van-icon>
-    <span>delete</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="records"></van-icon>
-    <span>records</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="description"></van-icon>
-    <span>description</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="card"></van-icon>
-    <span>card</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="gift-card"></van-icon>
-    <span>gift-card</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="coupon"></van-icon>
-    <span>coupon</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="clock"></van-icon>
-    <span>clock</span>
-  </van-col>
-  <van-col span="8">
-    <van-icon name="gold-coin"></van-icon>
-    <span>gold-coin</span>
-  </van-col>
-</van-row>
+<van-icon name="qr-invalid"></van-icon>
+<van-icon name="qr"></van-icon>
+<van-icon name="exchange"></van-icon>
+<van-icon name="close"></van-icon>
+<van-icon name="location"></van-icon>
+<van-icon name="upgrade"></van-icon>
+<van-icon name="check"></van-icon>
+<van-icon name="checked"></van-icon>
+<van-icon name="like-o"></van-icon>
+<van-icon name="like" style="color: red;"></van-icon>
+<van-icon name="chat"></van-icon>
+<van-icon name="shop"></van-icon>
+<van-icon name="photograph"></van-icon>
+<van-icon name="add"></van-icon>
+<van-icon name="add2"></van-icon>
+<van-icon name="photo"></van-icon>
+<van-icon name="edit"></van-icon>
+<van-icon name="passed"></van-icon>
+<van-icon name="cart"></van-icon>
+<van-icon name="arrow"></van-icon>
+<van-icon name="gift"></van-icon>
+<van-icon name="search"></van-icon>
+<van-icon name="clear"></van-icon>
+<van-icon name="success"></van-icon>
+<van-icon name="fail"></van-icon>
+<van-icon name="contact"></van-icon>
+<van-icon name="wechat"></van-icon>
+<van-icon name="alipay"></van-icon>
+<van-icon name="password-view"></van-icon>
+<van-icon name="wap-nav"></van-icon>
+<van-icon name="password-not-view"></van-icon>
+<van-icon name="wap-home"></van-icon>
+<van-icon name="ecard-pay"></van-icon>
+<van-icon name="balance-pay"></van-icon>
+<van-icon name="peer-pay"></van-icon>
+<van-icon name="credit-pay"></van-icon>
+<van-icon name="debit-pay"></van-icon>
+<van-icon name="other-pay"></van-icon>
+<van-icon name="cart"></van-icon>
+<van-icon name="browsing-history"></van-icon>
+<van-icon name="goods-collect"></van-icon>
+<van-icon name="shop-collect"></van-icon>
+<van-icon name="receive-gift"></van-icon>
+<van-icon name="send-gift"></van-icon>
+<van-icon name="setting"></van-icon>
+<van-icon name="points"></van-icon>
+<van-icon name="coupon"></van-icon>
+<van-icon name="free-postage"></van-icon>
+<van-icon name="discount"></van-icon>
+<van-icon name="birthday-privilege"></van-icon>
+<van-icon name="member-day-privilege"></van-icon>
+<van-icon name="balance-details"></van-icon>
+<van-icon name="cash-back-record"></van-icon>
+<van-icon name="points-mall"></van-icon>
+<van-icon name="exchange-record"></van-icon>
+<van-icon name="pending-payment"></van-icon>
+<van-icon name="pending-orders"></van-icon>
+<van-icon name="pending-deliver"></van-icon>
+<van-icon name="logistics"></van-icon>
+<van-icon name="pending-evaluate"></van-icon>
+<van-icon name="cash-on-deliver"></van-icon>
+<van-icon name="gift-card-pay"></van-icon>
+<van-icon name="underway"></van-icon>
+<van-icon name="point-gift"></van-icon>
+<van-icon name="after-sale"></van-icon>
+<van-icon name="edit-data"></van-icon>
+<van-icon name="question"></van-icon>
+<van-icon name="delete"></van-icon>
+<van-icon name="records"></van-icon>
+<van-icon name="description"></van-icon>
+<van-icon name="card"></van-icon>
+<van-icon name="gift-card"></van-icon>
+<van-icon name="coupon"></van-icon>
+<van-icon name="clock"></van-icon>
+<van-icon name="gold-coin"></van-icon>
 ```
 :::
 

From cbe5ad30cf285880f683bb1228ddda5f48cc1d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 21 Aug 2017 10:56:09 +0800
Subject: [PATCH 058/126] upgrade dependencies

---
 package.json |   4 +-
 yarn.lock    | 261 +++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 246 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index a290531bc..58e58f68f 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "babel-helper-vue-jsx-merge-props": "^2.0.2",
-    "babel-loader": "^7.1.1",
+    "babel-loader": "^7.1.2",
     "babel-plugin-module-resolver": "^2.7.1",
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
@@ -92,7 +92,7 @@
     "markdown-it": "^8.3.2",
     "markdown-it-container": "^2.0.0",
     "mocha": "^3.4.2",
-    "optimize-css-assets-webpack-plugin": "^3.0.0",
+    "optimize-css-assets-webpack-plugin": "^3.1.1",
     "postcss": "^6.0.8",
     "postcss-easy-import": "^2.1.0",
     "postcss-loader": "^2.0.6",
diff --git a/yarn.lock b/yarn.lock
index 69ddb1ec9..f26a86049 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -107,6 +107,10 @@ ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
+ansi-regex@^0.2.0, ansi-regex@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
+
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -115,6 +119,10 @@ ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
+ansi-styles@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -576,9 +584,9 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-loader@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.1.tgz#b87134c8b12e3e4c2a94e0546085bc680a2b8488"
+babel-loader@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
   dependencies:
     find-cache-dir "^1.0.0"
     loader-utils "^1.0.2"
@@ -1322,6 +1330,16 @@ chai@^4.1.1:
     pathval "^1.0.0"
     type-detect "^4.0.0"
 
+chalk@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
+  dependencies:
+    ansi-styles "^1.1.0"
+    escape-string-regexp "^1.0.0"
+    has-ansi "^0.1.0"
+    strip-ansi "^0.3.0"
+    supports-color "^0.2.0"
+
 chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -1440,7 +1458,7 @@ clap@^1.0.9:
   dependencies:
     chalk "^1.1.3"
 
-clean-css@3.4.x:
+clean-css@3.4.x, clean-css@^3.1.9:
   version "3.4.28"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
   dependencies:
@@ -1479,7 +1497,7 @@ cliui@^3.2.0:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
-clone-stats@^0.0.1:
+clone-stats@^0.0.1, clone-stats@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
 
@@ -1922,7 +1940,7 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-dateformat@^1.0.6:
+dateformat@^1.0.6, dateformat@^1.0.7-1.2.3:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
   dependencies:
@@ -2422,7 +2440,7 @@ escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
@@ -2854,6 +2872,10 @@ filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
+filesize@~2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-2.0.4.tgz#7805941c60fcdfe63f46d7ea358c59ade11c1325"
+
 fill-range@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
@@ -3267,7 +3289,7 @@ glogg@^1.0.0:
   dependencies:
     sparkles "^1.0.0"
 
-graceful-fs@4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.4:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -3281,6 +3303,10 @@ graceful-fs@~1.2.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
 
+graceful-fs@~2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"
+
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -3289,6 +3315,33 @@ growl@1.9.2:
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
 
+gulp-cssmin@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/gulp-cssmin/-/gulp-cssmin-0.2.0.tgz#87ab3c69dd39b20d5d96355c6504ad6a447b1e72"
+  dependencies:
+    clean-css "^3.1.9"
+    filesize "~2.0.0"
+    graceful-fs "~4.1.4"
+    gulp-rename "~1.1.0"
+    gulp-util "~2.2.0"
+    map-stream "0.0.4"
+    temp-write "~0.1.0"
+
+gulp-postcss@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/gulp-postcss/-/gulp-postcss-7.0.0.tgz#cfb62a19fa947f8be67ce9ecae89ceb959f0cf93"
+  dependencies:
+    gulp-util "^3.0.8"
+    postcss "^6.0.0"
+    postcss-load-config "^1.2.0"
+    vinyl-sourcemaps-apply "^0.2.1"
+
+gulp-rename@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.1.0.tgz#93090aaaf4d386c07f20538a6888f15efba727a1"
+  dependencies:
+    map-stream ">=0.0.4"
+
 gulp-util@^3.0.0, gulp-util@^3.0.8:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
@@ -3312,6 +3365,19 @@ gulp-util@^3.0.0, gulp-util@^3.0.8:
     through2 "^2.0.0"
     vinyl "^0.5.0"
 
+gulp-util@~2.2.0:
+  version "2.2.20"
+  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-2.2.20.tgz#d7146e5728910bd8f047a6b0b1e549bc22dbd64c"
+  dependencies:
+    chalk "^0.5.0"
+    dateformat "^1.0.7-1.2.3"
+    lodash._reinterpolate "^2.4.1"
+    lodash.template "^2.4.1"
+    minimist "^0.2.0"
+    multipipe "^0.1.0"
+    through2 "^0.5.0"
+    vinyl "^0.2.1"
+
 gulp@^3.9.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
@@ -3361,6 +3427,12 @@ har-validator@~4.2.1:
     ajv "^4.9.1"
     har-schema "^1.0.5"
 
+has-ansi@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
+  dependencies:
+    ansi-regex "^0.2.0"
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -4254,9 +4326,9 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
-last-call-webpack-plugin@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-2.0.1.tgz#4fd10d3afe79d2fad45dc873928980cbe799f1a7"
+last-call-webpack-plugin@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-2.1.1.tgz#bd7af41186b80e6cc3968eee5d65b250eaf791f1"
   dependencies:
     lodash "^4.17.4"
     webpack-sources "^1.0.1"
@@ -4374,14 +4446,36 @@ lodash._basevalues@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
 
+lodash._escapehtmlchar@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz#df67c3bb6b7e8e1e831ab48bfa0795b92afe899d"
+  dependencies:
+    lodash._htmlescapes "~2.4.1"
+
+lodash._escapestringchar@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz#ecfe22618a2ade50bfeea43937e51df66f0edb72"
+
 lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
 
+lodash._htmlescapes@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz#32d14bf0844b6de6f8b62a051b4f67c228b624cb"
+
 lodash._isiterateecall@^3.0.0:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
 
+lodash._isnative@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash._isnative/-/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c"
+
+lodash._objecttypes@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz#7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"
+
 lodash._reescape@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
@@ -4390,14 +4484,31 @@ lodash._reevaluate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
 
+lodash._reinterpolate@^2.4.1, lodash._reinterpolate@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz#4f1227aa5a8711fc632f5b07a1f4607aab8b3222"
+
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
 
+lodash._reunescapedhtml@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz#747c4fc40103eb3bb8a0976e571f7a2659e93ba7"
+  dependencies:
+    lodash._htmlescapes "~2.4.1"
+    lodash.keys "~2.4.1"
+
 lodash._root@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
 
+lodash._shimkeys@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz#6e9cc9666ff081f0b5a6c978b83e242e6949d203"
+  dependencies:
+    lodash._objecttypes "~2.4.1"
+
 lodash.assignin@^4.0.9:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
@@ -4426,12 +4537,27 @@ lodash.defaults@^4.0.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
 
+lodash.defaults@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-2.4.1.tgz#a7e8885f05e68851144b6e12a8f3678026bc4c54"
+  dependencies:
+    lodash._objecttypes "~2.4.1"
+    lodash.keys "~2.4.1"
+
 lodash.escape@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
   dependencies:
     lodash._root "^3.0.0"
 
+lodash.escape@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-2.4.1.tgz#2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4"
+  dependencies:
+    lodash._escapehtmlchar "~2.4.1"
+    lodash._reunescapedhtml "~2.4.1"
+    lodash.keys "~2.4.1"
+
 lodash.filter@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
@@ -4452,6 +4578,12 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
+lodash.isobject@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.4.1.tgz#5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"
+  dependencies:
+    lodash._objecttypes "~2.4.1"
+
 lodash.isplainobject@^4.0.4:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
@@ -4468,6 +4600,14 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
+lodash.keys@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.4.1.tgz#48dea46df8ff7632b10d706b8acb26591e2b3727"
+  dependencies:
+    lodash._isnative "~2.4.1"
+    lodash._shimkeys "~2.4.1"
+    lodash.isobject "~2.4.1"
+
 lodash.map@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
@@ -4504,6 +4644,18 @@ lodash.some@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
 
+lodash.template@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-2.4.1.tgz#9e611007edf629129a974ab3c48b817b3e1cf20d"
+  dependencies:
+    lodash._escapestringchar "~2.4.1"
+    lodash._reinterpolate "~2.4.1"
+    lodash.defaults "~2.4.1"
+    lodash.escape "~2.4.1"
+    lodash.keys "~2.4.1"
+    lodash.templatesettings "~2.4.1"
+    lodash.values "~2.4.1"
+
 lodash.template@^3.0.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
@@ -4525,10 +4677,23 @@ lodash.templatesettings@^3.0.0:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
+lodash.templatesettings@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz#ea76c75d11eb86d4dbe89a83893bb861929ac699"
+  dependencies:
+    lodash._reinterpolate "~2.4.1"
+    lodash.escape "~2.4.1"
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
+lodash.values@~2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-2.4.1.tgz#abf514436b3cb705001627978cbcf30b1280eea4"
+  dependencies:
+    lodash.keys "~2.4.1"
+
 lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
@@ -4622,6 +4787,14 @@ map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
+map-stream@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.4.tgz#5ec6de90213ef6c7b2eb9367e9ade8da4efdb68b"
+
+map-stream@>=0.0.4:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
+
 markdown-it-container@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/markdown-it-container/-/markdown-it-container-2.0.0.tgz#0019b43fd02eefece2f1960a2895fba81a404695"
@@ -4776,6 +4949,10 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
+minimist@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce"
+
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
@@ -4831,7 +5008,7 @@ multicast-dns@^6.0.1:
     dns-packet "^1.0.1"
     thunky "^0.1.0"
 
-multipipe@^0.1.2:
+multipipe@^0.1.0, multipipe@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
   dependencies:
@@ -5106,12 +5283,12 @@ optimist@^0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optimize-css-assets-webpack-plugin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-3.0.0.tgz#03d4ce02e91ba3f2a7905507dc6be5f90b4158fd"
+optimize-css-assets-webpack-plugin@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-3.1.1.tgz#b86f255a762d9143e3db41a64a136a6b76e8c8a7"
   dependencies:
     cssnano "^3.4.0"
-    last-call-webpack-plugin "^2.0.1"
+    last-call-webpack-plugin "^2.1.1"
 
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
@@ -6083,7 +6260,7 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.2:
+readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17, readable-stream@~1.0.2:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
@@ -6796,6 +6973,12 @@ stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
+strip-ansi@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
+  dependencies:
+    ansi-regex "^0.2.1"
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -6862,6 +7045,10 @@ supports-color@3.1.2:
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -6941,6 +7128,19 @@ tcomb@^2.5.1:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
 
+temp-write@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-0.1.1.tgz#0b6467838dd77fbf7f62a0c93da879732ffda932"
+  dependencies:
+    graceful-fs "~2.0.0"
+    tempfile "~0.1.2"
+
+tempfile@~0.1.2:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-0.1.3.tgz#7d6b710047339d39f847327a056dadf183103010"
+  dependencies:
+    uuid "~1.4.0"
+
 text-encoding@0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
@@ -6953,6 +7153,13 @@ throttleit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
 
+through2@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-0.5.1.tgz#dfdd012eb9c700e2323fd334f38ac622ab372da7"
+  dependencies:
+    readable-stream "~1.0.17"
+    xtend "~3.0.0"
+
 through2@^0.6.1:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
@@ -7269,6 +7476,10 @@ uuid@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
+uuid@~1.4.0:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-1.4.2.tgz#453019f686966a6df83cdc5244e7c990ecc332fc"
+
 v8flags@^2.0.2, v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
@@ -7311,6 +7522,18 @@ vinyl-fs@^0.3.0:
     through2 "^0.6.1"
     vinyl "^0.4.0"
 
+vinyl-sourcemaps-apply@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
+  dependencies:
+    source-map "^0.5.1"
+
+vinyl@^0.2.1:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.2.3.tgz#bca938209582ec5a49ad538a00fa1f125e513252"
+  dependencies:
+    clone-stats "~0.0.1"
+
 vinyl@^0.4.0:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
@@ -7620,6 +7843,10 @@ xmlhttprequest-ssl@1.5.3:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
+xtend@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
+
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"

From fa9b879338566c7a2595c1c7c8e4a2d5d35d2f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 21 Aug 2017 10:56:27 +0800
Subject: [PATCH 059/126] Doc: add usage guide

---
 docs/examples-docs/actionsheet.md     |  7 +++++++
 docs/examples-docs/badge.md           |  7 +++++++
 docs/examples-docs/button.md          |  7 +++++++
 docs/examples-docs/card.md            |  7 +++++++
 docs/examples-docs/cell-swipe.md      | 22 ++++++++++++----------
 docs/examples-docs/cell.md            |  8 ++++++++
 docs/examples-docs/checkbox.md        |  7 +++++++
 docs/examples-docs/datetime-picker.md |  7 +++++++
 docs/examples-docs/field.md           |  7 +++++++
 docs/examples-docs/layout.md          |  9 ++++++++-
 docs/examples-docs/loading.md         |  7 +++++++
 docs/examples-docs/panel.md           |  7 +++++++
 docs/examples-docs/picker.md          |  7 +++++++
 docs/examples-docs/popup.md           |  7 +++++++
 docs/examples-docs/progress.md        |  7 +++++++
 docs/examples-docs/quantity.md        |  7 +++++++
 docs/examples-docs/radio.md           |  7 +++++++
 docs/examples-docs/search.md          |  7 +++++++
 docs/examples-docs/steps.md           |  8 ++++++++
 docs/examples-docs/swipe.md           |  7 +++++++
 docs/examples-docs/switch.md          |  7 +++++++
 docs/examples-docs/tab.md             |  8 ++++++++
 docs/examples-docs/tag.md             |  7 +++++++
 docs/examples-docs/uploader.md        |  7 +++++++
 24 files changed, 177 insertions(+), 11 deletions(-)

diff --git a/docs/examples-docs/actionsheet.md b/docs/examples-docs/actionsheet.md
index a3e353a49..09cd0fef6 100644
--- a/docs/examples-docs/actionsheet.md
+++ b/docs/examples-docs/actionsheet.md
@@ -55,6 +55,13 @@ export default {
 
 ## Actionsheet 行动按钮
 
+### 使用指南
+``` javascript
+import { Actionsheet } from 'vant';
+
+Vue.component(Actionsheet.name, Actionsheet);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/badge.md b/docs/examples-docs/badge.md
index d8cec30bc..b0f27058c 100644
--- a/docs/examples-docs/badge.md
+++ b/docs/examples-docs/badge.md
@@ -28,6 +28,13 @@
 
 ## Badge 徽章
 
+### 使用指南
+``` javascript
+import { Badge } from 'vant';
+
+Vue.component(Badge.name, Badge);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/button.md b/docs/examples-docs/button.md
index 2f57ec21f..7f110c895 100644
--- a/docs/examples-docs/button.md
+++ b/docs/examples-docs/button.md
@@ -21,6 +21,13 @@
 
 ## Button 按钮
 
+### 使用指南
+``` javascript
+import { Button } from 'vant';
+
+Vue.component(Button.name, Button);
+```
+
 ### 代码演示
 
 #### 按钮类型
diff --git a/docs/examples-docs/card.md b/docs/examples-docs/card.md
index 79d1704db..993c39f6d 100644
--- a/docs/examples-docs/card.md
+++ b/docs/examples-docs/card.md
@@ -1,5 +1,12 @@
 ## Card 图文组件
 
+### 使用指南
+``` javascript
+import { Card } from 'vant';
+
+Vue.component(Card.name, Card);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/cell-swipe.md b/docs/examples-docs/cell-swipe.md
index 4be8e7d11..45225aabd 100644
--- a/docs/examples-docs/cell-swipe.md
+++ b/docs/examples-docs/cell-swipe.md
@@ -22,6 +22,13 @@
 </style>
 ## CellSwipe 滑动单元格
 
+### 使用指南
+``` javascript
+import { CellSwipe } from 'vant';
+
+Vue.component(CellSwipe.name, CellSwipe);
+```
+
 ### 代码演示
 
 #### 基础用法
@@ -32,13 +39,8 @@
   <van-cell-group>
     <van-cell title="单元格1" value="单元格1内容"></van-cell>
   </van-cell-group>
-  
-  <span slot="right" class="swipe-delete-btn">
-      删除
-  </span>
-  <span slot="left" class="swipe-check-btn">
-      选择
-  </span>
+  <span slot="right" class="swipe-delete-btn">删除</span>
+  <span slot="left" class="swipe-check-btn">选择</span>
 </van-cell-swipe>
 ```
 :::
@@ -48,13 +50,13 @@
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| right-width | 右侧滑动按钮宽度 | `number`  |      0     |           |
-| left-width | 左侧滑动按钮宽度 | `number`  |       0    |           |
+| left-width | 左侧滑动按钮宽度 | `number`  | 0 | |
+| right-width | 右侧滑动按钮宽度 | `number`  | 0 | |
 
 ### Slot
 
 | name       | 描述      |
 |-----------|-----------|
 | - | 自定义显示内容 |
-| right | 右侧滑动内容 |
 | left | 左侧滑动内容 |
+| right | 右侧滑动内容 |
diff --git a/docs/examples-docs/cell.md b/docs/examples-docs/cell.md
index f3c9c3ffc..b2566b15a 100644
--- a/docs/examples-docs/cell.md
+++ b/docs/examples-docs/cell.md
@@ -10,6 +10,14 @@ export default {
 
 ## Cell 单元格
 
+### 使用指南
+``` javascript
+import { Cell, CellGroup } from 'vant';
+
+Vue.component(Cell.name, Cell);
+Vue.component(CellGroup.name, CellGroup);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/checkbox.md b/docs/examples-docs/checkbox.md
index eb7770e30..fdfcba1d7 100644
--- a/docs/examples-docs/checkbox.md
+++ b/docs/examples-docs/checkbox.md
@@ -35,6 +35,13 @@ export default {
 
 ## Checkbox 复选框
 
+### 使用指南
+``` javascript
+import { Checkbox } from 'vant';
+
+Vue.component(Checkbox.name, Checkbox);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/datetime-picker.md b/docs/examples-docs/datetime-picker.md
index f1b8f0dd2..3f122139d 100644
--- a/docs/examples-docs/datetime-picker.md
+++ b/docs/examples-docs/datetime-picker.md
@@ -27,6 +27,13 @@ export default {
 
 ## DatetimePicker 时间选择
 
+### 使用指南
+``` javascript
+import { DatetimePicker } from 'vant';
+
+Vue.component(DatetimePicker.name, DatetimePicker);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/field.md b/docs/examples-docs/field.md
index f8789446d..97a24a36a 100644
--- a/docs/examples-docs/field.md
+++ b/docs/examples-docs/field.md
@@ -29,6 +29,13 @@ export default {
 
 表单中`input`或`textarea`的输入框。
 
+### 使用指南
+``` javascript
+import { Field } from 'vant';
+
+Vue.component(Field.name, Field);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/layout.md b/docs/examples-docs/layout.md
index 846437c7c..8df684302 100644
--- a/docs/examples-docs/layout.md
+++ b/docs/examples-docs/layout.md
@@ -28,7 +28,14 @@
 
 ## Layout 布局
 
-主要提供了`van-row`和`van-col`两个组件来进行行列布局。
+提供了`van-row`和`van-col`两个组件来进行行列布局。
+
+### 使用指南
+``` javascript
+import { Layout } from 'vant';
+
+Vue.component(Layout.name, Layout);
+```
 
 ### 代码演示
 
diff --git a/docs/examples-docs/loading.md b/docs/examples-docs/loading.md
index 4290c9564..098e7001d 100644
--- a/docs/examples-docs/loading.md
+++ b/docs/examples-docs/loading.md
@@ -20,6 +20,13 @@
 
 ## Loading 加载
 
+### 使用指南
+``` javascript
+import { Loading } from 'vant';
+
+Vue.component(Loading.name, Loading);
+```
+
 ### 代码演示
 
 #### 渐变深色spinner
diff --git a/docs/examples-docs/panel.md b/docs/examples-docs/panel.md
index bf5c6530a..899cb071e 100644
--- a/docs/examples-docs/panel.md
+++ b/docs/examples-docs/panel.md
@@ -29,6 +29,13 @@
 
 ## Panel 面板
 
+### 使用指南
+``` javascript
+import { Panel } from 'vant';
+
+Vue.component(Panel.name, Panel);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/picker.md b/docs/examples-docs/picker.md
index 8dc626267..0d3b7acac 100644
--- a/docs/examples-docs/picker.md
+++ b/docs/examples-docs/picker.md
@@ -38,6 +38,13 @@ export default {
 
 ## Picker 选择器
 
+### 使用指南
+``` javascript
+import { Picker } from 'vant';
+
+Vue.component(Picker.name, Picker);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/popup.md b/docs/examples-docs/popup.md
index d3d3b32ac..892b9df15 100644
--- a/docs/examples-docs/popup.md
+++ b/docs/examples-docs/popup.md
@@ -75,6 +75,13 @@ export default {
 
 ## Popup 弹出菜单
 
+### 使用指南
+``` javascript
+import { Popup } from 'vant';
+
+Vue.component(Popup.name, Popup);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/progress.md b/docs/examples-docs/progress.md
index 57c93c052..efb9a2993 100644
--- a/docs/examples-docs/progress.md
+++ b/docs/examples-docs/progress.md
@@ -10,6 +10,13 @@
 
 ## Progress 进度条
 
+### 使用指南
+``` javascript
+import { Progress } from 'vant';
+
+Vue.component(Progress.name, Progress);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/quantity.md b/docs/examples-docs/quantity.md
index f00c49264..1361400ff 100644
--- a/docs/examples-docs/quantity.md
+++ b/docs/examples-docs/quantity.md
@@ -23,6 +23,13 @@ export default {
 
 ## Quantity 数量选择
 
+### 使用指南
+``` javascript
+import { Quantity } from 'vant';
+
+Vue.component(Quantity.name, Quantity);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/radio.md b/docs/examples-docs/radio.md
index 03a1b2522..e580b966b 100644
--- a/docs/examples-docs/radio.md
+++ b/docs/examples-docs/radio.md
@@ -25,6 +25,13 @@ export default {
 
 ## Radio 单选框
 
+### 使用指南
+``` javascript
+import { Radio } from 'vant';
+
+Vue.component(Radio.name, Radio);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/search.md b/docs/examples-docs/search.md
index acc8f62ff..a46d12c25 100644
--- a/docs/examples-docs/search.md
+++ b/docs/examples-docs/search.md
@@ -16,6 +16,13 @@ export default {
 
 ## Search 搜索
 
+### 使用指南
+``` javascript
+import { Search } from 'vant';
+
+Vue.component(Search.name, Search);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/steps.md b/docs/examples-docs/steps.md
index 0334e692e..d9d229b4b 100644
--- a/docs/examples-docs/steps.md
+++ b/docs/examples-docs/steps.md
@@ -28,6 +28,14 @@ export default {
 
 ## Steps 步骤条
 
+### 使用指南
+``` javascript
+import { Step, Steps } from 'vant';
+
+Vue.component(Step.name, Step);
+Vue.component(Steps.name, Steps);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/swipe.md b/docs/examples-docs/swipe.md
index 6343fc1b8..2ce3618c8 100644
--- a/docs/examples-docs/swipe.md
+++ b/docs/examples-docs/swipe.md
@@ -35,6 +35,13 @@ export default {
 
 ## Swipe 轮播
 
+### 使用指南
+``` javascript
+import { Swipe } from 'vant';
+
+Vue.component(Swipe.name, Swipe);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/switch.md b/docs/examples-docs/switch.md
index 40500b81f..cb02b9ec8 100644
--- a/docs/examples-docs/switch.md
+++ b/docs/examples-docs/switch.md
@@ -43,6 +43,13 @@ export default {
 
 ## Switch 开关
 
+### 使用指南
+``` javascript
+import { Switch } from 'vant';
+
+Vue.component(Switch.name, Switch);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/tab.md b/docs/examples-docs/tab.md
index 5e4af3cbe..4c2d7486e 100644
--- a/docs/examples-docs/tab.md
+++ b/docs/examples-docs/tab.md
@@ -49,6 +49,14 @@ export default {
 
 ## Tab 标签
 
+### 使用指南
+``` javascript
+import { Tab, Tabs } from 'vant';
+
+Vue.component(Tab.name, Tab);
+Vue.component(Tabs.name, Tabs);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/tag.md b/docs/examples-docs/tag.md
index 5dd8f00d2..4d21b6ba6 100644
--- a/docs/examples-docs/tag.md
+++ b/docs/examples-docs/tag.md
@@ -10,6 +10,13 @@
 
 ## Tag 标记
 
+### 使用指南
+``` javascript
+import { Tag } from 'vant';
+
+Vue.component(Tag.name, Tag);
+```
+
 ### 代码演示
 
 #### 基础用法
diff --git a/docs/examples-docs/uploader.md b/docs/examples-docs/uploader.md
index 9eeab2469..f09410dc2 100644
--- a/docs/examples-docs/uploader.md
+++ b/docs/examples-docs/uploader.md
@@ -16,6 +16,13 @@ export default {
 
 ## Uploader 图片上传
 
+### 使用指南
+``` javascript
+import { Uploader } from 'vant';
+
+Vue.component(Uploader.name, Uploader);
+```
+
 ### 代码演示
 
 #### 基础用法

From 6324fa90887ee04f111d4e23a0247410916ca042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 21 Aug 2017 14:06:24 +0800
Subject: [PATCH 060/126] add progress bar when loading docs

---
 docs/src/index.js |  4 ----
 package.json      |  2 +-
 yarn.lock         | 11 ++++++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/src/index.js b/docs/src/index.js
index 4997a8d15..43f769edf 100644
--- a/docs/src/index.js
+++ b/docs/src/index.js
@@ -29,10 +29,6 @@ const router = new VueRouter({
 });
 
 router.beforeEach((route, redirect, next) => {
-  if (route.path !== '/') {
-    window.scrollTo(0, 0);
-  }
-
   const pathname = '/zanui/vue/examples';
   if (isMobile()) {
     window.location.replace(pathname);
diff --git a/package.json b/package.json
index 58e58f68f..1027ec832 100644
--- a/package.json
+++ b/package.json
@@ -116,6 +116,6 @@
     "webpack": "^3.5.5",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "0.1.13"
+    "zan-doc": "0.2.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index f26a86049..9ea1f3de1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5163,6 +5163,10 @@ npmlog@^4.0.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
+nprogress@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/nprogress/-/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1"
+
 nth-check@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
@@ -7922,12 +7926,13 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-zan-doc@0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.1.13.tgz#df532b538ba613a4fe39e436ec553de3e7c25918"
+zan-doc@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.2.0.tgz#40b31c4f1cc5ae539853a06b30f1cb479e2edca3"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"
     markdown-it "^8.3.1"
     markdown-it-container "^2.0.0"
     node-watch "^0.5.5"
+    nprogress "^0.2.0"

From 306a6417d1896b3b04473d094caed7ff804123c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 21 Aug 2017 21:53:52 +0800
Subject: [PATCH 061/126] fix: field textarea height calc wrong

---
 packages/field/src/field.vue | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/field/src/field.vue b/packages/field/src/field.vue
index 1a10aafbf..011fdae8a 100644
--- a/packages/field/src/field.vue
+++ b/packages/field/src/field.vue
@@ -95,6 +95,14 @@ export default {
     };
   },
 
+  mounted() {
+    if (this.autosize && this.type === 'textarea') {
+      const el = this.$refs.textareaElement;
+      el.style.height = el.scrollHeight + 'px';
+      el.style.overflowY = 'hidden';
+    }
+  },
+
   watch: {
     value(val) {
       this.currentValue = val;
@@ -102,7 +110,7 @@ export default {
 
     currentValue(val) {
       if (this.autosize && this.type === 'textarea') {
-        this.$nextTick(() => this.sizeAdjust());
+        this.$nextTick(this.sizeAdjust);
       }
       this.$emit('input', val);
     }
@@ -125,12 +133,9 @@ export default {
     },
 
     sizeAdjust() {
-      const textareaElement = this.$refs.textareaElement;
-      const textAreaDiff = (parseInt(textareaElement.style.paddingBottom, 10) +
-          parseInt(textareaElement.style.paddingTop, 10)) || 0;
-      // 需要先设为0， 才可以让scrollHeight正确计算。
-      textareaElement.style.height = 0 + 'px';
-      textareaElement.style.height = (textareaElement.scrollHeight - textAreaDiff) + 'px';
+      const el = this.$refs.textareaElement;
+      el.style.height = 'auto';
+      el.style.height = el.scrollHeight + 'px';
     },
 
     handleInputFocus() {

From 865f92f73583c7908a876fd1fa244ad08397a950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 21 Aug 2017 21:54:14 +0800
Subject: [PATCH 062/126] fix: popup will not preventScroll by default

---
 packages/mixins/popup/index.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js
index 95af13559..3cea8db79 100644
--- a/packages/mixins/popup/index.js
+++ b/packages/mixins/popup/index.js
@@ -4,16 +4,12 @@ import PopupContext from './popup-context';
 
 export default {
   props: {
-    /**
-     * popup当前显示状态
-     */
+    // popup当前显示状态
     value: {
       type: Boolean,
       default: false
     },
-    /**
-     * 是否显示遮罩层
-     */
+    // 是否显示遮罩层
     overlay: {
       type: Boolean,
       default: false
@@ -26,13 +22,16 @@ export default {
       default: false
     },
     zIndex: [String, Number],
-    /**
-     * popup滚动时是否body内容也滚动
-     * 默认为不滚动
-     */
+    // popup滚动时是否body内容也滚动
+    // 默认为不滚动
     lockOnScroll: {
       type: Boolean,
       default: true
+    },
+    // 防止滚动穿透
+    preventScroll: {
+      type: Boolean,
+      default: false
     }
   },
 
@@ -137,8 +136,11 @@ export default {
       this.$el.style.zIndex = PopupManager.nextZIndex();
       this.opened = true;
       this.opening = false;
-      document.addEventListener('touchstart', this.recordPosition, false);
-      document.addEventListener('touchmove', this.watchTouchMove, false);
+
+      if (this.preventScroll) {
+        document.addEventListener('touchstart', this.recordPosition, false);
+        document.addEventListener('touchmove', this.watchTouchMove, false);        
+      }
     },
 
     /**

From a94aa5bd771c01a8cb8ec6df5796fec139c6cc6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 21 Aug 2017 21:59:06 +0800
Subject: [PATCH 063/126] fix: Popup remove watcher

---
 packages/mixins/popup/index.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js
index 3cea8db79..44700d419 100644
--- a/packages/mixins/popup/index.js
+++ b/packages/mixins/popup/index.js
@@ -169,8 +169,11 @@ export default {
     doAfterClose() {
       this.closing = false;
       PopupManager.closeModal(this._popupId);
-      document.removeEventListener('touchstart', this.recordPosition, false);
-      document.removeEventListener('touchmove', this.watchTouchMove, false);
+
+      if (this.preventScroll) {
+        document.removeEventListener('touchstart', this.recordPosition, false);
+        document.removeEventListener('touchmove', this.watchTouchMove, false);
+      }
     }
   },
 

From 1551518a4e0a1a45a32ffdf04e9a379327d8ba88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 21 Aug 2017 22:23:59 +0800
Subject: [PATCH 064/126] [build] 0.8.5

---
 docs/examples-docs/changelog.md | 7 +++++++
 packages/index.js               | 2 +-
 packages/vant-css/package.json  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index 25d98d8dc..368905d3f 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -1,5 +1,12 @@
 ## 更新日志
 
+## [v0.8.4](https://github.com/youzan/vant/tree/v0.8.4) (2017-08-18)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.8.3...v0.8.4)
+
+**合并的 Pull Request (可能有不兼容改动):**
+
+- fix: field 计算autosize，需要nextTick [\#78](https://github.com/youzan/vant/pull/78) ([pangxie1991](https://github.com/pangxie1991))
+
 ## [v0.8.3](https://github.com/youzan/vant/tree/v0.8.3) (2017-08-18)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.8.1...v0.8.3)
 
diff --git a/packages/index.js b/packages/index.js
index b7ef72447..faf9b07f6 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -37,7 +37,7 @@ import Swipe from './swipe';
 import SwipeItem from './swipe-item';
 import DatetimePicker from './datetime-picker';
 
-const version = '0.8.4';
+const version = '0.8.5';
 const components = [
   Button,
   Switch,
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index 93029d11a..36e96b762 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

From bafe9142ead0731ed45846a55909d57b72ac79be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 21 Aug 2017 22:24:00 +0800
Subject: [PATCH 065/126] [release] 0.8.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1027ec832..43297595b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From d76db3d74aeb8db9d1c1e358d62a9f0885fdfe9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 22 Aug 2017 13:31:36 +0800
Subject: [PATCH 066/126] Layout: optimize doc && code review

---
 docs/examples-docs/layout.md     | 90 +++++++++++++-------------------
 docs/examples-docs/quickstart.md |  6 +--
 docs/src/doc.config.js           |  2 +-
 package.json                     |  2 +-
 packages/col/src/col.vue         | 45 ++++++++--------
 packages/row/src/row.vue         | 45 ++++++++--------
 yarn.lock                        | 10 ++--
 7 files changed, 92 insertions(+), 108 deletions(-)

diff --git a/docs/examples-docs/layout.md b/docs/examples-docs/layout.md
index 8df684302..93762dbeb 100644
--- a/docs/examples-docs/layout.md
+++ b/docs/examples-docs/layout.md
@@ -1,93 +1,75 @@
 <style>
 .demo-layout {
   .van-row {
-    padding: 0 20px;
+    padding: 0 15px;
   }
   .van-col {
-    margin-bottom: 10px;
-  }
-}
-
-.gray {
-    height: 30px;
-    line-height: 30px;
-    font-size: 12px;
-    background: #666;
     color: #fff;
-    text-align: center;
-}
-.white {
-    height: 30px;
-    line-height: 30px;
     font-size: 12px;
-    background: #fff;
-    color: #333;
+    line-height: 30px;
     text-align: center;
+    margin-bottom: 10px;
+    background-clip: content-box;
+
+    &:nth-child(odd) {
+      background-color: #39a9ed;
+    }
+
+    &:nth-child(even) {
+      background-color: #66c6f2;
+    }
+  }
 }
 </style>
 
 ## Layout 布局
 
-提供了`van-row`和`van-col`两个组件来进行行列布局。
+提供了`van-row`和`van-col`两个组件来进行行列布局
 
 ### 使用指南
 ``` javascript
-import { Layout } from 'vant';
+import { Row, Col } from 'vant';
 
-Vue.component(Layout.name, Layout);
+Vue.component(Row.name, Row);
+Vue.component(Col.name, Col);
 ```
 
 ### 代码演示
 
-#### 常规用法
+#### 基本用法
 
-Layout组件提供了`24列栅格`，通过在`van-col`上添加`span`属性设置列所占的宽度百分比`(span / 24)`；此外，添加`offset`属性可以设置列的偏移宽度，计算方式与span相同。
+Layout 组件提供了`24列栅格`，通过在`Col`上添加`span`属性设置列所占的宽度百分比    
+此外，添加`offset`属性可以设置列的偏移宽度，计算方式与 span 相同
 
-:::demo 常规用法
+:::demo 基本用法
 ```html
 <van-row>
-  <van-col span="8">
-    <div class="gray">span: 8</div>
-  </van-col>
-  <van-col span="8">
-    <div class="white">span: 8</div>
-  </van-col>
-  <van-col span="8">
-    <div class="gray">span: 8</div>
-  </van-col>
+  <van-col span="8">span: 8</van-col>
+  <van-col span="8">span: 8</van-col>
+  <van-col span="8">span: 8</van-col>
 </van-row>
+
 <van-row>
-  <van-col span="4">
-    <div class="gray">span: 4</div>
-  </van-col>
-  <van-col span="10" offset="4">
-    <div class="gray">offset: 4, span: 10</div>
-  </van-col>
+  <van-col span="4">span: 4</van-col>
+  <van-col span="10" offset="4">offset: 4, span: 10</van-col>
 </van-row>
+
 <van-row>
-  <van-col offset="12" span="12">
-    <div class="gray">offset: 12, span: 12</div>
-  </van-col>
+  <van-col offset="12" span="12">offset: 12, span: 12</van-col>
 </van-row>
 ```
 :::
 
-#### 在列元素之间增加间距
+#### 设置列元素间距
 
-列元素之间默认间距为0，如果希望在列元素增加相同的间距，可以在`van-row`上添加`gutter`属性来设置列元素之间的间距。
+通过`gutter`属性可以设置列元素之间的间距，默认间距为 0
 
 :::demo 在列元素之间增加间距
 ```html
 <van-row gutter="20">
-  <van-col span="8">
-    <div class="gray">span: 8</div>
-  </van-col>
-  <van-col span="8">
-    <div class="gray">span: 8</div>
-  </van-col>
-  <van-col span="8">
-    <div class="gray">span: 8</div>
-  </van-col>
+  <van-col span="8">span: 8</van-col>
+  <van-col span="8">span: 8</van-col>
+  <van-col span="8">span: 8</van-col>
 </van-row>
 ```
 :::
@@ -98,9 +80,11 @@ Layout组件提供了`24列栅格`，通过在`van-col`上添加`span`属性设
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
 | gutter | 列元素之间的间距（单位为px） | `String | Number`  | -  |   |
+| prefix | className 前缀 | `String`  | `van`  |   |
 
 #### Column
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
 | span | 列元素宽度 | `String | Number`  | -  |   |
-| offset | 列元素偏移宽度 | `String | Number`  | -  |   |
+| offset | 列元素偏移距离 | `String | Number`  | -  |   |
+| prefix | className 前缀 | `String`  | `van`  |   |
diff --git a/docs/examples-docs/quickstart.md b/docs/examples-docs/quickstart.md
index a8d2fd815..838dc92f6 100644
--- a/docs/examples-docs/quickstart.md
+++ b/docs/examples-docs/quickstart.md
@@ -1,6 +1,6 @@
 ## Vant
 
-一套基于`Vue.js 2.0`的 Mobile 组件库
+基于`Vue 2.0`的 Mobile 组件库
 
 ### 安装
 
@@ -47,11 +47,11 @@ Vue.use(vant);
 
 ### 自定义主题
 
-`Vant`默认提供一套主题，`CSS`命名采用`BEM`的风格方便使用者覆盖样式。如果你想完全替换主题色或者部分样式，可以使用下面的方法：
+`Vant`提供了一套默认主题，CSS 命名采用 BEM 的风格，方便使用者覆盖样式。如果你想完全替换主题色或者部分样式，可以使用下面的方法：
 
 #### 下载主题
 
-可以通过Github或npm来下载主题：
+可以通过 Github 或 npm 来下载主题：
 
 ```bash
 # npm
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 6a2a62c5d..110f0cadb 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -40,7 +40,7 @@ module.exports = {
         ]
       },
       {
-        "name": "Vant组件",
+        "name": "组件列表",
         "showInMobile": true,
         "groups": [
           {
diff --git a/package.json b/package.json
index 43297595b..4beb3342a 100644
--- a/package.json
+++ b/package.json
@@ -116,6 +116,6 @@
     "webpack": "^3.5.5",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "0.2.0"
+    "zan-doc": "^0.2.1"
   }
 }
diff --git a/packages/col/src/col.vue b/packages/col/src/col.vue
index 51fa4c7dc..281d0995e 100644
--- a/packages/col/src/col.vue
+++ b/packages/col/src/col.vue
@@ -13,27 +13,28 @@
 </template>
 
 <script>
-  export default {
-    name: 'van-col',
-    props: {
-      span: [Number, String],
-      offset: [Number, String],
-      prefix: {
-        type: String,
-        default: 'van'
-      }
-    },
-    computed: {
-      gutter() {
-        if (!this.$parent) return 0;
-        return Number(this.$parent.gutter) || 0;
-      },
-      style() {
-        const padding = `${this.gutter / 2}px`;
-        return this.gutter
-          ? { paddingLeft: padding, paddingRight: padding }
-          : null;
-      }
+export default {
+  name: 'van-col',
+
+  props: {
+    span: [Number, String],
+    offset: [Number, String],
+    prefix: {
+      type: String,
+      default: 'van'
     }
-  };
+  },
+
+  computed: {
+    gutter() {
+      return (this.$parent && Number(this.$parent.gutter)) || 0;
+    },
+    style() {
+      const padding = `${this.gutter / 2}px`;
+      return this.gutter
+        ? { paddingLeft: padding, paddingRight: padding }
+        : null;
+    }
+  }
+};
 </script>
diff --git a/packages/row/src/row.vue b/packages/row/src/row.vue
index 036b9fb1c..374cc793a 100644
--- a/packages/row/src/row.vue
+++ b/packages/row/src/row.vue
@@ -1,32 +1,31 @@
 <template>
-  <div
-    :class="`${prefix}-row`"
-    :style="style">
+  <div :class="`${prefix}-row`" :style="style">
     <slot></slot>
   </div>
 </template>
 
 <script>
-  export default {
-    name: 'van-row',
-    props: {
-      prefix: {
-        type: String,
-        default: 'van'
-      },
-      gutter: {
-        type: [Number, String],
-        default: 0
-      }
+export default {
+  name: 'van-row',
+
+  props: {
+    prefix: {
+      type: String,
+      default: 'van'
     },
-    computed: {
-      style() {
-        const gutter = Number(this.gutter);
-        const margin = `-${gutter / 2}px`;
-        return gutter
-          ? { marginLeft: margin, marginRight: margin }
-          : {};
-      }
+    gutter: {
+      type: [Number, String],
+      default: 0
     }
-  };
+  },
+
+  computed: {
+    style() {
+      const margin = `-${Number(this.gutter) / 2}px`;
+      return this.gutter
+        ? { marginLeft: margin, marginRight: margin }
+        : null;
+    }
+  }
+};
 </script>
diff --git a/yarn.lock b/yarn.lock
index 9ea1f3de1..f546eae28 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4809,7 +4809,7 @@ markdown-it@^6.0.5:
     mdurl "~1.0.1"
     uc.micro "^1.0.1"
 
-markdown-it@^8.3.1, markdown-it@^8.3.2:
+markdown-it@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.3.2.tgz#df4b86530d17c3bc9beec3b68d770b92ea17ae96"
   dependencies:
@@ -7926,13 +7926,13 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-zan-doc@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.2.0.tgz#40b31c4f1cc5ae539853a06b30f1cb479e2edca3"
+zan-doc@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.1.tgz#34723ea180d0ac2e183b66d2a3e4a04b4f6fe91b"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"
-    markdown-it "^8.3.1"
+    markdown-it "^8.3.2"
     markdown-it-container "^2.0.0"
     node-watch "^0.5.5"
     nprogress "^0.2.0"

From c4b0aebc75bf07086167e4bfb48ca021a0cc6a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 22 Aug 2017 13:33:37 +0800
Subject: [PATCH 067/126] Layout: adjust font size

---
 docs/examples-docs/layout.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples-docs/layout.md b/docs/examples-docs/layout.md
index 93762dbeb..67d32b869 100644
--- a/docs/examples-docs/layout.md
+++ b/docs/examples-docs/layout.md
@@ -5,7 +5,7 @@
   }
   .van-col {
     color: #fff;
-    font-size: 12px;
+    font-size: 13px;
     line-height: 30px;
     text-align: center;
     margin-bottom: 10px;

From 96a90097a500ce25957a198463c6f4d639c64616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 22 Aug 2017 13:41:42 +0800
Subject: [PATCH 068/126] Doc: fix scroll position

---
 docs/src/index.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/src/index.js b/docs/src/index.js
index 43f769edf..8b19eb7c9 100644
--- a/docs/src/index.js
+++ b/docs/src/index.js
@@ -6,11 +6,11 @@ import ZanDoc from 'zan-doc';
 import DemoBlock from './components/demo-block';
 import 'packages/vant-css/src/index.css';
 
-function isMobile() {
+const isMobile = (function() {
   var platform = navigator.userAgent.toLowerCase();
   return (/(android|bb\d+|meego).+mobile|kdtunion|weibo|m2oapp|micromessenger|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i).test(platform) ||
     (/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i).test(platform.substr(0, 4));
-}
+})();
 
 Vue.use(VueRouter);
 Vue.use(ZanDoc);
@@ -29,15 +29,20 @@ const router = new VueRouter({
 });
 
 router.beforeEach((route, redirect, next) => {
-  const pathname = '/zanui/vue/examples';
-  if (isMobile()) {
-    window.location.replace(pathname);
+  if (isMobile) {
+    window.location.replace('/zanui/vue/examples');
     return;
   }
   document.title = route.meta.title || document.title;
   next();
 });
 
+router.afterEach(() => {
+  if (!isMobile) {
+    window.scrollTo(0, 0);
+  }
+})
+
 new Vue({ // eslint-disable-line
   render: h => h(App),
   router

From 15569b0e510d75ef5139d76f0153e81cd43276ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 22 Aug 2017 14:15:43 +0800
Subject: [PATCH 069/126] fix: Col empty style

---
 packages/col/src/col.vue | 2 +-
 packages/row/src/row.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/col/src/col.vue b/packages/col/src/col.vue
index 281d0995e..4f1ed8cfe 100644
--- a/packages/col/src/col.vue
+++ b/packages/col/src/col.vue
@@ -33,7 +33,7 @@ export default {
       const padding = `${this.gutter / 2}px`;
       return this.gutter
         ? { paddingLeft: padding, paddingRight: padding }
-        : null;
+        : {};
     }
   }
 };
diff --git a/packages/row/src/row.vue b/packages/row/src/row.vue
index 374cc793a..0e4a6ae69 100644
--- a/packages/row/src/row.vue
+++ b/packages/row/src/row.vue
@@ -24,7 +24,7 @@ export default {
       const margin = `-${Number(this.gutter) / 2}px`;
       return this.gutter
         ? { marginLeft: margin, marginRight: margin }
-        : null;
+        : {};
     }
   }
 };

From 28cd16c7f0d4be05661685749a16da78f1730711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 22 Aug 2017 17:13:38 +0800
Subject: [PATCH 070/126] Button: reduce unnecessary styles

---
 docs/examples-docs/button.md         | 12 ++++----
 packages/vant-css/src/button.css     | 46 ++++------------------------
 packages/vant-css/src/common/var.css |  2 +-
 3 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/docs/examples-docs/button.md b/docs/examples-docs/button.md
index 7f110c895..992cc5ccc 100644
--- a/docs/examples-docs/button.md
+++ b/docs/examples-docs/button.md
@@ -48,10 +48,10 @@ Vue.component(Button.name, Button);
 
 :::demo 按钮尺寸
 ```html 
-<van-button size="large">large</van-button>
-<van-button size="normal">normal</van-button>
-<van-button size="small">small</van-button>
-<van-button size="mini">mini</van-button>
+<van-button size="large">Large</van-button>
+<van-button size="normal">Normal</van-button>
+<van-button size="small">Small</van-button>
+<van-button size="mini">Mini</van-button>
 ```
 :::
 
@@ -61,7 +61,7 @@ Vue.component(Button.name, Button);
 
 :::demo 禁用状态
 ```html
-<van-button disabled>diabled</van-button>
+<van-button disabled>Diabled</van-button>
 ```
 :::
 
@@ -80,7 +80,7 @@ Vue.component(Button.name, Button);
 :::demo 自定义按钮标签
 ```html 
 <van-button tag="a" href="https://www.youzan.com" target="_blank">
-  a标签按钮
+  a 标签按钮
 </van-button>
 ```
 :::
diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css
index 617c7de6d..0d05cdbf4 100644
--- a/packages/vant-css/src/button.css
+++ b/packages/vant-css/src/button.css
@@ -1,5 +1,4 @@
 @import './common/var.css';
-@import './loading.css';
 
 .van-button {
   position: relative;
@@ -11,9 +10,9 @@
   box-sizing: border-box;
   font-size: 16px;
   text-align: center;
-  appearance: none;
   outline: 0;
   overflow: hidden;
+  -webkit-appearance: none;
 
   &::after {
     content: " ";
@@ -22,8 +21,8 @@
     left: 0;
     right: 0;
     bottom: 0;
-    background-color: #000;
     opacity: 0;
+    background-color: #000;
     border-radius: inherit; /* inherit parent's border radius */
   }
 
@@ -33,9 +32,6 @@
 
   &__icon-loading {
     display: inline-block;
-    width: 16px;
-    height: 16px;
-    vertical-align: middle;
   }
 
   &--default {
@@ -44,8 +40,6 @@
     border: 1px solid $button-default-border-color;
 
     &:active {
-      border-color: #cacaca;
-      background-color: $c-gray-light;
       color: $c-gray-dark;
     }
   }
@@ -54,30 +48,18 @@
     color: $button-primary-color;
     background-color: $button-primary-background-color;
     border: 1px solid $button-primary-border-color;
-
-    &:active {
-      border-color: #00AA00;
-      background-color: #00AA00;
-      color: #66CC66;
-    }
   }
 
   &--danger {
     color: $button-danger-color;
     background-color: $button-danger-background-color;
     border: 1px solid $button-danger-border-color;
-
-    &:active {
-      border-color: #D43333;
-      background-color: #D43333;
-    }
   }
 
   &--large {
     width: 100%;
     height: 50px;
     line-height: 48px;
-    font-size: 16px;
   }
 
   &--normal {
@@ -92,9 +74,7 @@
     font-size: 12px;
   }
 
-  /*
-    mini图标默认宽度50px，文字不能超过4个
-  */
+  /* mini图标默认宽度50px，文字不能超过4个 */
   &--mini {
     display: inline-block;
     width: 50px;
@@ -114,14 +94,8 @@
   }
 
   &--block {
-    display: block;
     width: 100%;
-  }
-
-  &--loading {
-    .van-button__text {
-      display: none;
-    }
+    display: block;
   }
 
   &--bottom-action {
@@ -130,24 +104,16 @@
     line-height: 50px;
     border: 0;
     border-radius: 0;
-    background-color: $bottom-action-button-default-background-color;
     color: $bottom-action-button-default-color;
-    font-size: 16px;
+    background-color: $bottom-action-button-default-background-color;
 
     &:active {
-      border-color: #DD6F44;
-      background-color: #DD6F44;
       color: #fff;
     }
 
     &.van-button--primary {
-      background-color: $bottom-action-button-primary-background-color;
       color: $bottom-action-button-primary-color;
-
-      &:active {
-        border-color: #D43333;
-        background-color: #D43333;
-      }
+      background-color: $bottom-action-button-primary-background-color;
     }
   }
 }
diff --git a/packages/vant-css/src/common/var.css b/packages/vant-css/src/common/var.css
index 4e89219f5..2edb3809e 100644
--- a/packages/vant-css/src/common/var.css
+++ b/packages/vant-css/src/common/var.css
@@ -23,7 +23,7 @@ $button-primary-border-color: #0a0;
 
 $button-default-color: $c-black;
 $button-default-background-color: $c-white;
-$button-default-border-color: #bbb;
+$button-default-border-color: #ccc;
 
 $button-danger-color: $c-white;
 $button-danger-background-color: #f44;

From 3c2e8f4868675a48b427e7d6f1cc31896cc6c6f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 22 Aug 2017 17:14:57 +0800
Subject: [PATCH 071/126] Icon: code review

---
 docs/examples-docs/icon.md |  4 +---
 packages/icon/src/icon.vue | 24 +++++++++---------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/docs/examples-docs/icon.md b/docs/examples-docs/icon.md
index 2dfdb991c..a2278a668 100644
--- a/docs/examples-docs/icon.md
+++ b/docs/examples-docs/icon.md
@@ -65,9 +65,7 @@ Vue.component(Icon.name, Icon);
 ```
 :::
 
-#### 所有Icons
-
-以下为目前所有的图标：
+#### 图标列表
 
 :::demo 所有Icon
 ```html
diff --git a/packages/icon/src/icon.vue b/packages/icon/src/icon.vue
index b7d1e4642..8560237b0 100644
--- a/packages/icon/src/icon.vue
+++ b/packages/icon/src/icon.vue
@@ -1,22 +1,16 @@
 <template>
-  <i class="van-icon" :class="'van-icon-' + name" @click="handleIconClick"></i>
+  <i :class="['van-icon', 'van-icon-' + name]" @click="$emit('click', $event)" />
 </template>
 
 <script>
-  export default {
-    name: 'van-icon',
+export default {
+  name: 'van-icon',
 
-    props: {
-      name: {
-        type: String,
-        required: true
-      }
-    },
-
-    methods: {
-      handleIconClick(event) {
-        this.$emit('click', event);
-      }
+  props: {
+    name: {
+      type: String,
+      required: true
     }
-  };
+  }
+};
 </script>

From c494292e3f042ea10bad161081663bb07b67c1db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 22 Aug 2017 17:52:16 +0800
Subject: [PATCH 072/126] directory adjust: delete entry index.js

---
 packages/actionsheet/index.js                 |   3 -
 .../{src/actionsheet.vue => index.vue}        |   6 +-
 packages/badge-group/index.js                 |   3 -
 .../badge-group.vue => badge-group/index.vue} |   0
 packages/badge/index.js                       |   3 -
 packages/badge/{src/badge.vue => index.vue}   |   0
 packages/button/index.js                      |  77 +++++++++-
 packages/button/src/button.js                 |  76 ----------
 packages/card/index.js                        |   3 -
 packages/card/{src/card.vue => index.vue}     |   0
 packages/cell-group/index.js                  |   3 -
 .../cell-group.vue => cell-group/index.vue}   |   0
 packages/cell-swipe/index.js                  |   3 -
 packages/cell-swipe/index.vue                 | 129 +++++++++++++++++
 packages/cell-swipe/src/cell-swipe.vue        | 137 ------------------
 packages/cell/index.js                        |   3 -
 packages/cell/{src/cell.vue => index.vue}     |   8 +-
 packages/checkbox-group/index.js              |   3 -
 .../index.vue}                                |   0
 packages/checkbox/index.js                    |   3 -
 .../checkbox/{src/checkbox.vue => index.vue}  |   2 +-
 packages/col/index.js                         |   3 -
 packages/col/{src/col.vue => index.vue}       |   0
 packages/datetime-picker/index.js             |   3 -
 .../{src/datetime-picker.vue => index.vue}    |   2 +-
 packages/dialog/{src => }/dialog.vue          |   4 +-
 packages/dialog/index.js                      |  98 ++++++++++++-
 packages/dialog/src/dialog.js                 |  97 -------------
 packages/field/index.js                       |   3 -
 packages/field/{src/field.vue => index.vue}   |   4 +-
 packages/icon/index.js                        |   3 -
 packages/icon/{src/icon.vue => index.vue}     |   0
 .../image-preview/{src => }/image-preview.vue |   6 +-
 packages/image-preview/index.js               |  36 ++++-
 packages/image-preview/src/image-preview.js   |  35 -----
 packages/loading/index.js                     |   3 -
 .../loading/{src/loading.vue => index.vue}    |   0
 packages/panel/index.js                       |   3 -
 packages/panel/{src/panel.vue => index.vue}   |   0
 packages/picker/{src => }/draggable.js        |   0
 packages/picker/index.js                      |   3 -
 packages/picker/{src/picker.vue => index.vue} |   0
 packages/picker/{src => }/picker-column.vue   |   2 +-
 packages/popup/index.js                       |   3 -
 packages/popup/{src/popup.vue => index.vue}   |   2 +-
 packages/progress/index.js                    |   3 -
 .../progress/{src/progress.vue => index.vue}  |   0
 packages/quantity/index.js                    |   3 -
 .../quantity/{src/quantity.vue => index.vue}  |   0
 packages/radio-group/index.js                 |   3 -
 .../radio-group.vue => radio-group/index.vue} |   0
 packages/radio/index.js                       |   3 -
 packages/radio/{src/radio.vue => index.vue}   |   2 +-
 packages/row/index.js                         |   3 -
 packages/row/{src/row.vue => index.vue}       |   0
 packages/search/index.js                      |   3 -
 packages/search/index.vue                     | 105 ++++++++++++++
 packages/search/src/search.vue                | 105 --------------
 packages/step/index.js                        |   3 -
 .../{steps/src/step.vue => step/index.vue}    |   0
 packages/steps/index.js                       |   3 -
 packages/steps/{src/steps.vue => index.vue}   |   2 +-
 packages/swipe-item/index.js                  |   3 -
 .../swipe-item.vue => swipe-item/index.vue}   |   0
 packages/swipe/index.js                       |   3 -
 packages/swipe/{src/swipe.vue => index.vue}   |   0
 packages/swipe/{src => }/input.js             |   0
 packages/swipe/{src => }/scroll.js            |   0
 packages/swipe/{src => }/spring_dummy.js      |   0
 packages/swipe/{src => }/utils.js             |   0
 packages/switch/index.js                      |   3 -
 packages/switch/{src/switch.vue => index.vue} |   2 +-
 packages/tab/index.js                         |   2 -
 packages/tab/index.vue                        |  36 +++++
 packages/tab/src/tab.vue                      |  36 -----
 packages/tabs/index.js                        |   3 -
 packages/{tab/src/tabs.vue => tabs/index.vue} |   2 +-
 packages/{tab/src => tabs}/swipe.js           |   0
 packages/tag/index.js                         |   3 -
 packages/tag/{src/main.vue => index.vue}      |   0
 packages/toast/index.js                       |  78 +++++++++-
 packages/toast/src/toast.js                   |  79 ----------
 packages/toast/{src => }/toast.vue            |   4 +-
 packages/uploader/index.js                    |   3 -
 packages/uploader/{src/main.vue => index.vue} |   4 +-
 packages/waterfall/{src => }/directive.js     |   2 +-
 packages/waterfall/index.js                   |  13 +-
 packages/waterfall/src/main.js                |  14 --
 88 files changed, 587 insertions(+), 713 deletions(-)
 delete mode 100644 packages/actionsheet/index.js
 rename packages/actionsheet/{src/actionsheet.vue => index.vue} (94%)
 delete mode 100644 packages/badge-group/index.js
 rename packages/{badge/src/badge-group.vue => badge-group/index.vue} (100%)
 delete mode 100644 packages/badge/index.js
 rename packages/badge/{src/badge.vue => index.vue} (100%)
 delete mode 100644 packages/button/src/button.js
 delete mode 100644 packages/card/index.js
 rename packages/card/{src/card.vue => index.vue} (100%)
 delete mode 100644 packages/cell-group/index.js
 rename packages/{cell/src/cell-group.vue => cell-group/index.vue} (100%)
 delete mode 100644 packages/cell-swipe/index.js
 create mode 100644 packages/cell-swipe/index.vue
 delete mode 100644 packages/cell-swipe/src/cell-swipe.vue
 delete mode 100644 packages/cell/index.js
 rename packages/cell/{src/cell.vue => index.vue} (91%)
 delete mode 100644 packages/checkbox-group/index.js
 rename packages/{checkbox/src/checkbox-group.vue => checkbox-group/index.vue} (100%)
 delete mode 100644 packages/checkbox/index.js
 rename packages/checkbox/{src/checkbox.vue => index.vue} (98%)
 delete mode 100644 packages/col/index.js
 rename packages/col/{src/col.vue => index.vue} (100%)
 delete mode 100644 packages/datetime-picker/index.js
 rename packages/datetime-picker/{src/datetime-picker.vue => index.vue} (99%)
 rename packages/dialog/{src => }/dialog.vue (95%)
 delete mode 100644 packages/dialog/src/dialog.js
 delete mode 100644 packages/field/index.js
 rename packages/field/{src/field.vue => index.vue} (97%)
 delete mode 100644 packages/icon/index.js
 rename packages/icon/{src/icon.vue => index.vue} (100%)
 rename packages/image-preview/{src => }/image-preview.vue (95%)
 delete mode 100644 packages/image-preview/src/image-preview.js
 delete mode 100644 packages/loading/index.js
 rename packages/loading/{src/loading.vue => index.vue} (100%)
 delete mode 100644 packages/panel/index.js
 rename packages/panel/{src/panel.vue => index.vue} (100%)
 rename packages/picker/{src => }/draggable.js (100%)
 delete mode 100644 packages/picker/index.js
 rename packages/picker/{src/picker.vue => index.vue} (100%)
 rename packages/picker/{src => }/picker-column.vue (99%)
 delete mode 100644 packages/popup/index.js
 rename packages/popup/{src/popup.vue => index.vue} (96%)
 delete mode 100644 packages/progress/index.js
 rename packages/progress/{src/progress.vue => index.vue} (100%)
 delete mode 100644 packages/quantity/index.js
 rename packages/quantity/{src/quantity.vue => index.vue} (100%)
 delete mode 100644 packages/radio-group/index.js
 rename packages/{radio/src/radio-group.vue => radio-group/index.vue} (100%)
 delete mode 100644 packages/radio/index.js
 rename packages/radio/{src/radio.vue => index.vue} (96%)
 delete mode 100644 packages/row/index.js
 rename packages/row/{src/row.vue => index.vue} (100%)
 delete mode 100644 packages/search/index.js
 create mode 100644 packages/search/index.vue
 delete mode 100644 packages/search/src/search.vue
 delete mode 100644 packages/step/index.js
 rename packages/{steps/src/step.vue => step/index.vue} (100%)
 delete mode 100644 packages/steps/index.js
 rename packages/steps/{src/steps.vue => index.vue} (97%)
 delete mode 100644 packages/swipe-item/index.js
 rename packages/{swipe/src/swipe-item.vue => swipe-item/index.vue} (100%)
 delete mode 100644 packages/swipe/index.js
 rename packages/swipe/{src/swipe.vue => index.vue} (100%)
 rename packages/swipe/{src => }/input.js (100%)
 rename packages/swipe/{src => }/scroll.js (100%)
 rename packages/swipe/{src => }/spring_dummy.js (100%)
 rename packages/swipe/{src => }/utils.js (100%)
 delete mode 100644 packages/switch/index.js
 rename packages/switch/{src/switch.vue => index.vue} (97%)
 delete mode 100644 packages/tab/index.js
 create mode 100644 packages/tab/index.vue
 delete mode 100644 packages/tab/src/tab.vue
 delete mode 100644 packages/tabs/index.js
 rename packages/{tab/src/tabs.vue => tabs/index.vue} (99%)
 rename packages/{tab/src => tabs}/swipe.js (100%)
 delete mode 100644 packages/tag/index.js
 rename packages/tag/{src/main.vue => index.vue} (100%)
 delete mode 100644 packages/toast/src/toast.js
 rename packages/toast/{src => }/toast.vue (96%)
 delete mode 100644 packages/uploader/index.js
 rename packages/uploader/{src/main.vue => index.vue} (98%)
 rename packages/waterfall/{src => }/directive.js (98%)
 delete mode 100644 packages/waterfall/src/main.js

diff --git a/packages/actionsheet/index.js b/packages/actionsheet/index.js
deleted file mode 100644
index 40c4a8d78..000000000
--- a/packages/actionsheet/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import ActionSheet from './src/actionsheet';
-
-export default ActionSheet;
diff --git a/packages/actionsheet/src/actionsheet.vue b/packages/actionsheet/index.vue
similarity index 94%
rename from packages/actionsheet/src/actionsheet.vue
rename to packages/actionsheet/index.vue
index 852c821f8..175d00245 100644
--- a/packages/actionsheet/src/actionsheet.vue
+++ b/packages/actionsheet/index.vue
@@ -27,9 +27,9 @@
 </template>
 
 <script>
-import Popup from '../../mixins/popup';
-import VanIcon from '../../icon';
-import VanLoading from '../../loading';
+import Popup from '../mixins/popup';
+import VanIcon from '../icon';
+import VanLoading from '../loading';
 
 export default {
   name: 'van-actionsheet',
diff --git a/packages/badge-group/index.js b/packages/badge-group/index.js
deleted file mode 100644
index 2bff2f50d..000000000
--- a/packages/badge-group/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import BadgeGroup from '../badge/src/badge-group';
-
-export default BadgeGroup;
diff --git a/packages/badge/src/badge-group.vue b/packages/badge-group/index.vue
similarity index 100%
rename from packages/badge/src/badge-group.vue
rename to packages/badge-group/index.vue
diff --git a/packages/badge/index.js b/packages/badge/index.js
deleted file mode 100644
index dc8381205..000000000
--- a/packages/badge/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Badge from './src/badge';
-
-export default Badge;
diff --git a/packages/badge/src/badge.vue b/packages/badge/index.vue
similarity index 100%
rename from packages/badge/src/badge.vue
rename to packages/badge/index.vue
diff --git a/packages/button/index.js b/packages/button/index.js
index 5e17857e6..1961b6e9f 100644
--- a/packages/button/index.js
+++ b/packages/button/index.js
@@ -1,3 +1,76 @@
-import Button from './src/button';
+import Loading from '../loading';
 
-export default Button;
+const ALLOWED_SIZE = ['mini', 'small', 'normal', 'large'];
+const ALLOWED_TYPE = ['default', 'danger', 'primary'];
+
+export default {
+  name: 'van-button',
+
+  components: {
+    [Loading.name]: Loading
+  },
+
+  props: {
+    block: Boolean,
+    loading: Boolean,
+    disabled: Boolean,
+    nativeType: String,
+    bottomAction: Boolean,
+    tag: {
+      type: String,
+      default: 'button'
+    },
+    type: {
+      type: String,
+      default: 'default',
+      validator: value => ALLOWED_TYPE.indexOf(value) > -1
+    },
+    size: {
+      type: String,
+      default: 'normal',
+      validator: value => ALLOWED_SIZE.indexOf(value) > -1
+    }
+  },
+
+  methods: {
+    onClick(event) {
+      if (!this.loading && !this.disabled) {
+        this.$emit('click', event);
+      }
+    }
+  },
+
+  render(h) {
+    const { type, loading, disabled, tag: Tag } = this;
+
+    return (
+      <Tag
+        type={this.nativeType}
+        disabled={disabled}
+        class={[
+          'van-button',
+          'van-button--' + type,
+          'van-button--' + this.size,
+          {
+            'van-button--disabled': disabled,
+            'van-button--loading': loading,
+            'van-button--block': this.block,
+            'van-button--bottom-action': this.bottomAction
+          }
+        ]}
+        onClick={this.onClick}
+      >
+        {loading
+          ? <van-loading
+              class="van-button__icon-loading"
+              type="circle"
+              color={type === 'default' ? 'black' : 'white'}
+            />
+          : null}
+        <span class="van-button__text">
+          {this.$slots.default}
+        </span>
+      </Tag>
+    );
+  }
+};
diff --git a/packages/button/src/button.js b/packages/button/src/button.js
deleted file mode 100644
index a7bbe476e..000000000
--- a/packages/button/src/button.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import Loading from '../../loading';
-
-const ALLOWED_SIZE = ['mini', 'small', 'normal', 'large'];
-const ALLOWED_TYPE = ['default', 'danger', 'primary'];
-
-export default {
-  name: 'van-button',
-
-  components: {
-    [Loading.name]: Loading
-  },
-
-  props: {
-    block: Boolean,
-    loading: Boolean,
-    disabled: Boolean,
-    nativeType: String,
-    bottomAction: Boolean,
-    tag: {
-      type: String,
-      default: 'button'
-    },
-    type: {
-      type: String,
-      default: 'default',
-      validator: value => ALLOWED_TYPE.indexOf(value) > -1
-    },
-    size: {
-      type: String,
-      default: 'normal',
-      validator: value => ALLOWED_SIZE.indexOf(value) > -1
-    }
-  },
-
-  methods: {
-    onClick(event) {
-      if (!this.loading && !this.disabled) {
-        this.$emit('click', event);
-      }
-    }
-  },
-
-  render(h) {
-    const { type, loading, disabled, tag: Tag } = this;
-
-    return (
-      <Tag
-        type={this.nativeType}
-        disabled={disabled}
-        class={[
-          'van-button',
-          'van-button--' + type,
-          'van-button--' + this.size,
-          {
-            'van-button--disabled': disabled,
-            'van-button--loading': loading,
-            'van-button--block': this.block,
-            'van-button--bottom-action': this.bottomAction
-          }
-        ]}
-        onClick={this.onClick}
-      >
-        {loading
-          ? <van-loading
-              class="van-button__icon-loading"
-              type="circle"
-              color={type === 'default' ? 'black' : 'white'}
-            />
-          : null}
-        <span class="van-button__text">
-          {this.$slots.default}
-        </span>
-      </Tag>
-    );
-  }
-};
diff --git a/packages/card/index.js b/packages/card/index.js
deleted file mode 100644
index 84dfc6611..000000000
--- a/packages/card/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Card from './src/card';
-
-export default Card;
diff --git a/packages/card/src/card.vue b/packages/card/index.vue
similarity index 100%
rename from packages/card/src/card.vue
rename to packages/card/index.vue
diff --git a/packages/cell-group/index.js b/packages/cell-group/index.js
deleted file mode 100644
index ccbfd514e..000000000
--- a/packages/cell-group/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import CellGroup from '../cell/src/cell-group';
-
-export default CellGroup;
diff --git a/packages/cell/src/cell-group.vue b/packages/cell-group/index.vue
similarity index 100%
rename from packages/cell/src/cell-group.vue
rename to packages/cell-group/index.vue
diff --git a/packages/cell-swipe/index.js b/packages/cell-swipe/index.js
deleted file mode 100644
index 075cbb40d..000000000
--- a/packages/cell-swipe/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import CellSwipe from './src/cell-swipe';
-
-export default CellSwipe;
diff --git a/packages/cell-swipe/index.vue b/packages/cell-swipe/index.vue
new file mode 100644
index 000000000..fd99f533d
--- /dev/null
+++ b/packages/cell-swipe/index.vue
@@ -0,0 +1,129 @@
+<template>
+  <div v-clickoutside:touchstart="swipeMove" @click="swipeMove()" @touchstart="startDrag" @touchmove="onDrag" @touchend="endDrag" class="van-cell-swipe" ref="cell">
+    <div class="van-cell-wrapper">
+      <slot>单元格内容</slot>
+    </div>
+    <div class="van-cell-left">
+      <div ref="left">
+        <slot name="left"></slot>
+      </div>
+    </div>
+    <div class="van-cell-right">
+      <div ref="right">
+        <slot name="right"></slot>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { once } from '../utils/dom';
+import Clickoutside from '../utils/clickoutside';
+
+export default {
+  name: 'van-cell-swipe',
+  props: {
+    'leftWidth': { type: Number, default: 0 },
+    'rightWidth': { type: Number, default: 0 }
+  },
+  directives: { Clickoutside },
+  data() {
+    return {
+      start: { x: 0, y: 0 }
+    };
+  },
+  computed: {
+    leftDefaultTransform() {
+      return this.translate3d(-this.leftWidth - 1);
+    },
+    rightDefaultTransform() {
+      return this.translate3d(this.rightWidth);
+    }
+  },
+  mounted() {
+    this.wrap = this.$refs.cell.querySelector('.van-cell-wrapper');
+    this.leftElm = this.$refs.left;
+    this.leftWrapElm = this.leftElm.parentNode;
+    this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
+
+    this.rightElm = this.$refs.right;
+    this.rightWrapElm = this.rightElm.parentNode;
+    this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
+  },
+  methods: {
+    resetSwipeStatus() {
+      this.swiping = false; // 是否正在拖动
+      this.opened = true; // 记录是否滑动左右 或者 注册
+      this.offsetLeft = 0; // 记录单次拖动的拖动距离
+    },
+    translate3d(offset) {
+      return `translate3d(${offset}px, 0, 0)`;
+    },
+    swipeMove(offset = 0) {
+      this.wrap.style.webkitTransform = this.translate3d(offset);
+      this.rightWrapElm.style.webkitTransform = this.translate3d(this.rightWidth + offset);
+      this.leftWrapElm.style.webkitTransform = this.translate3d(-this.leftWidth + offset);
+      offset && (this.swiping = true);
+    },
+    swipeLeaveTransition(direction) {
+      setTimeout(() => {
+        this.swipeLeave = true;
+        // left
+        if (direction > 0 && -this.offsetLeft > this.rightWidth * 0.4 && this.rightWidth > 0) {
+          this.swipeMove(-this.rightWidth);
+          this.resetSwipeStatus();
+          return;
+          // right
+        } else if (direction < 0 && this.offsetLeft > this.leftWidth * 0.4 && this.leftWidth > 0) {
+          this.swipeMove(this.leftWidth);
+          this.resetSwipeStatus();
+          return;
+        } else {
+          this.swipeMove(0);
+          once(this.wrap, 'webkitTransitionEnd', _ => {
+            this.wrap.style.webkitTransform = '';
+            this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
+            this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
+            this.swipeLeave = false;
+            this.swiping = false;
+          });
+        }
+      }, 0);
+    },
+    startDrag(evt) {
+      evt = evt.changedTouches ? evt.changedTouches[0] : evt;
+      this.dragging = true;
+      this.start.x = evt.pageX;
+      this.start.y = evt.pageY;
+    },
+    onDrag(evt) {
+      if (this.opened) {
+        !this.swiping && this.swipeMove(0);
+        this.opened = false;
+        return;
+      }
+      if (!this.dragging) return;
+      let swiping;
+      const e = evt.changedTouches ? evt.changedTouches[0] : evt;
+      const offsetTop = e.pageY - this.start.y;
+      const offsetLeft = this.offsetLeft = e.pageX - this.start.x;
+      if ((offsetLeft < 0 && -offsetLeft > this.rightWidth) ||
+        (offsetLeft > 0 && offsetLeft > this.leftWidth) ||
+        (offsetLeft > 0 && !this.leftWidth) ||
+        (offsetLeft < 0 && !this.rightWidth)) {
+        return;
+      }
+      const y = Math.abs(offsetTop);
+      const x = Math.abs(offsetLeft);
+      swiping = !(x < 5 || (x >= 5 && y >= x * 1.73));
+      if (!swiping) return;
+      evt.preventDefault();
+      this.swipeMove(offsetLeft);
+    },
+    endDrag() {
+      if (!this.swiping) return;
+      this.swipeLeaveTransition(this.offsetLeft > 0 ? -1 : 1);
+    }
+  }
+};
+</script>
diff --git a/packages/cell-swipe/src/cell-swipe.vue b/packages/cell-swipe/src/cell-swipe.vue
deleted file mode 100644
index 00acbfe11..000000000
--- a/packages/cell-swipe/src/cell-swipe.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div
-    v-clickoutside:touchstart="swipeMove"
-    @click="swipeMove()"
-    @touchstart="startDrag"
-    @touchmove="onDrag"
-    @touchend="endDrag"
-    class="van-cell-swipe"
-    ref="cell">
-    <div class="van-cell-wrapper">
-      <slot>单元格内容</slot>
-    </div>
-    <div class="van-cell-left">
-      <div ref="left">
-        <slot name="left"></slot>
-      </div>
-    </div>
-    <div class="van-cell-right">
-      <div ref="right">
-        <slot name="right"></slot>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {once} from '../../utils/dom';
-  import Clickoutside from '../../utils/clickoutside';
-  
-  export default {
-    name: 'van-cell-swipe',
-    props: {
-      'leftWidth': {type: Number, default: 0},
-      'rightWidth': {type: Number, default: 0}
-    },
-    directives: {Clickoutside},
-    data() {
-      return {
-        start: {x: 0, y: 0}
-      };
-    },
-    computed: {
-      leftDefaultTransform(){
-        return this.translate3d(-this.leftWidth - 1);
-      },
-      rightDefaultTransform(){
-        return this.translate3d(this.rightWidth);
-      }
-    },
-    mounted() {
-      this.wrap = this.$refs.cell.querySelector('.van-cell-wrapper');
-      this.leftElm = this.$refs.left;
-      this.leftWrapElm = this.leftElm.parentNode;
-      this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
-
-      this.rightElm = this.$refs.right;
-      this.rightWrapElm = this.rightElm.parentNode;
-      this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
-    },
-    methods: {
-      resetSwipeStatus() {
-        this.swiping = false; // 是否正在拖动
-        this.opened = true; // 记录是否滑动左右 或者 注册
-        this.offsetLeft = 0; // 记录单次拖动的拖动距离
-      },
-      translate3d(offset) {
-        return `translate3d(${offset}px, 0, 0)`;
-      },
-      swipeMove(offset = 0) {
-        this.wrap.style.webkitTransform = this.translate3d(offset);
-        this.rightWrapElm.style.webkitTransform = this.translate3d(this.rightWidth + offset);
-        this.leftWrapElm.style.webkitTransform = this.translate3d(-this.leftWidth + offset);
-        offset && (this.swiping = true);
-      },
-      swipeLeaveTransition(direction) {
-        setTimeout(() => {
-          this.swipeLeave = true;
-          // left
-          if (direction > 0 && -this.offsetLeft > this.rightWidth * 0.4 && this.rightWidth > 0) {
-            this.swipeMove(-this.rightWidth);
-            this.resetSwipeStatus();
-            return;
-            // right
-          } else if (direction < 0 && this.offsetLeft > this.leftWidth * 0.4 && this.leftWidth > 0) {
-            this.swipeMove(this.leftWidth);
-            this.resetSwipeStatus();
-            return;
-          } else {
-            this.swipeMove(0);
-            once(this.wrap, 'webkitTransitionEnd', _ => {
-              this.wrap.style.webkitTransform = '';
-              this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
-              this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
-              this.swipeLeave = false;
-              this.swiping = false;
-            });
-          }
-        }, 0);
-      },
-      startDrag(evt) {
-        evt = evt.changedTouches ? evt.changedTouches[0] : evt;
-        this.dragging = true;
-        this.start.x = evt.pageX;
-        this.start.y = evt.pageY;
-      },
-      onDrag(evt) {
-        if (this.opened) {
-          !this.swiping && this.swipeMove(0);
-          this.opened = false;
-          return;
-        }
-        if (!this.dragging) return;
-        let swiping;
-        const e = evt.changedTouches ? evt.changedTouches[0] : evt;
-        const offsetTop = e.pageY - this.start.y;
-        const offsetLeft = this.offsetLeft = e.pageX - this.start.x;
-        if ((offsetLeft < 0 && -offsetLeft > this.rightWidth) ||
-          (offsetLeft > 0 && offsetLeft > this.leftWidth) ||
-          (offsetLeft > 0 && !this.leftWidth) ||
-          (offsetLeft < 0 && !this.rightWidth)) {
-          return;
-        }
-        const y = Math.abs(offsetTop);
-        const x = Math.abs(offsetLeft);
-        swiping = !(x < 5 || (x >= 5 && y >= x * 1.73));
-        if (!swiping) return;
-        evt.preventDefault();
-        this.swipeMove(offsetLeft);
-      },
-      endDrag() {
-        if (!this.swiping) return;
-        this.swipeLeaveTransition(this.offsetLeft > 0 ? -1 : 1);
-      }
-    }
-  };
-</script>
-
diff --git a/packages/cell/index.js b/packages/cell/index.js
deleted file mode 100644
index aa54ff040..000000000
--- a/packages/cell/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Cell from './src/cell';
-
-export default Cell;
diff --git a/packages/cell/src/cell.vue b/packages/cell/index.vue
similarity index 91%
rename from packages/cell/src/cell.vue
rename to packages/cell/index.vue
index afd997c80..f356c8aa9 100644
--- a/packages/cell/src/cell.vue
+++ b/packages/cell/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <a :class="['van-cell', { 'van-cell--required': required }]" :href="url" @click="handleClick">
+  <a :class="['van-cell', { 'van-cell--required': required }]" :href="url" @click="$emit('click')">
     <div
       class="van-cell__title"
       v-if="this.$slots.title || title"
@@ -42,12 +42,6 @@ export default {
     label: String,
     isLink: Boolean,
     required: Boolean
-  },
-
-  methods: {
-    handleClick() {
-      this.$emit('click');
-    }
   }
 };
 </script>
diff --git a/packages/checkbox-group/index.js b/packages/checkbox-group/index.js
deleted file mode 100644
index 5688b4ee1..000000000
--- a/packages/checkbox-group/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import CheckboxGroup from '../checkbox/src/checkbox-group';
-
-export default CheckboxGroup;
diff --git a/packages/checkbox/src/checkbox-group.vue b/packages/checkbox-group/index.vue
similarity index 100%
rename from packages/checkbox/src/checkbox-group.vue
rename to packages/checkbox-group/index.vue
diff --git a/packages/checkbox/index.js b/packages/checkbox/index.js
deleted file mode 100644
index d4bcea5a2..000000000
--- a/packages/checkbox/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Checkbox from './src/checkbox';
-
-export default Checkbox;
diff --git a/packages/checkbox/src/checkbox.vue b/packages/checkbox/index.vue
similarity index 98%
rename from packages/checkbox/src/checkbox.vue
rename to packages/checkbox/index.vue
index c2d46e349..1b31f0e1e 100644
--- a/packages/checkbox/src/checkbox.vue
+++ b/packages/checkbox/index.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import findParent from '../../mixins/findParent';
+import findParent from '../mixins/findParent';
 
 export default {
   name: 'van-checkbox',
diff --git a/packages/col/index.js b/packages/col/index.js
deleted file mode 100644
index b8728de40..000000000
--- a/packages/col/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Col from './src/col';
-
-export default Col;
diff --git a/packages/col/src/col.vue b/packages/col/index.vue
similarity index 100%
rename from packages/col/src/col.vue
rename to packages/col/index.vue
diff --git a/packages/datetime-picker/index.js b/packages/datetime-picker/index.js
deleted file mode 100644
index ca80ede95..000000000
--- a/packages/datetime-picker/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import DatetimePicker from './src/datetime-picker';
-
-export default DatetimePicker;
diff --git a/packages/datetime-picker/src/datetime-picker.vue b/packages/datetime-picker/index.vue
similarity index 99%
rename from packages/datetime-picker/src/datetime-picker.vue
rename to packages/datetime-picker/index.vue
index 4b2429e5d..34edb6c8d 100644
--- a/packages/datetime-picker/src/datetime-picker.vue
+++ b/packages/datetime-picker/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import Picker from '../../picker';
+import Picker from '../picker';
 
 const allowedType = ['time', 'date', 'datetime'];
 
diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/dialog.vue
similarity index 95%
rename from packages/dialog/src/dialog.vue
rename to packages/dialog/dialog.vue
index 35e21af78..aabc82ed8 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/dialog.vue
@@ -14,8 +14,8 @@
 </template>
 
 <script>
-import Button from '../../button';
-import Popup from '../../mixins/popup';
+import Button from '../button';
+import Popup from '../mixins/popup';
 
 export default {
   name: 'van-dialog',
diff --git a/packages/dialog/index.js b/packages/dialog/index.js
index cb8dcd8d5..c5287b19c 100644
--- a/packages/dialog/index.js
+++ b/packages/dialog/index.js
@@ -1,3 +1,97 @@
-import Dialog from './src/dialog.js';
+import Vue from 'vue';
+import Dialog from './dialog';
 
-export default Dialog;
+const DialogConstructor = Vue.extend(Dialog);
+
+let currentDialog;
+let instance;
+let dialogQueue = [];
+
+const defaultCallback = action => {
+  /* istanbul ignore else */
+  if (currentDialog) {
+    if (currentDialog.resolve && action === 'confirm') {
+      currentDialog.resolve(action);
+    } else if (currentDialog.reject && action === 'cancel') {
+      currentDialog.reject(action);
+    }
+  }
+};
+
+const initInstance = () => {
+  instance = new DialogConstructor({
+    el: document.createElement('div')
+  });
+
+  instance.$on('input', value => {
+    instance.value = value;
+  })
+  instance.callback = defaultCallback;
+};
+
+const showNextDialog = () => {
+  if (!instance) {
+    initInstance();
+  }
+
+  /* istanbul ignore else */
+  if (!instance.value && dialogQueue.length > 0) {
+    currentDialog = dialogQueue.shift();
+
+    const { options } = currentDialog;
+
+    for (const prop in options) {
+      /* istanbul ignore else */
+      if (options.hasOwnProperty(prop)) {
+        instance[prop] = options[prop];
+      }
+    }
+
+    instance.callback = options.callback || defaultCallback;
+    instance.value = true;
+    document.body.appendChild(instance.$el);
+  }
+};
+
+const DialogBox = options => {
+  return new Promise((resolve, reject) => { // eslint-disable-line
+    dialogQueue.push({
+      options: { ...options },
+      callback: options.callback,
+      resolve: resolve,
+      reject: reject
+    });
+
+    showNextDialog();
+  });
+};
+
+DialogBox.alert = function(options) {
+  return DialogBox({
+    type: 'alert',
+    title: '',
+    message: '',
+    closeOnClickOverlay: false,
+    showCancelButton: false,
+    ...options
+  });
+};
+
+DialogBox.confirm = function(options) {
+  return DialogBox({
+    type: 'confirm',
+    title: '',
+    message: '',
+    closeOnClickOverlay: true,
+    showCancelButton: true,
+    ...options
+  });
+};
+
+DialogBox.close = function() {
+  instance.value = false;
+  dialogQueue = [];
+  currentDialog = null;
+};
+
+export default DialogBox;
diff --git a/packages/dialog/src/dialog.js b/packages/dialog/src/dialog.js
deleted file mode 100644
index d82f3e9b2..000000000
--- a/packages/dialog/src/dialog.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import Vue from 'vue';
-import Dialog from './dialog.vue';
-
-const DialogConstructor = Vue.extend(Dialog);
-
-let currentDialog;
-let instance;
-let dialogQueue = [];
-
-const defaultCallback = action => {
-  /* istanbul ignore else */
-  if (currentDialog) {
-    if (currentDialog.resolve && action === 'confirm') {
-      currentDialog.resolve(action);
-    } else if (currentDialog.reject && action === 'cancel') {
-      currentDialog.reject(action);
-    }
-  }
-};
-
-const initInstance = () => {
-  instance = new DialogConstructor({
-    el: document.createElement('div')
-  });
-
-  instance.$on('input', value => {
-    instance.value = value;
-  })
-  instance.callback = defaultCallback;
-};
-
-const showNextDialog = () => {
-  if (!instance) {
-    initInstance();
-  }
-
-  /* istanbul ignore else */
-  if (!instance.value && dialogQueue.length > 0) {
-    currentDialog = dialogQueue.shift();
-
-    const { options } = currentDialog;
-
-    for (const prop in options) {
-      /* istanbul ignore else */
-      if (options.hasOwnProperty(prop)) {
-        instance[prop] = options[prop];
-      }
-    }
-
-    instance.callback = options.callback || defaultCallback;
-    instance.value = true;
-    document.body.appendChild(instance.$el);
-  }
-};
-
-var DialogBox = options => {
-  return new Promise((resolve, reject) => { // eslint-disable-line
-    dialogQueue.push({
-      options: { ...options },
-      callback: options.callback,
-      resolve: resolve,
-      reject: reject
-    });
-
-    showNextDialog();
-  });
-};
-
-DialogBox.alert = function(options) {
-  return DialogBox({
-    type: 'alert',
-    title: '',
-    message: '',
-    closeOnClickOverlay: false,
-    showCancelButton: false,
-    ...options
-  });
-};
-
-DialogBox.confirm = function(options) {
-  return DialogBox({
-    type: 'confirm',
-    title: '',
-    message: '',
-    closeOnClickOverlay: true,
-    showCancelButton: true,
-    ...options
-  });
-};
-
-DialogBox.close = function() {
-  instance.value = false;
-  dialogQueue = [];
-  currentDialog = null;
-};
-
-export default DialogBox;
diff --git a/packages/field/index.js b/packages/field/index.js
deleted file mode 100644
index 391f5272c..000000000
--- a/packages/field/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Field from './src/field';
-
-export default Field;
diff --git a/packages/field/src/field.vue b/packages/field/index.vue
similarity index 97%
rename from packages/field/src/field.vue
rename to packages/field/index.vue
index 011fdae8a..2f86df5b1 100644
--- a/packages/field/src/field.vue
+++ b/packages/field/index.vue
@@ -48,8 +48,8 @@
 
 <script>
 const VALID_TYPES = ['text', 'number', 'email', 'url', 'tel', 'date', 'time', 'datetime', 'password', 'textarea'];
-import vanCell from '../../cell';
-import vanIcon from '../../icon';
+import vanCell from '../cell';
+import vanIcon from '../icon';
 
 export default {
   name: 'van-field',
diff --git a/packages/icon/index.js b/packages/icon/index.js
deleted file mode 100644
index cf234f6f0..000000000
--- a/packages/icon/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Icon from './src/icon';
-
-export default Icon;
diff --git a/packages/icon/src/icon.vue b/packages/icon/index.vue
similarity index 100%
rename from packages/icon/src/icon.vue
rename to packages/icon/index.vue
diff --git a/packages/image-preview/src/image-preview.vue b/packages/image-preview/image-preview.vue
similarity index 95%
rename from packages/image-preview/src/image-preview.vue
rename to packages/image-preview/image-preview.vue
index 26c2c62ad..1ff21be7b 100644
--- a/packages/image-preview/src/image-preview.vue
+++ b/packages/image-preview/image-preview.vue
@@ -12,9 +12,9 @@
 
 <script>
 import Vue from 'vue';
-import Popup from '../../mixins/popup';
-import VanSwipe from '../../swipe';
-import VanSwipeItem from '../../swipe-item';
+import Popup from '../mixins/popup';
+import VanSwipe from '../swipe';
+import VanSwipeItem from '../swipe-item';
 
 export default {
   name: 'van-image-preview',
diff --git a/packages/image-preview/index.js b/packages/image-preview/index.js
index 6c0e89558..aed24c69b 100644
--- a/packages/image-preview/index.js
+++ b/packages/image-preview/index.js
@@ -1,3 +1,35 @@
-import ImagePreview from './src/image-preview.js';
+import Vue from 'vue';
+import ImagePreview from './image-preview';
 
-export default ImagePreview;
+let instance;
+
+const ImagePreviewConstructor = Vue.extend(ImagePreview);
+
+const initInstance = () => {
+  /* istanbul ignore if */
+  if (Vue.prototype.$isServer) return;
+  instance = new ImagePreviewConstructor({
+    el: document.createElement('div')
+  });
+};
+
+var ImagePreviewBox = images => {
+  /* istanbul ignore if */
+  if (Vue.prototype.$isServer) return;
+  if (!instance) {
+    initInstance();
+  }
+
+  /* istanbul ignore else */
+  if (!instance.value) {
+    instance.images = images;
+
+    document.body.appendChild(instance.$el);
+
+    Vue.nextTick(() => {
+      instance.value = true;
+    });
+  }
+};
+
+export default ImagePreviewBox;
diff --git a/packages/image-preview/src/image-preview.js b/packages/image-preview/src/image-preview.js
deleted file mode 100644
index 888693701..000000000
--- a/packages/image-preview/src/image-preview.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import Vue from 'vue';
-import ImagePreview from './image-preview.vue';
-
-let instance;
-
-const ImagePreviewConstructor = Vue.extend(ImagePreview);
-
-const initInstance = () => {
-  /* istanbul ignore if */
-  if (Vue.prototype.$isServer) return;
-  instance = new ImagePreviewConstructor({
-    el: document.createElement('div')
-  });
-};
-
-var ImagePreviewBox = images => {
-  /* istanbul ignore if */
-  if (Vue.prototype.$isServer) return;
-  if (!instance) {
-    initInstance();
-  }
-
-  /* istanbul ignore else */
-  if (!instance.value) {
-    instance.images = images;
-
-    document.body.appendChild(instance.$el);
-
-    Vue.nextTick(() => {
-      instance.value = true;
-    });
-  }
-};
-
-export default ImagePreviewBox;
diff --git a/packages/loading/index.js b/packages/loading/index.js
deleted file mode 100644
index b145318b8..000000000
--- a/packages/loading/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Loading from './src/loading';
-
-export default Loading;
diff --git a/packages/loading/src/loading.vue b/packages/loading/index.vue
similarity index 100%
rename from packages/loading/src/loading.vue
rename to packages/loading/index.vue
diff --git a/packages/panel/index.js b/packages/panel/index.js
deleted file mode 100644
index 35f2b3d2c..000000000
--- a/packages/panel/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Panel from './src/panel';
-
-export default Panel;
diff --git a/packages/panel/src/panel.vue b/packages/panel/index.vue
similarity index 100%
rename from packages/panel/src/panel.vue
rename to packages/panel/index.vue
diff --git a/packages/picker/src/draggable.js b/packages/picker/draggable.js
similarity index 100%
rename from packages/picker/src/draggable.js
rename to packages/picker/draggable.js
diff --git a/packages/picker/index.js b/packages/picker/index.js
deleted file mode 100644
index a53cc99e4..000000000
--- a/packages/picker/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Picker from './src/picker';
-
-export default Picker;
diff --git a/packages/picker/src/picker.vue b/packages/picker/index.vue
similarity index 100%
rename from packages/picker/src/picker.vue
rename to packages/picker/index.vue
diff --git a/packages/picker/src/picker-column.vue b/packages/picker/picker-column.vue
similarity index 99%
rename from packages/picker/src/picker-column.vue
rename to packages/picker/picker-column.vue
index e69af8dc2..32a6db2bd 100644
--- a/packages/picker/src/picker-column.vue
+++ b/packages/picker/picker-column.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import translateUtil from '../../utils/transition';
+import translateUtil from '../utils/transition';
 import draggable from './draggable';
 
 const DEFAULT_ITEM_HEIGHT = 44;
diff --git a/packages/popup/index.js b/packages/popup/index.js
deleted file mode 100644
index 31857d9ef..000000000
--- a/packages/popup/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Popup from './src/popup';
-
-export default Popup;
diff --git a/packages/popup/src/popup.vue b/packages/popup/index.vue
similarity index 96%
rename from packages/popup/src/popup.vue
rename to packages/popup/index.vue
index 526036b82..7fe9dbf7a 100644
--- a/packages/popup/src/popup.vue
+++ b/packages/popup/index.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import Popup from '../../mixins/popup';
+import Popup from '../mixins/popup';
 export default {
   name: 'van-popup',
 
diff --git a/packages/progress/index.js b/packages/progress/index.js
deleted file mode 100644
index 7d480f5da..000000000
--- a/packages/progress/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Progress from './src/progress';
-
-export default Progress;
diff --git a/packages/progress/src/progress.vue b/packages/progress/index.vue
similarity index 100%
rename from packages/progress/src/progress.vue
rename to packages/progress/index.vue
diff --git a/packages/quantity/index.js b/packages/quantity/index.js
deleted file mode 100644
index 31f90beb3..000000000
--- a/packages/quantity/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Quantity from './src/quantity';
-
-export default Quantity;
diff --git a/packages/quantity/src/quantity.vue b/packages/quantity/index.vue
similarity index 100%
rename from packages/quantity/src/quantity.vue
rename to packages/quantity/index.vue
diff --git a/packages/radio-group/index.js b/packages/radio-group/index.js
deleted file mode 100644
index 7f39d43e7..000000000
--- a/packages/radio-group/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import RadioGroup from '../radio/src/radio-group';
-
-export default RadioGroup;
diff --git a/packages/radio/src/radio-group.vue b/packages/radio-group/index.vue
similarity index 100%
rename from packages/radio/src/radio-group.vue
rename to packages/radio-group/index.vue
diff --git a/packages/radio/index.js b/packages/radio/index.js
deleted file mode 100644
index 28c69693a..000000000
--- a/packages/radio/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Radio from './src/radio';
-
-export default Radio;
diff --git a/packages/radio/src/radio.vue b/packages/radio/index.vue
similarity index 96%
rename from packages/radio/src/radio.vue
rename to packages/radio/index.vue
index 1633bfc15..3e0fa987b 100644
--- a/packages/radio/src/radio.vue
+++ b/packages/radio/index.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import findParent from '../../mixins/findParent';
+import findParent from '../mixins/findParent';
 
 export default {
   name: 'van-radio',
diff --git a/packages/row/index.js b/packages/row/index.js
deleted file mode 100644
index 6549c1ffb..000000000
--- a/packages/row/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Row from './src/row';
-
-export default Row;
diff --git a/packages/row/src/row.vue b/packages/row/index.vue
similarity index 100%
rename from packages/row/src/row.vue
rename to packages/row/index.vue
diff --git a/packages/search/index.js b/packages/search/index.js
deleted file mode 100644
index 716a43c6e..000000000
--- a/packages/search/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Search from './src/search';
-
-export default Search;
diff --git a/packages/search/index.vue b/packages/search/index.vue
new file mode 100644
index 000000000..85fe31b38
--- /dev/null
+++ b/packages/search/index.vue
@@ -0,0 +1,105 @@
+<template>
+  <div
+    class="van-search"
+    v-clickoutside="handleClickoutside"
+    :class="{ 'van-search--focus': isFocus, 'van-search--showcase': type === 'showcase' }">
+    <div class="van-search__input-wrap">
+      <van-icon name="search"></van-icon>
+      <input
+        type="text"
+        :placeholder="placeholder"
+        class="van-search__input"
+        v-model="value"
+        v-refocus="focusStatus"
+        @focus="handleFocus"
+        @keyup.enter="handleSearch">
+      <van-icon name="clear" @click="handleClean" v-show="isFocus"></van-icon>
+    </div>
+    <div class="van-search__cancel" v-show="type !== 'showcase' && isFocus" @click="handleBack">取消</div>
+  </div>
+</template>
+
+<script>
+import VanIcon from '../icon';
+import Clickoutside from '../utils/clickoutside';
+
+export default {
+  name: 'van-search',
+
+  components: {
+    VanIcon
+  },
+
+  props: {
+    placeholder: String,
+    type: {
+      type: String,
+      default: 'normal'
+    }
+  },
+
+  watch: {
+    value(val) {
+      this.$emit('change', val);
+    }
+  },
+
+  data() {
+    return {
+      value: '',
+      focusStatus: false,
+      isFocus: false
+    };
+  },
+
+  directives: {
+    Clickoutside,
+    refocus: {
+      update: function(el, state) {
+        if (state.value) {
+          el.focus();
+        }
+      }
+    }
+  },
+
+  methods: {
+    /**
+     * 进入input焦点，出现close和取消
+     */
+    handleFocus() {
+      this.isFocus = true;
+    },
+
+    /**
+     * 点击close后清空vlaue后，再聚焦input框
+     */
+    handleClean() {
+      this.value = '';
+      this.focusStatus = true;
+    },
+
+    /**
+     * 点击取消后，清空所有回复最初状态
+     */
+    handleBack() {
+      this.value = '';
+      this.focusStatus = false;
+      this.isFocus = false;
+      this.$emit('cancel');
+    },
+
+    /**
+     * input输入回车后，发送回调
+     */
+    handleSearch() {
+      this.$emit('search', this.value);
+    },
+
+    handleClickoutside() {
+      this.isFocus = false;
+      this.focusStatus = false;
+    }
+  }
+};
+</script>
diff --git a/packages/search/src/search.vue b/packages/search/src/search.vue
deleted file mode 100644
index 7363a51f5..000000000
--- a/packages/search/src/search.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <div
-    class="van-search"
-    v-clickoutside="handleClickoutside"
-    :class="{ 'van-search--focus': isFocus, 'van-search--showcase': type === 'showcase' }">
-    <div class="van-search__input-wrap">
-      <van-icon name="search"></van-icon>
-      <input
-        type="text"
-        :placeholder="placeholder"
-        class="van-search__input"
-        v-model="value"
-        v-refocus="focusStatus"
-        @focus="handleFocus"
-        @keyup.enter="handleSearch">
-      <van-icon name="clear" @click="handleClean" v-show="isFocus"></van-icon>
-    </div>
-    <div class="van-search__cancel" v-show="type !== 'showcase' && isFocus" @click="handleBack">取消</div>
-  </div>
-</template>
-
-<script>
-  import VanIcon from '../../icon';
-  import Clickoutside from '../../utils/clickoutside';
-
-  export default {
-    name: 'van-search',
-
-    components: {
-      VanIcon
-    },
-
-    props: {
-      placeholder: String,
-      type: {
-        type: String,
-        default: 'normal'
-      }
-    },
-
-    watch: {
-      value(val) {
-        this.$emit('change', val);
-      }
-    },
-
-    data() {
-      return {
-        value: '',
-        focusStatus: false,
-        isFocus: false
-      };
-    },
-
-    directives: {
-      Clickoutside,
-      refocus: {
-        update: function(el, state) {
-          if (state.value) {
-            el.focus();
-          }
-        }
-      }
-    },
-
-    methods: {
-      /**
-       * 进入input焦点，出现close和取消
-       */
-      handleFocus() {
-        this.isFocus = true;
-      },
-
-      /**
-       * 点击close后清空vlaue后，再聚焦input框
-       */
-      handleClean() {
-        this.value = '';
-        this.focusStatus = true;
-      },
-
-      /**
-       * 点击取消后，清空所有回复最初状态
-       */
-      handleBack() {
-        this.value = '';
-        this.focusStatus = false;
-        this.isFocus = false;
-        this.$emit('cancel');
-      },
-
-      /**
-       * input输入回车后，发送回调
-       */
-      handleSearch() {
-        this.$emit('search', this.value);
-      },
-
-      handleClickoutside() {
-        this.isFocus = false;
-        this.focusStatus = false;
-      }
-    }
-  };
-</script>
diff --git a/packages/step/index.js b/packages/step/index.js
deleted file mode 100644
index 5ec38e896..000000000
--- a/packages/step/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Step from '../steps/src/step';
-
-export default Step;
diff --git a/packages/steps/src/step.vue b/packages/step/index.vue
similarity index 100%
rename from packages/steps/src/step.vue
rename to packages/step/index.vue
diff --git a/packages/steps/index.js b/packages/steps/index.js
deleted file mode 100644
index aaf50e801..000000000
--- a/packages/steps/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Steps from './src/steps';
-
-export default Steps;
diff --git a/packages/steps/src/steps.vue b/packages/steps/index.vue
similarity index 97%
rename from packages/steps/src/steps.vue
rename to packages/steps/index.vue
index 7a533f938..91adf1efd 100644
--- a/packages/steps/src/steps.vue
+++ b/packages/steps/index.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import Icon from '../../icon';
+import Icon from '../icon';
 
 export default {
   name: 'van-steps',
diff --git a/packages/swipe-item/index.js b/packages/swipe-item/index.js
deleted file mode 100644
index 1fa974908..000000000
--- a/packages/swipe-item/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import SwipeItem from '../swipe/src/swipe-item';
-
-export default SwipeItem;
diff --git a/packages/swipe/src/swipe-item.vue b/packages/swipe-item/index.vue
similarity index 100%
rename from packages/swipe/src/swipe-item.vue
rename to packages/swipe-item/index.vue
diff --git a/packages/swipe/index.js b/packages/swipe/index.js
deleted file mode 100644
index be8c98896..000000000
--- a/packages/swipe/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Swipe from './src/swipe';
-
-export default Swipe;
diff --git a/packages/swipe/src/swipe.vue b/packages/swipe/index.vue
similarity index 100%
rename from packages/swipe/src/swipe.vue
rename to packages/swipe/index.vue
diff --git a/packages/swipe/src/input.js b/packages/swipe/input.js
similarity index 100%
rename from packages/swipe/src/input.js
rename to packages/swipe/input.js
diff --git a/packages/swipe/src/scroll.js b/packages/swipe/scroll.js
similarity index 100%
rename from packages/swipe/src/scroll.js
rename to packages/swipe/scroll.js
diff --git a/packages/swipe/src/spring_dummy.js b/packages/swipe/spring_dummy.js
similarity index 100%
rename from packages/swipe/src/spring_dummy.js
rename to packages/swipe/spring_dummy.js
diff --git a/packages/swipe/src/utils.js b/packages/swipe/utils.js
similarity index 100%
rename from packages/swipe/src/utils.js
rename to packages/swipe/utils.js
diff --git a/packages/switch/index.js b/packages/switch/index.js
deleted file mode 100644
index 0b5d5cf84..000000000
--- a/packages/switch/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Switch from './src/switch';
-
-export default Switch;
diff --git a/packages/switch/src/switch.vue b/packages/switch/index.vue
similarity index 97%
rename from packages/switch/src/switch.vue
rename to packages/switch/index.vue
index 4a4f4e6e6..3dde8ea05 100644
--- a/packages/switch/src/switch.vue
+++ b/packages/switch/index.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import VanLoading from '../../loading';
+import VanLoading from '../loading';
 /**
  * van-switch
  * @module components/switch
diff --git a/packages/tab/index.js b/packages/tab/index.js
deleted file mode 100644
index 551749afb..000000000
--- a/packages/tab/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Tab from './src/tab';
-export default Tab;
diff --git a/packages/tab/index.vue b/packages/tab/index.vue
new file mode 100644
index 000000000..232bd6b33
--- /dev/null
+++ b/packages/tab/index.vue
@@ -0,0 +1,36 @@
+<template>
+  <div class="van-tab__pane" :class="classNames">
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'van-tab',
+  props: {
+    // 选项卡头显示文字
+    title: {
+      type: String,
+      required: true
+    },
+    disabled: Boolean
+  },
+  data() {
+    const nextIndex = this.$parent.tabs.length;
+    this.$parent.tabs.push({
+      title: this.title,
+      disabled: this.disabled,
+      index: nextIndex
+    });
+
+    return {
+      key: nextIndex
+    };
+  },
+  computed: {
+    classNames() {
+      return { 'van-tab__pane--select': this.key === this.$parent.curActive };
+    }
+  }
+};
+</script>
diff --git a/packages/tab/src/tab.vue b/packages/tab/src/tab.vue
deleted file mode 100644
index d0fa5627f..000000000
--- a/packages/tab/src/tab.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div class="van-tab__pane" :class="classNames">
-    <slot></slot>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'van-tab',
-    props: {
-      // 选项卡头显示文字
-      title: {
-        type: String,
-        required: true
-      },
-      disabled: Boolean
-    },
-    data() {
-      const nextIndex = this.$parent.tabs.length;
-      this.$parent.tabs.push({
-        title: this.title,
-        disabled: this.disabled,
-        index: nextIndex
-      });
-
-      return {
-        key: nextIndex
-      };
-    },
-    computed: {
-      classNames() {
-        return { 'van-tab__pane--select': this.key === this.$parent.curActive };
-      }
-    }
-  };
-</script>
diff --git a/packages/tabs/index.js b/packages/tabs/index.js
deleted file mode 100644
index 5db150464..000000000
--- a/packages/tabs/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Tabs from '../tab/src/tabs';
-
-export default Tabs;
diff --git a/packages/tab/src/tabs.vue b/packages/tabs/index.vue
similarity index 99%
rename from packages/tab/src/tabs.vue
rename to packages/tabs/index.vue
index e38628d46..0da594a6e 100644
--- a/packages/tab/src/tabs.vue
+++ b/packages/tabs/index.vue
@@ -42,7 +42,7 @@
 
 <script>
   import swipe from './swipe';
-  import translateUtil from '../../utils/transition';
+  import translateUtil from '../utils/transition';
 
   export default {
     name: 'van-tabs',
diff --git a/packages/tab/src/swipe.js b/packages/tabs/swipe.js
similarity index 100%
rename from packages/tab/src/swipe.js
rename to packages/tabs/swipe.js
diff --git a/packages/tag/index.js b/packages/tag/index.js
deleted file mode 100644
index a9efba2a4..000000000
--- a/packages/tag/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Tag from './src/main';
-
-export default Tag;
diff --git a/packages/tag/src/main.vue b/packages/tag/index.vue
similarity index 100%
rename from packages/tag/src/main.vue
rename to packages/tag/index.vue
diff --git a/packages/toast/index.js b/packages/toast/index.js
index f521fe6ac..5c6b20de3 100644
--- a/packages/toast/index.js
+++ b/packages/toast/index.js
@@ -1,3 +1,79 @@
-import Toast from './src/toast';
+import Vue from 'vue';
+import merge from '../utils/merge';
+import ToastComponent from './toast';
+
+const ToastConstructor = Vue.extend(ToastComponent);
+let instance;
+
+const getInstance = () => {
+  if (instance) instance.clear();
+
+  instance = new ToastConstructor({
+    el: document.createElement('div')
+  });
+  return instance;
+};
+
+const removeDom = event => {
+  /* istanbul ignore else */
+  if (event.target.parentNode) {
+    event.target.parentNode.removeChild(event.target);
+  }
+};
+
+var Toast = (options = {}) => {
+  const duration = options.duration || 3000;
+
+  const instance = getInstance();
+
+  instance.closed = false;
+  clearTimeout(instance.timer);
+  instance.type = options.type ? options.type : 'text';
+  instance.message = typeof options === 'string' ? options : options.message;
+  instance.forbidClick = options.forbidClick ? options.forbidClick : false;
+  instance.clear = () => {
+    if (instance.closed) return;
+    instance.visible = false;
+    instance.$el.addEventListener('transitionend', removeDom);
+    instance.closed = true;
+  };
+
+  document.body.appendChild(instance.$el);
+  Vue.nextTick(function() {
+    instance.visible = true;
+    instance.$el.removeEventListener('transitionend', removeDom);
+    instance.timer = setTimeout(function() {
+      instance.clear();
+    }, duration);
+  });
+  return instance;
+};
+
+Toast.loading = (options) => {
+  return new Toast(merge({
+    type: 'loading'
+  }, options));
+};
+
+Toast.success = (options) => {
+  const message = typeof options === 'string' ? options : options.message;
+  return new Toast(merge({
+    type: 'success',
+    message: message
+  }, options));
+};
+
+Toast.fail = (options) => {
+  const message = typeof options === 'string' ? options : options.message;
+  return new Toast(merge({
+    type: 'fail',
+    message: message
+  }, options));
+};
+
+Toast.clear = () => {
+  /* istanbul ignore else */
+  if (instance) instance.clear();
+};
 
 export default Toast;
diff --git a/packages/toast/src/toast.js b/packages/toast/src/toast.js
deleted file mode 100644
index e0ef93b2b..000000000
--- a/packages/toast/src/toast.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import Vue from 'vue';
-import merge from '../../utils/merge';
-import ToastComponent from './toast.vue';
-
-const ToastConstructor = Vue.extend(ToastComponent);
-let instance;
-
-const getInstance = () => {
-  if (instance) instance.clear();
-
-  instance = new ToastConstructor({
-    el: document.createElement('div')
-  });
-  return instance;
-};
-
-const removeDom = event => {
-  /* istanbul ignore else */
-  if (event.target.parentNode) {
-    event.target.parentNode.removeChild(event.target);
-  }
-};
-
-var Toast = (options = {}) => {
-  const duration = options.duration || 3000;
-
-  const instance = getInstance();
-
-  instance.closed = false;
-  clearTimeout(instance.timer);
-  instance.type = options.type ? options.type : 'text';
-  instance.message = typeof options === 'string' ? options : options.message;
-  instance.forbidClick = options.forbidClick ? options.forbidClick : false;
-  instance.clear = () => {
-    if (instance.closed) return;
-    instance.visible = false;
-    instance.$el.addEventListener('transitionend', removeDom);
-    instance.closed = true;
-  };
-
-  document.body.appendChild(instance.$el);
-  Vue.nextTick(function() {
-    instance.visible = true;
-    instance.$el.removeEventListener('transitionend', removeDom);
-    instance.timer = setTimeout(function() {
-      instance.clear();
-    }, duration);
-  });
-  return instance;
-};
-
-Toast.loading = (options) => {
-  return new Toast(merge({
-    type: 'loading'
-  }, options));
-};
-
-Toast.success = (options) => {
-  const message = typeof options === 'string' ? options : options.message;
-  return new Toast(merge({
-    type: 'success',
-    message: message
-  }, options));
-};
-
-Toast.fail = (options) => {
-  const message = typeof options === 'string' ? options : options.message;
-  return new Toast(merge({
-    type: 'fail',
-    message: message
-  }, options));
-};
-
-Toast.clear = () => {
-  /* istanbul ignore else */
-  if (instance) instance.clear();
-};
-
-export default Toast;
diff --git a/packages/toast/src/toast.vue b/packages/toast/toast.vue
similarity index 96%
rename from packages/toast/src/toast.vue
rename to packages/toast/toast.vue
index b34ce4313..a147dd8a4 100644
--- a/packages/toast/src/toast.vue
+++ b/packages/toast/toast.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script>
-import vanLoading from '../../loading';
-import vanIcon from '../../icon';
+import vanLoading from '../loading';
+import vanIcon from '../icon';
 
 const TOAST_TYPES = ['text', 'html', 'loading', 'success', 'fail'];
 const DEFAULT_STYLE_LIST = ['success', 'fail'];
diff --git a/packages/uploader/index.js b/packages/uploader/index.js
deleted file mode 100644
index 923a084e7..000000000
--- a/packages/uploader/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Uploader from './src/main';
-
-export default Uploader;
diff --git a/packages/uploader/src/main.vue b/packages/uploader/index.vue
similarity index 98%
rename from packages/uploader/src/main.vue
rename to packages/uploader/index.vue
index 882f8408e..b0b8d4ede 100644
--- a/packages/uploader/src/main.vue
+++ b/packages/uploader/index.vue
@@ -1,8 +1,6 @@
 <template>
   <div class="van-uploader">
-    <slot>
-
-    </slot>
+    <slot></slot>
     <template v-if="disabled">
       <input type="file" @change="onValueChange" disabled="disabled" class="van-uploader__input" />
     </template>
diff --git a/packages/waterfall/src/directive.js b/packages/waterfall/directive.js
similarity index 98%
rename from packages/waterfall/src/directive.js
rename to packages/waterfall/directive.js
index 0ff4a4fd4..220479d40 100644
--- a/packages/waterfall/src/directive.js
+++ b/packages/waterfall/directive.js
@@ -1,4 +1,4 @@
-import Utils from '../../utils/scroll.js';
+import Utils from '../utils/scroll';
 
 const CONTEXT = '@@Waterfall';
 const OFFSET = 300;
diff --git a/packages/waterfall/index.js b/packages/waterfall/index.js
index d315e6f96..02665b9a1 100644
--- a/packages/waterfall/index.js
+++ b/packages/waterfall/index.js
@@ -1,3 +1,14 @@
-import Waterfall from './src/main.js';
+import Waterfall from './directive.js';
+import Vue from 'vue';
 
+const install = function(Vue) {
+  Vue.directive('WaterfallLower', Waterfall('lower'));
+  Vue.directive('WaterfallUpper', Waterfall('upper'));
+};
+
+if (!Vue.prototype.$isServer) {
+  Vue.use(install);
+}
+
+Waterfall.install = install;
 export default Waterfall;
diff --git a/packages/waterfall/src/main.js b/packages/waterfall/src/main.js
deleted file mode 100644
index 02665b9a1..000000000
--- a/packages/waterfall/src/main.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import Waterfall from './directive.js';
-import Vue from 'vue';
-
-const install = function(Vue) {
-  Vue.directive('WaterfallLower', Waterfall('lower'));
-  Vue.directive('WaterfallUpper', Waterfall('upper'));
-};
-
-if (!Vue.prototype.$isServer) {
-  Vue.use(install);
-}
-
-Waterfall.install = install;
-export default Waterfall;

From 9ac108e59d994f4d6e1eec7bff0e0d5fe89f32df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 22 Aug 2017 19:02:32 +0800
Subject: [PATCH 073/126] fix: test config

---
 test/unit/get-webpack-conf.js  | 21 +--------------------
 test/unit/specs/picker.spec.js |  2 +-
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/test/unit/get-webpack-conf.js b/test/unit/get-webpack-conf.js
index 09fad3cbe..695aed61f 100644
--- a/test/unit/get-webpack-conf.js
+++ b/test/unit/get-webpack-conf.js
@@ -74,7 +74,7 @@ const webpackConfig = {
         }]
       },
       {
-        test: /test\/unit\/components\/.*\.vue$|packages\/swipe\/.*\.vue$/,
+        test: /\.vue$/,
         use: [{
           loader: 'vue-loader',
           options: {
@@ -87,25 +87,6 @@ const webpackConfig = {
             }
           }
         }]
-      },
-      {
-        test: /packages\/.*\.vue$/,
-        exclude: /packages\/swipe/,
-        use: [{
-          loader: 'vue-loader',
-          options: {
-            loaders: {
-              css: [
-                'style-loader',
-                'css-loader',
-                'postcss-loader'
-              ],
-              js: [
-                'isparta-loader'
-              ]
-            }
-          }
-        }]
       }
     ]
   },
diff --git a/test/unit/specs/picker.spec.js b/test/unit/specs/picker.spec.js
index dd8e5770a..d3fe2184d 100644
--- a/test/unit/specs/picker.spec.js
+++ b/test/unit/specs/picker.spec.js
@@ -1,5 +1,5 @@
 import Picker from 'packages/picker';
-import PickerColumn from 'packages/picker/src/picker-column';
+import PickerColumn from 'packages/picker/picker-column';
 import { mount } from 'avoriaz';
 import Wrapper from 'avoriaz/dist/Wrapper';
 

From 9bb88ee295f19ca32f0963751106d09a5d0ef654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 22 Aug 2017 19:12:32 +0800
Subject: [PATCH 074/126] fix: isparta-loader config

---
 test/unit/get-webpack-conf.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/unit/get-webpack-conf.js b/test/unit/get-webpack-conf.js
index 695aed61f..1c57dd658 100644
--- a/test/unit/get-webpack-conf.js
+++ b/test/unit/get-webpack-conf.js
@@ -83,7 +83,8 @@ const webpackConfig = {
                 'style-loader',
                 'css-loader',
                 'postcss-loader'
-              ]
+              ],
+              js: ['isparta-loader']
             }
           }
         }]

From bc169e905a5213f0ce75bd9806e084621c4f369b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 22 Aug 2017 19:43:15 +0800
Subject: [PATCH 075/126] dalete merge && class operating methods

---
 packages/cell-swipe/index.vue          |  2 +-
 packages/mixins/popup/index.js         |  1 -
 packages/mixins/popup/popup-context.js |  6 +-
 packages/mixins/popup/popup-manager.js |  3 +-
 packages/toast/index.js                | 22 +++---
 packages/utils/dom.js                  | 96 +-------------------------
 packages/utils/merge.js                | 15 ----
 7 files changed, 21 insertions(+), 124 deletions(-)
 delete mode 100644 packages/utils/merge.js

diff --git a/packages/cell-swipe/index.vue b/packages/cell-swipe/index.vue
index fd99f533d..6b9c024b8 100644
--- a/packages/cell-swipe/index.vue
+++ b/packages/cell-swipe/index.vue
@@ -80,7 +80,7 @@ export default {
           return;
         } else {
           this.swipeMove(0);
-          once(this.wrap, 'webkitTransitionEnd', _ => {
+          once(this.wrap, 'webkitTransitionEnd', () => {
             this.wrap.style.webkitTransform = '';
             this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
             this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js
index 44700d419..b4b8fa227 100644
--- a/packages/mixins/popup/index.js
+++ b/packages/mixins/popup/index.js
@@ -1,4 +1,3 @@
-import merge from '../../utils/merge';
 import PopupManager from './popup-manager';
 import PopupContext from './popup-context';
 
diff --git a/packages/mixins/popup/popup-context.js b/packages/mixins/popup/popup-context.js
index f0b2ff7ea..45cbae621 100644
--- a/packages/mixins/popup/popup-context.js
+++ b/packages/mixins/popup/popup-context.js
@@ -1,4 +1,3 @@
-import merge from '../../utils/merge';
 import Vue from 'vue';
 
 let context;
@@ -16,7 +15,10 @@ const DEFAULT_CONTEXT = {
   modalStack: []
 };
 
-context = _global.popupContext = merge({}, DEFAULT_CONTEXT, context);
+context = _global.popupContext = {
+  ...DEFAULT_CONTEXT,
+  ...context
+};
 
 const PopupContext = {
   getContext(key) {
diff --git a/packages/mixins/popup/popup-manager.js b/packages/mixins/popup/popup-manager.js
index 3a98cc340..c422b537f 100644
--- a/packages/mixins/popup/popup-manager.js
+++ b/packages/mixins/popup/popup-manager.js
@@ -1,5 +1,4 @@
 import Vue from 'vue';
-import { addClass } from '../../utils/dom';
 import PopupContext from './popup-context';
 
 const getModal = function() {
@@ -79,7 +78,7 @@ const PopupManager = {
 
     const modalDom = getModal();
 
-    addClass(modalDom, 'van-modal');
+    modalDom.classList.add('van-modal');
 
     let domParentNode;
     if (dom && dom.parentNode && dom.parentNode.nodeType !== 11) {
diff --git a/packages/toast/index.js b/packages/toast/index.js
index 5c6b20de3..8113da876 100644
--- a/packages/toast/index.js
+++ b/packages/toast/index.js
@@ -1,5 +1,4 @@
 import Vue from 'vue';
-import merge from '../utils/merge';
 import ToastComponent from './toast';
 
 const ToastConstructor = Vue.extend(ToastComponent);
@@ -50,25 +49,28 @@ var Toast = (options = {}) => {
 };
 
 Toast.loading = (options) => {
-  return new Toast(merge({
-    type: 'loading'
-  }, options));
+  return new Toast({
+    type: 'loading',
+    ...options
+  });
 };
 
 Toast.success = (options) => {
   const message = typeof options === 'string' ? options : options.message;
-  return new Toast(merge({
+  return new Toast({
     type: 'success',
-    message: message
-  }, options));
+    message: message,
+    ...options
+  });
 };
 
 Toast.fail = (options) => {
   const message = typeof options === 'string' ? options : options.message;
-  return new Toast(merge({
+  return new Toast({
     type: 'fail',
-    message: message
-  }, options));
+    message: message,
+    ...options
+  });
 };
 
 Toast.clear = () => {
diff --git a/packages/utils/dom.js b/packages/utils/dom.js
index 45f9e385b..bd9b6edb5 100644
--- a/packages/utils/dom.js
+++ b/packages/utils/dom.js
@@ -1,101 +1,11 @@
 import Vue from 'vue';
-const isServer = Vue.prototype.$isServer;
 
-const trim = function(string) {
-  return (string || '').replace(/^[\s\uFEFF]+|[\s\uFEFF]+$/g, '');
-};
-
-export function hasClass(el, cls) {
-  if (!el || !cls) return false;
-  if (cls.indexOf(' ') !== -1) throw new Error('className should not contain space.');
-  if (el.classList) {
-    return el.classList.contains(cls);
-  } else {
-    return (' ' + el.className + ' ').indexOf(' ' + cls + ' ') > -1;
-  }
-};
-
-export function addClass(el, cls) {
-  if (!el) return;
-  var curClass = el.className;
-  var classes = (cls || '').split(' ');
-
-  for (var i = 0, j = classes.length; i < j; i++) {
-    var clsName = classes[i];
-    if (!clsName) continue;
-
-    if (el.classList) {
-      el.classList.add(clsName);
-    } else {
-      if (!hasClass(el, clsName)) {
-        curClass += ' ' + clsName;
-      }
-    }
-  }
-  if (!el.classList) {
-    el.className = curClass;
-  }
-};
-
-export function removeClass(el, cls) {
-  if (!el || !cls) return;
-  var classes = cls.split(' ');
-  var curClass = ' ' + el.className + ' ';
-
-  for (var i = 0, j = classes.length; i < j; i++) {
-    var clsName = classes[i];
-    if (!clsName) continue;
-
-    if (el.classList) {
-      el.classList.remove(clsName);
-    } else {
-      if (hasClass(el, clsName)) {
-        curClass = curClass.replace(' ' + clsName + ' ', ' ');
-      }
-    }
-  }
-  if (!el.classList) {
-    el.className = trim(curClass);
-  }
-};
 export const once = function(el, event, fn) {
-  var listener = function() {
+  const listener = function() {
     if (fn) {
       fn.apply(this, arguments);
     }
-    off(el, event, listener);
+    el.removeEventListener(event, listener);
   };
-  on(el, event, listener);
+  el.addEventListener(event, listener);
 };
-
-export const on = (function() {
-  if (!isServer && document.addEventListener) {
-    return function(element, event, handler) {
-      if (element && event && handler) {
-        element.addEventListener(event, handler, false);
-      }
-    };
-  } else {
-    return function(element, event, handler) {
-      if (element && event && handler) {
-        element.attachEvent('on' + event, handler);
-      }
-    };
-  }
-})();
-
-export const off = (function() {
-  if (!isServer && document.removeEventListener) {
-    return function(element, event, handler) {
-      if (element && event) {
-        element.removeEventListener(event, handler, false);
-      }
-    };
-  } else {
-    return function(element, event, handler) {
-      if (element && event) {
-        element.detachEvent('on' + event, handler);
-      }
-    };
-  }
-})();
diff --git a/packages/utils/merge.js b/packages/utils/merge.js
deleted file mode 100644
index c73581621..000000000
--- a/packages/utils/merge.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export default function(target, ...sources) {
-  for (let i = 0; i < sources.length; i++) {
-    const source = sources[i] || {};
-    for (const prop in source) {
-      if (source.hasOwnProperty(prop)) {
-        const value = source[prop];
-        if (value !== undefined) {
-          target[prop] = value;
-        }
-      }
-    }
-  }
-
-  return target;
-};

From 1e474244cae783d22abeb577993ee9d4d89eff6a Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Thu, 24 Aug 2017 00:15:49 +0800
Subject: [PATCH 076/126] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddatetime-pick?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=80=BC=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/examples-docs/datetime-picker.md         | 36 ++++++++-----------
 packages/datetime-picker/index.js             |  4 +--
 .../datetime-picker/src/datetime-picker.vue   |  4 +++
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/docs/examples-docs/datetime-picker.md b/docs/examples-docs/datetime-picker.md
index 1d90f56c3..f7c633f46 100644
--- a/docs/examples-docs/datetime-picker.md
+++ b/docs/examples-docs/datetime-picker.md
@@ -5,15 +5,16 @@ export default {
       minHour: 10,
       maxHour: 20,
       minDate: new Date(),
-      currentDate1: null,
+      maxDate: new Date(2019, 10, 1),
+      currentDate1: new Date(2018, 0, 1),
       currentDate2: null,
       currentDate3: null
     };
   },
 
   methods: {
-    handlePickerChange(picker, values) {
-      console.log(values);
+    handlePickerChange(picker) {
+      console.log(picker);
     },
     handlePickerCancel() {
       console.log('picker cancel');
@@ -36,10 +37,10 @@ export default {
 <van-datetime-picker
   v-model="currentDate1"
   type="datetime"
-  format="yyyy.mm.dd hh时 mm分"
   :min-hour="minHour"
   :max-hour="maxHour"
   :min-date="minDate"
+  :max-date="maxDate"
   @change="handlePickerChange">  
 </van-datetime-picker>
 
@@ -50,13 +51,14 @@ export default {
       minHour: 10,
       maxHour: 20,
       minDate: new Date(),
-      currentDate: null
+      maxDate: new Date(2019, 10, 1),
+      currentDate: new Date(2018, 0, 1)
     };
   },
 
   methods: {
-    handlePickerChange(picker, values) {
-      picker.setColumnValues(1, citys[values[0]]);
+    handlePickerChange(picker) {
+      console.log(picker);
     }
   }
 };
@@ -71,7 +73,6 @@ export default {
 <van-datetime-picker
   v-model="currentDate2"
   type="date"
-  format="yyyy.mm.dd hh时 mm分"
   :min-hour="minHour"
   :max-hour="maxHour"
   :min-date="minDate"
@@ -87,7 +88,6 @@ export default {
 <van-datetime-picker
   v-model="currentDate3"
   type="time"
-  format="yyyy.mm.dd hh时 mm分"
   :min-hour="minHour"
   :max-hour="maxHour"
   :min-date="minDate"
@@ -102,19 +102,11 @@ export default {
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
 | visibileColumnCount | 每一列可见备选元素的个数 | Number  | 5 |   |
-| itemHeight | 选中元素区高度 | Number  | 44 |   |
-| columns | 对象数组，配置每一列显示的数据 | Array  |  |   |
-| showToolbar | 是否在组件顶部显示一个toolbar | Boolean  | true |   |
-
-### columns
-
-`API`中的`columns`为一个对象数组，数组中的每一个对象配置每一列，每一列有以下`key`：
-
-| key       | 说明      |
-|-----------|-----------|
-| values | 列中对应的备选值 |
-| defaultIndex | 初始选中值的索引，默认为0 |
-| className | 为对应列添加特殊的`class` |
+| type | 组件类型 | String  | 'datetime' |  'datetime', 'date', 'time' |
+| minDate | 可选的最小日期 | Date  | 十年前的 1 月 1 日 |   |
+| maxDate | 可选的最大日期 | Date  | 十年后的 12 月 31 日 |   |
+| minHour | 可选的最小小时 | Number  | 0 |   |
+| maxHour | 可选的最大小时 | Number  | 23 |   |
 
 ### Event
 
diff --git a/packages/datetime-picker/index.js b/packages/datetime-picker/index.js
index c6ad7f9b3..ca80ede95 100644
--- a/packages/datetime-picker/index.js
+++ b/packages/datetime-picker/index.js
@@ -1,3 +1,3 @@
-import DateTimePicker from './src/datetime-picker';
+import DatetimePicker from './src/datetime-picker';
 
-export default DateTimePicker;
+export default DatetimePicker;
diff --git a/packages/datetime-picker/src/datetime-picker.vue b/packages/datetime-picker/src/datetime-picker.vue
index 5569efd63..6dbadea55 100644
--- a/packages/datetime-picker/src/datetime-picker.vue
+++ b/packages/datetime-picker/src/datetime-picker.vue
@@ -285,6 +285,10 @@ export default {
       }
       [].forEach.call(this.$refs.picker.$children, child => child.doOnValueChange());
     }
+  },
+
+  mounted() {
+    this.updateColumnValue(this.innerValue);
   }
 };
 </script>

From 8f3915f77c44c03be1bc0ddb168f024b17b7faea Mon Sep 17 00:00:00 2001
From: niunai <colonD.wny@gmail.com>
Date: Thu, 24 Aug 2017 00:28:16 +0800
Subject: [PATCH 077/126] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/datetime-picker/index.js | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 packages/datetime-picker/index.js

diff --git a/packages/datetime-picker/index.js b/packages/datetime-picker/index.js
deleted file mode 100644
index ca80ede95..000000000
--- a/packages/datetime-picker/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import DatetimePicker from './src/datetime-picker';
-
-export default DatetimePicker;

From 6d0db7101001944500a55aaf3267cac991337f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 24 Aug 2017 09:57:58 +0800
Subject: [PATCH 078/126] [build] 0.8.6

---
 docs/examples-docs/changelog.md | 19 ++++++++++++++++++-
 packages/index.js               |  2 +-
 packages/vant-css/package.json  |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index 368905d3f..545b0e180 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -1,9 +1,26 @@
 ## 更新日志
 
+## [v0.8.5](https://github.com/youzan/vant/tree/v0.8.5) (2017-08-21)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.8.4...v0.8.5)
+
+**非兼容更新和新特性:**
+
+- Doc: add usage guide && top progress [\#83](https://github.com/youzan/vant/pull/83) ([chenjiahan](https://github.com/chenjiahan))
+
+**修复:**
+
+- Popup: not preventScroll by default [\#84](https://github.com/youzan/vant/pull/84) ([chenjiahan](https://github.com/chenjiahan))
+- fix: swipe sometimes will change to drag image [\#81](https://github.com/youzan/vant/pull/81) ([pangxie1991](https://github.com/pangxie1991))
+
+**处理的 Issue:**
+
+- Href link does not work [\#82](https://github.com/youzan/vant/issues/82)
+- Swipe image not displayed [\#79](https://github.com/youzan/vant/issues/79)
+
 ## [v0.8.4](https://github.com/youzan/vant/tree/v0.8.4) (2017-08-18)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.8.3...v0.8.4)
 
-**合并的 Pull Request (可能有不兼容改动):**
+**修复:**
 
 - fix: field 计算autosize，需要nextTick [\#78](https://github.com/youzan/vant/pull/78) ([pangxie1991](https://github.com/pangxie1991))
 
diff --git a/packages/index.js b/packages/index.js
index faf9b07f6..3a1ca3699 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -37,7 +37,7 @@ import Swipe from './swipe';
 import SwipeItem from './swipe-item';
 import DatetimePicker from './datetime-picker';
 
-const version = '0.8.5';
+const version = '0.8.6';
 const components = [
   Button,
   Switch,
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index 36e96b762..d3dbbe043 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

From dbd35129792f6df554ac27c89c80fb0b1d8c10b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 24 Aug 2017 09:57:58 +0800
Subject: [PATCH 079/126] [release] 0.8.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4beb3342a..706d14a9f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From 99259a863f54a439572fb850b75c5bb9d515b06c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 24 Aug 2017 14:25:22 +0800
Subject: [PATCH 080/126] Doc: add touch simulator

---
 docs/src/doc.config.js | 10 +++++-----
 docs/src/examples.js   |  1 +
 package.json           |  6 +++---
 yarn.lock              | 24 ++++++++++++------------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 110f0cadb..655038e57 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -26,21 +26,21 @@ module.exports = {
                 "title": "快速上手",
                 noExample: true
               },
+              {
+                "title": "业务组件",
+                "link": "/zanui/captain/component/quickstart"
+              },
               {
                 "path": "/changelog",
                 "title": "更新日志",
                 noExample: true
-              },
-              {
-                "title": "业务组件",
-                "link": "/zanui/captain/component/quickstart"
               }
             ]
           }
         ]
       },
       {
-        "name": "组件列表",
+        "name": "组件",
         "showInMobile": true,
         "groups": [
           {
diff --git a/docs/src/examples.js b/docs/src/examples.js
index 73f943ae6..5126b64c3 100644
--- a/docs/src/examples.js
+++ b/docs/src/examples.js
@@ -5,6 +5,7 @@ import routes from './router.config';
 import ZanUI from 'packages/index';
 import ZanDoc from 'zan-doc';
 import 'packages/vant-css/src/index.css';
+import 'zan-doc/src/helper/touch-simulator';
 
 import DemoList from './components/demo-list.vue';
 
diff --git a/package.json b/package.json
index 706d14a9f..f6ff3a9f2 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "cross-env": "^5.0.5",
     "css-loader": "^0.28.5",
     "eslint-plugin-vue": "^2.1.0",
-    "extract-text-webpack-plugin": "2.1.2",
+    "extract-text-webpack-plugin": "^3.0.0",
     "felint": "^0.5.0-alpha.3",
     "file-loader": "^0.11.2",
     "file-save": "^0.2.0",
@@ -108,7 +108,7 @@
     "vue": "^2.4.2",
     "vue-html-loader": "^1.2.4",
     "vue-loader": "^13.0.4",
-    "vue-markdown-loader": "^2.0.0",
+    "vue-markdown-loader": "^2.1.0",
     "vue-router": "^2.7.0",
     "vue-sfc-compiler": "^0.0.2",
     "vue-style-loader": "^3.0.0",
@@ -116,6 +116,6 @@
     "webpack": "^3.5.5",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "^0.2.1"
+    "zan-doc": "^0.2.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index f546eae28..de34d1c02 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -305,7 +305,7 @@ async@2.1.4:
   dependencies:
     lodash "^4.14.0"
 
-async@^2.1.2:
+async@^2.1.2, async@^2.4.1:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
@@ -2768,12 +2768,12 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extract-text-webpack-plugin@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c"
+extract-text-webpack-plugin@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz#90caa7907bc449f335005e3ac7532b41b00de612"
   dependencies:
-    async "^2.1.2"
-    loader-utils "^1.0.2"
+    async "^2.4.1"
+    loader-utils "^1.1.0"
     schema-utils "^0.3.0"
     webpack-sources "^1.0.1"
 
@@ -7603,9 +7603,9 @@ vue-loader@^13.0.4:
     vue-style-loader "^3.0.0"
     vue-template-es2015-compiler "^1.5.3"
 
-vue-markdown-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/vue-markdown-loader/-/vue-markdown-loader-2.0.0.tgz#d3cadbf9c8976a81f2d5e39496d505fd4f31bc96"
+vue-markdown-loader@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/vue-markdown-loader/-/vue-markdown-loader-2.1.0.tgz#112d1921dd56daa29906b7c012623c6c5d6e0d8c"
   dependencies:
     cheerio "^0.20.0"
     highlight.js "^9.4.0"
@@ -7926,9 +7926,9 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-zan-doc@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.1.tgz#34723ea180d0ac2e183b66d2a3e4a04b4f6fe91b"
+zan-doc@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.2.tgz#ebf8ffda5bd3cf9277cc3e59c48476a3fbf84d9f"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"

From ac4b739814bb11c848ed1de00f8b3a05426a7a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 24 Aug 2017 14:38:22 +0800
Subject: [PATCH 081/126] Uploader: optimize template

---
 packages/uploader/index.vue | 89 ++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/packages/uploader/index.vue b/packages/uploader/index.vue
index b0b8d4ede..59d120bbc 100644
--- a/packages/uploader/index.vue
+++ b/packages/uploader/index.vue
@@ -1,57 +1,54 @@
 <template>
   <div class="van-uploader">
     <slot></slot>
-    <template v-if="disabled">
-      <input type="file" @change="onValueChange" disabled="disabled" class="van-uploader__input" />
-    </template>
-    <template v-else>
-      <input type="file" @change="onValueChange"  class="van-uploader__input" ref="input" />
-    </template>
+    <input type="file" @change="onValueChange" :disabled="disable" class="van-uploader__input" ref="input" />
   </div>
 </template>
 
 <script>
-  export default {
-    name: 'van-uploader',
-    props: {
-      disabled: {
-        type: Boolean,
-        default: false
-      },
-      beforeRead: Function,
-      afterRead: Function,
-      resultType: {
-        type: String,
-        default: 'dataUrl',
-        validator(value) {
-          return value === 'dataUrl' || value === 'text';
-        }
-      }
+export default {
+  name: 'van-uploader',
+
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
     },
-    methods: {
-      onValueChange(event) {
-        if (this.disabled) {
-          return;
-        }
-        var files = event.target.files;
-        var file = files[0];
-        if (!file) return;
-        if (this.beforeRead && !this.beforeRead(file)) return;
-        var reader = new FileReader();
-        reader.onload = (e) => {
-          this.afterRead && this.afterRead(
-            {
-              file: file,
-              content: e.target.result
-            });
-          this.$refs.input && (this.$refs.input.value = '');
-        };
-        if (this.resultType === 'dataUrl') {
-          reader.readAsDataURL(file);
-        } else if (this.resultType === 'text') {
-          reader.readAsText(file);
-        }
+    beforeRead: Function,
+    afterRead: Function,
+    resultType: {
+      type: String,
+      default: 'dataUrl',
+      validator: value => value === 'dataUrl' || value === 'text'
+    }
+  },
+
+  methods: {
+    onValueChange(event) {
+      if (this.disable) {
+        return;
+      }
+
+      const file = event.target.files[0];
+      if (!file || (this.beforeRead && !this.beforeRead(file))) {
+        return;
+      }
+
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        this.afterRead && this.afterRead({
+          file,
+          content: e.target.result
+        });
+        this.$refs.input && (this.$refs.input.value = '');
+      };
+
+      if (this.resultType === 'dataUrl') {
+        reader.readAsDataURL(file);
+      } else if (this.resultType === 'text') {
+        reader.readAsText(file);
       }
     }
-  };
+  }
+};
 </script>

From 5b1e27073deb96c8fffc952857d3cb9f192e16cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 24 Aug 2017 15:07:00 +0800
Subject: [PATCH 082/126] Progress: optimzie dom struct

---
 docs/examples-docs/progress.md     | 63 ++++++++++--------------------
 packages/progress/index.vue        | 53 +++++++------------------
 packages/vant-css/src/progress.css | 45 ++++++++++-----------
 3 files changed, 55 insertions(+), 106 deletions(-)

diff --git a/docs/examples-docs/progress.md b/docs/examples-docs/progress.md
index efb9a2993..917183190 100644
--- a/docs/examples-docs/progress.md
+++ b/docs/examples-docs/progress.md
@@ -1,13 +1,11 @@
 <style>
 .demo-progress {
-  &__wrapper {
-    padding: 5px;
+  .van-progress {
     margin: 20px 10px;
   }
 } 
 </style>
 
-
 ## Progress 进度条
 
 ### 使用指南
@@ -21,57 +19,37 @@ Vue.component(Progress.name, Progress);
 
 #### 基础用法
 
-默认情况进度条为蓝色，使用`percentage`属性来设置当前进度。
+进度条默认为蓝色，使用`percentage`属性来设置当前进度
 
 :::demo 基础用法
 ```html
-<div class="demo-progress__wrapper">
-  <van-progress class="demo-progress__demo1" :percentage="0"></van-progress>
-</div>
-<div class="demo-progress__wrapper">
-  <van-progress class="demo-progress__demo2" :percentage="46"></van-progress>
-</div>
-<div class="demo-progress__wrapper">
-  <van-progress class="demo-progress__demo1" :percentage="100"></van-progress>
-</div>
+<van-progress :percentage="0"></van-progress>
+<van-progress :percentage="46"></van-progress>
+<van-progress :percentage="100"></van-progress>
 ```
 :::
 
 
-#### Inactive
+#### 进度条置灰
 
-是否置灰进度条，一般用于进度条被取消时。
-
-:::demo Inactive
+:::demo 进度条置灰
 ```html
-<div class="demo-progress__wrapper">
-  <van-progress class="demo-progress__demo1" inactive :percentage="0"></van-progress>
-</div>
-<div class="demo-progress__wrapper">
-  <van-progress class="demo-progress__demo2" inactive :percentage="46"></van-progress>
-</div>
-<div class="demo-progress__wrapper">
-  <van-progress class="demo-progress__demo1" inactive :percentage="100"></van-progress>
-</div>
+<van-progress inactive :percentage="0"></van-progress>
+<van-progress inactive :percentage="46"></van-progress>
+<van-progress inactive :percentage="100"></van-progress>
 ```
 :::
 
 
-#### 自定义颜色和文字
+#### 样式定制
 
 可以使用`pivot-text`属性自定义文字，`color`属性自定义进度条颜色
 
-:::demo 自定义颜色和文字
+:::demo 样式定制
 ```html
-<div class="demo-progress__wrapper">
-  <van-progress class="demo-progress__demo1" pivot-text="红色" color="#ed5050" :percentage="26"></van-progress>
-</div>
-<div class="demo-progress__wrapper">
-  <van-progress class="demo-progress__demo1" pivot-text="橙色" color="#f60" :percentage="46"></van-progress>
-</div>
-<div class="demo-progress__wrapper">
-  <van-progress class="demo-progress__demo1" pivot-text="黄色" color="#f09000" :percentage="66"></van-progress>
-</div>
+<van-progress pivot-text="红色" color="#ed5050" :percentage="26"></van-progress>
+<van-progress pivot-text="橙色" color="#f60" :percentage="46"></van-progress>
+<van-progress pivot-text="黄色" color="#f09000" :percentage="66"></van-progress>
 ```
 :::
 
@@ -79,9 +57,8 @@ Vue.component(Progress.name, Progress);
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| inactive | 是否置灰 | `boolean`  | `false`          | `true`, `false`    |
-| percentage | 进度百分比 | `number`  | `false`          | `0-100`    |
-| pivotText | 文字显示 | `string`  | 百分比文字          | -   |
-| color | 进度条颜色 | `string`  | `#38f`    | hexvalue   |
-| textColor | 进度条文字颜色 | `string`  | `#fff`    | hexvalue   |
-
+| inactive | 是否置灰 | `boolean` | `false` | |
+| percentage | 进度百分比 | `number` | `false` | `0-100` |
+| pivotText | 文字显示 | `string` | 百分比文字 | - |
+| color | 进度条颜色 | `string` | `#38f` | hexvalue |
+| textColor | 进度条文字颜色 | `string` | `#fff` | hexvalue |
diff --git a/packages/progress/index.vue b/packages/progress/index.vue
index 4e89cfd58..685a46135 100644
--- a/packages/progress/index.vue
+++ b/packages/progress/index.vue
@@ -1,27 +1,11 @@
 <template>
   <div class="van-progress">
-    <div class="van-progress__bar">
-      <span class="van-progress__bar__finished-portion" :style="{backgroundColor: componentColor, width: percentage + '%'}"></span>
-      <span class="van-progress__bar__pivot" :style="pivotStyle">{{ pivotText }}</span>
-    </div>
+    <span class="van-progress__portion" :style="portionStyle"></span>
+    <span class="van-progress__pivot" :style="pivotStyle">{{ pivotText }}</span>
   </div>
 </template>
 
 <script>
-/**
- * van-progress
- * @module components/progress
- * @desc 开关
- * @param {boolean} [inactive=false] - 是否置灰
- * @param {number} [percentage=0] - 进度百分比
- * @param {string} [pivotText=percentage] - 进度条显示文字
- * @param {string} [color='#38f'] - 进度条颜色
- * @param {string} [textColor='#fff'] - 进度条文字颜色
- *
- * @example
- * <van-switch checked="true" disabled="false"></van-switch>
- */
-
 const DEFAULT_COLOR = '#38f';
 const DEFAULT_TEXT_COLOR = '#fff';
 const INACTIVE_COLOR = '#cacaca';
@@ -33,14 +17,12 @@ export default {
     percentage: {
       type: Number,
       required: true,
-      validator(value) {
-        return value <= 100 && value >= 0;
-      }
+      validator: value => value >= 0 && value <= 100
     },
     inactive: Boolean,
     pivotText: {
       type: String,
-      default: function() {
+      default() {
         return this.percentage + '%';
       }
     },
@@ -59,24 +41,19 @@ export default {
       return this.inactive ? INACTIVE_COLOR : this.color;
     },
     pivotStyle() {
-      const pivotStyle = {
-        backgroundColor: this.componentColor,
+      const { percentage } = this;
+      return {
         color: this.textColor,
-        left: this.percentage + '%',
-        marginLeft: '-14px'
+        backgroundColor: this.componentColor,
+        left: percentage <= 5 ? '0%' : percentage >= 95 ? '100%' : percentage + '%',
+        marginLeft: percentage <= 5 ? '0' : percentage >= 95 ? '-28px' : '-14px'
+      };
+    },
+    portionStyle() {
+      return {
+        width: this.percentage + '%',
+        backgroundColor: this.componentColor
       };
-      if (this.percentage <= 5) {
-        pivotStyle.left = '0%';
-        pivotStyle.marginLeft = '0';
-      } else if (this.percentage >= 95) {
-        pivotStyle.left = '100%';
-        pivotStyle.marginLeft = '-28px';
-      } else {
-        pivotStyle.left = this.percentage + '%';
-        pivotStyle.marginLeft = '-14px';
-      }
-
-      return pivotStyle;
     }
   }
 };
diff --git a/packages/vant-css/src/progress.css b/packages/vant-css/src/progress.css
index a087660fb..645d7db64 100644
--- a/packages/vant-css/src/progress.css
+++ b/packages/vant-css/src/progress.css
@@ -1,32 +1,27 @@
 @import './common/var.css';
 
 .van-progress {
-  &__bar {
-    height: 4px;
-    border-radius: 4.5px;
-    width: 100%;
-    background: $c-gray-light;
-    position: relative;
+  height: 4px;
+  position: relative;
+  border-radius: 4px;
+  background: $c-gray-light;
 
-    &__finished-portion {
-      border-radius: 4.5px;
-      height: 100%;
-      position: absolute;
-      left: 0;
-      display: inline-block;
-    }
+  &__portion {
+    left: 0;
+    height: 100%;
+    position: absolute;
+    border-radius: 4px;
+  }
 
-    &__pivot {
-      padding: 2px 0;
-      font-size: 8px;
-      position: absolute;
-      border-radius: 6px;
-      width: 28px;
-      background-color: $c-gray-light;
-      line-height: 8px;
-      text-align: center;
-      top: 50%;
-      transform: translate3d(0, -50%, 0);
-    }
+  &__pivot {
+    top: 50%;
+    width: 28px;
+    font-size: 8px;
+    margin-top: -6px;
+    position: absolute;
+    border-radius: 6px;
+    line-height: 12px;
+    text-align: center;
+    background-color: $c-gray-light;
   }
 }

From 14085f5facbe46bd194b588f33ee2f447aa6dc00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 24 Aug 2017 15:13:11 +0800
Subject: [PATCH 083/126] fix: progress test cases

---
 package.json                     |  2 +-
 test/unit/specs/progress.spec.js |  4 ++--
 yarn.lock                        | 29 ++++++++++++++++++++---------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index f6ff3a9f2..f51ff75c3 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "cross-env": "^5.0.5",
     "css-loader": "^0.28.5",
     "eslint-plugin-vue": "^2.1.0",
-    "extract-text-webpack-plugin": "^3.0.0",
+    "extract-text-webpack-plugin": "2.0.0",
     "felint": "^0.5.0-alpha.3",
     "file-loader": "^0.11.2",
     "file-save": "^0.2.0",
diff --git a/test/unit/specs/progress.spec.js b/test/unit/specs/progress.spec.js
index 69b6cf763..d70226746 100644
--- a/test/unit/specs/progress.spec.js
+++ b/test/unit/specs/progress.spec.js
@@ -9,8 +9,8 @@ describe('Progress', () => {
     wrapper = mount(Progress, {
       propsData: propsData
     });
-    bar = wrapper.find('.van-progress__bar__finished-portion')[0];
-    pivot = wrapper.find('.van-progress__bar__pivot')[0];
+    bar = wrapper.find('.van-progress__portion')[0];
+    pivot = wrapper.find('.van-progress__pivot')[0];
   };
 
   afterEach(() => {
diff --git a/yarn.lock b/yarn.lock
index de34d1c02..28f96953e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -67,7 +67,7 @@ ajv-keywords@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
 
-ajv@^4.7.0, ajv@^4.9.1:
+ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
@@ -305,7 +305,7 @@ async@2.1.4:
   dependencies:
     lodash "^4.14.0"
 
-async@^2.1.2, async@^2.4.1:
+async@^2.1.2:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
@@ -2768,14 +2768,14 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extract-text-webpack-plugin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz#90caa7907bc449f335005e3ac7532b41b00de612"
+extract-text-webpack-plugin@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0.tgz#8640f72609800a3528f13a2a9634d566a5c1ae60"
   dependencies:
-    async "^2.4.1"
-    loader-utils "^1.1.0"
-    schema-utils "^0.3.0"
-    webpack-sources "^1.0.1"
+    ajv "^4.11.2"
+    async "^2.1.2"
+    loader-utils "^1.0.2"
+    webpack-sources "^0.1.0"
 
 extract-zip@~1.6.5:
   version "1.6.5"
@@ -6816,6 +6816,10 @@ source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
+source-list-map@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+
 source-map-support@^0.4.15:
   version "0.4.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.16.tgz#16fecf98212467d017d586a2af68d628b9421cd8"
@@ -7707,6 +7711,13 @@ webpack-merge@^4.1.0:
   dependencies:
     lodash "^4.17.4"
 
+webpack-sources@^0.1.0:
+  version "0.1.5"
+  resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
+  dependencies:
+    source-list-map "~0.1.7"
+    source-map "~0.5.3"
+
 webpack-sources@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"

From c7b96bd8e0dbd26fe22c821365fd4431097e0b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 24 Aug 2017 15:27:56 +0800
Subject: [PATCH 084/126] Progress: fix disable prop

---
 packages/uploader/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/uploader/index.vue b/packages/uploader/index.vue
index 59d120bbc..8e7e0cc42 100644
--- a/packages/uploader/index.vue
+++ b/packages/uploader/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="van-uploader">
     <slot></slot>
-    <input type="file" @change="onValueChange" :disabled="disable" class="van-uploader__input" ref="input" />
+    <input type="file" @change="onValueChange" :disabled="disabled" class="van-uploader__input" ref="input" />
   </div>
 </template>
 
@@ -10,7 +10,7 @@ export default {
   name: 'van-uploader',
 
   props: {
-    disable: {
+    disabled: {
       type: Boolean,
       default: false
     },
@@ -25,7 +25,7 @@ export default {
 
   methods: {
     onValueChange(event) {
-      if (this.disable) {
+      if (this.disabled) {
         return;
       }
 

From c5474b21069694a66415c77f52eb313d4ca27ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 24 Aug 2017 20:36:24 +0800
Subject: [PATCH 085/126] CellSwipe: code review

---
 packages/cell-swipe/index.vue        | 153 +++++++++++++--------------
 packages/vant-css/src/cell-swipe.css |  29 +++--
 2 files changed, 86 insertions(+), 96 deletions(-)

diff --git a/packages/cell-swipe/index.vue b/packages/cell-swipe/index.vue
index 6b9c024b8..7c1b87dde 100644
--- a/packages/cell-swipe/index.vue
+++ b/packages/cell-swipe/index.vue
@@ -1,15 +1,19 @@
 <template>
-  <div v-clickoutside:touchstart="swipeMove" @click="swipeMove()" @touchstart="startDrag" @touchmove="onDrag" @touchend="endDrag" class="van-cell-swipe" ref="cell">
-    <div class="van-cell-wrapper">
-      <slot>单元格内容</slot>
-    </div>
-    <div class="van-cell-left">
-      <div ref="left">
+  <div 
+    v-clickoutside:touchstart="swipeMove"
+    class="van-cell-swipe"
+    @click="swipeMove()"
+    @touchstart="startDrag"
+    @touchmove="onDrag"
+    @touchend="endDrag"
+    @touchcancel="endDrag"
+  >
+    <div class="van-cell-swipe__wrapper" :style="wrapperStyle" @transitionend="swipe = false">
+      <div class="van-cell-swipe__left" v-if="leftWidth">
         <slot name="left"></slot>
       </div>
-    </div>
-    <div class="van-cell-right">
-      <div ref="right">
+      <slot></slot>
+      <div class="van-cell-swipe__right" v-if="rightWidth">
         <slot name="right"></slot>
       </div>
     </div>
@@ -17,112 +21,101 @@
 </template>
 
 <script>
-import { once } from '../utils/dom';
 import Clickoutside from '../utils/clickoutside';
 
 export default {
   name: 'van-cell-swipe',
+
   props: {
-    'leftWidth': { type: Number, default: 0 },
-    'rightWidth': { type: Number, default: 0 }
-  },
-  directives: { Clickoutside },
-  data() {
-    return {
-      start: { x: 0, y: 0 }
-    };
-  },
-  computed: {
-    leftDefaultTransform() {
-      return this.translate3d(-this.leftWidth - 1);
+    leftWidth: {
+      type: Number,
+      default: 0
     },
-    rightDefaultTransform() {
-      return this.translate3d(this.rightWidth);
+    rightWidth: {
+      type: Number,
+      default: 0
     }
   },
-  mounted() {
-    this.wrap = this.$refs.cell.querySelector('.van-cell-wrapper');
-    this.leftElm = this.$refs.left;
-    this.leftWrapElm = this.leftElm.parentNode;
-    this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
 
-    this.rightElm = this.$refs.right;
-    this.rightWrapElm = this.rightElm.parentNode;
-    this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
+  directives: {
+    Clickoutside
   },
+
+  data() {
+    return {
+      offset: 0
+    };
+  },
+
+  computed: {
+    wrapperStyle() {
+      return {
+        transform: `translate3d(${this.offset}px, 0, 0)`
+      }
+    }
+  },
+
   methods: {
     resetSwipeStatus() {
       this.swiping = false; // 是否正在拖动
       this.opened = true; // 记录是否滑动左右 或者 注册
-      this.offsetLeft = 0; // 记录单次拖动的拖动距离
-    },
-    translate3d(offset) {
-      return `translate3d(${offset}px, 0, 0)`;
     },
+
     swipeMove(offset = 0) {
-      this.wrap.style.webkitTransform = this.translate3d(offset);
-      this.rightWrapElm.style.webkitTransform = this.translate3d(this.rightWidth + offset);
-      this.leftWrapElm.style.webkitTransform = this.translate3d(-this.leftWidth + offset);
+      this.offset = offset;
       offset && (this.swiping = true);
     },
+
     swipeLeaveTransition(direction) {
-      setTimeout(() => {
-        this.swipeLeave = true;
-        // left
-        if (direction > 0 && -this.offsetLeft > this.rightWidth * 0.4 && this.rightWidth > 0) {
-          this.swipeMove(-this.rightWidth);
-          this.resetSwipeStatus();
-          return;
-          // right
-        } else if (direction < 0 && this.offsetLeft > this.leftWidth * 0.4 && this.leftWidth > 0) {
-          this.swipeMove(this.leftWidth);
-          this.resetSwipeStatus();
-          return;
-        } else {
-          this.swipeMove(0);
-          once(this.wrap, 'webkitTransitionEnd', () => {
-            this.wrap.style.webkitTransform = '';
-            this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform;
-            this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform;
-            this.swipeLeave = false;
-            this.swiping = false;
-          });
-        }
-      }, 0);
+      const { offset, leftWidth, rightWidth } = this;
+      // right
+      if (direction > 0 && -offset > rightWidth * 0.4 && rightWidth > 0) {
+        this.swipeMove(-rightWidth);
+        this.resetSwipeStatus();
+      }
+      // left
+      else if (direction < 0 && offset >leftWidth * 0.4 && leftWidth > 0) {
+        this.swipeMove(leftWidth);
+        this.resetSwipeStatus();
+      } else {
+        this.swipeMove();
+      }
     },
-    startDrag(evt) {
-      evt = evt.changedTouches ? evt.changedTouches[0] : evt;
-      this.dragging = true;
-      this.start.x = evt.pageX;
-      this.start.y = evt.pageY;
+
+    startDrag(event) {
+      this.startX = event.changedTouches[0].pageX;
+      this.startY = event.changedTouches[0].pageY;
     },
-    onDrag(evt) {
+
+    onDrag(event) {
       if (this.opened) {
-        !this.swiping && this.swipeMove(0);
+        !this.swiping && this.swipeMove();
         this.opened = false;
         return;
       }
-      if (!this.dragging) return;
-      let swiping;
-      const e = evt.changedTouches ? evt.changedTouches[0] : evt;
-      const offsetTop = e.pageY - this.start.y;
-      const offsetLeft = this.offsetLeft = e.pageX - this.start.x;
+
+      const offsetTop = event.changedTouches[0].pageY - this.startY;
+      const offsetLeft = event.changedTouches[0].pageX - this.startX;
       if ((offsetLeft < 0 && -offsetLeft > this.rightWidth) ||
         (offsetLeft > 0 && offsetLeft > this.leftWidth) ||
         (offsetLeft > 0 && !this.leftWidth) ||
         (offsetLeft < 0 && !this.rightWidth)) {
         return;
       }
+
       const y = Math.abs(offsetTop);
       const x = Math.abs(offsetLeft);
-      swiping = !(x < 5 || (x >= 5 && y >= x * 1.73));
-      if (!swiping) return;
-      evt.preventDefault();
-      this.swipeMove(offsetLeft);
+      const swiping = !(x < 5 || (x >= 5 && y >= x * 1.73));
+      if (swiping) {
+        event.preventDefault();
+        this.swipeMove(offsetLeft);
+      };
     },
+
     endDrag() {
-      if (!this.swiping) return;
-      this.swipeLeaveTransition(this.offsetLeft > 0 ? -1 : 1);
+      if (this.swiping) {
+        this.swipeLeaveTransition(this.offset > 0 ? -1 : 1);        
+      };
     }
   }
 };
diff --git a/packages/vant-css/src/cell-swipe.css b/packages/vant-css/src/cell-swipe.css
index 2bb7a35e8..3233148a6 100644
--- a/packages/vant-css/src/cell-swipe.css
+++ b/packages/vant-css/src/cell-swipe.css
@@ -1,29 +1,26 @@
-.van-cell {
-  &-swipe {
-    position: relative;
-    min-height: 48px;
-    overflow: hidden;
+.van-cell-swipe {
+  overflow: hidden;
+  position: relative;
 
-    .van-cell-wrapper,
-    .van-cell-left,
-    .van-cell-right {
-      transition: transform 150ms ease-in-out;
-    }
+  &__wrapper,
+  &__left,
+  &__right {
+    transition: transform .15s ease-in-out;
   }
 
-  &-left,
-  &-right {
-    position: absolute;
-    height: 100%;
+  &__left,
+  &__right {
     top: 0;
+    height: 100%;
+    position: absolute;
   }
 
-  &-left {
+  &__left {
     left: 0;
     transform: translate3d(-100%, 0, 0);
   }
 
-  &-right {
+  &__right {
     right: 0;
     transform: translate3d(100%, 0, 0);
   }

From c6b8de35418127c32ab3351704f31ef5b2380ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 24 Aug 2017 20:36:29 +0800
Subject: [PATCH 086/126] CellSwipe: improve test coverage

---
 test/unit/specs/cell-swipe.spec.js | 230 +++++++++++++----------------
 test/unit/utils.js                 |  33 ++++-
 2 files changed, 134 insertions(+), 129 deletions(-)

diff --git a/test/unit/specs/cell-swipe.spec.js b/test/unit/specs/cell-swipe.spec.js
index 46325f291..89e5ca833 100644
--- a/test/unit/specs/cell-swipe.spec.js
+++ b/test/unit/specs/cell-swipe.spec.js
@@ -1,141 +1,117 @@
 import CellSwipe from 'packages/cell-swipe';
 import { mount } from 'avoriaz';
+import { triggerTouch } from '../utils';
+
+const defaultProps = {
+  propsData: {
+    leftWidth: 100,
+    rightWidth: 100
+  }
+}
 
 describe('CellSwipe', () => {
   let wrapper;
   afterEach(() => {
     wrapper && wrapper.destroy();
   });
+  
+  it('render left or right part when has width', () => {
+    wrapper = mount(CellSwipe, defaultProps);
+    expect(wrapper.find('.van-cell-swipe__left').length).to.equal(1);
+    expect(wrapper.find('.van-cell-swipe__right').length).to.equal(1);
+  });
 
-  it('create a CellSwipe', () => {
-    wrapper = mount(CellSwipe, {
-      propsData: {
-        leftWidth: 2,
-        rightWidth: 2
-      }
+  it('not render left or right part when width is 0', () => {
+    wrapper = mount(CellSwipe);
+    expect(wrapper.find('.van-cell-swipe__left').length).to.equal(0);
+    expect(wrapper.find('.van-cell-swipe__right').length).to.equal(0);
+  });
+
+  it('drag and show left part', () => {
+    wrapper = mount(CellSwipe, defaultProps);
+
+    triggerTouch(wrapper, 'touchstart', 0, 0);
+    expect(wrapper.vm.startX).to.equal(0);
+    expect(wrapper.vm.startY).to.equal(0);
+
+    triggerTouch(wrapper, 'touchmove', 50, 0);
+    expect(wrapper.vm.offset).to.equal(50);
+
+    triggerTouch(wrapper, 'touchend', 50, 0);
+    expect(wrapper.vm.offset).to.equal(100);
+    wrapper.vm.$nextTick(() => {
+      expect(wrapper.vm.opened).to.be.true;
     });
-    wrapper.vm.startDrag({
-      pageX: 0,
-      pageY: 0
+  });
+
+  it('drag and show right part', () => {
+    wrapper = mount(CellSwipe, defaultProps);
+
+    triggerTouch(wrapper, 'touchstart', 0, 0);
+    triggerTouch(wrapper, 'touchmove', -50, 0);
+    triggerTouch(wrapper, 'touchend', -50, 0);
+    expect(wrapper.vm.offset).to.equal(-100);
+    wrapper.vm.$nextTick(() => {
+      expect(wrapper.vm.opened).to.be.true;
     });
-    wrapper.vm.onDrag({
-      preventDefault() {},
-      pageY: 0,
-      pageX: 50
+  });
+
+  it('drag and reset left part', () => {
+    wrapper = mount(CellSwipe, defaultProps);
+
+    triggerTouch(wrapper, 'touchstart', 0, 0);
+    triggerTouch(wrapper, 'touchmove', 10, 0);
+    triggerTouch(wrapper, 'touchmove', 30, 0);
+    triggerTouch(wrapper, 'touchend', 30, 0);
+    expect(wrapper.vm.offset).to.equal(0);
+  });
+
+  it('drag and reset right part', () => {
+    wrapper = mount(CellSwipe, defaultProps);
+
+    triggerTouch(wrapper, 'touchstart', 0, 0);
+    triggerTouch(wrapper, 'touchmove', -10, 0);
+    triggerTouch(wrapper, 'touchmove', -30, 0);
+    triggerTouch(wrapper, 'touchend', -30, 0);
+    expect(wrapper.vm.offset).to.equal(0);
+  });
+
+  it('drag distance out of ranges', () => {
+    wrapper = mount(CellSwipe, defaultProps);
+
+    triggerTouch(wrapper, 'touchstart', 0, 0);
+    triggerTouch(wrapper, 'touchmove', 1000, 0);
+    expect(wrapper.vm.offset).to.equal(0);
+  });
+
+  it('drag and hide left part', (done) => {
+    wrapper = mount(CellSwipe, defaultProps);
+
+    triggerTouch(wrapper, 'touchstart', 0, 0);
+    triggerTouch(wrapper, 'touchmove', 20, 0);
+    triggerTouch(wrapper, 'touchmove', 50, 0);
+    triggerTouch(wrapper, 'touchend', 50, 0);
+    expect(wrapper.vm.offset).to.equal(100);
+    wrapper.vm.$nextTick(() => {
+      expect(wrapper.vm.opened).to.be.true;
+
+      triggerTouch(wrapper, 'touchstart', 0, 0);
+      triggerTouch(wrapper, 'touchmove', 1, 0);
+      
+      wrapper.vm.$nextTick(() => {
+        expect(wrapper.vm.offset).to.equal(0);
+        expect(wrapper.vm.opened).to.be.false;
+        done();
+      });
     });
-    wrapper.vm.offsetLeft = -20;
-    wrapper.vm.rightWidth = 10;
-    wrapper.vm.swipeLeaveTransition(1);
-    wrapper.vm.endDrag();
-    expect(wrapper.hasClass('van-cell-swipe')).to.be.true;
-  });
-});
-
-
-describe('CellSwipe-left', () => {
-  let wrapper;
-  afterEach(() => {
-    wrapper && wrapper.destroy();
-  });
-
-  it('create a CellSwipe left', () => {
-    wrapper = mount(CellSwipe, {
-      propsData: {
-        leftWidth: 2,
-        rightWidth: 2
-      }
-    });
-    wrapper.vm.startDrag({
-      changedTouches: [{
-        pageX: 0,
-        pageY: 0
-      }
-      ]
-    });
-    wrapper.vm.onDrag({
-      preventDefault() {},
-      changedTouches: [{
-        pageX: 0,
-        pageY: -50
-      }
-      ]
-    });
-    wrapper.vm.offsetLeft = 20;
-    wrapper.vm.rightWidth = 10;
-    wrapper.vm.swipeLeaveTransition(-1);
-    wrapper.vm.endDrag();
-    expect(wrapper.hasClass('van-cell-swipe')).to.be.true;
-  });
-});
-
-describe('CellSwipe-0', () => {
-  let wrapper;
-  afterEach(() => {
-    wrapper && wrapper.destroy();
-  });
-
-  it('create a CellSwipe 0', () => {
-    wrapper = mount(CellSwipe, {
-      propsData: {
-        leftWidth: 0,
-        rightWidth: 2
-      }
-    });
-    wrapper.vm.startDrag({
-      pageX: 0,
-      pageY: 0
-    });
-    wrapper.vm.onDrag({
-      preventDefault() {},
-      pageY: 0,
-      pageX: -2
-    });
-    wrapper.vm.opened = true;
-    wrapper.vm.onDrag({
-      preventDefault() {},
-      pageY: 0,
-      pageX: -2
-    });
-    wrapper.vm.opened = false;
-    wrapper.vm.onDrag({
-      preventDefault() {},
-      pageY: 0,
-      pageX: 40
-    });
-    wrapper.vm.swipeLeaveTransition(0);
-    wrapper.vm.endDrag();
-    expect(wrapper.hasClass('van-cell-swipe')).to.be.true;
-  });
-});
-
-
-describe('CellSwipe-0', () => {
-  let wrapper;
-  afterEach(() => {
-    wrapper && wrapper.destroy();
-  });
-
-  it('create a CellSwipe 0', () => {
-    wrapper = mount(CellSwipe, {
-      propsData: {
-        leftWidth: 0,
-        rightWidth: 2
-      }
-    });
-    wrapper.vm.startDrag({
-      pageX: 0,
-      pageY: 0
-    });
-    wrapper.vm.onDrag({
-      preventDefault() {},
-      pageY: 1000,
-      pageX: 40
-    });
-    wrapper.vm.swipeMove();
-    wrapper.vm.swiping = false;
-    wrapper.vm.endDrag();
-    wrapper.vm.swiping = true;
-    wrapper.vm.endDrag();
-    expect(wrapper.hasClass('van-cell-swipe')).to.be.true;
+  });
+
+  it('drag vertical', () => {
+    wrapper = mount(CellSwipe, defaultProps);
+
+    triggerTouch(wrapper, 'touchstart', 0, 0);
+    triggerTouch(wrapper, 'touchmove', 0, 100);
+    triggerTouch(wrapper, 'touchend', 0, 100);
+    expect(wrapper.vm.offset).to.equal(0);
   });
 });
diff --git a/test/unit/utils.js b/test/unit/utils.js
index b8d768787..262356ed2 100644
--- a/test/unit/utils.js
+++ b/test/unit/utils.js
@@ -31,7 +31,9 @@ export function DOMChecker(wrapper, rules) {
   if (style) {
     Object.keys(style).forEach(key => {
       Object.keys(style[key]).forEach(prop => {
-        expect(wrapper.find(key)[0].hasStyle(prop, style[key][prop])).to.equal(true);
+        expect(wrapper.find(key)[0].hasStyle(prop, style[key][prop])).to.equal(
+          true
+        );
       });
     });
   }
@@ -39,8 +41,35 @@ export function DOMChecker(wrapper, rules) {
   if (noStyle) {
     Object.keys(noStyle).forEach(key => {
       Object.keys(noStyle[key]).forEach(prop => {
-        expect(wrapper.find(key)[0].hasStyle(prop, noStyle[key][prop])).to.equal(false);
+        expect(
+          wrapper.find(key)[0].hasStyle(prop, noStyle[key][prop])
+        ).to.equal(false);
       });
     });
   }
 }
+
+// 触发一个 touch 事件
+export function triggerTouch(wrapper, eventName, x, y) {
+  const el = wrapper.element ? wrapper.element : wrapper;
+  const touch = {
+    identifier: Date.now(),
+    target: el,
+    pageX: x,
+    pageY: y,
+    clientX: x,
+    clientY: y,
+    radiusX: 2.5,
+    radiusY: 2.5,
+    rotationAngle: 10,
+    force: 0.5,
+  };
+
+  const event = document.createEvent('CustomEvent');
+  event.initCustomEvent(eventName, true, true, {});
+  event.touches = [touch];
+  event.targetTouches = [touch];
+  event.changedTouches = [touch];
+
+  el.dispatchEvent(event);
+}

From 057049c15aaad61dd35fa25fe2216963fb49a0fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 24 Aug 2017 20:36:42 +0800
Subject: [PATCH 087/126] feat: support run single test

---
 package.json                  |   1 +
 test/unit/get-webpack-conf.js | 178 +++++++++++++++++-----------------
 test/unit/index.js            |  12 ++-
 test/unit/karma.conf.js       |   9 +-
 test/unit/selector.js         |  19 ++++
 5 files changed, 126 insertions(+), 93 deletions(-)
 create mode 100644 test/unit/selector.js

diff --git a/package.json b/package.json
index f51ff75c3..954d349c8 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "test": "karma start test/unit/karma.conf.js --single-run",
     "test:coverage": "open test/unit/coverage/lcov-report/index.html",
     "test:watch": "karma start test/unit/karma.conf.js",
+    "test:single": "node ./test/unit/selector.js",
     "release": "npm run bootstrap && sh build/release.sh"
   },
   "repository": {
diff --git a/test/unit/get-webpack-conf.js b/test/unit/get-webpack-conf.js
index 1c57dd658..6d0818692 100644
--- a/test/unit/get-webpack-conf.js
+++ b/test/unit/get-webpack-conf.js
@@ -2,96 +2,96 @@ const path = require('path');
 const webpack = require('webpack');
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
 
-const webpackConfig = {
-  output: {
-    path: path.resolve(process.cwd(), 'dist'),
-    publicPath: '/dist/',
-    filename: '[name].js',
-    chunkFilename: '[id].js',
-    libraryTarget: 'umd'
-  },
-  plugins: [
-    new ProgressBarPlugin(),
-    new webpack.LoaderOptionsPlugin({
-      minimize: true,
-      options: {
-        babel: {
-          presets: ['env'],
-          plugins: ['transform-runtime', 'transform-vue-jsx']
-        },
-        vue: {
-          autoprefixer: false,
-          preserveWhitespace: false
+function getWebpackConfig(testFileName) {
+  return {
+    output: {
+      path: path.resolve(process.cwd(), 'dist'),
+      publicPath: '/dist/',
+      filename: '[name].js',
+      chunkFilename: '[id].js',
+      libraryTarget: 'umd'
+    },
+    plugins: [
+      new ProgressBarPlugin(),
+      new webpack.LoaderOptionsPlugin({
+        minimize: true,
+        options: {
+          babel: {
+            presets: ['env'],
+            plugins: ['transform-runtime', 'transform-vue-jsx']
+          },
+          vue: {
+            autoprefixer: false,
+            preserveWhitespace: false
+          }
         }
-      }
-    })
-  ],
-  stats: 'errors-only',
-  resolve: {
-    modules: [
-      path.resolve(process.cwd(), 'node_modules'),
-      'node_modules'
+      }),
+      new webpack.DefinePlugin({
+        'process.env': {
+          TEST_FILE: `"${testFileName}"`
+        }
+      })
     ],
-    extensions: ['.js', '.json', '.vue'],
-    alias: {
-      src: path.resolve(process.cwd(), 'src'),
-      packages: path.resolve(process.cwd(), 'packages'),
-      examples: path.resolve(process.cwd(), 'examples'),
-      vue$: 'vue/dist/vue.common.js'
-    }
-  },
-  module: {
-    rules: [
-      {
-        enforce: 'pre',
-        test: /\.js$/,
-        exclude: /node_modules|vue-router\/|vue-loader\/|docs|test|src\/index|src\/utils|src\/mixins|packages\/swipe/,
-        use: ['isparta-loader']
-      },
-      {
-        test: /\.js$/,
-        exclude: /node_modules|vue-router\/|vue-loader\//,
-        use: ['babel-loader']
-      },
-      {
-        test: /\.(css|pcss)$/,
-        use: [
-          'style-loader',
-          'css-loader',
-          'postcss-loader'
-        ]
-      },
-      {
-        test: /\.(gif|png|jpe?g)(\?\S*)?$/,
-        use: [{
-          loader: 'url-loader',
-          options: {
-            query: {
-              limit: 10000,
-              name: 'static/[name].[hash:7].[ext]'
-            }
-          }
-        }]
-      },
-      {
-        test: /\.vue$/,
-        use: [{
-          loader: 'vue-loader',
-          options: {
-            loaders: {
-              css: [
-                'style-loader',
-                'css-loader',
-                'postcss-loader'
-              ],
-              js: ['isparta-loader']
-            }
-          }
-        }]
+    stats: 'errors-only',
+    resolve: {
+      modules: [path.resolve(process.cwd(), 'node_modules'), 'node_modules'],
+      extensions: ['.js', '.json', '.vue'],
+      alias: {
+        src: path.resolve(process.cwd(), 'src'),
+        packages: path.resolve(process.cwd(), 'packages'),
+        examples: path.resolve(process.cwd(), 'examples'),
+        vue$: 'vue/dist/vue.common.js'
       }
-    ]
-  },
-  devtool: '#inline-source-map'
-};
+    },
+    module: {
+      rules: [
+        {
+          enforce: 'pre',
+          test: /\.js$/,
+          exclude: /node_modules|vue-router\/|vue-loader\/|docs|test|src\/index|src\/utils|src\/mixins|packages\/swipe/,
+          use: ['isparta-loader']
+        },
+        {
+          test: /\.js$/,
+          exclude: /node_modules|vue-router\/|vue-loader\//,
+          use: ['babel-loader']
+        },
+        {
+          test: /\.(css|pcss)$/,
+          use: ['style-loader', 'css-loader', 'postcss-loader']
+        },
+        {
+          test: /\.(gif|png|jpe?g)(\?\S*)?$/,
+          use: [
+            {
+              loader: 'url-loader',
+              options: {
+                query: {
+                  limit: 10000,
+                  name: 'static/[name].[hash:7].[ext]'
+                }
+              }
+            }
+          ]
+        },
+        {
+          test: /\.vue$/,
+          use: [
+            {
+              loader: 'vue-loader',
+              options: {
+                loaders: {
+                  css: ['style-loader', 'css-loader', 'postcss-loader'],
+                  js: ['isparta-loader']
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    devtool: '#inline-source-map'
+  };
+}
 
-module.exports = webpackConfig;
+module.exports = getWebpackConfig;
diff --git a/test/unit/index.js b/test/unit/index.js
index fc003e86e..998623e9d 100644
--- a/test/unit/index.js
+++ b/test/unit/index.js
@@ -1,5 +1,13 @@
 require('packages/vant-css/src/index.css');
 
-// require all test files (files that ends with .spec.js)
+// 读取配置文件，判断运行单个测试文件还是所有测试文件
 const testsReq = require.context('./specs', true, /\.spec$/);
-testsReq.keys().forEach(testsReq);
+if (process.env.TEST_FILE) {
+  testsReq.keys().forEach((file) => {
+    if (file.indexOf(process.env.TEST_FILE) !== -1) {
+      testsReq(file);
+    }
+  });
+} else {
+  testsReq.keys().forEach(testsReq);
+}
\ No newline at end of file
diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
index e94bd9532..7c8a89d96 100644
--- a/test/unit/karma.conf.js
+++ b/test/unit/karma.conf.js
@@ -4,7 +4,7 @@ require('babel-core/register')({
   presets: [require('babel-preset-env')]
 });
 
-var webpackConfig = require('./get-webpack-conf');
+var getWebpackConfig = require('./get-webpack-conf');
 var travis = process.env.TRAVIS;
 
 module.exports = function(config) {
@@ -16,7 +16,7 @@ module.exports = function(config) {
     preprocessors: {
       './index.js': ['webpack', 'sourcemap']
     },
-    webpack: webpackConfig,
+    webpack: getWebpackConfig(getTestFileName()),
     webpackMiddleware: {
       noInfo: true
     },
@@ -30,3 +30,8 @@ module.exports = function(config) {
     singleRun: false
   });
 };
+
+function getTestFileName() {
+  const flagIndex = process.argv.indexOf('--file');
+  return flagIndex !== -1 ? process.argv[flagIndex + 1] : '';
+}
diff --git a/test/unit/selector.js b/test/unit/selector.js
new file mode 100644
index 000000000..ea3b633eb
--- /dev/null
+++ b/test/unit/selector.js
@@ -0,0 +1,19 @@
+/**
+ * 运行单个测试文件
+ */
+
+const fs = require('fs');
+const inquirer = require('inquirer');
+const path = require('path');
+const shell = require('shelljs');
+const files = fs.readdirSync(path.resolve(__dirname, './specs'));
+
+inquirer.prompt([{
+  type: 'list',
+  name: 'select',
+  message: '请选择要运行的测试文件：',
+  choices: files
+}], (result) => {
+  const file = result.select.replace('.spec.js', '');
+  shell.exec('karma start test/unit/karma.conf.js --color alway --file ' + file);
+});

From 34696d3f6e1ae09f283888ccfa3ea11cee74dae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 24 Aug 2017 20:39:06 +0800
Subject: [PATCH 088/126] remove dom.js

---
 packages/utils/dom.js | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 packages/utils/dom.js

diff --git a/packages/utils/dom.js b/packages/utils/dom.js
deleted file mode 100644
index bd9b6edb5..000000000
--- a/packages/utils/dom.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Vue from 'vue';
-
-export const once = function(el, event, fn) {
-  const listener = function() {
-    if (fn) {
-      fn.apply(this, arguments);
-    }
-    el.removeEventListener(event, listener);
-  };
-  el.addEventListener(event, listener);
-};

From 43693fa781777022c31504b09924b388423a14ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 25 Aug 2017 15:37:39 +0800
Subject: [PATCH 089/126] Dialog: support both function call and component call

---
 docs/examples-docs/dialog.md     |  95 ++++++++++++++--------------
 packages/dialog/dialog.vue       |  49 ++++++++++-----
 packages/dialog/index.js         | 105 +++++++++++--------------------
 packages/vant-css/src/button.css |   1 -
 packages/vant-css/src/dialog.css |  10 ++-
 test/unit/specs/dialog.spec.js   |  23 +++----
 6 files changed, 131 insertions(+), 152 deletions(-)

diff --git a/docs/examples-docs/dialog.md b/docs/examples-docs/dialog.md
index a40704c8c..cb71eacc0 100644
--- a/docs/examples-docs/dialog.md
+++ b/docs/examples-docs/dialog.md
@@ -9,33 +9,29 @@
 <script>
 import { Dialog } from 'packages/index';
 
+const message = '弹窗内容';
+
 export default {
   methods: {
-    handleAlertClick() {
+    onClickAlert() {
       Dialog.alert({
-        title: 'alert标题',
-        message: '弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。'
-      }).then((action) => {
-        console.log(action);
+        title: '标题',
+        message
       });
     },
 
-    handleAlert2Click() {
+    onClickAlert2() {
       Dialog.alert({
-        message: '无标题alert'
-      }).then((action) => {
-        console.log(action);
+        message
       });
     },
 
-    handleConfirmClick() {
+    onClickConfirm() {
       Dialog.confirm({
-        title: 'confirm标题',
-        message: '弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。'
-      }).then((action) => {
+        title: '标题',
+        message
+      }).catch(action => {
         console.log(action);
-      }, (error) => {
-        console.log(error);
       });
     }
   }
@@ -46,8 +42,6 @@ export default {
 
 ### 使用指南
 
-`Dialog`和其他组件不同，不是通过HTML结构的方式来使用，而是通过函数调用的方式。使用前需要先引入它，它接受一个数组作为参数，数组中的每一项对应了图片链接。
-
 ```js
 import { Dialog } from 'vant';
 ```
@@ -56,30 +50,30 @@ import { Dialog } from 'vant';
 
 #### 消息提示
 
-用于提示一些消息，只包含一个确认按钮。
+用于提示一些消息，只包含一个确认按钮
 
 :::demo 消息提示
 ```html
-<van-button @click="handleAlertClick">alert</van-button>
-<van-button @click="handleAlert2Click">无标题alert</van-button>
+<van-button @click="onClickAlert">Alert</van-button>
+<van-button @click="onClickAlert2">无标题 Alert</van-button>
 
 <script>
 export default {
   methods: {
-    handleAlertClick() {
+    onClickAlert() {
       Dialog.alert({
-        title: 'alert标题',
-        message: '弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。'
-      }).then((action) => {
-        console.log(action);
+        title: '标题',
+        message: '弹窗内容'
+      }).then(() => {
+        // on close
       });
     },
 
-    handleAlert2Click() {
+    onClickAlert2() {
       Dialog.alert({
-        message: '弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。'
-      }).then((action) => {
-        console.log(action);
+        message: '弹窗内容'
+      }).then(() => {
+        // on close
       });
     }
   }
@@ -90,23 +84,23 @@ export default {
 
 #### 消息确认
 
-用于确认消息，包含取消和确认按钮。
+用于确认消息，包含取消和确认按钮
 
 :::demo 消息确认
 ```html
-<van-button @click="handleConfirmClick">confirm</van-button>
+<van-button @click="onClickConfirm">Confirm</van-button>
 
 <script>
 export default {
   methods: {
-    handleConfirmClick() {
+    onClickConfirm() {
       Dialog.confirm({
-        title: 'confirm标题',
-        message: '弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。弹窗提示文字，左右始终距离边20PX，上下距离20PX，文字左对齐。'
-      }).then((action) => {
-        console.log(action);
-      }, (error) => {
-        console.log(error);
+        title: '标题',
+        message: '弹窗内容'
+      }).then(() => {
+        // on confirm
+      }).catch(() => {
+        // on cancel
       });
     }
   }
@@ -117,19 +111,22 @@ export default {
 
 ### 方法
 
-#### Dialog.alert(options)
-
-消息提示时使用该方法。
-
-#### Dialog.confirm(options)
-
-消息确认时使用该方法。
+| 方法名 | 参数 | 返回值 | 介绍 |
+|-----------|-----------|-----------|-------------|
+| Dialog.alert | options | `Promise`  | 展示消息提示弹窗 |
+| Dialog.confirm | options | `Promise`  | 展示消息确认弹窗 |
+| Dialog.close | - | `void`  | 关闭弹窗 |
 
 ### Options
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| title | 标题 | `string`  |  |   |
-| message | 内容 | `string`  |  |   |
-| confirmButtonText | 确认按钮的文案 | `string`  |  `确认` |   |
-| cancelButtonText | 取消按钮的文案 | `string`  | `取消` |   |
+| title | 标题 | `String`  |  |   |
+| message | 内容 | `String`  |  |   |
+| showConfirmButton | 是否展示确认按钮 | `Boolean`  |  `true` |   |
+| showCancelButton | 是否展示取消按钮 | `Boolean`  |  `false` |   |
+| confirmButtonText | 确认按钮的文案 | `String`  |  `确认` |   |
+| cancelButtonText | 取消按钮的文案 | `String`  | `取消` |   |
+| overlay | 是否展示蒙层 | `Boolean`  | `true` |   |
+| closeOnClickOverlay | 点击蒙层时是否关闭弹窗 | `Boolean`  | `false` |   |
+| lockOnScroll | 是否禁用背景滚动 | `Boolean`  | `true` |   |
diff --git a/packages/dialog/dialog.vue b/packages/dialog/dialog.vue
index aabc82ed8..7aec18626 100644
--- a/packages/dialog/dialog.vue
+++ b/packages/dialog/dialog.vue
@@ -2,8 +2,10 @@
   <transition name="van-dialog-bounce">
     <div class="van-dialog" v-show="value">
       <div class="van-dialog__header" v-if="title" v-text="title" />
-      <div class="van-dialog__content" v-if="message">
-        <div class="van-dialog__message" :class="{ 'van-dialog__message--withtitle': title }" v-html="message" />
+      <div class="van-dialog__content">
+        <slot>
+          <div class="van-dialog__message" v-if="message" :class="{ 'van-dialog__message--withtitle': title }" v-html="message" />
+        </slot>
       </div>
       <div class="van-dialog__footer" :class="{ 'is-twobtn': showCancelButton && showConfirmButton }">
         <van-button size="large" class="van-dialog__cancel" v-show="showCancelButton" @click="handleAction('cancel')">{{ cancelButtonText }}</van-button>
@@ -27,33 +29,48 @@ export default {
   mixins: [Popup],
 
   props: {
+    title: {
+      type: String,
+      default: ''
+    },
+    message: {
+      type: String,
+      default: ''
+    },
+    showConfirmButton: {
+      type: Boolean,
+      default: true
+    },
+    showCancelButton: {
+      type: Boolean,
+      default: false
+    },
+    confirmButtonText: {
+      type: String,
+      default: '确认'
+    },
+    cancelButtonText: {
+      type: String,
+      default: '取消'
+    },
+    callback: {
+      type: Function
+    },
     overlay: {
       default: true
     },
     closeOnClickOverlay: {
-      default: true
+      default: false
     },
     lockOnScroll: {
       default: true
     }
   },
 
-  data() {
-    return {
-      title: '',
-      message: '',
-      type: '',
-      showConfirmButton: true,
-      showCancelButton: false,
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      callback: null
-    };
-  },
-
   methods: {
     handleAction(action) {
       this.$emit('input', false);
+      this.$emit(action);
       this.callback && this.callback(action);
     }
   }
diff --git a/packages/dialog/index.js b/packages/dialog/index.js
index c5287b19c..02df39c96 100644
--- a/packages/dialog/index.js
+++ b/packages/dialog/index.js
@@ -1,97 +1,62 @@
 import Vue from 'vue';
-import Dialog from './dialog';
+import DialogComponent from './dialog';
 
-const DialogConstructor = Vue.extend(Dialog);
-
-let currentDialog;
 let instance;
-let dialogQueue = [];
 
-const defaultCallback = action => {
-  /* istanbul ignore else */
-  if (currentDialog) {
-    if (currentDialog.resolve && action === 'confirm') {
-      currentDialog.resolve(action);
-    } else if (currentDialog.reject && action === 'cancel') {
-      currentDialog.reject(action);
-    }
+const defaultConfig = {
+  value: true,
+  title: '',
+  message: '',
+  showCancelButton: false,
+  closeOnClickOverlay: false,
+  callback: action => {
+    instance[action === 'confirm' ? 'resolve' : 'reject'](action);
   }
 };
 
 const initInstance = () => {
+  const DialogConstructor = Vue.extend(DialogComponent);
   instance = new DialogConstructor({
     el: document.createElement('div')
   });
 
   instance.$on('input', value => {
     instance.value = value;
-  })
-  instance.callback = defaultCallback;
+  });
+
+  document.body.appendChild(instance.$el);
 };
 
-const showNextDialog = () => {
-  if (!instance) {
-    initInstance();
-  }
-
-  /* istanbul ignore else */
-  if (!instance.value && dialogQueue.length > 0) {
-    currentDialog = dialogQueue.shift();
-
-    const { options } = currentDialog;
-
-    for (const prop in options) {
-      /* istanbul ignore else */
-      if (options.hasOwnProperty(prop)) {
-        instance[prop] = options[prop];
-      }
+const Dialog = options => {
+  return new Promise((resolve, reject) => {
+    if (!instance) {
+      initInstance();
     }
 
-    instance.callback = options.callback || defaultCallback;
-    instance.value = true;
-    document.body.appendChild(instance.$el);
-  }
-};
-
-const DialogBox = options => {
-  return new Promise((resolve, reject) => { // eslint-disable-line
-    dialogQueue.push({
-      options: { ...options },
-      callback: options.callback,
-      resolve: resolve,
-      reject: reject
+    Object.assign(instance, {
+      resolve,
+      reject,
+      ...options
     });
-
-    showNextDialog();
   });
 };
 
-DialogBox.alert = function(options) {
-  return DialogBox({
-    type: 'alert',
-    title: '',
-    message: '',
-    closeOnClickOverlay: false,
-    showCancelButton: false,
-    ...options
-  });
-};
+Dialog.alert = options => Dialog({
+  ...defaultConfig,
+  ...options
+});
 
-DialogBox.confirm = function(options) {
-  return DialogBox({
-    type: 'confirm',
-    title: '',
-    message: '',
-    closeOnClickOverlay: true,
-    showCancelButton: true,
-    ...options
-  });
-};
+Dialog.confirm = options => Dialog({
+  ...defaultConfig,
+  showCancelButton: true,
+  ...options
+});
 
-DialogBox.close = function() {
+Dialog.close = () => {
   instance.value = false;
-  dialogQueue = [];
-  currentDialog = null;
 };
 
-export default DialogBox;
+export default Dialog;
+export {
+  Dialog
+};
diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css
index 0d05cdbf4..a3fd5f146 100644
--- a/packages/vant-css/src/button.css
+++ b/packages/vant-css/src/button.css
@@ -11,7 +11,6 @@
   font-size: 16px;
   text-align: center;
   outline: 0;
-  overflow: hidden;
   -webkit-appearance: none;
 
   &::after {
diff --git a/packages/vant-css/src/dialog.css b/packages/vant-css/src/dialog.css
index a7f77a619..5f76c401f 100644
--- a/packages/vant-css/src/dialog.css
+++ b/packages/vant-css/src/dialog.css
@@ -42,9 +42,10 @@
     overflow: hidden;
 
     &.is-twobtn {
+      display: flex;
+
       .van-button {
-        width: 50%;
-        float: left;
+        flex: 1;
       }
 
       .van-dialog__cancel {
@@ -63,7 +64,10 @@
   }
 
   &__confirm {
-    color: #00C000;
+    &,
+    &:active {
+      color: #00C000;
+    }
   }
 
   &-bounce-enter {
diff --git a/test/unit/specs/dialog.spec.js b/test/unit/specs/dialog.spec.js
index be92b4e3c..107c71ca7 100644
--- a/test/unit/specs/dialog.spec.js
+++ b/test/unit/specs/dialog.spec.js
@@ -3,11 +3,6 @@ import Vue from 'vue';
 
 describe('Dialog', () => {
   afterEach(() => {
-    const el = document.querySelector('.van-dialog');
-    if (!el) return;
-    if (el.parentNode) {
-      el.parentNode.removeChild(el);
-    }
     Dialog.close();
   });
 
@@ -28,30 +23,32 @@ describe('Dialog', () => {
     }, 500);
   });
 
-  it('create a confirm dialog', () => {
+  it('create a confirm dialog', (done) => {
     Dialog.confirm({
       title: 'title',
       message: 'message'
+    }).catch((action) => {
+      expect(action).to.equal('cancel');
+      done();
     });
 
     expect(document.querySelector('.van-dialog')).to.exist;
+
+    setTimeout(() => {
+      document.querySelector('.van-dialog__cancel').click();
+    }, 500);
   });
 
   it('create a confirm dialog with callback', (done) => {
-    let dialogAction;
     Dialog.confirm({
-      title: 'title',
-      message: 'message',
       callback: (action) => {
-        dialogAction = action;
+        expect(action).to.equal('cancel');
+        done();
       }
     });
 
-    expect(document.querySelector('.van-dialog')).to.exist;
     setTimeout(() => {
       document.querySelector('.van-dialog__cancel').click();
-      expect(dialogAction).to.equal('cancel');
-      done();
     }, 500);
   });
 });

From e7b1d709002e5dac914dc4e545fbf2a2b06f9b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Fri, 25 Aug 2017 15:57:38 +0800
Subject: [PATCH 090/126] fix: code style

---
 packages/actionsheet/index.vue           |  8 +++----
 packages/badge-group/index.vue           | 30 ++++++++++++------------
 packages/cell-swipe/index.vue            |  7 +++---
 packages/datetime-picker/index.vue       |  2 +-
 packages/field/index.vue                 |  8 +++----
 packages/image-preview/image-preview.vue |  8 +++----
 packages/loading/index.vue               | 13 ++++------
 packages/mixins/popup/index.js           |  2 +-
 packages/mixins/popup/popup-manager.js   |  2 +-
 packages/picker/index.vue                |  8 +++----
 packages/search/index.vue                |  4 ++--
 packages/steps/index.vue                 |  2 +-
 packages/swipe-item/index.vue            |  4 ++--
 packages/swipe/index.vue                 | 14 +++++------
 packages/switch/index.vue                | 16 +++----------
 packages/tabs/index.vue                  |  4 ++--
 packages/tag/index.vue                   |  4 +---
 packages/toast/toast.vue                 |  8 +++----
 18 files changed, 64 insertions(+), 80 deletions(-)

diff --git a/packages/actionsheet/index.vue b/packages/actionsheet/index.vue
index 175d00245..04f206ba2 100644
--- a/packages/actionsheet/index.vue
+++ b/packages/actionsheet/index.vue
@@ -28,8 +28,8 @@
 
 <script>
 import Popup from '../mixins/popup';
-import VanIcon from '../icon';
-import VanLoading from '../loading';
+import Icon from '../icon';
+import Loading from '../loading';
 
 export default {
   name: 'van-actionsheet',
@@ -37,8 +37,8 @@ export default {
   mixins: [Popup],
 
   components: {
-    [VanIcon.name]: VanIcon,
-    [VanLoading.name]: VanLoading
+    [Icon.name]: Icon,
+    [Loading.name]: Loading
   },
 
   props: {
diff --git a/packages/badge-group/index.vue b/packages/badge-group/index.vue
index dc1009994..1fc386423 100644
--- a/packages/badge-group/index.vue
+++ b/packages/badge-group/index.vue
@@ -5,21 +5,21 @@
 </template>
 
 <script>
-  export default {
-    name: 'van-badge-group',
+export default {
+  name: 'van-badge-group',
 
-    props: {
-      // 当前激活 tab 面板的 key
-      activeKey: {
-        type: [Number, String],
-        default: 0
-      }
-    },
-
-    data() {
-      return {
-        badges: []
-      };
+  props: {
+    // 当前激活 tab 面板的 key
+    activeKey: {
+      type: [Number, String],
+      default: 0
     }
-  };
+  },
+
+  data() {
+    return {
+      badges: []
+    };
+  }
+};
 </script>
diff --git a/packages/cell-swipe/index.vue b/packages/cell-swipe/index.vue
index 7c1b87dde..7ab4ce705 100644
--- a/packages/cell-swipe/index.vue
+++ b/packages/cell-swipe/index.vue
@@ -51,7 +51,7 @@ export default {
     wrapperStyle() {
       return {
         transform: `translate3d(${this.offset}px, 0, 0)`
-      }
+      };
     }
   },
 
@@ -72,9 +72,8 @@ export default {
       if (direction > 0 && -offset > rightWidth * 0.4 && rightWidth > 0) {
         this.swipeMove(-rightWidth);
         this.resetSwipeStatus();
-      }
       // left
-      else if (direction < 0 && offset >leftWidth * 0.4 && leftWidth > 0) {
+      } else if (direction < 0 && offset > leftWidth * 0.4 && leftWidth > 0) {
         this.swipeMove(leftWidth);
         this.resetSwipeStatus();
       } else {
@@ -114,7 +113,7 @@ export default {
 
     endDrag() {
       if (this.swiping) {
-        this.swipeLeaveTransition(this.offset > 0 ? -1 : 1);        
+        this.swipeLeaveTransition(this.offset > 0 ? -1 : 1);
       };
     }
   }
diff --git a/packages/datetime-picker/index.vue b/packages/datetime-picker/index.vue
index 75d521a17..c89cc77ff 100644
--- a/packages/datetime-picker/index.vue
+++ b/packages/datetime-picker/index.vue
@@ -19,7 +19,7 @@ export default {
   name: 'van-datetime-picker',
 
   components: {
-    'van-picker': Picker
+    [Picker.name]: Picker
   },
 
   props: {
diff --git a/packages/field/index.vue b/packages/field/index.vue
index 2f86df5b1..67145aa67 100644
--- a/packages/field/index.vue
+++ b/packages/field/index.vue
@@ -48,15 +48,15 @@
 
 <script>
 const VALID_TYPES = ['text', 'number', 'email', 'url', 'tel', 'date', 'time', 'datetime', 'password', 'textarea'];
-import vanCell from '../cell';
-import vanIcon from '../icon';
+import Cell from '../cell';
+import Icon from '../icon';
 
 export default {
   name: 'van-field',
 
   components: {
-    vanCell,
-    vanIcon
+    [Cell.name]: Cell,
+    [Icon.name]: Icon
   },
 
   props: {
diff --git a/packages/image-preview/image-preview.vue b/packages/image-preview/image-preview.vue
index 1ff21be7b..7b6cc3245 100644
--- a/packages/image-preview/image-preview.vue
+++ b/packages/image-preview/image-preview.vue
@@ -13,8 +13,8 @@
 <script>
 import Vue from 'vue';
 import Popup from '../mixins/popup';
-import VanSwipe from '../swipe';
-import VanSwipeItem from '../swipe-item';
+import Swipe from '../swipe';
+import SwipeItem from '../swipe-item';
 
 export default {
   name: 'van-image-preview',
@@ -22,8 +22,8 @@ export default {
   mixins: [Popup],
 
   components: {
-    VanSwipe,
-    VanSwipeItem
+    [Swipe.name]: Swipe,
+    [SwipeItem.name]: SwipeItem
   },
 
   props: {
diff --git a/packages/loading/index.vue b/packages/loading/index.vue
index 64fb16f73..75e8f7b33 100644
--- a/packages/loading/index.vue
+++ b/packages/loading/index.vue
@@ -1,12 +1,13 @@
 <template>
-  <div class="van-loading" :class="['van-loading--' + type]">
-    <span class="van-loading__spinner" :class="['van-loading__spinner--' + type, 'van-loading__spinner--' + color]"></span>
+  <div :class="['van-loading', 'van-loading--' + type]">
+    <span :class="['van-loading__spinner', 'van-loading__spinner--' + type, 'van-loading__spinner--' + color]"></span>
   </div>
 </template>
 
 <script>
 const VALID_TYPES = ['gradient-circle', 'circle'];
 const VALID_COLORS = ['black', 'white'];
+
 export default {
   name: 'van-loading',
 
@@ -14,16 +15,12 @@ export default {
     type: {
       type: String,
       default: 'gradient-circle',
-      validator(value) {
-        return VALID_TYPES.indexOf(value) > -1;
-      }
+      validator: value => VALID_TYPES.indexOf(value) > -1
     },
     color: {
       type: String,
       default: 'black',
-      validator(value) {
-        return VALID_COLORS.indexOf(value) > -1;
-      }
+      validator: value => VALID_COLORS.indexOf(value) > -1
     }
   }
 };
diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js
index b4b8fa227..cb98e2638 100644
--- a/packages/mixins/popup/index.js
+++ b/packages/mixins/popup/index.js
@@ -138,7 +138,7 @@ export default {
 
       if (this.preventScroll) {
         document.addEventListener('touchstart', this.recordPosition, false);
-        document.addEventListener('touchmove', this.watchTouchMove, false);        
+        document.addEventListener('touchmove', this.watchTouchMove, false);
       }
     },
 
diff --git a/packages/mixins/popup/popup-manager.js b/packages/mixins/popup/popup-manager.js
index c422b537f..4c71dfc99 100644
--- a/packages/mixins/popup/popup-manager.js
+++ b/packages/mixins/popup/popup-manager.js
@@ -82,7 +82,7 @@ const PopupManager = {
 
     let domParentNode;
     if (dom && dom.parentNode && dom.parentNode.nodeType !== 11) {
-      domParentNode = dom.parentNode
+      domParentNode = dom.parentNode;
     } else {
       domParentNode = document.body;
     }
diff --git a/packages/picker/index.vue b/packages/picker/index.vue
index cf2851cda..5468a326d 100644
--- a/packages/picker/index.vue
+++ b/packages/picker/index.vue
@@ -8,7 +8,7 @@
       </slot>
     </div>
     <div class="van-picker__columns" :class="['van-picker__columns--' + columns.length]">
-      <picker-column
+      <van-picker-column
         v-for="(item, index) in columns"
         :key="index"
         v-model="values[index]"
@@ -17,8 +17,8 @@
         :itemHeight="itemHeight"
         :visible-item-count="visibileColumnCount"
         :value-key="valueKey"
-        @columnChange="columnValueChange(index)">
-      </picker-column>
+        @columnChange="columnValueChange(index)"
+      />
       <div class="van-picker-center-highlight" :style="{ height: itemHeight + 'px', marginTop: -itemHeight / 2 + 'px' }"></div>
     </div>
   </div>
@@ -33,7 +33,7 @@ export default {
   name: 'van-picker',
 
   components: {
-    PickerColumn
+    [PickerColumn.name]: PickerColumn
   },
 
   props: {
diff --git a/packages/search/index.vue b/packages/search/index.vue
index 85fe31b38..8e4b2df90 100644
--- a/packages/search/index.vue
+++ b/packages/search/index.vue
@@ -20,14 +20,14 @@
 </template>
 
 <script>
-import VanIcon from '../icon';
+import Icon from '../icon';
 import Clickoutside from '../utils/clickoutside';
 
 export default {
   name: 'van-search',
 
   components: {
-    VanIcon
+    [Icon.name]: Icon
   },
 
   props: {
diff --git a/packages/steps/index.vue b/packages/steps/index.vue
index 91adf1efd..c246f91d3 100644
--- a/packages/steps/index.vue
+++ b/packages/steps/index.vue
@@ -30,7 +30,7 @@ export default {
   name: 'van-steps',
 
   components: {
-    'van-icon': Icon
+    [Icon.name]: Icon
   },
 
   props: {
diff --git a/packages/swipe-item/index.vue b/packages/swipe-item/index.vue
index dafed2fd2..36979841e 100644
--- a/packages/swipe-item/index.vue
+++ b/packages/swipe-item/index.vue
@@ -13,9 +13,9 @@ export default {
   },
 
   destroyed() {
-    const index = this.$parent.swipes.indexOf(this)
+    const index = this.$parent.swipes.indexOf(this);
     if (index > -1) {
-      this.$parent.swipes.splice(index, 1)
+      this.$parent.swipes.splice(index, 1);
     }
   }
 };
diff --git a/packages/swipe/index.vue b/packages/swipe/index.vue
index 4b6d818b6..6d2e642e0 100644
--- a/packages/swipe/index.vue
+++ b/packages/swipe/index.vue
@@ -61,27 +61,27 @@ export default {
     }).on('autoPlay', function(dist, isEnd) {
       scroll.movePage(dist.x, isEnd);
     });
-    this.dummy = dummy
+    this.dummy = dummy;
   },
 
   watch: {
     swipes(value) {
       if (this.autoPlay && value.length > 1) {
-        this.dummy.initMove()
+        this.dummy.initMove();
       } else {
-        this.dummy.clearMove()
+        this.dummy.clearMove();
       }
       this.scroll.update();
-      return value
+      return value;
     },
 
     autoPlay(value) {
       if (value && this.swipes.length > 1) {
-        this.dummy.initMove()
+        this.dummy.initMove();
       } else {
-        this.dummy.clearMove()
+        this.dummy.clearMove();
       }
-      return value
+      return value;
     }
   },
 
diff --git a/packages/switch/index.vue b/packages/switch/index.vue
index 3dde8ea05..e8f175984 100644
--- a/packages/switch/index.vue
+++ b/packages/switch/index.vue
@@ -8,22 +8,12 @@
 </template>
 
 <script>
-import VanLoading from '../loading';
-/**
- * van-switch
- * @module components/switch
- * @desc 开关
- * @param {boolean} [value=false] - 开关状态
- * @param {boolean} [disabled=false] - 禁用
- * @param {boolean} [loading=false] - loading状态
- *
- * @example
- * <van-switch :checked="true" :disabled="false"></van-switch>
- */
+import Loading from '../loading';
+
 export default {
   name: 'van-switch',
   components: {
-    'van-loading': VanLoading
+    [Loading.name]: Loading
   },
   props: {
     value: Boolean,
diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index 0da594a6e..5a9cac1e2 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -192,7 +192,7 @@
             const translate = swipeState.startTranslateLeft + deltaX;
 
             /* istanbul ignore else */
-            if (translate > 0 || (translate * -1) > this.maxTranslate ) return;
+            if (translate > 0 || (translate * -1) > this.maxTranslate) return;
 
             translateUtil.translateElement(el, translate, null);
           },
@@ -200,7 +200,7 @@
           end: () => {
             this.isSwiping = false;
           }
-        })
+        });
       },
 
       doOnValueChange() {
diff --git a/packages/tag/index.vue b/packages/tag/index.vue
index 4463165e0..e24bf0990 100644
--- a/packages/tag/index.vue
+++ b/packages/tag/index.vue
@@ -12,9 +12,7 @@
     props: {
       type: {
         type: String,
-        validator: function (val) {
-          return ~ALLOW_TYPE.indexOf(val);
-        }
+        validator: val => ~ALLOW_TYPE.indexOf(val)
       },
       mark: Boolean,
       plain: Boolean
diff --git a/packages/toast/toast.vue b/packages/toast/toast.vue
index a147dd8a4..8bb168e49 100644
--- a/packages/toast/toast.vue
+++ b/packages/toast/toast.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script>
-import vanLoading from '../loading';
-import vanIcon from '../icon';
+import Icon from '../icon';
+import Loading from '../loading';
 
 const TOAST_TYPES = ['text', 'html', 'loading', 'success', 'fail'];
 const DEFAULT_STYLE_LIST = ['success', 'fail'];
@@ -37,8 +37,8 @@ export default {
   name: 'van-toast',
 
   components: {
-    'van-loading': vanLoading,
-    'van-icon': vanIcon
+    [Icon.name]: Icon,
+    [Loading.name]: Loading
   },
   props: {
     type: {

From 956f7f4cdf2374fce16dad497f1e06850560df8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Sat, 26 Aug 2017 09:10:38 +0800
Subject: [PATCH 091/126] DatetimePicker: improve test coverage

---
 packages/datetime-picker/index.vue      |   3 +
 test/unit/index.js                      |   3 +
 test/unit/specs/datetime-picker.spec.js | 122 +++++++++++++++++++++---
 test/unit/utils.js                      |   2 +-
 4 files changed, 116 insertions(+), 14 deletions(-)

diff --git a/packages/datetime-picker/index.vue b/packages/datetime-picker/index.vue
index c89cc77ff..b0fc50386 100644
--- a/packages/datetime-picker/index.vue
+++ b/packages/datetime-picker/index.vue
@@ -270,6 +270,9 @@ export default {
       });
     },
     setColumnByValues(values) {
+      if (!this.$refs.picker) {
+        return;
+      }
       const setColumnValue = this.$refs.picker.setColumnValue;
       if (this.type === 'time') {
         setColumnValue(0, values[0]);
diff --git a/test/unit/index.js b/test/unit/index.js
index 998623e9d..9f20bac30 100644
--- a/test/unit/index.js
+++ b/test/unit/index.js
@@ -1,5 +1,8 @@
 require('packages/vant-css/src/index.css');
 
+// hack for test touch event
+window.ontouchstart = {};
+
 // 读取配置文件，判断运行单个测试文件还是所有测试文件
 const testsReq = require.context('./specs', true, /\.spec$/);
 if (process.env.TEST_FILE) {
diff --git a/test/unit/specs/datetime-picker.spec.js b/test/unit/specs/datetime-picker.spec.js
index 4b8e37329..edc003faf 100644
--- a/test/unit/specs/datetime-picker.spec.js
+++ b/test/unit/specs/datetime-picker.spec.js
@@ -1,5 +1,20 @@
 import DatetimePicker from 'packages/datetime-picker';
 import { mount } from 'avoriaz';
+import { triggerTouch } from '../utils';
+
+const dragHelper = (el, position) => {
+  triggerTouch(el, 'touchstart', 0, 0);
+  triggerTouch(el, 'touchmove', 0, position / 4);
+  triggerTouch(el, 'touchmove', 0, position / 3);
+  triggerTouch(el, 'touchmove', 0, position / 2);
+  triggerTouch(el, 'touchmove', 0, position);
+  triggerTouch(el, 'touchend', 0, position);
+};
+
+const testTime = '10:00';
+const testDate = new Date('2017/03/10 10:00');
+const minDate = new Date('2000/01/01 00:00');
+const maxDate = new Date('3000/01/01 00:00');
 
 describe('DatetimePicker', () => {
   let wrapper;
@@ -7,36 +22,117 @@ describe('DatetimePicker', () => {
     wrapper && wrapper.destroy();
   });
 
-  it('create a datetime picker', () => {
-    const date = new Date();
+  it('create a time picker', () => {
     wrapper = mount(DatetimePicker, {
+      attachToDocument: true,
       propsData: {
-        type: 'datetime',
-        value: date
+        type: 'time',
+        value: testTime
       }
     });
-    expect(wrapper.data().innerValue.getTime()).to.equal(date.getTime());
+    expect(wrapper.vm.innerValue).to.equal(testTime);
   });
 
   it('create a date picker', () => {
-    const date = new Date();
     wrapper = mount(DatetimePicker, {
+      attachToDocument: true,
       propsData: {
         type: 'date',
-        value: date
+        value: testDate
       }
     });
-    expect(wrapper.data().innerValue.getTime()).to.equal(date.getTime());
+    expect(wrapper.vm.innerValue.getTime()).to.equal(testDate.getTime());
   });
 
-  it('create a time picker', () => {
-    const time = '10:00';
+  it('create a datetime picker', () => {
     wrapper = mount(DatetimePicker, {
+      attachToDocument: true,
       propsData: {
-        type: 'time',
-        value: time
+        type: 'datetime',
+        value: testDate
       }
     });
-    expect(wrapper.data().innerValue).to.equal(time);
+    expect(wrapper.vm.innerValue.getTime()).to.equal(testDate.getTime());
+  });
+
+  it('drag time picker', (done) => {
+    wrapper = mount(DatetimePicker, {
+      attachToDocument: true,
+      propsData: {
+        type: 'time',
+        value: testTime
+      }
+    });
+
+    const [hour, minute] = wrapper.find('.van-picker-column-wrapper');
+    dragHelper(hour, -50);
+    dragHelper(minute, -50);
+
+    setTimeout(() => {
+      expect(wrapper.vm.innerValue).to.equal('5:05');
+      done();
+    }, 10);
+  });
+
+  it('drag date picker', (done) => {
+    wrapper = mount(DatetimePicker, {
+      attachToDocument: true,
+      propsData: {
+        type: 'date',
+        value: testDate,
+        minDate,
+        maxDate
+      }
+    });
+
+    setTimeout(() => {
+      const [year, month, day] = wrapper.find('.van-picker-column-wrapper');
+      dragHelper(year, -50);
+      dragHelper(month, -50);
+      dragHelper(day, -50);
+      setTimeout(() => {
+        const newYear = wrapper.vm.innerValue.getFullYear();
+        const newMonth = wrapper.vm.innerValue.getMonth() + 1;
+        const newDay = wrapper.vm.innerValue.getDate();
+        expect(newYear).to.equal(2022);
+        expect(newMonth).to.equal(8);
+        expect(newDay).to.equal(15);
+        done();
+      }, 10);
+    }, 10);
+  });
+
+  it('drag datetime picker', (done) => {
+    wrapper = mount(DatetimePicker, {
+      attachToDocument: true,
+      propsData: {
+        type: 'datetime',
+        value: testDate,
+        minDate,
+        maxDate
+      }
+    });
+
+    setTimeout(() => {
+      const [year, month, day, hour, minute] = wrapper.find('.van-picker-column-wrapper');
+      dragHelper(year, -50);
+      dragHelper(month, -50);
+      dragHelper(day, -50);
+      dragHelper(hour, -50);
+      dragHelper(minute, -50);
+      setTimeout(() => {
+        const newYear = wrapper.vm.innerValue.getFullYear();
+        const newMonth = wrapper.vm.innerValue.getMonth() + 1;
+        const newDay = wrapper.vm.innerValue.getDate();
+        const newHour = wrapper.vm.innerValue.getHours();
+        const newMinute = wrapper.vm.innerValue.getMinutes();
+        expect(newYear).to.equal(2022);
+        expect(newMonth).to.equal(8);
+        expect(newDay).to.equal(15);
+        expect(newHour).to.equal(15);
+        expect(newMinute).to.equal(5);
+        done();
+      }, 10);
+    }, 10);
   });
 });
diff --git a/test/unit/utils.js b/test/unit/utils.js
index 262356ed2..7e866d70d 100644
--- a/test/unit/utils.js
+++ b/test/unit/utils.js
@@ -62,7 +62,7 @@ export function triggerTouch(wrapper, eventName, x, y) {
     radiusX: 2.5,
     radiusY: 2.5,
     rotationAngle: 10,
-    force: 0.5,
+    force: 0.5
   };
 
   const event = document.createEvent('CustomEvent');

From a1aededecb73b1a00b1fb26b3562593367142d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 28 Aug 2017 13:45:25 +0800
Subject: [PATCH 092/126] NoticeBar: add component && doc

---
 build/bin/build-entry.js             |  3 +-
 components.json                      |  3 +-
 docs/examples-docs/notice-bar.md     | 71 +++++++++++++++++++++
 docs/src/ExamplesDocsApp.vue         |  1 -
 docs/src/doc.config.js               |  4 ++
 docs/src/examples.js                 |  6 +-
 docs/src/index.js                    |  2 +-
 package.json                         |  2 +-
 packages/index.js                    | 47 ++------------
 packages/notice-bar/index.vue        | 92 ++++++++++++++++++++++++++++
 packages/vant-css/src/index.css      |  1 +
 packages/vant-css/src/notice-bar.css | 36 +++++++++++
 yarn.lock                            |  6 +-
 13 files changed, 221 insertions(+), 53 deletions(-)
 create mode 100644 docs/examples-docs/notice-bar.md
 create mode 100644 packages/notice-bar/index.vue
 create mode 100644 packages/vant-css/src/notice-bar.css

diff --git a/build/bin/build-entry.js b/build/bin/build-entry.js
index 6294590f1..34d111e49 100644
--- a/build/bin/build-entry.js
+++ b/build/bin/build-entry.js
@@ -34,8 +34,7 @@ export {
 };
 export default {
   install,
-  version,
-{{list}}
+  version
 };
 `;
 
diff --git a/components.json b/components.json
index dd4b25daa..705772a32 100644
--- a/components.json
+++ b/components.json
@@ -36,5 +36,6 @@
   "uploader": "./packages/uploader/index.js",
   "swipe": "./packages/swipe/index.js",
   "swipe-item": "./packages/swipe-item/index.js",
-  "datetime-picker": "./packages/datetime-picker/index.js"
+  "datetime-picker": "./packages/datetime-picker/index.js",
+  "notice-bar": "./packages/notice-bar/index.js"
 }
diff --git a/docs/examples-docs/notice-bar.md b/docs/examples-docs/notice-bar.md
new file mode 100644
index 000000000..50b954b9b
--- /dev/null
+++ b/docs/examples-docs/notice-bar.md
@@ -0,0 +1,71 @@
+<style>
+.demo-notice-bar {
+  .van-notice-bar:not(:first-of-type) {
+    margin-top: 15px;
+  }
+}
+</style>
+
+## NoticeBar 通告栏
+
+### 使用指南
+``` javascript
+import { NoticeBar } from 'vant';
+
+Vue.component(NoticeBar.name, NoticeBar);
+```
+
+### 代码演示
+
+#### 基础用法
+
+:::demo 基础用法
+```html
+<van-notice-bar>
+  足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。
+</van-notice-bar>
+```
+:::
+
+#### 禁用滚动
+文字内容多于一行时，可通过`scrollable`参数控制是否开启滚动
+
+:::demo 禁用滚动
+```html
+<van-notice-bar :scrollable="false">
+  足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。
+</van-notice-bar>
+```
+:::
+
+#### 通告栏模式
+默认模式为空，支持`closeable`和`link`。
+
+:::demo 通告栏模式
+```html
+<!-- closeable 模式，在右侧显示关闭按钮 -->
+<van-notice-bar mode="closeable">
+  足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。
+</van-notice-bar>
+
+<!-- link 模式，在右侧显示链接箭头 -->
+<van-notice-bar mode="link">
+  足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。
+</van-notice-bar>
+```
+:::
+
+### API
+
+| 参数       | 说明      | 类型       | 默认值       | 可选值       |
+|-----------|-----------|-----------|-------------|-------------|
+| mode | 通告栏模式 | String | `''` | `closeable` `link` |
+| delay | 动画延迟时间，单位秒 | Number | `1` | |
+| scrollable | 是否滚动 | Boolean | `true` | |
+| speed | 滚动速率，单位px | Number | `40` | |
+
+### Event
+
+| 事件名       | 说明      | 参数       |
+|-----------|-----------|-----------|
+| click | 点击事件回调 | - |
diff --git a/docs/src/ExamplesDocsApp.vue b/docs/src/ExamplesDocsApp.vue
index c8753bf7f..85337be4a 100644
--- a/docs/src/ExamplesDocsApp.vue
+++ b/docs/src/ExamplesDocsApp.vue
@@ -7,7 +7,6 @@
 </template>
 
 <script>
-import 'highlight.js/styles/color-brewer.css';
 import docConfig from './doc.config';
 
 export default {
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 655038e57..70cf88afc 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -125,6 +125,10 @@ module.exports = {
               {
                 "path": "/lazyload",
                 "title": "Lazyload 图片懒加载"
+              },
+              {
+                "path": "/notice-bar",
+                "title": "NoticeBar 通告栏"
               }
             ]
           },
diff --git a/docs/src/examples.js b/docs/src/examples.js
index 5126b64c3..d63c18c42 100644
--- a/docs/src/examples.js
+++ b/docs/src/examples.js
@@ -2,16 +2,16 @@ import Vue from 'vue';
 import VueRouter from 'vue-router';
 import App from './ExamplesApp';
 import routes from './router.config';
-import ZanUI from 'packages/index';
+import Vant, { Lazyload } from 'packages/index';
 import ZanDoc from 'zan-doc';
 import 'packages/vant-css/src/index.css';
 import 'zan-doc/src/helper/touch-simulator';
 
 import DemoList from './components/demo-list.vue';
 
-Vue.use(ZanUI);
+Vue.use(Vant);
 Vue.use(ZanDoc);
-Vue.use(ZanUI.Lazyload, {
+Vue.use(Lazyload, {
   lazyComponent: true
 });
 Vue.use(VueRouter);
diff --git a/docs/src/index.js b/docs/src/index.js
index 8b19eb7c9..3c36180f8 100644
--- a/docs/src/index.js
+++ b/docs/src/index.js
@@ -4,7 +4,7 @@ import App from './ExamplesDocsApp';
 import routes from './router.config';
 import ZanDoc from 'zan-doc';
 import DemoBlock from './components/demo-block';
-import 'packages/vant-css/src/index.css';
+import 'packages/vant-css/src/reset.css';
 
 const isMobile = (function() {
   var platform = navigator.userAgent.toLowerCase();
diff --git a/package.json b/package.json
index 725581af1..1536e0cd9 100644
--- a/package.json
+++ b/package.json
@@ -117,6 +117,6 @@
     "webpack": "^3.5.5",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "^0.2.3"
+    "zan-doc": "^0.2.5"
   }
 }
diff --git a/packages/index.js b/packages/index.js
index 3a1ca3699..7529339fe 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -36,6 +36,7 @@ import Uploader from './uploader';
 import Swipe from './swipe';
 import SwipeItem from './swipe-item';
 import DatetimePicker from './datetime-picker';
+import NoticeBar from './notice-bar';
 
 const version = '0.8.6';
 const components = [
@@ -71,7 +72,8 @@ const components = [
   Uploader,
   Swipe,
   SwipeItem,
-  DatetimePicker
+  DatetimePicker,
+  NoticeBar
 ];
 
 const install = function(Vue) {
@@ -127,47 +129,10 @@ export {
   Uploader,
   Swipe,
   SwipeItem,
-  DatetimePicker
+  DatetimePicker,
+  NoticeBar
 };
 export default {
   install,
-  version,
-  Button,
-  Switch,
-  Field,
-  Radio,
-  Cell,
-  Icon,
-  CellGroup,
-  CellSwipe,
-  Popup,
-  Dialog,
-  Picker,
-  RadioGroup,
-  Waterfall,
-  Loading,
-  Panel,
-  Card,
-  Steps,
-  Tag,
-  Checkbox,
-  CheckboxGroup,
-  BadgeGroup,
-  Badge,
-  Search,
-  Step,
-  Tabs,
-  Tab,
-  Lazyload,
-  ImagePreview,
-  Col,
-  Row,
-  Actionsheet,
-  Quantity,
-  Progress,
-  Toast,
-  Uploader,
-  Swipe,
-  SwipeItem,
-  DatetimePicker
+  version
 };
diff --git a/packages/notice-bar/index.vue b/packages/notice-bar/index.vue
new file mode 100644
index 000000000..59e7430bd
--- /dev/null
+++ b/packages/notice-bar/index.vue
@@ -0,0 +1,92 @@
+<template>
+  <div v-show="showNoticeBar" @click="$emit('click')" :class="['van-notice-bar', { 'van-notice-bar--withicon': mode }]">
+    <div class="van-notice-bar__content-wrap" ref="contentWrap">
+      <div class="van-notice-bar__content" ref="content" :style="contentStyle" @transitionend="onTransitionEnd">
+        <slot></slot>
+      </div>
+    </div>
+    <van-icon class="van-notice-bar__icon" :name="iconName" v-if="iconName" @click="onClickIcon" />
+  </div>
+</template>
+
+<script>
+import Icon from '../icon';
+
+const NOTICE_BAR_MODE = ['', 'closeable', 'link'];
+
+export default {
+  name: 'van-notice-bar',
+
+  components: {
+    [Icon.name]: Icon
+  },
+
+  props: {
+    mode: {
+      type: String,
+      default: '',
+      validator: val => NOTICE_BAR_MODE.indexOf(val) !== -1
+    },
+    delay: {
+      type: [String, Number],
+      default: 1
+    },
+    scrollable: {
+      type: Boolean,
+      default: true
+    },
+    speed: {
+      type: Number,
+      default: 40
+    }
+  },
+
+  data() {
+    return {
+      duration: 0,
+      offsetWidth: 0,
+      showNoticeBar: true,
+      diableTransition: false
+    };
+  },
+
+  computed: {
+    iconName() {
+      return this.mode === 'closeable' ? 'close' : this.mode === 'link' ? 'arrow' : '';
+    },
+    contentStyle() {
+      return {
+        left: -this.offsetWidth + 'px',
+        transitionDelay: this.delay + 's',
+        transitionDuration: this.duration + 's',
+        transitionProperty: this.diableTransition ? 'none' : 'left'
+      };
+    }
+  },
+
+  mounted() {
+    const offsetWidth = this.$refs.content.getBoundingClientRect().width;
+    const wrapWidth = this.$refs.contentWrap.getBoundingClientRect().width;
+    if (this.scrollable && offsetWidth > wrapWidth) {
+      this.offsetWidth = offsetWidth;
+      this.duration = Math.ceil((offsetWidth + wrapWidth) / this.speed);
+    }
+  },
+
+  methods: {
+    onClickIcon() {
+      this.showNoticeBar = this.mode !== 'closeable';
+    },
+    onTransitionEnd() {
+      const { offsetWidth } = this;
+      this.diableTransition = true;
+      this.offsetWidth = 0;
+
+      setTimeout(() => {
+        this.diableTransition = false;
+        this.offsetWidth = offsetWidth;
+      }, 50);
+    }
+  }
+};
+</script>
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index d18b5a74d..6a7bfa8df 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -30,3 +30,4 @@
 @import './toast.css';
 @import './uploader.css';
 @import './swipe.css';
+@import './notice-bar.css';
diff --git a/packages/vant-css/src/notice-bar.css b/packages/vant-css/src/notice-bar.css
new file mode 100644
index 000000000..67f912a1a
--- /dev/null
+++ b/packages/vant-css/src/notice-bar.css
@@ -0,0 +1,36 @@
+@import './common/var.css';
+
+.van-notice-bar {
+  color: #f60;
+  padding: 9px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  background-color: #fff7cc;
+
+  &--withicon {
+    position: relative;
+    padding-right: 30px;
+  }
+
+  &__icon {
+    top: 10px;
+    right: 10px;
+    position: absolute;
+    font-size: 15px;
+    line-height: 1;
+    cursor: pointer;
+  }
+
+  &__content-wrap {
+    height: 18px;
+    overflow: hidden;
+    position: relative;
+  }
+
+  &__content {
+    position: absolute;
+    white-space: nowrap;
+    transition-property: left;
+    transition-timing-function: linear;
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index b2c4b198a..65dac4f42 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7959,9 +7959,9 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-zan-doc@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.3.tgz#79a8a4b6b5377e5900fd9a37034bb481ab281cf8"
+zan-doc@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.5.tgz#4f82e1b75db1a348b57436cd1d4ffb607bc18562"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"

From c357dd4e71fcbafd52fecd56b8beeaff6293b178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 28 Aug 2017 14:20:34 +0800
Subject: [PATCH 093/126] NoticeBar: add test cases

---
 docs/examples-docs/notice-bar.md   |  4 +-
 packages/notice-bar/index.vue      |  3 +-
 test/unit/specs/cell-swipe.spec.js |  6 +--
 test/unit/specs/notice-bar.spec.js | 62 ++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 7 deletions(-)
 create mode 100644 test/unit/specs/notice-bar.spec.js

diff --git a/docs/examples-docs/notice-bar.md b/docs/examples-docs/notice-bar.md
index 50b954b9b..eaccdde97 100644
--- a/docs/examples-docs/notice-bar.md
+++ b/docs/examples-docs/notice-bar.md
@@ -21,9 +21,7 @@ Vue.component(NoticeBar.name, NoticeBar);
 
 :::demo 基础用法
 ```html
-<van-notice-bar>
-  足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。
-</van-notice-bar>
+<van-notice-bar text="足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。">
 ```
 :::
 
diff --git a/packages/notice-bar/index.vue b/packages/notice-bar/index.vue
index 59e7430bd..3540c4833 100644
--- a/packages/notice-bar/index.vue
+++ b/packages/notice-bar/index.vue
@@ -2,7 +2,7 @@
   <div v-show="showNoticeBar" @click="$emit('click')" :class="['van-notice-bar', { 'van-notice-bar--withicon': mode }]">
     <div class="van-notice-bar__content-wrap" ref="contentWrap">
       <div class="van-notice-bar__content" ref="content" :style="contentStyle" @transitionend="onTransitionEnd">
-        <slot></slot>
+        <slot>{{ text }}</slot>
       </div>
     </div>
     <van-icon class="van-notice-bar__icon" :name="iconName" v-if="iconName" @click="onClickIcon" />
@@ -22,6 +22,7 @@ export default {
   },
 
   props: {
+    text: String,
     mode: {
       type: String,
       default: '',
diff --git a/test/unit/specs/cell-swipe.spec.js b/test/unit/specs/cell-swipe.spec.js
index 89e5ca833..ed142b25f 100644
--- a/test/unit/specs/cell-swipe.spec.js
+++ b/test/unit/specs/cell-swipe.spec.js
@@ -7,14 +7,14 @@ const defaultProps = {
     leftWidth: 100,
     rightWidth: 100
   }
-}
+};
 
 describe('CellSwipe', () => {
   let wrapper;
   afterEach(() => {
     wrapper && wrapper.destroy();
   });
-  
+
   it('render left or right part when has width', () => {
     wrapper = mount(CellSwipe, defaultProps);
     expect(wrapper.find('.van-cell-swipe__left').length).to.equal(1);
@@ -97,7 +97,7 @@ describe('CellSwipe', () => {
 
       triggerTouch(wrapper, 'touchstart', 0, 0);
       triggerTouch(wrapper, 'touchmove', 1, 0);
-      
+
       wrapper.vm.$nextTick(() => {
         expect(wrapper.vm.offset).to.equal(0);
         expect(wrapper.vm.opened).to.be.false;
diff --git a/test/unit/specs/notice-bar.spec.js b/test/unit/specs/notice-bar.spec.js
new file mode 100644
index 000000000..f85d09b36
--- /dev/null
+++ b/test/unit/specs/notice-bar.spec.js
@@ -0,0 +1,62 @@
+import NoticeBar from 'packages/notice-bar';
+import { mount } from 'avoriaz';
+
+describe('NoticeBar', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('create a notice-bar', () => {
+    wrapper = mount(NoticeBar, {
+      propsData: {},
+      attachToDocument: true
+    });
+
+    expect(wrapper.hasClass('van-notice-bar')).to.be.true;
+  });
+
+  it('mode closeable', () => {
+    wrapper = mount(NoticeBar, {
+      propsData: {
+        mode: 'closeable'
+      },
+      attachToDocument: true
+    });
+
+    const icon = wrapper.find('.van-icon-close');
+    expect(icon.length).to.equal(1);
+
+    icon[0].trigger('click');
+    expect(wrapper.hasStyle('display', 'none'));
+  });
+
+  it('mode link', () => {
+    wrapper = mount(NoticeBar, {
+      propsData: {
+        mode: 'link'
+      },
+      attachToDocument: true
+    });
+
+    expect(wrapper.find('.van-icon-arrow').length).to.equal(1);
+  });
+
+  it('notice-bar transitionend', (done) => {
+    wrapper = mount(NoticeBar, {
+      propsData: {
+        text: '足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。',
+        speed: 10000,
+        delay: 0
+      },
+      attachToDocument: true
+    });
+
+    const content = wrapper.find('.van-notice-bar__content')[0];
+
+    setTimeout(() => {
+      expect(content.hasStyle('transition-delay', '0s')).to.be.true;
+      done();
+    }, 1500);
+  });
+});

From 561821d03acd295bab4330ab5501c1feb0933c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 28 Aug 2017 14:40:00 +0800
Subject: [PATCH 094/126] NoticeBar: improve test coverage

---
 packages/notice-bar/index.vue       |  2 +-
 test/unit/components/notice-bar.vue | 16 ++++++++++++++++
 test/unit/index.js                  |  2 +-
 test/unit/specs/notice-bar.spec.js  | 11 +++++------
 4 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 test/unit/components/notice-bar.vue

diff --git a/packages/notice-bar/index.vue b/packages/notice-bar/index.vue
index 3540c4833..4060dccc6 100644
--- a/packages/notice-bar/index.vue
+++ b/packages/notice-bar/index.vue
@@ -70,7 +70,7 @@ export default {
     const wrapWidth = this.$refs.contentWrap.getBoundingClientRect().width;
     if (this.scrollable && offsetWidth > wrapWidth) {
       this.offsetWidth = offsetWidth;
-      this.duration = Math.ceil((offsetWidth + wrapWidth) / this.speed);
+      this.duration = (offsetWidth + wrapWidth) / this.speed;
     }
   },
 
diff --git a/test/unit/components/notice-bar.vue b/test/unit/components/notice-bar.vue
new file mode 100644
index 000000000..7eed57545
--- /dev/null
+++ b/test/unit/components/notice-bar.vue
@@ -0,0 +1,16 @@
+<template>
+  <div class="notice-bar-container" style="width: 100px;">
+    <van-notice-bar :speed="speed" :text="text" :mode="mode" :delay="delay" />
+  </div>
+</template>
+
+<script>
+import NoticeBar from 'packages/notice-bar';
+export default {
+  components: {
+    [NoticeBar.name]: NoticeBar
+  },
+  props: ['speed', 'text', 'mode', 'delay']
+};
+</script>
+
diff --git a/test/unit/index.js b/test/unit/index.js
index 9f20bac30..cac038bbe 100644
--- a/test/unit/index.js
+++ b/test/unit/index.js
@@ -13,4 +13,4 @@ if (process.env.TEST_FILE) {
   });
 } else {
   testsReq.keys().forEach(testsReq);
-}
\ No newline at end of file
+}
diff --git a/test/unit/specs/notice-bar.spec.js b/test/unit/specs/notice-bar.spec.js
index f85d09b36..87c796e44 100644
--- a/test/unit/specs/notice-bar.spec.js
+++ b/test/unit/specs/notice-bar.spec.js
@@ -1,4 +1,4 @@
-import NoticeBar from 'packages/notice-bar';
+import NoticeBar from '../components/notice-bar';
 import { mount } from 'avoriaz';
 
 describe('NoticeBar', () => {
@@ -13,7 +13,7 @@ describe('NoticeBar', () => {
       attachToDocument: true
     });
 
-    expect(wrapper.hasClass('van-notice-bar')).to.be.true;
+    expect(wrapper.find('.van-notice-bar').length).to.equal(1);
   });
 
   it('mode closeable', () => {
@@ -45,18 +45,17 @@ describe('NoticeBar', () => {
   it('notice-bar transitionend', (done) => {
     wrapper = mount(NoticeBar, {
       propsData: {
-        text: '足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。',
-        speed: 10000,
+        text: '足协杯战线连续第2年上演广州德比战',
+        speed: 1000,
         delay: 0
       },
       attachToDocument: true
     });
 
     const content = wrapper.find('.van-notice-bar__content')[0];
-
     setTimeout(() => {
       expect(content.hasStyle('transition-delay', '0s')).to.be.true;
       done();
-    }, 1500);
+    }, 500);
   });
 });

From 17779384ee22fc464cc7f26ee2d8e6a74d29dbb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 28 Aug 2017 14:55:39 +0800
Subject: [PATCH 095/126] fix: exclude test files when dist test coverage
 report

---
 test/unit/get-webpack-conf.js | 16 +++++++++++++++-
 test/unit/karma.conf.js       |  3 ++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/test/unit/get-webpack-conf.js b/test/unit/get-webpack-conf.js
index 6d0818692..3861fd399 100644
--- a/test/unit/get-webpack-conf.js
+++ b/test/unit/get-webpack-conf.js
@@ -75,7 +75,21 @@ function getWebpackConfig(testFileName) {
           ]
         },
         {
-          test: /\.vue$/,
+          test: /test\/unit\/components\/.*\.vue$|packages\/swipe\/.*\.vue$/,
+          use: [
+            {
+              loader: 'vue-loader',
+              options: {
+                loaders: {
+                  css: ['style-loader', 'css-loader', 'postcss-loader']
+                }
+              }
+            }
+          ]
+        },
+        {
+          test: /packages\/.*\.vue$/,
+          exclude: /packages\/swipe\/.*\.vue$/,
           use: [
             {
               loader: 'vue-loader',
diff --git a/test/unit/karma.conf.js b/test/unit/karma.conf.js
index 7c8a89d96..0056f945a 100644
--- a/test/unit/karma.conf.js
+++ b/test/unit/karma.conf.js
@@ -14,7 +14,8 @@ module.exports = function(config) {
     reporters: ['spec', 'coverage'],
     files: ['./index.js'],
     preprocessors: {
-      './index.js': ['webpack', 'sourcemap']
+      './index.js': ['webpack', 'sourcemap'],
+      'test/unit/!(components)/**/*.vue': ['coverage']
     },
     webpack: getWebpackConfig(getTestFileName()),
     webpackMiddleware: {

From f44ee614f1a34b1f621407ab9a02f1973fa1f19d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 28 Aug 2017 15:25:50 +0800
Subject: [PATCH 096/126] delete components.json

---
 build/bin/build-entry.js    |   6 +-
 build/bin/build-lib.js      |   4 +-
 build/bin/get-components.js |   8 ++
 build/bin/init.js           |  16 ----
 build/genExamples.js        |  16 ----
 build/webpack.config.dev.js |  11 ++-
 components.json             |  41 ---------
 packages/index.js           | 167 ++++++++++++++++++------------------
 8 files changed, 107 insertions(+), 162 deletions(-)
 create mode 100644 build/bin/get-components.js
 delete mode 100644 build/genExamples.js
 delete mode 100644 components.json

diff --git a/build/bin/build-entry.js b/build/bin/build-entry.js
index 34d111e49..27c7b9e96 100644
--- a/build/bin/build-entry.js
+++ b/build/bin/build-entry.js
@@ -1,4 +1,4 @@
-var Components = require('../../components.json');
+var Components = require('./get-components')();
 var fs = require('fs');
 var render = require('json-templater/string');
 var uppercamelcase = require('uppercamelcase');
@@ -40,13 +40,11 @@ export default {
 
 delete Components.font;
 
-var ComponentNames = Object.keys(Components);
-
 var includeComponentTemplate = [];
 var installTemplate = [];
 var listTemplate = [];
 
-ComponentNames.forEach(name => {
+Components.forEach(name => {
   var componentName = uppercamelcase(name);
 
   includeComponentTemplate.push(render(IMPORT_TEMPLATE, {
diff --git a/build/bin/build-lib.js b/build/bin/build-lib.js
index 0f59e218f..d20e2ba7c 100644
--- a/build/bin/build-lib.js
+++ b/build/bin/build-lib.js
@@ -12,7 +12,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const components = require('../../components.json');
+const components = require('./get-components')();
 const chalk = require('chalk');
 require('shelljs/global');
 
@@ -38,7 +38,7 @@ log('Finished', 'build:vant-css');
 
 // 5. build style entrys
 log('Starting', 'build:style-entries');
-Object.keys(components).forEach((componentName) => {
+components.forEach((componentName) => {
   const dir = path.join(__dirname, '../../lib/', componentName, '/style');
   const file = path.join(dir, 'index.js');
   const cssPath = path.join(__dirname, '../../lib/vant-css/', `${componentName}.css`);
diff --git a/build/bin/get-components.js b/build/bin/get-components.js
new file mode 100644
index 000000000..9cc7a71fe
--- /dev/null
+++ b/build/bin/get-components.js
@@ -0,0 +1,8 @@
+const fs = require('fs');
+const path = require('path');
+
+module.exports = function() {
+  const dirs = fs.readdirSync(path.resolve(__dirname, '../../packages'));
+  const excludes = ['index.js', 'vant-css', 'mixins', 'utils'];
+  return dirs.filter(dirName => excludes.indexOf(dirName) === -1)
+}
diff --git a/build/bin/init.js b/build/bin/init.js
index 2aa0b37d3..023176707 100644
--- a/build/bin/init.js
+++ b/build/bin/init.js
@@ -28,21 +28,5 @@ gulp.task('copy', function(callback) {
   });
 });
 
-
-// 添加到 components.json
-gulp.task('addComponents', function(callback) {
-  const componentsFile = require('../../components.json');
-  if (componentsFile[name]) {
-    console.error(`${name} 已存在.`);
-    process.exit(1);
-  }
-  componentsFile[name] = `./packages/${name}/index.js`;
-  fileSave(path.join(__dirname, '../../components.json'))
-    .write(JSON.stringify(componentsFile, null, '  '), 'utf8')
-    .end('\n');
-  gutil.log('-------> components.json文件更新成功');
-  gutil.log(gutil.colors.yellow('-------> 请无视下面的make报错'));
-});
-
 runSequence('copy', 'addComponents');
 
diff --git a/build/genExamples.js b/build/genExamples.js
deleted file mode 100644
index c668082f9..000000000
--- a/build/genExamples.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const path = require('path');
-const docConfig = require('../docs/src/doc.config');
-const { extractExample } = require('zan-doc/src/helper');
-
-function extract(watch = false) {
-  extractExample({
-    src: path.resolve(__dirname, '../docs/examples-docs'),
-    dist: path.resolve(__dirname, '../docs/examples-dist'),
-    nav: docConfig['zh-CN'].nav,
-    watch
-  });
-}
-
-module.exports = function watch(isProduction) {
-  extract(!isProduction);
-};
diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js
index 737712be8..c7704eae6 100644
--- a/build/webpack.config.dev.js
+++ b/build/webpack.config.dev.js
@@ -6,11 +6,20 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin');
 const isProduction = process.env.NODE_ENV === 'production';
+const docConfig = require('../docs/src/doc.config');
+const { extractExample } = require('zan-doc/src/helper');
 const styleLoaders = [
   { loader: 'css-loader' },
   { loader: 'postcss-loader', options: { sourceMap: true } }
 ];
-require('./genExamples')(isProduction);
+
+// extract [components].vue from [components].md
+extractExample({
+  src: path.resolve(__dirname, '../docs/examples-docs'),
+  dist: path.resolve(__dirname, '../docs/examples-dist'),
+  nav: docConfig['zh-CN'].nav,
+  watch: !isProduction
+});
 
 module.exports = {
   entry: {
diff --git a/components.json b/components.json
deleted file mode 100644
index 705772a32..000000000
--- a/components.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "button": "./packages/button/index.js",
-  "switch": "./packages/switch/index.js",
-  "field": "./packages/field/index.js",
-  "radio": "./packages/radio/index.js",
-  "cell": "./packages/cell/index.js",
-  "icon": "./packages/icon/index.js",
-  "cell-group": "./packages/cell-group/index.js",
-  "cell-swipe": "./packages/cell-swipe/index.js",
-  "popup": "./packages/popup/index.js",
-  "dialog": "./packages/dialog/index.js",
-  "picker": "./packages/picker/index.js",
-  "radio-group": "./packages/radio-group/index.js",
-  "waterfall": "./packages/waterfall/index.js",
-  "loading": "./packages/loading/index.js",
-  "panel": "./packages/panel/index.js",
-  "card": "./packages/card/index.js",
-  "steps": "./packages/steps/index.js",
-  "tag": "./packages/tag/index.js",
-  "checkbox": "./packages/checkbox/index.js",
-  "checkbox-group": "./packages/checkbox-group/index.js",
-  "badge-group": "./packages/badge-group/index.js",
-  "badge": "./packages/badge/index.js",
-  "search": "./packages/search/index.js",
-  "step": "./packages/step/index.js",
-  "tabs": "./packages/tabs/index.js",
-  "tab": "./packages/tab/index.js",
-  "lazyload": "./packages/lazyload/index.js",
-  "image-preview": "./packages/image-preview/index.js",
-  "col": "./packages/col/index.js",
-  "row": "./packages/row/index.js",
-  "actionsheet": "./packages/actionsheet/index.js",
-  "quantity": "./packages/quantity/index.js",
-  "progress": "./packages/progress/index.js",
-  "toast": "./packages/toast/index.js",
-  "uploader": "./packages/uploader/index.js",
-  "swipe": "./packages/swipe/index.js",
-  "swipe-item": "./packages/swipe-item/index.js",
-  "datetime-picker": "./packages/datetime-picker/index.js",
-  "notice-bar": "./packages/notice-bar/index.js"
-}
diff --git a/packages/index.js b/packages/index.js
index 7529339fe..956bda2ce 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -1,79 +1,81 @@
+import Actionsheet from './actionsheet';
+import Badge from './badge';
+import BadgeGroup from './badge-group';
 import Button from './button';
-import Switch from './switch';
-import Field from './field';
-import Radio from './radio';
+import Card from './card';
 import Cell from './cell';
-import Icon from './icon';
 import CellGroup from './cell-group';
 import CellSwipe from './cell-swipe';
-import Popup from './popup';
-import Dialog from './dialog';
-import Picker from './picker';
-import RadioGroup from './radio-group';
-import Waterfall from './waterfall';
-import Loading from './loading';
-import Panel from './panel';
-import Card from './card';
-import Steps from './steps';
-import Tag from './tag';
 import Checkbox from './checkbox';
 import CheckboxGroup from './checkbox-group';
-import BadgeGroup from './badge-group';
-import Badge from './badge';
+import Col from './col';
+import Collapse from './collapse';
+import DatetimePicker from './datetime-picker';
+import Dialog from './dialog';
+import Field from './field';
+import Icon from './icon';
+import ImagePreview from './image-preview';
+import Lazyload from './lazyload';
+import Loading from './loading';
+import NoticeBar from './notice-bar';
+import Panel from './panel';
+import Picker from './picker';
+import Popup from './popup';
+import Progress from './progress';
+import Quantity from './quantity';
+import Radio from './radio';
+import RadioGroup from './radio-group';
+import Row from './row';
 import Search from './search';
 import Step from './step';
-import Tabs from './tabs';
-import Tab from './tab';
-import Lazyload from './lazyload';
-import ImagePreview from './image-preview';
-import Col from './col';
-import Row from './row';
-import Actionsheet from './actionsheet';
-import Quantity from './quantity';
-import Progress from './progress';
-import Toast from './toast';
-import Uploader from './uploader';
+import Steps from './steps';
 import Swipe from './swipe';
 import SwipeItem from './swipe-item';
-import DatetimePicker from './datetime-picker';
-import NoticeBar from './notice-bar';
+import Switch from './switch';
+import Tab from './tab';
+import Tabs from './tabs';
+import Tag from './tag';
+import Toast from './toast';
+import Uploader from './uploader';
+import Waterfall from './waterfall';
 
 const version = '0.8.6';
 const components = [
+  Actionsheet,
+  Badge,
+  BadgeGroup,
   Button,
-  Switch,
-  Field,
-  Radio,
+  Card,
   Cell,
-  Icon,
   CellGroup,
   CellSwipe,
-  Popup,
-  Picker,
-  RadioGroup,
-  Loading,
-  Panel,
-  Card,
-  Steps,
-  Tag,
   Checkbox,
   CheckboxGroup,
-  BadgeGroup,
-  Badge,
+  Col,
+  Collapse,
+  DatetimePicker,
+  Field,
+  Icon,
+  Loading,
+  NoticeBar,
+  Panel,
+  Picker,
+  Popup,
+  Progress,
+  Quantity,
+  Radio,
+  RadioGroup,
+  Row,
   Search,
   Step,
-  Tabs,
-  Tab,
-  Col,
-  Row,
-  Actionsheet,
-  Quantity,
-  Progress,
-  Uploader,
+  Steps,
   Swipe,
   SwipeItem,
-  DatetimePicker,
-  NoticeBar
+  Switch,
+  Tab,
+  Tabs,
+  Tag,
+  Uploader
 ];
 
 const install = function(Vue) {
@@ -92,45 +94,46 @@ if (typeof window !== 'undefined' && window.Vue) {
 export {
   install,
   version,
+  Actionsheet,
+  Badge,
+  BadgeGroup,
   Button,
-  Switch,
-  Field,
-  Radio,
+  Card,
   Cell,
-  Icon,
   CellGroup,
   CellSwipe,
-  Popup,
-  Dialog,
-  Picker,
-  RadioGroup,
-  Waterfall,
-  Loading,
-  Panel,
-  Card,
-  Steps,
-  Tag,
   Checkbox,
   CheckboxGroup,
-  BadgeGroup,
-  Badge,
+  Col,
+  Collapse,
+  DatetimePicker,
+  Dialog,
+  Field,
+  Icon,
+  ImagePreview,
+  Lazyload,
+  Loading,
+  NoticeBar,
+  Panel,
+  Picker,
+  Popup,
+  Progress,
+  Quantity,
+  Radio,
+  RadioGroup,
+  Row,
   Search,
   Step,
-  Tabs,
-  Tab,
-  Lazyload,
-  ImagePreview,
-  Col,
-  Row,
-  Actionsheet,
-  Quantity,
-  Progress,
-  Toast,
-  Uploader,
+  Steps,
   Swipe,
   SwipeItem,
-  DatetimePicker,
-  NoticeBar
+  Switch,
+  Tab,
+  Tabs,
+  Tag,
+  Toast,
+  Uploader,
+  Waterfall
 };
 export default {
   install,

From c9031494be0532c38db32c82d90e0c5824b3901c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 28 Aug 2017 15:55:28 +0800
Subject: [PATCH 097/126] adjust nav order

---
 docs/src/doc.config.js | 128 ++++++++++++++++++++---------------------
 packages/index.js      |   3 -
 2 files changed, 64 insertions(+), 67 deletions(-)

diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 70cf88afc..0e3afd423 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -50,13 +50,17 @@ module.exports = {
                 "path": "/layout",
                 "title": "Layout 布局"
               },
+              {
+                "path": "/badge",
+                "title": "Badge 徽章"
+              },
               {
                 "path": "/button",
                 "title": "Button 按钮"
               },
               {
-                "path": "/icon",
-                "title": "Icon 图标"
+                "path": "/card",
+                "title": "Card 图文组件"
               },
               {
                 "path": "/cell",
@@ -67,56 +71,8 @@ module.exports = {
                 "title": "CellSwipe 滑动单元格"
               },
               {
-                "path": "/progress",
-                "title": "Progress 进度条"
-              },
-              {
-                "path": "/card",
-                "title": "Card 图文组件"
-              },
-              {
-                "path": "/panel",
-                "title": "Panel 面板"
-              },
-              {
-                "path": "/loading",
-                "title": "Loading 加载"
-              },
-              {
-                "path": "/steps",
-                "title": "Steps 步骤条"
-              },
-              {
-                "path": "/tag",
-                "title": "Tag 标记"
-              },
-              {
-                "path": "/badge",
-                "title": "Badge 徽章"
-              },
-              {
-                "path": "/tab",
-                "title": "Tab 标签"
-              },
-              {
-                "path": "/popup",
-                "title": "Popup 弹出菜单"
-              },
-              {
-                "path": "/swipe",
-                "title": "Swipe 轮播"
-              },
-              {
-                "path": "/search",
-                "title": "Search 搜索"
-              },
-              {
-                "path": "/quantity",
-                "title": "Quantity 数量选择"
-              },
-              {
-                "path": "/waterfall",
-                "title": "Waterfall 瀑布流"
+                "path": "/icon",
+                "title": "Icon 图标"
               },
               {
                 "path": "/image-preview",
@@ -126,9 +82,53 @@ module.exports = {
                 "path": "/lazyload",
                 "title": "Lazyload 图片懒加载"
               },
+              {
+                "path": "/loading",
+                "title": "Loading 加载"
+              },
               {
                 "path": "/notice-bar",
                 "title": "NoticeBar 通告栏"
+              },
+              {
+                "path": "/panel",
+                "title": "Panel 面板"
+              },
+              {
+                "path": "/popup",
+                "title": "Popup 弹出菜单"
+              },
+              {
+                "path": "/progress",
+                "title": "Progress 进度条"
+              },
+              {
+                "path": "/quantity",
+                "title": "Quantity 数量选择"
+              },
+              {
+                "path": "/steps",
+                "title": "Steps 步骤条"
+              },
+              {
+                "path": "/tab",
+                "title": "Tab 标签"
+              },
+              {
+                "path": "/tag",
+                "title": "Tag 标记"
+              },
+              {
+                "path": "/swipe",
+                "title": "Swipe 轮播"
+              },
+              {
+                "path": "/search",
+                "title": "Search 搜索"
+              },
+              {
+                "path": "/waterfall",
+                "title": "Waterfall 瀑布流"
               }
             ]
           },
@@ -136,8 +136,8 @@ module.exports = {
             "groupName": "表单",
             "list": [
               {
-                "path": "/switch",
-                "title": "Switch 开关"
+                "path": "/checkbox",
+                "title": "Checkbox 复选框"
               },
               {
                 "path": "/field",
@@ -148,8 +148,8 @@ module.exports = {
                 "title": "Radio 单选框"
               },
               {
-                "path": "/checkbox",
-                "title": "Checkbox 复选框"
+                "path": "/switch",
+                "title": "Switch 开关"
               },
               {
                 "path": "/uploader",
@@ -164,14 +164,6 @@ module.exports = {
                 "path": "/actionsheet",
                 "title": "Actionsheet 行动按钮"
               },
-              {
-                "path": "/toast",
-                "title": "Toast 轻提示"
-              },
-              {
-                "path": "/picker",
-                "title": "Picker 选择器"
-              },
               {
                 "path": "/datetime-picker",
                 "title": "DatetimePicker 时间选择"
@@ -179,6 +171,14 @@ module.exports = {
               {
                 "path": "/dialog",
                 "title": "Dialog 弹出框"
+              },
+              {
+                "path": "/picker",
+                "title": "Picker 选择器"
+              },
+              {
+                "path": "/toast",
+                "title": "Toast 轻提示"
               }
             ]
           }
diff --git a/packages/index.js b/packages/index.js
index 956bda2ce..e1ff78211 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -9,7 +9,6 @@ import CellSwipe from './cell-swipe';
 import Checkbox from './checkbox';
 import CheckboxGroup from './checkbox-group';
 import Col from './col';
-import Collapse from './collapse';
 import DatetimePicker from './datetime-picker';
 import Dialog from './dialog';
 import Field from './field';
@@ -52,7 +51,6 @@ const components = [
   Checkbox,
   CheckboxGroup,
   Col,
-  Collapse,
   DatetimePicker,
   Field,
   Icon,
@@ -105,7 +103,6 @@ export {
   Checkbox,
   CheckboxGroup,
   Col,
-  Collapse,
   DatetimePicker,
   Dialog,
   Field,

From 245f03309f0acbfc464dd4b3c03f7e9ee7e54189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 28 Aug 2017 17:38:32 +0800
Subject: [PATCH 098/126] add CellSwitch component

---
 docs/examples-docs/switch-cell.md     | 81 +++++++++++++++++++++++++++
 docs/src/doc.config.js                |  9 +++
 packages/index.js                     |  3 +
 packages/switch-cell/index.vue        | 32 +++++++++++
 packages/vant-css/src/index.css       |  1 +
 packages/vant-css/src/switch-cell.css |  9 +++
 test/unit/specs/switch-cell.spec.js   | 74 ++++++++++++++++++++++++
 7 files changed, 209 insertions(+)
 create mode 100644 docs/examples-docs/switch-cell.md
 create mode 100644 packages/switch-cell/index.vue
 create mode 100644 packages/vant-css/src/switch-cell.css
 create mode 100644 test/unit/specs/switch-cell.spec.js

diff --git a/docs/examples-docs/switch-cell.md b/docs/examples-docs/switch-cell.md
new file mode 100644
index 000000000..24ff57fc8
--- /dev/null
+++ b/docs/examples-docs/switch-cell.md
@@ -0,0 +1,81 @@
+## SwitchCell 开关单元格
+
+`SwitchCell`组件是对`Switch`和`Cell`组件的封装
+
+<script>
+export default {
+  data() {
+    return {
+      checked: true
+    }
+  }
+}
+</script>
+
+### 使用指南
+``` javascript
+import { SwitchCell } from 'vant';
+
+Vue.component(SwitchCell.name, SwitchCell);
+```
+
+### 代码演示
+
+#### 基础用法
+
+:::demo 基础用法
+```html
+<template>
+ <van-cell-group>
+   <van-switch-cell v-model="checked" title="标题" />
+ </van-cell-group>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      checked: true
+    }
+  }
+}
+</script>
+```
+:::
+
+#### 禁用状态
+通过`disabled`属性可以将组件设置为禁用状态
+
+:::demo 禁用状态
+```html
+<van-cell-group>
+  <van-switch-cell v-model="checked" :disabled="true" title="标题" />
+</van-cell-group>
+```
+:::
+
+#### 加载状态
+通过`loading`属性可以将组件设置为加载状态
+
+:::demo 加载状态
+```html
+<van-cell-group>
+  <van-switch-cell v-model="checked" :loading="true" title="标题" />
+</van-cell-group>
+```
+:::
+
+### API
+
+| 参数       | 说明      | 类型       | 默认值       | 可选值      |
+|-----------|-----------|-----------|-------------|-------------|
+| v-model | 开关状态 | `Boolean`  |   | |
+| title | 左侧标题 |  `String` | `''` | |
+| loading | 是否为加载状态 |  `Boolean` | `false` | |
+| disabled | 是否为禁用状态 |  `Boolean` | `false` | |
+
+### Event
+
+| 事件名       | 说明      | 参数       |
+|-----------|-----------|-----------|
+| change | 开关状态切换回调 | checked: 是否选中开关 |
\ No newline at end of file
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 0e3afd423..58c899777 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -181,6 +181,15 @@ module.exports = {
                 "title": "Toast 轻提示"
               }
             ]
+          },
+          {
+            "groupName": "业务组件",
+            "list": [
+              {
+                "path": "/switch-cell",
+                "title": "SwitchCell 开关单元格"
+              }
+            ]
           }
         ]
       }
diff --git a/packages/index.js b/packages/index.js
index e1ff78211..fcb708c38 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -31,6 +31,7 @@ import Steps from './steps';
 import Swipe from './swipe';
 import SwipeItem from './swipe-item';
 import Switch from './switch';
+import SwitchCell from './switch-cell';
 import Tab from './tab';
 import Tabs from './tabs';
 import Tag from './tag';
@@ -70,6 +71,7 @@ const components = [
   Swipe,
   SwipeItem,
   Switch,
+  SwitchCell,
   Tab,
   Tabs,
   Tag,
@@ -125,6 +127,7 @@ export {
   Swipe,
   SwipeItem,
   Switch,
+  SwitchCell,
   Tab,
   Tabs,
   Tag,
diff --git a/packages/switch-cell/index.vue b/packages/switch-cell/index.vue
new file mode 100644
index 000000000..911d33da5
--- /dev/null
+++ b/packages/switch-cell/index.vue
@@ -0,0 +1,32 @@
+<template>
+  <van-cell :title="title" class="van-switch-cell">
+    <van-switch :value="value" @input="$emit('input', $event)" :disabled="disabled" :loading="loading" />
+  </van-cell>
+</template>
+
+<script>
+import Cell from '../cell';
+import Switch from '../switch';
+
+export default {
+  name: 'van-switch-cell',
+
+  components: {
+    [Cell.name]: Cell,
+    [Switch.name]: Switch
+  },
+
+  props: {
+    title: String,
+    value: Boolean,
+    loading: Boolean,
+    disabled: Boolean
+  },
+
+  watch: {
+    value() {
+      this.$emit('change', this.value);
+    }
+  }
+};
+</script>
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index 6a7bfa8df..d897aacbd 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -31,3 +31,4 @@
 @import './uploader.css';
 @import './swipe.css';
 @import './notice-bar.css';
+@import './switch-cell.css';
diff --git a/packages/vant-css/src/switch-cell.css b/packages/vant-css/src/switch-cell.css
new file mode 100644
index 000000000..7edabe8bd
--- /dev/null
+++ b/packages/vant-css/src/switch-cell.css
@@ -0,0 +1,9 @@
+.van-switch-cell {
+  .van-cell__title {
+    vertical-align: middle;
+  }
+
+  .van-switch {
+    float: right;
+  }
+}
\ No newline at end of file
diff --git a/test/unit/specs/switch-cell.spec.js b/test/unit/specs/switch-cell.spec.js
new file mode 100644
index 000000000..a363c5ced
--- /dev/null
+++ b/test/unit/specs/switch-cell.spec.js
@@ -0,0 +1,74 @@
+import SwitchCell from 'packages/switch-cell';
+import { mount } from 'avoriaz';
+import { DOMChecker } from '../utils';
+
+describe('SwitchCell', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('default', () => {
+    wrapper = mount(SwitchCell, {
+      attachToDocument: true
+    });
+
+    DOMChecker(wrapper, {
+      count: {
+        '.van-switch--off': 1,
+        '.van-switch--disabled': 0
+      }
+    });
+  });
+
+  it('set title', () => {
+    wrapper = mount(SwitchCell, {
+      attachToDocument: true,
+      propsData: {
+        title: '测试标题'
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-cell__text': '测试标题'
+      },
+      count: {
+        '.van-switch--off': 1,
+        '.van-switch--disabled': 0
+      }
+    });
+  });
+
+  it('checked', () => {
+    wrapper = mount(SwitchCell, {
+      attachToDocument: true,
+      propsData: {
+        value: true
+      }
+    });
+
+    DOMChecker(wrapper, {
+      count: {
+        '.van-switch--on': 1,
+        '.van-switch--disabled': 0
+      }
+    });
+  });
+
+  it('disabled', () => {
+    wrapper = mount(SwitchCell, {
+      attachToDocument: true,
+      propsData: {
+        disabled: true
+      }
+    });
+
+    DOMChecker(wrapper, {
+      count: {
+        '.van-switch--off': 1,
+        '.van-switch--disabled': 1
+      }
+    });
+  });
+});

From 09944101db4f1cc2848b3aeae6b1c43599915f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 28 Aug 2017 17:52:17 +0800
Subject: [PATCH 099/126] SwitchCell: add change event test case

---
 test/unit/specs/switch-cell.spec.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/test/unit/specs/switch-cell.spec.js b/test/unit/specs/switch-cell.spec.js
index a363c5ced..edfaee56a 100644
--- a/test/unit/specs/switch-cell.spec.js
+++ b/test/unit/specs/switch-cell.spec.js
@@ -71,4 +71,25 @@ describe('SwitchCell', () => {
       }
     });
   });
+
+  it('listen to change event', (done) => {
+    wrapper = mount(SwitchCell, {
+      attachToDocument: true,
+      propsData: {
+        value: false
+      }
+    });
+
+    wrapper.vm.$on('input', (value) => {
+      wrapper.vm.value = value;
+    });
+
+    wrapper.vm.$on('change', (value) => {
+      expect(value).to.be.true;
+      done();
+    });
+
+    const switchEl = wrapper.find('.van-switch')[0];
+    switchEl.trigger('click');
+  });
 });

From 9eed1b1f856f3e1dc8ee5e6ff57ad42b6e185b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 28 Aug 2017 19:20:47 +0800
Subject: [PATCH 100/126] add ExpressWay component

---
 docs/examples-docs/express-way.md     | 130 +++++++++++++++++
 docs/src/doc.config.js                |   4 +
 packages/express-way/Option.vue       |  38 +++++
 packages/express-way/index.vue        | 100 +++++++++++++
 packages/index.js                     |   3 +
 packages/vant-css/src/express-way.css |  58 ++++++++
 packages/vant-css/src/index.css       |   1 +
 test/unit/specs/express-way.spec.js   | 201 ++++++++++++++++++++++++++
 8 files changed, 535 insertions(+)
 create mode 100644 docs/examples-docs/express-way.md
 create mode 100644 packages/express-way/Option.vue
 create mode 100644 packages/express-way/index.vue
 create mode 100644 packages/vant-css/src/express-way.css
 create mode 100644 test/unit/specs/express-way.spec.js

diff --git a/docs/examples-docs/express-way.md b/docs/examples-docs/express-way.md
new file mode 100644
index 000000000..1aed0e45a
--- /dev/null
+++ b/docs/examples-docs/express-way.md
@@ -0,0 +1,130 @@
+## ExpressWay 配送方式
+
+<script>
+import { Toast, CellGroup } from 'packages/index';
+
+export default {
+  data() {
+    return {
+      currentExpressType: 1,
+      expressList: [{
+        'postage': 10050,
+        'postage_desc': '由商家门店提供配送服务, 起送价 0.01 元',
+        'postage_title': '同城配送',
+        'express_type': 1
+      }, {
+        'postage': 0,
+        'postage_desc': '由商家选择合作快递为您服务',
+        'postage_title': '快递发货',
+        'express_type': 2,
+        'postage_warn_desc': '3天后发货'
+      }]
+    };
+  },
+
+  methods: {
+    onChange(item, index) {
+      Toast('配送方式更换为:' + item.postage_title);
+    }
+  },
+
+  components: {
+    [CellGroup.name]: CellGroup
+  }
+}
+</script>
+
+### 使用指南
+``` javascript
+import { ExpressWay } from 'vant';
+
+Vue.component(ExpressWay.name, ExpressWay);
+```
+
+### 代码演示
+
+#### 基础用法
+
+:::demo 基础用法
+```html
+<template>
+  <van-cell-group>
+    <van-express-way 
+      v-model="currentExpressType" 
+      :express-list="expressList" 
+      @change="onChange"
+    />
+  </van-cell-group>
+</tempalte>
+
+<script>
+export default {
+  data() {
+    return {
+      currentExpressType: 1,
+      expressList: [{
+        'postage': 10050,
+        'postage_desc': '由商家门店提供配送服务, 起送价 0.01 元',
+        'postage_title': '同城配送',
+        'express_type': 1
+      }, {
+        'postage': 0,
+        'postage_desc': '由商家选择合作快递为您服务',
+        'postage_title': '快递发货',
+        'express_type': 2,
+        'postage_warn_desc': '3天后发货'
+      }]
+    };
+  },
+
+  methods: {
+    onChange(item, index) {
+      Toast('配送方式更换为:' + item.postage_title);
+    }
+  }
+}
+</script>
+```
+:::
+
+#### 不可修改配送方式
+
+:::demo 不可修改配送方式
+```html
+<van-cell-group>
+  <van-express-way 
+    :value="-1" 
+    :express-list="expressList"
+    :editable="false"
+    @change="onChange"
+  />
+</van-cell-group>
+```
+:::
+
+### API
+
+| 参数       | 说明      | 类型       | 默认值       | 必须      |
+|-----------|-----------|-----------|-------------|-------------|
+| v-model | 当前选择的配送类型 | `Number`  |   | 是 |
+| expressList | 配送方式列表数据 | `Array`  |   | 是 |
+| cellTitle | Cell 标题 | `String`  | `配送方式` | 否 |
+| actionsheetTitle | Actionsheet 标题 | `String`  | `配送方式` | 否 |
+| editable | 能否修改配送方式 | `Boolean`  | `true` | 否 |
+
+
+### 数据格式
+#### expressList中的配送方式字段说明
+| key       | 说明      | 类型       |
+|-----------|-----------|-----------|
+| postage | 运费，以分为单位 |  Number |
+| postage_title | 配送方式 |  String |
+| postage_desc | 描述信息 |  String |
+| express_type | 配送类型 |  Number |
+| postage_warn_desc | 提示信息 |  String |
+
+### Event
+
+| 事件名       | 说明      | 参数       |
+|-----------|-----------|-----------|
+| change | 修改配送方式时触发 | item: 对应的数据, index：对应的索引 |
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 58c899777..364ce26be 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -185,6 +185,10 @@ module.exports = {
           {
             "groupName": "业务组件",
             "list": [
+              {
+                "path": "/express-way",
+                "title": "ExpressWay 配送方式"
+              },
               {
                 "path": "/switch-cell",
                 "title": "SwitchCell 开关单元格"
diff --git a/packages/express-way/Option.vue b/packages/express-way/Option.vue
new file mode 100644
index 000000000..29220462f
--- /dev/null
+++ b/packages/express-way/Option.vue
@@ -0,0 +1,38 @@
+<template>
+  <van-cell class="van-express-way-option" @click="$emit('change')">
+    <van-radio :name="data.express_type" :value="currentExpressWay" />
+    <div class="van-express-way-option__content">
+      <h3 class="van-express-way-option__title">
+        <span>{{ data.postage_title }}</span>
+        <span>{{ data.postage }}</span>
+      </h3>
+      <p>{{ data.postage_desc }}</p>
+      <div class="van-express-way-option__warn" v-if="data.postage_warn_desc">{{ data.postage_warn_desc }}</div>
+    </div>
+  </van-cell>
+</template>
+
+<script>
+import Cell from '../cell';
+import Radio from '../radio';
+
+export default {
+  name: 'van-express-way-option',
+
+  components: {
+    [Cell.name]: Cell,
+    [Radio.name]: Radio
+  },
+
+  props: {
+    currentExpressWay: {
+      type: Number,
+      required: true
+    },
+    data: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
diff --git a/packages/express-way/index.vue b/packages/express-way/index.vue
new file mode 100644
index 000000000..ac6743579
--- /dev/null
+++ b/packages/express-way/index.vue
@@ -0,0 +1,100 @@
+<template>
+  <van-cell class="van-express-way">
+    <van-actionsheet v-if="computedEditable" v-model="showActionsheet" :title="actionsheetTitle" >
+      <van-cell-group>
+        <van-express-way-option
+          v-for="(item, index) in computedList"
+          :key="item.express_type"
+          :data="item"
+          :currentExpressWay="value"
+          @change="onSelectExpressWay(item, index)"
+        />
+      </van-cell-group>
+    </van-actionsheet>
+    <van-cell :title="cellTitle" :isLink="computedEditable" @click="showActionsheet = computedEditable">
+      <p class="van-express-way__fee">{{ currentOption.postage }}</p>
+      <p class="van-express-way__type">{{ currentOption.postage_title }}</p>
+    </van-cell>
+  </van-cell>
+</template>
+
+<script>
+import Option from './Option.vue';
+import Actionsheet from '../actionsheet';
+import Cell from '../cell';
+import CellGroup from '../cell-group';
+
+export default {
+  name: 'van-express-way',
+
+  components: {
+    [Option.name]: Option,
+    [Cell.name]: Cell,
+    [CellGroup.name]: CellGroup,
+    [Actionsheet.name]: Actionsheet
+  },
+
+  props: {
+    value: {
+      type: Number,
+      required: true
+    },
+    expressList: {
+      type: Array,
+      required: true
+    },
+    cellTitle: {
+      type: String,
+      default: '配送方式'
+    },
+    actionsheetTitle: {
+      type: String,
+      default: '配送方式'
+    },
+    editable: {
+      type: Boolean,
+      default: true
+    }
+  },
+
+  data() {
+    return {
+      showActionsheet: false
+    };
+  },
+
+  computed: {
+    computedList() {
+      return this.expressList.map(item => ({
+        ...item,
+        postage: this.calcPostage(item.postage)
+      }));
+    },
+
+    computedEditable() {
+      return this.expressList && this.expressList.length >= 2 && this.editable;
+    },
+
+    currentOption() {
+      for (let i = 0; i < this.computedList.length; i++) {
+        if (this.computedList[i].express_type === this.value) {
+          return this.computedList[i];
+        }
+      }
+      return {};
+    }
+  },
+
+  methods: {
+    onSelectExpressWay(item, index) {
+      this.showActionsheet = false;
+      this.$emit('input', item.express_type);
+      this.$emit('change', item, index);
+    },
+
+    calcPostage(postage) {
+      return postage === 0 ? '免运费' : '¥' + (postage / 100).toFixed(2);
+    }
+  }
+};
+</script>
diff --git a/packages/index.js b/packages/index.js
index fcb708c38..ad330f79c 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -11,6 +11,7 @@ import CheckboxGroup from './checkbox-group';
 import Col from './col';
 import DatetimePicker from './datetime-picker';
 import Dialog from './dialog';
+import ExpressWay from './express-way';
 import Field from './field';
 import Icon from './icon';
 import ImagePreview from './image-preview';
@@ -53,6 +54,7 @@ const components = [
   CheckboxGroup,
   Col,
   DatetimePicker,
+  ExpressWay,
   Field,
   Icon,
   Loading,
@@ -107,6 +109,7 @@ export {
   Col,
   DatetimePicker,
   Dialog,
+  ExpressWay,
   Field,
   Icon,
   ImagePreview,
diff --git a/packages/vant-css/src/express-way.css b/packages/vant-css/src/express-way.css
new file mode 100644
index 000000000..a0507b435
--- /dev/null
+++ b/packages/vant-css/src/express-way.css
@@ -0,0 +1,58 @@
+.van-express-way {
+  padding: 0;
+
+  &__fee,
+  &__type {
+    color: #666;
+    line-height: 1.5;
+  }
+
+  &__fee {
+    font-size: 14px;
+  }
+
+  &__type {
+    font-size: 12px;
+  }
+
+  .van-actionsheet__content {
+    max-height: 290px;
+    overflow-y: auto;
+  }
+
+  &-option {
+    position: relative;
+    padding: 14px 15px 14px 0;
+    
+    .van-radio {
+      top: 50%;
+      left: 0;
+      margin-top: -11px;
+      position: absolute;
+    }
+
+    &__content {
+      padding-left: 30px;
+
+      p {
+        color: #999;
+        font-size: 12px;
+        line-height: 16px;
+      }
+    }
+
+    &__title {
+      span {
+        vertical-align: middle;
+
+        &:first-child {
+          margin-right: 5px;
+        }
+      }
+    }
+
+    &__warn {
+      color: #f09000;
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index d897aacbd..04bb59827 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -32,3 +32,4 @@
 @import './swipe.css';
 @import './notice-bar.css';
 @import './switch-cell.css';
+@import './express-way.css';
diff --git a/test/unit/specs/express-way.spec.js b/test/unit/specs/express-way.spec.js
new file mode 100644
index 000000000..06185dddd
--- /dev/null
+++ b/test/unit/specs/express-way.spec.js
@@ -0,0 +1,201 @@
+import ExpressWay from 'packages/express-way';
+import { mount } from 'avoriaz';
+import { DOMChecker } from '../utils';
+
+const mockData = [{
+  'postage': 10050,
+  'postage_desc': '由商家门店提供配送服务, 起送价 0.01 元',
+  'postage_title': '同城配送',
+  'express_type': 1
+}, {
+  'postage': 0,
+  'postage_desc': '由商家选择合作快递为您服务',
+  'postage_title': '快递发货',
+  'express_type': 2,
+  'postage_warn_desc': '3天后发货'
+}];
+
+describe('ExpressWay', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('default', () => {
+    wrapper = mount(ExpressWay, {
+      attachToDocument: true,
+      propsData: {
+        value: 1,
+        expressList: mockData
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-cell__text': '配送方式',
+        '.van-express-way__fee': '¥100.50',
+        '.van-express-way__type': mockData[0].postage_title,
+        '.van-actionsheet__header h3': '配送方式',
+        '.van-express-way-option__title span': mockData[0].postage_title,
+        '.van-express-way-option__content p': mockData[0].postage_desc
+      },
+      count: {
+        '.van-icon-arrow': 1
+      },
+      style: {
+        '.van-actionsheet': {
+          display: 'none'
+        }
+      }
+    });
+  });
+
+  it('show actionsheet', (done) => {
+    wrapper = mount(ExpressWay, {
+      attachToDocument: true,
+      propsData: {
+        value: 1,
+        expressList: mockData
+      }
+    });
+
+    // 点击后弹出 actionsheet
+    const cells = wrapper.find('.van-cell');
+    cells[cells.length - 1].trigger('click');
+    setTimeout(() => {
+      expect(wrapper.find('.van-actionsheet')[0].hasStyle('display', 'none')).to.equal(false);
+      done();
+    }, 500);
+  });
+
+  it('change express way', (done) => {
+    wrapper = mount(ExpressWay, {
+      attachToDocument: true,
+      propsData: {
+        value: 1,
+        expressList: mockData
+      }
+    });
+
+    wrapper.vm.$on('input', val => {
+      wrapper.vm.value = val;
+    });
+
+    // 点击后弹出 actionsheet
+    const cells = wrapper.find('.van-cell');
+    cells[cells.length - 1].trigger('click');
+
+    // 监听 change 事件
+    const submitSpyFunc = sinon.spy();
+    wrapper.vm.$on('change', submitSpyFunc);
+
+    setTimeout(() => {
+      expect(wrapper.find('.van-actionsheet')[0].hasStyle('display', 'none')).to.equal(false);
+
+      const secondOption = wrapper.find('.van-express-way-option')[1];
+      secondOption.trigger('click');
+
+      setTimeout(() => {
+        expect(wrapper.find('.van-actionsheet')[0].hasStyle('display', 'none')).to.equal(true);
+
+        DOMChecker(wrapper, {
+          text: {
+            '.van-express-way__fee': '免运费',
+            '.van-express-way__type': mockData[1].postage_title
+          }
+        });
+
+        // 修改后触发 change 事件
+        expect(submitSpyFunc.calledOnce).to.be.true;
+        done();
+      }, 500);
+    }, 500);
+  });
+
+  it('cellTitle prop', () => {
+    wrapper = mount(ExpressWay, {
+      attachToDocument: true,
+      propsData: {
+        value: 1,
+        cellTitle: '测试标题',
+        expressList: mockData
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-cell__text': '测试标题'
+      }
+    });
+  });
+
+  it('actionsheetTitle prop', () => {
+    wrapper = mount(ExpressWay, {
+      attachToDocument: true,
+      propsData: {
+        value: 1,
+        actionsheetTitle: '测试标题',
+        expressList: mockData
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-actionsheet__header h3': '测试标题'
+      }
+    });
+  });
+
+  it('set editable false ', () => {
+    wrapper = mount(ExpressWay, {
+      attachToDocument: true,
+      propsData: {
+        value: 1,
+        editable: false,
+        expressList: mockData
+      }
+    });
+
+    DOMChecker(wrapper, {
+      count: {
+        '.van-icon-arrow': 0,
+        '.van-actionsheet': 0
+      }
+    });
+  });
+
+  it('not editable when only one option', () => {
+    wrapper = mount(ExpressWay, {
+      attachToDocument: true,
+      propsData: {
+        value: 1,
+        editable: true,
+        expressList: mockData.slice(0, 1)
+      }
+    });
+
+    DOMChecker(wrapper, {
+      count: {
+        '.van-icon-arrow': 0,
+        '.van-actionsheet': 0
+      }
+    });
+  });
+
+  it('unexist express type', () => {
+    wrapper = mount(ExpressWay, {
+      attachToDocument: true,
+      propsData: {
+        value: -1,
+        expressList: mockData
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-express-way__fee': '',
+        '.van-express-way__type': ''
+      }
+    });
+  });
+});

From fc1fac76a99520545ae2e8726092d86835d1ff7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Mon, 28 Aug 2017 19:31:50 +0800
Subject: [PATCH 101/126] ExpressWay: remove option props type check

---
 packages/express-way/Option.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/express-way/Option.vue b/packages/express-way/Option.vue
index 29220462f..c29521dfa 100644
--- a/packages/express-way/Option.vue
+++ b/packages/express-way/Option.vue
@@ -25,14 +25,8 @@ export default {
   },
 
   props: {
-    currentExpressWay: {
-      type: Number,
-      required: true
-    },
-    data: {
-      type: Object,
-      required: true
-    }
+    data: Object,
+    currentExpressWay: Number
   }
 };
 </script>

From 276c06c0c05cf0af086d0f3fb27ecd3a0aec61dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 29 Aug 2017 11:29:21 +0800
Subject: [PATCH 102/126] [build] 0.8.7

---
 docs/examples-docs/changelog.md | 18 ++++++++++++++++++
 packages/index.js               |  2 +-
 packages/vant-css/package.json  |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/docs/examples-docs/changelog.md b/docs/examples-docs/changelog.md
index 545b0e180..de6ed92ed 100644
--- a/docs/examples-docs/changelog.md
+++ b/docs/examples-docs/changelog.md
@@ -1,5 +1,23 @@
 ## 更新日志
 
+## [v0.8.6](https://github.com/youzan/vant/tree/v0.8.6) (2017-08-24)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.8.5...v0.8.6)
+
+**非兼容更新和新特性:**
+
+- dalete merge && class operating methods [\#88](https://github.com/youzan/vant/pull/88) ([chenjiahan](https://github.com/chenjiahan))
+- directory adjust: delete entry index.js [\#87](https://github.com/youzan/vant/pull/87) ([chenjiahan](https://github.com/chenjiahan))
+- Button: reduce unnecessary styles [\#86](https://github.com/youzan/vant/pull/86) ([chenjiahan](https://github.com/chenjiahan))
+- Layout: optimize doc [\#85](https://github.com/youzan/vant/pull/85) ([chenjiahan](https://github.com/chenjiahan))
+
+**修复:**
+
+- Fix datetime-picker init value [\#89](https://github.com/youzan/vant/pull/89) ([w91](https://github.com/w91))
+
+**处理的 Issue:**
+
+- When 'showIndicators' set to 'false' The second image does not show [\#80](https://github.com/youzan/vant/issues/80)
+
 ## [v0.8.5](https://github.com/youzan/vant/tree/v0.8.5) (2017-08-21)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.8.4...v0.8.5)
 
diff --git a/packages/index.js b/packages/index.js
index ad330f79c..a3d2fba30 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -40,7 +40,7 @@ import Toast from './toast';
 import Uploader from './uploader';
 import Waterfall from './waterfall';
 
-const version = '0.8.6';
+const version = '0.8.7';
 const components = [
   Actionsheet,
   Badge,
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index d3dbbe043..303fa2df3 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

From edb23bffca5f312bd423106cc298881a087eddc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 29 Aug 2017 11:29:22 +0800
Subject: [PATCH 103/126] [release] 0.8.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1536e0cd9..b24c40444 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "有赞vue wap组件库",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From 3b6e462b9068702e132d5c9144fa195768fb7996 Mon Sep 17 00:00:00 2001
From: Yao <chenyao1102@gmail.com>
Date: Tue, 29 Aug 2017 15:17:00 +0800
Subject: [PATCH 104/126] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20make=20init=20bug?=
 =?UTF-8?q?=20(#97)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: make init
---
 build/bin/init.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/bin/init.js b/build/bin/init.js
index 023176707..799258e11 100644
--- a/build/bin/init.js
+++ b/build/bin/init.js
@@ -28,5 +28,5 @@ gulp.task('copy', function(callback) {
   });
 });
 
-runSequence('copy', 'addComponents');
+runSequence('copy');
 

From 67a3c16a627b5c791bd0a34708a85fe877d7e270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 29 Aug 2017 15:59:13 +0800
Subject: [PATCH 105/126] update dependencies

---
 build/webpack.config.dev.js |  1 +
 package.json                |  4 ++--
 yarn.lock                   | 33 ++++++++++++++++++++++-----------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js
index c7704eae6..f4657d327 100644
--- a/build/webpack.config.dev.js
+++ b/build/webpack.config.dev.js
@@ -60,6 +60,7 @@ module.exports = {
           {
             loader: 'vue-loader',
             options: {
+              preserveWhitespace: false,
               loaders: {
                 postcss: ExtractTextPlugin.extract({
                   use: styleLoaders,
diff --git a/package.json b/package.json
index b24c40444..67c50bf01 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "vue": "2.4.2"
   },
   "devDependencies": {
-    "autoprefixer": "^7.1.2",
+    "autoprefixer": "^7.1.3",
     "avoriaz": "2.0.0",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
@@ -117,6 +117,6 @@
     "webpack": "^3.5.5",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "^0.2.5"
+    "zan-doc": "^0.2.6"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 65dac4f42..361847594 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -334,15 +334,15 @@ autoprefixer@^6.3.1:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
-autoprefixer@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.2.tgz#fbeaf07d48fd878e0682bf7cbeeade728adb2b18"
+autoprefixer@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.3.tgz#0e8d337976d6f13644db9f8813b4c42f3d1ccc34"
   dependencies:
-    browserslist "^2.1.5"
-    caniuse-lite "^1.0.30000697"
+    browserslist "^2.4.0"
+    caniuse-lite "^1.0.30000718"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^6.0.6"
+    postcss "^6.0.10"
     postcss-value-parser "^3.2.3"
 
 avoriaz@2.0.0:
@@ -1204,13 +1204,20 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^2.1.2, browserslist@^2.1.5:
+browserslist@^2.1.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.3.3.tgz#2b0cabc4d28489f682598605858a0782f14b154c"
   dependencies:
     caniuse-lite "^1.0.30000715"
     electron-to-chromium "^1.3.18"
 
+browserslist@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/browserslist/-/browserslist-2.4.0.tgz#693ee93d01e66468a6348da5498e011f578f87f8"
+  dependencies:
+    caniuse-lite "^1.0.30000718"
+    electron-to-chromium "^1.3.18"
+
 buffer-indexof@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.0.tgz#f54f647c4f4e25228baa656a2e57e43d5f270982"
@@ -1304,10 +1311,14 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   version "1.0.30000715"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000715.tgz#0b9b5c795950dfbaf301a8806bafe87f126da8ca"
 
-caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000715:
+caniuse-lite@^1.0.30000715:
   version "1.0.30000715"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000715.tgz#c327f5e6d907ebcec62cde598c3bf0dd793fb9a0"
 
+caniuse-lite@^1.0.30000718:
+  version "1.0.30000718"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000718.tgz#0dd24290beb11310b2d80f6b70a823c2a65a6fad"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -7959,9 +7970,9 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-zan-doc@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.5.tgz#4f82e1b75db1a348b57436cd1d4ffb607bc18562"
+zan-doc@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.6.tgz#27cc789460c32f6bed7687e050e2d9063b2725d5"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"

From 3a32c2457393a8b554dfc90840121d579ef61e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 29 Aug 2017 15:59:19 +0800
Subject: [PATCH 106/126] add PayOrder component

---
 docs/examples-docs/pay-order.md     | 87 +++++++++++++++++++++++++
 docs/src/doc.config.js              |  4 ++
 packages/index.js                   |  3 +
 packages/pay-order/index.vue        | 63 ++++++++++++++++++
 packages/vant-css/src/index.css     |  1 +
 packages/vant-css/src/pay-order.css | 59 +++++++++++++++++
 test/unit/specs/pay-order.spec.js   | 99 +++++++++++++++++++++++++++++
 7 files changed, 316 insertions(+)
 create mode 100644 docs/examples-docs/pay-order.md
 create mode 100644 packages/pay-order/index.vue
 create mode 100644 packages/vant-css/src/pay-order.css
 create mode 100644 test/unit/specs/pay-order.spec.js

diff --git a/docs/examples-docs/pay-order.md b/docs/examples-docs/pay-order.md
new file mode 100644
index 000000000..1df37b4a2
--- /dev/null
+++ b/docs/examples-docs/pay-order.md
@@ -0,0 +1,87 @@
+## PayOrder 支付订单
+
+<script>
+import { Toast } from 'packages/index';
+
+export default {
+  methods: {
+    onClickButton() {
+      Toast('点击按钮');
+    }
+  }
+}
+</script>
+
+<style>
+.demo-pay-order {
+  .van-pay-order {
+    position: relative;
+  }
+}
+</style>
+
+### 使用指南
+``` javascript
+import { PayOrder } from 'vant';
+
+Vue.component(PayOrder.name, PayOrder);
+```
+
+### 代码演示
+
+#### 基础用法
+
+:::demo 基础用法
+```html
+<van-pay-order
+  :price="3050"
+  button-text="提交订单"
+  @submit="onClickButton"
+/>
+```
+:::
+
+#### 禁用状态
+禁用状态下不会触发`submit`事件
+
+:::demo 禁用状态
+```html
+<van-pay-order
+  disabled
+  :price="3050"
+  button-text="提交订单"
+  tip="您的收货地址不支持同城送, 我们已为您推荐快递"
+  @submit="onClickButton"
+/>
+```
+:::
+
+#### 加载状态
+加载状态下不会触发`submit`事件
+:::demo 加载状态
+```html
+<van-pay-order
+  loading
+  :price="3050"
+  button-text="提交订单"
+  @submit="onClickButton"
+/>
+```
+:::
+
+### API
+
+| 参数       | 说明      | 类型       | 默认值       | 必须      |
+|-----------|-----------|-----------|-------------|-------------|
+| price | 价格（单位分） |  `Number` |  | 是 |
+| button-text | 按钮文字 | `String`  |   | 是 |
+| button-type | 按钮类型 |  `String` | `danger` | 否 |
+| tip | 提示文案 |  `String` |  | 否 |
+| disabled | 是否禁用按钮 |  `Boolean` | `false` | 否 |
+| loading | 是否显示加载中的按钮 |  `Boolean` | `false` | 否 |
+
+### Event
+
+| 事件名       | 说明      | 参数       |
+|-----------|-----------|-----------|
+| submit | 按钮点击事件回调 | - |
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 364ce26be..64da013eb 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -189,6 +189,10 @@ module.exports = {
                 "path": "/express-way",
                 "title": "ExpressWay 配送方式"
               },
+              {
+                "path": "/pay-order",
+                "title": "PayOrder 提交订单栏"
+              },
               {
                 "path": "/switch-cell",
                 "title": "SwitchCell 开关单元格"
diff --git a/packages/index.js b/packages/index.js
index a3d2fba30..c262f1834 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -19,6 +19,7 @@ import Lazyload from './lazyload';
 import Loading from './loading';
 import NoticeBar from './notice-bar';
 import Panel from './panel';
+import PayOrder from './pay-order';
 import Picker from './picker';
 import Popup from './popup';
 import Progress from './progress';
@@ -60,6 +61,7 @@ const components = [
   Loading,
   NoticeBar,
   Panel,
+  PayOrder,
   Picker,
   Popup,
   Progress,
@@ -117,6 +119,7 @@ export {
   Loading,
   NoticeBar,
   Panel,
+  PayOrder,
   Picker,
   Popup,
   Progress,
diff --git a/packages/pay-order/index.vue b/packages/pay-order/index.vue
new file mode 100644
index 000000000..9f452672e
--- /dev/null
+++ b/packages/pay-order/index.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="van-pay-order">
+    <div class="van-pay-order__tip" v-show="tip">{{ tip }}</div>
+    <div class="van-pay-order__bar">
+      <div class="van-pay-order__price">
+        <span class="van-pay-order__price-text">合计：</span>
+        <span class="van-pay-order__price-interger">¥{{ priceInterger }}.</span>
+        <span class="van-pay-order__price-decimal">{{ priceDecimal }}</span>
+      </div>
+      <van-button :type="buttonType" :disabled="disabled" :loading="loading" @click="onSubmit">
+        {{ loading ? '' : buttonText }}
+      </van-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import Button from '../button';
+
+export default {
+  name: 'van-pay-order',
+
+  components: {
+    [Button.name]: Button
+  },
+
+  props: {
+    tip: String,
+    disabled: Boolean,
+    loading: Boolean,
+    buttonText: {
+      type: String,
+      required: true
+    },
+    buttonType: {
+      type: String,
+      default: 'danger'
+    },
+    price: {
+      type: Number,
+      required: true
+    }
+  },
+
+  computed: {
+    priceInterger() {
+      return Math.floor(this.price / 100);
+    },
+    priceDecimal() {
+      const decimal = this.price % 100;
+      return (decimal < 10 ? '0' : '') + decimal;
+    }
+  },
+
+  methods: {
+    onSubmit() {
+      if (!this.disabled && !this.loading) {
+        this.$emit('submit');
+      }
+    }
+  }
+};
+</script>
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index 04bb59827..89a4b636a 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -33,3 +33,4 @@
 @import './notice-bar.css';
 @import './switch-cell.css';
 @import './express-way.css';
+@import './pay-order.css';
diff --git a/packages/vant-css/src/pay-order.css b/packages/vant-css/src/pay-order.css
new file mode 100644
index 000000000..f674c6f04
--- /dev/null
+++ b/packages/vant-css/src/pay-order.css
@@ -0,0 +1,59 @@
+.van-pay-order {
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  z-index: 100;
+  position: fixed;
+  user-select: none;
+
+  &__tip {
+    color: #f60;
+    font-size: 12px;
+    line-height: 18px;
+    padding: 10px 10px;
+    background-color: #fff6e1;
+  }
+
+  &__bar {
+    height: 50px;
+    display: flex;
+    line-height: 50px;
+    background-color: #fff;
+  }
+
+  &__price {
+    flex: 1;
+    text-align: right;
+    padding-right: 10px;
+  }
+
+  &__price-text {
+    color: #666;
+    font-size: 16px;
+  }
+
+  &__price-interger {
+    color: #f44;
+    font-size: 16px;
+  }
+
+  &__price-decimal {
+    color: #f44;
+    font-size: 12px;
+  }
+
+  .van-button {
+    width: 110px;
+    height: 100%;
+    border-radius: 0;
+
+    &--disabled {
+      border: none;
+    }
+
+    .van-loading__spinner--white {
+      border-color: rgba(255,255,255, .8);
+      border-top-color: transparent;
+    }
+  }
+}
diff --git a/test/unit/specs/pay-order.spec.js b/test/unit/specs/pay-order.spec.js
new file mode 100644
index 000000000..3a4836535
--- /dev/null
+++ b/test/unit/specs/pay-order.spec.js
@@ -0,0 +1,99 @@
+import PayOrder from 'packages/pay-order';
+import { mount } from 'avoriaz';
+import { DOMChecker } from '../utils';
+
+describe('PayOrder', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('default', () => {
+    const props = {
+      price: 3050,
+      buttonText: '提交订单',
+      tip: '您的收货地址不支持同城送, 我们已为您推荐快递'
+    };
+
+    wrapper = mount(PayOrder, {
+      propsData: props
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-button__text': props.buttonText,
+        '.van-pay-order__price-interger': '¥30.',
+        '.van-pay-order__price-decimal': '50',
+        '.van-pay-order__tip': props.tip
+      }
+    });
+  });
+
+  it('no tip', () => {
+    wrapper = mount(PayOrder, {
+      propsData: {
+        price: 3005,
+        buttonText: '提交订单'
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-button__text': '提交订单',
+        '.van-pay-order__price-interger': '¥30.',
+        '.van-pay-order__price-decimal': '05',
+        '.van-pay-order__tip': ''
+      }
+    });
+  });
+
+  it('handle submit', () => {
+    wrapper = mount(PayOrder, {
+      propsData: {
+        price: 3005,
+        buttonText: '提交订单'
+      }
+    });
+
+    const submitSpyFunc = sinon.spy();
+    wrapper.vm.$on('submit', submitSpyFunc);
+    wrapper.find('.van-button')[0].trigger('click');
+    setTimeout(() => {
+      expect(submitSpyFunc.calledOnce).to.be.true;
+    }, 300);
+  });
+
+  it('can not submit when disabled', () => {
+    wrapper = mount(PayOrder, {
+      propsData: {
+        price: 3005,
+        disabled: true,
+        buttonText: '提交订单'
+      }
+    });
+
+    const submitSpyFunc = sinon.spy();
+    wrapper.vm.$on('submit', submitSpyFunc);
+    wrapper.find('.van-button')[0].trigger('click');
+    setTimeout(() => {
+      expect(submitSpyFunc.calledOnce).to.be.false;
+    }, 300);
+  });
+
+  it('can not submit when loading', () => {
+    wrapper = mount(PayOrder, {
+      propsData: {
+        price: 3005,
+        loading: true,
+        buttonText: '提交订单'
+      }
+    });
+
+    const submitSpyFunc = sinon.spy();
+    wrapper.vm.$on('submit', submitSpyFunc);
+    wrapper.find('.van-button')[0].trigger('click');
+    setTimeout(() => {
+      expect(submitSpyFunc.calledOnce).to.be.false;
+    }, 300);
+  });
+});

From ccc4fc3861dd5409ec5ec1dabccaec0f9aa4998d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 29 Aug 2017 16:09:03 +0800
Subject: [PATCH 107/126] PayOrder: improve test coverage

---
 packages/pay-order/index.vue      | 14 ++++----------
 test/unit/specs/pay-order.spec.js |  5 ++---
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/pay-order/index.vue b/packages/pay-order/index.vue
index 9f452672e..9f31a7291 100644
--- a/packages/pay-order/index.vue
+++ b/packages/pay-order/index.vue
@@ -2,7 +2,7 @@
   <div class="van-pay-order">
     <div class="van-pay-order__tip" v-show="tip">{{ tip }}</div>
     <div class="van-pay-order__bar">
-      <div class="van-pay-order__price">
+      <div class="van-pay-order__price" v-if="typeof price === 'number'">
         <span class="van-pay-order__price-text">合计：</span>
         <span class="van-pay-order__price-interger">¥{{ priceInterger }}.</span>
         <span class="van-pay-order__price-decimal">{{ priceDecimal }}</span>
@@ -26,19 +26,13 @@ export default {
 
   props: {
     tip: String,
-    disabled: Boolean,
+    type: Number,
     loading: Boolean,
-    buttonText: {
-      type: String,
-      required: true
-    },
+    disabled: Boolean,
+    buttonText: String,
     buttonType: {
       type: String,
       default: 'danger'
-    },
-    price: {
-      type: Number,
-      required: true
     }
   },
 
diff --git a/test/unit/specs/pay-order.spec.js b/test/unit/specs/pay-order.spec.js
index 3a4836535..c6941a328 100644
--- a/test/unit/specs/pay-order.spec.js
+++ b/test/unit/specs/pay-order.spec.js
@@ -33,7 +33,8 @@ describe('PayOrder', () => {
     wrapper = mount(PayOrder, {
       propsData: {
         price: 3005,
-        buttonText: '提交订单'
+        buttonText: '提交订单',
+        buttonType: 'normal'
       }
     });
 
@@ -66,7 +67,6 @@ describe('PayOrder', () => {
   it('can not submit when disabled', () => {
     wrapper = mount(PayOrder, {
       propsData: {
-        price: 3005,
         disabled: true,
         buttonText: '提交订单'
       }
@@ -83,7 +83,6 @@ describe('PayOrder', () => {
   it('can not submit when loading', () => {
     wrapper = mount(PayOrder, {
       propsData: {
-        price: 3005,
         loading: true,
         buttonText: '提交订单'
       }

From 625f6e7d8d1b11e181024e53b6bcfa2c01980354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 29 Aug 2017 16:12:30 +0800
Subject: [PATCH 108/126] PayOrder: adjust style when no price

---
 packages/pay-order/index.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/pay-order/index.vue b/packages/pay-order/index.vue
index 9f31a7291..c0d97122c 100644
--- a/packages/pay-order/index.vue
+++ b/packages/pay-order/index.vue
@@ -2,10 +2,12 @@
   <div class="van-pay-order">
     <div class="van-pay-order__tip" v-show="tip">{{ tip }}</div>
     <div class="van-pay-order__bar">
-      <div class="van-pay-order__price" v-if="typeof price === 'number'">
-        <span class="van-pay-order__price-text">合计：</span>
-        <span class="van-pay-order__price-interger">¥{{ priceInterger }}.</span>
-        <span class="van-pay-order__price-decimal">{{ priceDecimal }}</span>
+      <div class="van-pay-order__price">
+        <template v-if="hasPrice">
+          <span class="van-pay-order__price-text">合计：</span>
+          <span class="van-pay-order__price-interger">¥{{ priceInterger }}.</span>
+          <span class="van-pay-order__price-decimal">{{ priceDecimal }}</span>
+        </template>
       </div>
       <van-button :type="buttonType" :disabled="disabled" :loading="loading" @click="onSubmit">
         {{ loading ? '' : buttonText }}
@@ -27,6 +29,7 @@ export default {
   props: {
     tip: String,
     type: Number,
+    price: Number,
     loading: Boolean,
     disabled: Boolean,
     buttonText: String,
@@ -37,6 +40,9 @@ export default {
   },
 
   computed: {
+    hasPrice() {
+      return typeof this.price === 'number';
+    },
     priceInterger() {
       return Math.floor(this.price / 100);
     },

From 3a642fce0cc8585297d6de487165874a86c0ebd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 29 Aug 2017 16:45:28 +0800
Subject: [PATCH 109/126] Popup: add test cases

---
 packages/mixins/popup/index.js    |  1 +
 test/unit/specs/pay-order.spec.js |  2 +-
 test/unit/specs/popup.spec.js     | 57 +++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js
index cb98e2638..52317cbe2 100644
--- a/packages/mixins/popup/index.js
+++ b/packages/mixins/popup/index.js
@@ -99,6 +99,7 @@ export default {
      * 显示popup
      */
     open() {
+      /* istanbul ignore if */
       if (this.$isServer) return;
       if (this.opened) return;
 
diff --git a/test/unit/specs/pay-order.spec.js b/test/unit/specs/pay-order.spec.js
index c6941a328..6dab66ebf 100644
--- a/test/unit/specs/pay-order.spec.js
+++ b/test/unit/specs/pay-order.spec.js
@@ -34,7 +34,7 @@ describe('PayOrder', () => {
       propsData: {
         price: 3005,
         buttonText: '提交订单',
-        buttonType: 'normal'
+        buttonType: 'default'
       }
     });
 
diff --git a/test/unit/specs/popup.spec.js b/test/unit/specs/popup.spec.js
index 202cfbdb5..250109f50 100644
--- a/test/unit/specs/popup.spec.js
+++ b/test/unit/specs/popup.spec.js
@@ -1,5 +1,6 @@
 import Popup from 'packages/popup';
 import { mount } from 'avoriaz';
+import { triggerTouch } from '../utils';
 
 describe('Popup', () => {
   let wrapper;
@@ -57,4 +58,60 @@ describe('Popup', () => {
     expect(wrapper.hasClass('van-popup')).to.be.true;
     expect(wrapper.instance().currentTransition).to.equal('popup-fade');
   });
+
+  it('popup prevent scroll', (done) => {
+    wrapper = mount(Popup, {
+      propsData: {
+        preventScroll: true,
+        value: true
+      }
+    });
+
+    expect(wrapper.hasClass('van-popup')).to.be.true;
+
+    setTimeout(() => {
+      expect(wrapper.data().currentValue).to.be.true;
+      wrapper.vm.value = false;
+      triggerTouch(document, 'touchstart', 0, 0);
+      triggerTouch(document, 'touchmove', 0, 10);
+      triggerTouch(document, 'touchmove', 0, 30);
+      triggerTouch(document, 'touchmove', 0, -30);
+
+      setTimeout(() => {
+        expect(wrapper.data().currentValue).to.be.false;
+        done();
+      }, 300);
+    }, 300);
+  });
+
+  it('popup modal', (done) => {
+    wrapper = mount(Popup, {
+      propsData: {
+        preventScroll: true,
+        value: true
+      }
+    });
+
+    wrapper.vm.$on('input', val => {
+      wrapper.vm.value = val;
+    });
+
+    expect(wrapper.hasClass('van-popup')).to.be.true;
+
+    const modal = document.querySelector('.van-modal');
+
+    setTimeout(() => {
+      triggerTouch(modal, 'touchstart', 0, 0);
+      triggerTouch(modal, 'touchmove', 0, 10);
+      triggerTouch(modal, 'touchmove', 0, 30);
+      triggerTouch(modal, 'touchmove', 0, -30);
+      expect(modal).to.exist;
+
+      modal.click();
+      setTimeout(() => {
+        expect(wrapper.data().currentValue).to.be.false;
+        done();
+      }, 300);
+    }, 300);
+  });
 });

From cfa0f649b6629ad58270e228caa5f0e726492cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Tue, 29 Aug 2017 17:52:50 +0800
Subject: [PATCH 110/126] ExpressWay: adjust doc

---
 docs/examples-docs/express-way.md | 12 +++---------
 packages/express-way/index.vue    |  4 ++--
 test/unit/specs/picker.spec.js    |  1 -
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/docs/examples-docs/express-way.md b/docs/examples-docs/express-way.md
index 1aed0e45a..ee4d0ded4 100644
--- a/docs/examples-docs/express-way.md
+++ b/docs/examples-docs/express-way.md
@@ -67,19 +67,13 @@ export default {
         'postage_desc': '由商家门店提供配送服务, 起送价 0.01 元',
         'postage_title': '同城配送',
         'express_type': 1
-      }, {
-        'postage': 0,
-        'postage_desc': '由商家选择合作快递为您服务',
-        'postage_title': '快递发货',
-        'express_type': 2,
-        'postage_warn_desc': '3天后发货'
       }]
     };
   },
 
   methods: {
-    onChange(item, index) {
-      Toast('配送方式更换为:' + item.postage_title);
+    onChange(item) {
+      Toast(`配送方式更换为:${item.postage_title}`);
     }
   }
 }
@@ -93,7 +87,7 @@ export default {
 ```html
 <van-cell-group>
   <van-express-way 
-    :value="-1" 
+    :value="1" 
     :express-list="expressList"
     :editable="false"
     @change="onChange"
diff --git a/packages/express-way/index.vue b/packages/express-way/index.vue
index ac6743579..fcc72da4a 100644
--- a/packages/express-way/index.vue
+++ b/packages/express-way/index.vue
@@ -19,10 +19,10 @@
 </template>
 
 <script>
-import Option from './Option.vue';
-import Actionsheet from '../actionsheet';
+import Option from './Option';
 import Cell from '../cell';
 import CellGroup from '../cell-group';
+import Actionsheet from '../actionsheet';
 
 export default {
   name: 'van-express-way',
diff --git a/test/unit/specs/picker.spec.js b/test/unit/specs/picker.spec.js
index d3fe2184d..ee2d08e06 100644
--- a/test/unit/specs/picker.spec.js
+++ b/test/unit/specs/picker.spec.js
@@ -1,7 +1,6 @@
 import Picker from 'packages/picker';
 import PickerColumn from 'packages/picker/picker-column';
 import { mount } from 'avoriaz';
-import Wrapper from 'avoriaz/dist/Wrapper';
 
 const itemHeight = 44;
 

From 6d4f076c169cb8b9c3122309d1c32081377ed0b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 30 Aug 2017 11:54:21 +0800
Subject: [PATCH 111/126] add OrderGoods component

---
 docs/examples-docs/order-goods.md     | 229 +++++++++++++++++++++++
 docs/src/doc.config.js                |   4 +
 packages/index.js                     |   3 +
 packages/order-goods/Card.vue         | 102 +++++++++++
 packages/order-goods/Empty.vue        |  31 ++++
 packages/order-goods/Header.vue       |  26 +++
 packages/order-goods/Message.vue      |  50 ++++++
 packages/order-goods/Price.vue        |  32 ++++
 packages/order-goods/index.vue        | 113 ++++++++++++
 packages/order-goods/utils.js         |  13 ++
 packages/vant-css/src/order-goods.css | 214 ++++++++++++++++++++++
 test/unit/specs/order-goods.spec.js   | 249 ++++++++++++++++++++++++++
 12 files changed, 1066 insertions(+)
 create mode 100644 docs/examples-docs/order-goods.md
 create mode 100644 packages/order-goods/Card.vue
 create mode 100644 packages/order-goods/Empty.vue
 create mode 100644 packages/order-goods/Header.vue
 create mode 100644 packages/order-goods/Message.vue
 create mode 100644 packages/order-goods/Price.vue
 create mode 100644 packages/order-goods/index.vue
 create mode 100644 packages/order-goods/utils.js
 create mode 100644 packages/vant-css/src/order-goods.css
 create mode 100644 test/unit/specs/order-goods.spec.js

diff --git a/docs/examples-docs/order-goods.md b/docs/examples-docs/order-goods.md
new file mode 100644
index 000000000..f88a36717
--- /dev/null
+++ b/docs/examples-docs/order-goods.md
@@ -0,0 +1,229 @@
+## OrderGoods 下单页商品列表
+
+<script>
+
+const item1 = {
+  img_url: '//img.yzcdn.cn/upload_files/2017/07/02/af5b9f44deaeb68000d7e4a711160c53.jpg',
+  pay_price: 1050,
+  title: '商品 A',
+  num: '1'
+};
+
+const item2 = {
+  points_price: 200,
+  pay_price: 50,
+  img_url: '//img.yzcdn.cn/upload_files/2017/07/02/e89d56cd92ad8ce3b9d8e1babc3758b6.jpg',
+  title: '商品 B',
+  num: '15',
+  sku: [{ v: '商品SKU1' }, { v: '商品SKU2' }]
+}
+
+const item3 = {
+  pay_price: 50,
+  img_url: '//img.yzcdn.cn/upload_files/2017/07/02/e89d56cd92ad8ce3b9d8e1babc3758b6.jpg',
+  title: '商品 C',
+  num: '15',
+  is_presale: true,
+  delivery_time: '三天后发货',
+  show_delivery_time: true,
+  is_presale: true,
+  is_present: true,
+  message: {
+    '留言1': '留言1内容',
+    '留言2': 'https://img.yzcdn.cn/upload_files/2017/07/02/e89d56cd92ad8ce3b9d8e1babc3758b6.jpg'
+  }
+};
+
+export default {
+  data() {
+    return {
+      itemList1: [item1],
+      itemList2: [item2],
+      itemList3: [item3],
+      itemListMulti: [item1, item2, item3],
+      emptyItemList: [],
+      message1: '',
+      message2: '',
+      message3: '',
+      message4: ''
+    }
+  }
+}
+</script>
+
+### 使用指南
+``` javascript
+import { OrderGoods } from 'vant';
+
+Vue.component(OrderGoods.name, OrderGoods);
+```
+
+### 代码演示
+
+#### 基础用法
+
+:::demo 基础用法
+```html
+<template>
+  <van-order-goods
+    v-model="message1"
+    shop-name="起码运动馆"
+    :price="1050"
+    :item-list="itemList1"
+  />
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      message1: '',
+      itemList1: [{
+        img_url: '//img.yzcdn.cn/...',
+        pay_price: 1050,
+        title: '商品 A',
+        num: '1'
+      }]
+    }
+  }
+}
+</script>
+```
+:::
+
+#### 积分商品
+
+:::demo 积分商品
+```html
+<template>
+  <van-order-goods
+    v-model="message2"
+    shop-name="起码运动馆"
+    :item-list="itemList2"
+    :price="50"
+    :points="200"
+  />
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      message2: '',
+      itemList2: [{
+        points_price: 200,
+        pay_price: 50,
+        img_url: '//img.yzcdn.cn/...',
+        title: '商品 B',
+        num: '15',
+        sku: [
+          { v: '商品SKU1' },
+          { v: '商品SKU2' }
+        ]
+      }]
+    }
+  }
+}
+</script>
+```
+:::
+
+#### 预售商品
+
+:::demo 预售商品
+```html
+<template>
+  <van-order-goods
+    v-model="message3"
+    shop-name="起码运动馆"
+    :price="1050"
+    :item-list="itemList3"
+  />
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      message3: '',
+      itemList3: [{
+        pay_price: 50,
+        img_url: '//img.yzcdn.cn/...',
+        title: '商品 C',
+        num: '15',
+        delivery_time: '三天后发货',
+        show_delivery_time: true,
+        is_presale: true,
+        is_present: true
+      }]
+    }
+  }
+}
+</script>
+```
+:::
+
+#### 商品为空
+
+:::demo 商品为空
+```html
+<van-order-goods shop-name="起码运动馆" :item-list="[]" />
+```
+:::
+
+#### 多个商品
+
+:::demo 多个商品
+```html
+<van-order-goods
+  v-model="message4"
+  shop-name="起码运动馆"
+  :item-list="itemListMulti"
+  :price="1050"
+  :message-editable="false"
+/>
+```
+:::
+
+### API
+
+| 参数       | 说明      | 类型       | 默认值       |
+|-----------|-----------|-----------|-------------|
+| shop-name | 店铺名称 |  `String` |  |
+| shop-link | 店铺链接 |  `String` |  |
+| header-icon | 店铺名称左侧的图标类型 |  `String` | `shop` |
+| header-badge | 店铺名称右侧的徽章链接 |  `String` | |
+| item-list | 商品列表 |  `Array` | `[]` |
+| empty-icon | 商品列表为空时的图标 |  `String` | |
+| empty-message | 商品列表为空时的提示文案 |  `String` | `当前没有可购买的商品，请重新选择` |
+| empty-button-text | 商品列表为空时的按钮文案 |  `String` | `返回重新选择` |
+| v-model | 买家留言 |  `String` | `''` |
+| show-total-price | 是否显示价格栏 |  `Boolean` | `true` |
+| show-message | 是否显示留言栏 |  `Boolean` | `true` |
+| message-editable | 留言是否可以编辑 |  `Boolean` | `true` |
+| price | 合计金额（单位分） |  `Number` |  |
+| points | 合计积分 |  `Number` |  |
+
+### 数据格式
+#### itemList 中的配送方式字段说明
+| key       | 说明      | 类型       |
+|-----------|-----------|-----------|
+| title | 商品名称 | `String` |
+| img_url | 图片地址 | `String` |
+| delivery_time | 发货时间 | `String` |
+| num | 商品数量 | `Number` |
+| points_price | 积分价格 | `Number` |
+| pay_price（单位分） | 金额 | `Number` |
+| sku | 商品 sku | `Array` |
+| message | 商品留言 | `Array` |
+| is_presale | 是否为预售 | `Boolean` |
+| is_present | 是否为赠品 | `Boolean` |
+| is_period_buy | 是否为周期购 | `Boolean` |
+| show_delivery_time | 是否显示发货时间 | `Boolean` |
+
+### Slot
+| name       | 描述      |
+|-----------|-----------|
+| 默认 | 在商品列表和留言之间插入内容 |
+| top | 在标题和商品列表之间插入内容 |
+| bottom | 在合计价格下方插入内容 |
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 64da013eb..792b893ce 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -189,6 +189,10 @@ module.exports = {
                 "path": "/express-way",
                 "title": "ExpressWay 配送方式"
               },
+              {
+                "path": "/order-goods",
+                "title": "OrderGoods 下单页商品列表"
+              },
               {
                 "path": "/pay-order",
                 "title": "PayOrder 提交订单栏"
diff --git a/packages/index.js b/packages/index.js
index c262f1834..86ed944e2 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -18,6 +18,7 @@ import ImagePreview from './image-preview';
 import Lazyload from './lazyload';
 import Loading from './loading';
 import NoticeBar from './notice-bar';
+import OrderGoods from './order-goods';
 import Panel from './panel';
 import PayOrder from './pay-order';
 import Picker from './picker';
@@ -60,6 +61,7 @@ const components = [
   Icon,
   Loading,
   NoticeBar,
+  OrderGoods,
   Panel,
   PayOrder,
   Picker,
@@ -118,6 +120,7 @@ export {
   Lazyload,
   Loading,
   NoticeBar,
+  OrderGoods,
   Panel,
   PayOrder,
   Picker,
diff --git a/packages/order-goods/Card.vue b/packages/order-goods/Card.vue
new file mode 100644
index 000000000..edfa63b90
--- /dev/null
+++ b/packages/order-goods/Card.vue
@@ -0,0 +1,102 @@
+<template>
+  <div class="van-order-goods-card">
+    <van-card>
+      <div slot="thumb">
+        <img :src="data.img_url" />
+        <span v-if="data.is_present" class="van-order-goods-card__present"></span>
+      </div>
+      <div class="van-card__row" slot="title">
+        <h4 class="van-card__title">{{ data.title }}</h4>
+        <span class="van-card__price">{{ price }}</span>
+      </div>
+      <template slot="desc">
+        <div class="van-card__row">
+          <p class="van-card__desc">{{ desc }}</p>
+          <span class="van-card__num">x {{ data.num }}</span>
+        </div>
+        <div class="van-card__row">
+          <div class="van-order-goods-card__tags">
+            <span v-if="data.is_presale" class="van-order-goods-card__tag-green">预售</span>
+            <span v-if="data.is_period_buy" class="van-order-goods-card__tag-red">周期购</span>
+          </div>
+          <van-button
+            class="van-order-goods-card__message-button"
+            v-if="hasMessage"
+            @click="onClickMessageButton"
+          >
+            查看留言
+          </van-button>
+        </div>
+      </template>
+    </van-card>
+    <van-cell class="van-order-goods-card__delivery" v-if="data.show_delivery_time" title="发货时间" :value="data.delivery_time" />
+    <van-popup v-if="hasMessage" class="van-order-goods-card__message" v-model="showMessage" position="right">
+      <h2>备注信息</h2>
+      <ul>
+        <li v-for="(value, key) in data.message">
+          <label>{{ key }}</label>
+          <a v-if="isURL(value)" :href="value">
+            <img :src="value" />
+          </a>
+          <p v-else>{{ value }}</p>
+        </li>
+      </ul>
+      <div class="van-order-goods-card__button">
+        <van-button size="large" @click="showMessage = false">查看订单详情</van-button>
+      </div>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+import Card from '../card';
+import Cell from '../cell';
+import Button from '../button';
+import Popup from '../popup';
+import { getTotalPrice } from './utils';
+
+export default {
+  name: 'van-order-goods-card',
+
+  components: {
+    [Card.name]: Card,
+    [Cell.name]: Cell,
+    [Popup.name]: Popup,
+    [Button.name]: Button
+  },
+
+  props: {
+    data: {
+      type: Object,
+      required: true
+    }
+  },
+
+  data() {
+    return {
+      showMessage: false
+    };
+  },
+
+  computed: {
+    price() {
+      return getTotalPrice(this.data.pay_price, this.data.points_price);
+    },
+    desc() {
+      return this.data.sku ? this.data.sku.filter(item => item.v).map(item => item.v).join(', ') : '';
+    },
+    hasMessage() {
+      return this.data.message && Object.keys(this.data.message).length;
+    }
+  },
+
+  methods: {
+    onClickMessageButton() {
+      this.showMessage = true;
+    },
+    isURL(value) {
+      return /^\s*http(s)*:\/\/.+/.test(value);
+    }
+  }
+};
+</script>
diff --git a/packages/order-goods/Empty.vue b/packages/order-goods/Empty.vue
new file mode 100644
index 000000000..7e9779908
--- /dev/null
+++ b/packages/order-goods/Empty.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="van-order-goods-empty">
+    <img :src="icon" />
+    <p>{{ message }}</p>
+    <van-button @click="onClickButton">{{ buttonText }}</van-button>
+  </div>
+</template>
+
+<script>
+import Button from '../button';
+
+export default {
+  name: 'van-order-goods-empty',
+
+  components: {
+    [Button.name]: Button
+  },
+
+  props: {
+    icon: String,
+    message: String,
+    buttonText: String
+  },
+
+  methods: {
+    onClickButton() {
+      history.back();
+    }
+  }
+};
+</script>
diff --git a/packages/order-goods/Header.vue b/packages/order-goods/Header.vue
new file mode 100644
index 000000000..956229556
--- /dev/null
+++ b/packages/order-goods/Header.vue
@@ -0,0 +1,26 @@
+<template>
+  <div class="van-order-goods-header">
+    <van-icon :name="icon" />
+    <a :href="link">{{ title }}</a>
+    <img v-if="badge" :src="badge" />
+  </div>
+</template>
+
+<script>
+import Icon from '../icon';
+
+export default {
+  name: 'van-order-goods-header',
+
+  components: {
+    [Icon.name]: Icon
+  },
+
+  props: {
+    title: String,
+    icon: String,
+    link: String,
+    badge: String
+  }
+};
+</script>
diff --git a/packages/order-goods/Message.vue b/packages/order-goods/Message.vue
new file mode 100644
index 000000000..36a9af8e2
--- /dev/null
+++ b/packages/order-goods/Message.vue
@@ -0,0 +1,50 @@
+<template>
+  <van-cell class="van-order-goods-message" title="买家留言：">
+    <textarea
+      v-if="editable"
+      :value="message"
+      :class="{ 'van-order-goods-message-focused': textareaFocused }"
+      placeholder="点击给商家留言"
+      @focus="textareaFocused = true"
+      @blur="textareaFocused = false"
+      @input="onChange"
+    />
+    <p v-else>{{ message }}</p>
+  </van-cell>
+</template>
+
+<script>
+import Cell from '../cell';
+
+export default {
+  name: 'van-order-goods-message',
+
+  components: {
+    [Cell.name]: Cell
+  },
+
+  props: {
+    message: String,
+    editable: Boolean
+  },
+
+  data() {
+    return {
+      textareaFocused: false
+    };
+  },
+
+  methods: {
+    onChange(event) {
+      this.$emit('change', event.target.value);
+    }
+  },
+
+  created() {
+    // 不可编辑的情况下，默认留言为"无"
+    if (!this.editable && !this.message) {
+      this.$emit('change', '无');
+    }
+  }
+};
+</script>
diff --git a/packages/order-goods/Price.vue b/packages/order-goods/Price.vue
new file mode 100644
index 000000000..ea1f68a5b
--- /dev/null
+++ b/packages/order-goods/Price.vue
@@ -0,0 +1,32 @@
+<template>
+  <van-cell
+    class="van-order-goods-price"
+    title="合计"
+    :value="totalPrice"
+  />
+</template>
+
+<script>
+import Cell from '../cell';
+import { getTotalPrice } from './utils';
+
+export default {
+  name: 'van-order-goods-price',
+
+  components: {
+    [Cell.name]: Cell
+  },
+
+  props: {
+    price: Number,
+    points: Number,
+    isPoints: Boolean
+  },
+
+  computed: {
+    totalPrice() {
+      return getTotalPrice(this.price, this.points, this.isPoints);
+    }
+  }
+};
+</script>
diff --git a/packages/order-goods/index.vue b/packages/order-goods/index.vue
new file mode 100644
index 000000000..05dad6558
--- /dev/null
+++ b/packages/order-goods/index.vue
@@ -0,0 +1,113 @@
+<template>
+  <van-cell-group class="van-order-goods">
+    <van-order-goods-header
+      :title="shopName"
+      :link="shopLink"
+      :icon="headerIcon"
+      :badge="headerBadge"
+    />
+    <slot name="top"></slot>
+    <van-order-goods-empty
+      v-if="isEmpty"
+      :icon="emptyIcon"
+      :message="emptyMessage"
+      :button-text="emptyButtonText"
+    />
+    <div class="van-order-goods-list">
+      <van-order-goods-card
+        v-for="item in itemList"
+        :data="item"
+        :express-way="expressWay"
+        :key="item.title + item.img_url"
+      />
+    </div>
+    <slot></slot>
+    <template v-if="!isEmpty">
+      <van-order-goods-message v-if="showMessage" :message="message" :editable="messageEditable" @change="onMessageChange" />
+      <van-order-goods-price v-if="showTotalPrice" :price="price" :points="points" />
+    </template>
+    <slot name="bottom"></slot>
+  </van-cell-group>
+</template>
+
+<script>
+import Header from './Header';
+import Empty from './Empty';
+import Message from './Message';
+import Price from './Price';
+import Card from './Card';
+import CellGroup from '../cell-group';
+
+export default {
+  name: 'van-order-goods',
+
+  components: {
+    [Empty.name]: Empty,
+    [Header.name]: Header,
+    [Message.name]: Message,
+    [Price.name]: Price,
+    [Card.name]: Card,
+    [CellGroup.name]: CellGroup
+  },
+
+  model: {
+    prop: 'message'
+  },
+
+  props: {
+    shopName: String,
+    shopLink: String,
+    message: String,
+    price: Number,
+    points: Number,
+    expressWay: String,
+    headerBadge: String,
+    headerIcon: {
+      type: String,
+      default: 'shop'
+    },
+    emptyIcon: {
+      type: String,
+      default: '//b.yzcdn.cn/v2/image/wap/trade/new_order/empty@2x.png'
+    },
+    emptyMessage: {
+      type: String,
+      default: '当前没有可购买的商品，请重新选择'
+    },
+    emptyButtonText: {
+      type: String,
+      default: '返回重新选择'
+    },
+    showMessage: {
+      type: Boolean,
+      default: true
+    },
+    showTotalPrice: {
+      type: Boolean,
+      default: true
+    },
+    messageEditable: {
+      type: Boolean,
+      default: true
+    },
+    itemList: {
+      type: Array,
+      default() {
+        return [];
+      }
+    }
+  },
+
+  computed: {
+    isEmpty() {
+      return this.itemList.length === 0;
+    }
+  },
+
+  methods: {
+    onMessageChange(message) {
+      this.$emit('input', message);
+    }
+  }
+};
+</script>
diff --git a/packages/order-goods/utils.js b/packages/order-goods/utils.js
new file mode 100644
index 000000000..50d57b953
--- /dev/null
+++ b/packages/order-goods/utils.js
@@ -0,0 +1,13 @@
+/**
+ * 拼接商品价格（金额和积分）
+ */
+export function getTotalPrice(price, points) {
+  const arr = [];
+  if (points) {
+    arr.push(points + '积分');
+  }
+  if (price) {
+    arr.push('¥' + (price / 100).toFixed(2));
+  }
+  return arr.join(' + ');
+}
diff --git a/packages/vant-css/src/order-goods.css b/packages/vant-css/src/order-goods.css
new file mode 100644
index 000000000..fe80bfb3f
--- /dev/null
+++ b/packages/vant-css/src/order-goods.css
@@ -0,0 +1,214 @@
+@import "./mixins/border_retina";
+
+.van-order-goods {
+  background-color: #fff;
+
+  &-card {
+    margin-left: -15px;
+    position: relative;
+    background-color: #fafafa;
+
+    &:not(:first-child),
+    &__delivery {
+      &::after {
+        @mixin border-retina (top);
+      }
+    }
+
+    &__tags {
+      flex: 1;
+    }
+
+    &__tag-green,
+    &__tag-red {
+      font-size: 10px;
+      padding: 3px 5px;
+      margin-right: 5px;
+      border-radius: 2px;
+      display: inline-block;
+    }
+
+    &__tag-green {
+      color: #fff;
+      background-color: #4b0;
+    }
+
+    &__tag-red {
+      color: #ed5050;
+      padding: 5px 8px;
+      border: 1px solid #ed5050;
+    }
+
+    &__delivery {
+      padding-left: 15px;
+      background-color: transparent;
+
+      .van-cell__value {
+        color: #666;
+      }
+    }
+
+    &__present {
+      top: 0;
+      left: 3px;
+      width: 18px;
+      height: 36px;
+      position: absolute;
+      background: url("https://b.yzcdn.cn/v2/image/wap/trade/confirm/present@2x.png") no-repeat;
+      background-size: 18px 36px;
+    }
+
+    .van-button&__message-button {
+      height: 24px;
+      padding: 0 5px;
+      font-size: 10px;
+      line-height: 22px;
+    }
+
+    &__button {
+      padding: 20px 15px 0;
+      .van-button {
+        height: 40px;
+        line-height: 38px;
+      }
+    }
+
+    &__message {
+      width: 100%;
+      height: 100%;
+      background-color: #f8f8f8;
+
+      h2 {
+        color: #999;
+        font-size: 12px;
+        line-height: 18px;
+        padding: 5px 0 5px 10px;
+      }
+
+      ul {
+        background-color: #fff;
+      }
+
+      p,
+      a,
+      label {
+        font-size: 14px;
+        padding: 14px 0;
+        line-height: 20px;
+        vertical-align: top;
+        display: inline-block;
+      }
+
+      label {
+        color: #c9c9c9;
+        min-width: 90px;
+      }
+
+      li {
+        display: flex;
+        padding: 0 10px;
+        position: relative;
+
+        &:not(:last-child)::after {
+          @mixin border-retina (bottom);
+        }
+
+        img {
+          width: 70px;
+          height: 70px;
+        }
+      }
+    }
+  }
+
+  &-empty {
+    margin-left: -15px;
+    text-align: center;
+    position: relative;
+
+    &::after {
+      @mixin border-retina (top);
+    }
+
+    p {
+      color: #999;
+      padding: 0 10px;
+      font-size: 14px;
+      line-height: 20px;
+    }
+
+    img {
+      width: 80px;
+      height: 84px;
+      padding: 15px 0;
+    }
+
+    .van-button {
+      height: 41px;
+      margin: 15px 0;
+      padding: 0 10px;
+      line-height: 39px;
+      border-color: #e5e5e5;
+    }
+  }
+
+  &-header {
+    line-height: 50px;
+
+    a,
+    img,
+    .van-icon {
+      vertical-align: middle;
+    }
+
+    .van-icon {
+      font-size: 18px;
+      margin-right: 5px;
+    }
+
+    a {
+      color: #333;
+      font-size: 14px;
+    }
+
+    img {
+      height: 14px;
+      margin-left: 5px;
+    }
+  }
+
+  &-message {
+    textarea {
+      color: #666;
+      padding: 0;
+      width: 100%;
+      height: 22px;
+      border: none;
+      resize: none;
+      outline: none;
+      display: block;
+      font-size: 14px;
+      line-height: 22px;
+      transition: height .3s ease-in-out;
+    }
+
+    textarea&-focused {
+      height: 48px;
+    }
+
+    p {
+      color: #666;
+      text-align: left;
+    }
+
+    .van-cell__title {
+      width: 75px;
+    }
+  }
+
+  &-price {
+    .van-cell__value {
+      color: #f44;
+    }
+  }
+}
diff --git a/test/unit/specs/order-goods.spec.js b/test/unit/specs/order-goods.spec.js
new file mode 100644
index 000000000..e950889f0
--- /dev/null
+++ b/test/unit/specs/order-goods.spec.js
@@ -0,0 +1,249 @@
+import OrderGoods from 'packages/order-goods';
+import { mount } from 'avoriaz';
+import { DOMChecker } from '../utils';
+
+const item1 = {
+  img_url: 'https://img.yzcdn.cn/upload_files/2017/07/02/af5b9f44deaeb68000d7e4a711160c53.jpg',
+  pay_price: 1050,
+  title: '商品 A',
+  num: '1'
+};
+
+const item2 = {
+  points_price: 200,
+  pay_price: 50,
+  img_url: 'https://img.yzcdn.cn/upload_files/2017/07/02/e89d56cd92ad8ce3b9d8e1babc3758b6.jpg',
+  title: '商品 B',
+  num: '15',
+  sku: [{ v: '商品SKU1' }, { v: '商品SKU2' }]
+};
+
+const item3 = {
+  pay_price: 50,
+  img_url: 'https://img.yzcdn.cn/upload_files/2017/07/02/e89d56cd92ad8ce3b9d8e1babc3758b6.jpg',
+  title: '商品 C',
+  num: '15',
+  is_presale: true,
+  delivery_time: '三天后发货',
+  show_delivery_time: true,
+  is_presale: true,
+  is_present: true,
+  message: {
+    '留言1': '留言1内容',
+    '留言2': 'https://img.yzcdn.cn/upload_files/2017/07/02/e89d56cd92ad8ce3b9d8e1babc3758b6.jpg'
+  }
+};
+
+describe('OrderGoods', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('default', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        shopName: '起码运动馆',
+        price: item1.pay_price,
+        itemList: [item1],
+        message: '留言留言'
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-order-goods-header a': '起码运动馆',
+        '.van-order-goods-price .van-cell__value span': '¥10.50',
+        '.van-card__title': item1.title,
+        '.van-card__num': 'x ' + item1.num,
+        '.van-card__price': '¥10.50'
+      },
+      value: {
+        '.van-order-goods-message textarea': '留言留言'
+      },
+      src: {
+        '.van-card__thumb img': item1.img_url
+      }
+    });
+  });
+
+  it('empty list', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: []
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-order-goods-empty p': '当前没有可购买的商品，请重新选择',
+        '.van-order-goods-empty button': '返回重新选择'
+      },
+      src: {
+        '.van-order-goods-empty img': 'http://b.yzcdn.cn/v2/image/wap/trade/new_order/empty@2x.png'
+      }
+    });
+  });
+
+  it('empty list config', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [],
+        emptyIcon: 'https://img.yzcdn.cn/upload_files/2017/07/01/FlIeRrn5bMRoWhcwp4Dp1TmVAXKy.jpg',
+        emptyMessage: '测试',
+        emptyButtonText: '测试'
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-order-goods-empty p': '测试',
+        '.van-order-goods-empty button': '测试'
+      },
+      src: {
+        '.van-order-goods-empty img': 'https://img.yzcdn.cn/upload_files/2017/07/01/FlIeRrn5bMRoWhcwp4Dp1TmVAXKy.jpg'
+      }
+    });
+  });
+
+  it('message not editable', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item1],
+        message: '留言留言',
+        messageEditable: false
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-order-goods-message p': '留言留言'
+      }
+    });
+  });
+
+  it('points props', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item1],
+        points: 100
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-order-goods-price .van-cell__value span': '100积分'
+      }
+    });
+  });
+
+  it('points prop and price prop', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item1],
+        points: 100,
+        price: 1050
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-order-goods-price .van-cell__value span': '100积分 + ¥10.50'
+      }
+    });
+  });
+
+  it('shopLink prop', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item1],
+        shopLink: 'http://www.youzan.com'
+      }
+    });
+
+    expect(wrapper.find('.van-order-goods-header a')[0].element.getAttribute('href')).to.equal('http://www.youzan.com');
+  });
+
+  it('item with points', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item2]
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-card__price': '200积分 + ¥0.50',
+        '.van-card__title': item2.title,
+        '.van-card__num': 'x ' + item2.num
+      },
+      src: {
+        '.van-card__thumb img': item2.img_url
+      }
+    });
+  });
+
+  it('presable item with deliveryTime', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item3]
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-card__price': '¥0.50',
+        '.van-card__title': item3.title,
+        '.van-card__num': 'x ' + item3.num,
+        '.van-order-goods-card__delivery .van-cell__value span': item3.delivery_time
+      },
+      count: {
+        '.van-order-goods-card__present': 1,
+        '.van-order-goods-card__tag-green': 1
+      },
+      src: {
+        '.van-card__thumb img': item3.img_url
+      }
+    });
+  });
+
+  it('item with message', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item3]
+      }
+    });
+
+    DOMChecker(wrapper, {
+      count: {
+        '.van-order-goods-card__message-button': 1,
+        '.van-order-goods-card__message li': 2
+      }
+    });
+  });
+
+  it('multi items', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item1, item2, item3]
+      }
+    });
+
+    DOMChecker(wrapper, {
+      count: {
+        '.van-order-goods-card': 3
+      }
+    });
+  });
+});

From 9c0518d7be5cbf091d180d1f385bdb51b59c4c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 30 Aug 2017 14:09:12 +0800
Subject: [PATCH 112/126] OrderGoods: add test cases

---
 packages/vant-css/src/index.css     |  1 +
 test/unit/specs/order-goods.spec.js | 66 ++++++++++++++++++++++++++++-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index 89a4b636a..29e48a8cb 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -34,3 +34,4 @@
 @import './switch-cell.css';
 @import './express-way.css';
 @import './pay-order.css';
+@import './order-goods.css';
diff --git a/test/unit/specs/order-goods.spec.js b/test/unit/specs/order-goods.spec.js
index e950889f0..eef2d8ca5 100644
--- a/test/unit/specs/order-goods.spec.js
+++ b/test/unit/specs/order-goods.spec.js
@@ -76,6 +76,8 @@ describe('OrderGoods', () => {
       }
     });
 
+    wrapper.find('.van-button')[0].trigger('click');
+
     DOMChecker(wrapper, {
       text: {
         '.van-order-goods-empty p': '当前没有可购买的商品，请重新选择',
@@ -91,7 +93,6 @@ describe('OrderGoods', () => {
     wrapper = mount(OrderGoods, {
       attachToDocument: true,
       propsData: {
-        itemList: [],
         emptyIcon: 'https://img.yzcdn.cn/upload_files/2017/07/01/FlIeRrn5bMRoWhcwp4Dp1TmVAXKy.jpg',
         emptyMessage: '测试',
         emptyButtonText: '测试'
@@ -109,6 +110,28 @@ describe('OrderGoods', () => {
     });
   });
 
+  it('edit message', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item1],
+        message: ''
+      }
+    });
+
+    wrapper.vm.$on('input', val => {
+      wrapper.value = val;
+    });
+
+    const textarea = wrapper.find('textarea')[0];
+    textarea.value = '测试留言';
+    textarea.trigger('input');
+
+    wrapper.vm.$nextTick(() => {
+      expect(wrapper.value).to.equal('测试留言');
+    });
+  });
+
   it('message not editable', () => {
     wrapper = mount(OrderGoods, {
       attachToDocument: true,
@@ -126,6 +149,29 @@ describe('OrderGoods', () => {
     });
   });
 
+  it('message not editable && empty', () => {
+    wrapper = mount(OrderGoods, {
+      attachToDocument: true,
+      propsData: {
+        itemList: [item1],
+        message: '',
+        messageEditable: false
+      }
+    });
+
+    wrapper.vm.$on('input', val => {
+      wrapper.value = val;
+    });
+
+    wrapper.vm.$nextTick(() => {
+      DOMChecker(wrapper, {
+        text: {
+          '.van-order-goods-message p': '无'
+        }
+      });
+    });
+  });
+
   it('points props', () => {
     wrapper = mount(OrderGoods, {
       attachToDocument: true,
@@ -228,8 +274,26 @@ describe('OrderGoods', () => {
       count: {
         '.van-order-goods-card__message-button': 1,
         '.van-order-goods-card__message li': 2
+      },
+      style: {
+        '.van-order-goods-card__message': {
+          'display': 'none'
+        }
       }
     });
+
+    const messageButton = wrapper.find('.van-order-goods-card__message-button')[0];
+    messageButton.trigger('click');
+
+    setTimeout(function() {
+      DOMChecker(wrapper, {
+        noStyle: {
+          '.van-order-goods-card__message': {
+            'display': 'none'
+          }
+        }
+      });
+    }, 300);
   });
 
   it('multi items', () => {

From 90e450a52f2759e6d1148fb18e0e0ad47149a407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 30 Aug 2017 14:09:19 +0800
Subject: [PATCH 113/126] Doc: optimize doc style

---
 docs/examples-docs/button.md | 5 +++++
 package.json                 | 2 +-
 yarn.lock                    | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/examples-docs/button.md b/docs/examples-docs/button.md
index 992cc5ccc..91761fff0 100644
--- a/docs/examples-docs/button.md
+++ b/docs/examples-docs/button.md
@@ -7,6 +7,11 @@
     &--bottom-action {
       margin-bottom: 15px;
     }
+
+    &--small,
+    &--normal {
+      margin-right: 10px;
+    }
   }
 
   .zan-doc-demo-block {
diff --git a/package.json b/package.json
index 67c50bf01..0d3d08093 100644
--- a/package.json
+++ b/package.json
@@ -117,6 +117,6 @@
     "webpack": "^3.5.5",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "^0.2.6"
+    "zan-doc": "^0.2.9"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 361847594..e49b9ee00 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7970,9 +7970,9 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-zan-doc@^0.2.6:
-  version "0.2.6"
-  resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.6.tgz#27cc789460c32f6bed7687e050e2d9063b2725d5"
+zan-doc@^0.2.9:
+  version "0.2.9"
+  resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.9.tgz#9d8787f2a6502686f3c44dc4ced9d8ca0fbe3d4e"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"

From 75e042b8cb16d95c39bf43d22fb679ac3e923c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Wed, 30 Aug 2017 14:47:41 +0800
Subject: [PATCH 114/126] add InvalidGoods component

---
 docs/examples-docs/invalid-goods.md     |  83 ++++++++++++++++
 docs/src/doc.config.js                  |   4 +
 packages/index.js                       |   3 +
 packages/invalid-goods/Card.vue         |  30 ++++++
 packages/invalid-goods/index.vue        |  78 +++++++++++++++
 packages/vant-css/src/index.css         |   1 +
 packages/vant-css/src/invalid-goods.css | 121 ++++++++++++++++++++++++
 test/unit/specs/invalid-goods.spec.js   |  81 ++++++++++++++++
 8 files changed, 401 insertions(+)
 create mode 100644 docs/examples-docs/invalid-goods.md
 create mode 100644 packages/invalid-goods/Card.vue
 create mode 100644 packages/invalid-goods/index.vue
 create mode 100644 packages/vant-css/src/invalid-goods.css
 create mode 100644 test/unit/specs/invalid-goods.spec.js

diff --git a/docs/examples-docs/invalid-goods.md b/docs/examples-docs/invalid-goods.md
new file mode 100644
index 000000000..241ab5161
--- /dev/null
+++ b/docs/examples-docs/invalid-goods.md
@@ -0,0 +1,83 @@
+## InvalidGoods 不可用商品列表
+
+<script>
+const item = {
+  sku: [{ v: '商品SKU1' }, { v: '商品SKU2' }],
+  num: 2,
+  sku_id: 123,
+  title: "商品名称",
+  price: 12200,
+  unavailable_desc: '超出配送区域',
+  img_url: 'https://img.yzcdn.cn/upload_files/2017/06/29/FnPSAKkEeh4FnDA09oIbmnlzWQrw.png',
+};
+
+export default {
+   data() {
+     return {
+       goods: [item, item, item]
+     }
+   }
+}
+</script>
+
+### 使用指南
+``` javascript
+import { InvalidGoods } from 'vant';
+
+Vue.component(InvalidGoods.name, InvalidGoods);
+```
+
+### 代码演示
+
+#### 基础用法
+
+:::demo 基础用法
+```html
+<template>
+  <van-invalid-goods :goods="goods" />
+<tempalte/>
+
+<script>
+const item = {
+  num: 2,
+  sku_id: 123,
+  price: 12200,
+  title: "商品名称",
+  img_url: 'https://img.yzcdn.cn/...',
+  unavailable_desc: '超出配送区域',
+  sku: [
+    { v: '商品SKU1' },
+    { v: '商品SKU2' }
+  ]
+};
+
+export default {
+   data() {
+     return {
+       goods: [item, item, item]
+     }
+   }
+}
+</script>
+```
+:::
+
+### API
+
+| 参数       | 说明      | 类型       | 默认值       | 必须      |
+|-----------|-----------|-----------|-------------|-------------|
+| goods | 商品数据 | `Array`  |   | 是 |
+| title | 标题 | `String`  | `以下商品无法一起购买，点击查看原因` | 否 |
+| actionsheetTitle | 弹出层标题 | `String`  | `以下商品无法一起下单` | 否 |
+
+### 数据格式
+#### data中的商品字段说明
+| key       | 说明      | 类型       |
+|-----------|-----------|-----------|
+| num | 商品数量 |  `Number` |
+| sku_id | 商品 id |  `Number` |
+| price | 商品价格，以分为单位 |  `Number` |
+| title | 商品标题 |  `String` |
+| img_url | 商品图片 url |  `String` |
+| unavailable_desc | 不可用原因 |  `String` |
+| sku | 商品 sku |  `Array` |
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 792b893ce..53912fd7d 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -189,6 +189,10 @@ module.exports = {
                 "path": "/express-way",
                 "title": "ExpressWay 配送方式"
               },
+              {
+                "path": "/invalid-goods",
+                "title": "InvalidGoods 不可用商品列表"
+              },
               {
                 "path": "/order-goods",
                 "title": "OrderGoods 下单页商品列表"
diff --git a/packages/index.js b/packages/index.js
index 86ed944e2..bd8f2a69a 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -15,6 +15,7 @@ import ExpressWay from './express-way';
 import Field from './field';
 import Icon from './icon';
 import ImagePreview from './image-preview';
+import InvalidGoods from './invalid-goods';
 import Lazyload from './lazyload';
 import Loading from './loading';
 import NoticeBar from './notice-bar';
@@ -59,6 +60,7 @@ const components = [
   ExpressWay,
   Field,
   Icon,
+  InvalidGoods,
   Loading,
   NoticeBar,
   OrderGoods,
@@ -117,6 +119,7 @@ export {
   Field,
   Icon,
   ImagePreview,
+  InvalidGoods,
   Lazyload,
   Loading,
   NoticeBar,
diff --git a/packages/invalid-goods/Card.vue b/packages/invalid-goods/Card.vue
new file mode 100644
index 000000000..dff9c0e40
--- /dev/null
+++ b/packages/invalid-goods/Card.vue
@@ -0,0 +1,30 @@
+<template>
+  <div class="van-invalid-goods-card">
+    <div class="van-invalid-goods__thumb">
+      <img :src="item.img_url" />
+      <div class="van-invalid-goods-card__flag">失效</div>
+    </div>
+    <div class="van-invalid-goods-card__content">
+      <div class="van-invalid-goods-card__row">
+        <h4 class="van-invalid-goods-card__title">{{ item.title }}</h4>
+        <span class="van-invalid-goods-card__price">¥{{ item.price }}</span>
+      </div>
+      <div class="van-invalid-goods-card__row">
+        <div class="van-invalid-goods-card__sku">{{ item.sku }}</div>
+        <span  class="van-invalid-goods-card__num">x{{ item.num }}</span>
+      </div>
+      <div class="van-invalid-goods-card__desc">{{ item.unavailable_desc }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'van-invalid-goods-card',
+
+  props: {
+    item: Object
+  }
+};
+</script>
+
diff --git a/packages/invalid-goods/index.vue b/packages/invalid-goods/index.vue
new file mode 100644
index 000000000..d0e1079c7
--- /dev/null
+++ b/packages/invalid-goods/index.vue
@@ -0,0 +1,78 @@
+<template>
+  <div>
+    <div class="van-invalid-goods" @click="showDetail = true">
+      <h3 class="van-invalid-goods__title">{{ title }}</h3>
+      <van-cell-group class="van-invalid-goods__container">
+        <div class="van-invalid-goods__gallery">
+          <div v-for="item in formattedGoods" :key="item.sku_id" class="van-invalid-goods__thumb">
+            <img :src="item.img_url" />
+          </div>
+        </div>
+        <div class="van-invalid-goods__count">
+          <span>共{{ formattedGoods.length }}件</span>
+          <van-icon name="arrow" />
+        </div>
+      </van-cell-group>
+    </div>
+    <van-actionsheet v-model="showDetail" :title="actionsheetTitle">
+      <div class="van-invalid-goods__list">
+        <van-invalid-goods-card  v-for="item in formattedGoods" :key="item.sku_id" :item="item" />
+      </div>
+    </van-actionsheet>
+  </div>
+</template>
+
+<script>
+import Card from './Card';
+import Icon from '../icon';
+import CellGroup from '../cell-group';
+import Actionsheet from '../actionsheet';
+
+export default {
+  name: 'van-invalid-goods',
+
+  components: {
+    [Card.name]: Card,
+    [Icon.name]: Icon,
+    [CellGroup.name]: CellGroup,
+    [Actionsheet.name]: Actionsheet
+  },
+
+  props: {
+    goods: {
+      type: Array,
+      required: true
+    },
+    title: {
+      type: String,
+      default: '以下商品无法一起购买，点击查看原因'
+    },
+    actionsheetTitle: {
+      type: String,
+      default: '以下商品无法一起下单'
+    }
+  },
+
+  data() {
+    return {
+      showDetail: false
+    };
+  },
+
+  methods: {
+    getSkuStr(arr) {
+      return arr.filter(item => item.v).map(item => item.v).join(', ');
+    }
+  },
+
+  computed: {
+    formattedGoods() {
+      return this.goods.map(item => ({
+        ...item,
+        price: parseFloat(item.price / 100, 10).toFixed(2),
+        sku: this.getSkuStr(item.sku)
+      }));
+    }
+  }
+};
+</script>
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index 29e48a8cb..8731cbdb4 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -35,3 +35,4 @@
 @import './express-way.css';
 @import './pay-order.css';
 @import './order-goods.css';
+@import './invalid-goods.css';
diff --git a/packages/vant-css/src/invalid-goods.css b/packages/vant-css/src/invalid-goods.css
new file mode 100644
index 000000000..43c0480ce
--- /dev/null
+++ b/packages/vant-css/src/invalid-goods.css
@@ -0,0 +1,121 @@
+@import "./mixins/ellipsis";
+
+$van-invalid-goods-photo-size: 90px;
+
+.van {
+  &-invalid-goods {
+    margin: 10px 0;
+
+    &__title {
+      color: #999;
+      font-size: 12px;
+      text-align: center;
+      margin-bottom: 10px;
+    }
+
+    &__container {
+      padding: 5px 10px;
+    }
+
+    &__gallery {
+      overflow: hidden;
+      height: $van-invalid-goods-photo-size;
+    }
+
+    &__thumb {
+      float: left;
+      display: flex;
+      height: 100%;
+      position: relative;
+      margin-right: 5px;
+      align-items: center;
+      justify-content: center;
+
+      img {
+        max-width: $van-invalid-goods-photo-size;
+        max-height: $van-invalid-goods-photo-size;
+      }
+    }
+
+    &__count {
+      position: absolute;
+      top: 0;
+      right: 0;
+      width: 80px;
+      color: #666;
+      font-size: 14px;
+      padding-right: 8px;
+      line-height: calc($van-invalid-goods-photo-size + 10px);
+      background-color: #fff;
+      text-align: right;
+
+      span {
+        margin-right: 6px;
+        vertical-align: middle;
+      }
+    }
+
+    &__list {
+      max-height: 400px;
+      overflow-y: scroll;
+    }
+  }
+
+  &-invalid-goods-card {
+    color: #999;
+    margin: 10px 0;
+    padding: 5px 10px;
+    background-color: #fafafa;
+    height: $van-invalid-goods-photo-size;
+
+    &__flag {
+      position: absolute;
+      left: 0;
+      top: 70px;
+      width: $van-invalid-goods-photo-size;
+      color: #fff;
+      font-size: 12px;
+      line-height: 20px;
+      text-align: center;
+      background-color: rgba(0,0,0,.6);
+    }
+
+    &__content {
+      width: 100%;
+      padding-left: 100px;
+      box-sizing: border-box;
+    }
+
+    &__row {
+      display: flex;
+      line-height: 20px;
+    }
+
+    &__title,
+    &__sku {
+      flex: 1;
+      @mixin multi-ellipsis 2;
+    }
+
+    &__title,
+    &__price {
+      font-size: 14px;
+    }
+
+    &__num,
+    &__sku {
+      font-size: 12px;
+    }
+
+    &__desc {
+      color: #f60;
+      font-size: 12px;
+      margin-top: 5px;
+    }
+  }
+
+  .van-icon-arrow {
+    color: #666;
+    font-size: 10px;
+  }
+}
\ No newline at end of file
diff --git a/test/unit/specs/invalid-goods.spec.js b/test/unit/specs/invalid-goods.spec.js
new file mode 100644
index 000000000..308713ce6
--- /dev/null
+++ b/test/unit/specs/invalid-goods.spec.js
@@ -0,0 +1,81 @@
+import InvalidGoods from 'packages/invalid-goods/index';
+import { mount } from 'avoriaz';
+import { DOMChecker } from '../utils';
+
+const mockItem = {
+  sku: [{ v: '商品SKU1' }, { v: '商品SKU2' }],
+  num: 2,
+  'sku_id': 123,
+  title: '商品名称',
+  price: 12200,
+  'unavailable_desc': '超出配送区域',
+  'img_url': 'https://img.yzcdn.cn/upload_files/2017/06/29/FnPSAKkEeh4FnDA09oIbmnlzWQrw.png'
+};
+
+describe('InvalidGoods', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('default', () => {
+    wrapper = mount(InvalidGoods, {
+      attachToDocument: true,
+      propsData: {
+        goods: [mockItem, mockItem, mockItem]
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-invalid-goods__title': '以下商品无法一起购买，点击查看原因',
+        '.van-actionsheet__header h3': '以下商品无法一起下单',
+        '.van-invalid-goods-card__price': '¥122.00',
+        '.van-invalid-goods-card__sku': '商品SKU1, 商品SKU2',
+        '.van-invalid-goods-card__title': mockItem.title,
+        '.van-invalid-goods-card__num': 'x' + mockItem.num,
+        '.van-invalid-goods-card__desc': mockItem.unavailable_desc,
+        '.van-invalid-goods__count span': '共3件'
+      },
+      count: {
+        '.van-invalid-goods-card': 3,
+        '.van-invalid-goods__gallery img': 3
+      },
+      src: {
+        '.van-invalid-goods__thumb img': mockItem.img_url
+      }
+    });
+  });
+
+  it('title prop', () => {
+    wrapper = mount(InvalidGoods, {
+      attachToDocument: true,
+      propsData: {
+        goods: [mockItem],
+        title: '标题'
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-invalid-goods__title': '标题'
+      }
+    });
+  });
+
+  it('actionsheetTitle prop', () => {
+    wrapper = mount(InvalidGoods, {
+      attachToDocument: true,
+      propsData: {
+        goods: [mockItem],
+        actionsheetTitle: 'actionsheet标题'
+      }
+    });
+
+    DOMChecker(wrapper, {
+      text: {
+        '.van-actionsheet__header h3': 'actionsheet标题'
+      }
+    });
+  });
+});

From dc854a4d5682bc88bf47fedb76a619cbd624e253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 31 Aug 2017 10:33:55 +0800
Subject: [PATCH 115/126] Steps: update document

---
 docs/examples-docs/steps.md | 67 +++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/docs/examples-docs/steps.md b/docs/examples-docs/steps.md
index d9d229b4b..d41d06a3d 100644
--- a/docs/examples-docs/steps.md
+++ b/docs/examples-docs/steps.md
@@ -1,12 +1,17 @@
 <style>
 .demo-steps {
-  .steps-success {
+  .steps-success,
+  .van-icon-location {
     color: #06bf04;
   }
 
   .van-button {
     margin: 15px 0 0 15px;
   }
+
+  .van-steps__message + p {
+    margin-bottom: 10px;
+  }
 }
 </style>
 
@@ -20,7 +25,7 @@ export default {
 
   methods: {
     nextStep() {
-      if (++this.active > 3) this.active = 0;
+      this.active = ++this.active % 4;
     }
   }
 }
@@ -42,7 +47,7 @@ Vue.component(Steps.name, Steps);
 
 :::demo 基础用法
 ```html
-<van-steps :active="active" icon="logistics" icon-class="steps-success" title="等待商家发货" description="等待商家发货等待商家发货等待商家发货等待商家发货等待商家发货">
+<van-steps :active="active">
   <van-step>买家下单</van-step>
   <van-step>商家接单</van-step>
   <van-step>买家提货</van-step>
@@ -61,7 +66,7 @@ export default {
 
   methods: {
     nextStep() {
-      if (++this.active > 3) this.active = 0;
+      this.active = ++this.active % 4;
     }
   }
 }
@@ -69,13 +74,19 @@ export default {
 ```
 :::
 
-#### 只显示步骤条
+#### 物流描述
 
-当你不设置`title`或`description`属性时，就会只显示步骤条，而没有步骤的详细信息。
+通过`title`和`description`属性来定义物流描述信息
 
-:::demo 只显示步骤条
+:::demo 物流描述
 ```html
-<van-steps :active="active">
+<van-steps
+  :active="active"
+  icon="logistics"
+  icon-class="steps-success"
+  title="等待商家发货"
+  description="物流描述"
+>
   <van-step>买家下单</van-step>
   <van-step>商家接单</van-step>
   <van-step>买家提货</van-step>
@@ -84,38 +95,37 @@ export default {
 ```
 :::
 
-#### 竖式步骤条
+#### 竖向步骤条
 
-可以通过设置`direction`属性来改变步骤条的显示方式，可选值有`vertical/horizontal`。
+可以通过设置`direction`属性来改变步骤条的显示方式
 
-:::demo 只显示步骤条
+:::demo 竖向步骤条
 ```html
 <van-steps direction="vertical" :active="0" active-color="#f60">
   <van-step>
-    <h3>【城市】最新的物流状态之类的表述哈哈哈哈</h3>
-    <p>2016-07-12 12:12:12</p>
+    <h3>【城市】物流状态1</h3>
+    <p>2016-07-12 12:40</p>
   </van-step>
   <van-step>
-    <h3>【城市】已经过了的物流状态我是折行我是折行我是折行联系电话：158630099999</h3>
-    <p>2016-07-12 12:12:12</p>
+    <h3>【城市】物流状态2</h3>
+    <p>2016-07-11 10:00</p>
   </van-step>
   <van-step>
-    <h3>未发货</h3>
-    <p>2016-07-12 12:12:12</p>
+    <h3>快件已发货</h3>
+    <p>2016-07-10 09:30</p>
   </van-step>
 </van-steps>
 ```
 :::
 
 ### 高级用法
-
-可以使用具名`slot`增加自定义内容，其中包含`icon`和`message-extra`。
+使用`slot`增加自定义内容
 
 :::demo 高级用法
 ```html
 <van-steps :active="active" title="等待商家发货">
-  <van-icon slot="icon" name="like"></van-icon>
-  <p slot="message-extra">流程</p>
+  <van-icon slot="icon" name="location"></van-icon>
+  <p slot="message-extra">物流进度</p>
   <van-step>买家下单</van-step>
   <van-step>商家接单</van-step>
   <van-step>买家提货</van-step>
@@ -128,13 +138,13 @@ export default {
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| active | 当前激活的步骤，从0开始 | `number`  |          |          |
-| icon | 当前步骤的icon | `string`  |          |          |
-| iconClass | 当前步骤栏为icon添加的类 | `string`  |          |          |
-| title | 当前步骤从标题 | `string`  |          |          |
-| description | 当前步骤描述 | `string`  |          |          |
-| direction | 	显示方向 | `string`  |   `horizontal`       |      `vertical/horizontal`    |
-| activeColor | 	`active`状态时的颜色 | `string`  |   `#06bf04`       |        |
+| active | 当前步骤，起始值为0 | `Number` | | |
+| icon | 当前步骤的icon | `String`  | | |
+| iconClass | 当前步骤栏为icon添加的类 | `String` | | |
+| title | 当前步骤从标题 | `String`  | | |
+| description | 当前步骤描述 | `String`  | | |
+| direction | 显示方向 | `String`  | `horizontal` | `vertical` |
+| activeColor | active状态颜色 | `String`  | `#06bf04` | |
 
 ### Steps Slot
 
@@ -142,4 +152,3 @@ export default {
 |-----------|-----------|
 | icon | 自定义icon区域 |
 | message-extra | 状态栏添加额外的元素 |
-

From 7574962af6ef164ea859376f3779b2b86c434340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 31 Aug 2017 10:34:02 +0800
Subject: [PATCH 116/126] Loading: update document

---
 docs/examples-docs/loading.md     | 53 +++++++------------------------
 packages/vant-css/src/loading.css |  9 ++----
 2 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/docs/examples-docs/loading.md b/docs/examples-docs/loading.md
index 098e7001d..8a9dcffc2 100644
--- a/docs/examples-docs/loading.md
+++ b/docs/examples-docs/loading.md
@@ -1,19 +1,8 @@
 <style>
 .demo-loading {
   .van-loading {
-    margin: 0 auto;
-  }
-
-  .circle-loading {
-    margin: 20px auto;
-  }
-
-  .demo-loading__example--with-bg {
-    background-color: rgba(17, 17, 17, 0.7);
-    margin: 0 auto;
-    width: 120px;
-    padding: 45px 0;
-    border-radius: 10px;
+    display: inline-block;
+    margin: 10px 0 10px 20px;
   }
 }
 </style>
@@ -29,39 +18,21 @@ Vue.component(Loading.name, Loading);
 
 ### 代码演示
 
-#### 渐变深色spinner
+#### 单色 spinner
 
-:::demo 渐变深色spinner
+:::demo 单色 spinner
 ```html
-<van-loading class="some-customized-class"></van-loading>
+<van-loading type="circle" color="white"></van-loading>
+<van-loading type="circle" color="black"></van-loading>
 ```
 :::
 
-#### 渐变浅色spinner
+#### 渐变色 spinner
 
-:::demo 渐变浅色spinner
+:::demo 渐变色 spinner
 ```html
-<div class="demo-loading__example demo-loading__example--with-bg">
-  <van-loading class="some-customized-class" :color="'white'"></van-loading>
-</div>
-
-<style>
-.demo-loading__example--with-bg {
-  background-color: rgba(17, 17, 17, 0.7);
-  width: 120px;
-  padding: 45px 0;
-  border-radius: 10px;
-}
-</style>
-```
-:::
-
-#### 单色spinner
-
-:::demo 单色spinner
-```html
-<van-loading class="circle-loading" :type="'circle'" :color="'white'"></van-loading>
-<van-loading class="circle-loading" :type="'circle'" :color="'black'"></van-loading>
+<van-loading type="gradient-circle" color="black"></van-loading>
+<van-loading type="gradient-circle" color="white"></van-loading>
 ```
 :::
 
@@ -69,5 +40,5 @@ Vue.component(Loading.name, Loading);
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| color | `loading`颜色 | `string`  | `black`          | `black`, `white`   |
-| type | `loading`类型 | `string`  | `gradient-circle`          | `gradient-circle`, `circle`   |
+| color | 颜色 | `string` | `black` | `black` `white`   |
+| type | 类型 | `string` | `gradient-circle` | `gradient-circle` `circle`   |
diff --git a/packages/vant-css/src/loading.css b/packages/vant-css/src/loading.css
index 1fd4c337e..5aa53f468 100644
--- a/packages/vant-css/src/loading.css
+++ b/packages/vant-css/src/loading.css
@@ -10,8 +10,6 @@
 }
 
 .van-loading {
-
-  line-height: 0;
   font-size: 0;
 
   &--circle {
@@ -26,11 +24,10 @@
   }
 
   &__spinner {
-    display: inline-block;
-    height: 100%;
     width: 100%;
-    animation: van-loading 0.8s linear;
-    animation-iteration-count: infinite;
+    height: 100%;
+    display: inline-block;
+    animation: van-loading 0.8s linear infinite;
 
     &--circle {
       border-radius: 100%;

From a2a8523da121e05718eaa81b7f60fd7b2f9dcbcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 31 Aug 2017 10:38:05 +0800
Subject: [PATCH 117/126] update doc

---
 docs/src/ExamplesApp.vue           | 10 ++++------
 docs/src/components/demo-block.vue |  2 ++
 docs/src/components/demo-list.vue  |  2 +-
 docs/src/examples.js               |  7 +++----
 docs/src/index.js                  |  5 ++---
 packages/field/index.vue           | 13 ++++++-------
 6 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/docs/src/ExamplesApp.vue b/docs/src/ExamplesApp.vue
index 78dd05c34..fd1f2215a 100644
--- a/docs/src/ExamplesApp.vue
+++ b/docs/src/ExamplesApp.vue
@@ -54,11 +54,6 @@ export default {
 </script>
 
 <style>
-  a {
-    color: #4078c0;
-    text-decoration: none;
-  }
-
   body {
     -webkit-font-smoothing: antialiased;    
   }
@@ -70,9 +65,12 @@ export default {
   .examples-container {
     height: 100%;
     overflow: auto;
-    background: #f8f8f8;
     position: relative;
     -webkit-overflow-scrolling: touch;
+
+    &::-webkit-scrollbar {
+      width: 0;
+    }
   }
 
   .footer {
diff --git a/docs/src/components/demo-block.vue b/docs/src/components/demo-block.vue
index 466594eaf..749bea221 100644
--- a/docs/src/components/demo-block.vue
+++ b/docs/src/components/demo-block.vue
@@ -6,6 +6,8 @@
 
 <script>
 export default {
+  name: 'demo-block',
+
   computed: {
     component() {
       return this.$route.path.split('/').pop();
diff --git a/docs/src/components/demo-list.vue b/docs/src/components/demo-list.vue
index 87d9ecdd5..ae59d4043 100644
--- a/docs/src/components/demo-list.vue
+++ b/docs/src/components/demo-list.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import docConfig from '../doc.config.js';
+import docConfig from '../doc.config';
 import MobileNav from './mobile-nav';
 
 export default {
diff --git a/docs/src/examples.js b/docs/src/examples.js
index d63c18c42..235d2fb2c 100644
--- a/docs/src/examples.js
+++ b/docs/src/examples.js
@@ -2,13 +2,12 @@ import Vue from 'vue';
 import VueRouter from 'vue-router';
 import App from './ExamplesApp';
 import routes from './router.config';
-import Vant, { Lazyload } from 'packages/index';
+import Vant, { Lazyload } from 'packages';
 import ZanDoc from 'zan-doc';
+import DemoList from './components/demo-list';
 import 'packages/vant-css/src/index.css';
 import 'zan-doc/src/helper/touch-simulator';
 
-import DemoList from './components/demo-list.vue';
-
 Vue.use(Vant);
 Vue.use(ZanDoc);
 Vue.use(Lazyload, {
@@ -31,7 +30,7 @@ router.beforeEach((to, from, next) => {
   if (container) {
     document.querySelector('.examples-container').scrollTop = 0;
   }
-  next()
+  next();
 });
 
 new Vue({ // eslint-disable-line
diff --git a/docs/src/index.js b/docs/src/index.js
index 3c36180f8..0b1484d7f 100644
--- a/docs/src/index.js
+++ b/docs/src/index.js
@@ -4,7 +4,6 @@ import App from './ExamplesDocsApp';
 import routes from './router.config';
 import ZanDoc from 'zan-doc';
 import DemoBlock from './components/demo-block';
-import 'packages/vant-css/src/reset.css';
 
 const isMobile = (function() {
   var platform = navigator.userAgent.toLowerCase();
@@ -14,7 +13,7 @@ const isMobile = (function() {
 
 Vue.use(VueRouter);
 Vue.use(ZanDoc);
-Vue.component('demo-block', DemoBlock);
+Vue.component(DemoBlock.name, DemoBlock);
 
 const routesConfig = routes();
 routesConfig.push({
@@ -41,7 +40,7 @@ router.afterEach(() => {
   if (!isMobile) {
     window.scrollTo(0, 0);
   }
-})
+});
 
 new Vue({ // eslint-disable-line
   render: h => h(App),
diff --git a/packages/field/index.vue b/packages/field/index.vue
index 67145aa67..c2f32d3e9 100644
--- a/packages/field/index.vue
+++ b/packages/field/index.vue
@@ -47,10 +47,11 @@
 </template>
 
 <script>
-const VALID_TYPES = ['text', 'number', 'email', 'url', 'tel', 'date', 'time', 'datetime', 'password', 'textarea'];
 import Cell from '../cell';
 import Icon from '../icon';
 
+const VALID_TYPES = ['text', 'number', 'email', 'url', 'tel', 'date', 'time', 'datetime', 'password', 'textarea'];
+
 export default {
   name: 'van-field',
 
@@ -63,15 +64,14 @@ export default {
     type: {
       type: String,
       default: 'text',
-      validator(value) {
-        return VALID_TYPES.indexOf(value) > -1;
-      }
+      validator: value => VALID_TYPES.indexOf(value) > -1
     },
-    placeholder: String,
     value: {},
+    icon: String,
     label: String,
-    disabled: Boolean,
+    placeholder: String,
     error: Boolean,
+    disabled: Boolean,
     readonly: Boolean,
     required: Boolean,
     maxlength: [String, Number],
@@ -82,7 +82,6 @@ export default {
       type: Boolean,
       default: false
     },
-    icon: String,
     onIconClick: {
       type: Function,
       default: () => {}

From 1f645422cac5684a54b341b6ff2cf07a78ac8d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 31 Aug 2017 10:50:14 +0800
Subject: [PATCH 118/126] Tag: update document

---
 docs/examples-docs/tag.md | 73 +++++++++++++++++++--------------------
 packages/tag/index.vue    | 26 +++++++-------
 2 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/docs/examples-docs/tag.md b/docs/examples-docs/tag.md
index 4d21b6ba6..63491187f 100644
--- a/docs/examples-docs/tag.md
+++ b/docs/examples-docs/tag.md
@@ -1,10 +1,14 @@
 <style>
-.tags-container {
-  padding: 5px 15px;
-
+.demo-tag {
   .van-tag + .van-tag {
     margin-left: 10px;
   }
+
+  .van-tag {
+    &:first-of-type {
+      margin-left: 15px;
+    }
+  }
 }
 </style>
 
@@ -20,44 +24,37 @@ Vue.component(Tag.name, Tag);
 ### 代码演示
 
 #### 基础用法
-
-`Tag`默认是灰色，另外还有有三种类型，`danger`、`success`、`primary`，它们分别显示为红色，绿色和蓝色，你也可以加上自定义的类，为它们加上其他的颜色。
-
+通过 type 属性控制 Tag 颜色，默认为灰色
 :::demo 基础用法
 ```html
-<div class="tags-container">
-  <van-tag>返现</van-tag>
-</div>
-<div class="tags-container">
-  <van-tag type="danger">返现</van-tag>
-  <van-tag type="success">四字标签</van-tag>
-  <van-tag type="primary">一</van-tag>
-</div>
+<van-tag>标签</van-tag>
+<van-tag type="danger">标签</van-tag>
+<van-tag type="success">标签</van-tag>
+<van-tag type="primary">标签</van-tag>
 ```
 :::
 
-#### 高级用法
+#### 空心样式
+设置`plain`属性设置为空心样式
 
-设置`plain`为`true`时表示空心的`tag`，还可以设置`mark`为`true`，表示是否为标记。
-
-:::demo 高级用法
+:::demo 空心样式
 ```html
-<div class="tags-container">
-  <van-tag>返现</van-tag>
-  <van-tag plain>返现</van-tag>
-</div>
-<div class="tags-container">
-  <van-tag type="danger">返现</van-tag>
-  <van-tag plain type="danger">返现</van-tag>
-</div>
-<div class="tags-container">
-  <van-tag type="primary">返现</van-tag>
-  <van-tag plain type="primary">返现</van-tag>
-</div>
-<div class="tags-container">
-  <van-tag type="success">返现</van-tag>
-  <van-tag plain type="success">返现</van-tag>
-</div>
+<van-tag plain>标签</van-tag>
+<van-tag plain type="danger">标签</van-tag>
+<van-tag plain type="primary">标签</van-tag>
+<van-tag plain type="success">标签</van-tag>
+```
+:::
+
+#### 标记样式
+通过`mark`设置为标记样式
+
+:::demo 标记样式
+```html
+<van-tag mark>标签</van-tag>
+<van-tag mark type="danger">标签</van-tag>
+<van-tag mark type="primary">标签</van-tag>
+<van-tag mark type="success">标签</van-tag>
 ```
 :::
 
@@ -65,12 +62,12 @@ Vue.component(Tag.name, Tag);
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| plain | 是否是空心tag | `boolean`  | `false`          |           |
-| mark | 是否是标记 | `boolean`  | `false`          |           |
-| type | tag类型 | `string`  | `''`          | `primary`, `success`, `danger` |
+| type | 类型 | `String`  | `''`| `primary` `success` `danger` |
+| plain | 是否为空心样式 | `Boolean` | `false` | |
+| mark | 是否为标记样式 | `Boolean` | `false` | |
 
 ### Slot
 
 | name       | 描述      |
 |-----------|-----------|
-| - | 自定义tag显示内容 |
+| - | 自定义 Tag 显示内容 |
diff --git a/packages/tag/index.vue b/packages/tag/index.vue
index e24bf0990..4fd9ad45d 100644
--- a/packages/tag/index.vue
+++ b/packages/tag/index.vue
@@ -1,21 +1,21 @@
 <template>
-  <span class="van-tag" :class="[type ? `van-tag--${type}`: '', { 'is-plain': plain, 'is-mark': mark }]">
+  <span :class="['van-tag', { [`van-tag--${type}`]: type, 'is-plain': plain, 'is-mark': mark }]">
     <slot></slot>
   </span>
 </template>
 
 <script>
-  const ALLOW_TYPE = ['danger', 'success', 'primary'];
+const ALLOW_TYPE = ['danger', 'success', 'primary'];
 
-  export default {
-    name: 'van-tag',
-    props: {
-      type: {
-        type: String,
-        validator: val => ~ALLOW_TYPE.indexOf(val)
-      },
-      mark: Boolean,
-      plain: Boolean
-    }
-  };
+export default {
+  name: 'van-tag',
+  props: {
+    type: {
+      type: String,
+      validator: val => ~ALLOW_TYPE.indexOf(val)
+    },
+    mark: Boolean,
+    plain: Boolean
+  }
+};
 </script>

From aff5da68e45194ccdc73cb8a0ab9c813974a7853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 31 Aug 2017 11:29:47 +0800
Subject: [PATCH 119/126] Badge: update document

---
 docs/examples-docs/badge.md | 99 +++++++++++++++++++------------------
 packages/badge/index.vue    | 18 ++-----
 2 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/docs/examples-docs/badge.md b/docs/examples-docs/badge.md
index b0f27058c..6da67fc0c 100644
--- a/docs/examples-docs/badge.md
+++ b/docs/examples-docs/badge.md
@@ -1,29 +1,36 @@
 <style>
 .demo-badge {
-  .badge-group-wrapper {
-    padding: 30px 20px;
+  .van-badge-group {
+    width: auto;
+    margin: 0 15px;
+    padding: 20px 0;
     background-color: #fff;
+
+    &::after {
+      display: none;
+    }
   }
 
-  .van-badge-group {
+  .van-badge {
+    width: 85px;
     margin: 0 auto;
   }
 }
 </style>
 
 <script>
-  export default {
-    data() {
-      return {
-        activeKey: '2'
-      };
-    },
-    methods: {
-      onItemClick(e, data) {
-        this.activeKey = data.mark;
-      }
+export default {
+  data() {
+    return {
+      activeKey: 0
+    };
+  },
+  methods: {
+    onClick(key) {
+      this.activeKey = key;
     }
-  };
+  }
+};
 </script>
 
 ## Badge 徽章
@@ -39,48 +46,44 @@ Vue.component(Badge.name, Badge);
 
 #### 基础用法
 
-默认情况下激活第一个`badge`。
+通过在`van-badge-group`上设置`active-key`属性来控制选中的`badge`
 
 :::demo 基础用法
 ```html
-<div class="badge-group-wrapper">
-  <van-badge-group>
-    <van-badge title="热销榜" info="8" url="http://baidu.com" @click="onItemClick"></van-badge>
-    <van-badge title="花式寿司" info="99" @click="onItemClick"></van-badge>
-    <van-badge title="火炽寿司" @click="onItemClick"></van-badge>
-    <van-badge title="手握寿司" info="199" @click="onItemClick"></van-badge>
-  </van-badge-group>
-</div>
+<van-badge-group :active-key="activeKey">
+  <van-badge title="热销榜" @click="onClick"></van-badge>
+  <van-badge title="花式寿司" @click="onClick" info="8"></van-badge>
+  <van-badge title="火炽寿司" @click="onClick" info="99"></van-badge>
+  <van-badge title="手握寿司" @click="onClick" info="199"></van-badge>
+</van-badge-group>
+```
+
+``` javascript
+export default {
+  data() {
+    return {
+      activeKey: 0
+    };
+  },
+  methods: {
+    onClick(key) {
+      this.activeKey = key;
+    }
+  }
+};
 ```
 :::
 
-#### 选中某个badge
 
-如果想默认选中某个`badge`，你可以在`van-badge-group`上设置`activeKey`属性，属性值为对应的`badge`索引。
+### BadgeGroup API
 
-:::demo 选中某个badge
-```html
-<div class="badge-group-wrapper">
-  <van-badge-group :active-key="2">
-    <van-badge title="热销榜" info="8" url="http://baidu.com" @click="onItemClick"></van-badge>
-    <van-badge title="花式寿司" info="99" @click="onItemClick"></van-badge>
-    <van-badge title="火炽寿司" @click="onItemClick"></van-badge>
-    <van-badge title="手握寿司" info="199" @click="onItemClick"></van-badge>
-  </van-badge-group>
-</div>
-```
-:::
-
-### z-badge-group API
-
-| 参数       | 说明      | 类型       | 默认值       | 必须      |
+| 参数 | 说明 | 类型 | 默认值 | 可选值 |
 |-----------|-----------|-----------|-------------|-------------|
-| active-key | 激活的`badge`的索引 | `string`  | `0`但必须子badge里的mark是有`0`位索引 |           |
+| active-key | 选中`badge`的索引 | `String | Number`  | `0` | - |
 
-
-### z-badge API
-| 参数       | 说明      | 类型       | 默认值       | 必须       |
+### Badge API
+| 参数 | 说明 | 类型 | 默认值 | 可选值 |
 |-----------|-----------|-----------|-------------|-------------|
-| title | badge的文案标题 | `string`  | `''`          | `required`          |
-| info | 当前badge的提示消息 | `string`  | `''`         |           |
-| url | 跳转链接 | `string`  | 链接直接跳转或者hash          |           |
+| title | 内容 | `String` | `''` | - |
+| info | 提示消息 | `String`  | `''` | - |
+| url | 跳转链接 | `String` | - | - |
diff --git a/packages/badge/index.vue b/packages/badge/index.vue
index 7808d6755..9ed36df14 100644
--- a/packages/badge/index.vue
+++ b/packages/badge/index.vue
@@ -1,12 +1,8 @@
 <template>
-  <a
-    class="van-badge"
-    :class="{ 'van-badge--select': isSelect }"
-    :href="url"
-    @click="handleClick">
+  <a :class="['van-badge', { 'van-badge--select': isSelect }]" :href="url" @click="onClick">
     <div class="van-badge__active"></div>
-    <div v-if="info" class="van-badge__info">{{info}}</div>
-    {{title}}
+    <div v-if="info" class="van-badge__info">{{ info }}</div>
+    {{ title }}
   </a>
 </template>
 
@@ -40,12 +36,8 @@ export default {
   },
 
   methods: {
-    handleClick(e) {
-      this.$emit('click', e, {
-        title: this.title,
-        url: this.url,
-        info: this.info
-      });
+    onClick() {
+      this.$emit('click', this.$parent.badges.indexOf(this));
     }
   }
 };

From 3de9f86b47c433c904a042bd3a1aa284cfb52f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 31 Aug 2017 15:18:54 +0800
Subject: [PATCH 120/126] Doc: update component document && examples

---
 docs/examples-docs/button.md        |  10 +-
 docs/examples-docs/card.md          |  38 +++---
 docs/examples-docs/cell-swipe.md    |  27 ++--
 docs/examples-docs/cell.md          |  82 ++++++-------
 docs/examples-docs/icon.md          | 183 ++++++++++++++--------------
 docs/examples-docs/image-preview.md |  16 ++-
 docs/examples-docs/layout.md        |  10 +-
 docs/examples-docs/notice-bar.md    |   6 +-
 docs/examples-docs/panel.md         |  62 ++--------
 docs/examples-docs/popup.md         |  12 +-
 docs/src/ExamplesApp.vue            |  62 +++++-----
 packages/cell/index.vue             |   6 +-
 packages/panel/index.vue            |   2 +-
 packages/vant-css/src/badge.css     |   4 +-
 packages/vant-css/src/cell.css      |   4 +
 packages/vant-css/src/loading.css   |   1 +
 16 files changed, 243 insertions(+), 282 deletions(-)

diff --git a/docs/examples-docs/button.md b/docs/examples-docs/button.md
index 91761fff0..a5bfd47d2 100644
--- a/docs/examples-docs/button.md
+++ b/docs/examples-docs/button.md
@@ -114,8 +114,8 @@ Vue.component(Button.name, Button);
 | type | 按钮类型 | `String`  | `default` | `primary` `danger` |
 | size | 按钮尺寸 | `String`  | `normal` | `large` `small` `mini` |
 | tag | 按钮标签 | `String`  | `button` | 任意`HTML`标签 |
-| nativeType | 按钮类型（原生） | `String`  | `''` | |
-| diabled | 是否禁用 | `Boolean`  |  `false`  | |
-| loading | 是否显示为加载状态 | `Boolean`  |  `false`  | |
-| block | 是否为块级元素 | `Boolean`  |   `false`   | |
-| bottomAction | 是否为底部行动按钮 | `Boolean` | `false` | |
+| nativeType | 按钮类型（原生） | `String`  | `''` | - |
+| diabled | 是否禁用 | `Boolean`  |  `false`  | - |
+| loading | 是否显示为加载状态 | `Boolean`  |  `false`  | - |
+| block | 是否为块级元素 | `Boolean`  |   `false`   | - |
+| bottomAction | 是否为底部行动按钮 | `Boolean` | `false` | - |
diff --git a/docs/examples-docs/card.md b/docs/examples-docs/card.md
index 993c39f6d..2c586a78a 100644
--- a/docs/examples-docs/card.md
+++ b/docs/examples-docs/card.md
@@ -1,3 +1,13 @@
+<script>
+export default {
+  data() {
+    return {
+      imageURL: '//img.yzcdn.cn/upload_files/2017/07/02/af5b9f44deaeb68000d7e4a711160c53.jpg'
+    }
+  }
+}
+</script>
+
 ## Card 图文组件
 
 ### 使用指南
@@ -11,15 +21,9 @@ Vue.component(Card.name, Card);
 
 #### 基础用法
 
-当没有底部按钮时，右侧内容会居中显示。
-
 :::demo 基础用法
 ```html
-<van-card
-  title="商品名称是什么，两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余"
-  desc="描述"
-  thumb="https://img.yzcdn.cn/upload_files/2017/02/17/FnDwvwHmU-OiqsbjAO5X7wh1KWrR.jpg!100x100.jpg">
-</van-card>
+<van-card title="商品名称" desc="商品描述" :thumb="imageURL" />
 ```
 :::
 
@@ -29,10 +33,9 @@ Vue.component(Card.name, Card);
 
 :::demo 高级用法
 ```html
-<van-card
-  thumb="https://img.yzcdn.cn/upload_files/2017/02/17/FnDwvwHmU-OiqsbjAO5X7wh1KWrR.jpg!100x100.jpg">
+<van-card :thumb="imageURL">
   <div class="van-card__row" slot="title">
-    <h4 class="van-card__title">商品名称是什么，两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余</h4>
+    <h4 class="van-card__title">商品名称</h4>
     <span class="van-card__price">¥ 2.00</span>
   </div>
   <div class="van-card__row" slot="desc">
@@ -50,11 +53,10 @@ Vue.component(Card.name, Card);
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| thumb | 左侧图片 | `string`  |          |          |
-| title | 标题 | `string`  |          |          |
-| desc | 描述 | `string`  |          |          |
-| centered | 内容是否垂直居中 | `string`  | `false` |          |
-
+| thumb | 左侧图片 | `String`  | - | - |
+| title | 标题 | `String`  | - | - |
+| desc | 描述 | `String`  | - | - |
+| centered | 内容是否垂直居中 | `String`  | `false` | - |
 
 ### Slot
 
@@ -62,6 +64,6 @@ Vue.component(Card.name, Card);
 |-----------|-----------|
 | title | 自定义标题 |
 | desc | 自定义描述 |
-| tags | 自定义tags |
-| thumb | 自定义thumb |
-| footer | 自定义footer |
+| tags | 自定义 tags |
+| thumb | 自定义 thumb |
+| footer | 自定义 footer |
diff --git a/docs/examples-docs/cell-swipe.md b/docs/examples-docs/cell-swipe.md
index 45225aabd..a16494da7 100644
--- a/docs/examples-docs/cell-swipe.md
+++ b/docs/examples-docs/cell-swipe.md
@@ -1,6 +1,6 @@
 <style>
-.swipe-delete-btn {
-    background-color: #FF4444;
+.van-cell-swipe__left,
+.van-cell-swipe__right {
     color: #FFFFFF;
     font-size: 16px;
     width: 65px;
@@ -9,15 +9,11 @@
     text-align: center;
     line-height: 44px;
 }
-.swipe-check-btn {
-    background-color: #84c483;
-    color: #FFFFFF;
-    font-size: 16px;
-    width: 65px;
-    height: 44px;
-    display: inline-block;
-    text-align: center;
-    line-height: 44px;
+.van-cell-swipe__left {
+  background-color: #FF4444;  
+}
+.van-cell-swipe__right {
+  background-color: #84c483;
 }
 </style>
 ## CellSwipe 滑动单元格
@@ -36,22 +32,21 @@ Vue.component(CellSwipe.name, CellSwipe);
 :::demo 基础用法
 ```html
 <van-cell-swipe :right-width="65" :left-width="65">
+  <span slot="left">选择</span>
   <van-cell-group>
     <van-cell title="单元格1" value="单元格1内容"></van-cell>
   </van-cell-group>
-  <span slot="right" class="swipe-delete-btn">删除</span>
-  <span slot="left" class="swipe-check-btn">选择</span>
+  <span slot="right">删除</span>
 </van-cell-swipe>
 ```
 :::
 
-
 ### API
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| left-width | 左侧滑动按钮宽度 | `number`  | 0 | |
-| right-width | 右侧滑动按钮宽度 | `number`  | 0 | |
+| left-width | 左侧滑动区域宽度 | `Number`  | `0` | - |
+| right-width | 右侧滑动区域宽度 | `Number`  | `0` | - |
 
 ### Slot
 
diff --git a/docs/examples-docs/cell.md b/docs/examples-docs/cell.md
index b2566b15a..bbad3c505 100644
--- a/docs/examples-docs/cell.md
+++ b/docs/examples-docs/cell.md
@@ -8,6 +8,21 @@ export default {
 };
 </script>
 
+<style>
+.demo-cell {
+  .van-cell-text {
+    margin-right: 5px;
+  }
+  .van-cell__right-icon {
+    font-size: 16px;
+  }
+  .van-cell-text,
+  .van-tag--danger {
+    vertical-align: middle;
+  }
+}
+</style>
+
 ## Cell 单元格
 
 ### 使用指南
@@ -22,86 +37,66 @@ Vue.component(CellGroup.name, CellGroup);
 
 #### 基础用法
 
-你可以将`van-cell-group`组件看成一个容器即可。
+将`van-cell-group`组件看成一个容器即可
 
 :::demo 基础用法
 ```html
 <van-cell-group>
   <van-cell title="单元格1" value="单元格1内容"></van-cell>
-  <van-cell title="单元格2" value="单元格2内容"></van-cell>
+  <van-cell title="单元格2" value="单元格2内容" label="描述信息"></van-cell>
 </van-cell-group>
 ```
 :::
 
 #### 只设置value
-
-只设置`value`时会向左对齐。
+只设置`value`时会向左对齐
 
 :::demo 只设置value
 ```html
 <van-cell-group>
-  <van-cell value="单元格1内容"></van-cell>
-  <van-cell value="单元格2内容"></van-cell>
+  <van-cell value="单元格内容"></van-cell>
 </van-cell-group>
 ```
 :::
 
-#### 标题带描述信息
-
-传入`label`属性，属性值为描述信息的值。
-
-:::demo 标题带描述信息
+#### 展示图标
+通过`icon`属性在标题左侧展示图标
+:::demo 展示图标
 ```html
 <van-cell-group>
-  <van-cell title="单元格1" label="描述信息" value="查看专栏" is-link url="javascript:void(0)" @click="handleClick"></van-cell>
-  <van-cell title="单元格2" label="描述信息" value="查看专栏" is-link></van-cell>
+  <van-cell title="单元格" icon="location"></van-cell>
 </van-cell-group>
 ```
 :::
 
-#### 带图标
+#### 展示箭头
+传入`isLink`属性则会在右侧显示箭头
 
-传入`icon`属性。
-
-:::demo 带图标
+:::demo 展示箭头
 ```html
 <van-cell-group>
-  <van-cell title="起码运动馆" icon="home"></van-cell>
-  <van-cell title="线下门店" icon="location"></van-cell>
-</van-cell-group>
-```
-:::
-
-#### 可点击的链接
-
-传入`url`属性，传入`isLink`属性则会在右侧显示箭头。
-
-:::demo 可点击的链接
-```html
-<van-cell-group>
-  <van-cell title="起码运动馆" value="进入店铺" icon="home" url="http://youzan.com" is-link></van-cell>
-  <van-cell title="线下门店" icon="location" url="http://youzan.com" is-link></van-cell>
+  <van-cell title="单元格1" is-link></van-cell>
+  <van-cell title="单元格2" is-link value="内容"></van-cell>
 </van-cell-group>
 ```
 :::
 
 #### 高级用法
-
-如以上用法不能满足你的需求，可以使用对应的`slot`来自定义显示的内容。包含三个`slot`，默认`slot`、`icon`、`title`和`right-icon`的`slot`。
+如以上用法不能满足你的需求，可以使用对应的`slot`来自定义显示的内容
 
 :::demo 高级用法
 ```html
 <van-cell-group>
-  <van-cell value="进入店铺" icon="home" url="http://youzan.com" is-link>
+  <van-cell value="进入店铺" icon="home" is-link>
     <template slot="title">
       <span class="van-cell-text">起码运动馆</span>
       <van-tag type="danger">官方</van-tag>
     </template>
   </van-cell>
-  <van-cell title="线下门店" icon="location" url="http://youzan.com" is-link></van-cell>
+  <van-cell title="线下门店" icon="location" is-link></van-cell>
   <van-cell title="其他">
     <template slot="right-icon">
-      <van-icon name="passed" class="van-cell__right-icon" style="font-size: 16px;"></van-icon>
+      <van-icon name="search" class="van-cell__right-icon"></van-icon>
     </template>
   </van-cell>
 </van-cell-group>
@@ -112,12 +107,13 @@ Vue.component(CellGroup.name, CellGroup);
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| icon | 左侧图标 | `string`  |           |           |
-| title | 左侧标题 | `string`  |           |           |
-| value | 右侧内容 | `string`  |           |           |
-| isLink | 是否为链接，链接会在右侧出现箭头 | `boolean`  |           |           |
-| url | 跳转链接 | `string`  |           |           |
-| label | 描述信息，显示在标题下方 | `string`  |           |           |
+| icon | 左侧图标 | `String`  | - | - |
+| title | 左侧标题 | `String`  | - | - |
+| value | 右侧内容 | `String`  | - | - |
+| label | 标题下方的描述信息 | `String`  | - | - |
+| url | 跳转链接 | `String`  | - | - |
+| isLink | 是否展示右侧箭头 | `Boolean`  | `false` | - |
+| required | 是否显示表单必填符号 | `Boolean`  | `false` | - |
 
 ### Slot
 
diff --git a/docs/examples-docs/icon.md b/docs/examples-docs/icon.md
index a2278a668..a6c572e82 100644
--- a/docs/examples-docs/icon.md
+++ b/docs/examples-docs/icon.md
@@ -8,13 +8,14 @@
 
   .van-col {
     text-align: center;
-    height: 120px;
+    height: 100px;
     float: none;
     display: inline-block;
+    color: rgba(69, 90, 100, .8);
   }
 
   .van-icon {
-    font-size: 45px;
+    font-size: 32px;
     margin: 15px 0;
     display: block;
   }
@@ -29,15 +30,99 @@
 import Vue from 'vue';
 import { Icon } from 'packages';
 
+const icons = [
+  'close',
+  'location',
+  'clock',
+  'gold-coin',
+  'chat',
+  'exchange',
+  'upgrade',
+  'edit',
+  'contact',
+  'passed',
+  'points',
+  'delete',
+  'records',
+  'logistics',
+  'check',
+  'checked',
+  'gift',
+  'like-o',
+  'like',
+  'qr',
+  'qr-invalid',
+  'shop',
+  'photograph',
+  'add',
+  'add2',
+  'photo',
+  'cart',
+  'arrow',
+  'search',
+  'clear',
+  'success',
+  'fail',
+  'wechat',
+  'alipay',
+  'password-view',
+  'wap-nav',
+  'password-not-view',
+  'wap-home',
+  'ecard-pay',
+  'balance-pay',
+  'peer-pay',
+  'credit-pay',
+  'debit-pay',
+  'other-pay',
+  'cart',
+  'browsing-history',
+  'goods-collect',
+  'shop-collect',
+  'receive-gift',
+  'send-gift',
+  'setting',
+  'coupon',
+  'free-postage',
+  'discount',
+  'birthday-privilege',
+  'member-day-privilege',
+  'balance-details',
+  'cash-back-record',
+  'points-mall',
+  'exchange-record',
+  'pending-payment',
+  'pending-orders',
+  'pending-deliver',
+  'pending-evaluate',
+  'cash-on-deliver',
+  'gift-card-pay',
+  'underway',
+  'point-gift',
+  'after-sale',
+  'edit-data',
+  'question',
+  'description',
+  'card',
+  'gift-card',
+  'coupon'
+];
+
 Vue.component('van-icon-inner', Icon);
 Vue.component('van-icon', {
   props: ['name'],
 
   render(h) {
-    return <van-col span="8">
-      <van-icon-inner name={this.name}></van-icon-inner>
-      <span>{this.name}</span>
-    </van-col>
+    return (
+      <div>
+        {icons.map(icon => (
+          <van-col span="8">
+            <van-icon-inner name={icon}></van-icon-inner>
+            <span>{icon}</span>
+          </van-col>
+        ))}
+      </div>
+    )
   }
 });
 
@@ -57,7 +142,7 @@ Vue.component(Icon.name, Icon);
 
 #### 基础用法
 
-设置`name`属性为对应的图标名称即可：
+设置`name`属性为对应的图标名称即可，所有可用的图标名称见右侧列表
 
 :::demo 基础用法
 ```html
@@ -65,90 +150,8 @@ Vue.component(Icon.name, Icon);
 ```
 :::
 
-#### 图标列表
-
-:::demo 所有Icon
-```html
-<van-icon name="qr-invalid"></van-icon>
-<van-icon name="qr"></van-icon>
-<van-icon name="exchange"></van-icon>
-<van-icon name="close"></van-icon>
-<van-icon name="location"></van-icon>
-<van-icon name="upgrade"></van-icon>
-<van-icon name="check"></van-icon>
-<van-icon name="checked"></van-icon>
-<van-icon name="like-o"></van-icon>
-<van-icon name="like" style="color: red;"></van-icon>
-<van-icon name="chat"></van-icon>
-<van-icon name="shop"></van-icon>
-<van-icon name="photograph"></van-icon>
-<van-icon name="add"></van-icon>
-<van-icon name="add2"></van-icon>
-<van-icon name="photo"></van-icon>
-<van-icon name="edit"></van-icon>
-<van-icon name="passed"></van-icon>
-<van-icon name="cart"></van-icon>
-<van-icon name="arrow"></van-icon>
-<van-icon name="gift"></van-icon>
-<van-icon name="search"></van-icon>
-<van-icon name="clear"></van-icon>
-<van-icon name="success"></van-icon>
-<van-icon name="fail"></van-icon>
-<van-icon name="contact"></van-icon>
-<van-icon name="wechat"></van-icon>
-<van-icon name="alipay"></van-icon>
-<van-icon name="password-view"></van-icon>
-<van-icon name="wap-nav"></van-icon>
-<van-icon name="password-not-view"></van-icon>
-<van-icon name="wap-home"></van-icon>
-<van-icon name="ecard-pay"></van-icon>
-<van-icon name="balance-pay"></van-icon>
-<van-icon name="peer-pay"></van-icon>
-<van-icon name="credit-pay"></van-icon>
-<van-icon name="debit-pay"></van-icon>
-<van-icon name="other-pay"></van-icon>
-<van-icon name="cart"></van-icon>
-<van-icon name="browsing-history"></van-icon>
-<van-icon name="goods-collect"></van-icon>
-<van-icon name="shop-collect"></van-icon>
-<van-icon name="receive-gift"></van-icon>
-<van-icon name="send-gift"></van-icon>
-<van-icon name="setting"></van-icon>
-<van-icon name="points"></van-icon>
-<van-icon name="coupon"></van-icon>
-<van-icon name="free-postage"></van-icon>
-<van-icon name="discount"></van-icon>
-<van-icon name="birthday-privilege"></van-icon>
-<van-icon name="member-day-privilege"></van-icon>
-<van-icon name="balance-details"></van-icon>
-<van-icon name="cash-back-record"></van-icon>
-<van-icon name="points-mall"></van-icon>
-<van-icon name="exchange-record"></van-icon>
-<van-icon name="pending-payment"></van-icon>
-<van-icon name="pending-orders"></van-icon>
-<van-icon name="pending-deliver"></van-icon>
-<van-icon name="logistics"></van-icon>
-<van-icon name="pending-evaluate"></van-icon>
-<van-icon name="cash-on-deliver"></van-icon>
-<van-icon name="gift-card-pay"></van-icon>
-<van-icon name="underway"></van-icon>
-<van-icon name="point-gift"></van-icon>
-<van-icon name="after-sale"></van-icon>
-<van-icon name="edit-data"></van-icon>
-<van-icon name="question"></van-icon>
-<van-icon name="delete"></van-icon>
-<van-icon name="records"></van-icon>
-<van-icon name="description"></van-icon>
-<van-icon name="card"></van-icon>
-<van-icon name="gift-card"></van-icon>
-<van-icon name="coupon"></van-icon>
-<van-icon name="clock"></van-icon>
-<van-icon name="gold-coin"></van-icon>
-```
-:::
-
 ### API
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| name | icon名称 | `string`  | `''` |   |
+| name | icon名称 | `String`  | `''` | - |
diff --git a/docs/examples-docs/image-preview.md b/docs/examples-docs/image-preview.md
index 1239abd78..0de221cb1 100644
--- a/docs/examples-docs/image-preview.md
+++ b/docs/examples-docs/image-preview.md
@@ -11,7 +11,7 @@ import { ImagePreview } from 'packages/index';
 
 export default {
   methods: {
-    handleImagePreview() {
+    showImagePreview() {
       ImagePreview([
         'https://img.yzcdn.cn/upload_files/2017/03/15/FkubrzN7AgGwLlTeb1E89-T_ZjBg.png',
         'https://img.yzcdn.cn/upload_files/2017/03/14/FmTPs0SeyQaAOSK1rRe1sL8RcwSY.jpeg',
@@ -38,22 +38,20 @@ import { ImagePreview } from 'vant';
 
 :::demo 基础用法
 ```html
-<van-button @click="handleImagePreview">预览图片</van-button>
-
-<script>
-import { ImagePreview } from 'packages/index';
+<van-button @click="showImagePreview">预览图片</van-button>
+```
 
+```javascript
 export default {
   methods: {
-    handleImagePreview() {
+    showImagePreview() {
       ImagePreview([
-        'https://img.yzcdn.cn/upload_files/2017/03/14/FmTPs0SeyQaAOSK1rRe1sL8RcwSY.jpeg',
-        'https://img.yzcdn.cn/upload_files/2017/03/15/FvexrWlG_WxtCE9Omo5l27n_mAG_.jpeg'
+        'https://img.yzcdn.cn/1.jpg',
+        'https://img.yzcdn.cn/2.jpg'
       ]);
     }
   }
 };
-</script>
 ```
 :::
 
diff --git a/docs/examples-docs/layout.md b/docs/examples-docs/layout.md
index 67d32b869..2fe09d2a9 100644
--- a/docs/examples-docs/layout.md
+++ b/docs/examples-docs/layout.md
@@ -79,12 +79,12 @@ Layout 组件提供了`24列栅格`，通过在`Col`上添加`span`属性设置
 #### Row
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| gutter | 列元素之间的间距（单位为px） | `String | Number`  | -  |   |
-| prefix | className 前缀 | `String`  | `van`  |   |
+| gutter | 列元素之间的间距（单位为px） | `String | Number` | - | - |
+| prefix | className 前缀 | `String` | `van` | - |
 
 #### Column
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| span | 列元素宽度 | `String | Number`  | -  |   |
-| offset | 列元素偏移距离 | `String | Number`  | -  |   |
-| prefix | className 前缀 | `String`  | `van`  |   |
+| span | 列元素宽度 | `String | Number`  | - | - |
+| offset | 列元素偏移距离 | `String | Number` | -  | - |
+| prefix | className 前缀 | `String`  | `van` | - |
diff --git a/docs/examples-docs/notice-bar.md b/docs/examples-docs/notice-bar.md
index eaccdde97..7da1faa12 100644
--- a/docs/examples-docs/notice-bar.md
+++ b/docs/examples-docs/notice-bar.md
@@ -58,9 +58,9 @@ Vue.component(NoticeBar.name, NoticeBar);
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
 | mode | 通告栏模式 | String | `''` | `closeable` `link` |
-| delay | 动画延迟时间，单位秒 | Number | `1` | |
-| scrollable | 是否滚动 | Boolean | `true` | |
-| speed | 滚动速率，单位px | Number | `40` | |
+| delay | 动画延迟时间，单位秒 | Number | `1` | - |
+| speed | 滚动速率，单位px | Number | `40` | - |
+| scrollable | 是否滚动 | Boolean | `true` | - |
 
 ### Event
 
diff --git a/docs/examples-docs/panel.md b/docs/examples-docs/panel.md
index 899cb071e..ee7612ae6 100644
--- a/docs/examples-docs/panel.md
+++ b/docs/examples-docs/panel.md
@@ -1,19 +1,6 @@
 <style>
 .demo-panel {
-  .van-panel-sum {
-    background: #fff;
-    text-align: right;
-    font-size: 14px;
-    color: #333;
-    line-height: 30px;
-    padding-right: 15px;
-
-    span {
-      color: red;
-    }
-  }
-
-  .van-panel-buttons {
+  .van-panel__footer {
     text-align: right;
 
     .van-button {
@@ -21,7 +8,7 @@
     }
   }
 
-  .panel-content {
+  .van-panel__content {
     padding: 20px;
   }
 }
@@ -39,47 +26,24 @@ Vue.component(Panel.name, Panel);
 ### 代码演示
 
 #### 基础用法
-
-面板只是一个容器，里面可以放入自定义的内容。
+面板只是一个容器，里面可以放入自定义的内容
 
 :::demo 基础用法
 ```html
 <van-panel title="标题" desc="标题描述" status="状态">
-  <div class="panel-content">
-    panel内容
-  </div>
+  <div>Panel内容</div>
 </van-panel>
 ```
 :::
 
 #### 高级用法
-
-使用`slot`自定义内容。比如在自定义内容中放入一个`van-card`。
+使用`slot`自定义内容
 
 :::demo 高级用法
 ```html
 <van-panel title="标题" desc="标题描述" status="状态">
-  <van-card
-    title="商品名称是什么，两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余"
-    desc="商品SKU1，商品SKU2"
-    thumb="https://img.yzcdn.cn/upload_files/2017/02/17/FnDwvwHmU-OiqsbjAO5X7wh1KWrR.jpg!100x100.jpg">
-    <div class="van-card__row" slot="title">
-      <h4 class="van-card__title">商品名称是什么，两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余两行显示状态如效果图，多余多余多余</h4>
-      <span class="van-card__price">¥ 2.00</span>
-    </div>
-    <div class="van-card__row" slot="desc">
-      <h4 class="van-card__desc">商品sku</h4>
-      <span class="van-card__num">x 2</span>
-    </div>
-    <div class="van-card__footer" slot="footer">
-      <van-button size="mini">按钮一</van-button>
-      <van-button size="mini">按钮二</van-button>
-    </div>
-  </van-card>
-  <div class="van-panel-sum">
-    合计：<span>¥ 1999.90</span>
-  </div>
-  <div class="van-panel-buttons" slot="footer">
+  <div>Panel内容</div>
+  <div slot="footer">
     <van-button size="small">按钮一</van-button>
     <van-button size="small" type="danger">按钮二</van-button>
   </div>
@@ -89,11 +53,11 @@ Vue.component(Panel.name, Panel);
 
 ### API
 
-| 参数       | 说明      | 类型       | 默认值       | 可选值       |
+| 参数 | 说明 | 类型 | 默认值 | 可选值 |
 |-----------|-----------|-----------|-------------|-------------|
-| title | 标题 | `string`  |           |           |
-| desc | 描述 | `string`  |           |           |
-| status | 状态 | `string`  |           |           |
+| title | 标题 | `String`  | - | - |
+| desc | 描述 | `String`  | - | - |
+| status | 状态 | `String`  | - | - |
 
 
 ### Slot
@@ -101,5 +65,5 @@ Vue.component(Panel.name, Panel);
 | name       | 描述      |
 |-----------|-----------|
 | - | 自定义内容 |
-| header | 自定义header |
-| footer | 自定义footer |
+| header | 自定义 header |
+| footer | 自定义 footer |
diff --git a/docs/examples-docs/popup.md b/docs/examples-docs/popup.md
index 892b9df15..88d857736 100644
--- a/docs/examples-docs/popup.md
+++ b/docs/examples-docs/popup.md
@@ -163,9 +163,9 @@ export default {
 
 | 参数       | 说明      | 类型       | 默认值       | 可选值       |
 |-----------|-----------|-----------|-------------|-------------|
-| value | 利用`v-model`绑定当前组件是否显示 | `boolean`  | `false` | `true`, `false`  |
-| overlay | 是否显示背景遮罩层 | `boolean`  | `true` | `true`, `false`  |
-| lockOnScroll | 背景是否跟随滚动 | `boolean`  | `false` | `true`, `false`  |
-| position | 弹出菜单位置 | `string`  |  | `top`, `bottom`, `right`, `left`  |
-| closeOnClickOverlay | 点击遮罩层是否关闭弹出菜单 | `boolean`  | `true` | `true`, `false`  |
-| transition | 弹出菜单的`transition` | `string`  | `popup-slide` |   |
+| v-model | 当前组件是否显示 | `Boolean`  | `false` | - |
+| overlay | 是否显示背景遮罩层 | `Boolean`  | `true` | -  |
+| lockOnScroll | 背景是否跟随滚动 | `Boolean`  | `false` | - |
+| position | 弹出菜单位置 | `String`  | - | `top`, `bottom`, `right`, `left`  |
+| closeOnClickOverlay | 点击遮罩层是否关闭弹出菜单 | `Boolean`  | `true` | - |
+| transition | 弹出菜单的`transition` | `String`  | `popup-slide` |   |
diff --git a/docs/src/ExamplesApp.vue b/docs/src/ExamplesApp.vue
index fd1f2215a..77859a6d4 100644
--- a/docs/src/ExamplesApp.vue
+++ b/docs/src/ExamplesApp.vue
@@ -54,42 +54,42 @@ export default {
 </script>
 
 <style>
-  body {
-    -webkit-font-smoothing: antialiased;    
-  }
+body {
+  -webkit-font-smoothing: antialiased;    
+}
 
-  body, html {
-    height: 100%;
-  }
+body, html {
+  height: 100%;
+}
 
-  .examples-container {
-    height: 100%;
-    overflow: auto;
-    position: relative;
-    -webkit-overflow-scrolling: touch;
+.examples-container {
+  height: 100%;
+  overflow: auto;
+  position: relative;
+  -webkit-overflow-scrolling: touch;
 
-    &::-webkit-scrollbar {
-      width: 0;
-    }
+  &::-webkit-scrollbar {
+    width: 0;
   }
+}
 
-  .footer {
-    margin-top: 30px;
-    width: 100%;
-    padding: 10px 0 20px;
-    background: #f8f8f8;
-    
-    &.footer-fixed {
-      position: absolute;
-      bottom: 0;
-      left: 0;
-    }
+.footer {
+  margin-top: 30px;
+  width: 100%;
+  padding: 10px 0 20px;
+  background: #f8f8f8;
+  
+  &.footer-fixed {
+    position: absolute;
+    bottom: 0;
+    left: 0;
   }
+}
 
-  .zanui-logo {
-    display: block;
-    margin: 0 auto;
-    width: 150px;
-    height: auto;
-  }
+.zanui-logo {
+  display: block;
+  margin: 0 auto;
+  width: 150px;
+  height: auto;
+}
 </style>
diff --git a/packages/cell/index.vue b/packages/cell/index.vue
index f356c8aa9..3bcf14a33 100644
--- a/packages/cell/index.vue
+++ b/packages/cell/index.vue
@@ -2,7 +2,7 @@
   <a :class="['van-cell', { 'van-cell--required': required }]" :href="url" @click="$emit('click')">
     <div
       class="van-cell__title"
-      v-if="this.$slots.title || title"
+      v-if="$slots.title || title"
     >
       <slot name="icon">
         <i v-if="icon" class="van-icon" :class="'van-icon-' + icon"></i>
@@ -14,10 +14,10 @@
     </div>
     <div
       class="van-cell__value"
-      v-if="value || this.$slots.default"
+      v-if="value || $slots.default"
       :class="{
         'van-cell__value--link': isLink,
-        'van-cell__value--alone': !this.$slots.title && !title && !label
+        'van-cell__value--alone': !$slots.title && !title && !label
       }"
     >
       <slot>
diff --git a/packages/panel/index.vue b/packages/panel/index.vue
index 37003010c..eed3760d7 100644
--- a/packages/panel/index.vue
+++ b/packages/panel/index.vue
@@ -10,7 +10,7 @@
     <div class="van-panel__content">
       <slot></slot>
     </div>
-    <div class="van-panel__footer" v-if="this.$slots.footer">
+    <div class="van-panel__footer" v-if="$slots.footer">
       <slot name="footer"></slot>
     </div>
   </div>
diff --git a/packages/vant-css/src/badge.css b/packages/vant-css/src/badge.css
index 854c9d6b8..d79285264 100644
--- a/packages/vant-css/src/badge.css
+++ b/packages/vant-css/src/badge.css
@@ -32,9 +32,7 @@
       display: block;
     }
     &::after {
-      @mixin border-retina (top);
-      @mixin border-retina (right);
-      @mixin border-retina (left);
+      @mixin border-retina (top, right, left);
     }
   }
 
diff --git a/packages/vant-css/src/cell.css b/packages/vant-css/src/cell.css
index 5bc960596..8b381dd41 100644
--- a/packages/vant-css/src/cell.css
+++ b/packages/vant-css/src/cell.css
@@ -37,6 +37,10 @@
 
   &__title {
     display: table-cell;
+
+    .van-icon {
+      margin-right: 5px;
+    }
   }
 
   &__label {
diff --git a/packages/vant-css/src/loading.css b/packages/vant-css/src/loading.css
index 5aa53f468..704897bf4 100644
--- a/packages/vant-css/src/loading.css
+++ b/packages/vant-css/src/loading.css
@@ -11,6 +11,7 @@
 
 .van-loading {
   font-size: 0;
+  line-height: 0;
 
   &--circle {
     width: 16px;

From 13a41e0e1e8d979aca75fd6a05edb09282c455b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 31 Aug 2017 15:53:11 +0800
Subject: [PATCH 121/126] OrderGoods: fix message test cases

---
 docs/examples-docs/order-goods.md   |  6 +++++
 packages/order-goods/Empty.vue      |  8 +------
 packages/order-goods/index.vue      |  1 +
 test/unit/get-webpack-conf.js       |  2 +-
 test/unit/specs/order-goods.spec.js | 34 ++++++++++++++---------------
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/docs/examples-docs/order-goods.md b/docs/examples-docs/order-goods.md
index f88a36717..3c882555f 100644
--- a/docs/examples-docs/order-goods.md
+++ b/docs/examples-docs/order-goods.md
@@ -221,6 +221,12 @@ export default {
 | is_period_buy | 是否为周期购 | `Boolean` |
 | show_delivery_time | 是否显示发货时间 | `Boolean` |
 
+### Event
+
+| 事件名       | 说明      | 参数       |
+|-----------|-----------|-----------|
+| clickEmptyButton | 点击商品为空时的按钮时触发 | - |
+
 ### Slot
 | name       | 描述      |
 |-----------|-----------|
diff --git a/packages/order-goods/Empty.vue b/packages/order-goods/Empty.vue
index 7e9779908..f997cfe1a 100644
--- a/packages/order-goods/Empty.vue
+++ b/packages/order-goods/Empty.vue
@@ -2,7 +2,7 @@
   <div class="van-order-goods-empty">
     <img :src="icon" />
     <p>{{ message }}</p>
-    <van-button @click="onClickButton">{{ buttonText }}</van-button>
+    <van-button @click="$emit('clickEmptyButton')">{{ buttonText }}</van-button>
   </div>
 </template>
 
@@ -20,12 +20,6 @@ export default {
     icon: String,
     message: String,
     buttonText: String
-  },
-
-  methods: {
-    onClickButton() {
-      history.back();
-    }
   }
 };
 </script>
diff --git a/packages/order-goods/index.vue b/packages/order-goods/index.vue
index 05dad6558..56f808ecb 100644
--- a/packages/order-goods/index.vue
+++ b/packages/order-goods/index.vue
@@ -12,6 +12,7 @@
       :icon="emptyIcon"
       :message="emptyMessage"
       :button-text="emptyButtonText"
+      @clickEmptyButton="$emit('clickEmptyButton')"
     />
     <div class="van-order-goods-list">
       <van-order-goods-card
diff --git a/test/unit/get-webpack-conf.js b/test/unit/get-webpack-conf.js
index 3861fd399..d583169ad 100644
--- a/test/unit/get-webpack-conf.js
+++ b/test/unit/get-webpack-conf.js
@@ -35,7 +35,7 @@ function getWebpackConfig(testFileName) {
     stats: 'errors-only',
     resolve: {
       modules: [path.resolve(process.cwd(), 'node_modules'), 'node_modules'],
-      extensions: ['.js', '.json', '.vue'],
+      extensions: ['.js', '.json', '.vue', '.css'],
       alias: {
         src: path.resolve(process.cwd(), 'src'),
         packages: path.resolve(process.cwd(), 'packages'),
diff --git a/test/unit/specs/order-goods.spec.js b/test/unit/specs/order-goods.spec.js
index eef2d8ca5..698c5ff5b 100644
--- a/test/unit/specs/order-goods.spec.js
+++ b/test/unit/specs/order-goods.spec.js
@@ -76,6 +76,9 @@ describe('OrderGoods', () => {
       }
     });
 
+    const submitSpyFunc = sinon.spy();
+    wrapper.vm.$on('clickEmptyButton', submitSpyFunc);
+
     wrapper.find('.van-button')[0].trigger('click');
 
     DOMChecker(wrapper, {
@@ -87,6 +90,8 @@ describe('OrderGoods', () => {
         '.van-order-goods-empty img': 'http://b.yzcdn.cn/v2/image/wap/trade/new_order/empty@2x.png'
       }
     });
+
+    expect(submitSpyFunc.calledOnce).to.be.true;
   });
 
   it('empty list config', () => {
@@ -110,7 +115,7 @@ describe('OrderGoods', () => {
     });
   });
 
-  it('edit message', () => {
+  it('edit message', (done) => {
     wrapper = mount(OrderGoods, {
       attachToDocument: true,
       propsData: {
@@ -120,16 +125,14 @@ describe('OrderGoods', () => {
     });
 
     wrapper.vm.$on('input', val => {
-      wrapper.value = val;
+      wrapper.vm.message = val;
+      expect(wrapper.vm.message).to.equal('测试留言');
+      done();
     });
 
     const textarea = wrapper.find('textarea')[0];
-    textarea.value = '测试留言';
+    textarea.element.value = '测试留言';
     textarea.trigger('input');
-
-    wrapper.vm.$nextTick(() => {
-      expect(wrapper.value).to.equal('测试留言');
-    });
   });
 
   it('message not editable', () => {
@@ -159,16 +162,10 @@ describe('OrderGoods', () => {
       }
     });
 
-    wrapper.vm.$on('input', val => {
-      wrapper.value = val;
-    });
-
-    wrapper.vm.$nextTick(() => {
-      DOMChecker(wrapper, {
-        text: {
-          '.van-order-goods-message p': '无'
-        }
-      });
+    DOMChecker(wrapper, {
+      text: {
+        '.van-order-goods-message p': ''
+      }
     });
   });
 
@@ -262,7 +259,7 @@ describe('OrderGoods', () => {
     });
   });
 
-  it('item with message', () => {
+  it('item with message', (done) => {
     wrapper = mount(OrderGoods, {
       attachToDocument: true,
       propsData: {
@@ -293,6 +290,7 @@ describe('OrderGoods', () => {
           }
         }
       });
+      done();
     }, 300);
   });
 

From 7c857d8bb2135a2b9d61f9b16d616fe8b7d47f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 31 Aug 2017 15:56:37 +0800
Subject: [PATCH 122/126] update dependencies

---
 package.json | 10 +++++-----
 yarn.lock    | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 0d3d08093..a7ea9f6c7 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
   "license": "ISC",
   "dependencies": {
     "babel-runtime": "6.x",
-    "vue-lazyload": "^1.0.6"
+    "vue-lazyload": "^1.1.2"
   },
   "peerDependencies": {
     "vue": "2.4.2"
@@ -65,7 +65,7 @@
     "cheerio": "^0.22.0",
     "codecov": "^2.2.0",
     "cross-env": "^5.0.5",
-    "css-loader": "^0.28.5",
+    "css-loader": "^0.28.7",
     "eslint-plugin-vue": "^2.1.0",
     "extract-text-webpack-plugin": "2.0.0",
     "felint": "^0.5.0-alpha.3",
@@ -81,12 +81,12 @@
     "html-webpack-plugin": "^2.29.0",
     "isparta-loader": "^2.0.0",
     "json-templater": "^1.0.4",
-    "karma": "^1.7.0",
+    "karma": "^1.7.1",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.1",
     "karma-mocha": "^1.3.0",
     "karma-phantomjs-launcher": "^1.0.4",
-    "karma-sinon-chai": "^1.2.4",
+    "karma-sinon-chai": "^1.3.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "^0.0.31",
     "karma-webpack": "^2.0.4",
@@ -117,6 +117,6 @@
     "webpack": "^3.5.5",
     "webpack-dev-server": "^2.7.1",
     "webpack-merge": "^4.1.0",
-    "zan-doc": "^0.2.9"
+    "zan-doc": "^0.2.10"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index e49b9ee00..4ce6cd205 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1823,9 +1823,9 @@ css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
-css-loader@^0.28.5:
-  version "0.28.5"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.5.tgz#dd02bb91b94545710212ef7f6aaa66663113d754"
+css-loader@^0.28.7:
+  version "0.28.7"
+  resolved "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
   dependencies:
     babel-code-frame "^6.11.0"
     css-selector-tokenizer "^0.7.0"
@@ -4255,9 +4255,9 @@ karma-phantomjs-launcher@^1.0.4:
     lodash "^4.0.1"
     phantomjs-prebuilt "^2.1.7"
 
-karma-sinon-chai@^1.2.4:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/karma-sinon-chai/-/karma-sinon-chai-1.3.1.tgz#4633419494d9e2d848787dd76053031859f5b7f5"
+karma-sinon-chai@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.npmjs.org/karma-sinon-chai/-/karma-sinon-chai-1.3.2.tgz#ea4d97b16433e64813aaddddded7f7bb4338215e"
   dependencies:
     lolex "^1.6.0"
 
@@ -4283,9 +4283,9 @@ karma-webpack@^2.0.4:
     source-map "^0.1.41"
     webpack-dev-middleware "^1.0.11"
 
-karma@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.0.tgz#6f7a1a406446fa2e187ec95398698f4cee476269"
+karma@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz#85cc08e9e0a22d7ce9cca37c4a1be824f6a2b1ae"
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -7618,9 +7618,9 @@ vue-html-loader@^1.2.4:
     loader-utils "^1.0.2"
     object-assign "^4.1.0"
 
-vue-lazyload@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.0.6.tgz#7d5494fc35c35fc84dcc271165b827e309b4e793"
+vue-lazyload@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.1.2.tgz#86e0de01edd70596abc22d1017eea2f2b28e5efd"
 
 vue-loader@^13.0.4:
   version "13.0.4"
@@ -7970,9 +7970,9 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
 
-zan-doc@^0.2.9:
-  version "0.2.9"
-  resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.9.tgz#9d8787f2a6502686f3c44dc4ced9d8ca0fbe3d4e"
+zan-doc@^0.2.10:
+  version "0.2.10"
+  resolved "https://registry.npmjs.org/zan-doc/-/zan-doc-0.2.10.tgz#eb08f72100a873dd8ae0b2eb7f7454d3ff256322"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"

From 8986da5ba66b6b3cf8aa267ae8c1b712955fafbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 31 Aug 2017 19:36:37 +0800
Subject: [PATCH 123/126] add GoodsAction component

---
 docs/examples-docs/goods-action.md       | 88 ++++++++++++++++++++++++
 docs/src/doc.config.js                   |  4 ++
 packages/goods-action-big-btn/index.vue  | 32 +++++++++
 packages/goods-action-mini-btn/index.vue | 30 ++++++++
 packages/goods-action/index.vue          | 11 +++
 packages/index.js                        |  9 +++
 packages/vant-css/src/button.css         |  1 +
 packages/vant-css/src/common/var.css     |  1 +
 packages/vant-css/src/goods-action.css   | 40 +++++++++++
 packages/vant-css/src/index.css          |  1 +
 packages/vant-css/src/invalid-goods.css  |  2 +-
 packages/vant-css/src/order-goods.css    |  2 +-
 test/unit/components/goods-action.vue    | 37 ++++++++++
 test/unit/specs/goods-action.spec.js     | 47 +++++++++++++
 14 files changed, 303 insertions(+), 2 deletions(-)
 create mode 100644 docs/examples-docs/goods-action.md
 create mode 100644 packages/goods-action-big-btn/index.vue
 create mode 100644 packages/goods-action-mini-btn/index.vue
 create mode 100644 packages/goods-action/index.vue
 create mode 100644 packages/vant-css/src/goods-action.css
 create mode 100644 test/unit/components/goods-action.vue
 create mode 100644 test/unit/specs/goods-action.spec.js

diff --git a/docs/examples-docs/goods-action.md b/docs/examples-docs/goods-action.md
new file mode 100644
index 000000000..328a48951
--- /dev/null
+++ b/docs/examples-docs/goods-action.md
@@ -0,0 +1,88 @@
+<script>
+import { Toast } from 'packages';
+
+export default {
+  methods: {
+    onClickMiniBtn() {
+      Toast('点击图标');
+    },
+    onClickBigBtn() {
+      Toast('点击按钮');
+    }
+  }
+}
+</script>
+
+<style>
+.demo-goods-action {
+  .van-goods-action {
+    position: relative;
+  }
+}
+</style>
+
+## GoodsAction 商品操作组件
+
+### 使用指南
+``` javascript
+import {
+  GoodsAction,
+  GoodsActionBigBtn,
+  GoodsActionMiniBtn
+} from 'vant';
+
+Vue.component(GoodsAction.name, GoodsAction);
+Vue.component(GoodsActionBigBtn.name, GoodsActionBigBtn);
+Vue.component(GoodsActionMiniBtn.name, GoodsActionMiniBtn);
+```
+
+### 代码演示
+
+:::demo 
+```html
+<van-goods-action>
+  <van-goods-action-mini-btn icon="chat" @click="onClickMiniBtn">
+    客服
+  </van-goods-action-mini-btn>
+  <van-goods-action-mini-btn icon="cart" @click="onClickMiniBtn">
+    购物车
+  </van-goods-action-mini-btn>
+  <van-goods-action-big-btn @click="onClickBigBtn">
+    加入购物车
+  </van-goods-action-big-btn>
+  <van-goods-action-big-btn @click="onClickBigBtn" primary>
+    立即购买
+  </van-goods-action-big-btn>
+</van-goods-action>
+```
+
+```javascript
+export default {
+  methods: {
+    onClickMiniBtn() {
+      Toast('点击图标');
+    },
+    onClickBigBtn() {
+      Toast('点击按钮');
+    }
+  }
+}
+```
+:::
+
+### API
+
+#### GoodsActionMiniBtn
+
+| 参数 | 说明 | 类型 | 默认值 | 可选值 |
+|-----------|-----------|-----------|-------------|-------------|
+| icon | 图标 | `String`  | - | Icon 组件支持的所有图标 |
+| iconClass | 图标额外类名 | `String`  | `''` | - |
+| url | 跳转链接 | `String`  | `javascript:;` | - |
+
+#### GoodsActionBigBtn
+
+| 参数 | 说明 | 类型 | 默认值 | 可选值 |
+|-----------|-----------|-----------|-------------|-------------|
+| url | 跳转链接 | `String`  | `javascript:;` | - |
+| primary | 是否主行动按钮，主行动按钮默认为红色 | `Boolean` | `false` | - |
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 53912fd7d..d73a34ac3 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -189,6 +189,10 @@ module.exports = {
                 "path": "/express-way",
                 "title": "ExpressWay 配送方式"
               },
+              {
+                "path": "/goods-action",
+                "title": "GoodsAction 商品操作"
+              },
               {
                 "path": "/invalid-goods",
                 "title": "InvalidGoods 不可用商品列表"
diff --git a/packages/goods-action-big-btn/index.vue b/packages/goods-action-big-btn/index.vue
new file mode 100644
index 000000000..58bf06b07
--- /dev/null
+++ b/packages/goods-action-big-btn/index.vue
@@ -0,0 +1,32 @@
+<template>
+  <van-button
+    tag="a"
+    :href="url"
+    class="van-goods-action__big-btn"
+    :type="primary ? 'primary' : 'default'"
+    @click="$emit('click', $event)"
+    bottomAction
+  >
+    <slot></slot>
+  </van-button>
+</template>
+
+<script>
+import Button from '../button';
+
+export default {
+  name: 'van-goods-action-big-btn',
+
+  components: {
+    [Button.name]: Button
+  },
+
+  props: {
+    primary: Boolean,
+    url: {
+      type: String,
+      default: 'javascript:;'
+    }
+  }
+};
+</script>
diff --git a/packages/goods-action-mini-btn/index.vue b/packages/goods-action-mini-btn/index.vue
new file mode 100644
index 000000000..4f91fd443
--- /dev/null
+++ b/packages/goods-action-mini-btn/index.vue
@@ -0,0 +1,30 @@
+<template>
+  <a :href="url" class="van-goods-action__mini-btn" @click="$emit('click', $event);">
+    <van-icon :class="['van-goods-action__mini-btn-icon', iconClass]" :name="icon" />
+    <slot></slot>
+  </a>
+</template>
+
+<script>
+import Icon from '../icon';
+
+export default {
+  name: 'van-goods-action-mini-btn',
+
+  components: {
+    [Icon.name]: Icon
+  },
+
+  props: {
+    icon: String,
+    iconClass: {
+      type: String,
+      default: ''
+    },
+    url: {
+      type: String,
+      default: 'javascript:;'
+    }
+  }
+};
+</script>
diff --git a/packages/goods-action/index.vue b/packages/goods-action/index.vue
new file mode 100644
index 000000000..8ab06d10a
--- /dev/null
+++ b/packages/goods-action/index.vue
@@ -0,0 +1,11 @@
+<template>
+  <div class="van-goods-action">
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'van-goods-action'
+};
+</script>
diff --git a/packages/index.js b/packages/index.js
index bd8f2a69a..56cff9ada 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -13,6 +13,9 @@ import DatetimePicker from './datetime-picker';
 import Dialog from './dialog';
 import ExpressWay from './express-way';
 import Field from './field';
+import GoodsAction from './goods-action';
+import GoodsActionBigBtn from './goods-action-big-btn';
+import GoodsActionMiniBtn from './goods-action-mini-btn';
 import Icon from './icon';
 import ImagePreview from './image-preview';
 import InvalidGoods from './invalid-goods';
@@ -59,6 +62,9 @@ const components = [
   DatetimePicker,
   ExpressWay,
   Field,
+  GoodsAction,
+  GoodsActionBigBtn,
+  GoodsActionMiniBtn,
   Icon,
   InvalidGoods,
   Loading,
@@ -117,6 +123,9 @@ export {
   Dialog,
   ExpressWay,
   Field,
+  GoodsAction,
+  GoodsActionBigBtn,
+  GoodsActionMiniBtn,
   Icon,
   ImagePreview,
   InvalidGoods,
diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css
index a3fd5f146..81ce54d89 100644
--- a/packages/vant-css/src/button.css
+++ b/packages/vant-css/src/button.css
@@ -103,6 +103,7 @@
     line-height: 50px;
     border: 0;
     border-radius: 0;
+    font-size: 16px;
     color: $bottom-action-button-default-color;
     background-color: $bottom-action-button-default-background-color;
 
diff --git a/packages/vant-css/src/common/var.css b/packages/vant-css/src/common/var.css
index 2edb3809e..61de30818 100644
--- a/packages/vant-css/src/common/var.css
+++ b/packages/vant-css/src/common/var.css
@@ -13,6 +13,7 @@ $c-yellow-light: #fcff00;
 $c-orange: #f60;
 $c-orange-dark: #f15a0c;
 $c-blue: #38f;
+$c-active: #e8e8e8;
 
 $c-background: #f8f8f8;
 
diff --git a/packages/vant-css/src/goods-action.css b/packages/vant-css/src/goods-action.css
new file mode 100644
index 000000000..ca163bbdd
--- /dev/null
+++ b/packages/vant-css/src/goods-action.css
@@ -0,0 +1,40 @@
+@import './common/var.css';
+
+.van-goods-action {
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  position: fixed;
+
+  &__mini-btn {
+    color: #666;
+    display: flex;
+    height: 50px;
+    font-size: 10px;
+    min-width: 15%;
+    text-align: center;
+    background-color: #fff;
+    flex-direction: column;
+    justify-content: center;
+
+    &::after {
+      @mixin border-retina (top, right), #cacaca;
+    }
+
+    &:last-child {
+      &::after {
+        border-right-width: 0;
+      }
+    }
+
+    &:active {
+      background-color: $c-active;
+    }
+  }
+
+  &__mini-btn-icon {
+    font-size: 20px;
+    margin-bottom: 5px;
+  }
+}
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index 8731cbdb4..68b67d59c 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -36,3 +36,4 @@
 @import './pay-order.css';
 @import './order-goods.css';
 @import './invalid-goods.css';
+@import './goods-action.css';
diff --git a/packages/vant-css/src/invalid-goods.css b/packages/vant-css/src/invalid-goods.css
index 43c0480ce..83317b9d3 100644
--- a/packages/vant-css/src/invalid-goods.css
+++ b/packages/vant-css/src/invalid-goods.css
@@ -1,4 +1,4 @@
-@import "./mixins/ellipsis";
+@import "./mixins/ellipsis.css";
 
 $van-invalid-goods-photo-size: 90px;
 
diff --git a/packages/vant-css/src/order-goods.css b/packages/vant-css/src/order-goods.css
index fe80bfb3f..b40500e16 100644
--- a/packages/vant-css/src/order-goods.css
+++ b/packages/vant-css/src/order-goods.css
@@ -1,4 +1,4 @@
-@import "./mixins/border_retina";
+@import "./mixins/border_retina.css";
 
 .van-order-goods {
   background-color: #fff;
diff --git a/test/unit/components/goods-action.vue b/test/unit/components/goods-action.vue
new file mode 100644
index 000000000..bf867989c
--- /dev/null
+++ b/test/unit/components/goods-action.vue
@@ -0,0 +1,37 @@
+<template>
+  <van-goods-action>
+    <van-goods-action-mini-btn icon="chat" @click="onClickMiniBtn">
+      客服
+    </van-goods-action-mini-btn>
+    <van-goods-action-mini-btn icon="cart" url="http://www.youzan.com" @click="onClickMiniBtn">
+      购物车
+    </van-goods-action-mini-btn>
+    <van-goods-action-big-btn @click="onClickBigBtn">
+      加入购物车
+    </van-goods-action-big-btn>
+    <van-goods-action-big-btn @click="onClickBigBtn" primary url="http://www.youzan.com">
+      立即购买
+    </van-goods-action-big-btn>
+  </van-goods-action>
+</template>
+
+<script>
+import GoodsAction from 'packages/goods-action';
+import GoodsActionBigBtn from 'packages/goods-action-big-btn';
+import GoodsActionMiniBtn from 'packages/goods-action-mini-btn';
+
+export default {
+  components: {
+    [GoodsAction.name]: GoodsAction,
+    [GoodsActionBigBtn.name]: GoodsActionBigBtn,
+    [GoodsActionMiniBtn.name]: GoodsActionMiniBtn
+  },
+
+  methods: {
+    onClickMiniBtn() {
+    },
+    onClickBigBtn() {
+    }
+  }
+};
+</script>
diff --git a/test/unit/specs/goods-action.spec.js b/test/unit/specs/goods-action.spec.js
new file mode 100644
index 000000000..e86b69a08
--- /dev/null
+++ b/test/unit/specs/goods-action.spec.js
@@ -0,0 +1,47 @@
+import GoodsAction from '../components/goods-action';
+import GoodsActionBigBtn from 'packages/goods-action-big-btn';
+import GoodsActionMiniBtn from 'packages/goods-action-mini-btn';
+import { mount } from 'avoriaz';
+import { DOMChecker } from '../utils';
+
+describe('GoodsAction', () => {
+  let wrapper;
+
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('create a GoodsAction', () => {
+    wrapper = mount(GoodsAction, {});
+
+    DOMChecker(wrapper, {
+      count: {
+        '.van-goods-action__mini-btn': 2,
+        '.van-goods-action__big-btn': 2,
+        '.van-icon-chat': 1
+      }
+    });
+  });
+
+  it('click GoodsActionBigBtn', () => {
+    wrapper = mount(GoodsActionBigBtn, {});
+
+    const submitSpyFunc = sinon.spy();
+    wrapper.vm.$on('click', submitSpyFunc);
+    wrapper.trigger('click');
+    expect(submitSpyFunc.calledOnce).to.be.true;
+  });
+
+  it('click GoodsActionMiniBtn', () => {
+    wrapper = mount(GoodsActionMiniBtn, {
+      propsData: {
+        icon: 'card'
+      }
+    });
+
+    const submitSpyFunc = sinon.spy();
+    wrapper.vm.$on('click', submitSpyFunc);
+    wrapper.trigger('click');
+    expect(submitSpyFunc.calledOnce).to.be.true;
+  });
+});

From 9aef940581c024d842f71638248406191da648d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 31 Aug 2017 19:51:04 +0800
Subject: [PATCH 124/126] GoodsAction: big btn flex

---
 packages/vant-css/src/goods-action.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/vant-css/src/goods-action.css b/packages/vant-css/src/goods-action.css
index ca163bbdd..b473839cc 100644
--- a/packages/vant-css/src/goods-action.css
+++ b/packages/vant-css/src/goods-action.css
@@ -7,6 +7,10 @@
   display: flex;
   position: fixed;
 
+  &__big-btn {
+    flex: 1;
+  }
+
   &__mini-btn {
     color: #666;
     display: flex;

From b2ad5b97a237f1bc7617caea7bc70ce915ad1a84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@meituan.com>
Date: Thu, 31 Aug 2017 19:55:37 +0800
Subject: [PATCH 125/126] GoodsAction: fix mini btn border

---
 packages/vant-css/src/goods-action.css | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/vant-css/src/goods-action.css b/packages/vant-css/src/goods-action.css
index b473839cc..d09bb81a3 100644
--- a/packages/vant-css/src/goods-action.css
+++ b/packages/vant-css/src/goods-action.css
@@ -17,18 +17,19 @@
     height: 50px;
     font-size: 10px;
     min-width: 15%;
+    position: relative;
     text-align: center;
     background-color: #fff;
     flex-direction: column;
     justify-content: center;
 
     &::after {
-      @mixin border-retina (top, right), #cacaca;
+      @mixin border-retina (top, left), #cacaca;
     }
 
-    &:last-child {
+    &:first-child {
       &::after {
-        border-right-width: 0;
+        border-left-width: 0;
       }
     }
 

From 1418117681b3fa32c29a191250c77f65ddc6fb7a Mon Sep 17 00:00:00 2001
From: WyTiny <Tinysymphony@users.noreply.github.com>
Date: Fri, 1 Sep 2017 10:15:53 +0800
Subject: [PATCH 126/126] Add deep-select component and fix a popup bug. (#103)

* feat: new deep select

* fix: add deep-select test

* fix: import

* fix: icon import
---
 build/bin/init.js                      |   1 -
 build/webpack.config.dev.js            |   3 +-
 docs/examples-docs/deep-select.md      | 169 +++++++++++++++++++++++++
 docs/src/doc.config.js                 |   4 +
 packages/deep-select/index.vue         |  85 +++++++++++++
 packages/index.js                      |   3 +
 packages/mixins/popup/popup-context.js |  22 ++--
 packages/vant-css/src/deep-select.css  |  51 ++++++++
 packages/vant-css/src/index.css        |   1 +
 test/unit/specs/deep-select.spec.js    |  68 ++++++++++
 10 files changed, 392 insertions(+), 15 deletions(-)
 create mode 100644 docs/examples-docs/deep-select.md
 create mode 100644 packages/deep-select/index.vue
 create mode 100644 packages/vant-css/src/deep-select.css
 create mode 100644 test/unit/specs/deep-select.spec.js

diff --git a/build/bin/init.js b/build/bin/init.js
index 799258e11..1cc94dc86 100644
--- a/build/bin/init.js
+++ b/build/bin/init.js
@@ -29,4 +29,3 @@ gulp.task('copy', function(callback) {
 });
 
 runSequence('copy');
-
diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js
index f4657d327..e38ba86e3 100644
--- a/build/webpack.config.dev.js
+++ b/build/webpack.config.dev.js
@@ -34,6 +34,7 @@ module.exports = {
     chunkFilename: 'async.[name].js'
   },
   devServer: {
+    host: '0.0.0.0',
     historyApiFallback: {
       rewrites: [
         { from: /^\/zanui\/vue\/examples/, to: '/examples.html' },
@@ -114,7 +115,7 @@ module.exports = {
                 },
 
                 render: function(tokens, idx) {
-                    return tokens[idx].nesting === 1 
+                    return tokens[idx].nesting === 1
                       ? `<demo-block class="demo-box"><div class="highlight" slot="highlight"å>`
                       :`</div></demo-block>\n`;
                 }
diff --git a/docs/examples-docs/deep-select.md b/docs/examples-docs/deep-select.md
new file mode 100644
index 000000000..846fdd9c5
--- /dev/null
+++ b/docs/examples-docs/deep-select.md
@@ -0,0 +1,169 @@
+<script>
+
+export default {
+  data() {
+    return {
+      items: [{
+        text: '所有城市',
+        children: [{
+          text: '杭州',
+          id: 1001
+        }, {
+          text: '温州',
+          id: 1002
+        }, {
+          text: '海南',
+          id: 1100
+        }, {
+          text: '宁波',
+          id: 1003
+        }, {
+          text: '义乌',
+          id: 1004
+        }, {
+          text: '无锡',
+          id: 1011
+        }, {
+          text: '常州',
+          id: 1012
+        }, {
+          text: '大连',
+          id: 1031
+        }, {
+          text: '诸暨',
+          id: 1005
+        }]
+      }, {
+        text: '浙江',
+        children: [{
+          text: '杭州',
+          id: 1001
+        }, {
+          text: '温州',
+          id: 1002
+        }, {
+          text: '宁波',
+          id: 1003
+        }, {
+          text: '义乌',
+          id: 1004
+        }]
+      }, {
+        text: '江苏',
+        children: [{
+          text: '无锡',
+          id: 1011
+        }, {
+          text: '常州',
+          id: 1012
+        }]
+      }],
+      mainActiveIndex: 0,
+      activeId: 1001
+    };
+  },
+  methods: {
+    onNavClick(index) {
+      this.mainActiveIndex = index;
+    },
+    onItemClick(data) {
+      console.log(data);
+      this.activeId = data.id;
+    }
+  }
+}
+</script>
+
+## DeepSelect 分类选择组件
+
+### 使用指南
+``` javascript
+import { DeepSelect } from 'vant';
+
+Vue.component(DeepSelect.name, DeepSelect);
+```
+
+### 代码演示
+
+#### 基础用法
+
+:::demo 基础用法
+```html
+<van-deep-select
+  :items="items"
+  :main-active-index="mainActiveIndex"
+  :active-id="activeId"
+  @navclick="onNavClick"
+  @itemclick="onItemClick"
+></van-deep-select>
+```
+
+```javascript
+export default {
+  data() {
+    return {
+      items: items,
+      // 左侧高亮元素的index
+      mainActiveIndex: 0,
+      // 被选中元素的id
+      activeId: 1001
+    };
+  },
+  methods: {
+    onNavClick(index) {
+      this.mainActiveIndex = index;
+    },
+    onItemClick(data) {
+      console.log(data);
+      this.activeId = data.id;
+    }
+  }
+}
+</script>
+```
+:::
+
+### API
+
+#### 传入参数
+
+| 参数       | 说明      | 类型       | 默认值       | 必须      |
+|-----------|-----------|-----------|-------------|-------------|
+| items | 分类显示所需的数据，具体数据结构可看 数据结构 |  Array | [] |  |
+| mainActiveIndex | 左侧导航高亮的索引 |  Number | 0 |  |
+| activeId | 右侧选择项，高亮的数据id |  Number | 0 |  |
+
+#### 事件
+| 事件名       | 说明      | 参数      |
+|-----------|-----------|-----------|
+| navclick | 左侧导航点击时，触发的事件 |  index：被点击的导航的索引 |
+| itemclick | 右侧选择项被点击时，会触发的事件 | data: 该点击项的数据 |
+
+### 数据格式
+#### items 分类显示所需数据的数据结构
+`items` 整体为一个数组，数组内包含一系列描述分类的 object。
+
+每个分类里，text表示当前分类的名称。children 表示分类里的可选项，为数组结构，id被用来唯一标识每个选项
+```javascript
+[
+  {
+    // 导航名称
+    text: '所有城市',
+    // 该导航下所有的可选项
+    children: [
+      {
+        // 可选项的名称
+        text: '温州',
+        // 可选项的id，高亮的时候是根据id是否和选中的id是否相同进行判断的
+        id: 1002
+      },
+      {
+        // 可选项的名称
+        text: '杭州',
+        // 可选项的id，高亮的时候是根据id是否和选中的id是否相同进行判断的
+        id: 1001
+      }
+    ]
+  }
+]
+```
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 53912fd7d..d4cba5b4a 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -185,6 +185,10 @@ module.exports = {
           {
             "groupName": "业务组件",
             "list": [
+              {
+                "path": "/deep-select",
+                "title": "DeepSelect 分类选择组件"
+              },
               {
                 "path": "/express-way",
                 "title": "ExpressWay 配送方式"
diff --git a/packages/deep-select/index.vue b/packages/deep-select/index.vue
new file mode 100644
index 000000000..410b6ae86
--- /dev/null
+++ b/packages/deep-select/index.vue
@@ -0,0 +1,85 @@
+<template>
+  <div class="van-deep-select" v-bind:style="{ height: mainHeight + 'px' }">
+    <div class="van-deep-select__nav">
+      <div
+        v-for="(item, index) in items"
+        class="van-deep-select__nitem"
+        v-bind:class="{ 'van-deep-select__nitem--active': mainActiveIndex === index }"
+        @click="onNavClick(index)">
+        {{ item.text }}
+      </div>
+    </div>
+    <div class="van-deep-select__content" v-bind:style="{ height: itemHeight + 'px' }">
+      <div
+        v-for="item in subItems"
+        :key="item.id"
+        class="van-deep-select__item"
+        v-bind:class="{ 'van-deep-select__item--active': activeId === item.id }"
+        @click="onItemSelect(item)">
+        {{ item.text }}
+        <van-icon
+          v-if="activeId === item.id"
+          name="success"
+          class="van-deep-select__selected"
+        ></van-icon>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Icon from 'packages/icon';
+
+export default {
+  name: 'van-deep-select',
+
+  components: {
+    'van-icon': Icon
+  },
+
+  props: {
+    items: {
+      type: Array,
+      default () {
+        return [];
+      }
+    },
+    mainActiveIndex: {
+      type: Number,
+      default: 0
+    },
+    activeId: {
+      type: Number,
+      default: 0
+    },
+    maxHeight: {
+      type: Number,
+      default: 300
+    }
+  },
+
+  computed: {
+    subItems() {
+      const selectedItem = this.items[this.mainActiveIndex] || {};
+      return selectedItem.children || [];
+    },
+    mainHeight() {
+      const maxHeight = Math.max(this.items.length * 44, this.subItems.length * 44);
+      return Math.min(maxHeight, this.maxHeight);
+    },
+    itemHeight() {
+      return Math.min(this.subItems.length * 44, this.maxHeight);
+    }
+  },
+
+  methods: {
+    onNavClick(index) {
+      this.$emit('navclick', index);
+    },
+    onItemSelect(data) {
+      const exportData = Object.assign({}, data);
+      this.$emit('itemclick', exportData);
+    }
+  }
+};
+</script>
diff --git a/packages/index.js b/packages/index.js
index bd8f2a69a..ac61d310f 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -10,6 +10,7 @@ import Checkbox from './checkbox';
 import CheckboxGroup from './checkbox-group';
 import Col from './col';
 import DatetimePicker from './datetime-picker';
+import DeepSelect from './deep-select';
 import Dialog from './dialog';
 import ExpressWay from './express-way';
 import Field from './field';
@@ -57,6 +58,7 @@ const components = [
   CheckboxGroup,
   Col,
   DatetimePicker,
+  DeepSelect,
   ExpressWay,
   Field,
   Icon,
@@ -114,6 +116,7 @@ export {
   CheckboxGroup,
   Col,
   DatetimePicker,
+  DeepSelect,
   Dialog,
   ExpressWay,
   Field,
diff --git a/packages/mixins/popup/popup-context.js b/packages/mixins/popup/popup-context.js
index 45cbae621..0e0588b7b 100644
--- a/packages/mixins/popup/popup-context.js
+++ b/packages/mixins/popup/popup-context.js
@@ -1,12 +1,7 @@
 import Vue from 'vue';
 
-let context;
 const _global = Vue.prototype.$isServer ? global : window;
 
-if (_global && _global.popupContext) {
-  context = _global.popupContext;
-}
-
 const DEFAULT_CONTEXT = {
   idSeed: 1,
   zIndex: 2000,
@@ -15,23 +10,24 @@ const DEFAULT_CONTEXT = {
   modalStack: []
 };
 
-context = _global.popupContext = {
-  ...DEFAULT_CONTEXT,
-  ...context
-};
+if (!_global.popupContext) {
+  _global.popupContext = {
+    ...DEFAULT_CONTEXT
+  };
+}
 
 const PopupContext = {
   getContext(key) {
-    return context[key];
+    return _global.popupContext[key];
   },
 
   setContext(key, value) {
-    context[key] = value;
+    _global.popupContext[key] = value;
   },
 
   plusKeyByOne(key) {
-    const oldVal = +context[key];
-    context[key] = oldVal + 1;
+    const oldVal = +_global.popupContext[key];
+    _global.popupContext[key] = oldVal + 1;
 
     return oldVal;
   }
diff --git a/packages/vant-css/src/deep-select.css b/packages/vant-css/src/deep-select.css
new file mode 100644
index 000000000..e36ce7c71
--- /dev/null
+++ b/packages/vant-css/src/deep-select.css
@@ -0,0 +1,51 @@
+@import "./mixins/ellipsis";
+@import "./mixins/clearfix";
+@import './common/var.css';
+.van-deep-select {
+  user-select: none;
+  position: relative;
+  @mixin clearfix;
+  &__nav {
+    width: 143px;
+    /*float: left;*/
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    overflow: scroll;
+    background-color: $c-white;
+    -webkit-overflow-scrolling: touch;
+  }
+  &__nitem {
+    line-height: 44px;
+    padding: 0 15px;
+    background-color: $c-white;
+    @mixin multi-ellipsis 1;
+    &--active {
+      background-color: $c-background;
+    }
+  }
+  &__content {
+    padding: 0 15px;
+    margin-left: 143px;
+    overflow: scroll;
+    -webkit-overflow-scrolling: touch;
+  }
+  &__item {
+    position: relative;
+    line-height: 44px;
+    padding-left: 5px;
+    padding-right: 18px;
+    @mixin multi-ellipsis 1;
+    &--active {
+      color: $button-danger-background-color;
+    }
+  }
+  &__selected {
+    float: right;
+    position: absolute;
+    right: 0px;
+    top: 0;
+    bottom: 0;
+  }
+}
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index 8731cbdb4..45c3ed50b 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -6,6 +6,7 @@
 @import './cell.css';
 @import './cell-swipe.css';
 @import './card.css';
+@import './deep-select.css';
 @import './dialog.css';
 @import './field.css';
 @import './icon.css';
diff --git a/test/unit/specs/deep-select.spec.js b/test/unit/specs/deep-select.spec.js
new file mode 100644
index 000000000..2fa1a85b9
--- /dev/null
+++ b/test/unit/specs/deep-select.spec.js
@@ -0,0 +1,68 @@
+import DeepSelect from 'packages/deep-select';
+import { mount } from 'avoriaz';
+
+describe('DeepSelect', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('create an empty deep-select', () => {
+    wrapper = mount(DeepSelect);
+    expect(wrapper.hasStyle('height', '0px')).to.be.true;
+  });
+
+  it('create a deep-select correctly', () => {
+    wrapper = mount(DeepSelect, {
+      propsData: {
+        items: [{
+          text: 'A',
+          children: [{
+            text: 'Cc',
+            id: 123
+          }]
+        }],
+        maxHeight: 200
+      }
+    });
+    expect(wrapper.hasClass('van-deep-select')).to.be.true;
+    expect(wrapper.hasStyle('height', '44px')).to.be.true;
+    expect(wrapper.propsData().maxHeight).to.equal(200);
+  });
+
+  it('interact with this component', () => {
+    wrapper = mount(DeepSelect, {
+      propsData: {
+        items: [{
+          text: 'A',
+          children: [{
+            text: 'Cc',
+            id: 123
+          }, {
+            text: 'Bb',
+            id: 234
+          }]
+        }, {
+          text: 'B',
+          children: [{
+            text: 'Nmi',
+            id: 345
+          }]
+        }],
+        maxHeight: 220
+      }
+    });
+    wrapper.vm.$on('navclick', index => {
+      wrapper.vm.mainActiveIndex = index;
+    });
+    wrapper.vm.$on('itemclick', item => {
+      wrapper.vm.activeId = item.id;
+    });
+    const secondNav = wrapper.find('.van-deep-select__nitem')[1];
+    secondNav.trigger('click');
+    expect(wrapper.vm.mainActiveIndex).to.equal(1);
+    const target = wrapper.find('.van-deep-select__item')[0];
+    target.trigger('click');
+    expect(wrapper.vm.activeId).to.equal(345);
+  });
+});