From 0160ae2240a6e98e23abc5acc0042225e7a3a2ee Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 9 Mar 2018 16:21:47 +0800
Subject: [PATCH 01/48] [bugfix] Area: should reset index when area list
 changed (#678)

---
 packages/area/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/area/index.vue b/packages/area/index.vue
index 1a0f8983b..4e95ce41c 100644
--- a/packages/area/index.vue
+++ b/packages/area/index.vue
@@ -82,6 +82,10 @@ export default create({
   watch: {
     value() {
       this.setIndex();
+    },
+
+    areaList() {
+      this.setIndex();
     }
   },
 

From 6626fd91a2d6c8725457b494afa88a72a03fcf8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Fri, 9 Mar 2018 16:22:58 +0800
Subject: [PATCH 02/48] [build] 0.12.14

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

diff --git a/packages/index.js b/packages/index.js
index c2d4ae85d..f6be54972 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -63,7 +63,7 @@ import TreeSelect from './tree-select';
 import Uploader from './uploader';
 import Waterfall from './waterfall';
 
-const version = '0.12.13';
+const version = '0.12.14';
 const components = [
   Actionsheet,
   AddressEdit,
diff --git a/packages/vant-css/package-lock.json b/packages/vant-css/package-lock.json
index 4cc1940bf..867f3e214 100644
--- a/packages/vant-css/package-lock.json
+++ b/packages/vant-css/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.12.13",
+  "version": "0.12.14",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index 3244bd2b8..56a895d36 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.12.13",
+  "version": "0.12.14",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

From 2d441c5e86b8d4eb0c1489eee6425dd28e188e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Fri, 9 Mar 2018 16:22:58 +0800
Subject: [PATCH 03/48] [release] 0.12.14

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

diff --git a/package.json b/package.json
index a7c62b6ec..9d33e151e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.12.13",
+  "version": "0.12.14",
   "description": "A Vue.js 2.0 Mobile UI at YouZan",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From 0b7468f596bb3dfdfcfe81fca4343db00d55bb73 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 12 Mar 2018 17:19:24 +0800
Subject: [PATCH 04/48] [bugfix] AddressEdit: area code observer (#680)

---
 packages/address-edit/index.vue | 58 +++++++++++++++++++-------
 test/specs/address-edit.spec.js | 74 +++++++++++++++++++++++----------
 2 files changed, 96 insertions(+), 36 deletions(-)

diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue
index 56d9de8a2..7aabac8a0 100644
--- a/packages/address-edit/index.vue
+++ b/packages/address-edit/index.vue
@@ -17,7 +17,12 @@
         :error="errorInfo.tel"
         @focus="onFocus('tel')"
       />
-      <cell class="van-address-edit__area" :title="$t('areaTitle')" @click="showAreaSelect = true">
+      <cell
+        clickable
+        class="van-address-edit__area"
+        :title="$t('areaTitle')"
+        @click="showAreaSelect = true"
+      >
         <span>{{ currentInfo.province || $t('placeholder.province') }}</span>
         <span>{{ currentInfo.city || $t('placeholder.city') }}</span>
         <span>{{ currentInfo.county || $t('placeholder.county') }}</span>
@@ -63,6 +68,7 @@
     <popup v-model="showAreaSelect" position="bottom">
       <van-area
         ref="area"
+        :loading="!areaListLoaded"
         :value="currentInfo.area_code"
         :area-list="areaList"
         @confirm="onAreaConfirm"
@@ -74,7 +80,7 @@
 
 <script>
 /* eslint-disable camelcase */
-import { create } from '../utils';
+import { create, isObj } from '../utils';
 import Field from '../field';
 import Cell from '../cell';
 import CellGroup from '../cell-group';
@@ -87,6 +93,18 @@ import AddressEditDetail from './Detail';
 import SwitchCell from '../switch-cell';
 import validateMobile from '../utils/validate/mobile';
 
+const defaultAddress = {
+  name: '',
+  tel: '',
+  province: '',
+  city: '',
+  county: '',
+  area_code: '',
+  postal_code: '',
+  address_detail: '',
+  is_default: false
+};
+
 export default create({
   name: 'van-address-edit',
 
@@ -111,17 +129,7 @@ export default create({
     addressText: String,
     addressInfo: {
       type: Object,
-      default: () => ({
-        name: '',
-        tel: '',
-        province: '',
-        city: '',
-        county: '',
-        area_code: '',
-        postal_code: '',
-        address_detail: '',
-        is_default: false
-      })
+      default: () => ({ ...defaultAddress })
     },
     searchResult: {
       type: Array,
@@ -136,7 +144,10 @@ export default create({
   data() {
     return {
       showAreaSelect: false,
-      currentInfo: this.addressInfo,
+      currentInfo: {
+        ...defaultAddress,
+        ...this.addressInfo
+      },
       isEdit: !!this.addressInfo.id,
       detailFocused: false,
       errorInfo: {
@@ -151,10 +162,23 @@ export default create({
   watch: {
     addressInfo: {
       handler(val) {
-        this.currentInfo = val;
+        this.currentInfo = {
+          ...defaultAddress,
+          ...val
+        };
         this.isEdit = !!val.id;
+
+        if (val.area_code) {
+          this.setAreaCode(val.area_code);
+        }
       },
       deep: true
+    },
+
+    areaList() {
+      if (this.currentInfo.area_code) {
+        this.setAreaCode(this.currentInfo.area_code);
+      }
     }
   },
 
@@ -166,6 +190,10 @@ export default create({
 
     computedAddressText() {
       return this.addressText || this.$t('addressText');
+    },
+
+    areaListLoaded() {
+      return isObj(this.areaList) && Object.keys(this.areaList).length;
     }
   },
 
diff --git a/test/specs/address-edit.spec.js b/test/specs/address-edit.spec.js
index e65ecbb74..fff7fdd1f 100644
--- a/test/specs/address-edit.spec.js
+++ b/test/specs/address-edit.spec.js
@@ -99,42 +99,42 @@ describe('AddressEdit', () => {
     const saveButton = wrapper.find('.van-button')[0];
 
     // name empty
-    wrapper.vm.addressInfo.name = '';
+    wrapper.vm.currentInfo.name = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['name']).to.be.true;
     wrapper.find('.van-field__control')[0].trigger('focus');
     expect(wrapper.vm.errorInfo['name']).to.be.false;
 
     // name too long
-    wrapper.vm.addressInfo.name = '111111111111111111111111111';
+    wrapper.vm.currentInfo.name = '111111111111111111111111111';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['name']).to.be.true;
     wrapper.find('.van-field__control')[0].trigger('focus');
     expect(wrapper.vm.errorInfo['name']).to.be.false;
 
     // tel empty
-    wrapper.vm.addressInfo.name = '123';
-    wrapper.vm.addressInfo.tel = '';
+    wrapper.vm.currentInfo.name = '123';
+    wrapper.vm.currentInfo.tel = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['tel']).to.be.true;
     wrapper.find('.van-field__control')[1].trigger('focus');
     expect(wrapper.vm.errorInfo['tel']).to.be.false;
 
     // area_code empty
-    wrapper.vm.addressInfo.tel = '13000000000';
-    wrapper.vm.addressInfo.area_code = '';
+    wrapper.vm.currentInfo.tel = '13000000000';
+    wrapper.vm.currentInfo.area_code = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['area_code']).to.be.true;
 
     // area_code invalid
-    wrapper.vm.addressInfo.tel = '13000000000';
-    wrapper.vm.addressInfo.area_code = '-1';
+    wrapper.vm.currentInfo.tel = '13000000000';
+    wrapper.vm.currentInfo.area_code = '-1';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['area_code']).to.be.true;
 
     // address_detail empty
-    wrapper.vm.addressInfo.area_code = '100000';
-    wrapper.vm.addressInfo.address_detail = '';
+    wrapper.vm.currentInfo.area_code = '100000';
+    wrapper.vm.currentInfo.address_detail = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['address_detail']).to.be.true;
     wrapper.find('.van-field__control')[2].trigger('focus');
@@ -145,26 +145,26 @@ describe('AddressEdit', () => {
     for (let i = 0; i < 300; i++) {
       longAddress += '1';
     }
-    wrapper.vm.addressInfo.address_detail = longAddress;
+    wrapper.vm.currentInfo.address_detail = longAddress;
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['address_detail']).to.be.true;
     wrapper.find('.van-field__control')[2].trigger('focus');
     expect(wrapper.vm.errorInfo['address_detail']).to.be.false;
 
     // postal_code invalid
-    wrapper.vm.addressInfo.address_detail = '123';
-    wrapper.vm.addressInfo.postal_code = '123';
+    wrapper.vm.currentInfo.address_detail = '123';
+    wrapper.vm.currentInfo.postal_code = '123';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['postal_code']).to.be.true;
     wrapper.find('.van-field__control')[3].trigger('focus');
     expect(wrapper.vm.errorInfo['postal_code']).to.be.false;
 
     // valid result
-    wrapper.vm.addressInfo.postal_code = '123456';
+    wrapper.vm.currentInfo.postal_code = '123456';
     saveButton.trigger('click');
 
     // not show postal_code
-    wrapper.vm.addressInfo.postal_code = '156';
+    wrapper.vm.currentInfo.postal_code = '156';
     wrapper.vm.showPostal = false;
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['postal_code']).to.be.false;
@@ -235,17 +235,17 @@ describe('AddressEdit', () => {
     wrapper.vm.onAreaConfirm([{ code: -1 }]);
     wrapper.vm.onAreaConfirm([{ code: 1 }, { code: -1 }]);
     wrapper.vm.onAreaConfirm([{ code: 1 }, { code: 1 }, { code: -1 }]);
-    expect(wrapper.vm.addressInfo['area_code']).to.equal(undefined);
+    expect(wrapper.vm.currentInfo['area_code']).to.equal('');
 
     wrapper.vm.onAreaConfirm([
       { name: '浙江省' },
       { name: '杭州市' },
       { name: '西湖区', code: '123456' }
     ]);
-    expect(wrapper.vm.addressInfo['province']).to.equal('浙江省');
-    expect(wrapper.vm.addressInfo['city']).to.equal('杭州市');
-    expect(wrapper.vm.addressInfo['county']).to.equal('西湖区');
-    expect(wrapper.vm.addressInfo['area_code']).to.equal('123456');
+    expect(wrapper.vm.currentInfo['province']).to.equal('浙江省');
+    expect(wrapper.vm.currentInfo['city']).to.equal('杭州市');
+    expect(wrapper.vm.currentInfo['county']).to.equal('西湖区');
+    expect(wrapper.vm.currentInfo['area_code']).to.equal('123456');
   });
 
   it('delete address', done => {
@@ -308,7 +308,7 @@ describe('AddressEdit', () => {
     wrapper.vm.$nextTick(() => {
       wrapper.find('.van-field__icon')[0].trigger('touchstart');
       wrapper.vm.$nextTick(() => {
-        expect(wrapper.vm.addressInfo.address_detail).to.equal('');
+        expect(wrapper.vm.currentInfo.address_detail).to.equal('');
         done();
       });
     });
@@ -388,4 +388,36 @@ describe('AddressEdit', () => {
       done();
     }, 50);
   });
+
+  it('watch area code', done => {
+    wrapper = mount(AddressEdit, {
+      propsData: {
+        areaList: {},
+        addressInfo: {
+          area_code: '330304'
+        }
+      }
+    });
+
+    expect(wrapper.vm.currentInfo.city).to.equal('');
+    wrapper.vm.areaList = areaList;
+
+    setTimeout(() => {
+      expect(wrapper.vm.currentInfo.city).to.equal('温州市');
+
+      wrapper.vm.addressInfo = { area_code: '' };
+      wrapper.vm.areaList = {};
+
+      setTimeout(() => {
+        expect(wrapper.vm.currentInfo.city).to.equal('');
+        wrapper.vm.areaList = areaList;
+        wrapper.vm.addressInfo = { area_code: '330304' };
+
+        setTimeout(() => {
+          expect(wrapper.vm.currentInfo.city).to.equal('温州市');
+          done();
+        }, 50);
+      });
+    }, 50);
+  });
 });

From 0768aab52c29e268d8dfa667dfef930b98dfd98c Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 12 Mar 2018 17:40:20 +0800
Subject: [PATCH 05/48] [new feature] add Collapse component (#674)

---
 docs/demos/index.js                |   1 +
 docs/demos/views/collapse.vue      |  83 ++++++++++++++++++++++
 docs/markdown/en-US/collapse.md    |  95 +++++++++++++++++++++++++
 docs/markdown/index.js             |   2 +
 docs/markdown/zh-CN/collapse.md    | 108 +++++++++++++++++++++++++++++
 docs/src/doc.config.js             |   8 +++
 packages/address-edit/Detail.vue   |   8 +--
 packages/collapse-item/index.vue   |  75 ++++++++++++++++++++
 packages/collapse/index.vue        |  41 +++++++++++
 packages/index.js                  |   6 ++
 packages/vant-css/src/collapse.css |  31 +++++++++
 packages/vant-css/src/index.css    |   1 +
 test/components/collapse.vue       |  21 ++++++
 test/specs/collapse.spec.js        |  47 +++++++++++++
 14 files changed, 523 insertions(+), 4 deletions(-)
 create mode 100644 docs/demos/views/collapse.vue
 create mode 100644 docs/markdown/en-US/collapse.md
 create mode 100644 docs/markdown/zh-CN/collapse.md
 create mode 100644 packages/collapse-item/index.vue
 create mode 100644 packages/collapse/index.vue
 create mode 100644 packages/vant-css/src/collapse.css
 create mode 100644 test/components/collapse.vue
 create mode 100644 test/specs/collapse.spec.js

diff --git a/docs/demos/index.js b/docs/demos/index.js
index 8e85dba4b..9976b69d0 100644
--- a/docs/demos/index.js
+++ b/docs/demos/index.js
@@ -33,6 +33,7 @@ export default {
   'cell': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/cell'), 'cell')), 'cell')),
   'checkbox': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/checkbox'), 'checkbox')), 'checkbox')),
   'circle': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/circle'), 'circle')), 'circle')),
+  'collapse': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/collapse'), 'collapse')), 'collapse')),
   'contact': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/contact'), 'contact')), 'contact')),
   'coupon': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/coupon'), 'coupon')), 'coupon')),
   'datetime-picker': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/datetime-picker'), 'datetime-picker')), 'datetime-picker')),
diff --git a/docs/demos/views/collapse.vue b/docs/demos/views/collapse.vue
new file mode 100644
index 000000000..990a19393
--- /dev/null
+++ b/docs/demos/views/collapse.vue
@@ -0,0 +1,83 @@
+<template>
+  <demo-section>
+    <demo-block :title="$t('basicUsage')">
+      <van-collapse v-model="active1">
+        <van-collapse-item :title="$t('title1')">{{ $t('content1') }}</van-collapse-item>
+        <van-collapse-item :title="$t('title2')">{{ $t('content2') }}</van-collapse-item>
+        <van-collapse-item :title="$t('title3')">{{ $t('content3') }}</van-collapse-item>
+      </van-collapse>
+    </demo-block>
+
+    <demo-block :title="$t('accordion')">
+      <van-collapse v-model="active2" accordion>
+        <van-collapse-item :title="$t('title1')">{{ $t('content1') }}</van-collapse-item>
+        <van-collapse-item :title="$t('title2')">{{ $t('content2') }}</van-collapse-item>
+        <van-collapse-item :title="$t('title3')">{{ $t('content3') }}</van-collapse-item>
+      </van-collapse>
+    </demo-block>
+
+    <demo-block :title="$t('titleSlot')">
+      <van-collapse v-model="active3">
+        <van-collapse-item>
+          <div slot="title">{{ $t('title1') }}<van-icon name="question" /></div>
+          {{ $t('content1') }}
+        </van-collapse-item>
+        <van-collapse-item :title="$t('title2')">{{ $t('content2') }}</van-collapse-item>
+      </van-collapse>
+    </demo-block>
+  </demo-section>
+</template>
+
+<script>
+export default {
+  i18n: {
+    'zh-CN': {
+      accordion: '手风琴',
+      titleSlot: '自定义标题内容',
+      title1: '有赞微商城',
+      title2: '有赞零售',
+      title3: '有赞美业',
+      content1: '提供多样店铺模板，快速搭建网上商城',
+      content2: '网店吸粉获客、会员分层营销、一机多种收款，告别经营低效和客户流失',
+      content3: '线上拓客，随时预约，贴心顺手的开单收银'
+    },
+    'en-US': {
+      accordion: 'Accordion',
+      titleSlot: 'Custom title',
+      title1: 'Title1',
+      title2: 'Title2',
+      title3: 'Title3',
+      content1: 'Only those who have the patience to do simple things perfectly ever acquire the skill to do difficult things easily.',
+      content2: 'When someone walk out your life, let them. They are just making more room for someone else better to walk in.',
+      content3: 'The world is big and life is short. Live the life the way you want.'
+    }
+  },
+
+  data() {
+    return {
+      active1: [0],
+      active2: 0,
+      active3: []
+    };
+  }
+};
+</script>
+
+<style lang="postcss">
+@import "../../../packages/vant-css/src/common/var.css";
+
+.demo-collapse {
+  .van-collapse-item__content {
+    font-size: 13px;
+    line-height: 1.5;
+    color: $gray-darker;
+  }
+
+  .van-icon-question {
+    color: $blue;
+    vertical-align: -3px;
+    margin-left: 5px;
+    font-size: 15px;
+  }
+}
+</style>
diff --git a/docs/markdown/en-US/collapse.md b/docs/markdown/en-US/collapse.md
new file mode 100644
index 000000000..05d241111
--- /dev/null
+++ b/docs/markdown/en-US/collapse.md
@@ -0,0 +1,95 @@
+## Collapse
+
+### Install
+``` javascript
+import { Collapse } from 'vant';
+
+Vue.use(Collapse);
+```
+
+### Usage
+
+#### Basic Usage
+Use `v-model` to control the name of active panels
+
+```html
+<van-collapse v-model="activeNames">
+  <van-collapse-item title="Title1" name="1">Content</van-collapse-item>
+  <van-collapse-item title="Title2" name="2">Content</van-collapse-item>
+  <van-collapse-item title="Title3" name="3">Content</van-collapse-item>
+</van-collapse>
+```
+
+``` javascript
+export default {
+  data() {
+    return {
+      activeNames: ['1']
+    };
+  }
+};
+```
+
+#### Accordion
+In accordion mode, only one panel can be expanded at the same time.
+
+```html
+<van-collapse v-model="activeName" accordion>
+  <van-collapse-item title="Title1" name="1">Content</van-collapse-item>
+  <van-collapse-item title="Title2" name="2">Content</van-collapse-item>
+  <van-collapse-item title="Title3" name="3">Content</van-collapse-item>
+</van-collapse>
+```
+
+``` javascript
+export default {
+  data() {
+    return {
+      activeName: '1'
+    };
+  }
+};
+```
+
+#### Custom title
+
+```html
+<van-collapse v-model="activeNames">
+  <van-collapse-item name="1">
+    <div slot="title">Title1<van-icon name="question" /></div>
+    Content
+  </van-collapse-item>
+  <van-collapse-item title="Title2" name="2">
+    Content
+  </van-collapse-item>
+</van-collapse>
+```
+
+
+
+### Collapse API
+
+| Attribute | Description | Type | Default | Accepted Values |
+|-----------|-----------|-----------|-------------|-------------|
+| v-model | names of current active panels | `Array | String | Number` | - | - |
+| accordion | Whether to be accordion mode | `Boolean` | `false` | - |
+
+### Collapse Event
+
+| Event | Description | Arguments |
+|-----------|-----------|-----------|
+| change | Triggered when switch panel | activeNames: `string | array` |
+
+### CollapseItem API
+
+| Attribute | Description | Type | Default | Accepted Values |
+|-----------|-----------|-----------|-------------|-------------|
+| name | Name | `String | Number` | `index` | - |
+| title | Title | `String` | - | - |
+
+### CollapseItem Slot
+
+| name | Description |
+|-----------|-----------|
+| default | Content |
+| title | Custom title |
\ No newline at end of file
diff --git a/docs/markdown/index.js b/docs/markdown/index.js
index 16830af2c..17f923054 100644
--- a/docs/markdown/index.js
+++ b/docs/markdown/index.js
@@ -27,6 +27,7 @@ export default {
   'zh-CN/changelog': wrapper(r => require.ensure([], () => r(require('./zh-CN/changelog.md')), 'zh-CN/changelog')),
   'zh-CN/checkbox': wrapper(r => require.ensure([], () => r(require('./zh-CN/checkbox.md')), 'zh-CN/checkbox')),
   'zh-CN/circle': wrapper(r => require.ensure([], () => r(require('./zh-CN/circle.md')), 'zh-CN/circle')),
+  'zh-CN/collapse': wrapper(r => require.ensure([], () => r(require('./zh-CN/collapse.md')), 'zh-CN/collapse')),
   'zh-CN/contact': wrapper(r => require.ensure([], () => r(require('./zh-CN/contact.md')), 'zh-CN/contact')),
   'zh-CN/coupon': wrapper(r => require.ensure([], () => r(require('./zh-CN/coupon.md')), 'zh-CN/coupon')),
   'zh-CN/datetime-picker': wrapper(r => require.ensure([], () => r(require('./zh-CN/datetime-picker.md')), 'zh-CN/datetime-picker')),
@@ -81,6 +82,7 @@ export default {
   'en-US/changelog': wrapper(r => require.ensure([], () => r(require('./en-US/changelog.md')), 'en-US/changelog')),
   'en-US/checkbox': wrapper(r => require.ensure([], () => r(require('./en-US/checkbox.md')), 'en-US/checkbox')),
   'en-US/circle': wrapper(r => require.ensure([], () => r(require('./en-US/circle.md')), 'en-US/circle')),
+  'en-US/collapse': wrapper(r => require.ensure([], () => r(require('./en-US/collapse.md')), 'en-US/collapse')),
   'en-US/contact': wrapper(r => require.ensure([], () => r(require('./en-US/contact.md')), 'en-US/contact')),
   'en-US/coupon': wrapper(r => require.ensure([], () => r(require('./en-US/coupon.md')), 'en-US/coupon')),
   'en-US/datetime-picker': wrapper(r => require.ensure([], () => r(require('./en-US/datetime-picker.md')), 'en-US/datetime-picker')),
diff --git a/docs/markdown/zh-CN/collapse.md b/docs/markdown/zh-CN/collapse.md
new file mode 100644
index 000000000..539549d52
--- /dev/null
+++ b/docs/markdown/zh-CN/collapse.md
@@ -0,0 +1,108 @@
+## Collapse 折叠面板
+
+### 使用指南
+``` javascript
+import { Collapse } from 'vant';
+
+Vue.use(Collapse);
+```
+
+### 代码演示
+
+#### 基础用法
+通过`v-model`控制展开的面板列表，`activeNames`为数组格式
+
+```html
+<van-collapse v-model="activeNames">
+  <van-collapse-item title="有赞微商城" name="1">
+    提供多样店铺模板，快速搭建网上商城
+  </van-collapse-item>
+  <van-collapse-item title="有赞零售" name="2">
+    网店吸粉获客、会员分层营销、一机多种收款，告别经营低效和客户流失
+  </van-collapse-item>
+  <van-collapse-item title="有赞美业" name="3">
+    线上拓客，随时预约，贴心顺手的开单收银
+  </van-collapse-item>
+</van-collapse>
+```
+
+``` javascript
+export default {
+  data() {
+    return {
+      activeNames: ['1']
+    };
+  }
+};
+```
+
+#### 手风琴
+通过`accordion`可以设置为手风琴模式，最多展开一个面板，此时`activeName`为字符串格式
+
+```html
+<van-collapse v-model="activeName" accordion>
+  <van-collapse-item title="有赞微商城" name="1">
+    提供多样店铺模板，快速搭建网上商城
+  </van-collapse-item>
+  <van-collapse-item title="有赞零售" name="2">
+    网店吸粉获客、会员分层营销、一机多种收款，告别经营低效和客户流失
+  </van-collapse-item>
+  <van-collapse-item title="有赞美业" name="3">
+    线上拓客，随时预约，贴心顺手的开单收银
+  </van-collapse-item>
+</van-collapse>
+```
+
+``` javascript
+export default {
+  data() {
+    return {
+      activeName: '1'
+    };
+  }
+};
+```
+
+#### 自定义标题内容
+
+```html
+<van-collapse v-model="activeNames">
+  <van-collapse-item name="1">
+    <div slot="title">有赞微商城<van-icon name="question" /></div>
+    提供多样店铺模板，快速搭建网上商城
+  </van-collapse-item>
+  <van-collapse-item title="有赞零售" name="2">
+    网店吸粉获客、会员分层营销、一机多种收款，告别经营低效和客户流失
+  </van-collapse-item>
+</van-collapse>
+```
+
+
+
+### Collapse API
+
+| 参数 | 说明 | 类型 | 默认值 | 可选值 |
+|-----------|-----------|-----------|-------------|-------------|
+| v-model | 当前展开面板的 name | `Array | String | Number` | - | - |
+| accordion | 是否开启手风琴模式 | `Boolean` | `false` | - |
+
+### Collapse Event
+
+| 事件名 | 说明 | 参数 |
+|-----------|-----------|-----------|
+| change | 切换面板时触发 | activeNames: `string | array` |
+
+### CollapseItem API
+
+| 参数 | 说明 | 类型 | 默认值 | 可选值 |
+|-----------|-----------|-----------|-------------|-------------|
+| name | 面板唯一标识符，默认为索引值 | `String | Number` | `index` | - |
+| title | 标题 | `String` | - | - |
+
+
+### CollapseItem Slot
+
+| 名称 | 说明 |
+|-----------|-----------|
+| default | 面板内容 |
+| title | 自定义标题内容 |
\ No newline at end of file
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 1cad7cce2..334e3d7f9 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -88,6 +88,10 @@ module.exports = {
                 path: '/circle',
                 title: 'Circle - 环形进度条'
               },
+              {
+                path: '/collapse',
+                title: 'Collapse - 折叠面板'
+              },
               {
                 path: '/icon',
                 title: 'Icon - 图标'
@@ -374,6 +378,10 @@ module.exports = {
                 path: '/circle',
                 title: 'Circle'
               },
+              {
+                path: '/collapse',
+                title: 'Collapse'
+              },
               {
                 path: '/icon',
                 title: 'Icon'
diff --git a/packages/address-edit/Detail.vue b/packages/address-edit/Detail.vue
index 891db7bf1..3b4dc0df8 100644
--- a/packages/address-edit/Detail.vue
+++ b/packages/address-edit/Detail.vue
@@ -11,8 +11,8 @@
       :error="isError"
       :on-icon-click="onIconClick"
       @input="$emit('input', $event)"
-      @focus="handleFocus"
-      @blur="handleBlur"
+      @focus="onFocus"
+      @blur="onBlur"
     >
       <div slot="icon">
         <span v-if="showIcon && isAndroid" class="van-address-edit-detail__finish-edit">{{ $t('complete') }}</span>
@@ -79,13 +79,13 @@ export default create({
   },
 
   methods: {
-    handleFocus(e) {
+    onFocus(e) {
       this.isFocused = true;
       this.$emit('focus', e);
       this.$refs.root.scrollIntoView();
     },
 
-    handleBlur(e) {
+    onBlur(e) {
       // wait for click event finished
       setTimeout(() => {
         this.isFocused = false;
diff --git a/packages/collapse-item/index.vue b/packages/collapse-item/index.vue
new file mode 100644
index 000000000..50cc6cf61
--- /dev/null
+++ b/packages/collapse-item/index.vue
@@ -0,0 +1,75 @@
+<template>
+  <div
+    class="van-collapse-item"
+    :class="{
+      'van-hairline--top': index,
+      'van-collapse-item--expanded': expanded
+    }"
+  >
+    <cell class="van-collapse-item__title" is-link @click="onClick">
+      <slot name="title">{{ title }}</slot>
+    </cell>
+    <div class="van-collapse-item__content" v-show="expanded">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import Cell from '../cell';
+import findParent from '../mixins/find-parent';
+import { create, isDef } from '../utils';
+
+export default create({
+  name: 'van-collapse-item',
+
+  mixins: [findParent],
+
+  components: {
+    Cell
+  },
+
+  props: {
+    name: [String, Number],
+    title: String
+  },
+
+  computed: {
+    items() {
+      return this.parentGroup.items;
+    },
+
+    index() {
+      return this.items.indexOf(this);
+    },
+
+    currentName() {
+      return isDef(this.name) ? this.name : this.index;
+    },
+
+    expanded() {
+      const { activeNames } = this.parentGroup;
+      return this.parentGroup.accordion
+        ? activeNames === this.currentName
+        : activeNames.some(name => name === this.currentName);
+    }
+  },
+
+  created() {
+    this.findParentByName('van-collapse');
+    this.items.push(this);
+  },
+
+  destroyed() {
+    this.items.splice(this.index, 1);
+  },
+
+  methods: {
+    onClick() {
+      const { parentGroup } = this;
+      const name = parentGroup.accordion && this.currentName === parentGroup.activeNames ? '' : this.currentName;
+      this.parentGroup.switch(name, !this.expanded);
+    }
+  }
+});
+</script>
diff --git a/packages/collapse/index.vue b/packages/collapse/index.vue
new file mode 100644
index 000000000..7d526bbe4
--- /dev/null
+++ b/packages/collapse/index.vue
@@ -0,0 +1,41 @@
+<template>
+  <div class="van-collapse van-hairline--top-bottom">
+    <slot />
+  </div>
+</template>
+
+<script>
+import { create } from '../utils';
+
+export default create({
+  name: 'van-collapse',
+
+  model: {
+    prop: 'activeNames'
+  },
+
+  props: {
+    accordion: Boolean,
+    activeNames: [String, Number, Array]
+  },
+
+  data() {
+    return {
+      items: []
+    };
+  },
+
+  methods: {
+    switch(name, expanded) {
+      const { activeNames } = this;
+      if (!this.accordion) {
+        name = expanded
+          ? activeNames.concat(name)
+          : activeNames.filter(activeName => activeName !== name);
+      }
+      this.$emit('change', name);
+      this.$emit('input', name);
+    }
+  }
+});
+</script>
diff --git a/packages/index.js b/packages/index.js
index f6be54972..8930ee40d 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -14,6 +14,8 @@ import Checkbox from './checkbox';
 import CheckboxGroup from './checkbox-group';
 import Circle from './circle';
 import Col from './col';
+import Collapse from './collapse';
+import CollapseItem from './collapse-item';
 import ContactCard from './contact-card';
 import ContactEdit from './contact-edit';
 import ContactList from './contact-list';
@@ -80,6 +82,8 @@ const components = [
   CheckboxGroup,
   Circle,
   Col,
+  Collapse,
+  CollapseItem,
   ContactCard,
   ContactEdit,
   ContactList,
@@ -153,6 +157,8 @@ export {
   CheckboxGroup,
   Circle,
   Col,
+  Collapse,
+  CollapseItem,
   ContactCard,
   ContactEdit,
   ContactList,
diff --git a/packages/vant-css/src/collapse.css b/packages/vant-css/src/collapse.css
new file mode 100644
index 000000000..c796efa0c
--- /dev/null
+++ b/packages/vant-css/src/collapse.css
@@ -0,0 +1,31 @@
+@import './common/var.css';
+
+.van-collapse-item {
+  &__title {
+    .van-cell__right-icon::before {
+      transition: .3s;
+      transform: rotate(90deg);
+    }
+
+    &::after {
+      visibility: hidden;
+    }
+  }
+
+  &__content {
+    padding: 15px;
+    background-color: #fff;
+  }
+
+  &--expanded {
+    .van-collapse-item__title {
+      .van-cell__right-icon::before {
+        transform: rotate(-90deg);
+      }
+
+      &::after {
+        visibility: visible;
+      }
+    }
+  }
+}
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index e2f140575..e66642101 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -13,6 +13,7 @@
 @import './button.css';
 @import './cell.css';
 @import './circle.css';
+@import './collapse.css';
 @import './loading.css';
 @import './nav-bar.css';
 @import './notice-bar.css';
diff --git a/test/components/collapse.vue b/test/components/collapse.vue
new file mode 100644
index 000000000..56e29f7ce
--- /dev/null
+++ b/test/components/collapse.vue
@@ -0,0 +1,21 @@
+<template>
+  <van-collapse v-model="active" :accordion="accordion">
+    <van-collapse-item title="a" name="first">content</van-collapse-item>
+    <van-collapse-item title="b">content</van-collapse-item>
+    <van-collapse-item title="c">content</van-collapse-item>
+  </van-collapse>
+</template>
+
+<script>
+export default {
+  props: {
+    accordion: Boolean
+  },
+
+  data() {
+    return {
+      active: this.accordion ? '' : []
+    };
+  }
+};
+</script>
diff --git a/test/specs/collapse.spec.js b/test/specs/collapse.spec.js
new file mode 100644
index 000000000..d1a702ad7
--- /dev/null
+++ b/test/specs/collapse.spec.js
@@ -0,0 +1,47 @@
+import { mount } from 'avoriaz';
+import Collapse from '../components/collapse';
+
+describe('Circle', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('basic mode', () => {
+    wrapper = mount(Collapse);
+
+    const firstTitle = wrapper.find('.van-collapse-item__title')[0];
+    firstTitle.trigger('click');
+    expect(wrapper.vm.active).to.eql(['first']);
+
+    const secondTitle = wrapper.find('.van-collapse-item__title')[1];
+    secondTitle.trigger('click');
+    expect(wrapper.vm.active).to.eql(['first', 1]);
+
+    firstTitle.trigger('click');
+    expect(wrapper.vm.active).to.eql([1]);
+  });
+
+  it('accordion', () => {
+    wrapper = mount(Collapse, {
+      propsData: {
+        accordion: true
+      }
+    });
+
+    const firstTitle = wrapper.find('.van-collapse-item__title')[0];
+    firstTitle.trigger('click');
+    expect(wrapper.vm.active).to.eql('first');
+
+    const secondTitle = wrapper.find('.van-collapse-item__title')[1];
+    secondTitle.trigger('click');
+    expect(wrapper.vm.active).to.eql(1);
+
+    firstTitle.trigger('click');
+    expect(wrapper.vm.active).to.eql('first');
+
+    firstTitle.trigger('click');
+    expect(wrapper.vm.active).to.eql('');
+  });
+});
+

From 1a2a64225bb14059287571169082d66d07375330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Tue, 13 Mar 2018 12:13:57 +0800
Subject: [PATCH 06/48] [changelog] 0.12.14

---
 docs/markdown/en-US/changelog.md           | 19 ++++++++++++++++
 docs/markdown/zh-CN/changelog-generated.md | 26 ++++++++++++++++++++++
 docs/markdown/zh-CN/changelog.md           | 19 ++++++++++++++++
 3 files changed, 64 insertions(+)

diff --git a/docs/markdown/en-US/changelog.md b/docs/markdown/en-US/changelog.md
index 840236a04..fb1889fa6 100644
--- a/docs/markdown/en-US/changelog.md
+++ b/docs/markdown/en-US/changelog.md
@@ -1,5 +1,24 @@
 ## Changelog
 
+### [0.12.14](https://github.com/youzan/vant/tree/v0.12.14)
+`2018-03-09`
+
+**Bug Fixes**
+* Area: should reset index when area list changed [\#678](https://github.com/youzan/vant/pull/678) [@chenjiahan](https://github.com/chenjiahan)
+
+
+### [0.12.13](https://github.com/youzan/vant/tree/v0.12.13)
+`2018-03-09`
+
+**Improvements**
+
+* AddressEdit: support custom tel validator [\#673](https://github.com/youzan/vant/pull/673) [@chenjiahan](https://github.com/chenjiahan)
+* Sku: add close-on-click-overlay config for sku popup [\#676](https://github.com/youzan/vant/pull/676) [@w91](https://github.com/w91)
+
+**Bug Fixes**
+* fix CouponList text max-width [\#675](https://github.com/youzan/vant/pull/675) [@chenjiahan](https://github.com/chenjiahan)
+
+
 ### [0.12.12](https://github.com/youzan/vant/tree/v0.12.12)
 `2018-03-06`
 
diff --git a/docs/markdown/zh-CN/changelog-generated.md b/docs/markdown/zh-CN/changelog-generated.md
index 5d1af228a..66c3f5d06 100644
--- a/docs/markdown/zh-CN/changelog-generated.md
+++ b/docs/markdown/zh-CN/changelog-generated.md
@@ -1,5 +1,31 @@
 ## 更新日志
 
+## [v0.12.14](https://github.com/youzan/vant/tree/v0.12.14) (2018-03-09)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.12.13...v0.12.14)
+
+**Improvements**
+
+- \[bugfix\] Area: should reset index when area list changed [\#678](https://github.com/youzan/vant/pull/678) ([chenjiahan](https://github.com/chenjiahan))
+
+## [v0.12.13](https://github.com/youzan/vant/tree/v0.12.13) (2018-03-09)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.12.12...v0.12.13)
+
+**Issue**
+
+- 请问什么时候可以想vue.ydui.org里面那样弄个rem 版的 [\#672](https://github.com/youzan/vant/issues/672)
+- 使用babel-plugin-import 出错 [\#671](https://github.com/youzan/vant/issues/671)
+- undefined is not an object \(evaluating 't.offsetWidth'\) [\#668](https://github.com/youzan/vant/issues/668)
+- 关于输入框禁用样式 [\#667](https://github.com/youzan/vant/issues/667)
+- Swipe - 'change event' - Documentation  [\#664](https://github.com/youzan/vant/issues/664)
+- Swipe - 'no-wrap' - Enhancement [\#663](https://github.com/youzan/vant/issues/663)
+- Swipe 组件希望能增加禁止自动播放的功能 [\#656](https://github.com/youzan/vant/issues/656)
+
+**Improvements**
+
+- \[new feature\] add close-on-click-overlay config for sku popup [\#676](https://github.com/youzan/vant/pull/676) ([w91](https://github.com/w91))
+- \[bugfix\] CouponList text max-width [\#675](https://github.com/youzan/vant/pull/675) ([chenjiahan](https://github.com/chenjiahan))
+- \[new feature\] AddressEdit support custom tel validator [\#673](https://github.com/youzan/vant/pull/673) ([chenjiahan](https://github.com/chenjiahan))
+
 ## [v0.12.12](https://github.com/youzan/vant/tree/v0.12.12) (2018-03-06)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.12.11...v0.12.12)
 
diff --git a/docs/markdown/zh-CN/changelog.md b/docs/markdown/zh-CN/changelog.md
index bbb808e03..a6e786968 100644
--- a/docs/markdown/zh-CN/changelog.md
+++ b/docs/markdown/zh-CN/changelog.md
@@ -1,5 +1,24 @@
 ## 更新日志
 
+### [0.12.14](https://github.com/youzan/vant/tree/v0.12.14)
+`2018-03-09`
+
+**Bug Fixes**
+* Area: 修复 area-list 更新时未正确选中省市区的问题 [\#678](https://github.com/youzan/vant/pull/678) [@chenjiahan](https://github.com/chenjiahan)
+
+
+### [0.12.13](https://github.com/youzan/vant/tree/v0.12.13)
+`2018-03-09`
+
+**Improvements**
+
+* AddressEdit: 支持自定义手机号校验函数 [\#673](https://github.com/youzan/vant/pull/673) [@chenjiahan](https://github.com/chenjiahan)
+* Sku: 新增 close-on-click-overlay 属性 [\#676](https://github.com/youzan/vant/pull/676) [@w91](https://github.com/w91)
+
+**Bug Fixes**
+* 修复 CouponList 文字截断的问题 [\#675](https://github.com/youzan/vant/pull/675) [@chenjiahan](https://github.com/chenjiahan)
+
+
 ### [0.12.12](https://github.com/youzan/vant/tree/v0.12.12)
 `2018-03-06`
 

From 5592db2cb2cce4eae21bdd4336c809999007d143 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 13 Mar 2018 16:01:50 +0800
Subject: [PATCH 07/48] [new feature] add List component (#682)

---
 docs/demos/index.js                    |   1 +
 docs/demos/views/list.vue              |  79 +++++++++++++++++
 docs/demos/views/waterfall.vue         |   7 +-
 docs/markdown/en-US/list.md            |  66 ++++++++++++++
 docs/markdown/en-US/waterfall.md       |   1 +
 docs/markdown/index.js                 |   2 +
 docs/markdown/zh-CN/list.md            |  66 ++++++++++++++
 docs/markdown/zh-CN/loading.md         |   2 +-
 docs/markdown/zh-CN/waterfall.md       |   2 +-
 docs/src/WapApp.vue                    |   4 +-
 docs/src/doc.config.js                 |   8 ++
 package.json                           |  14 +--
 packages/index.js                      |   3 +
 packages/list/index.vue                | 118 +++++++++++++++++++++++++
 packages/locale/lang/en-US.js          |   4 +-
 packages/locale/lang/zh-CN.js          |   4 +-
 packages/pull-refresh/index.vue        |   2 +-
 packages/vant-css/src/index.css        |   9 +-
 packages/vant-css/src/list.css         |  25 ++++++
 packages/vant-css/src/pull-refresh.css |   4 +-
 test/specs/list.spec.js                |  68 ++++++++++++++
 yarn.lock                              |  51 ++++++-----
 22 files changed, 495 insertions(+), 45 deletions(-)
 create mode 100644 docs/demos/views/list.vue
 create mode 100644 docs/markdown/en-US/list.md
 create mode 100644 docs/markdown/zh-CN/list.md
 create mode 100644 packages/list/index.vue
 create mode 100644 packages/vant-css/src/list.css
 create mode 100644 test/specs/list.spec.js

diff --git a/docs/demos/index.js b/docs/demos/index.js
index 9976b69d0..2403dd8a1 100644
--- a/docs/demos/index.js
+++ b/docs/demos/index.js
@@ -44,6 +44,7 @@ export default {
   'image-preview': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/image-preview'), 'image-preview')), 'image-preview')),
   'layout': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/layout'), 'layout')), 'layout')),
   'lazyload': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/lazyload'), 'lazyload')), 'lazyload')),
+  'list': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/list'), 'list')), 'list')),
   'loading': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/loading'), 'loading')), 'loading')),
   'nav-bar': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/nav-bar'), 'nav-bar')), 'nav-bar')),
   'notice-bar': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/notice-bar'), 'notice-bar')), 'notice-bar')),
diff --git a/docs/demos/views/list.vue b/docs/demos/views/list.vue
new file mode 100644
index 000000000..36f31ee20
--- /dev/null
+++ b/docs/demos/views/list.vue
@@ -0,0 +1,79 @@
+<template>
+  <demo-section>
+    <demo-block :title="$t('basicUsage')">
+      <p class="page-desc">{{ $t('text') }}</p>
+      <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
+        <van-list 
+          v-model="loading"
+          :finished="finished"
+          @load="onLoad"
+        >
+          <van-cell v-for="item in list" :key="item" :title="item + ''" />
+        </van-list>
+      </van-pull-refresh>
+    </demo-block>
+  </demo-section>
+</template>
+
+<script>
+export default {
+  i18n: {
+    'zh-CN': {
+      text: '当即将滚动到元素底部时，会自动加载更多'
+    },
+    'en-US': {
+      text: 'This list will load items will scroll to bottom.'
+    }
+  },
+
+  data() {
+    return {
+      list: [],
+      refreshing: false,
+      loading: false,
+      finished: false
+    };
+  },
+
+  methods: {
+    onLoad() {
+      setTimeout(() => {
+        for (let i = 0; i < 10; i++) {
+          let text = this.list.length + 1;
+          this.list.push(text < 10 ? '0' + text : text);
+        }
+        this.loading = false;
+
+        if (this.list.length >= 40) {
+          this.finished = true;
+        }
+      }, 500);
+    },
+
+    onRefresh() {
+      setTimeout(() => {
+        this.list = [];
+        this.finished = false;
+        this.refreshing = false;
+        window.scrollTo(0, 10);
+      }, 1000);
+    }
+  }
+};
+</script>
+
+<style lang="postcss">
+.demo-list {
+  .van-cell {
+    text-align: center;
+  }
+
+  .page-desc {
+    padding: 5px 0;
+    line-height: 1.4;
+    font-size: 14px;
+    text-align: center;
+    color: #666;
+  }
+}
+</style>
diff --git a/docs/demos/views/waterfall.vue b/docs/demos/views/waterfall.vue
index 3c63a8213..8e7972a25 100644
--- a/docs/demos/views/waterfall.vue
+++ b/docs/demos/views/waterfall.vue
@@ -1,5 +1,6 @@
 <template>
   <demo-section>
+    <van-notice-bar>{{ $t('tips') }}</van-notice-bar>
     <demo-block :title="$t('basicUsage')">
       <p class="page-desc">{{ $t('text') }}</p>
       <ul
@@ -18,10 +19,12 @@ import { Waterfall } from 'packages';
 export default {
   i18n: {
     'zh-CN': {
-      text: '当即将滚动到元素底部时，会自动加载更多'
+      text: '当即将滚动到元素底部时，会自动加载更多',
+      tips: '注意：Waterfall 已被废弃，请使用 List 组件代替'
     },
     'en-US': {
-      text: 'This list will load items will scroll to bottom.'
+      text: 'This list will load items will scroll to bottom.',
+      tips: 'Waterfall is deprecated and no longer maintained, please use the List component instead.'
     }
   },
 
diff --git a/docs/markdown/en-US/list.md b/docs/markdown/en-US/list.md
new file mode 100644
index 000000000..a542aaa5b
--- /dev/null
+++ b/docs/markdown/en-US/list.md
@@ -0,0 +1,66 @@
+## List
+A list component to show items and control loading status.
+
+### Install
+``` javascript
+import { List } from 'vant';
+
+Vue.use(List);
+```
+
+### Usage
+
+#### Basic Usage
+
+```html
+<van-list
+  v-model="loading"
+  :finished="finished"
+  @load="onLoad"
+>
+  <van-cell v-for="item in list" :key="item" :title="item + ''" />
+</van-list>
+```
+
+```js
+export default {
+  data() {
+    return {
+      list: [],
+      loading: false,
+      finished: false
+    };
+  },
+
+  methods: {
+    onLoad() {
+      setTimeout(() => {
+        for (let i = 0; i < 10; i++) {
+          this.list.push(this.list.length + 1);
+        }
+        this.loading = false;
+
+        if (this.list.length >= 40) {
+          this.finished = true;
+        }
+      }, 500);
+    }
+  }
+}
+```
+
+### API
+
+| Attribute | Description | Type | Default | Accepted Values |
+|-----------|-----------|-----------|-------------|-------------|
+| loading | Whether to show loading info，the `load` event will not be triggered when loading | `Boolean` | `false` | - |
+| finished | Whether loading is finished，the `load` event will not be triggered when finished | `Boolean` | `false` | - |
+| offset | The load event will be triggered when the distance between the scrollbar and the bottom is less than offset | `Number` | `300` | - |
+| loading-text | Loading text | `String` | `Loading...` | - |
+| immediate-check | Whether to check loading position immediately after mounted | `Boolean` | `true` | - |
+
+### Event
+
+| Event | Description | Arguments |
+|-----------|-----------|-----------|
+| load | Triggered when the distance between the scrollbar and the bottom is less than offset | - |
diff --git a/docs/markdown/en-US/waterfall.md b/docs/markdown/en-US/waterfall.md
index 94d4ce24e..5a5e71700 100644
--- a/docs/markdown/en-US/waterfall.md
+++ b/docs/markdown/en-US/waterfall.md
@@ -1,4 +1,5 @@
 ## Waterfall
+Note: Waterfall is deprecated and no longer maintained, please use the [List](#/zh-CN/list) component instead.
 
 ### Install
 
diff --git a/docs/markdown/index.js b/docs/markdown/index.js
index 17f923054..76f0fb952 100644
--- a/docs/markdown/index.js
+++ b/docs/markdown/index.js
@@ -40,6 +40,7 @@ export default {
   'zh-CN/intro': wrapper(r => require.ensure([], () => r(require('./zh-CN/intro.md')), 'zh-CN/intro')),
   'zh-CN/layout': wrapper(r => require.ensure([], () => r(require('./zh-CN/layout.md')), 'zh-CN/layout')),
   'zh-CN/lazyload': wrapper(r => require.ensure([], () => r(require('./zh-CN/lazyload.md')), 'zh-CN/lazyload')),
+  'zh-CN/list': wrapper(r => require.ensure([], () => r(require('./zh-CN/list.md')), 'zh-CN/list')),
   'zh-CN/loading': wrapper(r => require.ensure([], () => r(require('./zh-CN/loading.md')), 'zh-CN/loading')),
   'zh-CN/nav-bar': wrapper(r => require.ensure([], () => r(require('./zh-CN/nav-bar.md')), 'zh-CN/nav-bar')),
   'zh-CN/notice-bar': wrapper(r => require.ensure([], () => r(require('./zh-CN/notice-bar.md')), 'zh-CN/notice-bar')),
@@ -95,6 +96,7 @@ export default {
   'en-US/intro': wrapper(r => require.ensure([], () => r(require('./en-US/intro.md')), 'en-US/intro')),
   'en-US/layout': wrapper(r => require.ensure([], () => r(require('./en-US/layout.md')), 'en-US/layout')),
   'en-US/lazyload': wrapper(r => require.ensure([], () => r(require('./en-US/lazyload.md')), 'en-US/lazyload')),
+  'en-US/list': wrapper(r => require.ensure([], () => r(require('./en-US/list.md')), 'en-US/list')),
   'en-US/loading': wrapper(r => require.ensure([], () => r(require('./en-US/loading.md')), 'en-US/loading')),
   'en-US/nav-bar': wrapper(r => require.ensure([], () => r(require('./en-US/nav-bar.md')), 'en-US/nav-bar')),
   'en-US/notice-bar': wrapper(r => require.ensure([], () => r(require('./en-US/notice-bar.md')), 'en-US/notice-bar')),
diff --git a/docs/markdown/zh-CN/list.md b/docs/markdown/zh-CN/list.md
new file mode 100644
index 000000000..85847f1dd
--- /dev/null
+++ b/docs/markdown/zh-CN/list.md
@@ -0,0 +1,66 @@
+## List 列表
+瀑布流滚动加载，用于控制长列表的展示
+
+### 使用指南
+``` javascript
+import { List } from 'vant';
+
+Vue.use(List);
+```
+
+### 代码演示
+
+#### 基础用法
+
+```html
+<van-list
+  v-model="loading"
+  :finished="finished"
+  @load="onLoad"
+>
+  <van-cell v-for="item in list" :key="item" :title="item + ''" />
+</van-list>
+```
+
+```js
+export default {
+  data() {
+    return {
+      list: [],
+      loading: false,
+      finished: false
+    };
+  },
+
+  methods: {
+    onLoad() {
+      setTimeout(() => {
+        for (let i = 0; i < 10; i++) {
+          this.list.push(this.list.length + 1);
+        }
+        this.loading = false;
+
+        if (this.list.length >= 40) {
+          this.finished = true;
+        }
+      }, 500);
+    }
+  }
+}
+```
+
+### API
+
+| 参数 | 说明 | 类型 | 默认值 | 可选值 |
+|-----------|-----------|-----------|-------------|-------------|
+| loading | 是否显示加载中提示，加载过程中不触发`load`事件 | `Boolean` | `false` | - |
+| finished | 是否已加载完成，加载完成后不再触发`load`事件 | `Boolean` | `false` | - |
+| offset | 滚动条与底部距离小于 offset 时触发`load`事件 | `Number` | `300` | - |
+| loading-text | 加载中提示文案 | `String` | `加载中...` | - |
+| immediate-check | 是否在初始化时立即执行滚动位置检查 | `Boolean` | `true` | - |
+
+### Event
+
+| 事件名 | 说明 | 参数 |
+|-----------|-----------|-----------|
+| load | 滚动条与底部距离小于 offset 时触发 | - |
diff --git a/docs/markdown/zh-CN/loading.md b/docs/markdown/zh-CN/loading.md
index b60c9da49..8d4b5a9b1 100644
--- a/docs/markdown/zh-CN/loading.md
+++ b/docs/markdown/zh-CN/loading.md
@@ -34,6 +34,6 @@ Vue.use(Loading);
 
 | 参数 | 说明 | 类型 | 默认值 | 可选值 |
 |-----------|-----------|-----------|-------------|-------------|
-| color | 颜色 | `String` | `black` | `black` `white` |
+| color | 颜色 | `String` | `black` | `white` |
 | type | 类型 | `String` | `circular` | `spinner` `circle` |
 | size | 大小 | `String` | `30px` | - |
diff --git a/docs/markdown/zh-CN/waterfall.md b/docs/markdown/zh-CN/waterfall.md
index 3d400f3e2..a6bd9075f 100644
--- a/docs/markdown/zh-CN/waterfall.md
+++ b/docs/markdown/zh-CN/waterfall.md
@@ -1,4 +1,5 @@
 ## Waterfall 瀑布流
+注意：Waterfall 组件已被废弃且不再维护，请使用 [List](#/zh-CN/list) 组件代替
 
 ### 使用指南
 
@@ -78,4 +79,3 @@ export default {
 | v-waterfall-upper | 滚动到顶部, 触发执行的函数 | `Function` | - | - |
 | waterfall-disabled | 在 vue 对象中表示是否禁止瀑布流触发的 key 值 | `String` | - | - |
 | waterfall-offset | 触发瀑布流加载的阈值 | `Number` | `300` | - |
-
diff --git a/docs/src/WapApp.vue b/docs/src/WapApp.vue
index 62f238c72..321bb6170 100644
--- a/docs/src/WapApp.vue
+++ b/docs/src/WapApp.vue
@@ -7,7 +7,9 @@
       left-arrow
       @click-left="onBack"
     />
-    <router-view />
+    <keep-alive>
+      <router-view />
+    </keep-alive>
   </div>
 </template>
 
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 334e3d7f9..ab0d46bfb 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -104,6 +104,10 @@ module.exports = {
                 path: '/lazyload',
                 title: 'Lazyload - 图片懒加载'
               },
+              {
+                path: '/list',
+                title: 'List - 列表'
+              },
               {
                 path: '/loading',
                 title: 'Loading - 加载'
@@ -394,6 +398,10 @@ module.exports = {
                 path: '/lazyload',
                 title: 'Lazyload'
               },
+              {
+                path: '/list',
+                title: 'List'
+              },
               {
                 path: '/loading',
                 title: 'Loading'
diff --git a/package.json b/package.json
index 9d33e151e..cd5b447e1 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
   "license": "MIT",
   "dependencies": {
     "babel-runtime": "6.x",
-    "vue-lazyload": "^1.2.1"
+    "vue-lazyload": "^1.2.2"
   },
   "peerDependencies": {
     "vue": ">= 2.5.0"
@@ -54,7 +54,7 @@
     "avoriaz": "2.0.0",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.3",
+    "babel-loader": "^7.1.4",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.15.0",
     "babel-polyfill": "^6.26.0",
@@ -71,7 +71,7 @@
     "fast-vue-md-loader": "^1.0.3",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "gh-pages": "^1.0.0",
-    "html-webpack-plugin": "^3.0.4",
+    "html-webpack-plugin": "^3.0.6",
     "isparta-loader": "^2.0.0",
     "karma": "^1.7.1",
     "karma-chrome-launcher": "^2.2.0",
@@ -92,16 +92,16 @@
     "shelljs": "^0.8.1",
     "sinon": "^2.4.1",
     "sinon-chai": "^2.12.0",
-    "style-loader": "^0.20.2",
+    "style-loader": "^0.20.3",
     "uppercamelcase": "^3.0.0",
     "url-loader": "^1.0.1",
     "vant-doc": "1.0.4",
-    "vue": "^2.5.13",
-    "vue-loader": "^14.1.1",
+    "vue": "^2.5.15",
+    "vue-loader": "^14.2.1",
     "vue-router": "^3.0.1",
     "vue-sfc-compiler": "^0.0.8",
     "vue-style-loader": "^4.0.2",
-    "vue-template-compiler": "^2.5.13",
+    "vue-template-compiler": "^2.5.15",
     "vue-template-es2015-compiler": "^1.6.0",
     "webpack": "^3.11.0",
     "webpack-dev-server": "2.11.1",
diff --git a/packages/index.js b/packages/index.js
index 8930ee40d..1fc0b9a57 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -30,6 +30,7 @@ import GoodsActionMiniBtn from './goods-action-mini-btn';
 import Icon from './icon';
 import ImagePreview from './image-preview';
 import Lazyload from './lazyload';
+import List from './list';
 import Loading from './loading';
 import Locale from './locale';
 import NavBar from './nav-bar';
@@ -96,6 +97,7 @@ const components = [
   GoodsActionBigBtn,
   GoodsActionMiniBtn,
   Icon,
+  List,
   Loading,
   NavBar,
   NoticeBar,
@@ -173,6 +175,7 @@ export {
   Icon,
   ImagePreview,
   Lazyload,
+  List,
   Loading,
   Locale,
   NavBar,
diff --git a/packages/list/index.vue b/packages/list/index.vue
new file mode 100644
index 000000000..8b3d085b1
--- /dev/null
+++ b/packages/list/index.vue
@@ -0,0 +1,118 @@
+<template>
+  <div class="van-list">
+    <slot />
+    <div class="van-list__loading" v-show="loading">
+      <slot name="loading">
+        <loading />
+        <span class="van-list__loading-text">{{ $t('loadingTip') }}</span>
+      </slot>
+    </div>
+  </div>
+</template>
+
+<script>
+import create from '../utils/create';
+import utils from '../utils/scroll';
+import { on, off } from '../utils/event';
+
+export default create({
+  name: 'van-list',
+
+  model: {
+    prop: 'loading'
+  },
+
+  props: {
+    loading: Boolean,
+    finished: Boolean,
+    immediateCheck: {
+      type: Boolean,
+      default: true
+    },
+    offset: {
+      type: Number,
+      default: 300
+    }
+  },
+
+  mounted() {
+    this.scroller = utils.getScrollEventTarget(this.$el);
+    this.handler(true);
+
+    if (this.immediateCheck) {
+      this.$nextTick(this.onScroll);
+    }
+  },
+
+  destroyed() {
+    this.handler(false);
+  },
+
+  activated() {
+    /* istanbul ignore next */
+    this.handler(true);
+  },
+
+  deactivated() {
+    /* istanbul ignore next */
+    this.handler(false);
+  },
+
+  watch: {
+    loading() {
+      this.$nextTick(this.onScroll);
+    },
+
+    finished() {
+      this.$nextTick(this.onScroll);
+    }
+  },
+
+  methods: {
+    onScroll() {
+      if (this.loading || this.finished) {
+        return;
+      }
+
+      const el = this.$el;
+      const { scroller } = this;
+      const scrollerHeight = utils.getVisibleHeight(scroller);
+
+      /* istanbul ignore next */
+      if (!scrollerHeight) {
+        return;
+      }
+
+      const scrollTop = utils.getScrollTop(scroller);
+      const targetBottom = scrollTop + scrollerHeight;
+
+      let reachBottom = false;
+
+      /* istanbul ignore next */
+      if (el === scroller) {
+        reachBottom = scroller.scrollHeight - targetBottom < this.offset;
+      } else {
+        const elBottom =
+          utils.getElementTop(el) -
+          utils.getElementTop(scroller) +
+          utils.getVisibleHeight(el);
+        reachBottom = elBottom - scrollerHeight < this.offset;
+      }
+
+      /* istanbul ignore else */
+      if (reachBottom) {
+        this.$emit('input', true);
+        this.$emit('load');
+      }
+    },
+
+    handler(bind) {
+      /* istanbul ignore else */
+      if (this.binded !== bind) {
+        this.binded = bind;
+        (bind ? on : off)(this.scroller, 'scroll', this.onScroll);
+      }
+    }
+  }
+});
+</script>
diff --git a/packages/locale/lang/en-US.js b/packages/locale/lang/en-US.js
index d3fe13f4c..c99646601 100644
--- a/packages/locale/lang/en-US.js
+++ b/packages/locale/lang/en-US.js
@@ -3,6 +3,7 @@ export default {
   cancel: 'Cancel',
   save: 'Save',
   complete: 'Complete',
+  loadingTip: 'Loading...',
   vanContactCard: {
     name: 'Name',
     tel: 'Phone',
@@ -31,8 +32,7 @@ export default {
   },
   vanPullRefresh: {
     pullingText: 'Pull to refresh...',
-    loosingText: 'Loose to refresh...',
-    loadingText: 'Loading...'
+    loosingText: 'Loose to refresh...'
   },
   vanSubmitBar: {
     label: 'Total：'
diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js
index 582b3c79a..6fc73ab27 100644
--- a/packages/locale/lang/zh-CN.js
+++ b/packages/locale/lang/zh-CN.js
@@ -3,6 +3,7 @@ export default {
   cancel: '取消',
   save: '保存',
   complete: '完成',
+  loadingTip: '加载中...',
   vanContactCard: {
     name: '联系人',
     tel: '联系电话',
@@ -34,8 +35,7 @@ export default {
   },
   vanPullRefresh: {
     pullingText: '下拉即可刷新...',
-    loosingText: '释放即可刷新...',
-    loadingText: '加载中...'
+    loosingText: '释放即可刷新...'
   },
   vanSubmitBar: {
     label: '合计：'
diff --git a/packages/pull-refresh/index.vue b/packages/pull-refresh/index.vue
index 72c1a00d1..c895dcd36 100644
--- a/packages/pull-refresh/index.vue
+++ b/packages/pull-refresh/index.vue
@@ -19,7 +19,7 @@
         <slot name="loading" v-if="status === 'loading'">
           <div class="van-pull-refresh__loading">
             <loading />
-            <span>{{ loadingText || $t('loadingText') }}</span>
+            <span>{{ loadingText || $t('loadingTip') }}</span>
           </div>
         </slot>
       </div>
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index e66642101..6cd288e97 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -4,17 +4,18 @@
 
 /* base */
 @import './base.css';
+@import './icon.css';
+@import './loading.css';
+@import './button.css';
+@import './cell.css';
 
 /* common components */
-@import './icon.css';
 @import './col.css';
 @import './row.css';
 @import './badge.css';
-@import './button.css';
-@import './cell.css';
 @import './circle.css';
 @import './collapse.css';
-@import './loading.css';
+@import './list.css';
 @import './nav-bar.css';
 @import './notice-bar.css';
 @import './popup.css';
diff --git a/packages/vant-css/src/list.css b/packages/vant-css/src/list.css
new file mode 100644
index 000000000..81a15fd20
--- /dev/null
+++ b/packages/vant-css/src/list.css
@@ -0,0 +1,25 @@
+@import './common/var.css';
+
+.van-list {
+  &__loading {
+    text-align: center;
+
+    .van-loading,
+    &-text {
+      display: inline-block;
+      vertical-align: middle;
+    }
+
+    .van-loading {
+      width: 16px;
+      height: 16px;
+      margin-right: 5px;
+    }
+
+    &-text {
+      font-size: 13px;
+      color: $gray-dark;
+      line-height: 50px;
+    }
+  }
+}
diff --git a/packages/vant-css/src/pull-refresh.css b/packages/vant-css/src/pull-refresh.css
index 4b8833e66..d903d42b4 100644
--- a/packages/vant-css/src/pull-refresh.css
+++ b/packages/vant-css/src/pull-refresh.css
@@ -25,13 +25,13 @@
     .van-loading {
       width: 16px;
       height: 16px;
-      display: inline-block;
-      margin-right: 10px;
+      margin-right: 5px;
     }
 
     span,
     .van-loading {
       vertical-align: middle;
+      display: inline-block;
     }
   }
 
diff --git a/test/specs/list.spec.js b/test/specs/list.spec.js
new file mode 100644
index 000000000..548c96a9c
--- /dev/null
+++ b/test/specs/list.spec.js
@@ -0,0 +1,68 @@
+import List from 'packages/list';
+import { mount } from 'avoriaz';
+
+describe('List', () => {
+  let wrapper;
+
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('load event', done => {
+    wrapper = mount(List);
+
+    const spy = sinon.spy();
+    wrapper.vm.$on('load', spy);
+    wrapper.vm.$on('input', val => {
+      wrapper.vm.loading = val;
+    });
+
+    expect(spy.calledOnce).to.be.false;
+    wrapper.vm.$nextTick(() => {
+      expect(spy.calledOnce).to.be.true;
+      done();
+    });
+  });
+
+  it('finished', done => {
+    wrapper = mount(List, {
+      propsData: {
+        finished: true
+      }
+    });
+
+    const spy = sinon.spy();
+    wrapper.vm.$on('load', spy);
+
+    wrapper.vm.$nextTick(() => {
+      expect(spy.calledOnce).to.be.false;
+
+      wrapper.vm.finished = false;
+
+      setTimeout(() => {
+        expect(spy.calledOnce).to.be.true;
+        done();
+      }, 50);
+    });
+  });
+
+  it('immediate check false', done => {
+    wrapper = mount(List, {
+      propsData: {
+        immediateCheck: false
+      }
+    });
+
+    const spy = sinon.spy();
+    wrapper.vm.$on('load', spy);
+    wrapper.vm.$on('input', val => {
+      wrapper.vm.loading = val;
+    });
+
+    expect(spy.calledOnce).to.be.false;
+    wrapper.vm.$nextTick(() => {
+      expect(spy.calledOnce).to.be.false;
+      done();
+    });
+  });
+});
diff --git a/yarn.lock b/yarn.lock
index d7dd16644..f9747a923 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -507,9 +507,9 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-loader@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.3.tgz#ff5b440da716e9153abb946251a9ab7670037b16"
+babel-loader@^7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015"
   dependencies:
     find-cache-dir "^1.0.0"
     loader-utils "^1.0.2"
@@ -3325,9 +3325,9 @@ html-minifier@^3.2.3:
     relateurl "0.2.x"
     uglify-js "3.3.x"
 
-html-webpack-plugin@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.0.4.tgz#498c10f40f99a339fbf3d87c5a80acf8cbea8e9b"
+html-webpack-plugin@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.0.6.tgz#d35b0452aae129a8a9f3fac44a169a625d8cf3fa"
   dependencies:
     html-minifier "^3.2.3"
     loader-utils "^0.2.16"
@@ -6149,6 +6149,13 @@ schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.3:
     ajv "^5.0.0"
     ajv-keywords "^2.1.0"
 
+schema-utils@^0.4.5:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -6641,12 +6648,12 @@ 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"
 
-style-loader@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.2.tgz#851b373c187890331776e9cde359eea9c95ecd00"
+style-loader@^0.20.3:
+  version "0.20.3"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.3.tgz#ebef06b89dec491bcb1fdb3452e913a6fd1c10c4"
   dependencies:
     loader-utils "^1.1.0"
-    schema-utils "^0.4.3"
+    schema-utils "^0.4.5"
 
 stylus-lookup@^1.0.1:
   version "1.0.2"
@@ -7151,13 +7158,13 @@ vue-hot-reload-api@^2.2.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz#683bd1d026c0d3b3c937d5875679e9a87ec6cd8f"
 
-vue-lazyload@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.2.1.tgz#baa7356bdc1483777fd16007fbe2dddc16e98298"
+vue-lazyload@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.2.2.tgz#73335ed32db25264f5957df1a21d277823423743"
 
-vue-loader@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-14.1.1.tgz#331f197fcea790d6b8662c29b850806e7eb29342"
+vue-loader@^14.2.1:
+  version "14.2.1"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-14.2.1.tgz#3ace19f98187b1fa9e0709defa963a0a2396b6b3"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
@@ -7197,9 +7204,9 @@ vue-style-loader@^4.0.2:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.5.13:
-  version "2.5.13"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz#12a2aa0ecd6158ac5e5f14d294b0993f399c3d38"
+vue-template-compiler@^2.5.15:
+  version "2.5.15"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.15.tgz#cc004097e37167be8b85ea22ab2840d8e8cca1c0"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -7208,9 +7215,9 @@ vue-template-es2015-compiler@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
 
-vue@^2.5.13:
-  version "2.5.13"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.13.tgz#95bd31e20efcf7a7f39239c9aa6787ce8cf578e1"
+vue@^2.5.15:
+  version "2.5.15"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.15.tgz#fdb67861dde967cd8d1b53116380f2f269b45202"
 
 watchpack@^1.4.0:
   version "1.4.0"

From c45cbb632fc2508a3d123569b00bf91ca4aaa7d0 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 13 Mar 2018 16:22:28 +0800
Subject: [PATCH 08/48] [Deprecate] add Waterfall deprecate tip (#683)

---
 packages/waterfall/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/waterfall/index.js b/packages/waterfall/index.js
index 65761ea78..1ad8a0999 100644
--- a/packages/waterfall/index.js
+++ b/packages/waterfall/index.js
@@ -1,6 +1,9 @@
 import Waterfall from './directive.js';
 
 const install = function(Vue) {
+  if (process.env.NODE_ENV !== 'production') {
+    console.warn('[Vant warn] Waterfall is deprecated, please use List component instread.');
+  }
   Vue.directive('WaterfallLower', Waterfall('lower'));
   Vue.directive('WaterfallUpper', Waterfall('upper'));
 };

From 4006a86cec5f2cc4ae7fd0a8a7be883eae75b559 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 13 Mar 2018 16:36:56 +0800
Subject: [PATCH 09/48] [Improvement] PullRefresh: support trigger loading
 animation (#684)

---
 docs/demos/views/pull-refresh.vue | 2 +-
 packages/pull-refresh/index.vue   | 6 ++----
 test/specs/sku.spec.js            | 8 +++++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/demos/views/pull-refresh.vue b/docs/demos/views/pull-refresh.vue
index f63c6c214..a8ed2990f 100644
--- a/docs/demos/views/pull-refresh.vue
+++ b/docs/demos/views/pull-refresh.vue
@@ -45,7 +45,7 @@ export default {
   .van-pull-refresh {
     &,
     &__track {
-      height: 100%;
+      height: calc(100vh - 50px);
     }
   }
 
diff --git a/packages/pull-refresh/index.vue b/packages/pull-refresh/index.vue
index c895dcd36..9646d81cd 100644
--- a/packages/pull-refresh/index.vue
+++ b/packages/pull-refresh/index.vue
@@ -76,10 +76,8 @@ export default create({
 
   watch: {
     value(val) {
-      if (!val) {
-        this.duration = this.animationDuration;
-        this.getStatus(0);
-      }
+      this.duration = this.animationDuration;
+      this.getStatus(val ? this.headHeight : 0, val);
     }
   },
 
diff --git a/test/specs/sku.spec.js b/test/specs/sku.spec.js
index f687a13cf..4fbf01613 100644
--- a/test/specs/sku.spec.js
+++ b/test/specs/sku.spec.js
@@ -4,7 +4,6 @@ import Toast from 'packages/toast';
 import { mount } from 'avoriaz';
 import { DOMChecker } from '../utils';
 import skuMockData from '../../docs/demos/mock/sku';
-import repeat from 'lodash/repeat';
 
 const data = skuMockData['zh-CN'];
 const { skuHelper } = Sku;
@@ -13,6 +12,13 @@ const initialSku = {
   s1: '30349',
   s2: '1193'
 };
+const repeat = (str, count) => {
+  let result = '';
+  for (let i = 0; i < count; i++) {
+    result += str;
+  }
+  return result;
+};
 
 const File = function() {
   this.name = 'test';

From d8d1aa6e829a89dd343a6e4fa526b01962927248 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 13 Mar 2018 19:41:31 +0800
Subject: [PATCH 10/48] [Improvement] CellSwipe: optimzie animation fluency
 (#685)

---
 docs/demos/views/cell-swipe.vue      | 15 ++++------
 packages/cell-swipe/index.vue        | 27 +++++++++++-------
 packages/vant-css/src/cell-swipe.css |  6 ----
 test/specs/cell-swipe.spec.js        | 42 +++++++++++-----------------
 test/specs/datetime-picker.spec.js   | 20 ++++++-------
 test/specs/picker.spec.js            |  4 +--
 test/utils.js                        | 12 ++++----
 7 files changed, 57 insertions(+), 69 deletions(-)

diff --git a/docs/demos/views/cell-swipe.vue b/docs/demos/views/cell-swipe.vue
index 992cffe1a..56fee5629 100644
--- a/docs/demos/views/cell-swipe.vue
+++ b/docs/demos/views/cell-swipe.vue
@@ -71,21 +71,18 @@ export default {
 .demo-cell-swipe {
   user-select: none;
 
-  .van-cell-swipe__left,
-  .van-cell-swipe__right {
+  .van-cell-swipe {
+    &__left,
+    &__right {
       color: #FFFFFF;
-      font-size: 16px;
+      font-size: 15px;
       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;
+      background-color: #F44;
+    }
   }
 }
 </style>
diff --git a/packages/cell-swipe/index.vue b/packages/cell-swipe/index.vue
index ba80a2fac..bb9b23e8f 100644
--- a/packages/cell-swipe/index.vue
+++ b/packages/cell-swipe/index.vue
@@ -24,6 +24,8 @@
 import { create } from '../utils';
 import Clickoutside from '../utils/clickoutside';
 
+const THRESHOLD = 0.15;
+
 export default create({
   name: 'van-cell-swipe',
 
@@ -45,14 +47,16 @@ export default create({
 
   data() {
     return {
-      offset: 0
+      offset: 0,
+      draging: false
     };
   },
 
   computed: {
     wrapperStyle() {
       return {
-        transform: `translate3d(${this.offset}px, 0, 0)`
+        transform: `translate3d(${this.offset}px, 0, 0)`,
+        transition: this.draging ? 'none' : '.6s cubic-bezier(0.18, 0.89, 0.32, 1)'
       };
     }
   },
@@ -70,16 +74,19 @@ export default create({
     swipeMove(offset = 0) {
       this.offset = offset;
       offset && (this.swiping = true);
+      !offset && (this.opened = false);
     },
 
     swipeLeaveTransition(direction) {
       const { offset, leftWidth, rightWidth } = this;
+      const threshold = this.opened ? (1 - THRESHOLD) : THRESHOLD;
+
       // right
-      if (direction > 0 && -offset > rightWidth * 0.4 && rightWidth > 0) {
+      if (direction > 0 && -offset > rightWidth * threshold && rightWidth > 0) {
         this.swipeMove(-rightWidth);
         this.resetSwipeStatus();
       // left
-      } else if (direction < 0 && offset > leftWidth * 0.4 && leftWidth > 0) {
+      } else if (direction < 0 && offset > leftWidth * threshold && leftWidth > 0) {
         this.swipeMove(leftWidth);
         this.resetSwipeStatus();
       } else {
@@ -88,17 +95,16 @@ export default create({
     },
 
     startDrag(event) {
+      this.draging = true;
       this.startX = event.touches[0].pageX;
       this.startY = event.touches[0].pageY;
+
+      if (this.opened) {
+        this.startX -= this.offset;
+      }
     },
 
     onDrag(event) {
-      if (this.opened) {
-        !this.swiping && this.swipeMove();
-        this.opened = false;
-        return;
-      }
-
       const offsetTop = event.touches[0].pageY - this.startY;
       const offsetLeft = event.touches[0].pageX - this.startX;
       if ((offsetLeft < 0 && -offsetLeft > this.rightWidth) ||
@@ -118,6 +124,7 @@ export default create({
     },
 
     endDrag() {
+      this.draging = false;
       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 88d48cc74..50b250db3 100644
--- a/packages/vant-css/src/cell-swipe.css
+++ b/packages/vant-css/src/cell-swipe.css
@@ -4,12 +4,6 @@
   overflow: hidden;
   position: relative;
 
-  &__wrapper,
-  &__left,
-  &__right {
-    transition: transform .15s ease-in-out;
-  }
-
   &__left,
   &__right {
     top: 0;
diff --git a/test/specs/cell-swipe.spec.js b/test/specs/cell-swipe.spec.js
index 6821d7aac..d8dd20ab9 100644
--- a/test/specs/cell-swipe.spec.js
+++ b/test/specs/cell-swipe.spec.js
@@ -1,6 +1,6 @@
 import CellSwipe from 'packages/cell-swipe';
 import { mount } from 'avoriaz';
-import { triggerTouch } from '../utils';
+import { triggerTouch, dragHelper } from '../utils';
 
 const defaultProps = {
   propsData: {
@@ -60,48 +60,40 @@ describe('CellSwipe', () => {
     });
   });
 
-  it('drag and reset left part', () => {
+  it('drag and show 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);
+    dragHelper(wrapper, 50);
+    expect(wrapper.vm.offset).to.equal(100);
   });
 
-  it('drag and reset right part', () => {
+  it('drag and show 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);
+    dragHelper(wrapper, -50);
+    expect(wrapper.vm.offset).to.equal(-100);
   });
 
-  it('drag distance out of ranges', () => {
+  it('drag distance out of ranges', done => {
     wrapper = mount(CellSwipe, defaultProps);
 
     triggerTouch(wrapper, 'touchstart', 0, 0);
     triggerTouch(wrapper, 'touchmove', 1000, 0);
-    expect(wrapper.vm.offset).to.equal(0);
+    
+    setTimeout(() => {
+      expect(wrapper.vm.offset).to.equal(0);
+      done();
+    });
   });
 
   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);
+    dragHelper(wrapper, 50);
     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);
-
+      dragHelper(wrapper, -50);
       wrapper.vm.$nextTick(() => {
         expect(wrapper.vm.offset).to.equal(0);
         expect(wrapper.vm.opened).to.be.false;
@@ -113,9 +105,7 @@ describe('CellSwipe', () => {
   it('drag vertical', () => {
     wrapper = mount(CellSwipe, defaultProps);
 
-    triggerTouch(wrapper, 'touchstart', 0, 0);
-    triggerTouch(wrapper, 'touchmove', 0, 100);
-    triggerTouch(wrapper, 'touchend', 0, 100);
+    dragHelper(wrapper, 0, 100);
     expect(wrapper.vm.offset).to.equal(0);
   });
 
diff --git a/test/specs/datetime-picker.spec.js b/test/specs/datetime-picker.spec.js
index 4095e08fd..defb80093 100644
--- a/test/specs/datetime-picker.spec.js
+++ b/test/specs/datetime-picker.spec.js
@@ -56,8 +56,8 @@ describe('DatetimePicker', () => {
     });
 
     const [hour, minute] = wrapper.find('.van-picker-column ul');
-    dragHelper(hour, -50);
-    dragHelper(minute, -50);
+    dragHelper(hour, 0, -50);
+    dragHelper(minute, 0, -50);
 
     setTimeout(() => {
       expect(wrapper.vm.innerValue).to.equal('1:01');
@@ -78,9 +78,9 @@ describe('DatetimePicker', () => {
 
     setTimeout(() => {
       const [year, month, day] = wrapper.find('.van-picker-column ul');
-      dragHelper(year, -50);
-      dragHelper(month, -50);
-      dragHelper(day, -50);
+      dragHelper(year, 0, -50);
+      dragHelper(month, 0, -50);
+      dragHelper(day, 0, -50);
       setTimeout(() => {
         const newYear = wrapper.vm.innerValue.getFullYear();
         const newMonth = wrapper.vm.innerValue.getMonth() + 1;
@@ -106,11 +106,11 @@ describe('DatetimePicker', () => {
 
     setTimeout(() => {
       const [year, month, day, hour, minute] = wrapper.find('.van-picker-column ul');
-      dragHelper(year, -50);
-      dragHelper(month, -50);
-      dragHelper(day, -50);
-      dragHelper(hour, -50);
-      dragHelper(minute, -50);
+      dragHelper(year, 0, -50);
+      dragHelper(month, 0, -50);
+      dragHelper(day, 0, -50);
+      dragHelper(hour, 0, -50);
+      dragHelper(minute, 0, -50);
       setTimeout(() => {
         const newYear = wrapper.vm.innerValue.getFullYear();
         const newMonth = wrapper.vm.innerValue.getMonth() + 1;
diff --git a/test/specs/picker.spec.js b/test/specs/picker.spec.js
index c2d6bb345..973f0dc4a 100644
--- a/test/specs/picker.spec.js
+++ b/test/specs/picker.spec.js
@@ -274,10 +274,10 @@ describe('PickerColumn', () => {
     expect(wrapper.vm.currentIndex).to.equal(0);
 
     const column = wrapper.find('.van-picker-column')[0];
-    dragHelper(column, 0);
+    dragHelper(column, 0, 0);
     expect(wrapper.vm.currentIndex).to.equal(0);
 
-    dragHelper(column, -100);
+    dragHelper(column, 0, -100);
     expect(wrapper.vm.currentIndex).to.equal(2);
   });
 });
diff --git a/test/utils.js b/test/utils.js
index 86a162f6b..c4e85b7ed 100644
--- a/test/utils.js
+++ b/test/utils.js
@@ -74,11 +74,11 @@ export function triggerTouch(wrapper, eventName, x, y) {
   el.dispatchEvent(event);
 }
 
-export function dragHelper(el, position) {
+export function dragHelper(el, x = 0, y = 0) {
   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);
+  triggerTouch(el, 'touchmove', x / 4, y / 4);
+  triggerTouch(el, 'touchmove', x / 3, y / 3);
+  triggerTouch(el, 'touchmove', x / 2, y / 2);
+  triggerTouch(el, 'touchmove', x, y);
+  triggerTouch(el, 'touchend', x, y);
 }

From 31be42bc8c16dc8c247cab7f555a271358fd5cbe Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 13 Mar 2018 22:45:20 +0800
Subject: [PATCH 11/48] [bugfix] Actionsheet: border display error (#686)

---
 docs/demos/views/actionsheet.vue      |  8 +++++---
 docs/markdown/en-US/actionsheet.md    | 15 ++++++++++++---
 docs/markdown/zh-CN/actionsheet.md    |  3 ++-
 packages/actionsheet/index.vue        |  2 +-
 packages/vant-css/src/actionsheet.css |  1 +
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/docs/demos/views/actionsheet.vue b/docs/demos/views/actionsheet.vue
index 56fcd4124..120f103c3 100644
--- a/docs/demos/views/actionsheet.vue
+++ b/docs/demos/views/actionsheet.vue
@@ -27,14 +27,16 @@ export default {
       button2: '弹出带取消按钮的 Actionsheet',
       button3: '弹出带标题的 Actionsheet',
       title2: '带取消按钮的 Actionsheet',
-      title3: '带标题的 Actionsheet'
+      title3: '带标题的 Actionsheet',
+      description: '描述信息'
     },
     'en-US': {
       button1: 'Show Actionsheet',
       button2: 'Show Actionsheet with cancel button',
       button3: 'Show Actionsheet with title',
       title2: 'Actionsheet with cancel button',
-      title3: 'Actionsheet with title'
+      title3: 'Actionsheet with title',
+      description: 'Description'
     }
   },
 
@@ -50,7 +52,7 @@ export default {
     actions() {
       return [
         { name: this.$t('option'), callback: this.onClick },
-        { name: this.$t('option') },
+        { name: this.$t('option'), subname: this.$t('description') },
         { name: this.$t('option'), loading: true }
       ];
     }
diff --git a/docs/markdown/en-US/actionsheet.md b/docs/markdown/en-US/actionsheet.md
index 6a58204ed..5760d01c6 100644
--- a/docs/markdown/en-US/actionsheet.md
+++ b/docs/markdown/en-US/actionsheet.md
@@ -22,9 +22,18 @@ export default {
     return {
       show: false,
       actions: [
-        { name: 'Option1', callback: this.onClick },
-        { name: 'Option2' },
-        { name: 'Option3', loading: true }
+        {
+          name: 'Option',
+          callback: this.onClick
+        },
+        {
+          name: 'Option',
+          description: 'Description'
+        },
+        {
+          name: 'Option',
+          loading: true
+        }
       ]
     };
   },
diff --git a/docs/markdown/zh-CN/actionsheet.md b/docs/markdown/zh-CN/actionsheet.md
index a91d53b94..41e6c8f07 100644
--- a/docs/markdown/zh-CN/actionsheet.md
+++ b/docs/markdown/zh-CN/actionsheet.md
@@ -27,7 +27,8 @@ export default {
           callback: this.onClick
         },
         {
-          name: '信用卡支付'
+          name: '选项',
+          subname: '描述信息'
         },
         {
           name: '选项',
diff --git a/packages/actionsheet/index.vue b/packages/actionsheet/index.vue
index f04920049..4c2b3ca8a 100644
--- a/packages/actionsheet/index.vue
+++ b/packages/actionsheet/index.vue
@@ -5,7 +5,7 @@
         <div v-text="title" />
         <icon name="close" @click.stop="$emit('input', false)" />
       </div>
-      <ul v-if="!title" class="van-actionsheet__list">
+      <ul v-if="!title" class="van-actionsheet__list van-hairline--bottom">
         <li
           v-for="(item, index) in actions"
           :key="index"
diff --git a/packages/vant-css/src/actionsheet.css b/packages/vant-css/src/actionsheet.css
index bf884756d..288ea5859 100644
--- a/packages/vant-css/src/actionsheet.css
+++ b/packages/vant-css/src/actionsheet.css
@@ -28,6 +28,7 @@
   &__subname {
     font-size: 12px;
     color: $gray-darker;
+    margin-left: 5px;
   }
 
   &__loading {

From 7d3768591f14b4b3392045d325d6d2b2dd8dd818 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 14 Mar 2018 10:28:51 +0800
Subject: [PATCH 12/48] [bugfix] Badge info font weight (#687)

---
 docs/src/WapApp.vue             | 5 +++++
 packages/mixins/popup/index.js  | 3 +--
 packages/vant-css/src/badge.css | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/src/WapApp.vue b/docs/src/WapApp.vue
index 321bb6170..fc2200ef5 100644
--- a/docs/src/WapApp.vue
+++ b/docs/src/WapApp.vue
@@ -45,4 +45,9 @@ body {
     text-transform: capitalize;
   }
 }
+
+.van-doc-demo-section {
+  margin-top: -46px;
+  padding-top: 46px;
+}
 </style>
diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js
index 24d7f6ac0..e051ee633 100644
--- a/packages/mixins/popup/index.js
+++ b/packages/mixins/popup/index.js
@@ -105,8 +105,6 @@ export default {
         return;
       }
 
-      this.$emit('input', true);
-
       // 如果属性中传入了`zIndex`，则覆盖`context`中对应的`zIndex`
       if (this.zIndex !== undefined) {
         context.zIndex = this.zIndex;
@@ -127,6 +125,7 @@ export default {
       }
 
       this.$el.style.zIndex = context.plusKey('zIndex');
+      this.$emit('input', true);
       this.opened = true;
 
       if (this.preventScroll) {
diff --git a/packages/vant-css/src/badge.css b/packages/vant-css/src/badge.css
index 141ec3391..a1126537e 100644
--- a/packages/vant-css/src/badge.css
+++ b/packages/vant-css/src/badge.css
@@ -44,8 +44,9 @@
     position: absolute;
     top: 2px;
     right: 2px;
+    color: $white;
     font-size: 10px;
-    color: $white;    
+    font-weight: normal;
     transform: scale(0.8);
     text-align: center;
     box-sizing: border-box;

From d36dd61bc92ce163de9ee90c7c5cfb44b7277beb Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 14 Mar 2018 11:07:48 +0800
Subject: [PATCH 13/48] [breaking change] Popup: add lockScroll instead of
 lockOnScroll & preventScroll (#688)

---
 docs/demos/views/popup.vue     | 35 +++++++++++++++-------------------
 docs/markdown/en-US/dialog.md  |  4 ++--
 docs/markdown/en-US/popup.md   |  3 +--
 docs/markdown/zh-CN/dialog.md  |  4 ++--
 docs/markdown/zh-CN/popup.md   |  3 +--
 packages/dialog/dialog.vue     |  4 ----
 packages/dialog/index.js       |  2 +-
 packages/mixins/popup/index.js | 22 +++++++--------------
 packages/popup/index.vue       |  4 ----
 packages/sku/Sku.vue           |  2 --
 test/specs/popup.spec.js       |  9 +++------
 types/dialog.d.ts              |  2 +-
 12 files changed, 33 insertions(+), 61 deletions(-)

diff --git a/docs/demos/views/popup.vue b/docs/demos/views/popup.vue
index 1f13aa9e0..146711989 100644
--- a/docs/demos/views/popup.vue
+++ b/docs/demos/views/popup.vue
@@ -2,21 +2,19 @@
   <demo-section>
     <demo-block :title="$t('basicUsage')">
       <van-button @click="show1 = true">{{ $t('button1') }}</van-button>
-      <van-popup v-model="show1" prevent-scroll>{{ $t('content') }}</van-popup>
+      <van-popup v-model="show1">{{ $t('content') }}</van-popup>
     </demo-block>
 
     <demo-block :title="$t('position')">
       <van-button @click="show2 = true;">{{ $t('button2') }}</van-button>
 
-      <van-popup v-model="show2" position="bottom" prevent-scroll>
+      <van-popup v-model="show2" position="bottom">
         <van-tabs>
-          <van-tab class="custom-pane" title="Tab1">
-            <ul class="scroller">
-              <li v-for="i in 30" :key="i" class="list-item">{{ i }} item item item</li>
-            </ul>
+          <van-tab title="Tab1">
+            <van-cell v-for="i in 20" :key="i" :title="`Item ${ i }`" />
           </van-tab>
-          <van-tab class="custom-pane" title="Tab2">
-            <p class="long-text">Lorem ipsum dolor sit amet, quis interdum et sollicitudin consectetuer scelerisque, gravida nulla consequatur dis mauris non morbi, dictum leo enim elementum ac wisi nullam, nam orci erat. Ultrices est. Nunc penatibus vel varius odio. Ullamcorper placerat amet amet sed, urna tempor, elit elit at. Eget congue. Sed proin metus sapien libero, pulvinar ut, ut aenean fermentum magna placerat dapibus voluptas, sed at lacinia pede fermentum rutrum et. Vitae nulla sapien vel in hac felis, montes in donec nulla eu volutpat augue.</p>
+          <van-tab title="Tab2">
+            Lorem ipsum dolor sit amet, quis interdum et sollicitudin consectetuer scelerisque, gravida nulla consequatur dis mauris non morbi, dictum leo enim elementum ac wisi nullam, nam orci erat. Ultrices est. Nunc penatibus vel varius odio. Ullamcorper placerat amet amet sed, urna tempor, elit elit at. Eget congue. Sed proin metus sapien libero, pulvinar ut, ut aenean fermentum magna placerat dapibus voluptas, sed at lacinia pede fermentum rutrum et. Vitae nulla sapien vel in hac felis, montes in donec nulla eu volutpat augue.
           </van-tab>
         </van-tabs>
       </van-popup>
@@ -89,6 +87,8 @@ export default {
 
 <style lang="postcss">
 .demo-popup {
+  height: 10000px;
+
   .van-button {
     margin: 10px 0 10px 15px;
   }
@@ -107,20 +107,15 @@ export default {
     }
 
     .van-tabs__content {
-      height: 166px;
+      height: 156px;
       overflow-y: scroll;
       -webkit-overflow-scrolling: touch;
-      .list-item {
-        padding: 10px 10px;
-        &:not(:last-child) {
-          border-bottom: 1px solid #f9f9f9;
-        }
-      }
-      .long-text {
-        padding: 10px;
-        line-height: 1.4;
-        color: #666;
-      }
+    }
+  
+    .van-tab__pane:not(:first-child) {
+      padding: 10px;
+      line-height: 1.4;
+      color: #666;
     }
 
     &--top {
diff --git a/docs/markdown/en-US/dialog.md b/docs/markdown/en-US/dialog.md
index dabb6c836..62c1f35e1 100644
--- a/docs/markdown/en-US/dialog.md
+++ b/docs/markdown/en-US/dialog.md
@@ -76,7 +76,7 @@ export default {
 | cancelButtonText | Cancel button test | `String` | `Cancel` | - |
 | overlay | Whether to show overlay | `Boolean` | `true` | - |
 | closeOnClickOverlay | Whether to close when click overlay | `Boolean` | `false` | - |
-| lockOnScroll | Whether to lock body scroll | `Boolean` | `true` | - |
+| lockScroll | Whether to lock body scroll | `Boolean` | `true` | - |
 
 #### Advanced Usage
 If you need to render vue components within a dialog, you can use dialog component.
@@ -130,7 +130,7 @@ export default {
 | cancel-button-text | Cancel button test | `String` | `Cancel` | - |
 | overlay | Whether to show overlay | `Boolean` | `true` | - |
 | close-on-click-overlay | Whether to close when click overlay | `Boolean` | `false` | - |
-| lock-on-scroll | Whether to lock body scroll | `Boolean` | `true` | - |
+| lock-scroll | Whether to lock background scroll | `Boolean` | `true` | - |
 
 ### Event
 
diff --git a/docs/markdown/en-US/popup.md b/docs/markdown/en-US/popup.md
index ac2f1f7c3..0f7c17d0a 100644
--- a/docs/markdown/en-US/popup.md
+++ b/docs/markdown/en-US/popup.md
@@ -41,13 +41,12 @@ Use `position` prop to set popup display position
 |-----------|-----------|-----------|-------------|-------------|
 | v-model | Whether to show popup | `Boolean` | `false` | - |
 | overlay | Whether to show overlay | `Boolean` | `true` | - |
-| lock-on-scroll | Lock body scroll | `Boolean` | `false` | - |
 | position | Position | `String` | - | `top` `bottom` `right` `left` |
 | overlay-class | Custom overlay class | `String` | `` | - |
 | overlay-style | Custom overlay style | `Object` | - | - |
 | close-on-click-overlay | Close popup when click overlay | `Boolean` | `true` | - |
 | transition | Transition | `String` | `popup-slide` | - |
-| prevent-scroll | Prevent background scroll | `Boolean` | `false` | - |
+| lock-scroll | Whether to lock background scroll | `Boolean` | `true` | - |
 | get-container | Return the mount node for Popup | `Function` | - | `() => HTMLElement` |
 
 ### Event
diff --git a/docs/markdown/zh-CN/dialog.md b/docs/markdown/zh-CN/dialog.md
index 24e738763..c48bb5352 100644
--- a/docs/markdown/zh-CN/dialog.md
+++ b/docs/markdown/zh-CN/dialog.md
@@ -77,7 +77,7 @@ export default {
 | cancelButtonText | 取消按钮的文案 | `String` | `取消` | - |
 | overlay | 是否展示蒙层 | `Boolean` | `true` | - |
 | closeOnClickOverlay | 点击蒙层时是否关闭弹窗 | `Boolean` | `false` | - |
-| lockOnScroll | 是否禁用背景滚动 | `Boolean` | `true` | - |
+| lockScroll | 是否锁定背景滚动 | `Boolean` | `true` | - |
 
 
 #### 高级用法
@@ -132,7 +132,7 @@ export default {
 | cancel-button-text | 取消按钮的文案 | `String` | `取消` | - |
 | overlay | 是否展示蒙层 | `Boolean` | `true` | - |
 | close-on-click-overlay | 点击蒙层时是否关闭弹窗 | `Boolean` | `false` | - |
-| lock-on-scroll | 是否禁用背景滚动 | `Boolean` | `true` | - |
+| lock-scroll | 是否锁定背景滚动 | `Boolean` | `true` | - |
 
 ### Event
 
diff --git a/docs/markdown/zh-CN/popup.md b/docs/markdown/zh-CN/popup.md
index 009e537ae..f1fc0db58 100644
--- a/docs/markdown/zh-CN/popup.md
+++ b/docs/markdown/zh-CN/popup.md
@@ -41,13 +41,12 @@ export default {
 |-----------|-----------|-----------|-------------|-------------|
 | v-model | 当前组件是否显示 | `Boolean` | `false` | - |
 | overlay | 是否显示背景蒙层 | `Boolean` | `true` | - |
-| lock-on-scroll | 背景是否跟随滚动 | `Boolean` | `false` | - |
+| lock-scroll | 是否锁定背景滚动 | `Boolean` | `true` | - |
 | position | Popup 位置 | `String` | - | `top` `bottom` `right` `left` |
 | overlay-class | 自定义蒙层 class | `String` | `` | - |
 | overlay-style | 自定义蒙层样式 | `Object` | `` | - |
 | close-on-click-overlay | 点击蒙层是否关闭 Popup | `Boolean` | `true` | - |
 | transition | transition 名称 | `String` | `popup-slide` | - |
-| prevent-scroll | 是否防止滚动穿透 | `Boolean` | `false` | - |
 | get-container | 指定弹出层挂载的 HTML 节点 | `Function` | - | `() => HTMLElement` |
 
 ### Event
diff --git a/packages/dialog/dialog.vue b/packages/dialog/dialog.vue
index 166bf115e..2de2eb787 100644
--- a/packages/dialog/dialog.vue
+++ b/packages/dialog/dialog.vue
@@ -62,10 +62,6 @@ export default create({
     closeOnClickOverlay: {
       type: Boolean,
       default: false
-    },
-    lockOnScroll: {
-      type: Boolean,
-      default: true
     }
   },
 
diff --git a/packages/dialog/index.js b/packages/dialog/index.js
index 37a46bc51..90f811e29 100644
--- a/packages/dialog/index.js
+++ b/packages/dialog/index.js
@@ -34,7 +34,7 @@ Dialog.defaultOptions = {
   title: '',
   message: '',
   overlay: true,
-  lockOnScroll: true,
+  lockScroll: true,
   confirmButtonText: '',
   cancelButtonText: '',
   showConfirmButton: true,
diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js
index e051ee633..2a178cb0a 100644
--- a/packages/mixins/popup/index.js
+++ b/packages/mixins/popup/index.js
@@ -17,12 +17,10 @@ export default {
     closeOnClickOverlay: Boolean,
     // z-index
     zIndex: [String, Number],
-    // prevent touchmove scroll
-    preventScroll: Boolean,
     // return the mount node for popup
     getContainer: Function,
     // prevent body scroll
-    lockOnScroll: {
+    lockScroll: {
       type: Boolean,
       default: true
     }
@@ -118,20 +116,17 @@ export default {
           className: this.overlayClass,
           customStyle: this.overlayStyle
         });
+      }
 
-        if (this.lockOnScroll) {
-          document.body.classList.add('van-overflow-hidden');
-        }
+      if (this.lockScroll) {
+        document.body.classList.add('van-overflow-hidden');
+        on(document, 'touchstart', this.recordPosition);
+        on(document, 'touchmove', this.watchTouchMove);
       }
 
       this.$el.style.zIndex = context.plusKey('zIndex');
       this.$emit('input', true);
       this.opened = true;
-
-      if (this.preventScroll) {
-        on(document, 'touchstart', this.recordPosition);
-        on(document, 'touchmove', this.watchTouchMove);
-      }
     },
 
     close() {
@@ -147,11 +142,8 @@ export default {
     doAfterClose() {
       manager.close(this._popupId);
 
-      if (this.lockOnScroll) {
+      if (this.lockScroll) {
         document.body.classList.remove('van-overflow-hidden');
-      }
-
-      if (this.preventScroll) {
         off(document, 'touchstart', this.recordPosition);
         off(document, 'touchmove', this.watchTouchMove);
       }
diff --git a/packages/popup/index.vue b/packages/popup/index.vue
index a6291cfa5..8fa9ed4a6 100644
--- a/packages/popup/index.vue
+++ b/packages/popup/index.vue
@@ -21,10 +21,6 @@ export default create({
       type: Boolean,
       default: true
     },
-    lockOnScroll: {
-      type: Boolean,
-      default: false
-    },
     closeOnClickOverlay: {
       type: Boolean,
       default: true
diff --git a/packages/sku/Sku.vue b/packages/sku/Sku.vue
index e552f54db..2f7c1dcb0 100644
--- a/packages/sku/Sku.vue
+++ b/packages/sku/Sku.vue
@@ -3,8 +3,6 @@
     v-if="!isSkuEmpty"
     v-model="show"
     position="bottom"
-    lock-on-scroll
-    prevent-scroll
     :close-on-click-overlay="closeOnClickOverlay"
     :get-container="getContainer"
   >
diff --git a/test/specs/popup.spec.js b/test/specs/popup.spec.js
index 1cef0261c..6676c532e 100644
--- a/test/specs/popup.spec.js
+++ b/test/specs/popup.spec.js
@@ -24,8 +24,7 @@ describe('Popup', () => {
       propsData: {
         value: false,
         zIndex: 100,
-        overlay: false,
-        lockOnScroll: true
+        overlay: false
       }
     });
 
@@ -64,7 +63,6 @@ describe('Popup', () => {
   it('popup prevent scroll', (done) => {
     wrapper = mount(Popup, {
       propsData: {
-        preventScroll: true,
         value: true
       }
     });
@@ -89,7 +87,6 @@ describe('Popup', () => {
   it('popup modal', (done) => {
     wrapper = mount(Popup, {
       propsData: {
-        preventScroll: true,
         value: true
       }
     });
@@ -120,12 +117,12 @@ describe('Popup', () => {
     wrapper = mount(Popup, {
       propsData: {
         overlay: '',
-        lockOnScroll: '',
+        lockScroll: '',
         closeOnClickOverlay: ''
       }
     });
 
-    expect(wrapper.vm.lockOnScroll).to.be.true;
+    expect(wrapper.vm.lockScroll).to.be.true;
   });
 
   it('get container prop', done => {
diff --git a/types/dialog.d.ts b/types/dialog.d.ts
index fbc05f21a..4e316e124 100644
--- a/types/dialog.d.ts
+++ b/types/dialog.d.ts
@@ -2,7 +2,7 @@ export type DialogOptions = {
   title?: string;
   message?: string;
   overlay?: boolean;
-  lockOnScroll?: boolean;
+  lockScroll?: boolean;
   confirmButtonText?: string;
   cancelButtonText?: string;
   showConfirmButton?: boolean;

From 8f2bd937862d704e003d51c60fa8201937cb333e Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 14 Mar 2018 11:33:02 +0800
Subject: [PATCH 14/48] [Improvement] Tag: adjust style (#689)

---
 packages/tag/index.vue        | 9 ++++++++-
 packages/vant-css/src/tag.css | 7 ++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/tag/index.vue b/packages/tag/index.vue
index 3c981d598..e069c2111 100644
--- a/packages/tag/index.vue
+++ b/packages/tag/index.vue
@@ -1,5 +1,12 @@
 <template>
-  <span class="van-tag van-hairline--surround" :class="{ [`van-tag--${type}`]: type, 'van-tag--plain': plain, 'van-tag--mark': mark }">
+  <span
+    class="van-tag van-hairline--surround"
+    :class="{
+      [`van-tag--${type}`]: type,
+      'van-tag--plain': plain,
+      'van-tag--mark': mark
+    }"
+  >
     <slot />
   </span>
 </template>
diff --git a/packages/vant-css/src/tag.css b/packages/vant-css/src/tag.css
index 7152d432e..826570b1a 100644
--- a/packages/vant-css/src/tag.css
+++ b/packages/vant-css/src/tag.css
@@ -2,9 +2,9 @@
 
 .van-tag {
   display: inline-block;
-  line-height: 14px;
-  padding: 1px 5px;
-  border-radius: 2px;
+  padding: 0 5px;
+  line-height: 18px;
+  border-radius: 3px;
   font-size: 10px;
   background: $gray;
   color: $white;
@@ -15,6 +15,7 @@
   }
 
   &--mark {
+    padding-right: 7px;
     border-radius: 0 8px 8px 0;
 
     &::after {

From 461b6732eb46648d33d7ba2d5ca7410ffde3d7da Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 14 Mar 2018 11:47:46 +0800
Subject: [PATCH 15/48] [Improvement] Toast: support Vue.use to register (#690)

---
 build/bin/build-entry.js         |  5 +----
 docs/demos/views/popup.vue       |  2 --
 packages/dialog/index.js         |  2 +-
 packages/image-preview/index.js  | 14 ++++++++------
 packages/index.js                |  3 +++
 packages/locale/index.js         |  8 ++++++--
 packages/toast/index.js          |  4 ++++
 packages/waterfall/index.js      |  3 +--
 test/specs/dialog.spec.js        |  2 +-
 test/specs/image-preview.spec.js |  5 +++++
 test/specs/toast.spec.js         |  6 ++++++
 11 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/build/bin/build-entry.js b/build/bin/build-entry.js
index 0ceccbc1c..639e32cf9 100644
--- a/build/bin/build-entry.js
+++ b/build/bin/build-entry.js
@@ -8,10 +8,7 @@ const tips = '// This file is auto gererated by build/bin/build-entry.js';
 function buildVantEntry() {
   const uninstallComponents = [
     'Lazyload',
-    'Waterfall',
-    'Toast',
-    'ImagePreview',
-    'Locale'
+    'Waterfall'
   ];
 
   const importList = Components.map(name => `import ${uppercamelize(name)} from './${name}';`);
diff --git a/docs/demos/views/popup.vue b/docs/demos/views/popup.vue
index 146711989..b73aba431 100644
--- a/docs/demos/views/popup.vue
+++ b/docs/demos/views/popup.vue
@@ -87,8 +87,6 @@ export default {
 
 <style lang="postcss">
 .demo-popup {
-  height: 10000px;
-
   .van-button {
     margin: 10px 0 10px 15px;
   }
diff --git a/packages/dialog/index.js b/packages/dialog/index.js
index 90f811e29..262ec734b 100644
--- a/packages/dialog/index.js
+++ b/packages/dialog/index.js
@@ -69,7 +69,7 @@ Dialog.resetDefaultOptions = () => {
 };
 
 Dialog.install = () => {
-  Vue.component(VanDialog.name, VanDialog);
+  Vue.use(VanDialog);
 };
 
 Vue.prototype.$dialog = Dialog;
diff --git a/packages/image-preview/index.js b/packages/image-preview/index.js
index 0110b3739..abbabc65b 100644
--- a/packages/image-preview/index.js
+++ b/packages/image-preview/index.js
@@ -1,18 +1,16 @@
 import Vue from 'vue';
-import ImagePreview from './image-preview';
+import VueImagePreview from './image-preview';
 
 let instance;
 
-const ImagePreviewConstructor = Vue.extend(ImagePreview);
-
 const initInstance = () => {
-  instance = new ImagePreviewConstructor({
+  instance = new (Vue.extend(VueImagePreview))({
     el: document.createElement('div')
   });
   document.body.appendChild(instance.$el);
 };
 
-const ImagePreviewBox = (images, startPosition = 0) => {
+const ImagePreview = (images, startPosition = 0) => {
   if (!instance) {
     initInstance();
   }
@@ -27,4 +25,8 @@ const ImagePreviewBox = (images, startPosition = 0) => {
   return instance;
 };
 
-export default ImagePreviewBox;
+ImagePreview.install = () => {
+  Vue.use(VueImagePreview);
+};
+
+export default ImagePreview;
diff --git a/packages/index.js b/packages/index.js
index 1fc0b9a57..0df5c8b6e 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -97,8 +97,10 @@ const components = [
   GoodsActionBigBtn,
   GoodsActionMiniBtn,
   Icon,
+  ImagePreview,
   List,
   Loading,
+  Locale,
   NavBar,
   NoticeBar,
   NumberKeyboard,
@@ -127,6 +129,7 @@ const components = [
   TabbarItem,
   Tabs,
   Tag,
+  Toast,
   TreeSelect,
   Uploader
 ];
diff --git a/packages/locale/index.js b/packages/locale/index.js
index bf456e9a8..ab56b32bc 100644
--- a/packages/locale/index.js
+++ b/packages/locale/index.js
@@ -5,7 +5,10 @@ import defaultMessages from './lang/zh-CN';
 const proto = Vue.prototype;
 const defaultLang = 'zh-CN';
 const locale = {
-  init() {
+  install() {
+    if (proto.$vantLang) {
+      return;
+    }
     Vue.util.defineReactive(proto, '$vantLang', defaultLang);
     Vue.util.defineReactive(proto, '$vantMessages', { [defaultLang]: defaultMessages });
   },
@@ -20,5 +23,6 @@ const locale = {
   }
 };
 
-locale.init();
+locale.install();
+
 export default locale;
diff --git a/packages/toast/index.js b/packages/toast/index.js
index 8df3e940d..1b29758ef 100644
--- a/packages/toast/index.js
+++ b/packages/toast/index.js
@@ -86,6 +86,10 @@ Toast.allowMultiple = (allow = true) => {
   singleton = !allow;
 };
 
+Toast.install = () => {
+  Vue.use(VueToast);
+};
+
 Vue.prototype.$toast = Toast;
 
 export default Toast;
diff --git a/packages/waterfall/index.js b/packages/waterfall/index.js
index 1ad8a0999..34bafacff 100644
--- a/packages/waterfall/index.js
+++ b/packages/waterfall/index.js
@@ -1,6 +1,6 @@
 import Waterfall from './directive.js';
 
-const install = function(Vue) {
+Waterfall.install = function(Vue) {
   if (process.env.NODE_ENV !== 'production') {
     console.warn('[Vant warn] Waterfall is deprecated, please use List component instread.');
   }
@@ -8,5 +8,4 @@ const install = function(Vue) {
   Vue.directive('WaterfallUpper', Waterfall('upper'));
 };
 
-Waterfall.install = install;
 export default Waterfall;
diff --git a/test/specs/dialog.spec.js b/test/specs/dialog.spec.js
index ca56e75ce..6f44beabd 100644
--- a/test/specs/dialog.spec.js
+++ b/test/specs/dialog.spec.js
@@ -60,7 +60,7 @@ describe('Dialog', () => {
     expect(Dialog.currentOptions.title).to.equal('');
   });
 
-  it('register dialog component', () => {
+  it('register component', () => {
     Vue.use(Dialog);
     expect(!!Vue.component('van-dialog')).to.be.true;
   });
diff --git a/test/specs/image-preview.spec.js b/test/specs/image-preview.spec.js
index aa04a5218..75d51fb73 100644
--- a/test/specs/image-preview.spec.js
+++ b/test/specs/image-preview.spec.js
@@ -54,4 +54,9 @@ describe('ImagePreview', () => {
       done();
     });
   });
+
+  it('register component', () => {
+    Vue.use(ImagePreview);
+    expect(!!Vue.component('van-image-preview')).to.be.true;
+  });
 });
diff --git a/test/specs/toast.spec.js b/test/specs/toast.spec.js
index 2e46c90b2..a69a2770e 100644
--- a/test/specs/toast.spec.js
+++ b/test/specs/toast.spec.js
@@ -1,3 +1,4 @@
+import Vue from 'vue';
 import Toast from 'packages/toast';
 
 describe('Toast', () => {
@@ -132,4 +133,9 @@ describe('Toast', () => {
     const toast2 = Toast(1);
     expect(toast2.duration).to.equal(3000);
   });
+
+  it('register component', () => {
+    Vue.use(Toast);
+    expect(!!Vue.component('van-toast')).to.be.true;
+  });
 });

From f13a0779fd9f223d424113763c89fcf89c06165d Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 15 Mar 2018 10:13:48 +0800
Subject: [PATCH 16/48] [Improvement] upgrade to webpack 4 (#693)

---
 build/webpack.build.js            |   19 +-
 build/webpack.config.dev.js       |   31 +-
 build/webpack.config.prod.js      |   11 +-
 docs/demos/mock/area.js           | 3607 +++++++++++++++++++++++++++++
 docs/demos/mock/area.json         | 3607 -----------------------------
 docs/demos/mock/areaEn.js         |   71 +
 docs/demos/mock/areaEn.json       |   71 -
 docs/demos/views/address-edit.vue |    2 +-
 docs/demos/views/area.vue         |    4 +-
 docs/markdown/en-US/area.md       |    2 +-
 docs/markdown/zh-CN/area.md       |    2 +-
 package.json                      |   27 +-
 test/get-webpack-conf.js          |   12 +-
 test/specs/address-edit.spec.js   |    2 +-
 test/specs/area.spec.js           |    2 +-
 test/specs/utils.spec.js          |    2 +-
 types/index.d.ts                  |    3 +
 yarn.lock                         | 3129 +++++++++++++++++++++----
 18 files changed, 6384 insertions(+), 4220 deletions(-)
 create mode 100644 docs/demos/mock/area.js
 delete mode 100644 docs/demos/mock/area.json
 create mode 100644 docs/demos/mock/areaEn.js
 delete mode 100644 docs/demos/mock/areaEn.json

diff --git a/build/webpack.build.js b/build/webpack.build.js
index 1a8a423bc..6c1e7cf28 100644
--- a/build/webpack.build.js
+++ b/build/webpack.build.js
@@ -1,16 +1,20 @@
+const path = require('path');
 const webpack = require('webpack');
 const config = require('./webpack.config.dev.js');
 const isMinify = process.argv.indexOf('-p') !== -1;
 
 module.exports = Object.assign({}, config, {
+  mode: 'production',
   entry: {
     'vant': './packages/index.js'
   },
   output: {
-    filename: isMinify ? './lib/[name].min.js' : './lib/[name].js',
+    path: path.join(__dirname, '../lib'),
     library: 'vant',
     libraryTarget: 'umd',
-    umdNamedDefine: true
+    filename: isMinify ? '[name].min.js' : '[name].js',
+    umdNamedDefine: true,
+    globalObject: 'this'
   },
   externals: {
     vue: {
@@ -20,10 +24,9 @@ module.exports = Object.assign({}, config, {
       amd: 'vue'
     }
   },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': '"production"'
-    }),
-    new webpack.optimize.ModuleConcatenationPlugin()
-  ]
+  plugins: [],
+  performance: false,
+  optimization: {
+    minimize: isMinify
+  }
 });
diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js
index a98513df1..377466cbf 100644
--- a/build/webpack.config.dev.js
+++ b/build/webpack.config.dev.js
@@ -3,16 +3,10 @@ const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
-const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin');
 const isProduction = process.env.NODE_ENV === 'production';
-const cache = {
-  loader: 'cache-loader',
-  options: {
-    cacheDirectory: path.resolve(__dirname, '../node_modules/.cache-loader')
-  }
-};
 
 module.exports = {
+  mode: 'development',
   entry: {
     'vant-docs': './docs/src/index.js',
     'vant-mobile': './docs/src/mobile.js'
@@ -20,7 +14,6 @@ module.exports = {
   output: {
     path: path.join(__dirname, '../docs/dist'),
     publicPath: '/',
-    filename: '[name].js',
     chunkFilename: 'async_[name].js'
   },
   devServer: {
@@ -34,21 +27,17 @@ module.exports = {
     stats: 'errors-only'
   },
   resolve: {
-    modules: [path.join(__dirname, '../node_modules'), 'node_modules'],
     extensions: ['.js', '.vue', '.css'],
     alias: {
       vue: 'vue/dist/vue.runtime.esm.js',
-      packages: path.join(__dirname, '../packages'),
-      lib: path.join(__dirname, '../lib'),
-      components: path.join(__dirname, '../docs/src/components')
+      packages: path.join(__dirname, '../packages')
     }
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.vue$/,
         use: [
-          cache,
           {
             loader: 'vue-loader',
             options: {
@@ -61,10 +50,7 @@ module.exports = {
       {
         test: /\.js$/,
         exclude: /node_modules|vue-router\/|vue-loader\//,
-        use: [
-          cache,
-          'babel-loader'
-        ]
+        use: 'babel-loader'
       },
       {
         test: /\.css$/,
@@ -78,7 +64,6 @@ module.exports = {
       {
         test: /\.md/,
         use: [
-          cache,
           'vue-loader',
           'fast-vue-md-loader'
         ]
@@ -103,15 +88,9 @@ module.exports = {
       filename: 'examples.html',
       inject: true
     }),
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'vendor',
-      minChunks: 2,
-      filename: isProduction ? 'vendor.[hash:8].js' : 'vendor.js'
-    }),
     new ExtractTextPlugin({
       filename: isProduction ? '[name].[hash:8].css' : '[name].css',
       allChunks: true
-    }),
-    new FriendlyErrorsPlugin()
+    })
   ]
 };
diff --git a/build/webpack.config.prod.js b/build/webpack.config.prod.js
index 6e4fe27b5..115f1679f 100644
--- a/build/webpack.config.prod.js
+++ b/build/webpack.config.prod.js
@@ -4,19 +4,12 @@ const path = require('path');
 const devConfig = require('./webpack.config.dev.js');
 
 module.exports = merge(devConfig, {
+  mode: 'production',
   output: {
     path: path.join(__dirname, '../docs/dist'),
     publicPath: 'https://img.yzcdn.cn/zanui/vant/',
     filename: '[name].[hash:8].js',
     umdNamedDefine: true,
     chunkFilename: 'async_[name].[chunkhash:8].js'
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: JSON.stringify(process.env.NODE_ENV)
-      }
-    }),
-    new webpack.optimize.UglifyJsPlugin()
-  ]
+  }
 });
diff --git a/docs/demos/mock/area.js b/docs/demos/mock/area.js
new file mode 100644
index 000000000..2ddc49c95
--- /dev/null
+++ b/docs/demos/mock/area.js
@@ -0,0 +1,3607 @@
+export default {
+  'province_list': {
+    '110000': '北京市',
+    '120000': '天津市',
+    '130000': '河北省',
+    '140000': '山西省',
+    '150000': '内蒙古自治区',
+    '210000': '辽宁省',
+    '220000': '吉林省',
+    '230000': '黑龙江省',
+    '310000': '上海市',
+    '320000': '江苏省',
+    '330000': '浙江省',
+    '340000': '安徽省',
+    '350000': '福建省',
+    '360000': '江西省',
+    '370000': '山东省',
+    '410000': '河南省',
+    '420000': '湖北省',
+    '430000': '湖南省',
+    '440000': '广东省',
+    '450000': '广西壮族自治区',
+    '460000': '海南省',
+    '500000': '重庆市',
+    '510000': '四川省',
+    '520000': '贵州省',
+    '530000': '云南省',
+    '540000': '西藏自治区',
+    '610000': '陕西省',
+    '620000': '甘肃省',
+    '630000': '青海省',
+    '640000': '宁夏回族自治区',
+    '650000': '新疆维吾尔自治区',
+    '710000': '台湾省',
+    '810000': '香港特别行政区',
+    '820000': '澳门特别行政区'
+  },
+  'city_list': {
+    '110100': '北京市',
+    '110200': '县',
+    '120100': '天津市',
+    '120200': '县',
+    '130100': '石家庄市',
+    '130200': '唐山市',
+    '130300': '秦皇岛市',
+    '130400': '邯郸市',
+    '130500': '邢台市',
+    '130600': '保定市',
+    '130700': '张家口市',
+    '130800': '承德市',
+    '130900': '沧州市',
+    '131000': '廊坊市',
+    '131100': '衡水市',
+    '139000': '省直辖县',
+    '140100': '太原市',
+    '140200': '大同市',
+    '140300': '阳泉市',
+    '140400': '长治市',
+    '140500': '晋城市',
+    '140600': '朔州市',
+    '140700': '晋中市',
+    '140800': '运城市',
+    '140900': '忻州市',
+    '141000': '临汾市',
+    '141100': '吕梁市',
+    '150100': '呼和浩特市',
+    '150200': '包头市',
+    '150300': '乌海市',
+    '150400': '赤峰市',
+    '150500': '通辽市',
+    '150600': '鄂尔多斯市',
+    '150700': '呼伦贝尔市',
+    '150800': '巴彦淖尔市',
+    '150900': '乌兰察布市',
+    '152200': '兴安盟',
+    '152500': '锡林郭勒盟',
+    '152900': '阿拉善盟',
+    '210100': '沈阳市',
+    '210200': '大连市',
+    '210300': '鞍山市',
+    '210400': '抚顺市',
+    '210500': '本溪市',
+    '210600': '丹东市',
+    '210700': '锦州市',
+    '210800': '营口市',
+    '210900': '阜新市',
+    '211000': '辽阳市',
+    '211100': '盘锦市',
+    '211200': '铁岭市',
+    '211300': '朝阳市',
+    '211400': '葫芦岛市',
+    '220100': '长春市',
+    '220200': '吉林市',
+    '220300': '四平市',
+    '220400': '辽源市',
+    '220500': '通化市',
+    '220600': '白山市',
+    '220700': '松原市',
+    '220800': '白城市',
+    '222400': '延边朝鲜族自治州',
+    '230100': '哈尔滨市',
+    '230200': '齐齐哈尔市',
+    '230300': '鸡西市',
+    '230400': '鹤岗市',
+    '230500': '双鸭山市',
+    '230600': '大庆市',
+    '230700': '伊春市',
+    '230800': '佳木斯市',
+    '230900': '七台河市',
+    '231000': '牡丹江市',
+    '231100': '黑河市',
+    '231200': '绥化市',
+    '232700': '大兴安岭地区',
+    '310100': '上海市',
+    '310200': '县',
+    '320100': '南京市',
+    '320200': '无锡市',
+    '320300': '徐州市',
+    '320400': '常州市',
+    '320500': '苏州市',
+    '320600': '南通市',
+    '320700': '连云港市',
+    '320800': '淮安市',
+    '320900': '盐城市',
+    '321000': '扬州市',
+    '321100': '镇江市',
+    '321200': '泰州市',
+    '321300': '宿迁市',
+    '330100': '杭州市',
+    '330200': '宁波市',
+    '330300': '温州市',
+    '330400': '嘉兴市',
+    '330500': '湖州市',
+    '330600': '绍兴市',
+    '330700': '金华市',
+    '330800': '衢州市',
+    '330900': '舟山市',
+    '331000': '台州市',
+    '331100': '丽水市',
+    '340100': '合肥市',
+    '340200': '芜湖市',
+    '340300': '蚌埠市',
+    '340400': '淮南市',
+    '340500': '马鞍山市',
+    '340600': '淮北市',
+    '340700': '铜陵市',
+    '340800': '安庆市',
+    '341000': '黄山市',
+    '341100': '滁州市',
+    '341200': '阜阳市',
+    '341300': '宿州市',
+    '341500': '六安市',
+    '341600': '亳州市',
+    '341700': '池州市',
+    '341800': '宣城市',
+    '350100': '福州市',
+    '350200': '厦门市',
+    '350300': '莆田市',
+    '350400': '三明市',
+    '350500': '泉州市',
+    '350600': '漳州市',
+    '350700': '南平市',
+    '350800': '龙岩市',
+    '350900': '宁德市',
+    '360100': '南昌市',
+    '360200': '景德镇市',
+    '360300': '萍乡市',
+    '360400': '九江市',
+    '360500': '新余市',
+    '360600': '鹰潭市',
+    '360700': '赣州市',
+    '360800': '吉安市',
+    '360900': '宜春市',
+    '361000': '抚州市',
+    '361100': '上饶市',
+    '370100': '济南市',
+    '370200': '青岛市',
+    '370300': '淄博市',
+    '370400': '枣庄市',
+    '370500': '东营市',
+    '370600': '烟台市',
+    '370700': '潍坊市',
+    '370800': '济宁市',
+    '370900': '泰安市',
+    '371000': '威海市',
+    '371100': '日照市',
+    '371200': '莱芜市',
+    '371300': '临沂市',
+    '371400': '德州市',
+    '371500': '聊城市',
+    '371600': '滨州市',
+    '371700': '菏泽市',
+    '410100': '郑州市',
+    '410200': '开封市',
+    '410300': '洛阳市',
+    '410400': '平顶山市',
+    '410500': '安阳市',
+    '410600': '鹤壁市',
+    '410700': '新乡市',
+    '410800': '焦作市',
+    '410900': '濮阳市',
+    '411000': '许昌市',
+    '411100': '漯河市',
+    '411200': '三门峡市',
+    '411300': '南阳市',
+    '411400': '商丘市',
+    '411500': '信阳市',
+    '411600': '周口市',
+    '411700': '驻马店市',
+    '419000': '省直辖县',
+    '420100': '武汉市',
+    '420200': '黄石市',
+    '420300': '十堰市',
+    '420500': '宜昌市',
+    '420600': '襄阳市',
+    '420700': '鄂州市',
+    '420800': '荆门市',
+    '420900': '孝感市',
+    '421000': '荆州市',
+    '421100': '黄冈市',
+    '421200': '咸宁市',
+    '421300': '随州市',
+    '422800': '恩施土家族苗族自治州',
+    '429000': '省直辖县',
+    '430100': '长沙市',
+    '430200': '株洲市',
+    '430300': '湘潭市',
+    '430400': '衡阳市',
+    '430500': '邵阳市',
+    '430600': '岳阳市',
+    '430700': '常德市',
+    '430800': '张家界市',
+    '430900': '益阳市',
+    '431000': '郴州市',
+    '431100': '永州市',
+    '431200': '怀化市',
+    '431300': '娄底市',
+    '433100': '湘西土家族苗族自治州',
+    '440100': '广州市',
+    '440200': '韶关市',
+    '440300': '深圳市',
+    '440400': '珠海市',
+    '440500': '汕头市',
+    '440600': '佛山市',
+    '440700': '江门市',
+    '440800': '湛江市',
+    '440900': '茂名市',
+    '441200': '肇庆市',
+    '441300': '惠州市',
+    '441400': '梅州市',
+    '441500': '汕尾市',
+    '441600': '河源市',
+    '441700': '阳江市',
+    '441800': '清远市',
+    '441900': '东莞市',
+    '442000': '中山市',
+    '445100': '潮州市',
+    '445200': '揭阳市',
+    '445300': '云浮市',
+    '450100': '南宁市',
+    '450200': '柳州市',
+    '450300': '桂林市',
+    '450400': '梧州市',
+    '450500': '北海市',
+    '450600': '防城港市',
+    '450700': '钦州市',
+    '450800': '贵港市',
+    '450900': '玉林市',
+    '451000': '百色市',
+    '451100': '贺州市',
+    '451200': '河池市',
+    '451300': '来宾市',
+    '451400': '崇左市',
+    '460100': '海口市',
+    '460200': '三亚市',
+    '460300': '三沙市',
+    '469000': '省直辖县',
+    '500100': '重庆市',
+    '500200': '县',
+    '510100': '成都市',
+    '510300': '自贡市',
+    '510400': '攀枝花市',
+    '510500': '泸州市',
+    '510600': '德阳市',
+    '510700': '绵阳市',
+    '510800': '广元市',
+    '510900': '遂宁市',
+    '511000': '内江市',
+    '511100': '乐山市',
+    '511300': '南充市',
+    '511400': '眉山市',
+    '511500': '宜宾市',
+    '511600': '广安市',
+    '511700': '达州市',
+    '511800': '雅安市',
+    '511900': '巴中市',
+    '512000': '资阳市',
+    '513200': '阿坝藏族羌族自治州',
+    '513300': '甘孜藏族自治州',
+    '513400': '凉山彝族自治州',
+    '520100': '贵阳市',
+    '520200': '六盘水市',
+    '520300': '遵义市',
+    '520400': '安顺市',
+    '520500': '毕节市',
+    '520600': '铜仁市',
+    '522300': '黔西南布依族苗族自治州',
+    '522600': '黔东南苗族侗族自治州',
+    '522700': '黔南布依族苗族自治州',
+    '530100': '昆明市',
+    '530300': '曲靖市',
+    '530400': '玉溪市',
+    '530500': '保山市',
+    '530600': '昭通市',
+    '530700': '丽江市',
+    '530800': '普洱市',
+    '530900': '临沧市',
+    '532300': '楚雄彝族自治州',
+    '532500': '红河哈尼族彝族自治州',
+    '532600': '文山壮族苗族自治州',
+    '532800': '西双版纳傣族自治州',
+    '532900': '大理白族自治州',
+    '533100': '德宏傣族景颇族自治州',
+    '533300': '怒江傈僳族自治州',
+    '533400': '迪庆藏族自治州',
+    '540100': '拉萨市',
+    '540200': '日喀则市',
+    '540300': '昌都市',
+    '540400': '林芝市',
+    '542200': '山南地区',
+    '542400': '那曲地区',
+    '542500': '阿里地区',
+    '610100': '西安市',
+    '610200': '铜川市',
+    '610300': '宝鸡市',
+    '610400': '咸阳市',
+    '610500': '渭南市',
+    '610600': '延安市',
+    '610700': '汉中市',
+    '610800': '榆林市',
+    '610900': '安康市',
+    '611000': '商洛市',
+    '620100': '兰州市',
+    '620200': '嘉峪关市',
+    '620300': '金昌市',
+    '620400': '白银市',
+    '620500': '天水市',
+    '620600': '武威市',
+    '620700': '张掖市',
+    '620800': '平凉市',
+    '620900': '酒泉市',
+    '621000': '庆阳市',
+    '621100': '定西市',
+    '621200': '陇南市',
+    '622900': '临夏回族自治州',
+    '623000': '甘南藏族自治州',
+    '630100': '西宁市',
+    '630200': '海东市',
+    '632200': '海北藏族自治州',
+    '632300': '黄南藏族自治州',
+    '632500': '海南藏族自治州',
+    '632600': '果洛藏族自治州',
+    '632700': '玉树藏族自治州',
+    '632800': '海西蒙古族藏族自治州',
+    '640100': '银川市',
+    '640200': '石嘴山市',
+    '640300': '吴忠市',
+    '640400': '固原市',
+    '640500': '中卫市',
+    '650100': '乌鲁木齐市',
+    '650200': '克拉玛依市',
+    '650400': '吐鲁番市',
+    '652200': '哈密地区',
+    '652300': '昌吉回族自治州',
+    '652700': '博尔塔拉蒙古自治州',
+    '652800': '巴音郭楞蒙古自治州',
+    '652900': '阿克苏地区',
+    '653000': '克孜勒苏柯尔克孜自治州',
+    '653100': '喀什地区',
+    '653200': '和田地区',
+    '654000': '伊犁哈萨克自治州',
+    '654200': '塔城地区',
+    '654300': '阿勒泰地区',
+    '659000': '自治区直辖县级行政区划',
+    '710100': '台北市',
+    '710200': '高雄市',
+    '710300': '台南市',
+    '710400': '台中市',
+    '710500': '金门县',
+    '710600': '南投县',
+    '710700': '基隆市',
+    '710800': '新竹市',
+    '710900': '嘉义市',
+    '711100': '新北市',
+    '711200': '宜兰县',
+    '711300': '新竹县',
+    '711400': '桃园县',
+    '711500': '苗栗县',
+    '711700': '彰化县',
+    '711900': '嘉义县',
+    '712100': '云林县',
+    '712400': '屏东县',
+    '712500': '台东县',
+    '712600': '花莲县',
+    '712700': '澎湖县',
+    '712800': '连江县',
+    '810100': '香港岛',
+    '810200': '九龙',
+    '810300': '新界',
+    '820100': '澳门半岛',
+    '820200': '离岛'
+  },
+  'county_list': {
+    '110101': '东城区',
+    '110102': '西城区',
+    '110105': '朝阳区',
+    '110106': '丰台区',
+    '110107': '石景山区',
+    '110108': '海淀区',
+    '110109': '门头沟区',
+    '110111': '房山区',
+    '110112': '通州区',
+    '110113': '顺义区',
+    '110114': '昌平区',
+    '110115': '大兴区',
+    '110116': '怀柔区',
+    '110117': '平谷区',
+    '110228': '密云县',
+    '110229': '延庆县',
+    '120101': '和平区',
+    '120102': '河东区',
+    '120103': '河西区',
+    '120104': '南开区',
+    '120105': '河北区',
+    '120106': '红桥区',
+    '120110': '东丽区',
+    '120111': '西青区',
+    '120112': '津南区',
+    '120113': '北辰区',
+    '120114': '武清区',
+    '120115': '宝坻区',
+    '120116': '滨海新区',
+    '120117': '宁河区',
+    '120118': '静海区',
+    '120225': '蓟县',
+    '130102': '长安区',
+    '130104': '桥西区',
+    '130105': '新华区',
+    '130107': '井陉矿区',
+    '130108': '裕华区',
+    '130109': '藁城区',
+    '130110': '鹿泉区',
+    '130111': '栾城区',
+    '130121': '井陉县',
+    '130123': '正定县',
+    '130125': '行唐县',
+    '130126': '灵寿县',
+    '130127': '高邑县',
+    '130128': '深泽县',
+    '130129': '赞皇县',
+    '130130': '无极县',
+    '130131': '平山县',
+    '130132': '元氏县',
+    '130133': '赵县',
+    '130183': '晋州市',
+    '130184': '新乐市',
+    '130202': '路南区',
+    '130203': '路北区',
+    '130204': '古冶区',
+    '130205': '开平区',
+    '130207': '丰南区',
+    '130208': '丰润区',
+    '130209': '曹妃甸区',
+    '130223': '滦县',
+    '130224': '滦南县',
+    '130225': '乐亭县',
+    '130227': '迁西县',
+    '130229': '玉田县',
+    '130281': '遵化市',
+    '130283': '迁安市',
+    '130302': '海港区',
+    '130303': '山海关区',
+    '130304': '北戴河区',
+    '130306': '抚宁区',
+    '130321': '青龙满族自治县',
+    '130322': '昌黎县',
+    '130324': '卢龙县',
+    '130390': '经济技术开发区',
+    '130402': '邯山区',
+    '130403': '丛台区',
+    '130404': '复兴区',
+    '130406': '峰峰矿区',
+    '130421': '邯郸县',
+    '130423': '临漳县',
+    '130424': '成安县',
+    '130425': '大名县',
+    '130426': '涉县',
+    '130427': '磁县',
+    '130428': '肥乡县',
+    '130429': '永年县',
+    '130430': '邱县',
+    '130431': '鸡泽县',
+    '130432': '广平县',
+    '130433': '馆陶县',
+    '130434': '魏县',
+    '130435': '曲周县',
+    '130481': '武安市',
+    '130502': '桥东区',
+    '130503': '桥西区',
+    '130521': '邢台县',
+    '130522': '临城县',
+    '130523': '内丘县',
+    '130524': '柏乡县',
+    '130525': '隆尧县',
+    '130526': '任县',
+    '130527': '南和县',
+    '130528': '宁晋县',
+    '130529': '巨鹿县',
+    '130530': '新河县',
+    '130531': '广宗县',
+    '130532': '平乡县',
+    '130533': '威县',
+    '130534': '清河县',
+    '130535': '临西县',
+    '130581': '南宫市',
+    '130582': '沙河市',
+    '130602': '竞秀区',
+    '130606': '莲池区',
+    '130607': '满城区',
+    '130608': '清苑区',
+    '130609': '徐水区',
+    '130623': '涞水县',
+    '130624': '阜平县',
+    '130626': '定兴县',
+    '130627': '唐县',
+    '130628': '高阳县',
+    '130629': '容城县',
+    '130630': '涞源县',
+    '130631': '望都县',
+    '130632': '安新县',
+    '130633': '易县',
+    '130634': '曲阳县',
+    '130635': '蠡县',
+    '130636': '顺平县',
+    '130637': '博野县',
+    '130638': '雄县',
+    '130681': '涿州市',
+    '130683': '安国市',
+    '130684': '高碑店市',
+    '130702': '桥东区',
+    '130703': '桥西区',
+    '130705': '宣化区',
+    '130706': '下花园区',
+    '130721': '宣化县',
+    '130722': '张北县',
+    '130723': '康保县',
+    '130724': '沽源县',
+    '130725': '尚义县',
+    '130726': '蔚县',
+    '130727': '阳原县',
+    '130728': '怀安县',
+    '130729': '万全县',
+    '130730': '怀来县',
+    '130731': '涿鹿县',
+    '130732': '赤城县',
+    '130733': '崇礼县',
+    '130802': '双桥区',
+    '130803': '双滦区',
+    '130804': '鹰手营子矿区',
+    '130821': '承德县',
+    '130822': '兴隆县',
+    '130823': '平泉县',
+    '130824': '滦平县',
+    '130825': '隆化县',
+    '130826': '丰宁满族自治县',
+    '130827': '宽城满族自治县',
+    '130828': '围场满族蒙古族自治县',
+    '130902': '新华区',
+    '130903': '运河区',
+    '130921': '沧县',
+    '130922': '青县',
+    '130923': '东光县',
+    '130924': '海兴县',
+    '130925': '盐山县',
+    '130926': '肃宁县',
+    '130927': '南皮县',
+    '130928': '吴桥县',
+    '130929': '献县',
+    '130930': '孟村回族自治县',
+    '130981': '泊头市',
+    '130982': '任丘市',
+    '130983': '黄骅市',
+    '130984': '河间市',
+    '131002': '安次区',
+    '131003': '广阳区',
+    '131022': '固安县',
+    '131023': '永清县',
+    '131024': '香河县',
+    '131025': '大城县',
+    '131026': '文安县',
+    '131028': '大厂回族自治县',
+    '131081': '霸州市',
+    '131082': '三河市',
+    '131090': '开发区',
+    '131091': '燕郊经济技术开发区',
+    '131102': '桃城区',
+    '131121': '枣强县',
+    '131122': '武邑县',
+    '131123': '武强县',
+    '131124': '饶阳县',
+    '131125': '安平县',
+    '131126': '故城县',
+    '131127': '景县',
+    '131128': '阜城县',
+    '131181': '冀州市',
+    '131182': '深州市',
+    '139001': '定州市',
+    '139002': '辛集市',
+    '140105': '小店区',
+    '140106': '迎泽区',
+    '140107': '杏花岭区',
+    '140108': '尖草坪区',
+    '140109': '万柏林区',
+    '140110': '晋源区',
+    '140121': '清徐县',
+    '140122': '阳曲县',
+    '140123': '娄烦县',
+    '140181': '古交市',
+    '140202': '城区',
+    '140203': '矿区',
+    '140211': '南郊区',
+    '140212': '新荣区',
+    '140221': '阳高县',
+    '140222': '天镇县',
+    '140223': '广灵县',
+    '140224': '灵丘县',
+    '140225': '浑源县',
+    '140226': '左云县',
+    '140227': '大同县',
+    '140302': '城区',
+    '140303': '矿区',
+    '140311': '郊区',
+    '140321': '平定县',
+    '140322': '盂县',
+    '140402': '城区',
+    '140411': '郊区',
+    '140421': '长治县',
+    '140423': '襄垣县',
+    '140424': '屯留县',
+    '140425': '平顺县',
+    '140426': '黎城县',
+    '140427': '壶关县',
+    '140428': '长子县',
+    '140429': '武乡县',
+    '140430': '沁县',
+    '140431': '沁源县',
+    '140481': '潞城市',
+    '140502': '城区',
+    '140521': '沁水县',
+    '140522': '阳城县',
+    '140524': '陵川县',
+    '140525': '泽州县',
+    '140581': '高平市',
+    '140602': '朔城区',
+    '140603': '平鲁区',
+    '140621': '山阴县',
+    '140622': '应县',
+    '140623': '右玉县',
+    '140624': '怀仁县',
+    '140702': '榆次区',
+    '140721': '榆社县',
+    '140722': '左权县',
+    '140723': '和顺县',
+    '140724': '昔阳县',
+    '140725': '寿阳县',
+    '140726': '太谷县',
+    '140727': '祁县',
+    '140728': '平遥县',
+    '140729': '灵石县',
+    '140781': '介休市',
+    '140802': '盐湖区',
+    '140821': '临猗县',
+    '140822': '万荣县',
+    '140823': '闻喜县',
+    '140824': '稷山县',
+    '140825': '新绛县',
+    '140826': '绛县',
+    '140827': '垣曲县',
+    '140828': '夏县',
+    '140829': '平陆县',
+    '140830': '芮城县',
+    '140881': '永济市',
+    '140882': '河津市',
+    '140902': '忻府区',
+    '140921': '定襄县',
+    '140922': '五台县',
+    '140923': '代县',
+    '140924': '繁峙县',
+    '140925': '宁武县',
+    '140926': '静乐县',
+    '140927': '神池县',
+    '140928': '五寨县',
+    '140929': '岢岚县',
+    '140930': '河曲县',
+    '140931': '保德县',
+    '140932': '偏关县',
+    '140981': '原平市',
+    '141002': '尧都区',
+    '141021': '曲沃县',
+    '141022': '翼城县',
+    '141023': '襄汾县',
+    '141024': '洪洞县',
+    '141025': '古县',
+    '141026': '安泽县',
+    '141027': '浮山县',
+    '141028': '吉县',
+    '141029': '乡宁县',
+    '141030': '大宁县',
+    '141031': '隰县',
+    '141032': '永和县',
+    '141033': '蒲县',
+    '141034': '汾西县',
+    '141081': '侯马市',
+    '141082': '霍州市',
+    '141102': '离石区',
+    '141121': '文水县',
+    '141122': '交城县',
+    '141123': '兴县',
+    '141124': '临县',
+    '141125': '柳林县',
+    '141126': '石楼县',
+    '141127': '岚县',
+    '141128': '方山县',
+    '141129': '中阳县',
+    '141130': '交口县',
+    '141181': '孝义市',
+    '141182': '汾阳市',
+    '150102': '新城区',
+    '150103': '回民区',
+    '150104': '玉泉区',
+    '150105': '赛罕区',
+    '150121': '土默特左旗',
+    '150122': '托克托县',
+    '150123': '和林格尔县',
+    '150124': '清水河县',
+    '150125': '武川县',
+    '150202': '东河区',
+    '150203': '昆都仑区',
+    '150204': '青山区',
+    '150205': '石拐区',
+    '150206': '白云鄂博矿区',
+    '150207': '九原区',
+    '150221': '土默特右旗',
+    '150222': '固阳县',
+    '150223': '达尔罕茂明安联合旗',
+    '150302': '海勃湾区',
+    '150303': '海南区',
+    '150304': '乌达区',
+    '150402': '红山区',
+    '150403': '元宝山区',
+    '150404': '松山区',
+    '150421': '阿鲁科尔沁旗',
+    '150422': '巴林左旗',
+    '150423': '巴林右旗',
+    '150424': '林西县',
+    '150425': '克什克腾旗',
+    '150426': '翁牛特旗',
+    '150428': '喀喇沁旗',
+    '150429': '宁城县',
+    '150430': '敖汉旗',
+    '150502': '科尔沁区',
+    '150521': '科尔沁左翼中旗',
+    '150522': '科尔沁左翼后旗',
+    '150523': '开鲁县',
+    '150524': '库伦旗',
+    '150525': '奈曼旗',
+    '150526': '扎鲁特旗',
+    '150581': '霍林郭勒市',
+    '150602': '东胜区',
+    '150621': '达拉特旗',
+    '150622': '准格尔旗',
+    '150623': '鄂托克前旗',
+    '150624': '鄂托克旗',
+    '150625': '杭锦旗',
+    '150626': '乌审旗',
+    '150627': '伊金霍洛旗',
+    '150702': '海拉尔区',
+    '150703': '扎赉诺尔区',
+    '150721': '阿荣旗',
+    '150722': '莫力达瓦达斡尔族自治旗',
+    '150723': '鄂伦春自治旗',
+    '150724': '鄂温克族自治旗',
+    '150725': '陈巴尔虎旗',
+    '150726': '新巴尔虎左旗',
+    '150727': '新巴尔虎右旗',
+    '150781': '满洲里市',
+    '150782': '牙克石市',
+    '150783': '扎兰屯市',
+    '150784': '额尔古纳市',
+    '150785': '根河市',
+    '150802': '临河区',
+    '150821': '五原县',
+    '150822': '磴口县',
+    '150823': '乌拉特前旗',
+    '150824': '乌拉特中旗',
+    '150825': '乌拉特后旗',
+    '150826': '杭锦后旗',
+    '150902': '集宁区',
+    '150921': '卓资县',
+    '150922': '化德县',
+    '150923': '商都县',
+    '150924': '兴和县',
+    '150925': '凉城县',
+    '150926': '察哈尔右翼前旗',
+    '150927': '察哈尔右翼中旗',
+    '150928': '察哈尔右翼后旗',
+    '150929': '四子王旗',
+    '150981': '丰镇市',
+    '152201': '乌兰浩特市',
+    '152202': '阿尔山市',
+    '152221': '科尔沁右翼前旗',
+    '152222': '科尔沁右翼中旗',
+    '152223': '扎赉特旗',
+    '152224': '突泉县',
+    '152501': '二连浩特市',
+    '152502': '锡林浩特市',
+    '152522': '阿巴嘎旗',
+    '152523': '苏尼特左旗',
+    '152524': '苏尼特右旗',
+    '152525': '东乌珠穆沁旗',
+    '152526': '西乌珠穆沁旗',
+    '152527': '太仆寺旗',
+    '152528': '镶黄旗',
+    '152529': '正镶白旗',
+    '152530': '正蓝旗',
+    '152531': '多伦县',
+    '152921': '阿拉善左旗',
+    '152922': '阿拉善右旗',
+    '152923': '额济纳旗',
+    '210102': '和平区',
+    '210103': '沈河区',
+    '210104': '大东区',
+    '210105': '皇姑区',
+    '210106': '铁西区',
+    '210111': '苏家屯区',
+    '210112': '浑南区',
+    '210113': '沈北新区',
+    '210114': '于洪区',
+    '210122': '辽中县',
+    '210123': '康平县',
+    '210124': '法库县',
+    '210181': '新民市',
+    '210190': '经济技术开发区',
+    '210202': '中山区',
+    '210203': '西岗区',
+    '210204': '沙河口区',
+    '210211': '甘井子区',
+    '210212': '旅顺口区',
+    '210213': '金州区',
+    '210224': '长海县',
+    '210281': '瓦房店市',
+    '210282': '普兰店市',
+    '210283': '庄河市',
+    '210291': '大连经济技术开发区',
+    '210292': '大连高新区',
+    '210302': '铁东区',
+    '210303': '铁西区',
+    '210304': '立山区',
+    '210311': '千山区',
+    '210321': '台安县',
+    '210323': '岫岩满族自治县',
+    '210381': '海城市',
+    '210390': '高新区',
+    '210402': '新抚区',
+    '210403': '东洲区',
+    '210404': '望花区',
+    '210411': '顺城区',
+    '210421': '抚顺县',
+    '210422': '新宾满族自治县',
+    '210423': '清原满族自治县',
+    '210502': '平山区',
+    '210503': '溪湖区',
+    '210504': '明山区',
+    '210505': '南芬区',
+    '210521': '本溪满族自治县',
+    '210522': '桓仁满族自治县',
+    '210602': '元宝区',
+    '210603': '振兴区',
+    '210604': '振安区',
+    '210624': '宽甸满族自治县',
+    '210681': '东港市',
+    '210682': '凤城市',
+    '210702': '古塔区',
+    '210703': '凌河区',
+    '210711': '太和区',
+    '210726': '黑山县',
+    '210727': '义县',
+    '210781': '凌海市',
+    '210782': '北镇市',
+    '210793': '经济技术开发区',
+    '210802': '站前区',
+    '210803': '西市区',
+    '210804': '鲅鱼圈区',
+    '210811': '老边区',
+    '210881': '盖州市',
+    '210882': '大石桥市',
+    '210902': '海州区',
+    '210903': '新邱区',
+    '210904': '太平区',
+    '210905': '清河门区',
+    '210911': '细河区',
+    '210921': '阜新蒙古族自治县',
+    '210922': '彰武县',
+    '211002': '白塔区',
+    '211003': '文圣区',
+    '211004': '宏伟区',
+    '211005': '弓长岭区',
+    '211011': '太子河区',
+    '211021': '辽阳县',
+    '211081': '灯塔市',
+    '211102': '双台子区',
+    '211103': '兴隆台区',
+    '211121': '大洼县',
+    '211122': '盘山县',
+    '211202': '银州区',
+    '211204': '清河区',
+    '211221': '铁岭县',
+    '211223': '西丰县',
+    '211224': '昌图县',
+    '211281': '调兵山市',
+    '211282': '开原市',
+    '211302': '双塔区',
+    '211303': '龙城区',
+    '211321': '朝阳县',
+    '211322': '建平县',
+    '211324': '喀喇沁左翼蒙古族自治县',
+    '211381': '北票市',
+    '211382': '凌源市',
+    '211402': '连山区',
+    '211403': '龙港区',
+    '211404': '南票区',
+    '211421': '绥中县',
+    '211422': '建昌县',
+    '211481': '兴城市',
+    '215090': '工业园区',
+    '220102': '南关区',
+    '220103': '宽城区',
+    '220104': '朝阳区',
+    '220105': '二道区',
+    '220106': '绿园区',
+    '220112': '双阳区',
+    '220113': '九台区',
+    '220122': '农安县',
+    '220182': '榆树市',
+    '220183': '德惠市',
+    '220190': '高新技术产业开发区',
+    '220191': '汽车产业开发区',
+    '220192': '经济技术开发区',
+    '220202': '昌邑区',
+    '220203': '龙潭区',
+    '220204': '船营区',
+    '220211': '丰满区',
+    '220221': '永吉县',
+    '220281': '蛟河市',
+    '220282': '桦甸市',
+    '220283': '舒兰市',
+    '220284': '磐石市',
+    '220302': '铁西区',
+    '220303': '铁东区',
+    '220322': '梨树县',
+    '220323': '伊通满族自治县',
+    '220381': '公主岭市',
+    '220382': '双辽市',
+    '220402': '龙山区',
+    '220403': '西安区',
+    '220421': '东丰县',
+    '220422': '东辽县',
+    '220502': '东昌区',
+    '220503': '二道江区',
+    '220521': '通化县',
+    '220523': '辉南县',
+    '220524': '柳河县',
+    '220581': '梅河口市',
+    '220582': '集安市',
+    '220602': '浑江区',
+    '220605': '江源区',
+    '220621': '抚松县',
+    '220622': '靖宇县',
+    '220623': '长白朝鲜族自治县',
+    '220681': '临江市',
+    '220702': '宁江区',
+    '220721': '前郭尔罗斯蒙古族自治县',
+    '220722': '长岭县',
+    '220723': '乾安县',
+    '220781': '扶余市',
+    '220802': '洮北区',
+    '220821': '镇赉县',
+    '220822': '通榆县',
+    '220881': '洮南市',
+    '220882': '大安市',
+    '221090': '工业园区',
+    '222401': '延吉市',
+    '222402': '图们市',
+    '222403': '敦化市',
+    '222404': '珲春市',
+    '222405': '龙井市',
+    '222406': '和龙市',
+    '222424': '汪清县',
+    '222426': '安图县',
+    '230102': '道里区',
+    '230103': '南岗区',
+    '230104': '道外区',
+    '230108': '平房区',
+    '230109': '松北区',
+    '230110': '香坊区',
+    '230111': '呼兰区',
+    '230112': '阿城区',
+    '230113': '双城区',
+    '230123': '依兰县',
+    '230124': '方正县',
+    '230125': '宾县',
+    '230126': '巴彦县',
+    '230127': '木兰县',
+    '230128': '通河县',
+    '230129': '延寿县',
+    '230183': '尚志市',
+    '230184': '五常市',
+    '230202': '龙沙区',
+    '230203': '建华区',
+    '230204': '铁锋区',
+    '230205': '昂昂溪区',
+    '230206': '富拉尔基区',
+    '230207': '碾子山区',
+    '230208': '梅里斯达斡尔族区',
+    '230221': '龙江县',
+    '230223': '依安县',
+    '230224': '泰来县',
+    '230225': '甘南县',
+    '230227': '富裕县',
+    '230229': '克山县',
+    '230230': '克东县',
+    '230231': '拜泉县',
+    '230281': '讷河市',
+    '230302': '鸡冠区',
+    '230303': '恒山区',
+    '230304': '滴道区',
+    '230305': '梨树区',
+    '230306': '城子河区',
+    '230307': '麻山区',
+    '230321': '鸡东县',
+    '230381': '虎林市',
+    '230382': '密山市',
+    '230402': '向阳区',
+    '230403': '工农区',
+    '230404': '南山区',
+    '230405': '兴安区',
+    '230406': '东山区',
+    '230407': '兴山区',
+    '230421': '萝北县',
+    '230422': '绥滨县',
+    '230502': '尖山区',
+    '230503': '岭东区',
+    '230505': '四方台区',
+    '230506': '宝山区',
+    '230521': '集贤县',
+    '230522': '友谊县',
+    '230523': '宝清县',
+    '230524': '饶河县',
+    '230602': '萨尔图区',
+    '230603': '龙凤区',
+    '230604': '让胡路区',
+    '230605': '红岗区',
+    '230606': '大同区',
+    '230621': '肇州县',
+    '230622': '肇源县',
+    '230623': '林甸县',
+    '230624': '杜尔伯特蒙古族自治县',
+    '230702': '伊春区',
+    '230703': '南岔区',
+    '230704': '友好区',
+    '230705': '西林区',
+    '230706': '翠峦区',
+    '230707': '新青区',
+    '230708': '美溪区',
+    '230709': '金山屯区',
+    '230710': '五营区',
+    '230711': '乌马河区',
+    '230712': '汤旺河区',
+    '230713': '带岭区',
+    '230714': '乌伊岭区',
+    '230715': '红星区',
+    '230716': '上甘岭区',
+    '230722': '嘉荫县',
+    '230781': '铁力市',
+    '230803': '向阳区',
+    '230804': '前进区',
+    '230805': '东风区',
+    '230811': '郊区',
+    '230822': '桦南县',
+    '230826': '桦川县',
+    '230828': '汤原县',
+    '230833': '抚远县',
+    '230881': '同江市',
+    '230882': '富锦市',
+    '230902': '新兴区',
+    '230903': '桃山区',
+    '230904': '茄子河区',
+    '230921': '勃利县',
+    '231002': '东安区',
+    '231003': '阳明区',
+    '231004': '爱民区',
+    '231005': '西安区',
+    '231024': '东宁县',
+    '231025': '林口县',
+    '231081': '绥芬河市',
+    '231083': '海林市',
+    '231084': '宁安市',
+    '231085': '穆棱市',
+    '231102': '爱辉区',
+    '231121': '嫩江县',
+    '231123': '逊克县',
+    '231124': '孙吴县',
+    '231181': '北安市',
+    '231182': '五大连池市',
+    '231202': '北林区',
+    '231221': '望奎县',
+    '231222': '兰西县',
+    '231223': '青冈县',
+    '231224': '庆安县',
+    '231225': '明水县',
+    '231226': '绥棱县',
+    '231281': '安达市',
+    '231282': '肇东市',
+    '231283': '海伦市',
+    '232721': '呼玛县',
+    '232722': '塔河县',
+    '232723': '漠河县',
+    '232790': '松岭区',
+    '232791': '呼中区',
+    '232792': '加格达奇区',
+    '232793': '新林区',
+    '264290': '威海临港经济技术开发区',
+    '310101': '黄浦区',
+    '310104': '徐汇区',
+    '310105': '长宁区',
+    '310106': '静安区',
+    '310107': '普陀区',
+    '310108': '闸北区',
+    '310109': '虹口区',
+    '310110': '杨浦区',
+    '310112': '闵行区',
+    '310113': '宝山区',
+    '310114': '嘉定区',
+    '310115': '浦东新区',
+    '310116': '金山区',
+    '310117': '松江区',
+    '310118': '青浦区',
+    '310120': '奉贤区',
+    '310230': '崇明县',
+    '320102': '玄武区',
+    '320104': '秦淮区',
+    '320105': '建邺区',
+    '320106': '鼓楼区',
+    '320111': '浦口区',
+    '320113': '栖霞区',
+    '320114': '雨花台区',
+    '320115': '江宁区',
+    '320116': '六合区',
+    '320117': '溧水区',
+    '320118': '高淳区',
+    '320202': '崇安区',
+    '320203': '南长区',
+    '320204': '北塘区',
+    '320205': '锡山区',
+    '320206': '惠山区',
+    '320211': '滨湖区',
+    '320281': '江阴市',
+    '320282': '宜兴市',
+    '320290': '新区',
+    '320302': '鼓楼区',
+    '320303': '云龙区',
+    '320305': '贾汪区',
+    '320311': '泉山区',
+    '320312': '铜山区',
+    '320321': '丰县',
+    '320322': '沛县',
+    '320324': '睢宁县',
+    '320381': '新沂市',
+    '320382': '邳州市',
+    '320390': '金山桥开发区',
+    '320391': '工业园区',
+    '320402': '天宁区',
+    '320404': '钟楼区',
+    '320411': '新北区',
+    '320412': '武进区',
+    '320413': '金坛区',
+    '320481': '溧阳市',
+    '320505': '虎丘区',
+    '320506': '吴中区',
+    '320507': '相城区',
+    '320508': '姑苏区',
+    '320509': '吴江区',
+    '320581': '常熟市',
+    '320582': '张家港市',
+    '320583': '昆山市',
+    '320585': '太仓市',
+    '320590': '工业园区',
+    '320591': '高新区',
+    '320602': '崇川区',
+    '320611': '港闸区',
+    '320612': '通州区',
+    '320621': '海安县',
+    '320623': '如东县',
+    '320681': '启东市',
+    '320682': '如皋市',
+    '320684': '海门市',
+    '320690': '南通经济技术开发区',
+    '320691': '高新区',
+    '320703': '连云区',
+    '320706': '海州区',
+    '320707': '赣榆区',
+    '320722': '东海县',
+    '320723': '灌云县',
+    '320724': '灌南县',
+    '320802': '清河区',
+    '320803': '淮安区',
+    '320804': '淮阴区',
+    '320811': '清浦区',
+    '320826': '涟水县',
+    '320829': '洪泽县',
+    '320830': '盱眙县',
+    '320831': '金湖县',
+    '320890': '经济开发区',
+    '320902': '亭湖区',
+    '320903': '盐都区',
+    '320904': '大丰区',
+    '320921': '响水县',
+    '320922': '滨海县',
+    '320923': '阜宁县',
+    '320924': '射阳县',
+    '320925': '建湖县',
+    '320981': '东台市',
+    '321002': '广陵区',
+    '321003': '邗江区',
+    '321012': '江都区',
+    '321023': '宝应县',
+    '321081': '仪征市',
+    '321084': '高邮市',
+    '321090': '经济开发区',
+    '321102': '京口区',
+    '321111': '润州区',
+    '321112': '丹徒区',
+    '321181': '丹阳市',
+    '321182': '扬中市',
+    '321183': '句容市',
+    '321202': '海陵区',
+    '321203': '高港区',
+    '321204': '姜堰区',
+    '321281': '兴化市',
+    '321282': '靖江市',
+    '321283': '泰兴市',
+    '321302': '宿城区',
+    '321311': '宿豫区',
+    '321322': '沭阳县',
+    '321323': '泗阳县',
+    '321324': '泗洪县',
+    '321390': '宿迁经济开发区',
+    '330102': '上城区',
+    '330103': '下城区',
+    '330104': '江干区',
+    '330105': '拱墅区',
+    '330106': '西湖区',
+    '330108': '滨江区',
+    '330109': '萧山区',
+    '330110': '余杭区',
+    '330111': '富阳区',
+    '330122': '桐庐县',
+    '330127': '淳安县',
+    '330182': '建德市',
+    '330185': '临安市',
+    '330203': '海曙区',
+    '330204': '江东区',
+    '330205': '江北区',
+    '330206': '北仑区',
+    '330211': '镇海区',
+    '330212': '鄞州区',
+    '330225': '象山县',
+    '330226': '宁海县',
+    '330281': '余姚市',
+    '330282': '慈溪市',
+    '330283': '奉化市',
+    '330290': '高新科技开发区',
+    '330302': '鹿城区',
+    '330303': '龙湾区',
+    '330304': '瓯海区',
+    '330305': '洞头区',
+    '330324': '永嘉县',
+    '330326': '平阳县',
+    '330327': '苍南县',
+    '330328': '文成县',
+    '330329': '泰顺县',
+    '330381': '瑞安市',
+    '330382': '乐清市',
+    '330402': '南湖区',
+    '330411': '秀洲区',
+    '330421': '嘉善县',
+    '330424': '海盐县',
+    '330481': '海宁市',
+    '330482': '平湖市',
+    '330483': '桐乡市',
+    '330502': '吴兴区',
+    '330503': '南浔区',
+    '330521': '德清县',
+    '330522': '长兴县',
+    '330523': '安吉县',
+    '330602': '越城区',
+    '330603': '柯桥区',
+    '330604': '上虞区',
+    '330624': '新昌县',
+    '330681': '诸暨市',
+    '330683': '嵊州市',
+    '330702': '婺城区',
+    '330703': '金东区',
+    '330723': '武义县',
+    '330726': '浦江县',
+    '330727': '磐安县',
+    '330781': '兰溪市',
+    '330782': '义乌市',
+    '330783': '东阳市',
+    '330784': '永康市',
+    '330802': '柯城区',
+    '330803': '衢江区',
+    '330822': '常山县',
+    '330824': '开化县',
+    '330825': '龙游县',
+    '330881': '江山市',
+    '330902': '定海区',
+    '330903': '普陀区',
+    '330921': '岱山县',
+    '330922': '嵊泗县',
+    '331002': '椒江区',
+    '331003': '黄岩区',
+    '331004': '路桥区',
+    '331021': '玉环县',
+    '331022': '三门县',
+    '331023': '天台县',
+    '331024': '仙居县',
+    '331081': '温岭市',
+    '331082': '临海市',
+    '331102': '莲都区',
+    '331121': '青田县',
+    '331122': '缙云县',
+    '331123': '遂昌县',
+    '331124': '松阳县',
+    '331125': '云和县',
+    '331126': '庆元县',
+    '331127': '景宁畲族自治县',
+    '331181': '龙泉市',
+    '340102': '瑶海区',
+    '340103': '庐阳区',
+    '340104': '蜀山区',
+    '340111': '包河区',
+    '340121': '长丰县',
+    '340122': '肥东县',
+    '340123': '肥西县',
+    '340124': '庐江县',
+    '340181': '巢湖市',
+    '340190': '高新技术开发区',
+    '340191': '经济技术开发区',
+    '340192': '北城新区',
+    '340193': '政务文化新区',
+    '340194': '滨湖新区',
+    '340195': '新站高新区',
+    '340202': '镜湖区',
+    '340203': '弋江区',
+    '340207': '鸠江区',
+    '340208': '三山区',
+    '340221': '芜湖县',
+    '340222': '繁昌县',
+    '340223': '南陵县',
+    '340225': '无为县',
+    '340302': '龙子湖区',
+    '340303': '蚌山区',
+    '340304': '禹会区',
+    '340311': '淮上区',
+    '340321': '怀远县',
+    '340322': '五河县',
+    '340323': '固镇县',
+    '340402': '大通区',
+    '340403': '田家庵区',
+    '340404': '谢家集区',
+    '340405': '八公山区',
+    '340406': '潘集区',
+    '340421': '凤台县',
+    '340490': '淮南高新技术产业开发区',
+    '340503': '花山区',
+    '340504': '雨山区',
+    '340506': '博望区',
+    '340521': '当涂县',
+    '340522': '含山县',
+    '340523': '和县',
+    '340602': '杜集区',
+    '340603': '相山区',
+    '340604': '烈山区',
+    '340621': '濉溪县',
+    '340702': '铜官山区',
+    '340703': '狮子山区',
+    '340711': '郊区',
+    '340721': '铜陵县',
+    '340802': '迎江区',
+    '340803': '大观区',
+    '340811': '宜秀区',
+    '340822': '怀宁县',
+    '340823': '枞阳县',
+    '340824': '潜山县',
+    '340825': '太湖县',
+    '340826': '宿松县',
+    '340827': '望江县',
+    '340828': '岳西县',
+    '340881': '桐城市',
+    '340890': '安庆经济技术开发区',
+    '341002': '屯溪区',
+    '341003': '黄山区',
+    '341004': '徽州区',
+    '341021': '歙县',
+    '341022': '休宁县',
+    '341023': '黟县',
+    '341024': '祁门县',
+    '341102': '琅琊区',
+    '341103': '南谯区',
+    '341122': '来安县',
+    '341124': '全椒县',
+    '341125': '定远县',
+    '341126': '凤阳县',
+    '341181': '天长市',
+    '341182': '明光市',
+    '341202': '颍州区',
+    '341203': '颍东区',
+    '341204': '颍泉区',
+    '341221': '临泉县',
+    '341222': '太和县',
+    '341225': '阜南县',
+    '341226': '颍上县',
+    '341282': '界首市',
+    '341290': '阜阳经济技术开发区',
+    '341302': '埇桥区',
+    '341321': '砀山县',
+    '341322': '萧县',
+    '341323': '灵璧县',
+    '341324': '泗县',
+    '341390': '经济开发区',
+    '341502': '金安区',
+    '341503': '裕安区',
+    '341521': '寿县',
+    '341522': '霍邱县',
+    '341523': '舒城县',
+    '341524': '金寨县',
+    '341525': '霍山县',
+    '341602': '谯城区',
+    '341621': '涡阳县',
+    '341622': '蒙城县',
+    '341623': '利辛县',
+    '341702': '贵池区',
+    '341721': '东至县',
+    '341722': '石台县',
+    '341723': '青阳县',
+    '341802': '宣州区',
+    '341821': '郎溪县',
+    '341822': '广德县',
+    '341823': '泾县',
+    '341824': '绩溪县',
+    '341825': '旌德县',
+    '341881': '宁国市',
+    '350102': '鼓楼区',
+    '350103': '台江区',
+    '350104': '仓山区',
+    '350105': '马尾区',
+    '350111': '晋安区',
+    '350121': '闽侯县',
+    '350122': '连江县',
+    '350123': '罗源县',
+    '350124': '闽清县',
+    '350125': '永泰县',
+    '350128': '平潭县',
+    '350181': '福清市',
+    '350182': '长乐市',
+    '350203': '思明区',
+    '350205': '海沧区',
+    '350206': '湖里区',
+    '350211': '集美区',
+    '350212': '同安区',
+    '350213': '翔安区',
+    '350302': '城厢区',
+    '350303': '涵江区',
+    '350304': '荔城区',
+    '350305': '秀屿区',
+    '350322': '仙游县',
+    '350402': '梅列区',
+    '350403': '三元区',
+    '350421': '明溪县',
+    '350423': '清流县',
+    '350424': '宁化县',
+    '350425': '大田县',
+    '350426': '尤溪县',
+    '350427': '沙县',
+    '350428': '将乐县',
+    '350429': '泰宁县',
+    '350430': '建宁县',
+    '350481': '永安市',
+    '350502': '鲤城区',
+    '350503': '丰泽区',
+    '350504': '洛江区',
+    '350505': '泉港区',
+    '350521': '惠安县',
+    '350524': '安溪县',
+    '350525': '永春县',
+    '350526': '德化县',
+    '350527': '金门县',
+    '350581': '石狮市',
+    '350582': '晋江市',
+    '350583': '南安市',
+    '350602': '芗城区',
+    '350603': '龙文区',
+    '350622': '云霄县',
+    '350623': '漳浦县',
+    '350624': '诏安县',
+    '350625': '长泰县',
+    '350626': '东山县',
+    '350627': '南靖县',
+    '350628': '平和县',
+    '350629': '华安县',
+    '350681': '龙海市',
+    '350702': '延平区',
+    '350703': '建阳区',
+    '350721': '顺昌县',
+    '350722': '浦城县',
+    '350723': '光泽县',
+    '350724': '松溪县',
+    '350725': '政和县',
+    '350781': '邵武市',
+    '350782': '武夷山市',
+    '350783': '建瓯市',
+    '350802': '新罗区',
+    '350803': '永定区',
+    '350821': '长汀县',
+    '350823': '上杭县',
+    '350824': '武平县',
+    '350825': '连城县',
+    '350881': '漳平市',
+    '350902': '蕉城区',
+    '350921': '霞浦县',
+    '350922': '古田县',
+    '350923': '屏南县',
+    '350924': '寿宁县',
+    '350925': '周宁县',
+    '350926': '柘荣县',
+    '350981': '福安市',
+    '350982': '福鼎市',
+    '350990': '东侨开发区',
+    '360102': '东湖区',
+    '360103': '西湖区',
+    '360104': '青云谱区',
+    '360105': '湾里区',
+    '360111': '青山湖区',
+    '360112': '新建区',
+    '360121': '南昌县',
+    '360123': '安义县',
+    '360124': '进贤县',
+    '360190': '经济技术开发区',
+    '360191': '红谷滩新区',
+    '360192': '高新区',
+    '360202': '昌江区',
+    '360203': '珠山区',
+    '360222': '浮梁县',
+    '360281': '乐平市',
+    '360302': '安源区',
+    '360313': '湘东区',
+    '360321': '莲花县',
+    '360322': '上栗县',
+    '360323': '芦溪县',
+    '360402': '庐山区',
+    '360403': '浔阳区',
+    '360421': '九江县',
+    '360423': '武宁县',
+    '360424': '修水县',
+    '360425': '永修县',
+    '360426': '德安县',
+    '360427': '星子县',
+    '360428': '都昌县',
+    '360429': '湖口县',
+    '360430': '彭泽县',
+    '360481': '瑞昌市',
+    '360482': '共青城市',
+    '360490': '经济技术开发区',
+    '360491': '八里湖新区',
+    '360502': '渝水区',
+    '360521': '分宜县',
+    '360602': '月湖区',
+    '360622': '余江县',
+    '360681': '贵溪市',
+    '360702': '章贡区',
+    '360703': '南康区',
+    '360721': '赣县',
+    '360722': '信丰县',
+    '360723': '大余县',
+    '360724': '上犹县',
+    '360725': '崇义县',
+    '360726': '安远县',
+    '360727': '龙南县',
+    '360728': '定南县',
+    '360729': '全南县',
+    '360730': '宁都县',
+    '360731': '于都县',
+    '360732': '兴国县',
+    '360733': '会昌县',
+    '360734': '寻乌县',
+    '360735': '石城县',
+    '360781': '瑞金市',
+    '360802': '吉州区',
+    '360803': '青原区',
+    '360821': '吉安县',
+    '360822': '吉水县',
+    '360823': '峡江县',
+    '360824': '新干县',
+    '360825': '永丰县',
+    '360826': '泰和县',
+    '360827': '遂川县',
+    '360828': '万安县',
+    '360829': '安福县',
+    '360830': '永新县',
+    '360881': '井冈山市',
+    '360902': '袁州区',
+    '360921': '奉新县',
+    '360922': '万载县',
+    '360923': '上高县',
+    '360924': '宜丰县',
+    '360925': '靖安县',
+    '360926': '铜鼓县',
+    '360981': '丰城市',
+    '360982': '樟树市',
+    '360983': '高安市',
+    '361002': '临川区',
+    '361021': '南城县',
+    '361022': '黎川县',
+    '361023': '南丰县',
+    '361024': '崇仁县',
+    '361025': '乐安县',
+    '361026': '宜黄县',
+    '361027': '金溪县',
+    '361028': '资溪县',
+    '361029': '东乡县',
+    '361030': '广昌县',
+    '361102': '信州区',
+    '361103': '广丰区',
+    '361121': '上饶县',
+    '361123': '玉山县',
+    '361124': '铅山县',
+    '361125': '横峰县',
+    '361126': '弋阳县',
+    '361127': '余干县',
+    '361128': '鄱阳县',
+    '361129': '万年县',
+    '361130': '婺源县',
+    '361181': '德兴市',
+    '370102': '历下区',
+    '370103': '市中区',
+    '370104': '槐荫区',
+    '370105': '天桥区',
+    '370112': '历城区',
+    '370113': '长清区',
+    '370124': '平阴县',
+    '370125': '济阳县',
+    '370126': '商河县',
+    '370181': '章丘市',
+    '370190': '高新区',
+    '370202': '市南区',
+    '370203': '市北区',
+    '370211': '黄岛区',
+    '370212': '崂山区',
+    '370213': '李沧区',
+    '370214': '城阳区',
+    '370281': '胶州市',
+    '370282': '即墨市',
+    '370283': '平度市',
+    '370285': '莱西市',
+    '370290': '开发区',
+    '370302': '淄川区',
+    '370303': '张店区',
+    '370304': '博山区',
+    '370305': '临淄区',
+    '370306': '周村区',
+    '370321': '桓台县',
+    '370322': '高青县',
+    '370323': '沂源县',
+    '370402': '市中区',
+    '370403': '薛城区',
+    '370404': '峄城区',
+    '370405': '台儿庄区',
+    '370406': '山亭区',
+    '370481': '滕州市',
+    '370502': '东营区',
+    '370503': '河口区',
+    '370521': '垦利县',
+    '370522': '利津县',
+    '370523': '广饶县',
+    '370602': '芝罘区',
+    '370611': '福山区',
+    '370612': '牟平区',
+    '370613': '莱山区',
+    '370634': '长岛县',
+    '370681': '龙口市',
+    '370682': '莱阳市',
+    '370683': '莱州市',
+    '370684': '蓬莱市',
+    '370685': '招远市',
+    '370686': '栖霞市',
+    '370687': '海阳市',
+    '370690': '开发区',
+    '370702': '潍城区',
+    '370703': '寒亭区',
+    '370704': '坊子区',
+    '370705': '奎文区',
+    '370724': '临朐县',
+    '370725': '昌乐县',
+    '370781': '青州市',
+    '370782': '诸城市',
+    '370783': '寿光市',
+    '370784': '安丘市',
+    '370785': '高密市',
+    '370786': '昌邑市',
+    '370790': '开发区',
+    '370791': '高新区',
+    '370811': '任城区',
+    '370812': '兖州区',
+    '370826': '微山县',
+    '370827': '鱼台县',
+    '370828': '金乡县',
+    '370829': '嘉祥县',
+    '370830': '汶上县',
+    '370831': '泗水县',
+    '370832': '梁山县',
+    '370881': '曲阜市',
+    '370883': '邹城市',
+    '370890': '高新区',
+    '370902': '泰山区',
+    '370911': '岱岳区',
+    '370921': '宁阳县',
+    '370923': '东平县',
+    '370982': '新泰市',
+    '370983': '肥城市',
+    '371002': '环翠区',
+    '371003': '文登区',
+    '371082': '荣成市',
+    '371083': '乳山市',
+    '371090': '工业新区',
+    '371091': '经济技术开发区',
+    '371102': '东港区',
+    '371103': '岚山区',
+    '371121': '五莲县',
+    '371122': '莒县',
+    '371202': '莱城区',
+    '371203': '钢城区',
+    '371302': '兰山区',
+    '371311': '罗庄区',
+    '371312': '河东区',
+    '371321': '沂南县',
+    '371322': '郯城县',
+    '371323': '沂水县',
+    '371324': '兰陵县',
+    '371325': '费县',
+    '371326': '平邑县',
+    '371327': '莒南县',
+    '371328': '蒙阴县',
+    '371329': '临沭县',
+    '371402': '德城区',
+    '371403': '陵城区',
+    '371422': '宁津县',
+    '371423': '庆云县',
+    '371424': '临邑县',
+    '371425': '齐河县',
+    '371426': '平原县',
+    '371427': '夏津县',
+    '371428': '武城县',
+    '371481': '乐陵市',
+    '371482': '禹城市',
+    '371490': '德州经济技术开发区',
+    '371502': '东昌府区',
+    '371521': '阳谷县',
+    '371522': '莘县',
+    '371523': '茌平县',
+    '371524': '东阿县',
+    '371525': '冠县',
+    '371526': '高唐县',
+    '371581': '临清市',
+    '371602': '滨城区',
+    '371603': '沾化区',
+    '371621': '惠民县',
+    '371622': '阳信县',
+    '371623': '无棣县',
+    '371625': '博兴县',
+    '371626': '邹平县',
+    '371690': '北海新区',
+    '371702': '牡丹区',
+    '371721': '曹县',
+    '371722': '单县',
+    '371723': '成武县',
+    '371724': '巨野县',
+    '371725': '郓城县',
+    '371726': '鄄城县',
+    '371727': '定陶县',
+    '371728': '东明县',
+    '410102': '中原区',
+    '410103': '二七区',
+    '410104': '管城回族区',
+    '410105': '金水区',
+    '410106': '上街区',
+    '410108': '惠济区',
+    '410122': '中牟县',
+    '410181': '巩义市',
+    '410182': '荥阳市',
+    '410183': '新密市',
+    '410184': '新郑市',
+    '410185': '登封市',
+    '410190': '高新技术开发区',
+    '410191': '经济技术开发区',
+    '410192': '郑东新区',
+    '410202': '龙亭区',
+    '410203': '顺河回族区',
+    '410204': '鼓楼区',
+    '410205': '禹王台区',
+    '410211': '金明区',
+    '410212': '祥符区',
+    '410221': '杞县',
+    '410222': '通许县',
+    '410223': '尉氏县',
+    '410225': '兰考县',
+    '410302': '老城区',
+    '410303': '西工区',
+    '410304': '瀍河回族区',
+    '410305': '涧西区',
+    '410306': '吉利区',
+    '410311': '洛龙区',
+    '410322': '孟津县',
+    '410323': '新安县',
+    '410324': '栾川县',
+    '410325': '嵩县',
+    '410326': '汝阳县',
+    '410327': '宜阳县',
+    '410328': '洛宁县',
+    '410329': '伊川县',
+    '410381': '偃师市',
+    '410390': '伊滨区',
+    '410402': '新华区',
+    '410403': '卫东区',
+    '410404': '石龙区',
+    '410411': '湛河区',
+    '410421': '宝丰县',
+    '410422': '叶县',
+    '410423': '鲁山县',
+    '410425': '郏县',
+    '410481': '舞钢市',
+    '410482': '汝州市',
+    '410502': '文峰区',
+    '410503': '北关区',
+    '410505': '殷都区',
+    '410506': '龙安区',
+    '410522': '安阳县',
+    '410523': '汤阴县',
+    '410526': '滑县',
+    '410527': '内黄县',
+    '410581': '林州市',
+    '410590': '开发区',
+    '410602': '鹤山区',
+    '410603': '山城区',
+    '410611': '淇滨区',
+    '410621': '浚县',
+    '410622': '淇县',
+    '410702': '红旗区',
+    '410703': '卫滨区',
+    '410704': '凤泉区',
+    '410711': '牧野区',
+    '410721': '新乡县',
+    '410724': '获嘉县',
+    '410725': '原阳县',
+    '410726': '延津县',
+    '410727': '封丘县',
+    '410728': '长垣县',
+    '410781': '卫辉市',
+    '410782': '辉县市',
+    '410802': '解放区',
+    '410803': '中站区',
+    '410804': '马村区',
+    '410811': '山阳区',
+    '410821': '修武县',
+    '410822': '博爱县',
+    '410823': '武陟县',
+    '410825': '温县',
+    '410882': '沁阳市',
+    '410883': '孟州市',
+    '410902': '华龙区',
+    '410922': '清丰县',
+    '410923': '南乐县',
+    '410926': '范县',
+    '410927': '台前县',
+    '410928': '濮阳县',
+    '411002': '魏都区',
+    '411023': '许昌县',
+    '411024': '鄢陵县',
+    '411025': '襄城县',
+    '411081': '禹州市',
+    '411082': '长葛市',
+    '411102': '源汇区',
+    '411103': '郾城区',
+    '411104': '召陵区',
+    '411121': '舞阳县',
+    '411122': '临颍县',
+    '411202': '湖滨区',
+    '411221': '渑池县',
+    '411222': '陕县',
+    '411224': '卢氏县',
+    '411281': '义马市',
+    '411282': '灵宝市',
+    '411302': '宛城区',
+    '411303': '卧龙区',
+    '411321': '南召县',
+    '411322': '方城县',
+    '411323': '西峡县',
+    '411324': '镇平县',
+    '411325': '内乡县',
+    '411326': '淅川县',
+    '411327': '社旗县',
+    '411328': '唐河县',
+    '411329': '新野县',
+    '411330': '桐柏县',
+    '411381': '邓州市',
+    '411402': '梁园区',
+    '411403': '睢阳区',
+    '411421': '民权县',
+    '411422': '睢县',
+    '411423': '宁陵县',
+    '411424': '柘城县',
+    '411425': '虞城县',
+    '411426': '夏邑县',
+    '411481': '永城市',
+    '411502': '浉河区',
+    '411503': '平桥区',
+    '411521': '罗山县',
+    '411522': '光山县',
+    '411523': '新县',
+    '411524': '商城县',
+    '411525': '固始县',
+    '411526': '潢川县',
+    '411527': '淮滨县',
+    '411528': '息县',
+    '411602': '川汇区',
+    '411621': '扶沟县',
+    '411622': '西华县',
+    '411623': '商水县',
+    '411624': '沈丘县',
+    '411625': '郸城县',
+    '411626': '淮阳县',
+    '411627': '太康县',
+    '411628': '鹿邑县',
+    '411681': '项城市',
+    '411690': '经济开发区',
+    '411691': '东新区',
+    '411702': '驿城区',
+    '411721': '西平县',
+    '411722': '上蔡县',
+    '411723': '平舆县',
+    '411724': '正阳县',
+    '411725': '确山县',
+    '411726': '泌阳县',
+    '411727': '汝南县',
+    '411728': '遂平县',
+    '411729': '新蔡县',
+    '419001': '济源市',
+    '420102': '江岸区',
+    '420103': '江汉区',
+    '420104': '硚口区',
+    '420105': '汉阳区',
+    '420106': '武昌区',
+    '420107': '青山区',
+    '420111': '洪山区',
+    '420112': '东西湖区',
+    '420113': '汉南区',
+    '420114': '蔡甸区',
+    '420115': '江夏区',
+    '420116': '黄陂区',
+    '420117': '新洲区',
+    '420190': '武汉经济技术开发区',
+    '420202': '黄石港区',
+    '420203': '西塞山区',
+    '420204': '下陆区',
+    '420205': '铁山区',
+    '420222': '阳新县',
+    '420281': '大冶市',
+    '420290': '黄石经济技术开发区',
+    '420302': '茅箭区',
+    '420303': '张湾区',
+    '420304': '郧阳区',
+    '420322': '郧西县',
+    '420323': '竹山县',
+    '420324': '竹溪县',
+    '420325': '房县',
+    '420381': '丹江口市',
+    '420502': '西陵区',
+    '420503': '伍家岗区',
+    '420504': '点军区',
+    '420505': '猇亭区',
+    '420506': '夷陵区',
+    '420525': '远安县',
+    '420526': '兴山县',
+    '420527': '秭归县',
+    '420528': '长阳土家族自治县',
+    '420529': '五峰土家族自治县',
+    '420581': '宜都市',
+    '420582': '当阳市',
+    '420583': '枝江市',
+    '420590': '经济开发区',
+    '420602': '襄城区',
+    '420606': '樊城区',
+    '420607': '襄州区',
+    '420624': '南漳县',
+    '420625': '谷城县',
+    '420626': '保康县',
+    '420682': '老河口市',
+    '420683': '枣阳市',
+    '420684': '宜城市',
+    '420702': '梁子湖区',
+    '420703': '华容区',
+    '420704': '鄂城区',
+    '420802': '东宝区',
+    '420804': '掇刀区',
+    '420821': '京山县',
+    '420822': '沙洋县',
+    '420881': '钟祥市',
+    '420902': '孝南区',
+    '420921': '孝昌县',
+    '420922': '大悟县',
+    '420923': '云梦县',
+    '420981': '应城市',
+    '420982': '安陆市',
+    '420984': '汉川市',
+    '421002': '沙市区',
+    '421003': '荆州区',
+    '421022': '公安县',
+    '421023': '监利县',
+    '421024': '江陵县',
+    '421081': '石首市',
+    '421083': '洪湖市',
+    '421087': '松滋市',
+    '421102': '黄州区',
+    '421121': '团风县',
+    '421122': '红安县',
+    '421123': '罗田县',
+    '421124': '英山县',
+    '421125': '浠水县',
+    '421126': '蕲春县',
+    '421127': '黄梅县',
+    '421181': '麻城市',
+    '421182': '武穴市',
+    '421202': '咸安区',
+    '421221': '嘉鱼县',
+    '421222': '通城县',
+    '421223': '崇阳县',
+    '421224': '通山县',
+    '421281': '赤壁市',
+    '421303': '曾都区',
+    '421321': '随县',
+    '421381': '广水市',
+    '422801': '恩施市',
+    '422802': '利川市',
+    '422822': '建始县',
+    '422823': '巴东县',
+    '422825': '宣恩县',
+    '422826': '咸丰县',
+    '422827': '来凤县',
+    '422828': '鹤峰县',
+    '429004': '仙桃市',
+    '429005': '潜江市',
+    '429006': '天门市',
+    '429021': '神农架林区',
+    '430102': '芙蓉区',
+    '430103': '天心区',
+    '430104': '岳麓区',
+    '430105': '开福区',
+    '430111': '雨花区',
+    '430112': '望城区',
+    '430121': '长沙县',
+    '430124': '宁乡县',
+    '430181': '浏阳市',
+    '430202': '荷塘区',
+    '430203': '芦淞区',
+    '430204': '石峰区',
+    '430211': '天元区',
+    '430221': '株洲县',
+    '430223': '攸县',
+    '430224': '茶陵县',
+    '430225': '炎陵县',
+    '430281': '醴陵市',
+    '430302': '雨湖区',
+    '430304': '岳塘区',
+    '430321': '湘潭县',
+    '430381': '湘乡市',
+    '430382': '韶山市',
+    '430405': '珠晖区',
+    '430406': '雁峰区',
+    '430407': '石鼓区',
+    '430408': '蒸湘区',
+    '430412': '南岳区',
+    '430421': '衡阳县',
+    '430422': '衡南县',
+    '430423': '衡山县',
+    '430424': '衡东县',
+    '430426': '祁东县',
+    '430481': '耒阳市',
+    '430482': '常宁市',
+    '430502': '双清区',
+    '430503': '大祥区',
+    '430511': '北塔区',
+    '430521': '邵东县',
+    '430522': '新邵县',
+    '430523': '邵阳县',
+    '430524': '隆回县',
+    '430525': '洞口县',
+    '430527': '绥宁县',
+    '430528': '新宁县',
+    '430529': '城步苗族自治县',
+    '430581': '武冈市',
+    '430602': '岳阳楼区',
+    '430603': '云溪区',
+    '430611': '君山区',
+    '430621': '岳阳县',
+    '430623': '华容县',
+    '430624': '湘阴县',
+    '430626': '平江县',
+    '430681': '汨罗市',
+    '430682': '临湘市',
+    '430702': '武陵区',
+    '430703': '鼎城区',
+    '430721': '安乡县',
+    '430722': '汉寿县',
+    '430723': '澧县',
+    '430724': '临澧县',
+    '430725': '桃源县',
+    '430726': '石门县',
+    '430781': '津市市',
+    '430802': '永定区',
+    '430811': '武陵源区',
+    '430821': '慈利县',
+    '430822': '桑植县',
+    '430902': '资阳区',
+    '430903': '赫山区',
+    '430921': '南县',
+    '430922': '桃江县',
+    '430923': '安化县',
+    '430981': '沅江市',
+    '431002': '北湖区',
+    '431003': '苏仙区',
+    '431021': '桂阳县',
+    '431022': '宜章县',
+    '431023': '永兴县',
+    '431024': '嘉禾县',
+    '431025': '临武县',
+    '431026': '汝城县',
+    '431027': '桂东县',
+    '431028': '安仁县',
+    '431081': '资兴市',
+    '431102': '零陵区',
+    '431103': '冷水滩区',
+    '431121': '祁阳县',
+    '431122': '东安县',
+    '431123': '双牌县',
+    '431124': '道县',
+    '431125': '江永县',
+    '431126': '宁远县',
+    '431127': '蓝山县',
+    '431128': '新田县',
+    '431129': '江华瑶族自治县',
+    '431202': '鹤城区',
+    '431221': '中方县',
+    '431222': '沅陵县',
+    '431223': '辰溪县',
+    '431224': '溆浦县',
+    '431225': '会同县',
+    '431226': '麻阳苗族自治县',
+    '431227': '新晃侗族自治县',
+    '431228': '芷江侗族自治县',
+    '431229': '靖州苗族侗族自治县',
+    '431230': '通道侗族自治县',
+    '431281': '洪江市',
+    '431302': '娄星区',
+    '431321': '双峰县',
+    '431322': '新化县',
+    '431381': '冷水江市',
+    '431382': '涟源市',
+    '433101': '吉首市',
+    '433122': '泸溪县',
+    '433123': '凤凰县',
+    '433124': '花垣县',
+    '433125': '保靖县',
+    '433126': '古丈县',
+    '433127': '永顺县',
+    '433130': '龙山县',
+    '440103': '荔湾区',
+    '440104': '越秀区',
+    '440105': '海珠区',
+    '440106': '天河区',
+    '440111': '白云区',
+    '440112': '黄埔区',
+    '440113': '番禺区',
+    '440114': '花都区',
+    '440115': '南沙区',
+    '440117': '从化区',
+    '440118': '增城区',
+    '440203': '武江区',
+    '440204': '浈江区',
+    '440205': '曲江区',
+    '440222': '始兴县',
+    '440224': '仁化县',
+    '440229': '翁源县',
+    '440232': '乳源瑶族自治县',
+    '440233': '新丰县',
+    '440281': '乐昌市',
+    '440282': '南雄市',
+    '440303': '罗湖区',
+    '440304': '福田区',
+    '440305': '南山区',
+    '440306': '宝安区',
+    '440307': '龙岗区',
+    '440308': '盐田区',
+    '440390': '坪山新区',
+    '440391': '光明新区',
+    '440392': '大鹏新区',
+    '440393': '龙华新区',
+    '440402': '香洲区',
+    '440403': '斗门区',
+    '440404': '金湾区',
+    '440507': '龙湖区',
+    '440511': '金平区',
+    '440512': '濠江区',
+    '440513': '潮阳区',
+    '440514': '潮南区',
+    '440515': '澄海区',
+    '440523': '南澳县',
+    '440604': '禅城区',
+    '440605': '南海区',
+    '440606': '顺德区',
+    '440607': '三水区',
+    '440608': '高明区',
+    '440703': '蓬江区',
+    '440704': '江海区',
+    '440705': '新会区',
+    '440781': '台山市',
+    '440783': '开平市',
+    '440784': '鹤山市',
+    '440785': '恩平市',
+    '440802': '赤坎区',
+    '440803': '霞山区',
+    '440804': '坡头区',
+    '440811': '麻章区',
+    '440823': '遂溪县',
+    '440825': '徐闻县',
+    '440881': '廉江市',
+    '440882': '雷州市',
+    '440883': '吴川市',
+    '440890': '经济技术开发区',
+    '440902': '茂南区',
+    '440904': '电白区',
+    '440981': '高州市',
+    '440982': '化州市',
+    '440983': '信宜市',
+    '441202': '端州区',
+    '441203': '鼎湖区',
+    '441204': '高要区',
+    '441223': '广宁县',
+    '441224': '怀集县',
+    '441225': '封开县',
+    '441226': '德庆县',
+    '441284': '四会市',
+    '441302': '惠城区',
+    '441303': '惠阳区',
+    '441322': '博罗县',
+    '441323': '惠东县',
+    '441324': '龙门县',
+    '441402': '梅江区',
+    '441403': '梅县区',
+    '441422': '大埔县',
+    '441423': '丰顺县',
+    '441424': '五华县',
+    '441426': '平远县',
+    '441427': '蕉岭县',
+    '441481': '兴宁市',
+    '441502': '城区',
+    '441521': '海丰县',
+    '441523': '陆河县',
+    '441581': '陆丰市',
+    '441602': '源城区',
+    '441621': '紫金县',
+    '441622': '龙川县',
+    '441623': '连平县',
+    '441624': '和平县',
+    '441625': '东源县',
+    '441702': '江城区',
+    '441704': '阳东区',
+    '441721': '阳西县',
+    '441781': '阳春市',
+    '441802': '清城区',
+    '441803': '清新区',
+    '441821': '佛冈县',
+    '441823': '阳山县',
+    '441825': '连山壮族瑶族自治县',
+    '441826': '连南瑶族自治县',
+    '441881': '英德市',
+    '441882': '连州市',
+    '441901': '中堂镇',
+    '441903': '南城区',
+    '441904': '长安镇',
+    '441905': '东坑镇',
+    '441906': '樟木头镇',
+    '441907': '莞城区',
+    '441908': '石龙镇',
+    '441909': '桥头镇',
+    '441910': '万江区',
+    '441911': '麻涌镇',
+    '441912': '虎门镇',
+    '441913': '谢岗镇',
+    '441914': '石碣镇',
+    '441915': '茶山镇',
+    '441916': '东城区',
+    '441917': '洪梅镇',
+    '441918': '道滘镇',
+    '441919': '高埗镇',
+    '441920': '企石镇',
+    '441921': '凤岗镇',
+    '441922': '大岭山镇',
+    '441923': '松山湖',
+    '441924': '清溪镇',
+    '441925': '望牛墩镇',
+    '441926': '厚街镇',
+    '441927': '常平镇',
+    '441928': '寮步镇',
+    '441929': '石排镇',
+    '441930': '横沥镇',
+    '441931': '塘厦镇',
+    '441932': '黄江镇',
+    '441933': '大朗镇',
+    '441990': '沙田镇',
+    '442001': '南头镇',
+    '442002': '神湾镇',
+    '442003': '东凤镇',
+    '442004': '五桂山镇',
+    '442005': '黄圃镇',
+    '442006': '小榄镇',
+    '442007': '石岐区街道',
+    '442008': '横栏镇',
+    '442009': '三角镇',
+    '442010': '三乡镇',
+    '442011': '港口镇',
+    '442012': '沙溪镇',
+    '442013': '板芙镇',
+    '442014': '沙朗镇',
+    '442015': '东升镇',
+    '442016': '阜沙镇',
+    '442017': '民众镇',
+    '442018': '东区街道',
+    '442019': '火炬开发区',
+    '442020': '西区街道',
+    '442021': '南区街道',
+    '442022': '古镇',
+    '442023': '坦洲镇',
+    '442024': '大涌镇',
+    '442025': '南朗镇',
+    '445102': '湘桥区',
+    '445103': '潮安区',
+    '445122': '饶平县',
+    '445190': '枫溪区',
+    '445202': '榕城区',
+    '445203': '揭东区',
+    '445222': '揭西县',
+    '445224': '惠来县',
+    '445281': '普宁市',
+    '445302': '云城区',
+    '445303': '云安区',
+    '445321': '新兴县',
+    '445322': '郁南县',
+    '445381': '罗定市',
+    '450102': '兴宁区',
+    '450103': '青秀区',
+    '450105': '江南区',
+    '450107': '西乡塘区',
+    '450108': '良庆区',
+    '450109': '邕宁区',
+    '450110': '武鸣区',
+    '450123': '隆安县',
+    '450124': '马山县',
+    '450125': '上林县',
+    '450126': '宾阳县',
+    '450127': '横县',
+    '450202': '城中区',
+    '450203': '鱼峰区',
+    '450204': '柳南区',
+    '450205': '柳北区',
+    '450221': '柳江县',
+    '450222': '柳城县',
+    '450223': '鹿寨县',
+    '450224': '融安县',
+    '450225': '融水苗族自治县',
+    '450226': '三江侗族自治县',
+    '450302': '秀峰区',
+    '450303': '叠彩区',
+    '450304': '象山区',
+    '450305': '七星区',
+    '450311': '雁山区',
+    '450312': '临桂区',
+    '450321': '阳朔县',
+    '450323': '灵川县',
+    '450324': '全州县',
+    '450325': '兴安县',
+    '450326': '永福县',
+    '450327': '灌阳县',
+    '450328': '龙胜各族自治县',
+    '450329': '资源县',
+    '450330': '平乐县',
+    '450331': '荔浦县',
+    '450332': '恭城瑶族自治县',
+    '450403': '万秀区',
+    '450405': '长洲区',
+    '450406': '龙圩区',
+    '450421': '苍梧县',
+    '450422': '藤县',
+    '450423': '蒙山县',
+    '450481': '岑溪市',
+    '450502': '海城区',
+    '450503': '银海区',
+    '450512': '铁山港区',
+    '450521': '合浦县',
+    '450602': '港口区',
+    '450603': '防城区',
+    '450621': '上思县',
+    '450681': '东兴市',
+    '450702': '钦南区',
+    '450703': '钦北区',
+    '450721': '灵山县',
+    '450722': '浦北县',
+    '450802': '港北区',
+    '450803': '港南区',
+    '450804': '覃塘区',
+    '450821': '平南县',
+    '450881': '桂平市',
+    '450902': '玉州区',
+    '450903': '福绵区',
+    '450921': '容县',
+    '450922': '陆川县',
+    '450923': '博白县',
+    '450924': '兴业县',
+    '450981': '北流市',
+    '451002': '右江区',
+    '451021': '田阳县',
+    '451022': '田东县',
+    '451023': '平果县',
+    '451024': '德保县',
+    '451026': '那坡县',
+    '451027': '凌云县',
+    '451028': '乐业县',
+    '451029': '田林县',
+    '451030': '西林县',
+    '451031': '隆林各族自治县',
+    '451081': '靖西市',
+    '451102': '八步区',
+    '451121': '昭平县',
+    '451122': '钟山县',
+    '451123': '富川瑶族自治县',
+    '451202': '金城江区',
+    '451221': '南丹县',
+    '451222': '天峨县',
+    '451223': '凤山县',
+    '451224': '东兰县',
+    '451225': '罗城仫佬族自治县',
+    '451226': '环江毛南族自治县',
+    '451227': '巴马瑶族自治县',
+    '451228': '都安瑶族自治县',
+    '451229': '大化瑶族自治县',
+    '451281': '宜州市',
+    '451302': '兴宾区',
+    '451321': '忻城县',
+    '451322': '象州县',
+    '451323': '武宣县',
+    '451324': '金秀瑶族自治县',
+    '451381': '合山市',
+    '451402': '江州区',
+    '451421': '扶绥县',
+    '451422': '宁明县',
+    '451423': '龙州县',
+    '451424': '大新县',
+    '451425': '天等县',
+    '451481': '凭祥市',
+    '460105': '秀英区',
+    '460106': '龙华区',
+    '460107': '琼山区',
+    '460108': '美兰区',
+    '460202': '海棠区',
+    '460203': '吉阳区',
+    '460204': '天涯区',
+    '460205': '崖州区',
+    '460321': '西沙群岛',
+    '460322': '南沙群岛',
+    '460323': '中沙群岛的岛礁及其海域',
+    '469001': '五指山市',
+    '469002': '琼海市',
+    '469003': '儋州市',
+    '469005': '文昌市',
+    '469006': '万宁市',
+    '469007': '东方市',
+    '469021': '定安县',
+    '469022': '屯昌县',
+    '469023': '澄迈县',
+    '469024': '临高县',
+    '469025': '白沙黎族自治县',
+    '469026': '昌江黎族自治县',
+    '469027': '乐东黎族自治县',
+    '469028': '陵水黎族自治县',
+    '469029': '保亭黎族苗族自治县',
+    '469030': '琼中黎族苗族自治县',
+    '500101': '万州区',
+    '500102': '涪陵区',
+    '500103': '渝中区',
+    '500104': '大渡口区',
+    '500105': '江北区',
+    '500106': '沙坪坝区',
+    '500107': '九龙坡区',
+    '500108': '南岸区',
+    '500109': '北碚区',
+    '500110': '綦江区',
+    '500111': '大足区',
+    '500112': '渝北区',
+    '500113': '巴南区',
+    '500114': '黔江区',
+    '500115': '长寿区',
+    '500116': '江津区',
+    '500117': '合川区',
+    '500118': '永川区',
+    '500119': '南川区',
+    '500120': '璧山区',
+    '500151': '铜梁区',
+    '500152': '潼南区',
+    '500153': '荣昌区',
+    '500228': '梁平县',
+    '500229': '城口县',
+    '500230': '丰都县',
+    '500231': '垫江县',
+    '500232': '武隆县',
+    '500233': '忠县',
+    '500234': '开县',
+    '500235': '云阳县',
+    '500236': '奉节县',
+    '500237': '巫山县',
+    '500238': '巫溪县',
+    '500240': '石柱土家族自治县',
+    '500241': '秀山土家族苗族自治县',
+    '500242': '酉阳土家族苗族自治县',
+    '500243': '彭水苗族土家族自治县',
+    '510104': '锦江区',
+    '510105': '青羊区',
+    '510106': '金牛区',
+    '510107': '武侯区',
+    '510108': '成华区',
+    '510112': '龙泉驿区',
+    '510113': '青白江区',
+    '510114': '新都区',
+    '510115': '温江区',
+    '510121': '金堂县',
+    '510122': '双流县',
+    '510124': '郫县',
+    '510129': '大邑县',
+    '510131': '蒲江县',
+    '510132': '新津县',
+    '510181': '都江堰市',
+    '510182': '彭州市',
+    '510183': '邛崃市',
+    '510184': '崇州市',
+    '510190': '高新西区',
+    '510191': '高新区',
+    '510302': '自流井区',
+    '510303': '贡井区',
+    '510304': '大安区',
+    '510311': '沿滩区',
+    '510321': '荣县',
+    '510322': '富顺县',
+    '510402': '东区',
+    '510403': '西区',
+    '510411': '仁和区',
+    '510421': '米易县',
+    '510422': '盐边县',
+    '510502': '江阳区',
+    '510503': '纳溪区',
+    '510504': '龙马潭区',
+    '510521': '泸县',
+    '510522': '合江县',
+    '510524': '叙永县',
+    '510525': '古蔺县',
+    '510603': '旌阳区',
+    '510623': '中江县',
+    '510626': '罗江县',
+    '510681': '广汉市',
+    '510682': '什邡市',
+    '510683': '绵竹市',
+    '510703': '涪城区',
+    '510704': '游仙区',
+    '510722': '三台县',
+    '510723': '盐亭县',
+    '510724': '安县',
+    '510725': '梓潼县',
+    '510726': '北川羌族自治县',
+    '510727': '平武县',
+    '510781': '江油市',
+    '510790': '经开区',
+    '510791': '高新区',
+    '510802': '利州区',
+    '510811': '昭化区',
+    '510812': '朝天区',
+    '510821': '旺苍县',
+    '510822': '青川县',
+    '510823': '剑阁县',
+    '510824': '苍溪县',
+    '510903': '船山区',
+    '510904': '安居区',
+    '510921': '蓬溪县',
+    '510922': '射洪县',
+    '510923': '大英县',
+    '511002': '市中区',
+    '511011': '东兴区',
+    '511024': '威远县',
+    '511025': '资中县',
+    '511028': '隆昌县',
+    '511102': '市中区',
+    '511111': '沙湾区',
+    '511112': '五通桥区',
+    '511113': '金口河区',
+    '511123': '犍为县',
+    '511124': '井研县',
+    '511126': '夹江县',
+    '511129': '沐川县',
+    '511132': '峨边彝族自治县',
+    '511133': '马边彝族自治县',
+    '511181': '峨眉山市',
+    '511302': '顺庆区',
+    '511303': '高坪区',
+    '511304': '嘉陵区',
+    '511321': '南部县',
+    '511322': '营山县',
+    '511323': '蓬安县',
+    '511324': '仪陇县',
+    '511325': '西充县',
+    '511381': '阆中市',
+    '511402': '东坡区',
+    '511403': '彭山区',
+    '511421': '仁寿县',
+    '511423': '洪雅县',
+    '511424': '丹棱县',
+    '511425': '青神县',
+    '511502': '翠屏区',
+    '511503': '南溪区',
+    '511521': '宜宾县',
+    '511523': '江安县',
+    '511524': '长宁县',
+    '511525': '高县',
+    '511526': '珙县',
+    '511527': '筠连县',
+    '511528': '兴文县',
+    '511529': '屏山县',
+    '511602': '广安区',
+    '511603': '前锋区',
+    '511621': '岳池县',
+    '511622': '武胜县',
+    '511623': '邻水县',
+    '511681': '华蓥市',
+    '511702': '通川区',
+    '511703': '达川区',
+    '511722': '宣汉县',
+    '511723': '开江县',
+    '511724': '大竹县',
+    '511725': '渠县',
+    '511781': '万源市',
+    '511802': '雨城区',
+    '511803': '名山区',
+    '511822': '荥经县',
+    '511823': '汉源县',
+    '511824': '石棉县',
+    '511825': '天全县',
+    '511826': '芦山县',
+    '511827': '宝兴县',
+    '511902': '巴州区',
+    '511903': '恩阳区',
+    '511921': '通江县',
+    '511922': '南江县',
+    '511923': '平昌县',
+    '512002': '雁江区',
+    '512021': '安岳县',
+    '512022': '乐至县',
+    '512081': '简阳市',
+    '513221': '汶川县',
+    '513222': '理县',
+    '513223': '茂县',
+    '513224': '松潘县',
+    '513225': '九寨沟县',
+    '513226': '金川县',
+    '513227': '小金县',
+    '513228': '黑水县',
+    '513229': '马尔康县',
+    '513230': '壤塘县',
+    '513231': '阿坝县',
+    '513232': '若尔盖县',
+    '513233': '红原县',
+    '513301': '康定市',
+    '513322': '泸定县',
+    '513323': '丹巴县',
+    '513324': '九龙县',
+    '513325': '雅江县',
+    '513326': '道孚县',
+    '513327': '炉霍县',
+    '513328': '甘孜县',
+    '513329': '新龙县',
+    '513330': '德格县',
+    '513331': '白玉县',
+    '513332': '石渠县',
+    '513333': '色达县',
+    '513334': '理塘县',
+    '513335': '巴塘县',
+    '513336': '乡城县',
+    '513337': '稻城县',
+    '513338': '得荣县',
+    '513401': '西昌市',
+    '513422': '木里藏族自治县',
+    '513423': '盐源县',
+    '513424': '德昌县',
+    '513425': '会理县',
+    '513426': '会东县',
+    '513427': '宁南县',
+    '513428': '普格县',
+    '513429': '布拖县',
+    '513430': '金阳县',
+    '513431': '昭觉县',
+    '513432': '喜德县',
+    '513433': '冕宁县',
+    '513434': '越西县',
+    '513435': '甘洛县',
+    '513436': '美姑县',
+    '513437': '雷波县',
+    '520102': '南明区',
+    '520103': '云岩区',
+    '520111': '花溪区',
+    '520112': '乌当区',
+    '520113': '白云区',
+    '520115': '观山湖区',
+    '520121': '开阳县',
+    '520122': '息烽县',
+    '520123': '修文县',
+    '520181': '清镇市',
+    '520201': '钟山区',
+    '520203': '六枝特区',
+    '520221': '水城县',
+    '520222': '盘县',
+    '520302': '红花岗区',
+    '520303': '汇川区',
+    '520321': '遵义县',
+    '520322': '桐梓县',
+    '520323': '绥阳县',
+    '520324': '正安县',
+    '520325': '道真仡佬族苗族自治县',
+    '520326': '务川仡佬族苗族自治县',
+    '520327': '凤冈县',
+    '520328': '湄潭县',
+    '520329': '余庆县',
+    '520330': '习水县',
+    '520381': '赤水市',
+    '520382': '仁怀市',
+    '520402': '西秀区',
+    '520403': '平坝区',
+    '520422': '普定县',
+    '520423': '镇宁布依族苗族自治县',
+    '520424': '关岭布依族苗族自治县',
+    '520425': '紫云苗族布依族自治县',
+    '520502': '七星关区',
+    '520521': '大方县',
+    '520522': '黔西县',
+    '520523': '金沙县',
+    '520524': '织金县',
+    '520525': '纳雍县',
+    '520526': '威宁彝族回族苗族自治县',
+    '520527': '赫章县',
+    '520602': '碧江区',
+    '520603': '万山区',
+    '520621': '江口县',
+    '520622': '玉屏侗族自治县',
+    '520623': '石阡县',
+    '520624': '思南县',
+    '520625': '印江土家族苗族自治县',
+    '520626': '德江县',
+    '520627': '沿河土家族自治县',
+    '520628': '松桃苗族自治县',
+    '522301': '兴义市',
+    '522322': '兴仁县',
+    '522323': '普安县',
+    '522324': '晴隆县',
+    '522325': '贞丰县',
+    '522326': '望谟县',
+    '522327': '册亨县',
+    '522328': '安龙县',
+    '522601': '凯里市',
+    '522622': '黄平县',
+    '522623': '施秉县',
+    '522624': '三穗县',
+    '522625': '镇远县',
+    '522626': '岑巩县',
+    '522627': '天柱县',
+    '522628': '锦屏县',
+    '522629': '剑河县',
+    '522630': '台江县',
+    '522631': '黎平县',
+    '522632': '榕江县',
+    '522633': '从江县',
+    '522634': '雷山县',
+    '522635': '麻江县',
+    '522636': '丹寨县',
+    '522701': '都匀市',
+    '522702': '福泉市',
+    '522722': '荔波县',
+    '522723': '贵定县',
+    '522725': '瓮安县',
+    '522726': '独山县',
+    '522727': '平塘县',
+    '522728': '罗甸县',
+    '522729': '长顺县',
+    '522730': '龙里县',
+    '522731': '惠水县',
+    '522732': '三都水族自治县',
+    '530102': '五华区',
+    '530103': '盘龙区',
+    '530111': '官渡区',
+    '530112': '西山区',
+    '530113': '东川区',
+    '530114': '呈贡区',
+    '530122': '晋宁县',
+    '530124': '富民县',
+    '530125': '宜良县',
+    '530126': '石林彝族自治县',
+    '530127': '嵩明县',
+    '530128': '禄劝彝族苗族自治县',
+    '530129': '寻甸回族彝族自治县',
+    '530181': '安宁市',
+    '530302': '麒麟区',
+    '530321': '马龙县',
+    '530322': '陆良县',
+    '530323': '师宗县',
+    '530324': '罗平县',
+    '530325': '富源县',
+    '530326': '会泽县',
+    '530328': '沾益县',
+    '530381': '宣威市',
+    '530402': '红塔区',
+    '530421': '江川县',
+    '530422': '澄江县',
+    '530423': '通海县',
+    '530424': '华宁县',
+    '530425': '易门县',
+    '530426': '峨山彝族自治县',
+    '530427': '新平彝族傣族自治县',
+    '530428': '元江哈尼族彝族傣族自治县',
+    '530502': '隆阳区',
+    '530521': '施甸县',
+    '530523': '龙陵县',
+    '530524': '昌宁县',
+    '530581': '腾冲市',
+    '530602': '昭阳区',
+    '530621': '鲁甸县',
+    '530622': '巧家县',
+    '530623': '盐津县',
+    '530624': '大关县',
+    '530625': '永善县',
+    '530626': '绥江县',
+    '530627': '镇雄县',
+    '530628': '彝良县',
+    '530629': '威信县',
+    '530630': '水富县',
+    '530702': '古城区',
+    '530721': '玉龙纳西族自治县',
+    '530722': '永胜县',
+    '530723': '华坪县',
+    '530724': '宁蒗彝族自治县',
+    '530802': '思茅区',
+    '530821': '宁洱哈尼族彝族自治县',
+    '530822': '墨江哈尼族自治县',
+    '530823': '景东彝族自治县',
+    '530824': '景谷傣族彝族自治县',
+    '530825': '镇沅彝族哈尼族拉祜族自治县',
+    '530826': '江城哈尼族彝族自治县',
+    '530827': '孟连傣族拉祜族佤族自治县',
+    '530828': '澜沧拉祜族自治县',
+    '530829': '西盟佤族自治县',
+    '530902': '临翔区',
+    '530921': '凤庆县',
+    '530922': '云县',
+    '530923': '永德县',
+    '530924': '镇康县',
+    '530925': '双江拉祜族佤族布朗族傣族自治县',
+    '530926': '耿马傣族佤族自治县',
+    '530927': '沧源佤族自治县',
+    '532301': '楚雄市',
+    '532322': '双柏县',
+    '532323': '牟定县',
+    '532324': '南华县',
+    '532325': '姚安县',
+    '532326': '大姚县',
+    '532327': '永仁县',
+    '532328': '元谋县',
+    '532329': '武定县',
+    '532331': '禄丰县',
+    '532501': '个旧市',
+    '532502': '开远市',
+    '532503': '蒙自市',
+    '532504': '弥勒市',
+    '532523': '屏边苗族自治县',
+    '532524': '建水县',
+    '532525': '石屏县',
+    '532527': '泸西县',
+    '532528': '元阳县',
+    '532529': '红河县',
+    '532530': '金平苗族瑶族傣族自治县',
+    '532531': '绿春县',
+    '532532': '河口瑶族自治县',
+    '532601': '文山市',
+    '532622': '砚山县',
+    '532623': '西畴县',
+    '532624': '麻栗坡县',
+    '532625': '马关县',
+    '532626': '丘北县',
+    '532627': '广南县',
+    '532628': '富宁县',
+    '532801': '景洪市',
+    '532822': '勐海县',
+    '532823': '勐腊县',
+    '532901': '大理市',
+    '532922': '漾濞彝族自治县',
+    '532923': '祥云县',
+    '532924': '宾川县',
+    '532925': '弥渡县',
+    '532926': '南涧彝族自治县',
+    '532927': '巍山彝族回族自治县',
+    '532928': '永平县',
+    '532929': '云龙县',
+    '532930': '洱源县',
+    '532931': '剑川县',
+    '532932': '鹤庆县',
+    '533102': '瑞丽市',
+    '533103': '芒市',
+    '533122': '梁河县',
+    '533123': '盈江县',
+    '533124': '陇川县',
+    '533321': '泸水县',
+    '533323': '福贡县',
+    '533324': '贡山独龙族怒族自治县',
+    '533325': '兰坪白族普米族自治县',
+    '533401': '香格里拉市',
+    '533422': '德钦县',
+    '533423': '维西傈僳族自治县',
+    '540102': '城关区',
+    '540121': '林周县',
+    '540122': '当雄县',
+    '540123': '尼木县',
+    '540124': '曲水县',
+    '540125': '堆龙德庆县',
+    '540126': '达孜县',
+    '540127': '墨竹工卡县',
+    '540202': '桑珠孜区',
+    '540221': '南木林县',
+    '540222': '江孜县',
+    '540223': '定日县',
+    '540224': '萨迦县',
+    '540225': '拉孜县',
+    '540226': '昂仁县',
+    '540227': '谢通门县',
+    '540228': '白朗县',
+    '540229': '仁布县',
+    '540230': '康马县',
+    '540231': '定结县',
+    '540232': '仲巴县',
+    '540233': '亚东县',
+    '540234': '吉隆县',
+    '540235': '聂拉木县',
+    '540236': '萨嘎县',
+    '540237': '岗巴县',
+    '540302': '卡若区',
+    '540321': '江达县',
+    '540322': '贡觉县',
+    '540323': '类乌齐县',
+    '540324': '丁青县',
+    '540325': '察雅县',
+    '540326': '八宿县',
+    '540327': '左贡县',
+    '540328': '芒康县',
+    '540329': '洛隆县',
+    '540330': '边坝县',
+    '540402': '巴宜区',
+    '540421': '工布江达县',
+    '540422': '米林县',
+    '540423': '墨脱县',
+    '540424': '波密县',
+    '540425': '察隅县',
+    '540426': '朗县',
+    '542221': '乃东县',
+    '542222': '扎囊县',
+    '542223': '贡嘎县',
+    '542224': '桑日县',
+    '542225': '琼结县',
+    '542226': '曲松县',
+    '542227': '措美县',
+    '542228': '洛扎县',
+    '542229': '加查县',
+    '542231': '隆子县',
+    '542232': '错那县',
+    '542233': '浪卡子县',
+    '542421': '那曲县',
+    '542422': '嘉黎县',
+    '542423': '比如县',
+    '542424': '聂荣县',
+    '542425': '安多县',
+    '542426': '申扎县',
+    '542427': '索县',
+    '542428': '班戈县',
+    '542429': '巴青县',
+    '542430': '尼玛县',
+    '542431': '双湖县',
+    '542521': '普兰县',
+    '542522': '札达县',
+    '542523': '噶尔县',
+    '542524': '日土县',
+    '542525': '革吉县',
+    '542526': '改则县',
+    '542527': '措勤县',
+    '610102': '新城区',
+    '610103': '碑林区',
+    '610104': '莲湖区',
+    '610111': '灞桥区',
+    '610112': '未央区',
+    '610113': '雁塔区',
+    '610114': '阎良区',
+    '610115': '临潼区',
+    '610116': '长安区',
+    '610117': '高陵区',
+    '610122': '蓝田县',
+    '610124': '周至县',
+    '610125': '户县',
+    '610202': '王益区',
+    '610203': '印台区',
+    '610204': '耀州区',
+    '610222': '宜君县',
+    '610302': '渭滨区',
+    '610303': '金台区',
+    '610304': '陈仓区',
+    '610322': '凤翔县',
+    '610323': '岐山县',
+    '610324': '扶风县',
+    '610326': '眉县',
+    '610327': '陇县',
+    '610328': '千阳县',
+    '610329': '麟游县',
+    '610330': '凤县',
+    '610331': '太白县',
+    '610402': '秦都区',
+    '610403': '杨陵区',
+    '610404': '渭城区',
+    '610422': '三原县',
+    '610423': '泾阳县',
+    '610424': '乾县',
+    '610425': '礼泉县',
+    '610426': '永寿县',
+    '610427': '彬县',
+    '610428': '长武县',
+    '610429': '旬邑县',
+    '610430': '淳化县',
+    '610431': '武功县',
+    '610481': '兴平市',
+    '610502': '临渭区',
+    '610521': '华县',
+    '610522': '潼关县',
+    '610523': '大荔县',
+    '610524': '合阳县',
+    '610525': '澄城县',
+    '610526': '蒲城县',
+    '610527': '白水县',
+    '610528': '富平县',
+    '610581': '韩城市',
+    '610582': '华阴市',
+    '610602': '宝塔区',
+    '610621': '延长县',
+    '610622': '延川县',
+    '610623': '子长县',
+    '610624': '安塞县',
+    '610625': '志丹县',
+    '610626': '吴起县',
+    '610627': '甘泉县',
+    '610628': '富县',
+    '610629': '洛川县',
+    '610630': '宜川县',
+    '610631': '黄龙县',
+    '610632': '黄陵县',
+    '610702': '汉台区',
+    '610721': '南郑县',
+    '610722': '城固县',
+    '610723': '洋县',
+    '610724': '西乡县',
+    '610725': '勉县',
+    '610726': '宁强县',
+    '610727': '略阳县',
+    '610728': '镇巴县',
+    '610729': '留坝县',
+    '610730': '佛坪县',
+    '610802': '榆阳区',
+    '610821': '神木县',
+    '610822': '府谷县',
+    '610823': '横山县',
+    '610824': '靖边县',
+    '610825': '定边县',
+    '610826': '绥德县',
+    '610827': '米脂县',
+    '610828': '佳县',
+    '610829': '吴堡县',
+    '610830': '清涧县',
+    '610831': '子洲县',
+    '610902': '汉滨区',
+    '610921': '汉阴县',
+    '610922': '石泉县',
+    '610923': '宁陕县',
+    '610924': '紫阳县',
+    '610925': '岚皋县',
+    '610926': '平利县',
+    '610927': '镇坪县',
+    '610928': '旬阳县',
+    '610929': '白河县',
+    '611002': '商州区',
+    '611021': '洛南县',
+    '611022': '丹凤县',
+    '611023': '商南县',
+    '611024': '山阳县',
+    '611025': '镇安县',
+    '611026': '柞水县',
+    '620102': '城关区',
+    '620103': '七里河区',
+    '620104': '西固区',
+    '620105': '安宁区',
+    '620111': '红古区',
+    '620121': '永登县',
+    '620122': '皋兰县',
+    '620123': '榆中县',
+    '620201': '市辖区',
+    '620290': '雄关区',
+    '620291': '长城区',
+    '620292': '镜铁区',
+    '620293': '新城镇',
+    '620294': '峪泉镇',
+    '620295': '文殊镇',
+    '620302': '金川区',
+    '620321': '永昌县',
+    '620402': '白银区',
+    '620403': '平川区',
+    '620421': '靖远县',
+    '620422': '会宁县',
+    '620423': '景泰县',
+    '620502': '秦州区',
+    '620503': '麦积区',
+    '620521': '清水县',
+    '620522': '秦安县',
+    '620523': '甘谷县',
+    '620524': '武山县',
+    '620525': '张家川回族自治县',
+    '620602': '凉州区',
+    '620621': '民勤县',
+    '620622': '古浪县',
+    '620623': '天祝藏族自治县',
+    '620702': '甘州区',
+    '620721': '肃南裕固族自治县',
+    '620722': '民乐县',
+    '620723': '临泽县',
+    '620724': '高台县',
+    '620725': '山丹县',
+    '620802': '崆峒区',
+    '620821': '泾川县',
+    '620822': '灵台县',
+    '620823': '崇信县',
+    '620824': '华亭县',
+    '620825': '庄浪县',
+    '620826': '静宁县',
+    '620902': '肃州区',
+    '620921': '金塔县',
+    '620922': '瓜州县',
+    '620923': '肃北蒙古族自治县',
+    '620924': '阿克塞哈萨克族自治县',
+    '620981': '玉门市',
+    '620982': '敦煌市',
+    '621002': '西峰区',
+    '621021': '庆城县',
+    '621022': '环县',
+    '621023': '华池县',
+    '621024': '合水县',
+    '621025': '正宁县',
+    '621026': '宁县',
+    '621027': '镇原县',
+    '621102': '安定区',
+    '621121': '通渭县',
+    '621122': '陇西县',
+    '621123': '渭源县',
+    '621124': '临洮县',
+    '621125': '漳县',
+    '621126': '岷县',
+    '621202': '武都区',
+    '621221': '成县',
+    '621222': '文县',
+    '621223': '宕昌县',
+    '621224': '康县',
+    '621225': '西和县',
+    '621226': '礼县',
+    '621227': '徽县',
+    '621228': '两当县',
+    '622901': '临夏市',
+    '622921': '临夏县',
+    '622922': '康乐县',
+    '622923': '永靖县',
+    '622924': '广河县',
+    '622925': '和政县',
+    '622926': '东乡族自治县',
+    '622927': '积石山保安族东乡族撒拉族自治县',
+    '623001': '合作市',
+    '623021': '临潭县',
+    '623022': '卓尼县',
+    '623023': '舟曲县',
+    '623024': '迭部县',
+    '623025': '玛曲县',
+    '623026': '碌曲县',
+    '623027': '夏河县',
+    '630102': '城东区',
+    '630103': '城中区',
+    '630104': '城西区',
+    '630105': '城北区',
+    '630121': '大通回族土族自治县',
+    '630122': '湟中县',
+    '630123': '湟源县',
+    '630202': '乐都区',
+    '630203': '平安区',
+    '630222': '民和回族土族自治县',
+    '630223': '互助土族自治县',
+    '630224': '化隆回族自治县',
+    '630225': '循化撒拉族自治县',
+    '632221': '门源回族自治县',
+    '632222': '祁连县',
+    '632223': '海晏县',
+    '632224': '刚察县',
+    '632321': '同仁县',
+    '632322': '尖扎县',
+    '632323': '泽库县',
+    '632324': '河南蒙古族自治县',
+    '632521': '共和县',
+    '632522': '同德县',
+    '632523': '贵德县',
+    '632524': '兴海县',
+    '632525': '贵南县',
+    '632621': '玛沁县',
+    '632622': '班玛县',
+    '632623': '甘德县',
+    '632624': '达日县',
+    '632625': '久治县',
+    '632626': '玛多县',
+    '632701': '玉树市',
+    '632722': '杂多县',
+    '632723': '称多县',
+    '632724': '治多县',
+    '632725': '囊谦县',
+    '632726': '曲麻莱县',
+    '632801': '格尔木市',
+    '632802': '德令哈市',
+    '632821': '乌兰县',
+    '632822': '都兰县',
+    '632823': '天峻县',
+    '640104': '兴庆区',
+    '640105': '西夏区',
+    '640106': '金凤区',
+    '640121': '永宁县',
+    '640122': '贺兰县',
+    '640181': '灵武市',
+    '640202': '大武口区',
+    '640205': '惠农区',
+    '640221': '平罗县',
+    '640302': '利通区',
+    '640303': '红寺堡区',
+    '640323': '盐池县',
+    '640324': '同心县',
+    '640381': '青铜峡市',
+    '640402': '原州区',
+    '640422': '西吉县',
+    '640423': '隆德县',
+    '640424': '泾源县',
+    '640425': '彭阳县',
+    '640502': '沙坡头区',
+    '640521': '中宁县',
+    '640522': '海原县',
+    '650102': '天山区',
+    '650103': '沙依巴克区',
+    '650104': '新市区',
+    '650105': '水磨沟区',
+    '650106': '头屯河区',
+    '650107': '达坂城区',
+    '650109': '米东区',
+    '650121': '乌鲁木齐县',
+    '650202': '独山子区',
+    '650203': '克拉玛依区',
+    '650204': '白碱滩区',
+    '650205': '乌尔禾区',
+    '650402': '高昌区',
+    '650421': '鄯善县',
+    '650422': '托克逊县',
+    '652201': '哈密市',
+    '652222': '巴里坤哈萨克自治县',
+    '652223': '伊吾县',
+    '652301': '昌吉市',
+    '652302': '阜康市',
+    '652323': '呼图壁县',
+    '652324': '玛纳斯县',
+    '652325': '奇台县',
+    '652327': '吉木萨尔县',
+    '652328': '木垒哈萨克自治县',
+    '652701': '博乐市',
+    '652702': '阿拉山口市',
+    '652722': '精河县',
+    '652723': '温泉县',
+    '652801': '库尔勒市',
+    '652822': '轮台县',
+    '652823': '尉犁县',
+    '652824': '若羌县',
+    '652825': '且末县',
+    '652826': '焉耆回族自治县',
+    '652827': '和静县',
+    '652828': '和硕县',
+    '652829': '博湖县',
+    '652901': '阿克苏市',
+    '652922': '温宿县',
+    '652923': '库车县',
+    '652924': '沙雅县',
+    '652925': '新和县',
+    '652926': '拜城县',
+    '652927': '乌什县',
+    '652928': '阿瓦提县',
+    '652929': '柯坪县',
+    '653001': '阿图什市',
+    '653022': '阿克陶县',
+    '653023': '阿合奇县',
+    '653024': '乌恰县',
+    '653101': '喀什市',
+    '653121': '疏附县',
+    '653122': '疏勒县',
+    '653123': '英吉沙县',
+    '653124': '泽普县',
+    '653125': '莎车县',
+    '653126': '叶城县',
+    '653127': '麦盖提县',
+    '653128': '岳普湖县',
+    '653129': '伽师县',
+    '653130': '巴楚县',
+    '653131': '塔什库尔干塔吉克自治县',
+    '653201': '和田市',
+    '653221': '和田县',
+    '653222': '墨玉县',
+    '653223': '皮山县',
+    '653224': '洛浦县',
+    '653225': '策勒县',
+    '653226': '于田县',
+    '653227': '民丰县',
+    '654002': '伊宁市',
+    '654003': '奎屯市',
+    '654004': '霍尔果斯市',
+    '654021': '伊宁县',
+    '654022': '察布查尔锡伯自治县',
+    '654023': '霍城县',
+    '654024': '巩留县',
+    '654025': '新源县',
+    '654026': '昭苏县',
+    '654027': '特克斯县',
+    '654028': '尼勒克县',
+    '654201': '塔城市',
+    '654202': '乌苏市',
+    '654221': '额敏县',
+    '654223': '沙湾县',
+    '654224': '托里县',
+    '654225': '裕民县',
+    '654226': '和布克赛尔蒙古自治县',
+    '654301': '阿勒泰市',
+    '654321': '布尔津县',
+    '654322': '富蕴县',
+    '654323': '福海县',
+    '654324': '哈巴河县',
+    '654325': '青河县',
+    '654326': '吉木乃县',
+    '654390': '北屯市',
+    '659001': '石河子市',
+    '659002': '阿拉尔市',
+    '659003': '图木舒克市',
+    '659004': '五家渠市',
+    '710101': '中正区',
+    '710102': '大同区',
+    '710103': '中山区',
+    '710104': '松山区',
+    '710105': '大安区',
+    '710106': '万华区',
+    '710107': '信义区',
+    '710108': '士林区',
+    '710109': '北投区',
+    '710110': '内湖区',
+    '710111': '南港区',
+    '710112': '文山区',
+    '710199': '其它区',
+    '710201': '新兴区',
+    '710202': '前金区',
+    '710203': '芩雅区',
+    '710204': '盐埕区',
+    '710205': '鼓山区',
+    '710206': '旗津区',
+    '710207': '前镇区',
+    '710208': '三民区',
+    '710209': '左营区',
+    '710210': '楠梓区',
+    '710211': '小港区',
+    '710241': '苓雅区',
+    '710242': '仁武区',
+    '710243': '大社区',
+    '710244': '冈山区',
+    '710245': '路竹区',
+    '710246': '阿莲区',
+    '710247': '田寮区',
+    '710248': '燕巢区',
+    '710249': '桥头区',
+    '710250': '梓官区',
+    '710251': '弥陀区',
+    '710252': '永安区',
+    '710253': '湖内区',
+    '710254': '凤山区',
+    '710255': '大寮区',
+    '710256': '林园区',
+    '710257': '鸟松区',
+    '710258': '大树区',
+    '710259': '旗山区',
+    '710260': '美浓区',
+    '710261': '六龟区',
+    '710262': '内门区',
+    '710263': '杉林区',
+    '710264': '甲仙区',
+    '710265': '桃源区',
+    '710266': '那玛夏区',
+    '710267': '茂林区',
+    '710268': '茄萣区',
+    '710299': '其它区',
+    '710301': '中西区',
+    '710302': '东区',
+    '710303': '南区',
+    '710304': '北区',
+    '710305': '安平区',
+    '710306': '安南区',
+    '710339': '永康区',
+    '710340': '归仁区',
+    '710341': '新化区',
+    '710342': '左镇区',
+    '710343': '玉井区',
+    '710344': '楠西区',
+    '710345': '南化区',
+    '710346': '仁德区',
+    '710347': '关庙区',
+    '710348': '龙崎区',
+    '710349': '官田区',
+    '710350': '麻豆区',
+    '710351': '佳里区',
+    '710352': '西港区',
+    '710353': '七股区',
+    '710354': '将军区',
+    '710355': '学甲区',
+    '710356': '北门区',
+    '710357': '新营区',
+    '710358': '后壁区',
+    '710359': '白河区',
+    '710360': '东山区',
+    '710361': '六甲区',
+    '710362': '下营区',
+    '710363': '柳营区',
+    '710364': '盐水区',
+    '710365': '善化区',
+    '710366': '大内区',
+    '710367': '山上区',
+    '710368': '新市区',
+    '710369': '安定区',
+    '710399': '其它区',
+    '710401': '中区',
+    '710402': '东区',
+    '710403': '南区',
+    '710404': '西区',
+    '710405': '北区',
+    '710406': '北屯区',
+    '710407': '西屯区',
+    '710408': '南屯区',
+    '710431': '太平区',
+    '710432': '大里区',
+    '710433': '雾峰区',
+    '710434': '乌日区',
+    '710435': '丰原区',
+    '710436': '后里区',
+    '710437': '石冈区',
+    '710438': '东势区',
+    '710439': '和平区',
+    '710440': '新社区',
+    '710441': '潭子区',
+    '710442': '大雅区',
+    '710443': '神冈区',
+    '710444': '大肚区',
+    '710445': '沙鹿区',
+    '710446': '龙井区',
+    '710447': '梧栖区',
+    '710448': '清水区',
+    '710449': '大甲区',
+    '710450': '外埔区',
+    '710451': '大安区',
+    '710499': '其它区',
+    '710507': '金沙镇',
+    '710508': '金湖镇',
+    '710509': '金宁乡',
+    '710510': '金城镇',
+    '710511': '烈屿乡',
+    '710512': '乌坵乡',
+    '710614': '南投市',
+    '710615': '中寮乡',
+    '710616': '草屯镇',
+    '710617': '国姓乡',
+    '710618': '埔里镇',
+    '710619': '仁爱乡',
+    '710620': '名间乡',
+    '710621': '集集镇',
+    '710622': '水里乡',
+    '710623': '鱼池乡',
+    '710624': '信义乡',
+    '710625': '竹山镇',
+    '710626': '鹿谷乡',
+    '710701': '仁爱区',
+    '710702': '信义区',
+    '710703': '中正区',
+    '710704': '中山区',
+    '710705': '安乐区',
+    '710706': '暖暖区',
+    '710707': '七堵区',
+    '710799': '其它区',
+    '710801': '东区',
+    '710802': '北区',
+    '710803': '香山区',
+    '710899': '其它区',
+    '710901': '东区',
+    '710902': '西区',
+    '710999': '其它区',
+    '711130': '万里区',
+    '711132': '板桥区',
+    '711133': '汐止区',
+    '711134': '深坑区',
+    '711136': '瑞芳区',
+    '711137': '平溪区',
+    '711138': '双溪区',
+    '711140': '新店区',
+    '711141': '坪林区',
+    '711142': '乌来区',
+    '711143': '永和区',
+    '711144': '中和区',
+    '711145': '土城区',
+    '711146': '三峡区',
+    '711147': '树林区',
+    '711149': '三重区',
+    '711150': '新庄区',
+    '711151': '泰山区',
+    '711152': '林口区',
+    '711154': '五股区',
+    '711155': '八里区',
+    '711156': '淡水区',
+    '711157': '三芝区',
+    '810101': '中西区',
+    '810102': '湾仔',
+    '810103': '东区',
+    '810104': '南区',
+    '810201': '九龙城区',
+    '810202': '油尖旺区',
+    '810203': '深水埗区',
+    '810204': '黄大仙区',
+    '810205': '观塘区',
+    '810301': '北区',
+    '810302': '大埔区',
+    '810303': '沙田区',
+    '810304': '西贡区',
+    '810305': '元朗区',
+    '810306': '屯门区',
+    '810307': '荃湾区',
+    '810308': '葵青区',
+    '810309': '离岛区',
+    '820101': '澳门半岛',
+    '820201': '离岛'
+  }
+}
\ No newline at end of file
diff --git a/docs/demos/mock/area.json b/docs/demos/mock/area.json
deleted file mode 100644
index 7a9843146..000000000
--- a/docs/demos/mock/area.json
+++ /dev/null
@@ -1,3607 +0,0 @@
-{
-  "province_list": {
-      "110000": "北京市",
-      "120000": "天津市",
-      "130000": "河北省",
-      "140000": "山西省",
-      "150000": "内蒙古自治区",
-      "210000": "辽宁省",
-      "220000": "吉林省",
-      "230000": "黑龙江省",
-      "310000": "上海市",
-      "320000": "江苏省",
-      "330000": "浙江省",
-      "340000": "安徽省",
-      "350000": "福建省",
-      "360000": "江西省",
-      "370000": "山东省",
-      "410000": "河南省",
-      "420000": "湖北省",
-      "430000": "湖南省",
-      "440000": "广东省",
-      "450000": "广西壮族自治区",
-      "460000": "海南省",
-      "500000": "重庆市",
-      "510000": "四川省",
-      "520000": "贵州省",
-      "530000": "云南省",
-      "540000": "西藏自治区",
-      "610000": "陕西省",
-      "620000": "甘肃省",
-      "630000": "青海省",
-      "640000": "宁夏回族自治区",
-      "650000": "新疆维吾尔自治区",
-      "710000": "台湾省",
-      "810000": "香港特别行政区",
-      "820000": "澳门特别行政区"
-  },
-  "city_list": {
-      "110100": "北京市",
-      "110200": "县",
-      "120100": "天津市",
-      "120200": "县",
-      "130100": "石家庄市",
-      "130200": "唐山市",
-      "130300": "秦皇岛市",
-      "130400": "邯郸市",
-      "130500": "邢台市",
-      "130600": "保定市",
-      "130700": "张家口市",
-      "130800": "承德市",
-      "130900": "沧州市",
-      "131000": "廊坊市",
-      "131100": "衡水市",
-      "139000": "省直辖县",
-      "140100": "太原市",
-      "140200": "大同市",
-      "140300": "阳泉市",
-      "140400": "长治市",
-      "140500": "晋城市",
-      "140600": "朔州市",
-      "140700": "晋中市",
-      "140800": "运城市",
-      "140900": "忻州市",
-      "141000": "临汾市",
-      "141100": "吕梁市",
-      "150100": "呼和浩特市",
-      "150200": "包头市",
-      "150300": "乌海市",
-      "150400": "赤峰市",
-      "150500": "通辽市",
-      "150600": "鄂尔多斯市",
-      "150700": "呼伦贝尔市",
-      "150800": "巴彦淖尔市",
-      "150900": "乌兰察布市",
-      "152200": "兴安盟",
-      "152500": "锡林郭勒盟",
-      "152900": "阿拉善盟",
-      "210100": "沈阳市",
-      "210200": "大连市",
-      "210300": "鞍山市",
-      "210400": "抚顺市",
-      "210500": "本溪市",
-      "210600": "丹东市",
-      "210700": "锦州市",
-      "210800": "营口市",
-      "210900": "阜新市",
-      "211000": "辽阳市",
-      "211100": "盘锦市",
-      "211200": "铁岭市",
-      "211300": "朝阳市",
-      "211400": "葫芦岛市",
-      "220100": "长春市",
-      "220200": "吉林市",
-      "220300": "四平市",
-      "220400": "辽源市",
-      "220500": "通化市",
-      "220600": "白山市",
-      "220700": "松原市",
-      "220800": "白城市",
-      "222400": "延边朝鲜族自治州",
-      "230100": "哈尔滨市",
-      "230200": "齐齐哈尔市",
-      "230300": "鸡西市",
-      "230400": "鹤岗市",
-      "230500": "双鸭山市",
-      "230600": "大庆市",
-      "230700": "伊春市",
-      "230800": "佳木斯市",
-      "230900": "七台河市",
-      "231000": "牡丹江市",
-      "231100": "黑河市",
-      "231200": "绥化市",
-      "232700": "大兴安岭地区",
-      "310100": "上海市",
-      "310200": "县",
-      "320100": "南京市",
-      "320200": "无锡市",
-      "320300": "徐州市",
-      "320400": "常州市",
-      "320500": "苏州市",
-      "320600": "南通市",
-      "320700": "连云港市",
-      "320800": "淮安市",
-      "320900": "盐城市",
-      "321000": "扬州市",
-      "321100": "镇江市",
-      "321200": "泰州市",
-      "321300": "宿迁市",
-      "330100": "杭州市",
-      "330200": "宁波市",
-      "330300": "温州市",
-      "330400": "嘉兴市",
-      "330500": "湖州市",
-      "330600": "绍兴市",
-      "330700": "金华市",
-      "330800": "衢州市",
-      "330900": "舟山市",
-      "331000": "台州市",
-      "331100": "丽水市",
-      "340100": "合肥市",
-      "340200": "芜湖市",
-      "340300": "蚌埠市",
-      "340400": "淮南市",
-      "340500": "马鞍山市",
-      "340600": "淮北市",
-      "340700": "铜陵市",
-      "340800": "安庆市",
-      "341000": "黄山市",
-      "341100": "滁州市",
-      "341200": "阜阳市",
-      "341300": "宿州市",
-      "341500": "六安市",
-      "341600": "亳州市",
-      "341700": "池州市",
-      "341800": "宣城市",
-      "350100": "福州市",
-      "350200": "厦门市",
-      "350300": "莆田市",
-      "350400": "三明市",
-      "350500": "泉州市",
-      "350600": "漳州市",
-      "350700": "南平市",
-      "350800": "龙岩市",
-      "350900": "宁德市",
-      "360100": "南昌市",
-      "360200": "景德镇市",
-      "360300": "萍乡市",
-      "360400": "九江市",
-      "360500": "新余市",
-      "360600": "鹰潭市",
-      "360700": "赣州市",
-      "360800": "吉安市",
-      "360900": "宜春市",
-      "361000": "抚州市",
-      "361100": "上饶市",
-      "370100": "济南市",
-      "370200": "青岛市",
-      "370300": "淄博市",
-      "370400": "枣庄市",
-      "370500": "东营市",
-      "370600": "烟台市",
-      "370700": "潍坊市",
-      "370800": "济宁市",
-      "370900": "泰安市",
-      "371000": "威海市",
-      "371100": "日照市",
-      "371200": "莱芜市",
-      "371300": "临沂市",
-      "371400": "德州市",
-      "371500": "聊城市",
-      "371600": "滨州市",
-      "371700": "菏泽市",
-      "410100": "郑州市",
-      "410200": "开封市",
-      "410300": "洛阳市",
-      "410400": "平顶山市",
-      "410500": "安阳市",
-      "410600": "鹤壁市",
-      "410700": "新乡市",
-      "410800": "焦作市",
-      "410900": "濮阳市",
-      "411000": "许昌市",
-      "411100": "漯河市",
-      "411200": "三门峡市",
-      "411300": "南阳市",
-      "411400": "商丘市",
-      "411500": "信阳市",
-      "411600": "周口市",
-      "411700": "驻马店市",
-      "419000": "省直辖县",
-      "420100": "武汉市",
-      "420200": "黄石市",
-      "420300": "十堰市",
-      "420500": "宜昌市",
-      "420600": "襄阳市",
-      "420700": "鄂州市",
-      "420800": "荆门市",
-      "420900": "孝感市",
-      "421000": "荆州市",
-      "421100": "黄冈市",
-      "421200": "咸宁市",
-      "421300": "随州市",
-      "422800": "恩施土家族苗族自治州",
-      "429000": "省直辖县",
-      "430100": "长沙市",
-      "430200": "株洲市",
-      "430300": "湘潭市",
-      "430400": "衡阳市",
-      "430500": "邵阳市",
-      "430600": "岳阳市",
-      "430700": "常德市",
-      "430800": "张家界市",
-      "430900": "益阳市",
-      "431000": "郴州市",
-      "431100": "永州市",
-      "431200": "怀化市",
-      "431300": "娄底市",
-      "433100": "湘西土家族苗族自治州",
-      "440100": "广州市",
-      "440200": "韶关市",
-      "440300": "深圳市",
-      "440400": "珠海市",
-      "440500": "汕头市",
-      "440600": "佛山市",
-      "440700": "江门市",
-      "440800": "湛江市",
-      "440900": "茂名市",
-      "441200": "肇庆市",
-      "441300": "惠州市",
-      "441400": "梅州市",
-      "441500": "汕尾市",
-      "441600": "河源市",
-      "441700": "阳江市",
-      "441800": "清远市",
-      "441900": "东莞市",
-      "442000": "中山市",
-      "445100": "潮州市",
-      "445200": "揭阳市",
-      "445300": "云浮市",
-      "450100": "南宁市",
-      "450200": "柳州市",
-      "450300": "桂林市",
-      "450400": "梧州市",
-      "450500": "北海市",
-      "450600": "防城港市",
-      "450700": "钦州市",
-      "450800": "贵港市",
-      "450900": "玉林市",
-      "451000": "百色市",
-      "451100": "贺州市",
-      "451200": "河池市",
-      "451300": "来宾市",
-      "451400": "崇左市",
-      "460100": "海口市",
-      "460200": "三亚市",
-      "460300": "三沙市",
-      "469000": "省直辖县",
-      "500100": "重庆市",
-      "500200": "县",
-      "510100": "成都市",
-      "510300": "自贡市",
-      "510400": "攀枝花市",
-      "510500": "泸州市",
-      "510600": "德阳市",
-      "510700": "绵阳市",
-      "510800": "广元市",
-      "510900": "遂宁市",
-      "511000": "内江市",
-      "511100": "乐山市",
-      "511300": "南充市",
-      "511400": "眉山市",
-      "511500": "宜宾市",
-      "511600": "广安市",
-      "511700": "达州市",
-      "511800": "雅安市",
-      "511900": "巴中市",
-      "512000": "资阳市",
-      "513200": "阿坝藏族羌族自治州",
-      "513300": "甘孜藏族自治州",
-      "513400": "凉山彝族自治州",
-      "520100": "贵阳市",
-      "520200": "六盘水市",
-      "520300": "遵义市",
-      "520400": "安顺市",
-      "520500": "毕节市",
-      "520600": "铜仁市",
-      "522300": "黔西南布依族苗族自治州",
-      "522600": "黔东南苗族侗族自治州",
-      "522700": "黔南布依族苗族自治州",
-      "530100": "昆明市",
-      "530300": "曲靖市",
-      "530400": "玉溪市",
-      "530500": "保山市",
-      "530600": "昭通市",
-      "530700": "丽江市",
-      "530800": "普洱市",
-      "530900": "临沧市",
-      "532300": "楚雄彝族自治州",
-      "532500": "红河哈尼族彝族自治州",
-      "532600": "文山壮族苗族自治州",
-      "532800": "西双版纳傣族自治州",
-      "532900": "大理白族自治州",
-      "533100": "德宏傣族景颇族自治州",
-      "533300": "怒江傈僳族自治州",
-      "533400": "迪庆藏族自治州",
-      "540100": "拉萨市",
-      "540200": "日喀则市",
-      "540300": "昌都市",
-      "540400": "林芝市",
-      "542200": "山南地区",
-      "542400": "那曲地区",
-      "542500": "阿里地区",
-      "610100": "西安市",
-      "610200": "铜川市",
-      "610300": "宝鸡市",
-      "610400": "咸阳市",
-      "610500": "渭南市",
-      "610600": "延安市",
-      "610700": "汉中市",
-      "610800": "榆林市",
-      "610900": "安康市",
-      "611000": "商洛市",
-      "620100": "兰州市",
-      "620200": "嘉峪关市",
-      "620300": "金昌市",
-      "620400": "白银市",
-      "620500": "天水市",
-      "620600": "武威市",
-      "620700": "张掖市",
-      "620800": "平凉市",
-      "620900": "酒泉市",
-      "621000": "庆阳市",
-      "621100": "定西市",
-      "621200": "陇南市",
-      "622900": "临夏回族自治州",
-      "623000": "甘南藏族自治州",
-      "630100": "西宁市",
-      "630200": "海东市",
-      "632200": "海北藏族自治州",
-      "632300": "黄南藏族自治州",
-      "632500": "海南藏族自治州",
-      "632600": "果洛藏族自治州",
-      "632700": "玉树藏族自治州",
-      "632800": "海西蒙古族藏族自治州",
-      "640100": "银川市",
-      "640200": "石嘴山市",
-      "640300": "吴忠市",
-      "640400": "固原市",
-      "640500": "中卫市",
-      "650100": "乌鲁木齐市",
-      "650200": "克拉玛依市",
-      "650400": "吐鲁番市",
-      "652200": "哈密地区",
-      "652300": "昌吉回族自治州",
-      "652700": "博尔塔拉蒙古自治州",
-      "652800": "巴音郭楞蒙古自治州",
-      "652900": "阿克苏地区",
-      "653000": "克孜勒苏柯尔克孜自治州",
-      "653100": "喀什地区",
-      "653200": "和田地区",
-      "654000": "伊犁哈萨克自治州",
-      "654200": "塔城地区",
-      "654300": "阿勒泰地区",
-      "659000": "自治区直辖县级行政区划",
-      "710100": "台北市",
-      "710200": "高雄市",
-      "710300": "台南市",
-      "710400": "台中市",
-      "710500": "金门县",
-      "710600": "南投县",
-      "710700": "基隆市",
-      "710800": "新竹市",
-      "710900": "嘉义市",
-      "711100": "新北市",
-      "711200": "宜兰县",
-      "711300": "新竹县",
-      "711400": "桃园县",
-      "711500": "苗栗县",
-      "711700": "彰化县",
-      "711900": "嘉义县",
-      "712100": "云林县",
-      "712400": "屏东县",
-      "712500": "台东县",
-      "712600": "花莲县",
-      "712700": "澎湖县",
-      "712800": "连江县",
-      "810100": "香港岛",
-      "810200": "九龙",
-      "810300": "新界",
-      "820100": "澳门半岛",
-      "820200": "离岛"
-  },
-  "county_list": {
-      "110101": "东城区",
-      "110102": "西城区",
-      "110105": "朝阳区",
-      "110106": "丰台区",
-      "110107": "石景山区",
-      "110108": "海淀区",
-      "110109": "门头沟区",
-      "110111": "房山区",
-      "110112": "通州区",
-      "110113": "顺义区",
-      "110114": "昌平区",
-      "110115": "大兴区",
-      "110116": "怀柔区",
-      "110117": "平谷区",
-      "110228": "密云县",
-      "110229": "延庆县",
-      "120101": "和平区",
-      "120102": "河东区",
-      "120103": "河西区",
-      "120104": "南开区",
-      "120105": "河北区",
-      "120106": "红桥区",
-      "120110": "东丽区",
-      "120111": "西青区",
-      "120112": "津南区",
-      "120113": "北辰区",
-      "120114": "武清区",
-      "120115": "宝坻区",
-      "120116": "滨海新区",
-      "120117": "宁河区",
-      "120118": "静海区",
-      "120225": "蓟县",
-      "130102": "长安区",
-      "130104": "桥西区",
-      "130105": "新华区",
-      "130107": "井陉矿区",
-      "130108": "裕华区",
-      "130109": "藁城区",
-      "130110": "鹿泉区",
-      "130111": "栾城区",
-      "130121": "井陉县",
-      "130123": "正定县",
-      "130125": "行唐县",
-      "130126": "灵寿县",
-      "130127": "高邑县",
-      "130128": "深泽县",
-      "130129": "赞皇县",
-      "130130": "无极县",
-      "130131": "平山县",
-      "130132": "元氏县",
-      "130133": "赵县",
-      "130183": "晋州市",
-      "130184": "新乐市",
-      "130202": "路南区",
-      "130203": "路北区",
-      "130204": "古冶区",
-      "130205": "开平区",
-      "130207": "丰南区",
-      "130208": "丰润区",
-      "130209": "曹妃甸区",
-      "130223": "滦县",
-      "130224": "滦南县",
-      "130225": "乐亭县",
-      "130227": "迁西县",
-      "130229": "玉田县",
-      "130281": "遵化市",
-      "130283": "迁安市",
-      "130302": "海港区",
-      "130303": "山海关区",
-      "130304": "北戴河区",
-      "130306": "抚宁区",
-      "130321": "青龙满族自治县",
-      "130322": "昌黎县",
-      "130324": "卢龙县",
-      "130390": "经济技术开发区",
-      "130402": "邯山区",
-      "130403": "丛台区",
-      "130404": "复兴区",
-      "130406": "峰峰矿区",
-      "130421": "邯郸县",
-      "130423": "临漳县",
-      "130424": "成安县",
-      "130425": "大名县",
-      "130426": "涉县",
-      "130427": "磁县",
-      "130428": "肥乡县",
-      "130429": "永年县",
-      "130430": "邱县",
-      "130431": "鸡泽县",
-      "130432": "广平县",
-      "130433": "馆陶县",
-      "130434": "魏县",
-      "130435": "曲周县",
-      "130481": "武安市",
-      "130502": "桥东区",
-      "130503": "桥西区",
-      "130521": "邢台县",
-      "130522": "临城县",
-      "130523": "内丘县",
-      "130524": "柏乡县",
-      "130525": "隆尧县",
-      "130526": "任县",
-      "130527": "南和县",
-      "130528": "宁晋县",
-      "130529": "巨鹿县",
-      "130530": "新河县",
-      "130531": "广宗县",
-      "130532": "平乡县",
-      "130533": "威县",
-      "130534": "清河县",
-      "130535": "临西县",
-      "130581": "南宫市",
-      "130582": "沙河市",
-      "130602": "竞秀区",
-      "130606": "莲池区",
-      "130607": "满城区",
-      "130608": "清苑区",
-      "130609": "徐水区",
-      "130623": "涞水县",
-      "130624": "阜平县",
-      "130626": "定兴县",
-      "130627": "唐县",
-      "130628": "高阳县",
-      "130629": "容城县",
-      "130630": "涞源县",
-      "130631": "望都县",
-      "130632": "安新县",
-      "130633": "易县",
-      "130634": "曲阳县",
-      "130635": "蠡县",
-      "130636": "顺平县",
-      "130637": "博野县",
-      "130638": "雄县",
-      "130681": "涿州市",
-      "130683": "安国市",
-      "130684": "高碑店市",
-      "130702": "桥东区",
-      "130703": "桥西区",
-      "130705": "宣化区",
-      "130706": "下花园区",
-      "130721": "宣化县",
-      "130722": "张北县",
-      "130723": "康保县",
-      "130724": "沽源县",
-      "130725": "尚义县",
-      "130726": "蔚县",
-      "130727": "阳原县",
-      "130728": "怀安县",
-      "130729": "万全县",
-      "130730": "怀来县",
-      "130731": "涿鹿县",
-      "130732": "赤城县",
-      "130733": "崇礼县",
-      "130802": "双桥区",
-      "130803": "双滦区",
-      "130804": "鹰手营子矿区",
-      "130821": "承德县",
-      "130822": "兴隆县",
-      "130823": "平泉县",
-      "130824": "滦平县",
-      "130825": "隆化县",
-      "130826": "丰宁满族自治县",
-      "130827": "宽城满族自治县",
-      "130828": "围场满族蒙古族自治县",
-      "130902": "新华区",
-      "130903": "运河区",
-      "130921": "沧县",
-      "130922": "青县",
-      "130923": "东光县",
-      "130924": "海兴县",
-      "130925": "盐山县",
-      "130926": "肃宁县",
-      "130927": "南皮县",
-      "130928": "吴桥县",
-      "130929": "献县",
-      "130930": "孟村回族自治县",
-      "130981": "泊头市",
-      "130982": "任丘市",
-      "130983": "黄骅市",
-      "130984": "河间市",
-      "131002": "安次区",
-      "131003": "广阳区",
-      "131022": "固安县",
-      "131023": "永清县",
-      "131024": "香河县",
-      "131025": "大城县",
-      "131026": "文安县",
-      "131028": "大厂回族自治县",
-      "131081": "霸州市",
-      "131082": "三河市",
-      "131090": "开发区",
-      "131091": "燕郊经济技术开发区",
-      "131102": "桃城区",
-      "131121": "枣强县",
-      "131122": "武邑县",
-      "131123": "武强县",
-      "131124": "饶阳县",
-      "131125": "安平县",
-      "131126": "故城县",
-      "131127": "景县",
-      "131128": "阜城县",
-      "131181": "冀州市",
-      "131182": "深州市",
-      "139001": "定州市",
-      "139002": "辛集市",
-      "140105": "小店区",
-      "140106": "迎泽区",
-      "140107": "杏花岭区",
-      "140108": "尖草坪区",
-      "140109": "万柏林区",
-      "140110": "晋源区",
-      "140121": "清徐县",
-      "140122": "阳曲县",
-      "140123": "娄烦县",
-      "140181": "古交市",
-      "140202": "城区",
-      "140203": "矿区",
-      "140211": "南郊区",
-      "140212": "新荣区",
-      "140221": "阳高县",
-      "140222": "天镇县",
-      "140223": "广灵县",
-      "140224": "灵丘县",
-      "140225": "浑源县",
-      "140226": "左云县",
-      "140227": "大同县",
-      "140302": "城区",
-      "140303": "矿区",
-      "140311": "郊区",
-      "140321": "平定县",
-      "140322": "盂县",
-      "140402": "城区",
-      "140411": "郊区",
-      "140421": "长治县",
-      "140423": "襄垣县",
-      "140424": "屯留县",
-      "140425": "平顺县",
-      "140426": "黎城县",
-      "140427": "壶关县",
-      "140428": "长子县",
-      "140429": "武乡县",
-      "140430": "沁县",
-      "140431": "沁源县",
-      "140481": "潞城市",
-      "140502": "城区",
-      "140521": "沁水县",
-      "140522": "阳城县",
-      "140524": "陵川县",
-      "140525": "泽州县",
-      "140581": "高平市",
-      "140602": "朔城区",
-      "140603": "平鲁区",
-      "140621": "山阴县",
-      "140622": "应县",
-      "140623": "右玉县",
-      "140624": "怀仁县",
-      "140702": "榆次区",
-      "140721": "榆社县",
-      "140722": "左权县",
-      "140723": "和顺县",
-      "140724": "昔阳县",
-      "140725": "寿阳县",
-      "140726": "太谷县",
-      "140727": "祁县",
-      "140728": "平遥县",
-      "140729": "灵石县",
-      "140781": "介休市",
-      "140802": "盐湖区",
-      "140821": "临猗县",
-      "140822": "万荣县",
-      "140823": "闻喜县",
-      "140824": "稷山县",
-      "140825": "新绛县",
-      "140826": "绛县",
-      "140827": "垣曲县",
-      "140828": "夏县",
-      "140829": "平陆县",
-      "140830": "芮城县",
-      "140881": "永济市",
-      "140882": "河津市",
-      "140902": "忻府区",
-      "140921": "定襄县",
-      "140922": "五台县",
-      "140923": "代县",
-      "140924": "繁峙县",
-      "140925": "宁武县",
-      "140926": "静乐县",
-      "140927": "神池县",
-      "140928": "五寨县",
-      "140929": "岢岚县",
-      "140930": "河曲县",
-      "140931": "保德县",
-      "140932": "偏关县",
-      "140981": "原平市",
-      "141002": "尧都区",
-      "141021": "曲沃县",
-      "141022": "翼城县",
-      "141023": "襄汾县",
-      "141024": "洪洞县",
-      "141025": "古县",
-      "141026": "安泽县",
-      "141027": "浮山县",
-      "141028": "吉县",
-      "141029": "乡宁县",
-      "141030": "大宁县",
-      "141031": "隰县",
-      "141032": "永和县",
-      "141033": "蒲县",
-      "141034": "汾西县",
-      "141081": "侯马市",
-      "141082": "霍州市",
-      "141102": "离石区",
-      "141121": "文水县",
-      "141122": "交城县",
-      "141123": "兴县",
-      "141124": "临县",
-      "141125": "柳林县",
-      "141126": "石楼县",
-      "141127": "岚县",
-      "141128": "方山县",
-      "141129": "中阳县",
-      "141130": "交口县",
-      "141181": "孝义市",
-      "141182": "汾阳市",
-      "150102": "新城区",
-      "150103": "回民区",
-      "150104": "玉泉区",
-      "150105": "赛罕区",
-      "150121": "土默特左旗",
-      "150122": "托克托县",
-      "150123": "和林格尔县",
-      "150124": "清水河县",
-      "150125": "武川县",
-      "150202": "东河区",
-      "150203": "昆都仑区",
-      "150204": "青山区",
-      "150205": "石拐区",
-      "150206": "白云鄂博矿区",
-      "150207": "九原区",
-      "150221": "土默特右旗",
-      "150222": "固阳县",
-      "150223": "达尔罕茂明安联合旗",
-      "150302": "海勃湾区",
-      "150303": "海南区",
-      "150304": "乌达区",
-      "150402": "红山区",
-      "150403": "元宝山区",
-      "150404": "松山区",
-      "150421": "阿鲁科尔沁旗",
-      "150422": "巴林左旗",
-      "150423": "巴林右旗",
-      "150424": "林西县",
-      "150425": "克什克腾旗",
-      "150426": "翁牛特旗",
-      "150428": "喀喇沁旗",
-      "150429": "宁城县",
-      "150430": "敖汉旗",
-      "150502": "科尔沁区",
-      "150521": "科尔沁左翼中旗",
-      "150522": "科尔沁左翼后旗",
-      "150523": "开鲁县",
-      "150524": "库伦旗",
-      "150525": "奈曼旗",
-      "150526": "扎鲁特旗",
-      "150581": "霍林郭勒市",
-      "150602": "东胜区",
-      "150621": "达拉特旗",
-      "150622": "准格尔旗",
-      "150623": "鄂托克前旗",
-      "150624": "鄂托克旗",
-      "150625": "杭锦旗",
-      "150626": "乌审旗",
-      "150627": "伊金霍洛旗",
-      "150702": "海拉尔区",
-      "150703": "扎赉诺尔区",
-      "150721": "阿荣旗",
-      "150722": "莫力达瓦达斡尔族自治旗",
-      "150723": "鄂伦春自治旗",
-      "150724": "鄂温克族自治旗",
-      "150725": "陈巴尔虎旗",
-      "150726": "新巴尔虎左旗",
-      "150727": "新巴尔虎右旗",
-      "150781": "满洲里市",
-      "150782": "牙克石市",
-      "150783": "扎兰屯市",
-      "150784": "额尔古纳市",
-      "150785": "根河市",
-      "150802": "临河区",
-      "150821": "五原县",
-      "150822": "磴口县",
-      "150823": "乌拉特前旗",
-      "150824": "乌拉特中旗",
-      "150825": "乌拉特后旗",
-      "150826": "杭锦后旗",
-      "150902": "集宁区",
-      "150921": "卓资县",
-      "150922": "化德县",
-      "150923": "商都县",
-      "150924": "兴和县",
-      "150925": "凉城县",
-      "150926": "察哈尔右翼前旗",
-      "150927": "察哈尔右翼中旗",
-      "150928": "察哈尔右翼后旗",
-      "150929": "四子王旗",
-      "150981": "丰镇市",
-      "152201": "乌兰浩特市",
-      "152202": "阿尔山市",
-      "152221": "科尔沁右翼前旗",
-      "152222": "科尔沁右翼中旗",
-      "152223": "扎赉特旗",
-      "152224": "突泉县",
-      "152501": "二连浩特市",
-      "152502": "锡林浩特市",
-      "152522": "阿巴嘎旗",
-      "152523": "苏尼特左旗",
-      "152524": "苏尼特右旗",
-      "152525": "东乌珠穆沁旗",
-      "152526": "西乌珠穆沁旗",
-      "152527": "太仆寺旗",
-      "152528": "镶黄旗",
-      "152529": "正镶白旗",
-      "152530": "正蓝旗",
-      "152531": "多伦县",
-      "152921": "阿拉善左旗",
-      "152922": "阿拉善右旗",
-      "152923": "额济纳旗",
-      "210102": "和平区",
-      "210103": "沈河区",
-      "210104": "大东区",
-      "210105": "皇姑区",
-      "210106": "铁西区",
-      "210111": "苏家屯区",
-      "210112": "浑南区",
-      "210113": "沈北新区",
-      "210114": "于洪区",
-      "210122": "辽中县",
-      "210123": "康平县",
-      "210124": "法库县",
-      "210181": "新民市",
-      "210190": "经济技术开发区",
-      "210202": "中山区",
-      "210203": "西岗区",
-      "210204": "沙河口区",
-      "210211": "甘井子区",
-      "210212": "旅顺口区",
-      "210213": "金州区",
-      "210224": "长海县",
-      "210281": "瓦房店市",
-      "210282": "普兰店市",
-      "210283": "庄河市",
-      "210291": "大连经济技术开发区",
-      "210292": "大连高新区",
-      "210302": "铁东区",
-      "210303": "铁西区",
-      "210304": "立山区",
-      "210311": "千山区",
-      "210321": "台安县",
-      "210323": "岫岩满族自治县",
-      "210381": "海城市",
-      "210390": "高新区",
-      "210402": "新抚区",
-      "210403": "东洲区",
-      "210404": "望花区",
-      "210411": "顺城区",
-      "210421": "抚顺县",
-      "210422": "新宾满族自治县",
-      "210423": "清原满族自治县",
-      "210502": "平山区",
-      "210503": "溪湖区",
-      "210504": "明山区",
-      "210505": "南芬区",
-      "210521": "本溪满族自治县",
-      "210522": "桓仁满族自治县",
-      "210602": "元宝区",
-      "210603": "振兴区",
-      "210604": "振安区",
-      "210624": "宽甸满族自治县",
-      "210681": "东港市",
-      "210682": "凤城市",
-      "210702": "古塔区",
-      "210703": "凌河区",
-      "210711": "太和区",
-      "210726": "黑山县",
-      "210727": "义县",
-      "210781": "凌海市",
-      "210782": "北镇市",
-      "210793": "经济技术开发区",
-      "210802": "站前区",
-      "210803": "西市区",
-      "210804": "鲅鱼圈区",
-      "210811": "老边区",
-      "210881": "盖州市",
-      "210882": "大石桥市",
-      "210902": "海州区",
-      "210903": "新邱区",
-      "210904": "太平区",
-      "210905": "清河门区",
-      "210911": "细河区",
-      "210921": "阜新蒙古族自治县",
-      "210922": "彰武县",
-      "211002": "白塔区",
-      "211003": "文圣区",
-      "211004": "宏伟区",
-      "211005": "弓长岭区",
-      "211011": "太子河区",
-      "211021": "辽阳县",
-      "211081": "灯塔市",
-      "211102": "双台子区",
-      "211103": "兴隆台区",
-      "211121": "大洼县",
-      "211122": "盘山县",
-      "211202": "银州区",
-      "211204": "清河区",
-      "211221": "铁岭县",
-      "211223": "西丰县",
-      "211224": "昌图县",
-      "211281": "调兵山市",
-      "211282": "开原市",
-      "211302": "双塔区",
-      "211303": "龙城区",
-      "211321": "朝阳县",
-      "211322": "建平县",
-      "211324": "喀喇沁左翼蒙古族自治县",
-      "211381": "北票市",
-      "211382": "凌源市",
-      "211402": "连山区",
-      "211403": "龙港区",
-      "211404": "南票区",
-      "211421": "绥中县",
-      "211422": "建昌县",
-      "211481": "兴城市",
-      "215090": "工业园区",
-      "220102": "南关区",
-      "220103": "宽城区",
-      "220104": "朝阳区",
-      "220105": "二道区",
-      "220106": "绿园区",
-      "220112": "双阳区",
-      "220113": "九台区",
-      "220122": "农安县",
-      "220182": "榆树市",
-      "220183": "德惠市",
-      "220190": "高新技术产业开发区",
-      "220191": "汽车产业开发区",
-      "220192": "经济技术开发区",
-      "220202": "昌邑区",
-      "220203": "龙潭区",
-      "220204": "船营区",
-      "220211": "丰满区",
-      "220221": "永吉县",
-      "220281": "蛟河市",
-      "220282": "桦甸市",
-      "220283": "舒兰市",
-      "220284": "磐石市",
-      "220302": "铁西区",
-      "220303": "铁东区",
-      "220322": "梨树县",
-      "220323": "伊通满族自治县",
-      "220381": "公主岭市",
-      "220382": "双辽市",
-      "220402": "龙山区",
-      "220403": "西安区",
-      "220421": "东丰县",
-      "220422": "东辽县",
-      "220502": "东昌区",
-      "220503": "二道江区",
-      "220521": "通化县",
-      "220523": "辉南县",
-      "220524": "柳河县",
-      "220581": "梅河口市",
-      "220582": "集安市",
-      "220602": "浑江区",
-      "220605": "江源区",
-      "220621": "抚松县",
-      "220622": "靖宇县",
-      "220623": "长白朝鲜族自治县",
-      "220681": "临江市",
-      "220702": "宁江区",
-      "220721": "前郭尔罗斯蒙古族自治县",
-      "220722": "长岭县",
-      "220723": "乾安县",
-      "220781": "扶余市",
-      "220802": "洮北区",
-      "220821": "镇赉县",
-      "220822": "通榆县",
-      "220881": "洮南市",
-      "220882": "大安市",
-      "221090": "工业园区",
-      "222401": "延吉市",
-      "222402": "图们市",
-      "222403": "敦化市",
-      "222404": "珲春市",
-      "222405": "龙井市",
-      "222406": "和龙市",
-      "222424": "汪清县",
-      "222426": "安图县",
-      "230102": "道里区",
-      "230103": "南岗区",
-      "230104": "道外区",
-      "230108": "平房区",
-      "230109": "松北区",
-      "230110": "香坊区",
-      "230111": "呼兰区",
-      "230112": "阿城区",
-      "230113": "双城区",
-      "230123": "依兰县",
-      "230124": "方正县",
-      "230125": "宾县",
-      "230126": "巴彦县",
-      "230127": "木兰县",
-      "230128": "通河县",
-      "230129": "延寿县",
-      "230183": "尚志市",
-      "230184": "五常市",
-      "230202": "龙沙区",
-      "230203": "建华区",
-      "230204": "铁锋区",
-      "230205": "昂昂溪区",
-      "230206": "富拉尔基区",
-      "230207": "碾子山区",
-      "230208": "梅里斯达斡尔族区",
-      "230221": "龙江县",
-      "230223": "依安县",
-      "230224": "泰来县",
-      "230225": "甘南县",
-      "230227": "富裕县",
-      "230229": "克山县",
-      "230230": "克东县",
-      "230231": "拜泉县",
-      "230281": "讷河市",
-      "230302": "鸡冠区",
-      "230303": "恒山区",
-      "230304": "滴道区",
-      "230305": "梨树区",
-      "230306": "城子河区",
-      "230307": "麻山区",
-      "230321": "鸡东县",
-      "230381": "虎林市",
-      "230382": "密山市",
-      "230402": "向阳区",
-      "230403": "工农区",
-      "230404": "南山区",
-      "230405": "兴安区",
-      "230406": "东山区",
-      "230407": "兴山区",
-      "230421": "萝北县",
-      "230422": "绥滨县",
-      "230502": "尖山区",
-      "230503": "岭东区",
-      "230505": "四方台区",
-      "230506": "宝山区",
-      "230521": "集贤县",
-      "230522": "友谊县",
-      "230523": "宝清县",
-      "230524": "饶河县",
-      "230602": "萨尔图区",
-      "230603": "龙凤区",
-      "230604": "让胡路区",
-      "230605": "红岗区",
-      "230606": "大同区",
-      "230621": "肇州县",
-      "230622": "肇源县",
-      "230623": "林甸县",
-      "230624": "杜尔伯特蒙古族自治县",
-      "230702": "伊春区",
-      "230703": "南岔区",
-      "230704": "友好区",
-      "230705": "西林区",
-      "230706": "翠峦区",
-      "230707": "新青区",
-      "230708": "美溪区",
-      "230709": "金山屯区",
-      "230710": "五营区",
-      "230711": "乌马河区",
-      "230712": "汤旺河区",
-      "230713": "带岭区",
-      "230714": "乌伊岭区",
-      "230715": "红星区",
-      "230716": "上甘岭区",
-      "230722": "嘉荫县",
-      "230781": "铁力市",
-      "230803": "向阳区",
-      "230804": "前进区",
-      "230805": "东风区",
-      "230811": "郊区",
-      "230822": "桦南县",
-      "230826": "桦川县",
-      "230828": "汤原县",
-      "230833": "抚远县",
-      "230881": "同江市",
-      "230882": "富锦市",
-      "230902": "新兴区",
-      "230903": "桃山区",
-      "230904": "茄子河区",
-      "230921": "勃利县",
-      "231002": "东安区",
-      "231003": "阳明区",
-      "231004": "爱民区",
-      "231005": "西安区",
-      "231024": "东宁县",
-      "231025": "林口县",
-      "231081": "绥芬河市",
-      "231083": "海林市",
-      "231084": "宁安市",
-      "231085": "穆棱市",
-      "231102": "爱辉区",
-      "231121": "嫩江县",
-      "231123": "逊克县",
-      "231124": "孙吴县",
-      "231181": "北安市",
-      "231182": "五大连池市",
-      "231202": "北林区",
-      "231221": "望奎县",
-      "231222": "兰西县",
-      "231223": "青冈县",
-      "231224": "庆安县",
-      "231225": "明水县",
-      "231226": "绥棱县",
-      "231281": "安达市",
-      "231282": "肇东市",
-      "231283": "海伦市",
-      "232721": "呼玛县",
-      "232722": "塔河县",
-      "232723": "漠河县",
-      "232790": "松岭区",
-      "232791": "呼中区",
-      "232792": "加格达奇区",
-      "232793": "新林区",
-      "264290": "威海临港经济技术开发区",
-      "310101": "黄浦区",
-      "310104": "徐汇区",
-      "310105": "长宁区",
-      "310106": "静安区",
-      "310107": "普陀区",
-      "310108": "闸北区",
-      "310109": "虹口区",
-      "310110": "杨浦区",
-      "310112": "闵行区",
-      "310113": "宝山区",
-      "310114": "嘉定区",
-      "310115": "浦东新区",
-      "310116": "金山区",
-      "310117": "松江区",
-      "310118": "青浦区",
-      "310120": "奉贤区",
-      "310230": "崇明县",
-      "320102": "玄武区",
-      "320104": "秦淮区",
-      "320105": "建邺区",
-      "320106": "鼓楼区",
-      "320111": "浦口区",
-      "320113": "栖霞区",
-      "320114": "雨花台区",
-      "320115": "江宁区",
-      "320116": "六合区",
-      "320117": "溧水区",
-      "320118": "高淳区",
-      "320202": "崇安区",
-      "320203": "南长区",
-      "320204": "北塘区",
-      "320205": "锡山区",
-      "320206": "惠山区",
-      "320211": "滨湖区",
-      "320281": "江阴市",
-      "320282": "宜兴市",
-      "320290": "新区",
-      "320302": "鼓楼区",
-      "320303": "云龙区",
-      "320305": "贾汪区",
-      "320311": "泉山区",
-      "320312": "铜山区",
-      "320321": "丰县",
-      "320322": "沛县",
-      "320324": "睢宁县",
-      "320381": "新沂市",
-      "320382": "邳州市",
-      "320390": "金山桥开发区",
-      "320391": "工业园区",
-      "320402": "天宁区",
-      "320404": "钟楼区",
-      "320411": "新北区",
-      "320412": "武进区",
-      "320413": "金坛区",
-      "320481": "溧阳市",
-      "320505": "虎丘区",
-      "320506": "吴中区",
-      "320507": "相城区",
-      "320508": "姑苏区",
-      "320509": "吴江区",
-      "320581": "常熟市",
-      "320582": "张家港市",
-      "320583": "昆山市",
-      "320585": "太仓市",
-      "320590": "工业园区",
-      "320591": "高新区",
-      "320602": "崇川区",
-      "320611": "港闸区",
-      "320612": "通州区",
-      "320621": "海安县",
-      "320623": "如东县",
-      "320681": "启东市",
-      "320682": "如皋市",
-      "320684": "海门市",
-      "320690": "南通经济技术开发区",
-      "320691": "高新区",
-      "320703": "连云区",
-      "320706": "海州区",
-      "320707": "赣榆区",
-      "320722": "东海县",
-      "320723": "灌云县",
-      "320724": "灌南县",
-      "320802": "清河区",
-      "320803": "淮安区",
-      "320804": "淮阴区",
-      "320811": "清浦区",
-      "320826": "涟水县",
-      "320829": "洪泽县",
-      "320830": "盱眙县",
-      "320831": "金湖县",
-      "320890": "经济开发区",
-      "320902": "亭湖区",
-      "320903": "盐都区",
-      "320904": "大丰区",
-      "320921": "响水县",
-      "320922": "滨海县",
-      "320923": "阜宁县",
-      "320924": "射阳县",
-      "320925": "建湖县",
-      "320981": "东台市",
-      "321002": "广陵区",
-      "321003": "邗江区",
-      "321012": "江都区",
-      "321023": "宝应县",
-      "321081": "仪征市",
-      "321084": "高邮市",
-      "321090": "经济开发区",
-      "321102": "京口区",
-      "321111": "润州区",
-      "321112": "丹徒区",
-      "321181": "丹阳市",
-      "321182": "扬中市",
-      "321183": "句容市",
-      "321202": "海陵区",
-      "321203": "高港区",
-      "321204": "姜堰区",
-      "321281": "兴化市",
-      "321282": "靖江市",
-      "321283": "泰兴市",
-      "321302": "宿城区",
-      "321311": "宿豫区",
-      "321322": "沭阳县",
-      "321323": "泗阳县",
-      "321324": "泗洪县",
-      "321390": "宿迁经济开发区",
-      "330102": "上城区",
-      "330103": "下城区",
-      "330104": "江干区",
-      "330105": "拱墅区",
-      "330106": "西湖区",
-      "330108": "滨江区",
-      "330109": "萧山区",
-      "330110": "余杭区",
-      "330111": "富阳区",
-      "330122": "桐庐县",
-      "330127": "淳安县",
-      "330182": "建德市",
-      "330185": "临安市",
-      "330203": "海曙区",
-      "330204": "江东区",
-      "330205": "江北区",
-      "330206": "北仑区",
-      "330211": "镇海区",
-      "330212": "鄞州区",
-      "330225": "象山县",
-      "330226": "宁海县",
-      "330281": "余姚市",
-      "330282": "慈溪市",
-      "330283": "奉化市",
-      "330290": "高新科技开发区",
-      "330302": "鹿城区",
-      "330303": "龙湾区",
-      "330304": "瓯海区",
-      "330305": "洞头区",
-      "330324": "永嘉县",
-      "330326": "平阳县",
-      "330327": "苍南县",
-      "330328": "文成县",
-      "330329": "泰顺县",
-      "330381": "瑞安市",
-      "330382": "乐清市",
-      "330402": "南湖区",
-      "330411": "秀洲区",
-      "330421": "嘉善县",
-      "330424": "海盐县",
-      "330481": "海宁市",
-      "330482": "平湖市",
-      "330483": "桐乡市",
-      "330502": "吴兴区",
-      "330503": "南浔区",
-      "330521": "德清县",
-      "330522": "长兴县",
-      "330523": "安吉县",
-      "330602": "越城区",
-      "330603": "柯桥区",
-      "330604": "上虞区",
-      "330624": "新昌县",
-      "330681": "诸暨市",
-      "330683": "嵊州市",
-      "330702": "婺城区",
-      "330703": "金东区",
-      "330723": "武义县",
-      "330726": "浦江县",
-      "330727": "磐安县",
-      "330781": "兰溪市",
-      "330782": "义乌市",
-      "330783": "东阳市",
-      "330784": "永康市",
-      "330802": "柯城区",
-      "330803": "衢江区",
-      "330822": "常山县",
-      "330824": "开化县",
-      "330825": "龙游县",
-      "330881": "江山市",
-      "330902": "定海区",
-      "330903": "普陀区",
-      "330921": "岱山县",
-      "330922": "嵊泗县",
-      "331002": "椒江区",
-      "331003": "黄岩区",
-      "331004": "路桥区",
-      "331021": "玉环县",
-      "331022": "三门县",
-      "331023": "天台县",
-      "331024": "仙居县",
-      "331081": "温岭市",
-      "331082": "临海市",
-      "331102": "莲都区",
-      "331121": "青田县",
-      "331122": "缙云县",
-      "331123": "遂昌县",
-      "331124": "松阳县",
-      "331125": "云和县",
-      "331126": "庆元县",
-      "331127": "景宁畲族自治县",
-      "331181": "龙泉市",
-      "340102": "瑶海区",
-      "340103": "庐阳区",
-      "340104": "蜀山区",
-      "340111": "包河区",
-      "340121": "长丰县",
-      "340122": "肥东县",
-      "340123": "肥西县",
-      "340124": "庐江县",
-      "340181": "巢湖市",
-      "340190": "高新技术开发区",
-      "340191": "经济技术开发区",
-      "340192": "北城新区",
-      "340193": "政务文化新区",
-      "340194": "滨湖新区",
-      "340195": "新站高新区",
-      "340202": "镜湖区",
-      "340203": "弋江区",
-      "340207": "鸠江区",
-      "340208": "三山区",
-      "340221": "芜湖县",
-      "340222": "繁昌县",
-      "340223": "南陵县",
-      "340225": "无为县",
-      "340302": "龙子湖区",
-      "340303": "蚌山区",
-      "340304": "禹会区",
-      "340311": "淮上区",
-      "340321": "怀远县",
-      "340322": "五河县",
-      "340323": "固镇县",
-      "340402": "大通区",
-      "340403": "田家庵区",
-      "340404": "谢家集区",
-      "340405": "八公山区",
-      "340406": "潘集区",
-      "340421": "凤台县",
-      "340490": "淮南高新技术产业开发区",
-      "340503": "花山区",
-      "340504": "雨山区",
-      "340506": "博望区",
-      "340521": "当涂县",
-      "340522": "含山县",
-      "340523": "和县",
-      "340602": "杜集区",
-      "340603": "相山区",
-      "340604": "烈山区",
-      "340621": "濉溪县",
-      "340702": "铜官山区",
-      "340703": "狮子山区",
-      "340711": "郊区",
-      "340721": "铜陵县",
-      "340802": "迎江区",
-      "340803": "大观区",
-      "340811": "宜秀区",
-      "340822": "怀宁县",
-      "340823": "枞阳县",
-      "340824": "潜山县",
-      "340825": "太湖县",
-      "340826": "宿松县",
-      "340827": "望江县",
-      "340828": "岳西县",
-      "340881": "桐城市",
-      "340890": "安庆经济技术开发区",
-      "341002": "屯溪区",
-      "341003": "黄山区",
-      "341004": "徽州区",
-      "341021": "歙县",
-      "341022": "休宁县",
-      "341023": "黟县",
-      "341024": "祁门县",
-      "341102": "琅琊区",
-      "341103": "南谯区",
-      "341122": "来安县",
-      "341124": "全椒县",
-      "341125": "定远县",
-      "341126": "凤阳县",
-      "341181": "天长市",
-      "341182": "明光市",
-      "341202": "颍州区",
-      "341203": "颍东区",
-      "341204": "颍泉区",
-      "341221": "临泉县",
-      "341222": "太和县",
-      "341225": "阜南县",
-      "341226": "颍上县",
-      "341282": "界首市",
-      "341290": "阜阳经济技术开发区",
-      "341302": "埇桥区",
-      "341321": "砀山县",
-      "341322": "萧县",
-      "341323": "灵璧县",
-      "341324": "泗县",
-      "341390": "经济开发区",
-      "341502": "金安区",
-      "341503": "裕安区",
-      "341521": "寿县",
-      "341522": "霍邱县",
-      "341523": "舒城县",
-      "341524": "金寨县",
-      "341525": "霍山县",
-      "341602": "谯城区",
-      "341621": "涡阳县",
-      "341622": "蒙城县",
-      "341623": "利辛县",
-      "341702": "贵池区",
-      "341721": "东至县",
-      "341722": "石台县",
-      "341723": "青阳县",
-      "341802": "宣州区",
-      "341821": "郎溪县",
-      "341822": "广德县",
-      "341823": "泾县",
-      "341824": "绩溪县",
-      "341825": "旌德县",
-      "341881": "宁国市",
-      "350102": "鼓楼区",
-      "350103": "台江区",
-      "350104": "仓山区",
-      "350105": "马尾区",
-      "350111": "晋安区",
-      "350121": "闽侯县",
-      "350122": "连江县",
-      "350123": "罗源县",
-      "350124": "闽清县",
-      "350125": "永泰县",
-      "350128": "平潭县",
-      "350181": "福清市",
-      "350182": "长乐市",
-      "350203": "思明区",
-      "350205": "海沧区",
-      "350206": "湖里区",
-      "350211": "集美区",
-      "350212": "同安区",
-      "350213": "翔安区",
-      "350302": "城厢区",
-      "350303": "涵江区",
-      "350304": "荔城区",
-      "350305": "秀屿区",
-      "350322": "仙游县",
-      "350402": "梅列区",
-      "350403": "三元区",
-      "350421": "明溪县",
-      "350423": "清流县",
-      "350424": "宁化县",
-      "350425": "大田县",
-      "350426": "尤溪县",
-      "350427": "沙县",
-      "350428": "将乐县",
-      "350429": "泰宁县",
-      "350430": "建宁县",
-      "350481": "永安市",
-      "350502": "鲤城区",
-      "350503": "丰泽区",
-      "350504": "洛江区",
-      "350505": "泉港区",
-      "350521": "惠安县",
-      "350524": "安溪县",
-      "350525": "永春县",
-      "350526": "德化县",
-      "350527": "金门县",
-      "350581": "石狮市",
-      "350582": "晋江市",
-      "350583": "南安市",
-      "350602": "芗城区",
-      "350603": "龙文区",
-      "350622": "云霄县",
-      "350623": "漳浦县",
-      "350624": "诏安县",
-      "350625": "长泰县",
-      "350626": "东山县",
-      "350627": "南靖县",
-      "350628": "平和县",
-      "350629": "华安县",
-      "350681": "龙海市",
-      "350702": "延平区",
-      "350703": "建阳区",
-      "350721": "顺昌县",
-      "350722": "浦城县",
-      "350723": "光泽县",
-      "350724": "松溪县",
-      "350725": "政和县",
-      "350781": "邵武市",
-      "350782": "武夷山市",
-      "350783": "建瓯市",
-      "350802": "新罗区",
-      "350803": "永定区",
-      "350821": "长汀县",
-      "350823": "上杭县",
-      "350824": "武平县",
-      "350825": "连城县",
-      "350881": "漳平市",
-      "350902": "蕉城区",
-      "350921": "霞浦县",
-      "350922": "古田县",
-      "350923": "屏南县",
-      "350924": "寿宁县",
-      "350925": "周宁县",
-      "350926": "柘荣县",
-      "350981": "福安市",
-      "350982": "福鼎市",
-      "350990": "东侨开发区",
-      "360102": "东湖区",
-      "360103": "西湖区",
-      "360104": "青云谱区",
-      "360105": "湾里区",
-      "360111": "青山湖区",
-      "360112": "新建区",
-      "360121": "南昌县",
-      "360123": "安义县",
-      "360124": "进贤县",
-      "360190": "经济技术开发区",
-      "360191": "红谷滩新区",
-      "360192": "高新区",
-      "360202": "昌江区",
-      "360203": "珠山区",
-      "360222": "浮梁县",
-      "360281": "乐平市",
-      "360302": "安源区",
-      "360313": "湘东区",
-      "360321": "莲花县",
-      "360322": "上栗县",
-      "360323": "芦溪县",
-      "360402": "庐山区",
-      "360403": "浔阳区",
-      "360421": "九江县",
-      "360423": "武宁县",
-      "360424": "修水县",
-      "360425": "永修县",
-      "360426": "德安县",
-      "360427": "星子县",
-      "360428": "都昌县",
-      "360429": "湖口县",
-      "360430": "彭泽县",
-      "360481": "瑞昌市",
-      "360482": "共青城市",
-      "360490": "经济技术开发区",
-      "360491": "八里湖新区",
-      "360502": "渝水区",
-      "360521": "分宜县",
-      "360602": "月湖区",
-      "360622": "余江县",
-      "360681": "贵溪市",
-      "360702": "章贡区",
-      "360703": "南康区",
-      "360721": "赣县",
-      "360722": "信丰县",
-      "360723": "大余县",
-      "360724": "上犹县",
-      "360725": "崇义县",
-      "360726": "安远县",
-      "360727": "龙南县",
-      "360728": "定南县",
-      "360729": "全南县",
-      "360730": "宁都县",
-      "360731": "于都县",
-      "360732": "兴国县",
-      "360733": "会昌县",
-      "360734": "寻乌县",
-      "360735": "石城县",
-      "360781": "瑞金市",
-      "360802": "吉州区",
-      "360803": "青原区",
-      "360821": "吉安县",
-      "360822": "吉水县",
-      "360823": "峡江县",
-      "360824": "新干县",
-      "360825": "永丰县",
-      "360826": "泰和县",
-      "360827": "遂川县",
-      "360828": "万安县",
-      "360829": "安福县",
-      "360830": "永新县",
-      "360881": "井冈山市",
-      "360902": "袁州区",
-      "360921": "奉新县",
-      "360922": "万载县",
-      "360923": "上高县",
-      "360924": "宜丰县",
-      "360925": "靖安县",
-      "360926": "铜鼓县",
-      "360981": "丰城市",
-      "360982": "樟树市",
-      "360983": "高安市",
-      "361002": "临川区",
-      "361021": "南城县",
-      "361022": "黎川县",
-      "361023": "南丰县",
-      "361024": "崇仁县",
-      "361025": "乐安县",
-      "361026": "宜黄县",
-      "361027": "金溪县",
-      "361028": "资溪县",
-      "361029": "东乡县",
-      "361030": "广昌县",
-      "361102": "信州区",
-      "361103": "广丰区",
-      "361121": "上饶县",
-      "361123": "玉山县",
-      "361124": "铅山县",
-      "361125": "横峰县",
-      "361126": "弋阳县",
-      "361127": "余干县",
-      "361128": "鄱阳县",
-      "361129": "万年县",
-      "361130": "婺源县",
-      "361181": "德兴市",
-      "370102": "历下区",
-      "370103": "市中区",
-      "370104": "槐荫区",
-      "370105": "天桥区",
-      "370112": "历城区",
-      "370113": "长清区",
-      "370124": "平阴县",
-      "370125": "济阳县",
-      "370126": "商河县",
-      "370181": "章丘市",
-      "370190": "高新区",
-      "370202": "市南区",
-      "370203": "市北区",
-      "370211": "黄岛区",
-      "370212": "崂山区",
-      "370213": "李沧区",
-      "370214": "城阳区",
-      "370281": "胶州市",
-      "370282": "即墨市",
-      "370283": "平度市",
-      "370285": "莱西市",
-      "370290": "开发区",
-      "370302": "淄川区",
-      "370303": "张店区",
-      "370304": "博山区",
-      "370305": "临淄区",
-      "370306": "周村区",
-      "370321": "桓台县",
-      "370322": "高青县",
-      "370323": "沂源县",
-      "370402": "市中区",
-      "370403": "薛城区",
-      "370404": "峄城区",
-      "370405": "台儿庄区",
-      "370406": "山亭区",
-      "370481": "滕州市",
-      "370502": "东营区",
-      "370503": "河口区",
-      "370521": "垦利县",
-      "370522": "利津县",
-      "370523": "广饶县",
-      "370602": "芝罘区",
-      "370611": "福山区",
-      "370612": "牟平区",
-      "370613": "莱山区",
-      "370634": "长岛县",
-      "370681": "龙口市",
-      "370682": "莱阳市",
-      "370683": "莱州市",
-      "370684": "蓬莱市",
-      "370685": "招远市",
-      "370686": "栖霞市",
-      "370687": "海阳市",
-      "370690": "开发区",
-      "370702": "潍城区",
-      "370703": "寒亭区",
-      "370704": "坊子区",
-      "370705": "奎文区",
-      "370724": "临朐县",
-      "370725": "昌乐县",
-      "370781": "青州市",
-      "370782": "诸城市",
-      "370783": "寿光市",
-      "370784": "安丘市",
-      "370785": "高密市",
-      "370786": "昌邑市",
-      "370790": "开发区",
-      "370791": "高新区",
-      "370811": "任城区",
-      "370812": "兖州区",
-      "370826": "微山县",
-      "370827": "鱼台县",
-      "370828": "金乡县",
-      "370829": "嘉祥县",
-      "370830": "汶上县",
-      "370831": "泗水县",
-      "370832": "梁山县",
-      "370881": "曲阜市",
-      "370883": "邹城市",
-      "370890": "高新区",
-      "370902": "泰山区",
-      "370911": "岱岳区",
-      "370921": "宁阳县",
-      "370923": "东平县",
-      "370982": "新泰市",
-      "370983": "肥城市",
-      "371002": "环翠区",
-      "371003": "文登区",
-      "371082": "荣成市",
-      "371083": "乳山市",
-      "371090": "工业新区",
-      "371091": "经济技术开发区",
-      "371102": "东港区",
-      "371103": "岚山区",
-      "371121": "五莲县",
-      "371122": "莒县",
-      "371202": "莱城区",
-      "371203": "钢城区",
-      "371302": "兰山区",
-      "371311": "罗庄区",
-      "371312": "河东区",
-      "371321": "沂南县",
-      "371322": "郯城县",
-      "371323": "沂水县",
-      "371324": "兰陵县",
-      "371325": "费县",
-      "371326": "平邑县",
-      "371327": "莒南县",
-      "371328": "蒙阴县",
-      "371329": "临沭县",
-      "371402": "德城区",
-      "371403": "陵城区",
-      "371422": "宁津县",
-      "371423": "庆云县",
-      "371424": "临邑县",
-      "371425": "齐河县",
-      "371426": "平原县",
-      "371427": "夏津县",
-      "371428": "武城县",
-      "371481": "乐陵市",
-      "371482": "禹城市",
-      "371490": "德州经济技术开发区",
-      "371502": "东昌府区",
-      "371521": "阳谷县",
-      "371522": "莘县",
-      "371523": "茌平县",
-      "371524": "东阿县",
-      "371525": "冠县",
-      "371526": "高唐县",
-      "371581": "临清市",
-      "371602": "滨城区",
-      "371603": "沾化区",
-      "371621": "惠民县",
-      "371622": "阳信县",
-      "371623": "无棣县",
-      "371625": "博兴县",
-      "371626": "邹平县",
-      "371690": "北海新区",
-      "371702": "牡丹区",
-      "371721": "曹县",
-      "371722": "单县",
-      "371723": "成武县",
-      "371724": "巨野县",
-      "371725": "郓城县",
-      "371726": "鄄城县",
-      "371727": "定陶县",
-      "371728": "东明县",
-      "410102": "中原区",
-      "410103": "二七区",
-      "410104": "管城回族区",
-      "410105": "金水区",
-      "410106": "上街区",
-      "410108": "惠济区",
-      "410122": "中牟县",
-      "410181": "巩义市",
-      "410182": "荥阳市",
-      "410183": "新密市",
-      "410184": "新郑市",
-      "410185": "登封市",
-      "410190": "高新技术开发区",
-      "410191": "经济技术开发区",
-      "410192": "郑东新区",
-      "410202": "龙亭区",
-      "410203": "顺河回族区",
-      "410204": "鼓楼区",
-      "410205": "禹王台区",
-      "410211": "金明区",
-      "410212": "祥符区",
-      "410221": "杞县",
-      "410222": "通许县",
-      "410223": "尉氏县",
-      "410225": "兰考县",
-      "410302": "老城区",
-      "410303": "西工区",
-      "410304": "瀍河回族区",
-      "410305": "涧西区",
-      "410306": "吉利区",
-      "410311": "洛龙区",
-      "410322": "孟津县",
-      "410323": "新安县",
-      "410324": "栾川县",
-      "410325": "嵩县",
-      "410326": "汝阳县",
-      "410327": "宜阳县",
-      "410328": "洛宁县",
-      "410329": "伊川县",
-      "410381": "偃师市",
-      "410390": "伊滨区",
-      "410402": "新华区",
-      "410403": "卫东区",
-      "410404": "石龙区",
-      "410411": "湛河区",
-      "410421": "宝丰县",
-      "410422": "叶县",
-      "410423": "鲁山县",
-      "410425": "郏县",
-      "410481": "舞钢市",
-      "410482": "汝州市",
-      "410502": "文峰区",
-      "410503": "北关区",
-      "410505": "殷都区",
-      "410506": "龙安区",
-      "410522": "安阳县",
-      "410523": "汤阴县",
-      "410526": "滑县",
-      "410527": "内黄县",
-      "410581": "林州市",
-      "410590": "开发区",
-      "410602": "鹤山区",
-      "410603": "山城区",
-      "410611": "淇滨区",
-      "410621": "浚县",
-      "410622": "淇县",
-      "410702": "红旗区",
-      "410703": "卫滨区",
-      "410704": "凤泉区",
-      "410711": "牧野区",
-      "410721": "新乡县",
-      "410724": "获嘉县",
-      "410725": "原阳县",
-      "410726": "延津县",
-      "410727": "封丘县",
-      "410728": "长垣县",
-      "410781": "卫辉市",
-      "410782": "辉县市",
-      "410802": "解放区",
-      "410803": "中站区",
-      "410804": "马村区",
-      "410811": "山阳区",
-      "410821": "修武县",
-      "410822": "博爱县",
-      "410823": "武陟县",
-      "410825": "温县",
-      "410882": "沁阳市",
-      "410883": "孟州市",
-      "410902": "华龙区",
-      "410922": "清丰县",
-      "410923": "南乐县",
-      "410926": "范县",
-      "410927": "台前县",
-      "410928": "濮阳县",
-      "411002": "魏都区",
-      "411023": "许昌县",
-      "411024": "鄢陵县",
-      "411025": "襄城县",
-      "411081": "禹州市",
-      "411082": "长葛市",
-      "411102": "源汇区",
-      "411103": "郾城区",
-      "411104": "召陵区",
-      "411121": "舞阳县",
-      "411122": "临颍县",
-      "411202": "湖滨区",
-      "411221": "渑池县",
-      "411222": "陕县",
-      "411224": "卢氏县",
-      "411281": "义马市",
-      "411282": "灵宝市",
-      "411302": "宛城区",
-      "411303": "卧龙区",
-      "411321": "南召县",
-      "411322": "方城县",
-      "411323": "西峡县",
-      "411324": "镇平县",
-      "411325": "内乡县",
-      "411326": "淅川县",
-      "411327": "社旗县",
-      "411328": "唐河县",
-      "411329": "新野县",
-      "411330": "桐柏县",
-      "411381": "邓州市",
-      "411402": "梁园区",
-      "411403": "睢阳区",
-      "411421": "民权县",
-      "411422": "睢县",
-      "411423": "宁陵县",
-      "411424": "柘城县",
-      "411425": "虞城县",
-      "411426": "夏邑县",
-      "411481": "永城市",
-      "411502": "浉河区",
-      "411503": "平桥区",
-      "411521": "罗山县",
-      "411522": "光山县",
-      "411523": "新县",
-      "411524": "商城县",
-      "411525": "固始县",
-      "411526": "潢川县",
-      "411527": "淮滨县",
-      "411528": "息县",
-      "411602": "川汇区",
-      "411621": "扶沟县",
-      "411622": "西华县",
-      "411623": "商水县",
-      "411624": "沈丘县",
-      "411625": "郸城县",
-      "411626": "淮阳县",
-      "411627": "太康县",
-      "411628": "鹿邑县",
-      "411681": "项城市",
-      "411690": "经济开发区",
-      "411691": "东新区",
-      "411702": "驿城区",
-      "411721": "西平县",
-      "411722": "上蔡县",
-      "411723": "平舆县",
-      "411724": "正阳县",
-      "411725": "确山县",
-      "411726": "泌阳县",
-      "411727": "汝南县",
-      "411728": "遂平县",
-      "411729": "新蔡县",
-      "419001": "济源市",
-      "420102": "江岸区",
-      "420103": "江汉区",
-      "420104": "硚口区",
-      "420105": "汉阳区",
-      "420106": "武昌区",
-      "420107": "青山区",
-      "420111": "洪山区",
-      "420112": "东西湖区",
-      "420113": "汉南区",
-      "420114": "蔡甸区",
-      "420115": "江夏区",
-      "420116": "黄陂区",
-      "420117": "新洲区",
-      "420190": "武汉经济技术开发区",
-      "420202": "黄石港区",
-      "420203": "西塞山区",
-      "420204": "下陆区",
-      "420205": "铁山区",
-      "420222": "阳新县",
-      "420281": "大冶市",
-      "420290": "黄石经济技术开发区",
-      "420302": "茅箭区",
-      "420303": "张湾区",
-      "420304": "郧阳区",
-      "420322": "郧西县",
-      "420323": "竹山县",
-      "420324": "竹溪县",
-      "420325": "房县",
-      "420381": "丹江口市",
-      "420502": "西陵区",
-      "420503": "伍家岗区",
-      "420504": "点军区",
-      "420505": "猇亭区",
-      "420506": "夷陵区",
-      "420525": "远安县",
-      "420526": "兴山县",
-      "420527": "秭归县",
-      "420528": "长阳土家族自治县",
-      "420529": "五峰土家族自治县",
-      "420581": "宜都市",
-      "420582": "当阳市",
-      "420583": "枝江市",
-      "420590": "经济开发区",
-      "420602": "襄城区",
-      "420606": "樊城区",
-      "420607": "襄州区",
-      "420624": "南漳县",
-      "420625": "谷城县",
-      "420626": "保康县",
-      "420682": "老河口市",
-      "420683": "枣阳市",
-      "420684": "宜城市",
-      "420702": "梁子湖区",
-      "420703": "华容区",
-      "420704": "鄂城区",
-      "420802": "东宝区",
-      "420804": "掇刀区",
-      "420821": "京山县",
-      "420822": "沙洋县",
-      "420881": "钟祥市",
-      "420902": "孝南区",
-      "420921": "孝昌县",
-      "420922": "大悟县",
-      "420923": "云梦县",
-      "420981": "应城市",
-      "420982": "安陆市",
-      "420984": "汉川市",
-      "421002": "沙市区",
-      "421003": "荆州区",
-      "421022": "公安县",
-      "421023": "监利县",
-      "421024": "江陵县",
-      "421081": "石首市",
-      "421083": "洪湖市",
-      "421087": "松滋市",
-      "421102": "黄州区",
-      "421121": "团风县",
-      "421122": "红安县",
-      "421123": "罗田县",
-      "421124": "英山县",
-      "421125": "浠水县",
-      "421126": "蕲春县",
-      "421127": "黄梅县",
-      "421181": "麻城市",
-      "421182": "武穴市",
-      "421202": "咸安区",
-      "421221": "嘉鱼县",
-      "421222": "通城县",
-      "421223": "崇阳县",
-      "421224": "通山县",
-      "421281": "赤壁市",
-      "421303": "曾都区",
-      "421321": "随县",
-      "421381": "广水市",
-      "422801": "恩施市",
-      "422802": "利川市",
-      "422822": "建始县",
-      "422823": "巴东县",
-      "422825": "宣恩县",
-      "422826": "咸丰县",
-      "422827": "来凤县",
-      "422828": "鹤峰县",
-      "429004": "仙桃市",
-      "429005": "潜江市",
-      "429006": "天门市",
-      "429021": "神农架林区",
-      "430102": "芙蓉区",
-      "430103": "天心区",
-      "430104": "岳麓区",
-      "430105": "开福区",
-      "430111": "雨花区",
-      "430112": "望城区",
-      "430121": "长沙县",
-      "430124": "宁乡县",
-      "430181": "浏阳市",
-      "430202": "荷塘区",
-      "430203": "芦淞区",
-      "430204": "石峰区",
-      "430211": "天元区",
-      "430221": "株洲县",
-      "430223": "攸县",
-      "430224": "茶陵县",
-      "430225": "炎陵县",
-      "430281": "醴陵市",
-      "430302": "雨湖区",
-      "430304": "岳塘区",
-      "430321": "湘潭县",
-      "430381": "湘乡市",
-      "430382": "韶山市",
-      "430405": "珠晖区",
-      "430406": "雁峰区",
-      "430407": "石鼓区",
-      "430408": "蒸湘区",
-      "430412": "南岳区",
-      "430421": "衡阳县",
-      "430422": "衡南县",
-      "430423": "衡山县",
-      "430424": "衡东县",
-      "430426": "祁东县",
-      "430481": "耒阳市",
-      "430482": "常宁市",
-      "430502": "双清区",
-      "430503": "大祥区",
-      "430511": "北塔区",
-      "430521": "邵东县",
-      "430522": "新邵县",
-      "430523": "邵阳县",
-      "430524": "隆回县",
-      "430525": "洞口县",
-      "430527": "绥宁县",
-      "430528": "新宁县",
-      "430529": "城步苗族自治县",
-      "430581": "武冈市",
-      "430602": "岳阳楼区",
-      "430603": "云溪区",
-      "430611": "君山区",
-      "430621": "岳阳县",
-      "430623": "华容县",
-      "430624": "湘阴县",
-      "430626": "平江县",
-      "430681": "汨罗市",
-      "430682": "临湘市",
-      "430702": "武陵区",
-      "430703": "鼎城区",
-      "430721": "安乡县",
-      "430722": "汉寿县",
-      "430723": "澧县",
-      "430724": "临澧县",
-      "430725": "桃源县",
-      "430726": "石门县",
-      "430781": "津市市",
-      "430802": "永定区",
-      "430811": "武陵源区",
-      "430821": "慈利县",
-      "430822": "桑植县",
-      "430902": "资阳区",
-      "430903": "赫山区",
-      "430921": "南县",
-      "430922": "桃江县",
-      "430923": "安化县",
-      "430981": "沅江市",
-      "431002": "北湖区",
-      "431003": "苏仙区",
-      "431021": "桂阳县",
-      "431022": "宜章县",
-      "431023": "永兴县",
-      "431024": "嘉禾县",
-      "431025": "临武县",
-      "431026": "汝城县",
-      "431027": "桂东县",
-      "431028": "安仁县",
-      "431081": "资兴市",
-      "431102": "零陵区",
-      "431103": "冷水滩区",
-      "431121": "祁阳县",
-      "431122": "东安县",
-      "431123": "双牌县",
-      "431124": "道县",
-      "431125": "江永县",
-      "431126": "宁远县",
-      "431127": "蓝山县",
-      "431128": "新田县",
-      "431129": "江华瑶族自治县",
-      "431202": "鹤城区",
-      "431221": "中方县",
-      "431222": "沅陵县",
-      "431223": "辰溪县",
-      "431224": "溆浦县",
-      "431225": "会同县",
-      "431226": "麻阳苗族自治县",
-      "431227": "新晃侗族自治县",
-      "431228": "芷江侗族自治县",
-      "431229": "靖州苗族侗族自治县",
-      "431230": "通道侗族自治县",
-      "431281": "洪江市",
-      "431302": "娄星区",
-      "431321": "双峰县",
-      "431322": "新化县",
-      "431381": "冷水江市",
-      "431382": "涟源市",
-      "433101": "吉首市",
-      "433122": "泸溪县",
-      "433123": "凤凰县",
-      "433124": "花垣县",
-      "433125": "保靖县",
-      "433126": "古丈县",
-      "433127": "永顺县",
-      "433130": "龙山县",
-      "440103": "荔湾区",
-      "440104": "越秀区",
-      "440105": "海珠区",
-      "440106": "天河区",
-      "440111": "白云区",
-      "440112": "黄埔区",
-      "440113": "番禺区",
-      "440114": "花都区",
-      "440115": "南沙区",
-      "440117": "从化区",
-      "440118": "增城区",
-      "440203": "武江区",
-      "440204": "浈江区",
-      "440205": "曲江区",
-      "440222": "始兴县",
-      "440224": "仁化县",
-      "440229": "翁源县",
-      "440232": "乳源瑶族自治县",
-      "440233": "新丰县",
-      "440281": "乐昌市",
-      "440282": "南雄市",
-      "440303": "罗湖区",
-      "440304": "福田区",
-      "440305": "南山区",
-      "440306": "宝安区",
-      "440307": "龙岗区",
-      "440308": "盐田区",
-      "440390": "坪山新区",
-      "440391": "光明新区",
-      "440392": "大鹏新区",
-      "440393": "龙华新区",
-      "440402": "香洲区",
-      "440403": "斗门区",
-      "440404": "金湾区",
-      "440507": "龙湖区",
-      "440511": "金平区",
-      "440512": "濠江区",
-      "440513": "潮阳区",
-      "440514": "潮南区",
-      "440515": "澄海区",
-      "440523": "南澳县",
-      "440604": "禅城区",
-      "440605": "南海区",
-      "440606": "顺德区",
-      "440607": "三水区",
-      "440608": "高明区",
-      "440703": "蓬江区",
-      "440704": "江海区",
-      "440705": "新会区",
-      "440781": "台山市",
-      "440783": "开平市",
-      "440784": "鹤山市",
-      "440785": "恩平市",
-      "440802": "赤坎区",
-      "440803": "霞山区",
-      "440804": "坡头区",
-      "440811": "麻章区",
-      "440823": "遂溪县",
-      "440825": "徐闻县",
-      "440881": "廉江市",
-      "440882": "雷州市",
-      "440883": "吴川市",
-      "440890": "经济技术开发区",
-      "440902": "茂南区",
-      "440904": "电白区",
-      "440981": "高州市",
-      "440982": "化州市",
-      "440983": "信宜市",
-      "441202": "端州区",
-      "441203": "鼎湖区",
-      "441204": "高要区",
-      "441223": "广宁县",
-      "441224": "怀集县",
-      "441225": "封开县",
-      "441226": "德庆县",
-      "441284": "四会市",
-      "441302": "惠城区",
-      "441303": "惠阳区",
-      "441322": "博罗县",
-      "441323": "惠东县",
-      "441324": "龙门县",
-      "441402": "梅江区",
-      "441403": "梅县区",
-      "441422": "大埔县",
-      "441423": "丰顺县",
-      "441424": "五华县",
-      "441426": "平远县",
-      "441427": "蕉岭县",
-      "441481": "兴宁市",
-      "441502": "城区",
-      "441521": "海丰县",
-      "441523": "陆河县",
-      "441581": "陆丰市",
-      "441602": "源城区",
-      "441621": "紫金县",
-      "441622": "龙川县",
-      "441623": "连平县",
-      "441624": "和平县",
-      "441625": "东源县",
-      "441702": "江城区",
-      "441704": "阳东区",
-      "441721": "阳西县",
-      "441781": "阳春市",
-      "441802": "清城区",
-      "441803": "清新区",
-      "441821": "佛冈县",
-      "441823": "阳山县",
-      "441825": "连山壮族瑶族自治县",
-      "441826": "连南瑶族自治县",
-      "441881": "英德市",
-      "441882": "连州市",
-      "441901": "中堂镇",
-      "441903": "南城区",
-      "441904": "长安镇",
-      "441905": "东坑镇",
-      "441906": "樟木头镇",
-      "441907": "莞城区",
-      "441908": "石龙镇",
-      "441909": "桥头镇",
-      "441910": "万江区",
-      "441911": "麻涌镇",
-      "441912": "虎门镇",
-      "441913": "谢岗镇",
-      "441914": "石碣镇",
-      "441915": "茶山镇",
-      "441916": "东城区",
-      "441917": "洪梅镇",
-      "441918": "道滘镇",
-      "441919": "高埗镇",
-      "441920": "企石镇",
-      "441921": "凤岗镇",
-      "441922": "大岭山镇",
-      "441923": "松山湖",
-      "441924": "清溪镇",
-      "441925": "望牛墩镇",
-      "441926": "厚街镇",
-      "441927": "常平镇",
-      "441928": "寮步镇",
-      "441929": "石排镇",
-      "441930": "横沥镇",
-      "441931": "塘厦镇",
-      "441932": "黄江镇",
-      "441933": "大朗镇",
-      "441990": "沙田镇",
-      "442001": "南头镇",
-      "442002": "神湾镇",
-      "442003": "东凤镇",
-      "442004": "五桂山镇",
-      "442005": "黄圃镇",
-      "442006": "小榄镇",
-      "442007": "石岐区街道",
-      "442008": "横栏镇",
-      "442009": "三角镇",
-      "442010": "三乡镇",
-      "442011": "港口镇",
-      "442012": "沙溪镇",
-      "442013": "板芙镇",
-      "442014": "沙朗镇",
-      "442015": "东升镇",
-      "442016": "阜沙镇",
-      "442017": "民众镇",
-      "442018": "东区街道",
-      "442019": "火炬开发区",
-      "442020": "西区街道",
-      "442021": "南区街道",
-      "442022": "古镇",
-      "442023": "坦洲镇",
-      "442024": "大涌镇",
-      "442025": "南朗镇",
-      "445102": "湘桥区",
-      "445103": "潮安区",
-      "445122": "饶平县",
-      "445190": "枫溪区",
-      "445202": "榕城区",
-      "445203": "揭东区",
-      "445222": "揭西县",
-      "445224": "惠来县",
-      "445281": "普宁市",
-      "445302": "云城区",
-      "445303": "云安区",
-      "445321": "新兴县",
-      "445322": "郁南县",
-      "445381": "罗定市",
-      "450102": "兴宁区",
-      "450103": "青秀区",
-      "450105": "江南区",
-      "450107": "西乡塘区",
-      "450108": "良庆区",
-      "450109": "邕宁区",
-      "450110": "武鸣区",
-      "450123": "隆安县",
-      "450124": "马山县",
-      "450125": "上林县",
-      "450126": "宾阳县",
-      "450127": "横县",
-      "450202": "城中区",
-      "450203": "鱼峰区",
-      "450204": "柳南区",
-      "450205": "柳北区",
-      "450221": "柳江县",
-      "450222": "柳城县",
-      "450223": "鹿寨县",
-      "450224": "融安县",
-      "450225": "融水苗族自治县",
-      "450226": "三江侗族自治县",
-      "450302": "秀峰区",
-      "450303": "叠彩区",
-      "450304": "象山区",
-      "450305": "七星区",
-      "450311": "雁山区",
-      "450312": "临桂区",
-      "450321": "阳朔县",
-      "450323": "灵川县",
-      "450324": "全州县",
-      "450325": "兴安县",
-      "450326": "永福县",
-      "450327": "灌阳县",
-      "450328": "龙胜各族自治县",
-      "450329": "资源县",
-      "450330": "平乐县",
-      "450331": "荔浦县",
-      "450332": "恭城瑶族自治县",
-      "450403": "万秀区",
-      "450405": "长洲区",
-      "450406": "龙圩区",
-      "450421": "苍梧县",
-      "450422": "藤县",
-      "450423": "蒙山县",
-      "450481": "岑溪市",
-      "450502": "海城区",
-      "450503": "银海区",
-      "450512": "铁山港区",
-      "450521": "合浦县",
-      "450602": "港口区",
-      "450603": "防城区",
-      "450621": "上思县",
-      "450681": "东兴市",
-      "450702": "钦南区",
-      "450703": "钦北区",
-      "450721": "灵山县",
-      "450722": "浦北县",
-      "450802": "港北区",
-      "450803": "港南区",
-      "450804": "覃塘区",
-      "450821": "平南县",
-      "450881": "桂平市",
-      "450902": "玉州区",
-      "450903": "福绵区",
-      "450921": "容县",
-      "450922": "陆川县",
-      "450923": "博白县",
-      "450924": "兴业县",
-      "450981": "北流市",
-      "451002": "右江区",
-      "451021": "田阳县",
-      "451022": "田东县",
-      "451023": "平果县",
-      "451024": "德保县",
-      "451026": "那坡县",
-      "451027": "凌云县",
-      "451028": "乐业县",
-      "451029": "田林县",
-      "451030": "西林县",
-      "451031": "隆林各族自治县",
-      "451081": "靖西市",
-      "451102": "八步区",
-      "451121": "昭平县",
-      "451122": "钟山县",
-      "451123": "富川瑶族自治县",
-      "451202": "金城江区",
-      "451221": "南丹县",
-      "451222": "天峨县",
-      "451223": "凤山县",
-      "451224": "东兰县",
-      "451225": "罗城仫佬族自治县",
-      "451226": "环江毛南族自治县",
-      "451227": "巴马瑶族自治县",
-      "451228": "都安瑶族自治县",
-      "451229": "大化瑶族自治县",
-      "451281": "宜州市",
-      "451302": "兴宾区",
-      "451321": "忻城县",
-      "451322": "象州县",
-      "451323": "武宣县",
-      "451324": "金秀瑶族自治县",
-      "451381": "合山市",
-      "451402": "江州区",
-      "451421": "扶绥县",
-      "451422": "宁明县",
-      "451423": "龙州县",
-      "451424": "大新县",
-      "451425": "天等县",
-      "451481": "凭祥市",
-      "460105": "秀英区",
-      "460106": "龙华区",
-      "460107": "琼山区",
-      "460108": "美兰区",
-      "460202": "海棠区",
-      "460203": "吉阳区",
-      "460204": "天涯区",
-      "460205": "崖州区",
-      "460321": "西沙群岛",
-      "460322": "南沙群岛",
-      "460323": "中沙群岛的岛礁及其海域",
-      "469001": "五指山市",
-      "469002": "琼海市",
-      "469003": "儋州市",
-      "469005": "文昌市",
-      "469006": "万宁市",
-      "469007": "东方市",
-      "469021": "定安县",
-      "469022": "屯昌县",
-      "469023": "澄迈县",
-      "469024": "临高县",
-      "469025": "白沙黎族自治县",
-      "469026": "昌江黎族自治县",
-      "469027": "乐东黎族自治县",
-      "469028": "陵水黎族自治县",
-      "469029": "保亭黎族苗族自治县",
-      "469030": "琼中黎族苗族自治县",
-      "500101": "万州区",
-      "500102": "涪陵区",
-      "500103": "渝中区",
-      "500104": "大渡口区",
-      "500105": "江北区",
-      "500106": "沙坪坝区",
-      "500107": "九龙坡区",
-      "500108": "南岸区",
-      "500109": "北碚区",
-      "500110": "綦江区",
-      "500111": "大足区",
-      "500112": "渝北区",
-      "500113": "巴南区",
-      "500114": "黔江区",
-      "500115": "长寿区",
-      "500116": "江津区",
-      "500117": "合川区",
-      "500118": "永川区",
-      "500119": "南川区",
-      "500120": "璧山区",
-      "500151": "铜梁区",
-      "500152": "潼南区",
-      "500153": "荣昌区",
-      "500228": "梁平县",
-      "500229": "城口县",
-      "500230": "丰都县",
-      "500231": "垫江县",
-      "500232": "武隆县",
-      "500233": "忠县",
-      "500234": "开县",
-      "500235": "云阳县",
-      "500236": "奉节县",
-      "500237": "巫山县",
-      "500238": "巫溪县",
-      "500240": "石柱土家族自治县",
-      "500241": "秀山土家族苗族自治县",
-      "500242": "酉阳土家族苗族自治县",
-      "500243": "彭水苗族土家族自治县",
-      "510104": "锦江区",
-      "510105": "青羊区",
-      "510106": "金牛区",
-      "510107": "武侯区",
-      "510108": "成华区",
-      "510112": "龙泉驿区",
-      "510113": "青白江区",
-      "510114": "新都区",
-      "510115": "温江区",
-      "510121": "金堂县",
-      "510122": "双流县",
-      "510124": "郫县",
-      "510129": "大邑县",
-      "510131": "蒲江县",
-      "510132": "新津县",
-      "510181": "都江堰市",
-      "510182": "彭州市",
-      "510183": "邛崃市",
-      "510184": "崇州市",
-      "510190": "高新西区",
-      "510191": "高新区",
-      "510302": "自流井区",
-      "510303": "贡井区",
-      "510304": "大安区",
-      "510311": "沿滩区",
-      "510321": "荣县",
-      "510322": "富顺县",
-      "510402": "东区",
-      "510403": "西区",
-      "510411": "仁和区",
-      "510421": "米易县",
-      "510422": "盐边县",
-      "510502": "江阳区",
-      "510503": "纳溪区",
-      "510504": "龙马潭区",
-      "510521": "泸县",
-      "510522": "合江县",
-      "510524": "叙永县",
-      "510525": "古蔺县",
-      "510603": "旌阳区",
-      "510623": "中江县",
-      "510626": "罗江县",
-      "510681": "广汉市",
-      "510682": "什邡市",
-      "510683": "绵竹市",
-      "510703": "涪城区",
-      "510704": "游仙区",
-      "510722": "三台县",
-      "510723": "盐亭县",
-      "510724": "安县",
-      "510725": "梓潼县",
-      "510726": "北川羌族自治县",
-      "510727": "平武县",
-      "510781": "江油市",
-      "510790": "经开区",
-      "510791": "高新区",
-      "510802": "利州区",
-      "510811": "昭化区",
-      "510812": "朝天区",
-      "510821": "旺苍县",
-      "510822": "青川县",
-      "510823": "剑阁县",
-      "510824": "苍溪县",
-      "510903": "船山区",
-      "510904": "安居区",
-      "510921": "蓬溪县",
-      "510922": "射洪县",
-      "510923": "大英县",
-      "511002": "市中区",
-      "511011": "东兴区",
-      "511024": "威远县",
-      "511025": "资中县",
-      "511028": "隆昌县",
-      "511102": "市中区",
-      "511111": "沙湾区",
-      "511112": "五通桥区",
-      "511113": "金口河区",
-      "511123": "犍为县",
-      "511124": "井研县",
-      "511126": "夹江县",
-      "511129": "沐川县",
-      "511132": "峨边彝族自治县",
-      "511133": "马边彝族自治县",
-      "511181": "峨眉山市",
-      "511302": "顺庆区",
-      "511303": "高坪区",
-      "511304": "嘉陵区",
-      "511321": "南部县",
-      "511322": "营山县",
-      "511323": "蓬安县",
-      "511324": "仪陇县",
-      "511325": "西充县",
-      "511381": "阆中市",
-      "511402": "东坡区",
-      "511403": "彭山区",
-      "511421": "仁寿县",
-      "511423": "洪雅县",
-      "511424": "丹棱县",
-      "511425": "青神县",
-      "511502": "翠屏区",
-      "511503": "南溪区",
-      "511521": "宜宾县",
-      "511523": "江安县",
-      "511524": "长宁县",
-      "511525": "高县",
-      "511526": "珙县",
-      "511527": "筠连县",
-      "511528": "兴文县",
-      "511529": "屏山县",
-      "511602": "广安区",
-      "511603": "前锋区",
-      "511621": "岳池县",
-      "511622": "武胜县",
-      "511623": "邻水县",
-      "511681": "华蓥市",
-      "511702": "通川区",
-      "511703": "达川区",
-      "511722": "宣汉县",
-      "511723": "开江县",
-      "511724": "大竹县",
-      "511725": "渠县",
-      "511781": "万源市",
-      "511802": "雨城区",
-      "511803": "名山区",
-      "511822": "荥经县",
-      "511823": "汉源县",
-      "511824": "石棉县",
-      "511825": "天全县",
-      "511826": "芦山县",
-      "511827": "宝兴县",
-      "511902": "巴州区",
-      "511903": "恩阳区",
-      "511921": "通江县",
-      "511922": "南江县",
-      "511923": "平昌县",
-      "512002": "雁江区",
-      "512021": "安岳县",
-      "512022": "乐至县",
-      "512081": "简阳市",
-      "513221": "汶川县",
-      "513222": "理县",
-      "513223": "茂县",
-      "513224": "松潘县",
-      "513225": "九寨沟县",
-      "513226": "金川县",
-      "513227": "小金县",
-      "513228": "黑水县",
-      "513229": "马尔康县",
-      "513230": "壤塘县",
-      "513231": "阿坝县",
-      "513232": "若尔盖县",
-      "513233": "红原县",
-      "513301": "康定市",
-      "513322": "泸定县",
-      "513323": "丹巴县",
-      "513324": "九龙县",
-      "513325": "雅江县",
-      "513326": "道孚县",
-      "513327": "炉霍县",
-      "513328": "甘孜县",
-      "513329": "新龙县",
-      "513330": "德格县",
-      "513331": "白玉县",
-      "513332": "石渠县",
-      "513333": "色达县",
-      "513334": "理塘县",
-      "513335": "巴塘县",
-      "513336": "乡城县",
-      "513337": "稻城县",
-      "513338": "得荣县",
-      "513401": "西昌市",
-      "513422": "木里藏族自治县",
-      "513423": "盐源县",
-      "513424": "德昌县",
-      "513425": "会理县",
-      "513426": "会东县",
-      "513427": "宁南县",
-      "513428": "普格县",
-      "513429": "布拖县",
-      "513430": "金阳县",
-      "513431": "昭觉县",
-      "513432": "喜德县",
-      "513433": "冕宁县",
-      "513434": "越西县",
-      "513435": "甘洛县",
-      "513436": "美姑县",
-      "513437": "雷波县",
-      "520102": "南明区",
-      "520103": "云岩区",
-      "520111": "花溪区",
-      "520112": "乌当区",
-      "520113": "白云区",
-      "520115": "观山湖区",
-      "520121": "开阳县",
-      "520122": "息烽县",
-      "520123": "修文县",
-      "520181": "清镇市",
-      "520201": "钟山区",
-      "520203": "六枝特区",
-      "520221": "水城县",
-      "520222": "盘县",
-      "520302": "红花岗区",
-      "520303": "汇川区",
-      "520321": "遵义县",
-      "520322": "桐梓县",
-      "520323": "绥阳县",
-      "520324": "正安县",
-      "520325": "道真仡佬族苗族自治县",
-      "520326": "务川仡佬族苗族自治县",
-      "520327": "凤冈县",
-      "520328": "湄潭县",
-      "520329": "余庆县",
-      "520330": "习水县",
-      "520381": "赤水市",
-      "520382": "仁怀市",
-      "520402": "西秀区",
-      "520403": "平坝区",
-      "520422": "普定县",
-      "520423": "镇宁布依族苗族自治县",
-      "520424": "关岭布依族苗族自治县",
-      "520425": "紫云苗族布依族自治县",
-      "520502": "七星关区",
-      "520521": "大方县",
-      "520522": "黔西县",
-      "520523": "金沙县",
-      "520524": "织金县",
-      "520525": "纳雍县",
-      "520526": "威宁彝族回族苗族自治县",
-      "520527": "赫章县",
-      "520602": "碧江区",
-      "520603": "万山区",
-      "520621": "江口县",
-      "520622": "玉屏侗族自治县",
-      "520623": "石阡县",
-      "520624": "思南县",
-      "520625": "印江土家族苗族自治县",
-      "520626": "德江县",
-      "520627": "沿河土家族自治县",
-      "520628": "松桃苗族自治县",
-      "522301": "兴义市",
-      "522322": "兴仁县",
-      "522323": "普安县",
-      "522324": "晴隆县",
-      "522325": "贞丰县",
-      "522326": "望谟县",
-      "522327": "册亨县",
-      "522328": "安龙县",
-      "522601": "凯里市",
-      "522622": "黄平县",
-      "522623": "施秉县",
-      "522624": "三穗县",
-      "522625": "镇远县",
-      "522626": "岑巩县",
-      "522627": "天柱县",
-      "522628": "锦屏县",
-      "522629": "剑河县",
-      "522630": "台江县",
-      "522631": "黎平县",
-      "522632": "榕江县",
-      "522633": "从江县",
-      "522634": "雷山县",
-      "522635": "麻江县",
-      "522636": "丹寨县",
-      "522701": "都匀市",
-      "522702": "福泉市",
-      "522722": "荔波县",
-      "522723": "贵定县",
-      "522725": "瓮安县",
-      "522726": "独山县",
-      "522727": "平塘县",
-      "522728": "罗甸县",
-      "522729": "长顺县",
-      "522730": "龙里县",
-      "522731": "惠水县",
-      "522732": "三都水族自治县",
-      "530102": "五华区",
-      "530103": "盘龙区",
-      "530111": "官渡区",
-      "530112": "西山区",
-      "530113": "东川区",
-      "530114": "呈贡区",
-      "530122": "晋宁县",
-      "530124": "富民县",
-      "530125": "宜良县",
-      "530126": "石林彝族自治县",
-      "530127": "嵩明县",
-      "530128": "禄劝彝族苗族自治县",
-      "530129": "寻甸回族彝族自治县",
-      "530181": "安宁市",
-      "530302": "麒麟区",
-      "530321": "马龙县",
-      "530322": "陆良县",
-      "530323": "师宗县",
-      "530324": "罗平县",
-      "530325": "富源县",
-      "530326": "会泽县",
-      "530328": "沾益县",
-      "530381": "宣威市",
-      "530402": "红塔区",
-      "530421": "江川县",
-      "530422": "澄江县",
-      "530423": "通海县",
-      "530424": "华宁县",
-      "530425": "易门县",
-      "530426": "峨山彝族自治县",
-      "530427": "新平彝族傣族自治县",
-      "530428": "元江哈尼族彝族傣族自治县",
-      "530502": "隆阳区",
-      "530521": "施甸县",
-      "530523": "龙陵县",
-      "530524": "昌宁县",
-      "530581": "腾冲市",
-      "530602": "昭阳区",
-      "530621": "鲁甸县",
-      "530622": "巧家县",
-      "530623": "盐津县",
-      "530624": "大关县",
-      "530625": "永善县",
-      "530626": "绥江县",
-      "530627": "镇雄县",
-      "530628": "彝良县",
-      "530629": "威信县",
-      "530630": "水富县",
-      "530702": "古城区",
-      "530721": "玉龙纳西族自治县",
-      "530722": "永胜县",
-      "530723": "华坪县",
-      "530724": "宁蒗彝族自治县",
-      "530802": "思茅区",
-      "530821": "宁洱哈尼族彝族自治县",
-      "530822": "墨江哈尼族自治县",
-      "530823": "景东彝族自治县",
-      "530824": "景谷傣族彝族自治县",
-      "530825": "镇沅彝族哈尼族拉祜族自治县",
-      "530826": "江城哈尼族彝族自治县",
-      "530827": "孟连傣族拉祜族佤族自治县",
-      "530828": "澜沧拉祜族自治县",
-      "530829": "西盟佤族自治县",
-      "530902": "临翔区",
-      "530921": "凤庆县",
-      "530922": "云县",
-      "530923": "永德县",
-      "530924": "镇康县",
-      "530925": "双江拉祜族佤族布朗族傣族自治县",
-      "530926": "耿马傣族佤族自治县",
-      "530927": "沧源佤族自治县",
-      "532301": "楚雄市",
-      "532322": "双柏县",
-      "532323": "牟定县",
-      "532324": "南华县",
-      "532325": "姚安县",
-      "532326": "大姚县",
-      "532327": "永仁县",
-      "532328": "元谋县",
-      "532329": "武定县",
-      "532331": "禄丰县",
-      "532501": "个旧市",
-      "532502": "开远市",
-      "532503": "蒙自市",
-      "532504": "弥勒市",
-      "532523": "屏边苗族自治县",
-      "532524": "建水县",
-      "532525": "石屏县",
-      "532527": "泸西县",
-      "532528": "元阳县",
-      "532529": "红河县",
-      "532530": "金平苗族瑶族傣族自治县",
-      "532531": "绿春县",
-      "532532": "河口瑶族自治县",
-      "532601": "文山市",
-      "532622": "砚山县",
-      "532623": "西畴县",
-      "532624": "麻栗坡县",
-      "532625": "马关县",
-      "532626": "丘北县",
-      "532627": "广南县",
-      "532628": "富宁县",
-      "532801": "景洪市",
-      "532822": "勐海县",
-      "532823": "勐腊县",
-      "532901": "大理市",
-      "532922": "漾濞彝族自治县",
-      "532923": "祥云县",
-      "532924": "宾川县",
-      "532925": "弥渡县",
-      "532926": "南涧彝族自治县",
-      "532927": "巍山彝族回族自治县",
-      "532928": "永平县",
-      "532929": "云龙县",
-      "532930": "洱源县",
-      "532931": "剑川县",
-      "532932": "鹤庆县",
-      "533102": "瑞丽市",
-      "533103": "芒市",
-      "533122": "梁河县",
-      "533123": "盈江县",
-      "533124": "陇川县",
-      "533321": "泸水县",
-      "533323": "福贡县",
-      "533324": "贡山独龙族怒族自治县",
-      "533325": "兰坪白族普米族自治县",
-      "533401": "香格里拉市",
-      "533422": "德钦县",
-      "533423": "维西傈僳族自治县",
-      "540102": "城关区",
-      "540121": "林周县",
-      "540122": "当雄县",
-      "540123": "尼木县",
-      "540124": "曲水县",
-      "540125": "堆龙德庆县",
-      "540126": "达孜县",
-      "540127": "墨竹工卡县",
-      "540202": "桑珠孜区",
-      "540221": "南木林县",
-      "540222": "江孜县",
-      "540223": "定日县",
-      "540224": "萨迦县",
-      "540225": "拉孜县",
-      "540226": "昂仁县",
-      "540227": "谢通门县",
-      "540228": "白朗县",
-      "540229": "仁布县",
-      "540230": "康马县",
-      "540231": "定结县",
-      "540232": "仲巴县",
-      "540233": "亚东县",
-      "540234": "吉隆县",
-      "540235": "聂拉木县",
-      "540236": "萨嘎县",
-      "540237": "岗巴县",
-      "540302": "卡若区",
-      "540321": "江达县",
-      "540322": "贡觉县",
-      "540323": "类乌齐县",
-      "540324": "丁青县",
-      "540325": "察雅县",
-      "540326": "八宿县",
-      "540327": "左贡县",
-      "540328": "芒康县",
-      "540329": "洛隆县",
-      "540330": "边坝县",
-      "540402": "巴宜区",
-      "540421": "工布江达县",
-      "540422": "米林县",
-      "540423": "墨脱县",
-      "540424": "波密县",
-      "540425": "察隅县",
-      "540426": "朗县",
-      "542221": "乃东县",
-      "542222": "扎囊县",
-      "542223": "贡嘎县",
-      "542224": "桑日县",
-      "542225": "琼结县",
-      "542226": "曲松县",
-      "542227": "措美县",
-      "542228": "洛扎县",
-      "542229": "加查县",
-      "542231": "隆子县",
-      "542232": "错那县",
-      "542233": "浪卡子县",
-      "542421": "那曲县",
-      "542422": "嘉黎县",
-      "542423": "比如县",
-      "542424": "聂荣县",
-      "542425": "安多县",
-      "542426": "申扎县",
-      "542427": "索县",
-      "542428": "班戈县",
-      "542429": "巴青县",
-      "542430": "尼玛县",
-      "542431": "双湖县",
-      "542521": "普兰县",
-      "542522": "札达县",
-      "542523": "噶尔县",
-      "542524": "日土县",
-      "542525": "革吉县",
-      "542526": "改则县",
-      "542527": "措勤县",
-      "610102": "新城区",
-      "610103": "碑林区",
-      "610104": "莲湖区",
-      "610111": "灞桥区",
-      "610112": "未央区",
-      "610113": "雁塔区",
-      "610114": "阎良区",
-      "610115": "临潼区",
-      "610116": "长安区",
-      "610117": "高陵区",
-      "610122": "蓝田县",
-      "610124": "周至县",
-      "610125": "户县",
-      "610202": "王益区",
-      "610203": "印台区",
-      "610204": "耀州区",
-      "610222": "宜君县",
-      "610302": "渭滨区",
-      "610303": "金台区",
-      "610304": "陈仓区",
-      "610322": "凤翔县",
-      "610323": "岐山县",
-      "610324": "扶风县",
-      "610326": "眉县",
-      "610327": "陇县",
-      "610328": "千阳县",
-      "610329": "麟游县",
-      "610330": "凤县",
-      "610331": "太白县",
-      "610402": "秦都区",
-      "610403": "杨陵区",
-      "610404": "渭城区",
-      "610422": "三原县",
-      "610423": "泾阳县",
-      "610424": "乾县",
-      "610425": "礼泉县",
-      "610426": "永寿县",
-      "610427": "彬县",
-      "610428": "长武县",
-      "610429": "旬邑县",
-      "610430": "淳化县",
-      "610431": "武功县",
-      "610481": "兴平市",
-      "610502": "临渭区",
-      "610521": "华县",
-      "610522": "潼关县",
-      "610523": "大荔县",
-      "610524": "合阳县",
-      "610525": "澄城县",
-      "610526": "蒲城县",
-      "610527": "白水县",
-      "610528": "富平县",
-      "610581": "韩城市",
-      "610582": "华阴市",
-      "610602": "宝塔区",
-      "610621": "延长县",
-      "610622": "延川县",
-      "610623": "子长县",
-      "610624": "安塞县",
-      "610625": "志丹县",
-      "610626": "吴起县",
-      "610627": "甘泉县",
-      "610628": "富县",
-      "610629": "洛川县",
-      "610630": "宜川县",
-      "610631": "黄龙县",
-      "610632": "黄陵县",
-      "610702": "汉台区",
-      "610721": "南郑县",
-      "610722": "城固县",
-      "610723": "洋县",
-      "610724": "西乡县",
-      "610725": "勉县",
-      "610726": "宁强县",
-      "610727": "略阳县",
-      "610728": "镇巴县",
-      "610729": "留坝县",
-      "610730": "佛坪县",
-      "610802": "榆阳区",
-      "610821": "神木县",
-      "610822": "府谷县",
-      "610823": "横山县",
-      "610824": "靖边县",
-      "610825": "定边县",
-      "610826": "绥德县",
-      "610827": "米脂县",
-      "610828": "佳县",
-      "610829": "吴堡县",
-      "610830": "清涧县",
-      "610831": "子洲县",
-      "610902": "汉滨区",
-      "610921": "汉阴县",
-      "610922": "石泉县",
-      "610923": "宁陕县",
-      "610924": "紫阳县",
-      "610925": "岚皋县",
-      "610926": "平利县",
-      "610927": "镇坪县",
-      "610928": "旬阳县",
-      "610929": "白河县",
-      "611002": "商州区",
-      "611021": "洛南县",
-      "611022": "丹凤县",
-      "611023": "商南县",
-      "611024": "山阳县",
-      "611025": "镇安县",
-      "611026": "柞水县",
-      "620102": "城关区",
-      "620103": "七里河区",
-      "620104": "西固区",
-      "620105": "安宁区",
-      "620111": "红古区",
-      "620121": "永登县",
-      "620122": "皋兰县",
-      "620123": "榆中县",
-      "620201": "市辖区",
-      "620290": "雄关区",
-      "620291": "长城区",
-      "620292": "镜铁区",
-      "620293": "新城镇",
-      "620294": "峪泉镇",
-      "620295": "文殊镇",
-      "620302": "金川区",
-      "620321": "永昌县",
-      "620402": "白银区",
-      "620403": "平川区",
-      "620421": "靖远县",
-      "620422": "会宁县",
-      "620423": "景泰县",
-      "620502": "秦州区",
-      "620503": "麦积区",
-      "620521": "清水县",
-      "620522": "秦安县",
-      "620523": "甘谷县",
-      "620524": "武山县",
-      "620525": "张家川回族自治县",
-      "620602": "凉州区",
-      "620621": "民勤县",
-      "620622": "古浪县",
-      "620623": "天祝藏族自治县",
-      "620702": "甘州区",
-      "620721": "肃南裕固族自治县",
-      "620722": "民乐县",
-      "620723": "临泽县",
-      "620724": "高台县",
-      "620725": "山丹县",
-      "620802": "崆峒区",
-      "620821": "泾川县",
-      "620822": "灵台县",
-      "620823": "崇信县",
-      "620824": "华亭县",
-      "620825": "庄浪县",
-      "620826": "静宁县",
-      "620902": "肃州区",
-      "620921": "金塔县",
-      "620922": "瓜州县",
-      "620923": "肃北蒙古族自治县",
-      "620924": "阿克塞哈萨克族自治县",
-      "620981": "玉门市",
-      "620982": "敦煌市",
-      "621002": "西峰区",
-      "621021": "庆城县",
-      "621022": "环县",
-      "621023": "华池县",
-      "621024": "合水县",
-      "621025": "正宁县",
-      "621026": "宁县",
-      "621027": "镇原县",
-      "621102": "安定区",
-      "621121": "通渭县",
-      "621122": "陇西县",
-      "621123": "渭源县",
-      "621124": "临洮县",
-      "621125": "漳县",
-      "621126": "岷县",
-      "621202": "武都区",
-      "621221": "成县",
-      "621222": "文县",
-      "621223": "宕昌县",
-      "621224": "康县",
-      "621225": "西和县",
-      "621226": "礼县",
-      "621227": "徽县",
-      "621228": "两当县",
-      "622901": "临夏市",
-      "622921": "临夏县",
-      "622922": "康乐县",
-      "622923": "永靖县",
-      "622924": "广河县",
-      "622925": "和政县",
-      "622926": "东乡族自治县",
-      "622927": "积石山保安族东乡族撒拉族自治县",
-      "623001": "合作市",
-      "623021": "临潭县",
-      "623022": "卓尼县",
-      "623023": "舟曲县",
-      "623024": "迭部县",
-      "623025": "玛曲县",
-      "623026": "碌曲县",
-      "623027": "夏河县",
-      "630102": "城东区",
-      "630103": "城中区",
-      "630104": "城西区",
-      "630105": "城北区",
-      "630121": "大通回族土族自治县",
-      "630122": "湟中县",
-      "630123": "湟源县",
-      "630202": "乐都区",
-      "630203": "平安区",
-      "630222": "民和回族土族自治县",
-      "630223": "互助土族自治县",
-      "630224": "化隆回族自治县",
-      "630225": "循化撒拉族自治县",
-      "632221": "门源回族自治县",
-      "632222": "祁连县",
-      "632223": "海晏县",
-      "632224": "刚察县",
-      "632321": "同仁县",
-      "632322": "尖扎县",
-      "632323": "泽库县",
-      "632324": "河南蒙古族自治县",
-      "632521": "共和县",
-      "632522": "同德县",
-      "632523": "贵德县",
-      "632524": "兴海县",
-      "632525": "贵南县",
-      "632621": "玛沁县",
-      "632622": "班玛县",
-      "632623": "甘德县",
-      "632624": "达日县",
-      "632625": "久治县",
-      "632626": "玛多县",
-      "632701": "玉树市",
-      "632722": "杂多县",
-      "632723": "称多县",
-      "632724": "治多县",
-      "632725": "囊谦县",
-      "632726": "曲麻莱县",
-      "632801": "格尔木市",
-      "632802": "德令哈市",
-      "632821": "乌兰县",
-      "632822": "都兰县",
-      "632823": "天峻县",
-      "640104": "兴庆区",
-      "640105": "西夏区",
-      "640106": "金凤区",
-      "640121": "永宁县",
-      "640122": "贺兰县",
-      "640181": "灵武市",
-      "640202": "大武口区",
-      "640205": "惠农区",
-      "640221": "平罗县",
-      "640302": "利通区",
-      "640303": "红寺堡区",
-      "640323": "盐池县",
-      "640324": "同心县",
-      "640381": "青铜峡市",
-      "640402": "原州区",
-      "640422": "西吉县",
-      "640423": "隆德县",
-      "640424": "泾源县",
-      "640425": "彭阳县",
-      "640502": "沙坡头区",
-      "640521": "中宁县",
-      "640522": "海原县",
-      "650102": "天山区",
-      "650103": "沙依巴克区",
-      "650104": "新市区",
-      "650105": "水磨沟区",
-      "650106": "头屯河区",
-      "650107": "达坂城区",
-      "650109": "米东区",
-      "650121": "乌鲁木齐县",
-      "650202": "独山子区",
-      "650203": "克拉玛依区",
-      "650204": "白碱滩区",
-      "650205": "乌尔禾区",
-      "650402": "高昌区",
-      "650421": "鄯善县",
-      "650422": "托克逊县",
-      "652201": "哈密市",
-      "652222": "巴里坤哈萨克自治县",
-      "652223": "伊吾县",
-      "652301": "昌吉市",
-      "652302": "阜康市",
-      "652323": "呼图壁县",
-      "652324": "玛纳斯县",
-      "652325": "奇台县",
-      "652327": "吉木萨尔县",
-      "652328": "木垒哈萨克自治县",
-      "652701": "博乐市",
-      "652702": "阿拉山口市",
-      "652722": "精河县",
-      "652723": "温泉县",
-      "652801": "库尔勒市",
-      "652822": "轮台县",
-      "652823": "尉犁县",
-      "652824": "若羌县",
-      "652825": "且末县",
-      "652826": "焉耆回族自治县",
-      "652827": "和静县",
-      "652828": "和硕县",
-      "652829": "博湖县",
-      "652901": "阿克苏市",
-      "652922": "温宿县",
-      "652923": "库车县",
-      "652924": "沙雅县",
-      "652925": "新和县",
-      "652926": "拜城县",
-      "652927": "乌什县",
-      "652928": "阿瓦提县",
-      "652929": "柯坪县",
-      "653001": "阿图什市",
-      "653022": "阿克陶县",
-      "653023": "阿合奇县",
-      "653024": "乌恰县",
-      "653101": "喀什市",
-      "653121": "疏附县",
-      "653122": "疏勒县",
-      "653123": "英吉沙县",
-      "653124": "泽普县",
-      "653125": "莎车县",
-      "653126": "叶城县",
-      "653127": "麦盖提县",
-      "653128": "岳普湖县",
-      "653129": "伽师县",
-      "653130": "巴楚县",
-      "653131": "塔什库尔干塔吉克自治县",
-      "653201": "和田市",
-      "653221": "和田县",
-      "653222": "墨玉县",
-      "653223": "皮山县",
-      "653224": "洛浦县",
-      "653225": "策勒县",
-      "653226": "于田县",
-      "653227": "民丰县",
-      "654002": "伊宁市",
-      "654003": "奎屯市",
-      "654004": "霍尔果斯市",
-      "654021": "伊宁县",
-      "654022": "察布查尔锡伯自治县",
-      "654023": "霍城县",
-      "654024": "巩留县",
-      "654025": "新源县",
-      "654026": "昭苏县",
-      "654027": "特克斯县",
-      "654028": "尼勒克县",
-      "654201": "塔城市",
-      "654202": "乌苏市",
-      "654221": "额敏县",
-      "654223": "沙湾县",
-      "654224": "托里县",
-      "654225": "裕民县",
-      "654226": "和布克赛尔蒙古自治县",
-      "654301": "阿勒泰市",
-      "654321": "布尔津县",
-      "654322": "富蕴县",
-      "654323": "福海县",
-      "654324": "哈巴河县",
-      "654325": "青河县",
-      "654326": "吉木乃县",
-      "654390": "北屯市",
-      "659001": "石河子市",
-      "659002": "阿拉尔市",
-      "659003": "图木舒克市",
-      "659004": "五家渠市",
-      "710101": "中正区",
-      "710102": "大同区",
-      "710103": "中山区",
-      "710104": "松山区",
-      "710105": "大安区",
-      "710106": "万华区",
-      "710107": "信义区",
-      "710108": "士林区",
-      "710109": "北投区",
-      "710110": "内湖区",
-      "710111": "南港区",
-      "710112": "文山区",
-      "710199": "其它区",
-      "710201": "新兴区",
-      "710202": "前金区",
-      "710203": "芩雅区",
-      "710204": "盐埕区",
-      "710205": "鼓山区",
-      "710206": "旗津区",
-      "710207": "前镇区",
-      "710208": "三民区",
-      "710209": "左营区",
-      "710210": "楠梓区",
-      "710211": "小港区",
-      "710241": "苓雅区",
-      "710242": "仁武区",
-      "710243": "大社区",
-      "710244": "冈山区",
-      "710245": "路竹区",
-      "710246": "阿莲区",
-      "710247": "田寮区",
-      "710248": "燕巢区",
-      "710249": "桥头区",
-      "710250": "梓官区",
-      "710251": "弥陀区",
-      "710252": "永安区",
-      "710253": "湖内区",
-      "710254": "凤山区",
-      "710255": "大寮区",
-      "710256": "林园区",
-      "710257": "鸟松区",
-      "710258": "大树区",
-      "710259": "旗山区",
-      "710260": "美浓区",
-      "710261": "六龟区",
-      "710262": "内门区",
-      "710263": "杉林区",
-      "710264": "甲仙区",
-      "710265": "桃源区",
-      "710266": "那玛夏区",
-      "710267": "茂林区",
-      "710268": "茄萣区",
-      "710299": "其它区",
-      "710301": "中西区",
-      "710302": "东区",
-      "710303": "南区",
-      "710304": "北区",
-      "710305": "安平区",
-      "710306": "安南区",
-      "710339": "永康区",
-      "710340": "归仁区",
-      "710341": "新化区",
-      "710342": "左镇区",
-      "710343": "玉井区",
-      "710344": "楠西区",
-      "710345": "南化区",
-      "710346": "仁德区",
-      "710347": "关庙区",
-      "710348": "龙崎区",
-      "710349": "官田区",
-      "710350": "麻豆区",
-      "710351": "佳里区",
-      "710352": "西港区",
-      "710353": "七股区",
-      "710354": "将军区",
-      "710355": "学甲区",
-      "710356": "北门区",
-      "710357": "新营区",
-      "710358": "后壁区",
-      "710359": "白河区",
-      "710360": "东山区",
-      "710361": "六甲区",
-      "710362": "下营区",
-      "710363": "柳营区",
-      "710364": "盐水区",
-      "710365": "善化区",
-      "710366": "大内区",
-      "710367": "山上区",
-      "710368": "新市区",
-      "710369": "安定区",
-      "710399": "其它区",
-      "710401": "中区",
-      "710402": "东区",
-      "710403": "南区",
-      "710404": "西区",
-      "710405": "北区",
-      "710406": "北屯区",
-      "710407": "西屯区",
-      "710408": "南屯区",
-      "710431": "太平区",
-      "710432": "大里区",
-      "710433": "雾峰区",
-      "710434": "乌日区",
-      "710435": "丰原区",
-      "710436": "后里区",
-      "710437": "石冈区",
-      "710438": "东势区",
-      "710439": "和平区",
-      "710440": "新社区",
-      "710441": "潭子区",
-      "710442": "大雅区",
-      "710443": "神冈区",
-      "710444": "大肚区",
-      "710445": "沙鹿区",
-      "710446": "龙井区",
-      "710447": "梧栖区",
-      "710448": "清水区",
-      "710449": "大甲区",
-      "710450": "外埔区",
-      "710451": "大安区",
-      "710499": "其它区",
-      "710507": "金沙镇",
-      "710508": "金湖镇",
-      "710509": "金宁乡",
-      "710510": "金城镇",
-      "710511": "烈屿乡",
-      "710512": "乌坵乡",
-      "710614": "南投市",
-      "710615": "中寮乡",
-      "710616": "草屯镇",
-      "710617": "国姓乡",
-      "710618": "埔里镇",
-      "710619": "仁爱乡",
-      "710620": "名间乡",
-      "710621": "集集镇",
-      "710622": "水里乡",
-      "710623": "鱼池乡",
-      "710624": "信义乡",
-      "710625": "竹山镇",
-      "710626": "鹿谷乡",
-      "710701": "仁爱区",
-      "710702": "信义区",
-      "710703": "中正区",
-      "710704": "中山区",
-      "710705": "安乐区",
-      "710706": "暖暖区",
-      "710707": "七堵区",
-      "710799": "其它区",
-      "710801": "东区",
-      "710802": "北区",
-      "710803": "香山区",
-      "710899": "其它区",
-      "710901": "东区",
-      "710902": "西区",
-      "710999": "其它区",
-      "711130": "万里区",
-      "711132": "板桥区",
-      "711133": "汐止区",
-      "711134": "深坑区",
-      "711136": "瑞芳区",
-      "711137": "平溪区",
-      "711138": "双溪区",
-      "711140": "新店区",
-      "711141": "坪林区",
-      "711142": "乌来区",
-      "711143": "永和区",
-      "711144": "中和区",
-      "711145": "土城区",
-      "711146": "三峡区",
-      "711147": "树林区",
-      "711149": "三重区",
-      "711150": "新庄区",
-      "711151": "泰山区",
-      "711152": "林口区",
-      "711154": "五股区",
-      "711155": "八里区",
-      "711156": "淡水区",
-      "711157": "三芝区",
-      "810101": "中西区",
-      "810102": "湾仔",
-      "810103": "东区",
-      "810104": "南区",
-      "810201": "九龙城区",
-      "810202": "油尖旺区",
-      "810203": "深水埗区",
-      "810204": "黄大仙区",
-      "810205": "观塘区",
-      "810301": "北区",
-      "810302": "大埔区",
-      "810303": "沙田区",
-      "810304": "西贡区",
-      "810305": "元朗区",
-      "810306": "屯门区",
-      "810307": "荃湾区",
-      "810308": "葵青区",
-      "810309": "离岛区",
-      "820101": "澳门半岛",
-      "820201": "离岛"
-  }
-}
\ No newline at end of file
diff --git a/docs/demos/mock/areaEn.js b/docs/demos/mock/areaEn.js
new file mode 100644
index 000000000..8150cac2e
--- /dev/null
+++ b/docs/demos/mock/areaEn.js
@@ -0,0 +1,71 @@
+export default {
+  'province_list': {
+    '110000': 'Beijing',
+    '330000': 'Zhejiang',
+    '810000': 'Hong Kong'
+  },
+  'city_list': {
+    '110100': 'Beijing City',
+    '330100': 'Hangzhou',
+    '330200': 'Ningbo',
+    '330300': 'Wenzhou',
+    '330400': 'Jiaxin',
+    '331100': 'Lishui',
+    '810100': 'Hong Kong Island',
+    '810200': 'Kowloon',
+    '810300': 'New Territories'
+  },
+  'county_list': {
+    '110101': 'Dongcheng',
+    '110102': 'Xicheng',
+    '110105': 'Chaoyang',
+    '110106': 'Fengtai',
+    '110108': 'Haidian',
+    '110111': 'Fangshan',
+    '110112': 'Tongzhou',
+    '110113': 'Shunyi',
+    '110114': 'Changping',
+    '110115': 'Daxing',
+    '330105': 'Gongshu',
+    '330106': 'Xihu',
+    '330108': 'Binjiang',
+    '330109': 'Xiaoshan',
+    '330110': 'Yuhang',
+    '330111': 'Fuyang',
+    '330127': 'Chunan',
+    '330182': 'Jiande',
+    '330185': 'Linan',
+    '330206': 'Beilun',
+    '330211': 'Zhenhai',
+    '330225': 'Xiangshan',
+    '330226': 'Ninghai',
+    '330281': 'Yuyao',
+    '330282': 'Cixi',
+    '330327': 'Cangnan',
+    '330328': 'Wencheng',
+    '330329': 'Shuntai',
+    '330381': 'Ruian',
+    '330382': 'Yueqing',
+    '330402': 'Nanhu',
+    '330421': 'Jiashan',
+    '330424': 'Haiyan',
+    '330481': 'Haining',
+    '330482': 'Pinghu',
+    '330483': 'Tongxiang',
+    '331102': 'Liandu District',
+    '331121': 'Qingtian County',
+    '331125': 'Yunhe County',
+    '331181': 'Longquan County',
+    '810101': 'Central',
+    '810102': 'Wan Chai',
+    '810202': 'Mong Kok',
+    '810203': 'Sham Shui Po',
+    '810204': 'Chuk Un',
+    '810205': 'Kwun Tong',
+    '810303': 'Sha Tin',
+    '810305': 'Yuen Long',
+    '810306': 'Tuen Mun',
+    '810307': 'Tsuen Wan',
+    '810309': 'Lantau Island'
+  }
+}
\ No newline at end of file
diff --git a/docs/demos/mock/areaEn.json b/docs/demos/mock/areaEn.json
deleted file mode 100644
index e73db6f4a..000000000
--- a/docs/demos/mock/areaEn.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "province_list": {
-      "110000": "Beijing",
-      "330000": "Zhejiang",
-      "810000": "Hong Kong"
-  },
-  "city_list": {
-      "110100": "Beijing City",
-      "330100": "Hangzhou",
-      "330200": "Ningbo",
-      "330300": "Wenzhou",
-      "330400": "Jiaxin",
-      "331100": "Lishui",
-      "810100": "Hong Kong Island",
-      "810200": "Kowloon",
-      "810300": "New Territories"
-  },
-  "county_list": {
-      "110101": "Dongcheng",
-      "110102": "Xicheng",
-      "110105": "Chaoyang",
-      "110106": "Fengtai",
-      "110108": "Haidian",
-      "110111": "Fangshan",
-      "110112": "Tongzhou",
-      "110113": "Shunyi",
-      "110114": "Changping",
-      "110115": "Daxing",
-      "330105": "Gongshu",
-      "330106": "Xihu",
-      "330108": "Binjiang",
-      "330109": "Xiaoshan",
-      "330110": "Yuhang",
-      "330111": "Fuyang",
-      "330127": "Chunan",
-      "330182": "Jiande",
-      "330185": "Linan",
-      "330206": "Beilun",
-      "330211": "Zhenhai",
-      "330225": "Xiangshan",
-      "330226": "Ninghai",
-      "330281": "Yuyao",
-      "330282": "Cixi",
-      "330327": "Cangnan",
-      "330328": "Wencheng",
-      "330329": "Shuntai",
-      "330381": "Ruian",
-      "330382": "Yueqing",
-      "330402": "Nanhu",
-      "330421": "Jiashan",
-      "330424": "Haiyan",
-      "330481": "Haining",
-      "330482": "Pinghu",
-      "330483": "Tongxiang",
-      "331102": "Liandu District",
-      "331121": "Qingtian County",
-      "331125": "Yunhe County",
-      "331181": "Longquan County",
-      "810101": "Central",
-      "810102": "Wan Chai",
-      "810202": "Mong Kok",
-      "810203": "Sham Shui Po",
-      "810204": "Chuk Un",
-      "810205": "Kwun Tong",
-      "810303": "Sha Tin",
-      "810305": "Yuen Long",
-      "810306": "Tuen Mun",
-      "810307": "Tsuen Wan",
-      "810309": "Lantau Island"
-  }
-}
\ No newline at end of file
diff --git a/docs/demos/views/address-edit.vue b/docs/demos/views/address-edit.vue
index 0a7ad7ba4..ea33cf138 100644
--- a/docs/demos/views/address-edit.vue
+++ b/docs/demos/views/address-edit.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import areaList from '../mock/area.json';
+import areaList from '../mock/area';
 
 export default {
   i18n: {
diff --git a/docs/demos/views/area.vue b/docs/demos/views/area.vue
index 8592b57da..e0c377b57 100644
--- a/docs/demos/views/area.vue
+++ b/docs/demos/views/area.vue
@@ -15,8 +15,8 @@
 </template>
 
 <script>
-import AreaList from '../mock/area.json';
-import AreaListEn from '../mock/areaEn.json';
+import AreaList from '../mock/area';
+import AreaListEn from '../mock/areaEn';
 
 export default {
   i18n: {
diff --git a/docs/markdown/en-US/area.md b/docs/markdown/en-US/area.md
index b5bc71659..d0f5a635d 100644
--- a/docs/markdown/en-US/area.md
+++ b/docs/markdown/en-US/area.md
@@ -86,7 +86,7 @@ Example of `AreaList`
 }
 ```
 
-All code of China: [Area.json](https://github.com/youzan/vant/blob/dev/docs/demos/mock/area.json)
+All code of China: [Area.json](https://github.com/youzan/vant/blob/dev/docs/demos/mock/area.js)
 
 #### argument of callback function confirm
 An array contains selected area objects.
diff --git a/docs/markdown/zh-CN/area.md b/docs/markdown/zh-CN/area.md
index 5ceeaa222..ae2043ef0 100644
--- a/docs/markdown/zh-CN/area.md
+++ b/docs/markdown/zh-CN/area.md
@@ -90,7 +90,7 @@ Vue.use(Area);
 }
 ```
 
-完整数据见 [Area.json](https://github.com/youzan/vant/blob/dev/docs/demos/mock/area.json)
+完整数据见 [Area.json](https://github.com/youzan/vant/blob/dev/docs/demos/mock/area.js)
 
 #### 点击完成时返回的数据格式
 
diff --git a/package.json b/package.json
index cd5b447e1..2c8a2637d 100644
--- a/package.json
+++ b/package.json
@@ -18,11 +18,11 @@
     "build:components": "node build/bin/build-components.js --color",
     "build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color",
     "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",
-    "build:style-entry": "cross-env VUE_ENV=server node build/bin/build-style-entry.js",
+    "build:style-entry": "node build/bin/build-style-entry.js",
     "build:changelog": "sh build/bin/build-changelog.sh",
     "deploy": "npm run deploy:docs && npm run deploy:cdn && gh-pages -d docs/dist --remote youzan && rimraf docs/dist",
     "deploy:cdn": "superman cdn /zanui/vant docs/dist/*.js docs/dist/*.css && superman cdn /zanui/vant/async_en-US docs/dist/async_en-US/*.js && superman cdn /zanui/vant/async_zh-CN docs/dist/async_zh-CN/*.js",
-    "deploy:docs": "rimraf docs/dist && cross-env NODE_ENV=production webpack --progress --hide-modules --config  build/webpack.config.prod.js",
+    "deploy:docs": "rimraf docs/dist && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.config.prod.js",
     "dist": "npm run bootstrap && node build/bin/build-lib.js",
     "lint": "./node_modules/.bin/eslint ./packages --ext .js,.vue",
     "test": "karma start test/karma.conf.js --single-run",
@@ -59,29 +59,27 @@
     "babel-plugin-transform-runtime": "^6.15.0",
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.1",
-    "cache-loader": "^1.2.2",
     "chai": "^4.1.2",
     "codecov": "^3.0.0",
-    "cross-env": "^5.1.3",
+    "cross-env": "^5.1.4",
     "css-loader": "^0.28.10",
     "dependency-tree": "^6.0.1",
     "eslint": "^4.18.2",
     "eslint-plugin-vue": "^4.3.0",
-    "extract-text-webpack-plugin": "3.0.2",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "fast-vue-md-loader": "^1.0.3",
-    "friendly-errors-webpack-plugin": "^1.6.1",
     "gh-pages": "^1.0.0",
-    "html-webpack-plugin": "^3.0.6",
+    "html-webpack-plugin": "3.0.6",
     "isparta-loader": "^2.0.0",
-    "karma": "^1.7.1",
+    "karma": "^2.0.0",
     "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.3.2",
     "karma-spec-reporter": "^0.0.32",
-    "karma-webpack": "^2.0.9",
-    "mocha": "^4.0.1",
+    "karma-webpack": "^2.0.13",
+    "mocha": "^5.0.4",
     "postcss": "^6.0.19",
     "postcss-calc": "^6.0.0",
     "postcss-easy-import": "^3.0.0",
@@ -96,15 +94,16 @@
     "uppercamelcase": "^3.0.0",
     "url-loader": "^1.0.1",
     "vant-doc": "1.0.4",
-    "vue": "^2.5.15",
+    "vue": "^2.5.16",
     "vue-loader": "^14.2.1",
     "vue-router": "^3.0.1",
     "vue-sfc-compiler": "^0.0.8",
     "vue-style-loader": "^4.0.2",
-    "vue-template-compiler": "^2.5.15",
+    "vue-template-compiler": "^2.5.16",
     "vue-template-es2015-compiler": "^1.6.0",
-    "webpack": "^3.11.0",
-    "webpack-dev-server": "2.11.1",
+    "webpack": "^4.1.1",
+    "webpack-cli": "^2.0.12",
+    "webpack-dev-server": "3.1.1",
     "webpack-merge": "^4.1.2"
   }
 }
diff --git a/test/get-webpack-conf.js b/test/get-webpack-conf.js
index 590b2e99f..9f047037c 100644
--- a/test/get-webpack-conf.js
+++ b/test/get-webpack-conf.js
@@ -4,6 +4,7 @@ const ProgressBarPlugin = require('progress-bar-webpack-plugin');
 
 function getWebpackConfig(testFileName) {
   return {
+    mode: 'development',
     output: {
       path: path.resolve(process.cwd(), 'dist'),
       publicPath: '/dist/',
@@ -18,7 +19,7 @@ function getWebpackConfig(testFileName) {
         options: {
           babel: {
             presets: ['env'],
-            plugins: ['transform-runtime']
+            plugins: ['transform-runtime', 'transform-object-rest-spread']
           },
           vue: {
             autoprefixer: false,
@@ -35,7 +36,7 @@ function getWebpackConfig(testFileName) {
     stats: 'errors-only',
     resolve: {
       modules: [path.resolve(process.cwd(), 'node_modules'), 'node_modules'],
-      extensions: ['.js', '.json', '.vue', '.css'],
+      extensions: ['.js', '.vue', '.css'],
       alias: {
         src: path.resolve(process.cwd(), 'src'),
         packages: path.resolve(process.cwd(), 'packages'),
@@ -48,12 +49,12 @@ function getWebpackConfig(testFileName) {
           enforce: 'pre',
           test: /\.js$/,
           exclude: /node_modules|vue-router\/|vue-loader\/|docs|test|src\/index|src\/utils|src\/mixins|packages\/swipe/,
-          use: ['isparta-loader']
+          use: 'isparta-loader'
         },
         {
           test: /\.js$/,
           exclude: /node_modules|vue-router\/|vue-loader\//,
-          use: ['babel-loader']
+          use: 'babel-loader'
         },
         {
           test: /\.(css|pcss)$/,
@@ -111,8 +112,7 @@ function getWebpackConfig(testFileName) {
           ]
         }
       ]
-    },
-    devtool: '#inline-source-map'
+    }
   };
 }
 
diff --git a/test/specs/address-edit.spec.js b/test/specs/address-edit.spec.js
index fff7fdd1f..d52098aa3 100644
--- a/test/specs/address-edit.spec.js
+++ b/test/specs/address-edit.spec.js
@@ -1,7 +1,7 @@
 import { mount } from 'avoriaz';
 import AddressEdit from 'packages/address-edit';
 import AddressDetail from 'packages/address-edit/Detail';
-import areaList from '../../docs/demos/mock/area.json';
+import areaList from '../../docs/demos/mock/area';
 
 describe('AddressEdit', () => {
   let wrapper;
diff --git a/test/specs/area.spec.js b/test/specs/area.spec.js
index f2e6d569e..7f309d6ac 100644
--- a/test/specs/area.spec.js
+++ b/test/specs/area.spec.js
@@ -1,6 +1,6 @@
 import Area from 'packages/area';
 import { mount } from 'avoriaz';
-import areaList from '../../docs/demos/mock/area.json';
+import areaList from '../../docs/demos/mock/area';
 
 describe('Area', () => {
   let wrapper;
diff --git a/test/specs/utils.spec.js b/test/specs/utils.spec.js
index 120df21fa..a029e2fa0 100644
--- a/test/specs/utils.spec.js
+++ b/test/specs/utils.spec.js
@@ -49,7 +49,7 @@ describe('Utils', () => {
     raf(spy);
 
     setTimeout(() => {
-      expect(spy.calledOnce).to.be.true;
+      expect(spy.called).to.be.true;
       cancel(1);
       done();
     }, 50);
diff --git a/types/index.d.ts b/types/index.d.ts
index c84daa30a..4e2e10f22 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -22,6 +22,8 @@ export class CellSwipe extends VanComponent {}
 export class Checkbox extends VanComponent {}
 export class CheckboxGroup extends VanComponent {}
 export class Col extends VanComponent {}
+export class Collapse extends VanComponent {}
+export class CollapseItem extends VanComponent {}
 export class ContactCard extends VanComponent {}
 export class ContactEdit extends VanComponent {}
 export class ContactList extends VanComponent {}
@@ -33,6 +35,7 @@ export class GoodsAction extends VanComponent {}
 export class GoodsActionBigBtn extends VanComponent {}
 export class GoodsActionMiniBtn extends VanComponent {}
 export class Icon extends VanComponent {}
+export class List extends VanComponent {}
 export class Loading extends VanComponent {}
 export class NavBar extends VanComponent {}
 export class NoticeBar extends VanComponent {}
diff --git a/yarn.lock b/yarn.lock
index f9747a923..bbcf16ddf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,17 @@
 # yarn lockfile v1
 
 
+"@sindresorhus/is@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
+
+JSONStream@^1.0.3:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -10,13 +21,6 @@ abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
 
-accepts@1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
-  dependencies:
-    mime-types "~2.1.11"
-    negotiator "0.6.1"
-
 accepts@~1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
@@ -24,11 +28,11 @@ accepts@~1.3.4:
     mime-types "~2.1.16"
     negotiator "0.6.1"
 
-acorn-dynamic-import@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+acorn-dynamic-import@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
   dependencies:
-    acorn "^4.0.3"
+    acorn "^5.0.0"
 
 acorn-jsx@^3.0.0:
   version "3.0.1"
@@ -36,6 +40,13 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
+acorn-node@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.3.0.tgz#5f86d73346743810ef1269b901dbcbded020861b"
+  dependencies:
+    acorn "^5.4.1"
+    xtend "^4.0.1"
+
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
@@ -48,10 +59,25 @@ acorn@^5.0.0, acorn@^5.4.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
 
+acorn@^5.2.1, acorn@^5.4.1:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
+
+addressparser@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
+
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
 
+agent-base@2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-2.1.1.tgz#d6de10d5af6132d5bd692427d46fc538539094c7"
+  dependencies:
+    extend "~3.0.0"
+    semver "~5.0.1"
+
 ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
@@ -100,6 +126,20 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
+amqplib@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.5.2.tgz#d2d7313c7ffaa4d10bcf1e6252de4591b6cc7b63"
+  dependencies:
+    bitsyntax "~0.0.4"
+    bluebird "^3.4.6"
+    buffer-more-ints "0.0.2"
+    readable-stream "1.x >=1.1.9"
+    safe-buffer "^5.0.1"
+
+ansi-escapes@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+
 ansi-escapes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
@@ -126,10 +166,20 @@ ansi-styles@^3.2.0:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
 ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
 
+any-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242"
+
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -148,7 +198,7 @@ app-module-path@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-1.1.0.tgz#a6ac5368450f209b9f5b86e9a3e4a6ab6fe7531c"
 
-aproba@^1.0.3:
+aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
@@ -187,6 +237,14 @@ arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
 
+array-differ@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+
+array-filter@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
+
 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"
@@ -206,6 +264,14 @@ array-includes@^3.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.7.0"
 
+array-map@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
+
+array-reduce@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
+
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
@@ -228,9 +294,9 @@ array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
 
-arraybuffer.slice@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
+arraybuffer.slice@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
 
 arrify@^1.0.0:
   version "1.0.1"
@@ -256,7 +322,7 @@ assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-assert@^1.1.1:
+assert@^1.1.1, assert@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
   dependencies:
@@ -274,23 +340,43 @@ ast-module-types@^2.3.1, ast-module-types@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/ast-module-types/-/ast-module-types-2.3.2.tgz#4bb1de2d729678824429e22a628d03e87df4ad11"
 
+ast-types@0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.10.1.tgz#f52fca9715579a14f841d67d7f8d25432ab6a3dd"
+
+ast-types@0.11.3, ast-types@0.x.x:
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.3.tgz#c20757fe72ee71278ea0ff3d87e5c2ca30d9edf8"
+
+astw@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz#7bd41784d32493987aeb239b6b4e1c57a873b917"
+  dependencies:
+    acorn "^4.0.3"
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@1.x, async@^1.4.0, async@^1.5.2:
+async-limiter@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+
+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"
 
-async@2.6.0, async@^2.1.2, async@^2.4.1:
+async@2.6.0, async@^2.0.0, async@^2.4.1, async@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
     lodash "^4.14.0"
 
-async@~0.9.0:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+async@~2.1.2:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc"
+  dependencies:
+    lodash "^4.14.0"
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -340,6 +426,12 @@ aws4@^1.2.1, aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
+axios@^0.15.3:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.15.3.tgz#2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"
+  dependencies:
+    follow-redirects "1.0.0"
+
 babel-cli@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
@@ -406,6 +498,14 @@ babel-generator@^6.26.0:
     source-map "^0.5.7"
     trim-right "^1.0.1"
 
+babel-helper-bindify-decorators@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.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"
@@ -440,6 +540,15 @@ babel-helper-explode-assignable-expression@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
+babel-helper-explode-class@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb"
+  dependencies:
+    babel-helper-bindify-decorators "^6.24.1"
+    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"
@@ -531,10 +640,38 @@ 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-async-generators@^6.5.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
+
+babel-plugin-syntax-class-constructor-call@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz#9cb9d39fe43c8600bec8146456ddcbd4e1a76416"
+
+babel-plugin-syntax-class-properties@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
+
+babel-plugin-syntax-decorators@^6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
+
+babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+
 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-export-extensions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz#70a1484f0f9089a4e84ad44bac353c95b9b12721"
+
+babel-plugin-syntax-flow@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
+
 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"
@@ -543,7 +680,15 @@ 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:
+babel-plugin-transform-async-generator-functions@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-generators "^6.5.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-to-generator@^6.24.1:
   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:
@@ -551,6 +696,33 @@ babel-plugin-transform-async-to-generator@^6.22.0:
     babel-plugin-syntax-async-functions "^6.8.0"
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-class-constructor-call@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz#80dc285505ac067dcb8d6c65e2f6f11ab7765ef9"
+  dependencies:
+    babel-plugin-syntax-class-constructor-call "^6.18.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-class-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-decorators@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
+  dependencies:
+    babel-helper-explode-class "^6.24.1"
+    babel-plugin-syntax-decorators "^6.13.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-types "^6.24.1"
+
 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"
@@ -563,7 +735,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.23.0:
+babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
   dependencies:
@@ -573,7 +745,7 @@ babel-plugin-transform-es2015-block-scoping@^6.23.0:
     babel-types "^6.26.0"
     lodash "^4.17.4"
 
-babel-plugin-transform-es2015-classes@^6.23.0:
+babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-classes@^6.24.1:
   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:
@@ -587,33 +759,33 @@ babel-plugin-transform-es2015-classes@^6.23.0:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-computed-properties@^6.22.0:
+babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transform-es2015-computed-properties@^6.24.1:
   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.23.0:
+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.22.0:
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0, babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
   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.23.0:
+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.22.0:
+babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es2015-function-name@^6.24.1:
   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:
@@ -644,7 +816,7 @@ babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-e
     babel-template "^6.26.0"
     babel-types "^6.26.0"
 
-babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0, babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
   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:
@@ -652,7 +824,7 @@ babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-umd@^6.23.0:
+babel-plugin-transform-es2015-modules-umd@^6.23.0, babel-plugin-transform-es2015-modules-umd@^6.24.1:
   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:
@@ -660,14 +832,14 @@ babel-plugin-transform-es2015-modules-umd@^6.23.0:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-object-super@^6.22.0:
+babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es2015-object-super@^6.24.1:
   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.23.0:
+babel-plugin-transform-es2015-parameters@^6.23.0, babel-plugin-transform-es2015-parameters@^6.24.1:
   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:
@@ -678,7 +850,7 @@ babel-plugin-transform-es2015-parameters@^6.23.0:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
   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:
@@ -691,7 +863,7 @@ babel-plugin-transform-es2015-spread@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-sticky-regex@^6.22.0:
+babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es2015-sticky-regex@^6.24.1:
   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:
@@ -705,13 +877,13 @@ babel-plugin-transform-es2015-template-literals@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-typeof-symbol@^6.23.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.22.0:
+babel-plugin-transform-es2015-unicode-regex@^6.22.0, babel-plugin-transform-es2015-unicode-regex@^6.24.1:
   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:
@@ -719,7 +891,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.22.0:
     babel-runtime "^6.22.0"
     regexpu-core "^2.0.0"
 
-babel-plugin-transform-exponentiation-operator@^6.22.0:
+babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.24.1:
   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:
@@ -727,14 +899,28 @@ 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.26.0:
+babel-plugin-transform-export-extensions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz#53738b47e75e8218589eea946cbbd39109bbe653"
+  dependencies:
+    babel-plugin-syntax-export-extensions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-flow-strip-types@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
+  dependencies:
+    babel-plugin-syntax-flow "^6.18.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-object-rest-spread@^6.22.0, 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.26.0"
 
-babel-plugin-transform-regenerator@^6.22.0:
+babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
   dependencies:
@@ -796,7 +982,63 @@ babel-preset-env@^1.6.1:
     invariant "^2.2.2"
     semver "^5.3.0"
 
-babel-register@^6.26.0:
+babel-preset-es2015@^6.9.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
+  dependencies:
+    babel-plugin-check-es2015-constants "^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-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-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.24.1"
+    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-preset-stage-1@^6.5.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz#7692cd7dcd6849907e6ae4a0a85589cfb9e2bfb0"
+  dependencies:
+    babel-plugin-transform-class-constructor-call "^6.24.1"
+    babel-plugin-transform-export-extensions "^6.22.0"
+    babel-preset-stage-2 "^6.24.1"
+
+babel-preset-stage-2@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1"
+  dependencies:
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babel-plugin-transform-class-properties "^6.24.1"
+    babel-plugin-transform-decorators "^6.24.1"
+    babel-preset-stage-3 "^6.24.1"
+
+babel-preset-stage-3@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395"
+  dependencies:
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-generator-functions "^6.24.1"
+    babel-plugin-transform-async-to-generator "^6.24.1"
+    babel-plugin-transform-exponentiation-operator "^6.24.1"
+    babel-plugin-transform-object-rest-spread "^6.22.0"
+
+babel-register@^6.26.0, babel-register@^6.9.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
   dependencies:
@@ -848,10 +1090,14 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@^6.17.0, babylon@^6.18.0:
+babylon@^6.17.0, babylon@^6.17.3, babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
 
+babylon@^7.0.0-beta.30:
+  version "7.0.0-beta.40"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.40.tgz#91fc8cd56d5eb98b28e6fde41045f2957779940a"
+
 babylon@~6.8.1:
   version "6.8.4"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.8.4.tgz#097306b8dabae95159225cf29b3ea55912053180"
@@ -926,6 +1172,22 @@ binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
+binaryextensions@2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.1.1.tgz#3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935"
+
+bitsyntax@~0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/bitsyntax/-/bitsyntax-0.0.4.tgz#eb10cc6f82b8c490e3e85698f07e83d46e0cba82"
+  dependencies:
+    buffer-more-ints "0.0.2"
+
+bl@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
+  dependencies:
+    readable-stream "~2.0.5"
+
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
@@ -936,7 +1198,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.1.1, bluebird@^3.3.0:
+bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1029,13 +1291,47 @@ braces@^2.3.0:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    kind-of "^6.0.2"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
-browser-stdout@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
+browser-pack@^6.0.1:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.0.4.tgz#9a73beb3b48f9e36868be007b64400102c04a99f"
+  dependencies:
+    JSONStream "^1.0.3"
+    combine-source-map "~0.8.0"
+    defined "^1.0.0"
+    safe-buffer "^5.1.1"
+    through2 "^2.0.0"
+    umd "^3.0.0"
+
+browser-resolve@^1.11.0, browser-resolve@^1.7.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.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.1.1"
@@ -1083,12 +1379,64 @@ browserify-sign@^4.0.0:
     inherits "^2.0.1"
     parse-asn1 "^5.0.0"
 
-browserify-zlib@^0.2.0:
+browserify-zlib@^0.2.0, browserify-zlib@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
   dependencies:
     pako "~1.0.5"
 
+browserify@^14.5.0:
+  version "14.5.0"
+  resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5"
+  dependencies:
+    JSONStream "^1.0.3"
+    assert "^1.4.0"
+    browser-pack "^6.0.1"
+    browser-resolve "^1.11.0"
+    browserify-zlib "~0.2.0"
+    buffer "^5.0.2"
+    cached-path-relative "^1.0.0"
+    concat-stream "~1.5.1"
+    console-browserify "^1.1.0"
+    constants-browserify "~1.0.0"
+    crypto-browserify "^3.0.0"
+    defined "^1.0.0"
+    deps-sort "^2.0.0"
+    domain-browser "~1.1.0"
+    duplexer2 "~0.1.2"
+    events "~1.1.0"
+    glob "^7.1.0"
+    has "^1.0.0"
+    htmlescape "^1.1.0"
+    https-browserify "^1.0.0"
+    inherits "~2.0.1"
+    insert-module-globals "^7.0.0"
+    labeled-stream-splicer "^2.0.0"
+    module-deps "^4.0.8"
+    os-browserify "~0.3.0"
+    parents "^1.0.1"
+    path-browserify "~0.0.0"
+    process "~0.11.0"
+    punycode "^1.3.2"
+    querystring-es3 "~0.2.0"
+    read-only-stream "^2.0.0"
+    readable-stream "^2.0.2"
+    resolve "^1.1.4"
+    shasum "^1.0.0"
+    shell-quote "^1.6.1"
+    stream-browserify "^2.0.0"
+    stream-http "^2.0.0"
+    string_decoder "~1.0.0"
+    subarg "^1.0.0"
+    syntax-error "^1.1.1"
+    through2 "^2.0.0"
+    timers-browserify "^1.0.1"
+    tty-browserify "~0.0.0"
+    url "~0.11.0"
+    util "~0.10.1"
+    vm-browserify "~0.0.1"
+    xtend "^4.0.0"
+
 browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
@@ -1114,6 +1462,10 @@ buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
 
+buffer-more-ints@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c"
+
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -1126,6 +1478,25 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+buffer@^5.0.2:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.1.0.tgz#c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe"
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+
+buildmail@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
+  dependencies:
+    addressparser "1.0.1"
+    libbase64 "0.1.0"
+    libmime "3.0.0"
+    libqp "1.1.0"
+    nodemailer-fetch "1.6.0"
+    nodemailer-shared "1.1.0"
+    punycode "1.4.1"
+
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -1138,6 +1509,24 @@ bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
 
+cacache@^10.0.1:
+  version "10.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+  dependencies:
+    bluebird "^3.5.1"
+    chownr "^1.0.1"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    lru-cache "^4.1.1"
+    mississippi "^2.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^5.2.4"
+    unique-filename "^1.1.0"
+    y18n "^4.0.0"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1152,14 +1541,21 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-cache-loader@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-1.2.2.tgz#6d5c38ded959a09cc5d58190ab5af6f73bd353f5"
+cacheable-request@^2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
   dependencies:
-    loader-utils "^1.1.0"
-    mkdirp "^0.5.1"
-    neo-async "^2.5.0"
-    schema-utils "^0.4.2"
+    clone-response "1.0.2"
+    get-stream "3.0.0"
+    http-cache-semantics "3.8.1"
+    keyv "3.0.0"
+    lowercase-keys "1.0.0"
+    normalize-url "2.0.1"
+    responselike "1.0.2"
+
+cached-path-relative@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
 
 caller-path@^0.1.0:
   version "0.1.0"
@@ -1201,10 +1597,6 @@ camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -1230,6 +1622,10 @@ caniuse-lite@^1.0.30000809, caniuse-lite@^1.0.30000810:
   version "1.0.30000811"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000811.tgz#0b6e40f2efccc27bd3cb52f91ee7ca4673d77d10"
 
+caseless@~0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1252,7 +1648,7 @@ chai@^4.1.2:
     pathval "^1.0.0"
     type-detect "^4.0.0"
 
-chalk@^1.1.1, chalk@^1.1.3:
+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"
   dependencies:
@@ -1262,7 +1658,7 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
   dependencies:
@@ -1270,6 +1666,14 @@ chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.2.0"
 
+chalk@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chalk@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
@@ -1307,7 +1711,7 @@ cheerio@0.22.0:
     lodash.reject "^4.4.0"
     lodash.some "^4.4.0"
 
-chokidar@^1.4.1, chokidar@^1.6.1, chokidar@^1.7.0:
+chokidar@^1.4.1, chokidar@^1.6.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1340,6 +1744,32 @@ chokidar@^2.0.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chokidar@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7"
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^2.1.1"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+    upath "^1.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
+chownr@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+
+chrome-trace-event@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-0.1.2.tgz#90f36885d5345a50621332f0717b595883d5d982"
+
 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"
@@ -1351,6 +1781,10 @@ circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
 
+circular-json@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.1.tgz#b8942a09e535863dc21b04417a91971e1d9cd91f"
+
 clap@^1.0.9:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
@@ -1372,12 +1806,35 @@ clean-css@4.1.x:
   dependencies:
     source-map "0.5.x"
 
+cli-cursor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  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-spinners@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
+
+cli-table@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
+  dependencies:
+    colors "1.0.3"
+
+cli-truncate@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
+  dependencies:
+    slice-ansi "0.0.4"
+    string-width "^1.0.1"
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -1398,14 +1855,56 @@ cliui@^3.2.0:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
-clone@^1.0.2:
+cliui@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
+clone-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+
+clone-response@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  dependencies:
+    mimic-response "^1.0.0"
+
+clone-stats@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
+
+clone-stats@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
+
+clone@^1.0.0, clone@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
 
+clone@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
+
+cloneable-readable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117"
+  dependencies:
+    inherits "^2.0.1"
+    process-nextick-args "^1.0.6"
+    through2 "^2.0.1"
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
+co@~3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/co/-/co-3.0.6.tgz#1445f226c5eb956138e68c9ac30167ea7d2e6bda"
+
 coa@~1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
@@ -1463,6 +1962,10 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+
 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"
@@ -1473,6 +1976,24 @@ combine-lists@^1.0.0:
   dependencies:
     lodash "^4.5.0"
 
+combine-source-map@~0.7.1:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.7.2.tgz#0870312856b307a87cc4ac486f3a9a62aeccc09e"
+  dependencies:
+    convert-source-map "~1.1.0"
+    inline-source-map "~0.6.0"
+    lodash.memoize "~3.0.3"
+    source-map "~0.5.3"
+
+combine-source-map@~0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b"
+  dependencies:
+    convert-source-map "~1.1.0"
+    inline-source-map "~0.6.0"
+    lodash.memoize "~3.0.3"
+    source-map "~0.5.3"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -1487,6 +2008,10 @@ commander@2.14.x, commander@^2.11.0, commander@^2.6.0, commander@^2.8.1, command
   version "2.14.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
 
+commander@^2.9.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.0.tgz#ad2a23a1c3b036e392469b8012cec6b33b4c1322"
+
 commander@~2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -1501,10 +2026,6 @@ component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
 
-component-emitter@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
-
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -1535,7 +2056,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.6.0, concat-stream@^1.6.0:
+concat-stream@1.6.0, concat-stream@^1.5.0, concat-stream@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -1543,6 +2064,14 @@ concat-stream@1.6.0, concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat-stream@~1.5.0, concat-stream@~1.5.1:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "~2.0.0"
+    typedarray "~0.0.5"
+
 connect-history-api-fallback@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
@@ -1572,7 +2101,7 @@ consolidate@^0.14.0:
   dependencies:
     bluebird "^3.1.1"
 
-constants-browserify@^1.0.0:
+constants-browserify@^1.0.0, constants-browserify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
 
@@ -1588,6 +2117,10 @@ convert-source-map@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
+convert-source-map@~1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -1596,11 +2129,22 @@ cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
 
-core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0:
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
 
@@ -1647,9 +2191,9 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-env@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.3.tgz#f8ae18faac87692b0a8b4d2f7000d4ec3a85dfd7"
+cross-env@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.4.tgz#f61c14291f7cc653bb86457002ea80a04699d022"
   dependencies:
     cross-spawn "^5.1.0"
     is-windows "^1.0.0"
@@ -1662,6 +2206,16 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -1674,7 +2228,7 @@ cryptiles@3.x.x:
   dependencies:
     boom "5.x.x"
 
-crypto-browserify@^3.11.0:
+crypto-browserify@^3.0.0, crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
   dependencies:
@@ -1805,11 +2359,13 @@ custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
 
-d@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  dependencies:
-    es5-ext "^0.10.9"
+cyclist@~0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+
+dargs@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/dargs/-/dargs-5.1.0.tgz#ec7ea50c78564cd36c9d5ec18f66329fade27829"
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -1817,6 +2373,18 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-uri-to-buffer@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
+
+date-fns@^1.27.2:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
+
+date-format@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -1828,34 +2396,32 @@ dateformat@^1.0.6:
     get-stdin "^4.0.1"
     meow "^3.3.0"
 
+dateformat@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
 
-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:
-    ms "0.7.1"
-
-debug@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
-  dependencies:
-    ms "0.7.2"
-
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8:
+debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0, debug@^3.0.1, debug@^3.1.0:
+debug@3.1.0, debug@^3.0.1, debug@^3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   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"
+  dependencies:
+    ms "0.7.1"
+
 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"
@@ -1864,6 +2430,12 @@ decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
 
+decompress-response@^3.2.0, decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  dependencies:
+    mimic-response "^1.0.0"
+
 deep-eql@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
@@ -1874,7 +2446,7 @@ deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
 
-deep-extend@~0.4.0:
+deep-extend@^0.4.0, deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
@@ -1901,10 +2473,25 @@ define-property@^1.0.0:
   dependencies:
     is-descriptor "^1.0.0"
 
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
 
+degenerator@~1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
+  dependencies:
+    ast-types "0.x.x"
+    escodegen "1.x.x"
+    esprima "3.x.x"
+
 del@^2.0.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
@@ -1953,6 +2540,15 @@ dependency-tree@^6.0.1:
     filing-cabinet "^1.13.0"
     precinct "^4.0.0"
 
+deps-sort@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5"
+  dependencies:
+    JSONStream "^1.0.3"
+    shasum "^1.0.0"
+    subarg "^1.0.0"
+    through2 "^2.0.0"
+
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -1964,6 +2560,10 @@ destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
 
+detect-conflict@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/detect-conflict/-/detect-conflict-1.0.1.tgz#088657a66a961c05019db7c4230883b1c6b4176e"
+
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
@@ -2036,15 +2636,22 @@ detective-typescript@^2.0.0:
     typescript "^2.6.1"
     typescript-eslint-parser "^9.0.0"
 
+detective@^4.0.0:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
+  dependencies:
+    acorn "^5.2.1"
+    defined "^1.0.0"
+
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
 
-diff@3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
+diff@3.5.0, diff@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
-diff@^3.1.0:
+diff@^3.1.0, diff@^3.3.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
 
@@ -2105,6 +2712,10 @@ domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
 
+domain-browser@~1.1.0:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
@@ -2145,20 +2756,55 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
+double-ended-queue@^2.1.0-0:
+  version "2.1.0-0"
+  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+
+duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  dependencies:
+    readable-stream "^2.0.2"
+
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+
+duplexify@^3.4.2, duplexify@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e"
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
   dependencies:
     jsbn "~0.1.0"
 
+editions@^1.3.3:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
+ejs@^2.3.1:
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
+
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.33:
   version "1.3.33"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz#bf00703d62a7c65238136578c352d6c5c042a545"
 
+elegant-spinner@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
+
 elliptic@^6.0.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
@@ -2179,46 +2825,60 @@ encodeurl@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
 
-engine.io-client@1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.3.tgz#1798ed93451246453d4c6f635d7a201fe940d5ab"
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  dependencies:
+    once "^1.4.0"
+
+engine.io-client@~3.1.0:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.6.tgz#5bdeb130f8b94a50ac5cbeb72583e7a4a063ddfd"
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
-    debug "2.3.3"
-    engine.io-parser "1.3.2"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.1"
     has-cors "1.1.0"
     indexof "0.0.1"
-    parsejson "0.0.3"
     parseqs "0.0.5"
     parseuri "0.0.5"
-    ws "1.1.2"
-    xmlhttprequest-ssl "1.5.3"
+    ws "~3.3.1"
+    xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
-engine.io-parser@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.2.tgz#937b079f0007d0893ec56d46cb220b8cb435220a"
+engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
   dependencies:
     after "0.8.2"
-    arraybuffer.slice "0.0.6"
+    arraybuffer.slice "~0.0.7"
     base64-arraybuffer "0.1.5"
     blob "0.0.4"
-    has-binary "0.1.7"
-    wtf-8 "1.0.0"
+    has-binary2 "~1.0.2"
 
-engine.io@1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.3.tgz#8de7f97895d20d39b85f88eeee777b2bd42b13d4"
+engine.io@~3.1.0:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.5.tgz#0e7ef9d690eb0b35597f1d4ad02a26ca2dba3845"
   dependencies:
-    accepts "1.3.3"
+    accepts "~1.3.4"
     base64id "1.0.0"
     cookie "0.3.1"
-    debug "2.3.3"
-    engine.io-parser "1.3.2"
-    ws "1.1.2"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.0"
+    ws "~3.3.1"
+  optionalDependencies:
+    uws "~9.14.0"
 
-enhanced-resolve@^3.4.0, enhanced-resolve@~3.4.1:
+enhanced-resolve@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a"
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    tapable "^1.0.0"
+
+enhanced-resolve@~3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
   dependencies:
@@ -2241,17 +2901,24 @@ errno@^0.1.3:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0:
+errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  dependencies:
+    prr "~1.0.1"
+
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
     is-arrayish "^0.2.1"
 
-error-stack-parser@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.1.tgz#a3202b8fb03114aa9b40a0e3669e48b2b65a010a"
+error@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz#a5f75fff4d9926126ddac0ea5dc38e689153cb02"
   dependencies:
-    stackframe "^1.0.3"
+    string-template "~0.2.1"
+    xtend "~4.0.0"
 
 es-abstract@^1.5.1, es-abstract@^1.7.0:
   version "1.10.0"
@@ -2271,62 +2938,10 @@ es-to-primitive@^1.1.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.1"
 
-es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.38"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.38.tgz#fa7d40d65bbc9bb8a67e1d3f9cc656a00530eed3"
-  dependencies:
-    es6-iterator "~2.0.3"
-    es6-symbol "~3.1.1"
-
-es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
-
-es6-map@^0.1.3:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-    es6-iterator "~2.0.1"
-    es6-set "~0.1.5"
-    es6-symbol "~3.1.1"
-    event-emitter "~0.3.5"
-
 es6-promise@^4.0.3:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
 
-es6-set@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-    es6-iterator "~2.0.1"
-    es6-symbol "3.1.1"
-    event-emitter "~0.3.5"
-
-es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
-es6-weak-map@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.14"
-    es6-iterator "^2.0.1"
-    es6-symbol "^3.1.1"
-
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -2346,6 +2961,17 @@ escodegen@1.8.x:
   optionalDependencies:
     source-map "~0.2.0"
 
+escodegen@1.x.x:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 escodegen@^1.6.1, escodegen@^1.8.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
@@ -2357,15 +2983,6 @@ escodegen@^1.6.1, escodegen@^1.8.0:
   optionalDependencies:
     source-map "~0.5.6"
 
-escope@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
-  dependencies:
-    es6-map "^0.1.3"
-    es6-weak-map "^2.0.1"
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-plugin-vue@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.3.0.tgz#478c6267269dbaa20f6e8b2cfae7a0ccc98c1d72"
@@ -2436,11 +3053,11 @@ 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.3:
+esprima@3.x.x, esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
-esprima@^4.0.0:
+esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
@@ -2477,18 +3094,11 @@ etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
 
-event-emitter@~0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
 eventemitter3@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
 
-events@^1.0.0:
+events@^1.0.0, events@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
@@ -2517,6 +3127,10 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+exit-hook@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+
 expand-braces@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
@@ -2556,6 +3170,12 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
+expand-tilde@^2.0.0, 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.16.2:
   version "4.16.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
@@ -2597,18 +3217,18 @@ extend-shallow@^2.0.1:
   dependencies:
     is-extendable "^0.1.0"
 
-extend-shallow@^3.0.0:
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
+extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-external-editor@^2.0.4:
+external-editor@^2.0.4, external-editor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
   dependencies:
@@ -2622,7 +3242,7 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extglob@^2.0.2:
+extglob@^2.0.2, extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
   dependencies:
@@ -2635,14 +3255,14 @@ extglob@^2.0.2:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-text-webpack-plugin@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
+extract-text-webpack-plugin@^4.0.0-beta.0:
+  version "4.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz#f7361d7ff430b42961f8d1321ba8c1757b5d4c42"
   dependencies:
     async "^2.4.1"
     loader-utils "^1.1.0"
-    schema-utils "^0.3.0"
-    webpack-sources "^1.0.1"
+    schema-utils "^0.4.5"
+    webpack-sources "^1.1.0"
 
 extract-zip@^1.6.5:
   version "1.6.6"
@@ -2702,6 +3322,13 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
+figures@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  dependencies:
+    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"
@@ -2719,6 +3346,10 @@ file-exists@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-exists/-/file-exists-1.0.0.tgz#e6d269b56567b8922581398e990dd7078f72d616"
 
+file-uri-to-path@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -2810,6 +3441,12 @@ find@0.2.6:
   dependencies:
     traverse-chain "~0.1.0"
 
+first-chunk-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70"
+  dependencies:
+    readable-stream "^2.0.2"
+
 flat-cache@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
@@ -2823,6 +3460,23 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
+flow-parser@^0.*:
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.66.0.tgz#be583fefb01192aa5164415d31a6241b35718983"
+
+flush-write-stream@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.4"
+
+follow-redirects@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
+  dependencies:
+    debug "^2.2.0"
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -2841,6 +3495,14 @@ forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
+form-data@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.0.0.tgz#6f0aebadcc5da16c13e1ecc11137d85f9b883b25"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.11"
+
 form-data@~2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
@@ -2877,13 +3539,12 @@ fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
 
-friendly-errors-webpack-plugin@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.6.1.tgz#e32781c4722f546a06a9b5d7a7cfa28520375d70"
+from2@^2.1.0, from2@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
   dependencies:
-    chalk "^1.1.3"
-    error-stack-parser "^2.0.0"
-    string-length "^1.0.1"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
 
 fs-access@^1.0.0:
   version "1.0.1"
@@ -2920,6 +3581,15 @@ fs-readdir-recursive@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
 
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -2948,6 +3618,13 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+ftp@~0.3.10:
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  dependencies:
+    readable-stream "1.1.x"
+    xregexp "2.0.0"
+
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -2969,6 +3646,16 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
+generate-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+
+generate-object-property@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  dependencies:
+    is-property "^1.0.0"
+
 get-amd-module-type@^2.0.4:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-amd-module-type/-/get-amd-module-type-2.0.5.tgz#e671ec5a96ad5fbf53a3a22a289e9238c772ddb0"
@@ -2988,10 +3675,21 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
-get-stream@^3.0.0:
+get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+get-uri@2:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.1.tgz#dbdcacacd8c608a38316869368117697a1631c59"
+  dependencies:
+    data-uri-to-buffer "1"
+    debug "2"
+    extend "3"
+    file-uri-to-path "1"
+    ftp "~0.3.10"
+    readable-stream "2"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -3002,6 +3700,13 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+gh-got@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-6.0.0.tgz#d74353004c6ec466647520a10bd46f7299d268d0"
+  dependencies:
+    got "^7.0.0"
+    is-plain-obj "^1.1.0"
+
 gh-pages@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-1.1.0.tgz#738134d8e35e5323b39892cda28b8904e85f24b2"
@@ -3014,6 +3719,19 @@ gh-pages@^1.0.0:
     graceful-fs "4.1.11"
     rimraf "^2.6.2"
 
+github-username@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/github-username/-/github-username-4.1.0.tgz#cbe280041883206da4212ae9e4b5f169c30bf417"
+  dependencies:
+    gh-got "^6.0.0"
+
+glob-all@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-all/-/glob-all-3.1.0.tgz#8913ddfb5ee1ac7812656241b03d5217c64b02ab"
+  dependencies:
+    glob "^7.0.5"
+    yargs "~1.2.6"
+
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -3034,7 +3752,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-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.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, 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:
@@ -3055,6 +3773,24 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
 globals@^11.0.1:
   version "11.3.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.3.0.tgz#e04fdb7b9796d8adac9c8f64c14837b2313378b0"
@@ -3090,7 +3826,48 @@ gonzales-pe@^3.4.4:
   dependencies:
     minimist "1.1.x"
 
-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:
+got@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a"
+  dependencies:
+    decompress-response "^3.2.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    is-plain-obj "^1.1.0"
+    is-retry-allowed "^1.0.0"
+    is-stream "^1.0.0"
+    isurl "^1.0.0-alpha5"
+    lowercase-keys "^1.0.0"
+    p-cancelable "^0.3.0"
+    p-timeout "^1.1.1"
+    safe-buffer "^5.0.1"
+    timed-out "^4.0.0"
+    url-parse-lax "^1.0.0"
+    url-to-options "^1.0.1"
+
+got@^8.2.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-8.3.0.tgz#6ba26e75f8a6cc4c6b3eb1fe7ce4fec7abac8533"
+  dependencies:
+    "@sindresorhus/is" "^0.7.0"
+    cacheable-request "^2.1.1"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    into-stream "^3.1.0"
+    is-retry-allowed "^1.1.0"
+    isurl "^1.0.0-alpha5"
+    lowercase-keys "^1.0.0"
+    mimic-response "^1.0.0"
+    p-cancelable "^0.4.0"
+    p-timeout "^2.0.1"
+    pify "^3.0.0"
+    safe-buffer "^5.1.1"
+    timed-out "^4.0.1"
+    url-parse-lax "^3.0.0"
+    url-to-options "^1.0.1"
+
+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:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -3098,6 +3875,12 @@ graceful-fs@4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6,
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
+grouped-queue@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/grouped-queue/-/grouped-queue-0.3.3.tgz#c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"
+  dependencies:
+    lodash "^4.17.2"
+
 growl@1.10.3:
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"
@@ -3124,6 +3907,15 @@ har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
 
+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"
@@ -3144,11 +3936,11 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-binary@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.7.tgz#68e61eb16210c9545a0a5cce06a873912fe1e68c"
+has-binary2@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.2.tgz#e83dba49f0b9be4d026d27365350d9f03f54be98"
   dependencies:
-    isarray "0.0.1"
+    isarray "2.0.1"
 
 has-color@~0.1.0:
   version "0.1.7"
@@ -3170,10 +3962,20 @@ has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
 
+has-symbol-support-x@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
+
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
 
+has-to-string-tag-x@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
+  dependencies:
+    has-symbol-support-x "^1.4.1"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -3205,7 +4007,7 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1:
+has@^1.0.0, has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
   dependencies:
@@ -3268,6 +4070,13 @@ highlight.js@^9.12.0:
   version "9.12.0"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
 
+hipchat-notifier@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz#b6d249755437c191082367799d3ba9a0f23b231e"
+  dependencies:
+    lodash "^4.0.0"
+    request "^2.0.0"
+
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -3291,6 +4100,12 @@ home-or-tmp@^2.0.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
+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.5.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
@@ -3325,7 +4140,7 @@ html-minifier@^3.2.3:
     relateurl "0.2.x"
     uglify-js "3.3.x"
 
-html-webpack-plugin@^3.0.6:
+html-webpack-plugin@3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.0.6.tgz#d35b0452aae129a8a9f3fac44a169a625d8cf3fa"
   dependencies:
@@ -3337,6 +4152,10 @@ html-webpack-plugin@^3.0.6:
     toposort "^1.0.0"
     util.promisify "1.0.0"
 
+htmlescape@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
+
 htmlparser2@^3.9.1:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
@@ -3357,6 +4176,10 @@ htmlparser2@~3.3.0:
     domutils "1.1"
     readable-stream "1.0"
 
+http-cache-semantics@3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -3374,6 +4197,14 @@ http-parser-js@>=0.4.0:
   version "0.4.10"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
 
+http-proxy-agent@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz#cc1ce38e453bf984a0f7702d2dd59c73d081284a"
+  dependencies:
+    agent-base "2"
+    debug "2"
+    extend "3"
+
 http-proxy-middleware@~0.17.4:
   version "0.17.4"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833"
@@ -3406,10 +4237,33 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+httpntlm@1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/httpntlm/-/httpntlm-1.6.1.tgz#ad01527143a2e8773cfae6a96f58656bb52a34b2"
+  dependencies:
+    httpreq ">=0.4.22"
+    underscore "~1.7.0"
+
+httpreq@>=0.4.22:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-0.4.24.tgz#4335ffd82cd969668a39465c929ac61d6393627f"
+
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
+https-proxy-agent@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz#35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"
+  dependencies:
+    agent-base "2"
+    debug "2"
+    extend "3"
+
+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.19, iconv-lite@^0.4.17:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
@@ -3428,6 +4282,10 @@ ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+
 ignore@^3.3.3:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
@@ -3449,6 +4307,10 @@ indent-string@^2.1.0:
   dependencies:
     repeating "^2.0.0"
 
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
@@ -3457,6 +4319,14 @@ indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
+inflection@~1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.10.0.tgz#5bffcb1197ad3e81050f8e17e21668087ee9eb2f"
+
+inflection@~1.3.0:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.3.8.tgz#cbd160da9f75b14c3cc63578d4f396784bf3014e"
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -3472,11 +4342,17 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@~1.3.0:
+ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
-inquirer@^3.0.6:
+inline-source-map@~0.6.0:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5"
+  dependencies:
+    source-map "~0.5.3"
+
+inquirer@^3.0.6, inquirer@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
   dependencies:
@@ -3495,16 +4371,54 @@ inquirer@^3.0.6:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
+inquirer@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.1.0.tgz#19da508931892328abbbdd4c477f1efc65abfd67"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.1.0"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^5.5.2"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
+insert-module-globals@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.0.2.tgz#012c56baa7d3307a8b417d4ec5270cf9741c18f4"
+  dependencies:
+    JSONStream "^1.0.3"
+    combine-source-map "~0.7.1"
+    concat-stream "~1.5.1"
+    is-buffer "^1.1.0"
+    lexical-scope "^1.2.0"
+    process "~0.11.0"
+    through2 "^2.0.0"
+    xtend "^4.0.0"
+
 internal-ip@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
   dependencies:
     meow "^3.3.0"
 
-interpret@^1.0.0:
+interpret@^1.0.0, interpret@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
+into-stream@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
+  dependencies:
+    from2 "^2.1.1"
+    p-is-promise "^1.1.0"
+
 invariant@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
@@ -3515,7 +4429,11 @@ 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.5:
+ip@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.0.1.tgz#c7e356cdea225ae71b36d70f2e71a92ba4e42590"
+
+ip@^1.1.0, ip@^1.1.2, ip@^1.1.4, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
 
@@ -3549,7 +4467,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5:
+is-buffer@^1.1.0, is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -3587,7 +4505,7 @@ is-descriptor@^0.1.0:
     is-data-descriptor "^0.1.4"
     kind-of "^5.0.0"
 
-is-descriptor@^1.0.0:
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
   dependencies:
@@ -3661,6 +4579,20 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
+is-my-ip-valid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+
+is-my-json-valid@^2.12.4:
+  version "2.17.2"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
+  dependencies:
+    generate-function "^2.0.0"
+    generate-object-property "^1.1.0"
+    is-my-ip-valid "^1.0.0"
+    jsonpointer "^4.0.0"
+    xtend "^4.0.0"
+
 is-number@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
@@ -3677,12 +4609,32 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+
+is-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+
+is-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
+  dependencies:
+    symbol-observable "^0.2.2"
+
 is-odd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-1.0.0.tgz#3b8a932eb028b3775c39bb09e91767accdb69088"
   dependencies:
     is-number "^3.0.0"
 
+is-odd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
+  dependencies:
+    is-number "^4.0.0"
+
 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"
@@ -3699,7 +4651,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"
 
@@ -3721,6 +4673,10 @@ is-promise@^2.1.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.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@@ -3735,7 +4691,17 @@ is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
 
-is-stream@^1.0.1, is-stream@^1.1.0:
+is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+
+is-scoped@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-scoped/-/is-scoped-1.0.0.tgz#449ca98299e713038256289ecb2b540dc437cb30"
+  dependencies:
+    scoped-regex "^1.0.0"
+
+is-stream@^1.0.0, 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"
 
@@ -3761,11 +4727,15 @@ is-windows@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
 
+is-windows@^1.0.1, is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
 
-isarray@0.0.1:
+isarray@0.0.1, isarray@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
@@ -3773,6 +4743,10 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
+isarray@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+
 isbinaryfile@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
@@ -3834,6 +4808,21 @@ istanbul@^0.4.0:
     which "^1.1.1"
     wordwrap "^1.0.0"
 
+istextorbinary@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.2.1.tgz#a5231a08ef6dd22b268d0895084cf8d58b5bec53"
+  dependencies:
+    binaryextensions "2"
+    editions "^1.3.3"
+    textextensions "2"
+
+isurl@^1.0.0-alpha5:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
+  dependencies:
+    has-to-string-tag-x "^1.2.0"
+    is-object "^1.0.1"
+
 js-base64@^2.1.9:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
@@ -3860,6 +4849,46 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
+jscodeshift@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.4.1.tgz#da91a1c2eccfa03a3387a21d39948e251ced444a"
+  dependencies:
+    async "^1.5.0"
+    babel-plugin-transform-flow-strip-types "^6.8.0"
+    babel-preset-es2015 "^6.9.0"
+    babel-preset-stage-1 "^6.5.0"
+    babel-register "^6.9.0"
+    babylon "^6.17.3"
+    colors "^1.1.2"
+    flow-parser "^0.*"
+    lodash "^4.13.1"
+    micromatch "^2.3.7"
+    node-dir "0.1.8"
+    nomnom "^1.8.1"
+    recast "^0.12.5"
+    temp "^0.8.1"
+    write-file-atomic "^1.2.0"
+
+jscodeshift@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.5.0.tgz#bdb7b6cc20dd62c16aa728c3fa2d2fe66ca7c748"
+  dependencies:
+    babel-plugin-transform-flow-strip-types "^6.8.0"
+    babel-preset-es2015 "^6.9.0"
+    babel-preset-stage-1 "^6.5.0"
+    babel-register "^6.9.0"
+    babylon "^7.0.0-beta.30"
+    colors "^1.1.2"
+    flow-parser "^0.*"
+    lodash "^4.13.1"
+    micromatch "^2.3.7"
+    neo-async "^2.5.0"
+    node-dir "0.1.8"
+    nomnom "^1.8.1"
+    recast "^0.14.1"
+    temp "^0.8.1"
+    write-file-atomic "^1.2.0"
+
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -3868,9 +4897,13 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
-json-loader@^0.5.4:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+
+json-parse-better-errors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
@@ -3890,11 +4923,17 @@ json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@~5.0.1:
+json-stable-stringify@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45"
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@5.0.x, 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"
 
-json3@3.3.2, json3@^3.3.2:
+json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
 
@@ -3922,6 +4961,14 @@ 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"
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -3973,22 +5020,24 @@ karma-spec-reporter@^0.0.32:
   dependencies:
     colors "^1.1.2"
 
-karma-webpack@^2.0.9:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.9.tgz#61c88091f7dd910635134c032b266a465affb57f"
+karma-webpack@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.13.tgz#cf56e3056c15b7747a0bb2140fc9a6be41dd9f02"
   dependencies:
-    async "~0.9.0"
-    loader-utils "^0.2.5"
-    lodash "^3.8.0"
+    async "^2.0.0"
+    babel-runtime "^6.0.0"
+    loader-utils "^1.0.0"
+    lodash "^4.0.0"
     source-map "^0.5.6"
     webpack-dev-middleware "^1.12.0"
 
-karma@^1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.1.tgz#85cc08e9e0a22d7ce9cca37c4a1be824f6a2b1ae"
+karma@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-2.0.0.tgz#a02698dd7f0f05ff5eb66ab8f65582490b512e58"
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
+    browserify "^14.5.0"
     chokidar "^1.4.1"
     colors "^1.1.0"
     combine-lists "^1.0.0"
@@ -4001,8 +5050,8 @@ karma@^1.7.1:
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^3.8.0"
-    log4js "^0.6.31"
+    lodash "^4.17.4"
+    log4js "^2.3.9"
     mime "^1.3.4"
     minimatch "^3.0.2"
     optimist "^0.6.1"
@@ -4010,15 +5059,21 @@ karma@^1.7.1:
     range-parser "^1.2.0"
     rimraf "^2.6.0"
     safe-buffer "^5.0.1"
-    socket.io "1.7.3"
-    source-map "^0.5.3"
-    tmp "0.0.31"
+    socket.io "2.0.4"
+    source-map "^0.6.1"
+    tmp "0.0.33"
     useragent "^2.1.12"
 
 kew@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
 
+keyv@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
+  dependencies:
+    json-buffer "3.0.0"
+
 killable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
@@ -4049,6 +5104,14 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
+labeled-stream-splicer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59"
+  dependencies:
+    inherits "^2.0.1"
+    isarray "~0.0.1"
+    stream-splicer "^2.0.0"
+
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
@@ -4072,12 +5135,82 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+lexical-scope@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.2.0.tgz#fcea5edc704a4b3a8796cdca419c3a0afaf22df4"
+  dependencies:
+    astw "^2.0.0"
+
+libbase64@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-0.1.0.tgz#62351a839563ac5ff5bd26f12f60e9830bb751e6"
+
+libmime@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/libmime/-/libmime-3.0.0.tgz#51a1a9e7448ecbd32cda54421675bb21bc093da6"
+  dependencies:
+    iconv-lite "0.4.15"
+    libbase64 "0.1.0"
+    libqp "1.1.0"
+
+libqp@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"
+
 linkify-it@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
   dependencies:
     uc.micro "^1.0.1"
 
+listr-silent-renderer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
+
+listr-update-renderer@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.4.0.tgz#344d980da2ca2e8b145ba305908f32ae3f4cc8a7"
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    elegant-spinner "^1.0.1"
+    figures "^1.7.0"
+    indent-string "^3.0.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    strip-ansi "^3.0.1"
+
+listr-verbose-renderer@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35"
+  dependencies:
+    chalk "^1.1.3"
+    cli-cursor "^1.0.2"
+    date-fns "^1.27.2"
+    figures "^1.7.0"
+
+listr@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.13.0.tgz#20bb0ba30bae660ee84cc0503df4be3d5623887d"
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    figures "^1.7.0"
+    indent-string "^2.1.0"
+    is-observable "^0.2.0"
+    is-promise "^2.1.0"
+    is-stream "^1.1.0"
+    listr-silent-renderer "^1.1.1"
+    listr-update-renderer "^0.4.0"
+    listr-verbose-renderer "^0.4.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    ora "^0.2.3"
+    p-map "^1.1.1"
+    rxjs "^5.4.2"
+    stream-to-observable "^0.2.0"
+    strip-ansi "^3.0.1"
+
 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"
@@ -4097,11 +5230,20 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
 loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.16, loader-utils@^0.2.5:
+loader-utils@^0.2.16:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
@@ -4110,7 +5252,7 @@ loader-utils@^0.2.16, loader-utils@^0.2.5:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   dependencies:
@@ -4161,6 +5303,10 @@ lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
+lodash.memoize@~3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
+
 lodash.merge@^4.4.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
@@ -4193,21 +5339,64 @@ lodash@3.x, lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.5.0:
+lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.5.0:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
-log4js@^0.6.31:
-  version "0.6.38"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-0.6.38.tgz#2c494116695d6fb25480943d3fc872e662a522fd"
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
   dependencies:
-    readable-stream "~1.0.2"
-    semver "~4.3.3"
+    chalk "^1.0.0"
+
+log-symbols@^2.1.0, log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  dependencies:
+    chalk "^2.0.1"
+
+log-update@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
+  dependencies:
+    ansi-escapes "^1.0.0"
+    cli-cursor "^1.0.2"
+
+log4js@^2.3.9:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.5.3.tgz#38bb7bde5e9c1c181bd75e8bc128c5cd0409caf1"
+  dependencies:
+    circular-json "^0.5.1"
+    date-format "^1.2.0"
+    debug "^3.1.0"
+    semver "^5.3.0"
+    streamroller "^0.7.0"
+  optionalDependencies:
+    amqplib "^0.5.2"
+    axios "^0.15.3"
+    hipchat-notifier "^1.1.0"
+    loggly "^1.1.0"
+    mailgun-js "^0.7.0"
+    nodemailer "^2.5.0"
+    redis "^2.7.1"
+    slack-node "~0.2.0"
+
+loggly@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/loggly/-/loggly-1.1.1.tgz#0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"
+  dependencies:
+    json-stringify-safe "5.0.x"
+    request "2.75.x"
+    timespan "2.3.x"
 
 loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
 
+loglevelnext@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.3.tgz#0f69277e73bbbf2cd61b94d82313216bf87ac66e"
+
 lolex@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
@@ -4222,7 +5411,7 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0"
 
-loud-rejection@^1.0.0:
+loud-rejection@^1.0.0, loud-rejection@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
   dependencies:
@@ -4233,6 +5422,10 @@ lower-case@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
+lowercase-keys@1.0.0, lowercase-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+
 lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
@@ -4240,16 +5433,47 @@ lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@~2.6.5:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.6.5.tgz#e56d6354148ede8d7707b58d143220fd08df0fd5"
+
 macaddress@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
 
+mailcomposer@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/mailcomposer/-/mailcomposer-4.0.1.tgz#0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"
+  dependencies:
+    buildmail "4.0.1"
+    libmime "3.0.0"
+
+mailgun-js@^0.7.0:
+  version "0.7.15"
+  resolved "https://registry.yarnpkg.com/mailgun-js/-/mailgun-js-0.7.15.tgz#ee366a20dac64c3c15c03d6c1b3e0ed795252abb"
+  dependencies:
+    async "~2.1.2"
+    debug "~2.2.0"
+    form-data "~2.1.1"
+    inflection "~1.10.0"
+    is-stream "^1.1.0"
+    path-proxy "~1.0.0"
+    proxy-agent "~2.0.0"
+    q "~1.4.0"
+    tsscmp "~1.0.0"
+
 make-dir@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
   dependencies:
     pify "^3.0.0"
 
+make-dir@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b"
+  dependencies:
+    pify "^3.0.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -4297,6 +5521,29 @@ media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
 
+mem-fs-editor@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-3.0.2.tgz#dd0a6eaf2bb8a6b37740067aa549eb530105af9f"
+  dependencies:
+    commondir "^1.0.1"
+    deep-extend "^0.4.0"
+    ejs "^2.3.1"
+    glob "^7.0.3"
+    globby "^6.1.0"
+    mkdirp "^0.5.0"
+    multimatch "^2.0.0"
+    rimraf "^2.2.8"
+    through2 "^2.0.0"
+    vinyl "^2.0.1"
+
+mem-fs@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/mem-fs/-/mem-fs-1.1.3.tgz#b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"
+  dependencies:
+    through2 "^2.0.0"
+    vinyl "^1.1.0"
+    vinyl-file "^2.0.0"
+
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
@@ -4333,7 +5580,7 @@ methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
-micromatch@^2.1.5, micromatch@^2.3.11:
+micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -4369,6 +5616,24 @@ micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+micromatch@^3.1.8:
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -4384,7 +5649,17 @@ mime-db@~1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
-mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
+mime-types@^2.1.11:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
+mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
   version "2.1.17"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
   dependencies:
@@ -4398,7 +5673,7 @@ mime@^1.3.4, mime@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
 
-mime@^2.0.3:
+mime@^2.0.3, mime@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.0.tgz#161e541965551d3b549fa1114391e3a3d55b923b"
 
@@ -4406,6 +5681,10 @@ mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
+mimic-response@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e"
+
 minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
@@ -4428,14 +5707,33 @@ minimist@1.1.x:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
 
-minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
+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"
+
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
+mississippi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^2.0.1"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
@@ -4459,14 +5757,14 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
   dependencies:
     minimist "0.0.8"
 
-mocha@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794"
+mocha@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.4.tgz#6b7aa328472da1088e69d47e75925fd3a3bb63c6"
   dependencies:
-    browser-stdout "1.3.0"
+    browser-stdout "1.3.1"
     commander "2.11.0"
     debug "3.1.0"
-    diff "3.3.1"
+    diff "3.5.0"
     escape-string-regexp "1.0.5"
     glob "7.1.2"
     growl "1.10.3"
@@ -4481,6 +5779,26 @@ module-definition@^2.2.4:
     ast-module-types "^2.3.2"
     node-source-walk "^3.0.0"
 
+module-deps@^4.0.8:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.1.1.tgz#23215833f1da13fd606ccb8087b44852dcb821fd"
+  dependencies:
+    JSONStream "^1.0.3"
+    browser-resolve "^1.7.0"
+    cached-path-relative "^1.0.0"
+    concat-stream "~1.5.0"
+    defined "^1.0.0"
+    detective "^4.0.0"
+    duplexer2 "^0.1.2"
+    inherits "^2.0.1"
+    parents "^1.0.0"
+    readable-stream "^2.0.2"
+    resolve "^1.1.3"
+    stream-combiner2 "^1.1.1"
+    subarg "^1.0.0"
+    through2 "^2.0.0"
+    xtend "^4.0.0"
+
 module-lookup-amd@^4.0.2:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/module-lookup-amd/-/module-lookup-amd-4.0.5.tgz#58e353f9dc01ecec057b1ccdd00ed059484acca5"
@@ -4492,14 +5810,21 @@ module-lookup-amd@^4.0.2:
     requirejs "~2.2.0"
     requirejs-config-file "~2.0.0"
 
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
-ms@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -4515,6 +5840,15 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
+multimatch@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  dependencies:
+    array-differ "^1.0.0"
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    minimatch "^3.0.0"
+
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@@ -4539,6 +5873,23 @@ nanomatch@^1.2.5:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+nanomatch@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-odd "^2.0.0"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 native-promise-only@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
@@ -4565,12 +5916,24 @@ neo-async@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f"
 
+netmask@~1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
+
+nice-try@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
+
 no-case@^2.2.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
   dependencies:
     lower-case "^1.1.1"
 
+node-dir@0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.8.tgz#55fb8deb699070707fb67f91a460f0448294c77d"
+
 node-forge@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.1.tgz#9da611ea08982f4b94206b3beb4cc9665f20c300"
@@ -4631,10 +5994,70 @@ node-source-walk@^3.0.0, node-source-walk@^3.2.0, node-source-walk@^3.3.0:
   dependencies:
     babylon "^6.17.0"
 
+node-uuid@~1.4.7:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
+
 node-watch@^0.5.5:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.5.7.tgz#a0f9f791b99d5463b2e91e628bc20fcab8520066"
 
+nodemailer-direct-transport@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz#e96fafb90358560947e569017d97e60738a50a86"
+  dependencies:
+    nodemailer-shared "1.1.0"
+    smtp-connection "2.12.0"
+
+nodemailer-fetch@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz#79c4908a1c0f5f375b73fe888da9828f6dc963a4"
+
+nodemailer-shared@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz#cf5994e2fd268d00f5cf0fa767a08169edb07ec0"
+  dependencies:
+    nodemailer-fetch "1.6.0"
+
+nodemailer-smtp-pool@2.8.2:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz#2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"
+  dependencies:
+    nodemailer-shared "1.1.0"
+    nodemailer-wellknown "0.1.10"
+    smtp-connection "2.12.0"
+
+nodemailer-smtp-transport@2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz#03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"
+  dependencies:
+    nodemailer-shared "1.1.0"
+    nodemailer-wellknown "0.1.10"
+    smtp-connection "2.12.0"
+
+nodemailer-wellknown@0.1.10:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz#586db8101db30cb4438eb546737a41aad0cf13d5"
+
+nodemailer@^2.5.0:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-2.7.2.tgz#f242e649aeeae39b6c7ed740ef7b061c404d30f9"
+  dependencies:
+    libmime "3.0.0"
+    mailcomposer "4.0.1"
+    nodemailer-direct-transport "3.3.2"
+    nodemailer-shared "1.1.0"
+    nodemailer-smtp-pool "2.8.2"
+    nodemailer-smtp-transport "2.7.2"
+    socks "1.1.9"
+
+nomnom@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
+  dependencies:
+    chalk "~0.4.0"
+    underscore "~1.6.0"
+
 nomnomnomnom@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/nomnomnomnom/-/nomnomnomnom-2.0.1.tgz#b2239f031c8d04da67e32836e1e3199e12f7a8e2"
@@ -4674,6 +6097,14 @@ normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
+normalize-url@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  dependencies:
+    prepend-http "^2.0.0"
+    query-string "^5.0.1"
+    sort-keys "^2.0.0"
+
 normalize-url@^1.4.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
@@ -4724,10 +6155,6 @@ oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
-
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -4797,12 +6224,16 @@ on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@1.x, once@^1.3.0, once@^1.3.3:
+once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
     wrappy "1"
 
+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"
@@ -4833,9 +6264,14 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-options@>=0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
+ora@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
+  dependencies:
+    chalk "^1.1.1"
+    cli-cursor "^1.0.2"
+    cli-spinners "^0.1.2"
+    object-assign "^4.0.1"
 
 original@>=0.0.5:
   version "1.0.0"
@@ -4843,7 +6279,7 @@ original@>=0.0.5:
   dependencies:
     url-parse "1.0.x"
 
-os-browserify@^0.3.0:
+os-browserify@^0.3.0, os-browserify@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
 
@@ -4851,12 +6287,6 @@ 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"
 
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  dependencies:
-    lcid "^1.0.0"
-
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
@@ -4865,7 +6295,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.2:
+os-tmpdir@^1.0.0, 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"
 
@@ -4884,10 +6314,32 @@ output-file-sync@^1.1.2:
     mkdirp "^0.5.1"
     object-assign "^4.1.0"
 
+p-cancelable@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
+
+p-cancelable@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.0.tgz#bcb41d35bf6097fc4367a065b6eb84b9b124eff0"
+
+p-each-series@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
+  dependencies:
+    p-reduce "^1.0.0"
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
+p-is-promise@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+
+p-lazy@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-lazy/-/p-lazy-1.0.0.tgz#ec53c802f2ee3ac28f166cc82d0b2b02de27a835"
+
 p-limit@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
@@ -4904,20 +6356,74 @@ p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
 
+p-reduce@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+
+p-timeout@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386"
+  dependencies:
+    p-finally "^1.0.0"
+
+p-timeout@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
 
+pac-proxy-agent@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz#34a385dfdf61d2f0ecace08858c745d3e791fd4d"
+  dependencies:
+    agent-base "2"
+    debug "2"
+    extend "3"
+    get-uri "2"
+    http-proxy-agent "1"
+    https-proxy-agent "1"
+    pac-resolver "~2.0.0"
+    raw-body "2"
+    socks-proxy-agent "2"
+
+pac-resolver@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-2.0.0.tgz#99b88d2f193fbdeefc1c9a529c1f3260ab5277cd"
+  dependencies:
+    co "~3.0.6"
+    degenerator "~1.0.2"
+    ip "1.0.1"
+    netmask "~1.0.4"
+    thunkify "~2.1.1"
+
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
 
+parallel-transform@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  dependencies:
+    cyclist "~0.2.2"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
 param-case@2.1.x:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
   dependencies:
     no-case "^2.2.0"
 
+parents@^1.0.0, parents@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751"
+  dependencies:
+    path-platform "~0.11.15"
+
 parse-asn1@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
@@ -4943,11 +6449,16 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
-parsejson@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
   dependencies:
-    better-assert "~1.0.0"
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
+parse-passwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
 parseqs@0.0.5:
   version "0.0.5"
@@ -4969,7 +6480,7 @@ pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
 
-path-browserify@0.0.0:
+path-browserify@0.0.0, path-browserify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
@@ -4995,7 +6506,7 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
-path-key@^2.0.0:
+path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
@@ -5003,6 +6514,16 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
+path-platform@~0.11.15:
+  version "0.11.15"
+  resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2"
+
+path-proxy@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-proxy/-/path-proxy-1.0.0.tgz#18e8a36859fc9d2f1a53b48dee138543c020de5e"
+  dependencies:
+    inflection "~1.3.0"
+
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -5027,6 +6548,12 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  dependencies:
+    pify "^3.0.0"
+
 pathval@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
@@ -5585,18 +7112,26 @@ prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
 
-prepend-http@^1.0.0:
+prepend-http@^1.0.0, prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.7.0:
+prettier@^1.5.3, prettier@^1.7.0:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
 
+pretty-bytes@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
+
 pretty-error@^2.0.2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
@@ -5604,15 +7139,19 @@ pretty-error@^2.0.2:
     renderkid "^2.0.1"
     utila "~0.4"
 
-private@^0.1.6, private@^0.1.7:
+private@^0.1.6, private@^0.1.7, private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
 
+process-nextick-args@^1.0.6, 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"
+
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
-process@^0.11.10:
+process@^0.11.10, process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
@@ -5632,6 +7171,10 @@ progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
 
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+
 proxy-addr@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
@@ -5639,6 +7182,19 @@ proxy-addr@~2.0.2:
     forwarded "~0.1.2"
     ipaddr.js "1.5.2"
 
+proxy-agent@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-2.0.0.tgz#57eb5347aa805d74ec681cb25649dba39c933499"
+  dependencies:
+    agent-base "2"
+    debug "2"
+    extend "3"
+    http-proxy-agent "1"
+    https-proxy-agent "1"
+    lru-cache "~2.6.5"
+    pac-proxy-agent "1"
+    socks-proxy-agent "2"
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -5657,11 +7213,26 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
+pump@^2.0.0, pump@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb"
+  dependencies:
+    duplexify "^3.5.3"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
-punycode@^1.2.4, punycode@^1.4.1:
+punycode@1.4.1, punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
@@ -5669,6 +7240,10 @@ q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
+q@~1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+
 qjobs@^1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73"
@@ -5677,6 +7252,10 @@ qs@6.5.1, qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
+qs@~6.2.0:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
+
 qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
@@ -5688,7 +7267,15 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-querystring-es3@^0.2.0:
+query-string@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.0.tgz#9583b15fd1307f899e973ed418886426a9976469"
+  dependencies:
+    decode-uri-component "^0.2.0"
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0, querystring-es3@~0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
@@ -5728,7 +7315,7 @@ range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
 
-raw-body@2.3.2:
+raw-body@2, raw-body@2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
   dependencies:
@@ -5752,6 +7339,19 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
+read-chunk@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"
+  dependencies:
+    pify "^3.0.0"
+    safe-buffer "^5.1.1"
+
+read-only-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
+  dependencies:
+    readable-stream "^2.0.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"
@@ -5766,6 +7366,13 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
+read-pkg-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^3.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"
@@ -5782,16 +7389,15 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-readable-stream@1.0, readable-stream@~1.0.2:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
   dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
+    load-json-file "^4.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^3.0.0"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071"
   dependencies:
@@ -5803,6 +7409,47 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
+readable-stream@1.0:
+  version "1.0.34"
+  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"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@1.1.x, "readable-stream@1.x >=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, readable-stream@^2.3.0:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
+    util-deprecate "~1.0.1"
+
+readable-stream@~2.0.0, readable-stream@~2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~0.10.x"
+    util-deprecate "~1.0.1"
+
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -5812,6 +7459,25 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
+recast@^0.12.5:
+  version "0.12.9"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.12.9.tgz#e8e52bdb9691af462ccbd7c15d5a5113647a15f1"
+  dependencies:
+    ast-types "0.10.1"
+    core-js "^2.4.1"
+    esprima "~4.0.0"
+    private "~0.1.5"
+    source-map "~0.6.1"
+
+recast@^0.14.1:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.14.5.tgz#53f1f6edf7810bdfb39a25d0ff97d315bad7c314"
+  dependencies:
+    ast-types "0.11.3"
+    esprima "~4.0.0"
+    private "~0.1.5"
+    source-map "~0.6.1"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -5825,6 +7491,22 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
+redis-commands@^1.2.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.5.tgz#4495889414f1e886261180b1442e7295602d83a2"
+
+redis-parser@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
+
+redis@^2.7.1:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
+  dependencies:
+    double-ended-queue "^2.1.0-0"
+    redis-commands "^1.2.0"
+    redis-parser "^2.6.0"
+
 reduce-css-calc@^1.2.6:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
@@ -5940,12 +7622,46 @@ repeating@^2.0.0:
   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"
+
+replace-ext@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
+
 request-progress@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08"
   dependencies:
     throttleit "^1.0.0"
 
+request@2.75.x:
+  version "2.75.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.75.0.tgz#d2b8268a286da13eaa5d01adf5d18cc90f657d93"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    bl "~1.1.2"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.0.0"
+    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"
+    node-uuid "~1.4.7"
+    oauth-sign "~0.8.1"
+    qs "~6.2.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+
 request@2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
@@ -5973,6 +7689,33 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+request@^2.0.0, request@^2.74.0:
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
 request@^2.81.0:
   version "2.83.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
@@ -6000,6 +7743,15 @@ request@^2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
+requestretry@^1.2.2:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-1.13.0.tgz#213ec1006eeb750e8b8ce54176283d15a8d55d94"
+  dependencies:
+    extend "^3.0.0"
+    lodash "^4.15.0"
+    request "^2.74.0"
+    when "^3.7.7"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -6045,6 +7797,13 @@ resolve-dependency-path@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/resolve-dependency-path/-/resolve-dependency-path-1.0.2.tgz#6abe93a6de3e4f9dce7b5e8261e1f47aa1af4dc2"
 
+resolve-dir@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
@@ -6057,16 +7816,29 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
-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"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.4.0:
+resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
   dependencies:
     path-parse "^1.0.5"
 
+responselike@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  dependencies:
+    lowercase-keys "^1.0.0"
+
+restore-cursor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+  dependencies:
+    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"
@@ -6090,7 +7862,7 @@ 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"
 
-rimraf@~2.2.0:
+rimraf@~2.2.0, rimraf@~2.2.6:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
 
@@ -6101,12 +7873,18 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
-run-async@^2.2.0:
+run-async@^2.0.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-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  dependencies:
+    aproba "^1.1.1"
+
 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"
@@ -6117,6 +7895,12 @@ 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"
 
+rxjs@^5.4.2, rxjs@^5.5.2:
+  version "5.5.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.7.tgz#afb3d1642b069b2fbf203903d6501d1acb4cda27"
+  dependencies:
+    symbol-observable "1.0.1"
+
 safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, 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"
@@ -6136,12 +7920,6 @@ sax@~1.2.1:
   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"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
-  dependencies:
-    ajv "^5.0.0"
-
 schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.3.tgz#e2a594d3395834d5e15da22b48be13517859458e"
@@ -6156,6 +7934,10 @@ schema-utils@^0.4.5:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
+scoped-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/scoped-regex/-/scoped-regex-1.0.0.tgz#a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -6166,7 +7948,7 @@ selfsigned@^1.9.1:
   dependencies:
     node-forge "0.7.1"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -6174,9 +7956,9 @@ semver@5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
-semver@~4.3.3:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+semver@~5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
 
 send@0.16.1:
   version "0.16.1"
@@ -6196,6 +7978,10 @@ send@0.16.1:
     range-parser "~1.2.0"
     statuses "~1.3.1"
 
+serialize-javascript@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005"
+
 serve-index@^1.7.2:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
@@ -6261,13 +8047,20 @@ setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
 
-sha.js@^2.4.0, sha.js@^2.4.8:
+sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
   version "2.4.10"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b"
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+shasum@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f"
+  dependencies:
+    json-stable-stringify "~0.0.0"
+    sha.js "~2.4.4"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -6278,7 +8071,16 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shelljs@^0.8.1:
+shell-quote@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
+  dependencies:
+    array-filter "~0.0.0"
+    array-map "~0.0.0"
+    array-reduce "~0.0.0"
+    jsonify "~0.0.0"
+
+shelljs@^0.8.0, shelljs@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.1.tgz#729e038c413a2254c4078b95ed46e0397154a9f1"
   dependencies:
@@ -6307,16 +8109,41 @@ sinon@^2.4.1:
     text-encoding "0.6.4"
     type-detect "^4.0.0"
 
+slack-node@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/slack-node/-/slack-node-0.2.0.tgz#de4b8dddaa8b793f61dbd2938104fdabf37dfa30"
+  dependencies:
+    requestretry "^1.2.2"
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+
 slice-ansi@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
   dependencies:
     is-fullwidth-code-point "^2.0.0"
 
+slide@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+
+smart-buffer@^1.0.13, smart-buffer@^1.0.4:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
+
+smtp-connection@2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/smtp-connection/-/smtp-connection-2.12.0.tgz#d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"
+  dependencies:
+    httpntlm "1.6.1"
+    nodemailer-shared "1.1.0"
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -6356,49 +8183,46 @@ sntp@2.x.x:
   dependencies:
     hoek "4.x.x"
 
-socket.io-adapter@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b"
-  dependencies:
-    debug "2.3.3"
-    socket.io-parser "2.3.1"
+socket.io-adapter@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
 
-socket.io-client@1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.3.tgz#b30e86aa10d5ef3546601c09cde4765e381da377"
+socket.io-client@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e"
   dependencies:
     backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
     component-bind "1.0.0"
     component-emitter "1.2.1"
-    debug "2.3.3"
-    engine.io-client "1.8.3"
-    has-binary "0.1.7"
+    debug "~2.6.4"
+    engine.io-client "~3.1.0"
+    has-cors "1.1.0"
     indexof "0.0.1"
     object-component "0.0.3"
+    parseqs "0.0.5"
     parseuri "0.0.5"
-    socket.io-parser "2.3.1"
+    socket.io-parser "~3.1.1"
     to-array "0.1.4"
 
-socket.io-parser@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0"
+socket.io-parser@~3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.3.tgz#ed2da5ee79f10955036e3da413bfd7f1e4d86c8e"
   dependencies:
-    component-emitter "1.1.2"
-    debug "2.2.0"
-    isarray "0.0.1"
-    json3 "3.3.2"
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    has-binary2 "~1.0.2"
+    isarray "2.0.1"
 
-socket.io@1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.3.tgz#b8af9caba00949e568e369f1327ea9be9ea2461b"
+socket.io@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.0.4.tgz#c1a4590ceff87ecf13c72652f046f716b29e6014"
   dependencies:
-    debug "2.3.3"
-    engine.io "1.8.3"
-    has-binary "0.1.7"
-    object-assign "4.1.0"
-    socket.io-adapter "0.5.0"
-    socket.io-client "1.7.3"
-    socket.io-parser "2.3.1"
+    debug "~2.6.6"
+    engine.io "~3.1.0"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.0.4"
+    socket.io-parser "~3.1.1"
 
 sockjs-client@1.1.4:
   version "1.1.4"
@@ -6418,12 +8242,40 @@ sockjs@0.3.19:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
+socks-proxy-agent@2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz#86ebb07193258637870e13b7bd99f26c663df3d3"
+  dependencies:
+    agent-base "2"
+    extend "3"
+    socks "~1.1.5"
+
+socks@1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
+  dependencies:
+    ip "^1.1.2"
+    smart-buffer "^1.0.4"
+
+socks@~1.1.5:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.10.tgz#5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"
+  dependencies:
+    ip "^1.1.4"
+    smart-buffer "^1.0.13"
+
 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@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
@@ -6448,7 +8300,7 @@ source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
-source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.6:
+source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
@@ -6529,9 +8381,11 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
-stackframe@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
+ssri@^5.2.4:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.2.4.tgz#9985e14041e65fc397af96542be35724ac11da52"
+  dependencies:
+    safe-buffer "^5.1.1"
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -6548,14 +8402,28 @@ statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
-stream-browserify@^2.0.1:
+stream-browserify@^2.0.0, stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
-stream-http@^2.7.2:
+stream-combiner2@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
+  dependencies:
+    duplexer2 "~0.1.0"
+    readable-stream "^2.0.2"
+
+stream-each@^1.1.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd"
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.0.0, stream-http@^2.7.2:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
   dependencies:
@@ -6565,15 +8433,39 @@ stream-http@^2.7.2:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
+stream-shift@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+
+stream-splicer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz#1b63be438a133e4b671cc1935197600175910d83"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.2"
+
+stream-to-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10"
+  dependencies:
+    any-observable "^0.2.0"
+
+streamroller@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
+  dependencies:
+    date-format "^1.2.0"
+    debug "^3.1.0"
+    mkdirp "^0.5.1"
+    readable-stream "^2.3.0"
+
 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-length@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
-  dependencies:
-    strip-ansi "^3.0.0"
+string-template@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
@@ -6590,7 +8482,7 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@^1.0.0, string_decoder@~1.0.3:
+string_decoder@^1.0.0, string_decoder@~1.0.0, string_decoder@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:
@@ -6624,6 +8516,13 @@ strip-ansi@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
 
+strip-bom-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca"
+  dependencies:
+    first-chunk-stream "^2.0.0"
+    strip-bom "^2.0.0"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -6663,6 +8562,12 @@ stylus-lookup@^1.0.1:
     debug "^3.1.0"
     is-relative-path "~1.0.0"
 
+subarg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
+  dependencies:
+    minimist "^1.1.0"
+
 sugarss@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44"
@@ -6685,18 +8590,18 @@ supports-color@^3.1.0, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-  dependencies:
-    has-flag "^2.0.0"
-
 supports-color@^5.1.0, supports-color@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a"
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
+  dependencies:
+    has-flag "^3.0.0"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -6709,6 +8614,20 @@ svgo@^0.7.0:
     sax "~1.2.1"
     whet.extend "~0.9.9"
 
+symbol-observable@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
+
+symbol-observable@^0.2.2:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
+
+syntax-error@^1.1.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c"
+  dependencies:
+    acorn-node "^1.2.0"
+
 table@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
@@ -6753,22 +8672,44 @@ tcomb@^2.5.1:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
 
+temp@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
+  dependencies:
+    os-tmpdir "^1.0.0"
+    rimraf "~2.2.6"
+
 text-encoding@0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
 
-text-table@~0.2.0:
+text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
+textextensions@2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.2.0.tgz#38ac676151285b658654581987a0ce1a4490d286"
+
 throttleit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
 
-through@^2.3.6:
+through2@^2.0.0, through2@^2.0.1:
+  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.2.7 <3", through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
+thunkify@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
+
 thunky@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
@@ -6777,19 +8718,27 @@ time-stamp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
 
+timed-out@^4.0.0, timed-out@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+
+timers-browserify@^1.0.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d"
+  dependencies:
+    process "~0.11.0"
+
 timers-browserify@^2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
   dependencies:
     setimmediate "^1.0.4"
 
-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"
+timespan@2.3.x:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929"
 
-tmp@0.0.x, tmp@^0.0.33:
+tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   dependencies:
@@ -6850,16 +8799,28 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+tsscmp@~1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.5.tgz#7dc4a33af71581ab4337da91d85ca5427ebd9a97"
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
 
+tty-browserify@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
   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"
@@ -6881,7 +8842,7 @@ type-is@~1.6.15:
     media-typer "0.3.0"
     mime-types "~2.1.15"
 
-typedarray@^0.0.6:
+typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
@@ -6900,14 +8861,21 @@ uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
 
-uglify-js@3.3.x:
+uglify-es@^3.3.4:
   version "3.3.10"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.10.tgz#8e47821d4cf28e14c1826a0078ba0825ed094da8"
+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.10.tgz#8b0b7992cebe20edc26de1bf325cef797b8f3fa5"
   dependencies:
     commander "~2.14.1"
     source-map "~0.6.1"
 
-uglify-js@^2.6, uglify-js@^2.8.29:
+uglify-js@3.3.x:
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.12.tgz#efd87c16a1f4c674a8a5ede571001ef634dcc883"
+  dependencies:
+    commander "~2.14.1"
+    source-map "~0.6.1"
+
+uglify-js@^2.6:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -6920,21 +8888,30 @@ 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"
 
-uglifyjs-webpack-plugin@^0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+uglifyjs-webpack-plugin@^1.1.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.2.tgz#e7516d4367afdb715c3847841eb46f94c45ca2b9"
   dependencies:
-    source-map "^0.5.6"
-    uglify-js "^2.8.29"
-    webpack-sources "^1.0.1"
+    cacache "^10.0.1"
+    find-cache-dir "^1.0.0"
+    schema-utils "^0.4.2"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    uglify-es "^3.3.4"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
 
 uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
-ultron@1.0.x:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
+ultron@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+
+umd@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.2.tgz#95bdbc6d3983050df600431f44e5faeb4b7b3d45"
 
 underscore.string@2.3.x:
   version "2.3.3"
@@ -6944,6 +8921,10 @@ underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
 
+underscore@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
+
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -6967,6 +8948,18 @@ uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
 
+unique-filename@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
+  dependencies:
+    imurmurhash "^0.1.4"
+
 universalify@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
@@ -6982,6 +8975,10 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
+untildify@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.2.tgz#7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"
+
 upath@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.0.tgz#b4706b9461ca8473adf89133d235689ca17f3656"
@@ -6989,6 +8986,10 @@ upath@1.0.0:
     lodash "3.x"
     underscore.string "2.3.x"
 
+upath@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d"
+
 upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
@@ -7003,6 +9004,10 @@ urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
+url-join@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
+
 url-loader@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.0.1.tgz#61bc53f1f184d7343da2728a1289ef8722ea45ee"
@@ -7011,6 +9016,18 @@ url-loader@^1.0.1:
     mime "^2.0.3"
     schema-utils "^0.4.3"
 
+url-parse-lax@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  dependencies:
+    prepend-http "^1.0.1"
+
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  dependencies:
+    prepend-http "^2.0.0"
+
 url-parse@1.0.x:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
@@ -7025,7 +9042,11 @@ url-parse@^1.1.8:
     querystringify "~1.0.0"
     requires-port "~1.0.0"
 
-url@^0.11.0:
+url-to-options@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
+
+url@^0.11.0, url@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
   dependencies:
@@ -7066,7 +9087,7 @@ util.promisify@1.0.0:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
 
-util@0.10.3, util@^0.10.3:
+util@0.10.3, util@^0.10.3, util@~0.10.1:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -7088,6 +9109,14 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
+uws@~9.14.0:
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
+
+v8-compile-cache@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4"
+
 v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
@@ -7129,7 +9158,37 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vm-browserify@0.0.4:
+vinyl-file@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.3.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+    strip-bom-stream "^2.0.0"
+    vinyl "^1.1.0"
+
+vinyl@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
+  dependencies:
+    clone "^1.0.0"
+    clone-stats "^0.0.1"
+    replace-ext "0.0.1"
+
+vinyl@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c"
+  dependencies:
+    clone "^2.1.1"
+    clone-buffer "^1.0.0"
+    clone-stats "^1.0.0"
+    cloneable-readable "^1.0.0"
+    remove-trailing-separator "^1.0.1"
+    replace-ext "^1.0.0"
+
+vm-browserify@0.0.4, vm-browserify@~0.0.1:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
   dependencies:
@@ -7204,9 +9263,9 @@ vue-style-loader@^4.0.2:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.5.15:
-  version "2.5.15"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.15.tgz#cc004097e37167be8b85ea22ab2840d8e8cca1c0"
+vue-template-compiler@^2.5.16:
+  version "2.5.16"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz#93b48570e56c720cdf3f051cc15287c26fbd04cb"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -7215,17 +9274,17 @@ vue-template-es2015-compiler@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
 
-vue@^2.5.15:
-  version "2.5.15"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.15.tgz#fdb67861dde967cd8d1b53116380f2f269b45202"
+vue@^2.5.16:
+  version "2.5.16"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.16.tgz#07edb75e8412aaeed871ebafa99f4672584a0085"
 
-watchpack@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
+watchpack@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz#231e783af830a22f8966f65c4c4bacc814072eed"
   dependencies:
-    async "^2.1.2"
-    chokidar "^1.7.0"
+    chokidar "^2.0.2"
     graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
 
 wbuf@^1.1.0, wbuf@^1.7.2:
   version "1.7.2"
@@ -7233,7 +9292,55 @@ wbuf@^1.1.0, wbuf@^1.7.2:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-webpack-dev-middleware@1.12.2, webpack-dev-middleware@^1.12.0:
+webpack-addons@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/webpack-addons/-/webpack-addons-1.1.5.tgz#2b178dfe873fb6e75e40a819fa5c26e4a9bc837a"
+  dependencies:
+    jscodeshift "^0.4.0"
+
+webpack-cli@^2.0.12:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.0.12.tgz#64db876d044f03d8d6544281854b71a3a3c77dd3"
+  dependencies:
+    chalk "^2.3.2"
+    cross-spawn "^6.0.5"
+    diff "^3.5.0"
+    enhanced-resolve "^4.0.0"
+    glob-all "^3.1.0"
+    global-modules "^1.0.0"
+    got "^8.2.0"
+    inquirer "^5.1.0"
+    interpret "^1.0.4"
+    jscodeshift "^0.5.0"
+    listr "^0.13.0"
+    loader-utils "^1.1.0"
+    lodash "^4.17.5"
+    log-symbols "^2.2.0"
+    mkdirp "^0.5.1"
+    p-each-series "^1.0.0"
+    p-lazy "^1.0.0"
+    prettier "^1.5.3"
+    resolve-cwd "^2.0.0"
+    supports-color "^5.3.0"
+    v8-compile-cache "^1.1.2"
+    webpack-addons "^1.1.5"
+    yargs "^11.0.0"
+    yeoman-environment "^2.0.0"
+    yeoman-generator "^2.0.3"
+
+webpack-dev-middleware@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.0.1.tgz#7ffd6d0192883c83d3f262e8d7dec822493c6166"
+  dependencies:
+    loud-rejection "^1.6.0"
+    memory-fs "~0.4.1"
+    mime "^2.1.0"
+    path-is-absolute "^1.0.0"
+    range-parser "^1.0.3"
+    url-join "^4.0.0"
+    webpack-log "^1.0.1"
+
+webpack-dev-middleware@^1.12.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
   dependencies:
@@ -7243,9 +9350,9 @@ webpack-dev-middleware@1.12.2, webpack-dev-middleware@^1.12.0:
     range-parser "^1.0.3"
     time-stamp "^2.0.0"
 
-webpack-dev-server@2.11.1:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.11.1.tgz#6f9358a002db8403f016e336816f4485384e5ec0"
+webpack-dev-server@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.1.tgz#3c0fdd1ba3b50ebc79858a0e6b9ccdd1565b0c24"
   dependencies:
     ansi-html "0.0.7"
     array-includes "^3.0.3"
@@ -7272,8 +9379,18 @@ webpack-dev-server@2.11.1:
     spdy "^3.4.1"
     strip-ansi "^3.0.0"
     supports-color "^5.1.0"
-    webpack-dev-middleware "1.12.2"
-    yargs "6.6.0"
+    webpack-dev-middleware "3.0.1"
+    webpack-log "^1.1.2"
+    yargs "9.0.1"
+
+webpack-log@^1.0.1, webpack-log@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.1.2.tgz#cdc76016537eed24708dc6aa3d1e52189efee107"
+  dependencies:
+    chalk "^2.1.0"
+    log-symbols "^2.1.0"
+    loglevelnext "^1.0.1"
+    uuid "^3.1.0"
 
 webpack-merge@^4.1.2:
   version "4.1.2"
@@ -7281,39 +9398,36 @@ webpack-merge@^4.1.2:
   dependencies:
     lodash "^4.17.5"
 
-webpack-sources@^1.0.1:
+webpack-sources@^1.0.1, webpack-sources@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.11.0.tgz#77da451b1d7b4b117adaf41a1a93b5742f24d894"
+webpack@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.1.1.tgz#44e4d6a869dd36fdfc0b227f9bd865a4bccfd81c"
   dependencies:
     acorn "^5.0.0"
-    acorn-dynamic-import "^2.0.0"
+    acorn-dynamic-import "^3.0.0"
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
-    async "^2.1.2"
-    enhanced-resolve "^3.4.0"
-    escope "^3.6.0"
-    interpret "^1.0.0"
-    json-loader "^0.5.4"
-    json5 "^0.5.1"
+    chrome-trace-event "^0.1.1"
+    enhanced-resolve "^4.0.0"
+    eslint-scope "^3.7.1"
     loader-runner "^2.3.0"
     loader-utils "^1.1.0"
     memory-fs "~0.4.1"
+    micromatch "^3.1.8"
     mkdirp "~0.5.0"
+    neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
-    source-map "^0.5.3"
-    supports-color "^4.2.1"
-    tapable "^0.2.7"
-    uglifyjs-webpack-plugin "^0.4.6"
-    watchpack "^1.4.0"
+    schema-utils "^0.4.2"
+    tapable "^1.0.0"
+    uglifyjs-webpack-plugin "^1.1.1"
+    watchpack "^1.5.0"
     webpack-sources "^1.0.1"
-    yargs "^8.0.2"
 
 websocket-driver@>=0.5.1:
   version "0.7.0"
@@ -7326,19 +9440,19 @@ websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
 
+when@^3.7.7:
+  version "3.7.8"
+  resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
+
 whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
 
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-
 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.10, which@^1.2.9:
+which@^1.0.9, which@^1.1.1, which@^1.2.1, which@^1.2.10, which@^1.2.14, which@^1.2.9:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -7366,6 +9480,13 @@ wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
+worker-farm@^1.5.2:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.4.tgz#4debbe46b40edefcc717ebde74a90b1ae1e909a1"
+  dependencies:
+    errno "~0.1.7"
+    xtend "~4.0.1"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -7377,32 +9498,41 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
+write-file-atomic@^1.2.0:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    slide "^1.1.5"
+
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
   dependencies:
     mkdirp "^0.5.1"
 
-ws@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f"
+ws@~3.3.1:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
   dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
-wtf-8@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+    ultron "~1.1.0"
 
 xml-char-classes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
 
-xmlhttprequest-ssl@1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
+xmlhttprequest-ssl@~1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
 
-xtend@^4.0.0:
+xregexp@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+
+xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
@@ -7410,43 +9540,29 @@ y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
-yargs-parser@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
-  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"
   dependencies:
     camelcase "^4.1.0"
 
-yargs@6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+yargs-parser@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
   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 "^4.2.0"
+    camelcase "^4.1.0"
 
-yargs@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+yargs@9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"
@@ -7462,6 +9578,29 @@ yargs@^8.0.2:
     y18n "^3.2.1"
     yargs-parser "^7.0.0"
 
+yargs@^11.0.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.1.1"
+    find-up "^2.1.0"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^9.0.2"
+
+yargs@~1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.2.6.tgz#9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b"
+  dependencies:
+    minimist "^0.1.0"
+
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
@@ -7480,3 +9619,51 @@ yauzl@2.4.1:
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+
+yeoman-environment@^2.0.0, yeoman-environment@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.0.5.tgz#84f22bafa84088971fe99ea85f654a3a3dd2b693"
+  dependencies:
+    chalk "^2.1.0"
+    debug "^3.1.0"
+    diff "^3.3.1"
+    escape-string-regexp "^1.0.2"
+    globby "^6.1.0"
+    grouped-queue "^0.3.3"
+    inquirer "^3.3.0"
+    is-scoped "^1.0.0"
+    lodash "^4.17.4"
+    log-symbols "^2.1.0"
+    mem-fs "^1.1.0"
+    text-table "^0.2.0"
+    untildify "^3.0.2"
+
+yeoman-generator@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-2.0.3.tgz#19426ed22687ffe05d31526c3f1c2cf67ba768f3"
+  dependencies:
+    async "^2.6.0"
+    chalk "^2.3.0"
+    cli-table "^0.3.1"
+    cross-spawn "^5.1.0"
+    dargs "^5.1.0"
+    dateformat "^3.0.2"
+    debug "^3.1.0"
+    detect-conflict "^1.0.0"
+    error "^7.0.2"
+    find-up "^2.1.0"
+    github-username "^4.0.0"
+    istextorbinary "^2.1.0"
+    lodash "^4.17.4"
+    make-dir "^1.1.0"
+    mem-fs-editor "^3.0.2"
+    minimist "^1.2.0"
+    pretty-bytes "^4.0.2"
+    read-chunk "^2.1.0"
+    read-pkg-up "^3.0.0"
+    rimraf "^2.6.2"
+    run-async "^2.0.0"
+    shelljs "^0.8.0"
+    text-table "^0.2.0"
+    through2 "^2.0.0"
+    yeoman-environment "^2.0.5"

From 5cdf3b1d793751a9e4d8529558c4cbd95955e7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=95=8F?= <cookfront@gmail.com>
Date: Thu, 15 Mar 2018 10:17:51 +0800
Subject: [PATCH 17/48] [new feature] Tabs: support switch tabs with swipe
 gestrue in the content (#694)

---
 docs/demos/views/tab.vue                   |  14 ++++-
 docs/markdown/en-US/tab.md                 |  14 +++++
 docs/markdown/zh-CN/tab.md                 |  13 +++++
 packages/stepper/index.vue                 |   1 +
 packages/tabs/index.vue                    |  58 +++++++++++++++++++--
 packages/vant-css/src/vant-icon-743c0e.ttf | Bin 0 -> 25804 bytes
 test/components/tabs.vue                   |  12 ++++-
 test/specs/tabs.spec.js                    |  33 +++++++++++-
 8 files changed, 137 insertions(+), 8 deletions(-)
 create mode 100644 packages/vant-css/src/vant-icon-743c0e.ttf

diff --git a/docs/demos/views/tab.vue b/docs/demos/views/tab.vue
index f44242dde..743e892bc 100644
--- a/docs/demos/views/tab.vue
+++ b/docs/demos/views/tab.vue
@@ -58,6 +58,14 @@
         </van-tab>
       </van-tabs>
     </demo-block>
+
+    <demo-block :title="$t('title8')">
+      <van-tabs :active="active" swipeable>
+        <van-tab :title="$t('tab') + index" v-for="index in tabs" :key="index">
+          {{ $t('content') }} {{ index }}
+        </van-tab>
+      </van-tabs>
+    </demo-block>
   </demo-section>
 </template>
 
@@ -71,7 +79,8 @@ export default {
       title4: '样式风格',
       title5: '点击事件',
       title6: '粘性布局',
-      title7: '自定义标签'
+      title7: '自定义标签',
+      title8: '滑动切换'
     },
     'en-US': {
       tab: 'Tab ',
@@ -81,7 +90,8 @@ export default {
       title4: 'Card Style',
       title5: 'Click Event',
       title6: 'Sticky',
-      title7: 'Custom Tab'
+      title7: 'Custom Tab',
+      title8: 'Swipeable'
     }
   },
 
diff --git a/docs/markdown/en-US/tab.md b/docs/markdown/en-US/tab.md
index f7d2a4e21..8cdb54a83 100644
--- a/docs/markdown/en-US/tab.md
+++ b/docs/markdown/en-US/tab.md
@@ -124,6 +124,18 @@ Use title slot to custom tab title
 </van-tabs>
 ```
 
+#### Swipeable
+
+In swipeable mode, you can switch tabs with swipe gestrue in the content
+
+```html
+<van-tabs :active="active" swipeable>
+  <van-tab v-for="index in 4" :title="'tab ' + index">
+    content {{ index }}
+  </van-tab>
+</van-tabs>
+```
+
 ### Tabs API
 
 | Attribute | Description | Type | Default | Accepted Values |
@@ -132,6 +144,8 @@ Use title slot to custom tab title
 | active | Index of active tab | `String` `Number` | `0` | - |
 | duration | Toggle tab's animation time | `Number` | `0.2` | - | - |
 | swipe-threshold | Set swipe tabs threshold | `Number` | `4` | - | - |
+| sticky | Whether to use sticky mode | `Boolean` | `false` | - |
+| swipeable | Whether to switch tabs with swipe gestrue in the content | `Boolean` | `false` | - |
 
 ### Tab API
 
diff --git a/docs/markdown/zh-CN/tab.md b/docs/markdown/zh-CN/tab.md
index 3ac38def3..c234922cc 100644
--- a/docs/markdown/zh-CN/tab.md
+++ b/docs/markdown/zh-CN/tab.md
@@ -124,6 +124,18 @@ export default {
 </van-tabs>
 ```
 
+#### 滑动切换
+
+通过`swipeable`属性可以开启滑动切换tab
+
+```html
+<van-tabs :active="active" swipeable>
+  <van-tab v-for="index in 4" :title="'选项 ' + index">
+    内容 {{ index }}
+  </van-tab>
+</van-tabs>
+```
+
 ### Tabs API
 
 | 参数 | 说明 | 类型 | 默认值 | 可选 |
@@ -133,6 +145,7 @@ export default {
 | duration | 切换 tab 的动画时间 | `Number` | `0.2` | - |
 | swipe-threshold | 滚动阀值，设置 Tab 超过多少个可滚动 | `Number` | `4` | - |
 | sticky | 是否使用粘性定位布局 | `Boolean` | `false` | - |
+| swipeable | 是否可以滑动内容切换 | `Boolean` | `false` | - |
 
 ### Tab API
 
diff --git a/packages/stepper/index.vue b/packages/stepper/index.vue
index 7b925c0e3..4ab313c3c 100644
--- a/packages/stepper/index.vue
+++ b/packages/stepper/index.vue
@@ -103,6 +103,7 @@ export default create({
     onInput(event) {
       const { value } = event.target;
       this.currentValue = value ? this.correctValue(+value) : value;
+      event.target.value = this.currentValue;
       this.emitInput();
     },
 
diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index e55607139..f5bd1c9aa 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -26,7 +26,7 @@
         </div>
       </div>
     </div>
-    <div class="van-tabs__content">
+    <div class="van-tabs__content" ref="content">
       <slot />
     </div>
   </div>
@@ -63,7 +63,8 @@ export default create({
     swipeThreshold: {
       type: Number,
       default: 4
-    }
+    },
+    swipeable: Boolean
   },
 
   data() {
@@ -71,7 +72,11 @@ export default create({
       tabs: [],
       position: 'content-top',
       curActive: 0,
-      navBarStyle: {}
+      navBarStyle: {},
+      pos: {
+        x: 0,
+        y: 0
+      }
     };
   },
 
@@ -115,6 +120,9 @@ export default create({
       if (this.sticky) {
         this.scrollHandler(true);
       }
+      if (this.swipeable) {
+        this.swipeableHandler(true);
+      }
       this.scrollIntoView();
     });
   },
@@ -124,6 +132,10 @@ export default create({
     if (this.sticky) {
       this.scrollHandler(false);
     }
+    /* istanbul ignore next */
+    if (this.swipeable) {
+      this.swipeableHandler(false);
+    }
   },
 
   methods: {
@@ -136,6 +148,46 @@ export default create({
       }
     },
 
+    // whether to bind content swipe listener
+    swipeableHandler(init) {
+      const swipeableEl = this.$refs.content;
+
+      this.touchMoveHandler = scrollUtils.debounce(this.watchTouchMove.bind(this), 500);
+
+      (init ? on : off)(swipeableEl, 'touchstart', this.recordTouchStartPosition, true);
+      (init ? on : off)(swipeableEl, 'touchmove', this.touchMoveHandler, true);
+    },
+
+    // record swipe touch start position
+    recordTouchStartPosition(e) {
+      this.pos = {
+        x: e.touches[0].clientX,
+        y: e.touches[0].clientY
+      };
+    },
+
+    // watch swipe touch move
+    watchTouchMove(e) {
+      const { pos } = this;
+      const dx = e.touches[0].clientX - pos.x;
+      const dy = e.touches[0].clientY - pos.y;
+      const isForward = dx > 0;
+      const isHorizontal = Math.abs(dy) < Math.abs(dx);
+      const minSwipeDistance = 50;
+
+      /* istanbul ignore else */
+      if (isHorizontal && Math.abs(dx) >= minSwipeDistance) {
+        const active = +this.curActive;
+
+        /* istanbul ignore else */
+        if (isForward && active !== 0) {
+          this.curActive = active - 1;
+        } else if (!isForward && active !== this.tabs.length - 1) {
+          this.curActive = active + 1;
+        }
+      }
+    },
+
     // adjust tab position
     onScroll() {
       const scrollTop = scrollUtils.getScrollTop(this.scrollEl);
diff --git a/packages/vant-css/src/vant-icon-743c0e.ttf b/packages/vant-css/src/vant-icon-743c0e.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..efcd83914614dd107aaa2933a3286c6055220129
GIT binary patch
literal 25804
zcmd_Td0=E!nKyjTy>++R_gj_Pt5Q|jQ>jW-W$UCn={3DUZ*(^e-RUgdfpn5iLU)6r
z4xlWeBA||_;3$KP<ESsFAfnF5$T;fwqB6LRC^N|BD^o1`IoP>;zjN+QIt}q1=KJ@n
z)H(O;b(ZHm=h@B;M>vkNaqr>;uCQtM-ofO1vsZB(=|bwBox9tM8(Vh$3Gtf|-#2<<
zWcIZyK70+w35PgNI&*C5%8BT=I<Dq8>+Kx3`}@boN5)(a-1!ld{WV<WI1=QaTGk-^
zFkJod6ANc9KmGc@puMNz&P>gWj(qR`dBD$c>f^}&#)*+Lv*cam7UYExPfm}V82{Wq
zM>cZYrAIi9PtVTGFFaQ|#&g_}>p0G`kwf2w=TMRpo`3yMum4_ng{GYMxs;_K^&?Y1
z`<KJ6zTa~;qs9|^Tb`#S=@WHd5nd5~hp57#b@rhxT}rOwXixCta8~?r-0L)o56!o7
z1+Jgt*KgdmhjUJiEKGBCoQ35Y`76U@YVz0!+Bb3t%F$ec6v9bMslqQYdJ#YOHlEJd
z&Bl}bn(H9w0ndp7Qdjw0FtK5bTU+C5huG*2Vk{06TQM8LbFaS+_a~Z<*+STuyEi{q
z$-_(;_08vUd}UdLS-RQoo64*#yRytu+cbY=8)kgDpRb=a`pVMHu-T3=HgilgAL%Rm
z!rEQgo>_*q{rcj$IXEx<{PD2gc;oLawaK1FJ1c${D}c4c&f>ThIIK5sH`atmNTsXO
zf+wH~=@#zitc-=G*ABf7IID5gN8ErE9%U_PQQ~Akjf#3U&W?3<axTuzc{nfU<NREJ
z3vwEuHVjyda8WMC#kmBR<WgLk%W(BvmdkN@u7PXhnz&~Cek<3;wF8bjxFT2LI=M1e
z;i_C0*Uj~Cy<8u+1`s~Lt>xBngWM3ep4-4}<Ti1exh>o<x0Tz*ZRd7yJGl$E3%Om~
zZf*~^m)pl(#O>z}a0j`IxkKC~7yyOu|G$6ibOJ0><}_edY6w!t)|;+5g$L~Nn&~Lq
z)J#Vqpk_J>Q#I33%uzEPpn|KJj^de`=>REQ&2$vjYNiA9a5d8bj<}lXDCVe{4zR`5
zOb00AYNi9caW&Hc^0=Dm0E1l3bbv;#W;(znS2G<Tl&hHzu*%g;2dL$0rlVN5W;#GJ
zS2G=8nyZ-((9P9M2RP?yrUS%tHPZq1xti&)3%Hu;uphXZ>98}nn(44dxSHv(TezC(
zuy44U>9B*in(45YxSHv(tGJr!u)nyP>9Etdn(46TxSHv(`?#9vD1NA!4m*;onGSoC
ztC<eFl&hHz`<1Ji4m+2tnGSoHtC<eFnX8!&`<knn4m+HynGSoMtC<eFo~xM-`=6_s
z4w!(enGQICtC<eifvcGgc!H~$4j6;0nGU#vtC<d1gsYj3TZ^#ifLXYj>40Onn(2UT
zxSHvJcetAAfPuK0>41y4n(2U*xSHvJpSYUofT_5e>43Ain(2VOxSHvJ$GDp5fYG>`
z>44j~n(2V$xSHvJ@3@-jfcdzZ>3{>dn(2TIxti&K7rC10fFZe>>3}P_n(2Twxti&K
zKe?LefJwQU>3~zYn(2UDxti&KXK`j2j$&MVj&on+UM9Emb$lB?D0B%^!sC{0mXC|;
z#iylh(&yxQ`7-%V`KL-wxm}gigX-tiA6f0zcUYgcueHC!{_l=y#|zFg&X2p+yB>5s
z;~sYZ)HCbReedx7+&}EUDG&_Y5bO)y8~lUzm)bL-bZ8;;Liiu+LUm{Ao{aQIz7+LF
z?}<Jhi^opIk0%;Zb*b6Z!|6);vzcJ#Q0CV99rZuR9?BJRpUV9qzdnC7|APj5!_mfu
z##4>AG(LmA3$NoNJcn~R0!YVNlX7RJ7>topG3b|?Nx(0qb8AQ@o$IWWeCd2HpL16$
z)k;zeYC*Rw$x^;Z<DE1oP2+x=L%y%2wMX5dko!>@@MxOn#Tyn*4y|85baH{XmqIsO
zH966@W=-G3<f}^oKFUh7YD@JOpFY2uUZV{Z&#T8809FTu`MU5l#^a|uH?>-ig-lxV
z2YWHLV6n0WBdv7inlbKNS_+WbD&4&AF;6(`c`Td`F9%lZ5FcMzf)zDrTsFThiiJFw
z#Z)mE@c5-nDxE8njFYggNWp$mu9kvkSK5da=xr2|jlI2%XMf$;OaAx6?qJaUFbO6D
z<ZJFg!2LCZgzJ{_dmG7DNFW(NDH34Cf+$6TZVI0~rEP@gF(*}So~<xO8pE2hS@181
z-Z&rml`|6~B%gDVV1fiI1Ehiux=60vN!PweSKLq69<z-iS};kI-4rB}G&$fW4?28~
zEvmzz-hDUo9bV_BtqzCv)8uaY*n+qoU#Gf7t2(Q?`3P_Ix_NuKuXps=e;ym_>Fetm
zJNDv);#EaumPm6a)(sA>J29vK*U9O%L;RYXRHswD$>DPf{G8M0JVm3Y5SZfyr_W*J
z>fdzps?RM%d8;~O#SdAFV+(J)>{wraf8Vjo{y+n3MA73Fht6Ny8{W<4ka}3h=YivZ
z2}m(c0v<ZRe6F2Ts+n@BoGD{QT_lhRl;Bd5j66DenN3NFZWBz67VtX>*1nCDJ)Qle
z<f|YJr84P!8ydo&u(^4-+38QVtxfJvmlKb^{PIynA>`Fpze{fLWv6$J_2%Mr?u@Oi
zP~LRWo?Sz`KD}!lYAo)Dhwq+&EtP}aYljBA8nP)z%$ukao}=0S#fw%)(3W&ue0pQU
zX+^ReYgpefv?=TKx~v|zuW9^XB-Y-#yJ1r%A{j05_tJV#$(p-mQ@%0aT{9SVSyc?4
z%|#sWByyaOR8^AyF8Tdo{c`f5!{k-newcg+p`~(7Mmd$pD$#@{-G*%aaug)5q6$Kc
zQ{#mHWbk<@cNuqzyOz6!`xN&jG;uyQS{*O-qEwY(C>mne%SW--idjyv^`f{8vz|kS
zge@2>5sKD&2`juZoW&Ypg|I%TCwI1yG`4A+6#GfGl+X3EUEn0mtcsS=f=&V`K)TTs
z`G`B{>b1FCw)c^n>EmWs&~>xT?Y7-a-bWw3uAuwvcDLKEznCA)<p%ToU3hvlPqBV+
zq`p|JC;w*icx>;qdp!2V?@|9o>hYf)e&<KtIn2E7-tp7pz0A`exT{6xeVTHi%)4#B
zK)cW0)vO3!mf*6}1pdVxR=3-_!yRymmPzzxl6H#)ETSvmHgXrQK^JoCa{Nc&;j90c
z_K~z^ip9+0WTu1PgnWGUes{=?Z*=$_TeiI8cIplHj`sGBo}%6dI#tcZt4GzK%dL6t
zEh8qdm`4LP;u-8vTx6pZpr;e)5KDm-DHETub4q~{+fCR}zKo6V!qYr|Hp-LOUGq2I
zc;ot;Zn|mVuI)G7Bs{~Cc|p;i%WunHbrn1kdfk9dO2y+G_!ai604i)9rAD$TPpaBT
zA%vpf81OE|{>!MJp+V*`&`1?43{+&m3Lpj1&K#itL;+0r_}NE<HAH_^-|ush7aV?H
z)YsGaqd+|HSYyxTNIoAC`l)|x@fN4w@8oBlKA-;Yp_HbjLWAVQ;9<m_S>`qMOt}I9
z*Hll_;apU|jn*P3BKg1eNBsEmha$OLIhW%s42M4_+zo!92>K2blurUkGEB=3-=su3
z0#4#06y-<;YU-q@n&K3Sq4AephGW3AY(O|W=rcn@?|F_mm(FGV<>&Z2c$<S?yRoyQ
zr)U4gxrF4Pv2uG)&w+!@brR7ZNmLSv$^i9T-h>z5Xg(k1zd!cucNTiPkB+@CKGNMg
zuRp>|Han>%G+DK}`@;#z?XZ(dB7~@?KUOD72V%vZVvKojvj@TfM<f?9IC*+z9R@Fy
zrgU`HI5Dwc#tBNWE-pehF<Yr(8_8r-z_D~i>Hencn;_&)o2>s#v04?9mu-Cc>>61n
zBpwj13B-wDRnPVb-?a*SJaG0Mfw*k3yhMu*vhoqhBIs8IVzB^uhh4o~68Pi(c-%ii
zaWO=4431v}d<D3*I1~19hq)=NNecKv60iWGR*#AIRx7!D%E!)$vcS_-0oGvWZjmmC
zFQ~<dhK@4$%A|5W3TL!{wv2y(i?XYxzE@CucG0;{tS{*f3;9E3gKMA5nr}P%$_K5I
zg_nBTt+seTi_l#hvHC4?dpEHw0hiye@J@<{7XRQ}7f2+U6NzBF6pxqss7EH=lqBr1
z`22nPYfeeYm2#@Bg(&@vRdw+jqD8PMG8rVCR_Cy~0xnhc{7L_o$7gpdsziWjEV>?R
zh(;S?m1ujlJ<7bwn^G8Fz<zy!odGA`g!e(CtU`}cY>zXSp>PxLlWHYSDHF-S$C%hR
zQl<bAl#rz)U5gc@EZ^x4de&34`^ir--yL)t0p@Q&l>A4#%`e(*Cv85VPOt}kf~~i&
zXLRCs6Qh(s8J+k)<JO>Evd-y$n4cLO8XBCLC${<7bwm8jwR8=xb!%>mFafOi2^#$b
z5aNVjL86hX-((l;nxBsfcH6YwC)sUn$6h)%-rLvLJAUkC8t9b(7}6W)6a6IyiYxGH
zit>5qVOB9%!TFTWigap%r7X~b7WDNKx>?!*k1-<SSVW$SI7vXGJ11COLcII|;60h&
z%uD)r^~WTBSWqMqkc0!53SSUJ(Gs=Dzi|smUiz^GG2xFs?-FX}>q5jXeNp85`+4yT
zvMoX6Up*u1-y@Rc%NB`<lKAlsvQ8D0eG>5#Nqo>Ek{%I6#S%QwbHYwJVHN$#<%N<K
ztW=2*3@lNb`5dD_OOynyVnH*E1#wek$1r2LGcP=^4?8*vj;A(1DtRSxS2o+*Ju>#(
z7_bu!EDWsaDYdNGuzBkn2>*4$bBkVj-jN$0m3f(O)W5p>;KEWhR^R7MbvFirlwLGg
z5*oVUTF}^>2(}6mVDvu%iNG3g&){dX9kP@gz(7pG`5Y4k>QAl)8I8CCU;~tw@)<{t
zU#czzw50&a-t7+yp>izt29ou}lYv`CX0ALwMuBJS_{%g9k5x`+sZ?7s`Lyx)k(Nxh
zrBZt@uzIzx_HWy<=bG86wd>Zcoto9p($Kd*y{V(8>&Ve(jvnd8=g86d3x+p!6GEG4
zOIc{$wxq>~(Q_U9_a%(iPo*$fO6{%~31bSi)tE7|_+}pPsy8eJ9o;J2Uh(`<8%sc8
zXPKw<Qz_P}JRp%Zk_S<}$}j1k*!2XtZkPUp)tcv9w|$3PwoU){^I+7^CI8It2zgnP
zwW?OlSM%ietNhvxcW=9U>AUI=u3gGSv6cKfooC3XRvq1{Jh?C9NtH9J4*7<+O^#DO
ze0=iv2!J6PpS-$Aa<8t|p;Z=w|G55hFx!wNFdpdz1_O{KymcrLAUu%#zz;xhMT(qo
z;I#vp<1CcPt8WcL-gB4Ycgc6%CA<6z{D2F-;tI%}Z<Z6R3ORi6O;ynVn#59@^yD|#
zer|yb4od+_gprYqlc#ivK~yq&L?wv%<>hloqvXm;x-!2)2tb7b{Fj`5S94tdd<?9g
z)1{JKR;T_)(j)twvVOlDly8xEw_oB5i>-lZG{FDZAC3AOy1N?|TN}E&8ijwfI-S-J
z#G0C7A7CNsEj~pmvePf?56DEhPw_bfnHMAevrqUV5x>ynix#@_XP?M-b>)SoJVcP7
znX!H^fTpoy-{dIOMOmI@_UAm3Bttr@V2^-kV<c4#q=0FG*BJT@kl&Z~6^r|hQLl5u
z{Ls++jnvzqJBK$sd-mB4!)HSS!sTmvM<-sG813!jJB#}!XjypuLvuIG4KYu@{@|7k
zJ9lo_a`5W4{J^@N?sO)T?(SK)3}@TGLugcH%II=X>zMO^U^00$EP{cnLat-bgK-{|
zlnfyUU7<CkjW6?Whg1UJ|1cipqlMk2i0|xzFH+iFU}52A7A8f-VOPm@irud0Z$B6Q
zR_Q>W^`JK#_8zqM9hgAmVk#-R7?BdD(wxs(=nGs_Mh|)gU5OFVV0b*DoT>`XQ|3l^
zj{5v)7YTOp_kE4$zjjz};Cb@X-@X6+W;@Rdr&&9Yb-$?{Efat^i?UA!>jcUuQ_aYE
zqgk`@T^IEZldW4zTep(o-ivxSY~&w&nCBlptT*C^elqoLuqQn|U{KzD#T6XYMzFp7
z9CR81=mlbs-DiPuS|I~3W6sxr#=s8um8s|>AeRDF@ND>bbRtt0%c(#<6-Z?P7GkQL
zBH+BTo|H!`c``mv#?wpAe|}e09ja=v@c5E@^`Do?E&43~@Y#^?9CP>c_bu+=pFR8Z
zy=8p9z3d4O@>U*SiB_~&_J9$+zlr9aeS&|XeD-s~o*(PG$mdscba)1jNNG+7Mp&X!
zZIgL0xe9@j-4u8b2mjBb-(cpD0N8=>hA*YGxIkIPHlB(R<Gd!UD`a$gx==`yS2Km(
znZk1PlkQBp{*gqnKejj<?(58iTe=ct@#*?zP5idg?~pAvE!L9agJ7b%a^M8-Z>Z+;
z)dv2KU~5Bo@t#CS+Nb3^BK+f8p&_y<k_mexk2?^QuM=HSjpJl?<~@(SYXzjmu~Jp;
z9_|H<$e@plkWu96K#CCE<tt3Kn})<fV?*qqIa!KpX^AT7CwU=FX~8rl8!4kj8A~St
zSx6~JAnG{c63E0j(&899_)Jjf$VUih0RadPX^=WJLK#tD^ftsRAUWHR296EC0l^og
z)n)KOv=uz)DS(zBHe;R(az~kV0rD|g0S|gIpc3#8^XPejU#s#Lx`F{0xDFC<VF}iE
zkiyT-OGzV@q}7O3|BdRavyzBPtoNw$Ceh^-FSCfUmG|%->#WskX|%}7eg$6{K`WAw
z!CPg~a+xS8E^(9WU8-eK{<~U=Wx19b@s^^RzfqRD^UZE&FrH4wgHCsIzFU$(NJdNE
zNYrDN=*g`tk?TPTzZNZd$W?(vFc=S<Dy+vC3pbHqoJLO<HWcvvm=%Mw*7;NtRWZCR
z%6^dUjf7YgV+?NVWvV8#{>z$rnbmC!8G~r#Wr+@%mgoPw;wmwU?@0$W+3bJ)&Tu3e
z+F6g$(Y`BKm9&w~I$yst6pe&gHXXbY3er6&EyJyi;m8m$4K#u0aW5&Y<jZH|YF-Xh
z^IEl>7c;U}I>(><t^V0PpWlP;`f_5=o<w;MaeS$%=}S#ZY>439t0Uuya`G2@o=sKe
z_B_?p)P&y#eg@6@3X>7FQe7GaxGZBW&T)reEo76eU_>k<Y;o9CgCckj9P<EmdeEoy
z<a&PXhxiAE22alGFE7jvu3tYmyKw!XeV!e=PfZ-{>Fw<~3Jwv0cwbTvh$4AFa*8og
z)VGK(kvz+<+x_V`(1)otiC(akFM_{B?a_(TyS97w4$#sMiKyuk^^KHUGGs$^??<rf
zH&YFjDJ`LAVhM<NCGAmK(mkw}C*r_l8<pY$y63To7#$NUfpcNGMd2sijc0$?(9_ev
zyBBNzSj;c@{IQNz6ZMocZzCsNF45KK(%)|lTEcu-jK%c#I}5%uKA)7AqAoHQ+jXR&
ztE++kR6|!G>R-H+QaAkg;>T7={E4Vp$sR}6X>mIAzg5$Yt>lkl-L{DSIY(4(l-%Ca
z-c|?M0~wM*&(L}C0H(UAwvnXHiEn|&Avz$bbK+YN20)C}bCk@v6|cSlEEwxX>dDv@
zO!RsO6}{?5z}Az`=^tNCbJ@u!k@l-KJ!8jf$H#isEC;$NX?>1qG*n{z+uyH-AT9km
zm7Rt>`hULP3Q?++Mj>{+@yvNG(5BA30bppOOXL158+RJ#^bvLnP*&L>*!)1PnQ9TS
zPDZj(6_geP`36M|@GmfF1pqF|V6!18p?V3(*FFFDY~C^ZjY@ZS<r}{;9<yX*&jm-0
zT(IX6<MG|Fe|>l5>%aPXrF*?U+;jNC-H+_P@Nm!Ssl2nlQoXKP={Fzcy71m3d&70+
zBjED%ZW*kW2L{U3!7aTWS6iiE<Q6Jz`hWf3at--2zYB9?qm~k+6C!)ij1bC|ml<vH
zVe(ZHARi!G@|DW=YE^iakVVK6_18+9OZZZ}r7+w<<r50<RuEXL3>n~M+&gHSYe)uU
zW-m|4%uF6yA&9T4Ak9Eb<j*NIAfbeUm1<Y9Nkw`Bqc5gJ+K^we7}HP0h!2!FwlmJa
z6oj~7C2(Gf=hR51g2PG3#_iC3ZC9P6>nf^q`?^u5`aWO8x2?Xjv;Gn4k#AGEbC1(k
zsvoE?BFnB0sP<B-Cx!3gJ;swixOh+H;tIa}LG~oWJU@F0Rn=Yc0jFBoz8#IP+e=&8
z+gbmwv|V_gLTf(9WVT$+zDToPw7Oi@&H7=q$saTtW<Rj?T)P$aJBIa^!Fwb?WA;E^
z0*O79T~n^YMMWk|nda9rX^b5k6?4(d1B9ul2T%%uE8DgZ2O&WtEA$FJAVB_SKA!hU
z@`V!_SFpXKGaKf8#|Yv7l911x$z)1FK@cI<5^eg!R#Aj#x;GJY>BS`x*k|}V7AN?R
zg+g^9Sz3R*-W@DhZS{5WNQCH^a`G~%PkX$AAUmzH1?+)hk!@b9$CK1tWUHa3AX{PZ
z!Q@(uuAaf^0~F;!-^4&(E(1lckY>}-W+?H?Uo<+ZzjKAmnph-NnEBl7@3wCJ9TiX?
zhp;w4ZV@GmM9)&R{k(7$ATj|8umro2wU|W%s3;vvh2j)y445;tAW~{sh%O+f3_9H}
zv2zWSx{O#}_?T+9t7q?{zOdu$eaY6=q_6}2*{`^){7<Z|@M2@SUAVHKU*t$QcRkrf
zw%^0=v@4IPHk<mGVlOtv9*Z?HPrseQ1)0*<b)?Ci`q6X;saKR1@{;a4z`uR*I;d7L
zgcb6eMsDPPBI5u<`bMh-$_p7Za6U(cQXnl$CfvA|rOK;IMcyoTAbF}dyA6`=4^!Cw
zF!T4XQz30vg7V?a5jmiWf}pP3%gVh)`3d<b8az#FoJL>}ZimgONZ{J%=M_-Hiqp1(
zW-QMQ#XI$|)S1NUIt8#F3`bLz*DuF;iYXvrWKl`3`j}W0Gz=5%VskL8;iJlDiZy&V
z*+7OfkCFS790yK9Hn@B0L)FbcMA8Gh5AN<y^Qt|Pk9tVk_Cq_`Jkfl_X8lD(R4m2j
z=3@KKcH*di@8ZWB2J?mdP@W%xw_D~dVz@7n;YEjqZ%hyRh!QKrf_axKA4GuvW80p=
z`uf2=ZBo!di3!bBxUhh)OQSJIP#S?|nZ#lpyE~Lv>flMLFa0jln=ZcF<&_m{Yj-S4
zEEbYXt?M9ukDM$gd~UZdQBE%HH!9P}P)Gt?Yt--oI0U%Y(}{Vb`WTofcmO28DNxUd
zjD^VuF%5YzDad6Sg(_uAfTFQmD4s@H3QY)73`9jcMk-XdQ5(5#*zWN=u2$5R)<dl=
zs&ci%@39XHvmTYV5DS6WT-3*$>1@42A46C`nuS+AN6Yy;93Gxm<?xZPtn$3aaYw!^
ze9C6iXFPWOlrKu$m2gbcV&RHji~7h-c2AE}kUi+4s)*!ooGzDBzeuFY7bFT!{kG--
zkDU~AR;PvMElz7r|AE~z&`eGMmTYjG@Qm;bbXV`??&UrYjr&8~-*b<0-{+p?&Qk84
zX~!8KXRvm3_rwWC%Jiou8whrgvV~4!o@gwL*`wSY<Mqr_j)e_Akn)55gyHuL)G^eE
zLN+9&K`ob;F{83p$s02Le3i~{7D7~sN>YLCwJOvZl`2RSNL5iU0r1r-<tpk`bLaaN
zsuqx`Pg_AvdRAzZ8%2^lK=LyEX{{QRtE>;KJtnbzk7&8UqVVf^MK~o`;aC`HSgun7
zj|}=n5K51?Qg8tpkIN*UIK8Sxl01P>+2eI5)Pz;ExdpdJaQj^(<QM8R(V1~Y>Kyui
zsyTnq=g7K5pTiyw+I$|X>a_ckYSQg<_Y*asHn_d`q}&0`6AW83VOuCIq|-twBqY*8
zq5)|9q;i}W+`XPY58u@*RC~x_^&(#O-==(1#HN;{OYGZ~?N+aKr?S(=|M)%sU&prU
zBn%2x{YSjjUhfYIlC!lG&ZudZ*BJ`(#7Bf&TuNqTiY}uGce2MJxB9%T9=kh|vZ|un
zX49ISs@Gv_ba`EAHT}{0m?c^7w|nXw!J@+xafUiPUZ2nNPOnAuS<+sM;NxRWZfDtB
zP?dDEy)|c%EdgG!wR#(!?xu|AKrCoUMeQwh^`82G8pwLGVWy)oY~QH-z6BH<c)(TV
z>4eJF;HYpb3mGT)0`P&IIhh_e^l$-nM~jqKJxBEB$PJOm4Wy@>h{Y0@#bdqY#+KGy
zEv<jIJF<JVBZ8l*&Cb@29~bL0C(`xxnW;_T>cMLDK$k!C)1QWx?YZ8CQ=ZDK7;7Sz
zKr=AK5~GRYhTfl|rV_<+OfiP7Kt(CQc7{HNA~fs-ipN0m3%CAo{jP>Ot*&v``X4sr
zuIe8usL`0xKGc6zu5n+!{_4%cLt9G2<t;<Qo8Mla8yq;j^+2>PXtxFHq6fF09vI|z
zJ$zkD!YzYnXuke|UEP&*EWQnbJ;%00G*#{1b#T+*aK3pr+11oQh6gu7nRdzcLcJX_
z7C}~QnZnk?W2Y%fA`CD6AK|^!=9hMl9z>?jj~!DKGoKr6se+wNeq5scy1G73`*jfg
zvf0tE1GHbc`nS`rm-*l9Zq5%6ZaR2+?C{n?#-_*u#60%;!uCtX77lJ493~A-uqZX<
zf*-^g8wCBdomzrs=>(nQ3(fhf$Ywu`-Ylv0j1$3F6^d@?pYUe|>3n!|-&YIm7wrD#
z?hD!rU+vrM^Ljk0s)f?YhWe&dJ{os>yQ-HQdFsd|)h@3)9?hqk>Kl^jkmgU8lgaX0
z>Lm*ow6|YygnAb>c7E!KV+SrOc6JsoI&kcXPjxoh6lI&mVsrR{(L}bPtyt|F+z4i}
zcg-3o2hVIA?5h^r8nTHfu#Js;G1WcPonl^paqsxvBJ<diypA&gI?VyV9i11@9_;j_
zWE7=3AP+U3I3!bfP?yFj3n?OOAefIcmg4<h0^Kte-!a;Zi5WgD)N3zUtVG+PrPcbj
zjG74&F1QqI(!ulVfp|PnRySU}L4BRWW21T~lo0F0mdH!3d`$n@pml5GjW;&#=(Y}$
zp9CVZFc!{*m%ro()jF>p_15Kz#T<3Xz)3AZx;;Vt)?Z~x)pSqh*BB&I_6RQucS7!+
z!S1@48|7xXYXAY~XycM;D4AL|n4~%ooR!%OGa_XX)5LO#RZA_gZvv$^C>>6za!4(y
z3SNc`onjIwh3FA#kmoWJu~LeR*_&augxN)JT~?UNp8ey1x6Vsmg*Q-_J$rjrP-uc~
zrwQrqG`{?c?0MHf!r?WFWt-aDWmWwVi+hjSRPlmvCVYViNE3$!#n2bBVRBl(F`VU3
zCLCbn5{93x>+i42_9s!zku>~NPg=LbOZTM6tMK&icpVSZ`~(WuWv}kX4_<91A>ATr
zwoi0)e8Q&LW!p8^*w_?P{kVa96-a05pvhbhdV|giHGhEx!W#m@TUIE4E5-EFe@eC|
z@%^o#rvB2KN%_^3%;eP&t(4Txd+7PMs6nK-<Mp!`*KdG3{E!Lc{;Y-;6eJy}KbU$`
zfV{MdR7bzMuD-sM%@ThY&-!{22xqf+u6BHo2WW}&zjXiFsfYc0IWSxZR#h8dmwzE_
z<PU%{9_LPQu)E2MVE8~y1t^gOl@2@9GUZBDq^BRF%w(qI!5)Ckf>tU5h++8($LKM$
zh(Tf*<QOVa_?DraqV473Rab<m!6+;(o-g(aF;7P52xX?qt@@K69+2g*q6`i7_d6t2
z^u~I7*Jc$psHj=l8nnq)o8}MMhy4z#U;fhrq3f^TcPg|obm_+XuMBMojcn2Xf`4(*
z%Xb9H`?ocFix=hZyH8sqcr3x7&uOuHwgqy*{dN+JTpG*;+?pH?)cF;!f3&6Eo-4{y
zG$n_hJaJ;*!08WqJPo^cO&Sk6eTGbt+I0xvvLn={Tjf1I==aNTvep4=mC}%gqhS`;
zWJ=vaAE(C`U)z1V>&kDtZ*!md$J4hRb?vGQJGXZ1blD&BTtYtTIpMjK+~GzDW$koo
zboXtpD@m*CcK4Z<Q@0&;?y78c4%6}{JRc>OcpmcpCAq|X2f1{qZ-#B90e$Dm(U(oj
z-VAa}a*ihr%Mj8^pQ#j{%tT~KkWL<=spo$wNMS3#0=W7&ruT<U!dut-GcyeFt!nu7
z`^#S-8_Ieu_ZBxKA1d5Q>I=WeQDw+R`1=jH5<P|5s0vG#jI-OYYzHABOCX)7MoFVw
zF$+^h#6<O#Dg>ld?PLb>!h7>MMdqCWMS9@-5C2o8U4w<4lb3A{w-#y_MXz6McMq=P
zNxen!`7HH38Q$#jyN0*aTYNsnk{;gFBKp0e$ZxBQOA<sQl6afTd9*I+vZ7U=1XDz}
zbBp3rE$U_^8Q_JTidUA^ogjO~eN-H`m$)xbW!bB2(;A0R%BRqqXIPY{g=yG|W?_A_
z4tHw~aueJfq?0#cDppE;sT6pHY@6}4OtvjnkOL!8sLbgsXv<arILN9i&7%b;iqZLm
z<)gMDoL#nx#-y$YXP3+-z;6rpof*f~kMT3+qqxCPo}8r06I>K=&Yv9Iu=u1HRV?;^
z5{Qb#7V!L{dGo$4O-)<&ZEh}h9XWZptLyN|BVD2hWr7&NWJ=;)Qot=pz^)!aUi^V5
zVG&?x3jc0d0OOyQ1b09phnxYIE8rxz^i3v`$;9Lt<I%T$-9UXdTR*Vwj-^0r(ofrx
zoGo=$kHt=!+0Rq2x!e5tt|KI;N>-n>gZk<_6#*S?VSYDKCAFwh|BMo_3rMH_J}N<~
z+MG_xheL;hbA#$Cs9g`$vO{xADaUgv2u6MitJ+Xey*eCu_3f7(Uo$YU=J;iQTnfDX
zhAWKOyn?uwLi(R}@BYm0-NHA{E6J*y9mK@1ELx+L_>bxLksbPd=i``0z!q%t&ePS&
zxpIc_*`U~=m8G0Tp527NHpAgk^02s8A?$Ei!aG9eqTItPf2ZE7xKr!a^dtjeSBE>%
z*jkL*WWp_erMorJ+51j!C;3YK_J(}N5<=qdOkR5RyN+t*z}}wgE*$1lZ6nd!2^ko=
zvND{?>chNq+r{ArZ|<p*wVA=LJUVOO?-zt`LQCEXZ5idCm^74<UW^E%!iqAaJj|@8
zY>I^pn`0(4S{9cApHhJlm8(+mPl-H9V7hZ!vDuW{6g&Cna(;1tuEJBRXyGXJ+t0pU
z=jHG9)wR<yXYZswfwbq#)L7>p)OA`(NZ*{RRC44&n1KhWF}VIhB(HDw)`8x84s#Kt
zmGl>63Ny@55-{^k+y%|z{$dqWIR`62^lG`knH0_<ApG-sn$j4RNjIWw@UJTZyVD&V
zX<?B1`qw88f068W`2CKv-=IFZV3^oqjq!M6>^tW@ZYresThs0B>BZ?(;mDD8m`U79
zE#DWXo&K%l8DA8F!U(M7S3Fq%0rMZiSsKBO&Ju1R?xxrYy`oew=5={tOnVHhj4?9g
zW><uLOG{u5^i9T9pLTd1n96^N<PmVFq@+6Z_tJYvg!%dv=fc-6&iKMurVskUVPCdX
z$}Y}Oe^mo3-9{J9@BF6mAYc9S##Nwq8SV8TsD=>ktQM)P;k<RCP)El^838I}1T(c_
z)v^Zvn9+cGGa^<rP7Jdx!-R|c9W<t}v({&*Wf!&YqE=qy*4FJUE!$hqB&$h%ijdpz
z6fTBRE5EoSS1IR7Gi>egCD$+R@I@j%{yx<Fq5cni^YH%R=D$jm6Xe-MnVy}mzb4d#
z|6meSy0N>VDTnQe!P>%SmzVNw0t5~DT$M`Ks6>IP#wiw{_U+7Wgr2t@^gzKOYGjl!
ztYryAshHq}k1BG)p;}deS8xT)lTWp`+iba+fer6EezYOmCd#o$LDC$4&6jjL?XIvE
z_TqwxtT>%^)dBPAFig@t1Eq#Sx=mH>A-fg(MYP!cHoM0GBdPTg^vyOG@z(i0!I0mR
z#Vm<!*@lsccdZ|o$(6c_O_qS_R25m4?7?Iv*^se%vrdO1Dza5^cpPeePq8r_j)<Nh
z45b~oXCqrAdmh`-v`c$l_!K0oZhEi!Jj^Jh1jv(9)k<DS6X6*`&ejqBj^B}A{EnQ}
z|Aw@Uj*^cN;gd**<HPzXaufN*;vJv)3{PMwVc3#AC(OW7iE$MM`%F!4fVC*2P4^4i
z`RCc}EgKD!c;49;e}BBsnSUbQ)D%B^FZIdidPcjuM;EBq6K`znYi#6S+6d}T+n5XM
zQe8G%M_#MT>Qd>VV;7Z}_s(o*7GGn$E6yxxE%=sCEFlPKr^NcJz1368rzpQv9GLO9
zer#DJzjT{~i)Teumgwz#^!HA@v4d)CGq@qX88>*}2Ab#|^c{9;OmG9-1NJ8)0?$K5
z0F_w2gW@4bp;EGO8f1a<JAiUf5>RYz)hbRl%FO4pl!oeHFrR?f4H6<~&t<9|06}FC
zo7DD+Z5~JmXcJkK=KV6JB!jxFEE+3!w(~jcC`=UHIQR<+!}_;L7l4t77TK%+BZ)K>
zzggD5?S*BM>?M8t-xr(t#{zBoKj|N6tM@wUwrwI`*|LemU0&bfjRI`seBNyitN1}^
zOL#u%3g4=^+>%Z4C_crz*B(~=Ru%ilB00$~h`@_*(g!7rXPq;2OC3yAa2ZRKZ4Gro
zz`o7l^e9%5FWd_2LCJO44Gl)O{*k6u@|s2T9JNcr_w=<*jpW2{wTAkmIb1x`-@kTv
z`#N&M;`ZkbX9J&6T&hg$)>f!)Exe-IZ5KK1j;zOJ7a<bwP#_fa;tFR1&g*y=Z?T3n
zRS|e13f6vG1PUI%V)y#(KBrT#%Pq2McX|Po#`*rd@NQTw?&PlI-fc*3urTacp;8*-
zcmb)6#VBKWsG33s9f+kWLk9rMmkuLNm#N%IN!wD2A~8NlabDFhi@?f4almjNo<M4l
z)Ue__)2m@$5^Tt&<4R~+{75YCPI&lfPr{ckg@&41a2LcDwG!L_*|T=Po0o{S&MI2m
zJJxD^tWMe|I-L9okc{FXf-LK>(%z76&y9v8DczcD+_e)}^k}XrB{j4w<WjXY#?Qsu
z)kFHH^=GK`hSb3yOV#~~UM_p`N$UTqE=B&@M!a4P_b+TVB1lBb<}~`WSw)#>X)AFy
z#J!&TXr}1;UxLS*@c2#!wZ=_8$jfCp?sD{iEzd&d=-=3=X_iN{ctZPo{X^cc#}oEa
z92k0i5y<Md!q;IJ;bm6DZ8+(Ma4Y{XcR9DfUB%tN-OPQ0`z!9Rp=<gU_hatgxZjWx
zxfaqNEzkjTQaP`sJ7ldFms2tw1uY=waW6XH?<F0E{Jqpsl1m+#YN^m6SBn9;LqkeF
zqjkvTLPr&e<&Ho{wOovm4w&0kV^ql4;UeXHNs~)e%Aj}1c?cqk)ing#zET1ktXjy>
za#cB>K~o*YK&G1R0D8~l{l#)ezN3VO3TT#!Flf<Iu?+b~9*s~_k51IU4VpDP?b3O_
z?pva+mILhSD8NRer)M+Od{xUpGmOomlxLMfBuqwf)qJi}EkV<T01yW~Mu8LPburlI
zK*Y~ZP?;9a<r(Y(6pdI;3P4F_V2w;(N|1uq!7v-@P?QCtyo2fpN<e9qAZ&L*2{68|
zo!o@IOo#|)erS{c3$PDDMw~!hi4V{Ld={ipfa&rFsKfXOcp!p;XaWzj0rp@uzm{l@
z$D0$+84tXZiU>lgemfBy&ZsyZ^||?N#Vip*KGAY4lHpS=ZLxMOg)YTHV$K=0JBZJb
zYYav_%|*K(s9{IHRS4L2T#s|RONk}Bi(P>|6Z`xv88sl;6JECjepQkrs2x;S3BBrb
zE0NAp2)FviF%+-e*}k{eYWI?3Ja6BWiVK1OBWe0!V=xBA(-{%y(CFN-Sz!-0N(<7>
z34_Mfs9+Rh1(y<#BrMH_(Gtrs+tJ?*yN;$rg0uxOJMp-Fi|B6KGPI><B<KxTc%N5u
z^8s&6B-!wV!RD5HD)f<XP9Wi;cOvd{LXP0^dF{O2mMavpHoFkm(^npFbhZ{V32#fa
ztIh5fCDrG*DS}`*Av;C;pwDh6yyc_B-cTyoEe`c4`c$yFS)V+PHX<yzl;S|w0Imtp
zbCl7tzX1oLf{zN}oiIt*BT%ZABONlVy{WiRkV`&D6H{^~3$yUD2G2(WCbKG3GXl-7
zmdLkK`eE`d{o7yq()CY0rT3FVlT+j${_>%14?Xl(|N5`P!#55O_aXx&?w*|D`&-D5
zZ~ofX77u-ywCO)W_~!55bJw@X^`H2J-by~LUm_H~jN~@G^=8^lL&t5%>tw{J9li#B
zBZ2cj&)&#@F8I(}YNJk{z%}d|^2)9*<&j79HP?R`$1Z#R<{^BZpdI|o@UVWZkqCKR
zE7|n5ujy|yo;QDQ_*>*BtZzToTZN~M)FpnO_KWiSo9J6k-n!HbARHsmHBdsE8kK?U
z3S@B9F#8WlSmq+$;>DQ(kN<+mdc~WoZ}EF~9N4ygSDp1rkbV$1uX5RE)w?s~C1+#E
zYHg_WS+%-ULsV<szHdu^DQ(yPnKo0R<RZN@3;OFv!fzp=@&jg;Y%)7wpvqXiQlnv5
z09sb=Flent;-N|=0XFt9Nf8)X1v~~Os6>;15*hnIt;U03jR<UkvtcbqULd=((QsD(
z>}^kN*?`SELxzT*n*M^<FI!}n=JACu4nTS)cs+moyw@u@T&n+2*zXQGaTv;eA^Dw1
zWTZ}uh7U)=LyN!d?;>~UV_oZnQAeOoi$E%;+M4ht3XdDoInZ8elg%niK1bLV2{@K$
zkUNDJFv51&U{M(ZB|FZe(xDz>H2b+*LBRgYFC$=Uh<lo_jmSV(2GJVUyp2?aqn?nb
zExEWo+18dM_t3Wj=m)8p6@R~CU%Z{gmp$^J-9tR~2V^ZE$`4B+zbNsy(%i)d6V1&D
zfr~ezHC0;VB&${8IYjW)e-6(=JYf%izg2XEtokqU(6Eut-K(?HokJ~%z=j&KK-?)f
zPeaPYR_s0_yUX>Nq513Q*RO{+Bs4yr@_M_gmyZ0$$feb88kp<v>n=VX+JH9<tfv=+
zSW*3^$BW&4{c}r&SZP>0JRa)Uu*46&Ap9?OCnm}0cV?-C`zGiYG>o9%0VRfoWGYbA
za1V6$)uzo&i}&iYc)a=qxu$VL<Kjkm<eIrT{u?jn*5)QA;ORfqTe1ULe97Z~+`W7G
z9WGyoCXm{9vdarXwS!$kpphK2c%cNLDO09gE&$TW8y6?2zP*Fpln`(%gEVB|3dp7Q
zxHM+4z&MquwvVUjY-i^QgL-q8GZ5)U+@4q=smh{gb2z*eKWwO==k8wH4Rv?U?ea&O
zT@D*~0VUZHbGvb)h_~=jw=3R}gqD4&jyq?!YTavlf;JnBuvXTIyNo)zyK<;pJ~TzW
z3SV_cErOaY_r+YUtWCAYt&#*=z(7#*+ieJ2T_J}x>vF~V%2`#g;P-;@g6|EL5-O|Y
z*R+7mPQ$LS-I{eTRf@RXw37a(&I6MNI+<tM=hJttG~mV^-q!@p=^OTtaX;q`N>-Ro
zQkgZT5I0V!l8xd9nOVV6;R6%pgC~O=8z{3MwgkdsR%cg!u|luHkp?P_(|?*@m&X@|
zX6y1!YxP>I996Fkhp&}=PWc*}ZH;U_bK<hQTiYP{X>R=R$oRAjjz=V4Le*Cqs<^lF
zorWs%V5_#+WxV5qIIK>x>l$kmO3=E^;cF$QPrk;UvbD)=t)IT^#2Na|nwhbY4>vX|
z4yQ=*rE#C~dEp^o%Wf)r$(lH$jb7X~_!wN~ev|zk*cjxWXTL|^K!CXbt(XFx$k@pM
zwIBv9$p}gsgw<dtc{PZa0qBc`UG0gML{p6aS6J^!;a+CFC&GGfonMJ|!~zY}cn<*y
zZ?uR)N8z+D-fDN^-3f)>X#0hQ^8SE-|I~heV1K!AVf!tyhFHtimcOAF7yl-byT$32
zWNTwF5~fCbv3O4l0a+F;#5^t+pgT&w+}%1Dmw>1VfhTp|+E8d2ZmzVpRI4qmmFD3V
z+%+|5kmrSugX2?iqDOH*t(`l{y^s4S=BXeB%3^1(qm+WSaY>X|ib3;%B$|oWfUL;K
z0u&gtjp+e57@#0R(H4kr_HrYG=H}Tg^8lTyEHySOuwA>%8d6(%(Cr2>4$PAV>kcRj
zP-EpaqyS7Ll*uCKTmD_uWN`5vxS)>kUm)pR0)Jnko+xCm=ujMse-)Dt$@R(bh90QU
z?d^8a;)P{~SG4+UK?gKTJ?ZS(htY&^&>9Tq`O*47opm2?Ew?q4+b)PkE<AK$BywSU
zsiCd%8X>R1eBD8=0sk%v{KNl1C4~R*FoH-hWAF3y*9QZZpE)H9(S9ieg7y7gM=EBO
zoo-Q$r4Vx9=987gQn;STOV*#nJw6<q$)73lMCZY<)|AUOH)XR;f$+thvG?{7(#K$!
zc~1*Z;r<1C3yY76LtwB9*2_Ham?V%2H0c>9i(pL5vr%Hq4P$DmxM5<N1c*z4YwUss
z&6mX%wR^qxm{V!<OFsUox(2VfRqDwsz9u-mJm>Iu96F~3BQ9C;sCM+cb$7aen_y`k
z_w?BFF^CeBYXSf_FtJ4Ha36~n>h!Ot+W1XGph=?Sz?&CBPOlrc%NAb@p;jgnG9DP;
z(z{u{0_u{|m5_w_R!ZO@mxJ2rJb|tTX_E+0gY<!&6fijjDl0^N^jdDzclHT(IhS6`
zHRQWR;kvVL=O=9PqnFA-7g0_s0p+K%OSp($lv(Uy*JU1E?4iZ^N8!I({G#&Bi*fr|
zIU&nG#5+IOGQ2^@^goc-5m3c%RZge>>9yDX2Qs>ouhG64`q`I+HS`^qo<g}=D2c@q
zDU`HA2e{;&j1l2?lP!y*2>y_4{wMPM;Nso%RV=36`*VUZ|Hl2)jsN``kQ^-TGgug^
z?S-g4<EheBfzy`gFbbo8eo=Vha9mUjJ7#Ac;bM`r=#MYnOZ_ps(noI!!~3%fM2-5}
z$yfA@!zuUm$xa9Pr9S-4VzKxxXa#Ys(>XauZ~39$S=};GpjISI{RDLZwO(G;0`UfS
z(Cf942vr!rzM9Dh|Ekq)x9U$@y`CTzfSx^6j`Iv?SjwM(ulpZxCt5WtYE@5(yi8xO
zHZWkmUX2Cbwu)`b%>S;(o0MM7JXUN!uPl8h+d%88-TlVH$yZ)UKCB05UzcQl^qo?4
z_ucvi$vZXp&sXuL6Npp6ECIoTV1R7aAO_f*LSWkm9+%zJk)Z2`2^P33+||K^g72VK
z-po+zT+Adc=phU0f^J_*eKJWRvjhim58z>jUesC|H}{ubV|7?8{cRUcHoWpA6iP+v
zJDMeh{PuH0bIJ6M3(27icchbZeLeK>bNX=qPPX)bI+wdGz;rz_LY=T92GU>43wA{y
z{eo)g=0(*>gdxab#U8v@N$wUUN$f`9B|WLIRUX{JLv#y6bCIX7>=A6Tcsew_X?XJu
zYX=9{-mrOi)3knrB!XlVZBCaJ*I}SCCsvpt;HDu9h_G8%g+aU)imVeX1A<GoY!oaI
z2wPn?35Do$S-(o}jnf<Bum+(LRZ;@0Uy_&A6gVi^<w*^cnUujc3}Yg}Af=!Z;}s>S
z=x^K0zh`d(2jx}4<PjTglinX143Ya4T(i6NCqD@$^{*#|dlW@KqIZ(-_vq8W#vyX6
zC!~-cg~NKA0!HQ}*{|PAKA6_@8S+6by+Vf~fNKClLvP<K{h3$IjVtFfQ$NEWg)PGt
z^*P}$xC$aT;6X?6IfD%ajW9s645p|cn2GXbFg_p~g2t;{09Kq#uJ*e@@e0CLuixs3
zCW9_04ejKG4VRs`n(c;C@qi{u?&u{4j<9&=;@J{;A0}RwKhlD$yI!9i@0{X=M~0hP
zO2xhVCl2h`R-RS_PzB`(O*poHr~Z5Bo1k@i)O`OLVH6VUJ@^+HF(WJ><Tk^UatfPa
z5%ZBY!&Fn!YKE=g^eSf92HD97W|3HEYhFlmjWCb51-!=$3rN4+3|kPs#|(?mxIAcv
zC8Ynr3|nz)?$>76#^p%m)X4Ng>*VOn^sez^S4@q}EytGw`^M+yCugRU9c_i>v`ypF
z<8vbm<73IAS0?9A9V;#@Oe81fW=<qG&P*?iPfg7vXXj=v8y{V0JHD_m+tc1YVWzi@
z&YZv-2S>PRjHeYhYDT#kgm=Lr?ihCk-sv?0yO}rVzd2<eYRuvNnv<-45*8e7cmwI1
z%WXorX;yXwzc|i~aY@jvSHho1>0`jP3;3HroLcP6z%DO|+i<i`wDc7IW{@(=@-9Ql
zDAL>T4q94k7WNqJ_?vh``8GBxdgp_uK#dQx5i)}3`IkZ_NpGWwkmln45y1_4Vk36q
zfXKx~+{8n?u-^CMdSsAjBt*ibjzmZl@+ivFCP|8<Ne1^~vm}T2>okx?(gg8M3u$Fs
zbAfb_BBcGDq)aNfY1~D+Ne`IyJ}@+t=Uq$IkwG#<){_lnBiTeYlPv`AtRUOScCv%)
zBo~ki$u6>+>>+!}K5`M+PY#fS<YID&TtY4-hdFU%Y^-%gfNy~-T1O@p#^+k+N2bQ5
zk*Ueqkt?kub8|DNTc^e+7DN_w9UYk(nI0W)9UEU5nVg!pEyYpTdvtPc;rQ6dm94XL
zlcy%9#*dA=kD~hg<n*!D<CF6XGjms3Mn~qxsJGxA9hpDgdURy;^47WW(V4k17fYC#
zM$=Q1r^e@OqvLZ6lM|DpfK$up@sR~_^!WJb<udcf$HdX8@sT<BGozPNe|}sAXwFWJ
z1FB{0hlP>R1!;8VirJZI>*(D0*yKVh`lybLA2mV}eg<W2W8?FqbCa_R*dof<<UDFj
zFR0_Ro2)#mI5x5{Vxb||_!;zM`q;SHXJsjFnZRt=C+5b-Tj~FT7&$iXI5s)4(7N2t
za?C<Q>am%rvDVR<$!W*2nVGS91gEC3+bqXtPK+zZXBOBZ2na}1lb4UT&RFO}q5qbG
zc2u33IfnV19G&-{7(a0oYj)nOODAULXdU{nO^=^$#nMfl8krIhR%aHDqdcZUnjM*+
zA0PA3$7#%e>ok7$)a3YS$8rjdiL)bD%#SOx<3=sl?D+H;T~KqC+)MFs{J<4hD(6xH
zngr%qE{|V4F+RN@&K{qc9;g1ojFtJv=0;|ZTV|&KZL^q=g;qL2HWr+3JuxyhB^hDs
z$+_0aY5dCM7=Ln3IeEo6W?*L84(J&Nys&Dr0ZQ}IJYZw=xH^x{8X5EB3k&GBIDdR(
zZrnb9d}ele&S}I!y;(Xg3Y(Vs$z#(N0PL(hf5qtN`24)I005gFQ?8iCpiYlmDPJ**
ievge?>8QuqGApM?W?Sj{$uuxMa!NWqPQjMqi~kojCV+bY

literal 0
HcmV?d00001

diff --git a/test/components/tabs.vue b/test/components/tabs.vue
index bb0773a75..71486b498 100644
--- a/test/components/tabs.vue
+++ b/test/components/tabs.vue
@@ -1,5 +1,12 @@
 <template>
-  <van-tabs :active="active" :duration="duration" @click="handleTabClick" @disabled="handleTabDisabledClick" :sticky="sticky">
+  <van-tabs
+    :active="active"
+    :duration="duration"
+    :sticky="sticky"
+    :swipeable="swipeable"
+    @click="handleTabClick"
+    @disabled="handleTabDisabledClick"
+  >
     <van-tab :title="firstTabTitle" :disabled="firstTabDisabled">内容一</van-tab>
     <van-tab title="选项二">内容二</van-tab>
     <van-tab title="选项三" disabled>内容三</van-tab>
@@ -17,7 +24,8 @@ export default {
     firstTabDisabled: {
       type: Boolean
     },
-    sticky: Boolean
+    sticky: Boolean,
+    swipeable: Boolean
   },
 
   data() {
diff --git a/test/specs/tabs.spec.js b/test/specs/tabs.spec.js
index 7dacb080f..8e7a3c2b2 100644
--- a/test/specs/tabs.spec.js
+++ b/test/specs/tabs.spec.js
@@ -2,6 +2,7 @@ import Tabs from 'packages/tabs';
 import { mount } from 'avoriaz';
 import TabsTestComponent from '../components/tabs';
 import MoreTabsTestComponent from '../components/more-tabs';
+import { triggerTouch } from '../utils';
 
 describe('Tabs', () => {
   let wrapper;
@@ -114,7 +115,7 @@ describe('Tabs', () => {
     });
   });
 
-  it('sticky', (done) => {
+  it('create a sticky tabs', (done) => {
     wrapper = mount(TabsTestComponent, {
       attachToDocument: true,
       propsData: {
@@ -129,4 +130,34 @@ describe('Tabs', () => {
       done();
     }, 30);
   });
+
+  it('create a swipeable tabs', (done) => {
+    wrapper = mount(TabsTestComponent, {
+      attachToDocument: true,
+      propsData: {
+        swipeable: true
+      }      
+    });
+
+    const tabsContainer = wrapper.find('.van-tabs')[0];
+    const tabContent = wrapper.find('.van-tabs__content')[0];
+
+    expect(tabsContainer.vNode.child.curActive).to.equal(0);
+
+    wrapper.vm.$nextTick(() => {
+      triggerTouch(tabContent, 'touchstart', 0, 0);
+      triggerTouch(tabContent, 'touchmove', -100, 0);
+  
+      setTimeout(() => {
+        expect(tabsContainer.vNode.child.curActive).to.equal(1);
+  
+        triggerTouch(tabContent, 'touchstart', 0, 0);
+        triggerTouch(tabContent, 'touchmove', 100, 0);
+        setTimeout(() => {
+          expect(tabsContainer.vNode.child.curActive).to.equal(0);
+          done();      
+        }, 500);
+      }, 500);
+    })
+  });
 });

From e366e033edda6670a850407349a55ec11418c215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=95=8F?= <cookfront@gmail.com>
Date: Thu, 15 Mar 2018 14:13:26 +0800
Subject: [PATCH 18/48] [Improvement] Tabs: use touchend event to handle swipe
 (#695)

---
 packages/tabs/index.vue | 56 +++++++++++++++++++++--------------------
 test/specs/tabs.spec.js |  3 +++
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index f5bd1c9aa..1d495814b 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -72,11 +72,7 @@ export default create({
       tabs: [],
       position: 'content-top',
       curActive: 0,
-      navBarStyle: {},
-      pos: {
-        x: 0,
-        y: 0
-      }
+      navBarStyle: {}
     };
   },
 
@@ -152,42 +148,48 @@ export default create({
     swipeableHandler(init) {
       const swipeableEl = this.$refs.content;
 
-      this.touchMoveHandler = scrollUtils.debounce(this.watchTouchMove.bind(this), 500);
-
-      (init ? on : off)(swipeableEl, 'touchstart', this.recordTouchStartPosition, true);
-      (init ? on : off)(swipeableEl, 'touchmove', this.touchMoveHandler, true);
+      (init ? on : off)(swipeableEl, 'touchstart', this.onTouchStart, false);
+      (init ? on : off)(swipeableEl, 'touchmove', this.onTouchMove, false);
+      (init ? on : off)(swipeableEl, 'touchend', this.onTouchEnd, false);
     },
 
     // record swipe touch start position
-    recordTouchStartPosition(e) {
-      this.pos = {
-        x: e.touches[0].clientX,
-        y: e.touches[0].clientY
-      };
+    onTouchStart(event) {
+      this.startX = event.touches[0].clientX;
+      this.startY = event.touches[0].clientY;
     },
 
     // watch swipe touch move
-    watchTouchMove(e) {
-      const { pos } = this;
-      const dx = e.touches[0].clientX - pos.x;
-      const dy = e.touches[0].clientY - pos.y;
-      const isForward = dx > 0;
-      const isHorizontal = Math.abs(dy) < Math.abs(dx);
+    onTouchMove(event) {
+      event.preventDefault();
+      this.deltaX = event.touches[0].clientX - this.startX;
+      this.direction = this.getDirection(event.touches[0]);
+    },
+
+    // watch swipe touch end
+    onTouchEnd(event) {
+      event.preventDefault();
+      const { direction, deltaX, curActive } = this;
       const minSwipeDistance = 50;
 
       /* istanbul ignore else */
-      if (isHorizontal && Math.abs(dx) >= minSwipeDistance) {
-        const active = +this.curActive;
-
+      if (direction === 'horizontal' && Math.abs(deltaX) >= minSwipeDistance) {
         /* istanbul ignore else */
-        if (isForward && active !== 0) {
-          this.curActive = active - 1;
-        } else if (!isForward && active !== this.tabs.length - 1) {
-          this.curActive = active + 1;
+        if (deltaX > 0 && curActive !== 0) {
+          this.curActive = curActive - 1;
+        } else if (deltaX < 0 && curActive !== this.tabs.length - 1) {
+          this.curActive = curActive + 1;
         }
       }
     },
 
+    // get swipe direction
+    getDirection(touch) {
+      const distanceX = Math.abs(touch.clientX - this.startX);
+      const distanceY = Math.abs(touch.clientY - this.startY);
+      return distanceX > distanceY ? 'horizontal' : distanceX < distanceY ? 'vertical' : '';
+    },
+
     // adjust tab position
     onScroll() {
       const scrollTop = scrollUtils.getScrollTop(this.scrollEl);
diff --git a/test/specs/tabs.spec.js b/test/specs/tabs.spec.js
index 8e7a3c2b2..98c320e21 100644
--- a/test/specs/tabs.spec.js
+++ b/test/specs/tabs.spec.js
@@ -147,12 +147,15 @@ describe('Tabs', () => {
     wrapper.vm.$nextTick(() => {
       triggerTouch(tabContent, 'touchstart', 0, 0);
       triggerTouch(tabContent, 'touchmove', -100, 0);
+      triggerTouch(tabContent, 'touchend', 0, 0);
   
       setTimeout(() => {
         expect(tabsContainer.vNode.child.curActive).to.equal(1);
   
         triggerTouch(tabContent, 'touchstart', 0, 0);
         triggerTouch(tabContent, 'touchmove', 100, 0);
+        triggerTouch(tabContent, 'touchend', 0, 0);
+        
         setTimeout(() => {
           expect(tabsContainer.vNode.child.curActive).to.equal(0);
           done();      

From 1e9bc4065ba0b08b745c66b43c3599e511463285 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 15 Mar 2018 20:49:13 +0800
Subject: [PATCH 19/48] [Doc] improve document detail (#698)

---
 docs/demos/views/steps.vue   | 2 +-
 docs/demos/views/tab.vue     | 2 +-
 docs/markdown/zh-CN/badge.md | 8 ++++----
 docs/markdown/zh-CN/field.md | 2 +-
 docs/markdown/zh-CN/steps.md | 4 ++--
 package.json                 | 2 +-
 packages/tabs/index.vue      | 1 +
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/demos/views/steps.vue b/docs/demos/views/steps.vue
index c5ec848e8..7dbcf45bd 100644
--- a/docs/demos/views/steps.vue
+++ b/docs/demos/views/steps.vue
@@ -54,7 +54,7 @@ export default {
       step2: '商家接单',
       step3: '买家提货',
       step4: '交易完成',
-      title2: '物流描述',
+      title2: '描述信息',
       title3: '竖向步骤条',
       status1: '【城市】物流状态1',
       status2: '【城市】物流状态',
diff --git a/docs/demos/views/tab.vue b/docs/demos/views/tab.vue
index 743e892bc..76aa8895f 100644
--- a/docs/demos/views/tab.vue
+++ b/docs/demos/views/tab.vue
@@ -116,7 +116,7 @@ export default {
 
 <style lang="postcss">
 .demo-tab {
-  margin-bottom: 500px;
+  margin-bottom: 300px;
 
   .van-tab .van-icon {
     margin-right: 5px;
diff --git a/docs/markdown/zh-CN/badge.md b/docs/markdown/zh-CN/badge.md
index be0a85512..22312c79e 100644
--- a/docs/markdown/zh-CN/badge.md
+++ b/docs/markdown/zh-CN/badge.md
@@ -15,10 +15,10 @@ Vue.use(Badge);
 
 ```html
 <van-badge-group :active-key="activeKey">
-  <van-badge title="热销榜" @click="onClick" />
-  <van-badge title="花式寿司" @click="onClick" info="8" />
-  <van-badge title="火炽寿司" @click="onClick" info="99" />
-  <van-badge title="手握寿司" @click="onClick" info="199" />
+  <van-badge title="标签名称" @click="onClick" />
+  <van-badge title="标签名称" @click="onClick" info="8" />
+  <van-badge title="标签名称" @click="onClick" info="99" />
+  <van-badge title="标签名称" @click="onClick" info="199" />
 </van-badge-group>
 ```
 
diff --git a/docs/markdown/zh-CN/field.md b/docs/markdown/zh-CN/field.md
index 53c76f52b..2257df11b 100644
--- a/docs/markdown/zh-CN/field.md
+++ b/docs/markdown/zh-CN/field.md
@@ -86,7 +86,7 @@ Vue.use(Field);
     placeholder="请输入留言"
     rows="1"
     autosize
-/>
+  />
 </van-cell-group>
 ```
 
diff --git a/docs/markdown/zh-CN/steps.md b/docs/markdown/zh-CN/steps.md
index fb9a3b3f0..47b4c3467 100644
--- a/docs/markdown/zh-CN/steps.md
+++ b/docs/markdown/zh-CN/steps.md
@@ -30,9 +30,9 @@ export default {
 }
 ```
 
-#### 物流描述
+#### 描述信息
 
-通过`title`和`description`属性来定义物流描述信息
+通过`title`和`description`属性来定义描述信息信息
 
 ```html
 <van-steps
diff --git a/package.json b/package.json
index 2c8a2637d..f332e331c 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   ],
   "scripts": {
     "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 ./",
+    "dev": "npm run build:file && webpack-dev-server --inline --config build/webpack.config.dev.js",
     "build:file": "node build/bin/build-entry.js",
     "build:components": "node build/bin/build-components.js --color",
     "build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color",
diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index 1d495814b..34b3bb60c 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -151,6 +151,7 @@ export default create({
       (init ? on : off)(swipeableEl, 'touchstart', this.onTouchStart, false);
       (init ? on : off)(swipeableEl, 'touchmove', this.onTouchMove, false);
       (init ? on : off)(swipeableEl, 'touchend', this.onTouchEnd, false);
+      (init ? on : off)(swipeableEl, 'touchcancel', this.onTouchEnd, false);
     },
 
     // record swipe touch start position

From d92efbbb038ea65321f30df8509ae0b6ce0df9e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Fri, 16 Mar 2018 10:22:50 +0800
Subject: [PATCH 20/48] update README.md

---
 README.md                    | 10 +++-------
 README.zh-CN.md              | 13 +++++--------
 docs/markdown/en-US/intro.md |  2 +-
 docs/markdown/zh-CN/intro.md |  2 +-
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 1422e6426..432b1779c 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
     <img alt="logo" src="https://img.yzcdn.cn/public_files/2017/12/18/fd78cf6bb5d12e2a119d0576bedfd230.png" width="120" height="120" style="margin-bottom: 10px;">
 </p>
 
-<p align="center">A Vue.js 2.0 Mobile UI at YouZan</p>
+<p align="center" style="margin: 30px 0 35px;">A Vue.js 2.0 Mobile UI at YouZan</p>
 
 [![Build Status](https://travis-ci.org/youzan/vant.svg?branch=master)](https://travis-ci.org/youzan/vant)
 [![downloads](https://img.shields.io/npm/dt/vant.svg)](https://www.npmjs.com/package/vant)
@@ -18,17 +18,13 @@
 
 ## Features
 
-* 48+ Reusable components
+* 50+ Reusable components
 * 90%+ Unit test coverage
 * Extensive documentation and demos
 * Support [babel-plugin-import](https://github.com/ant-design/babel-plugin-import)
 * Support TypeScript
 * Support SSR
 
-<p align="center">
-  <img alt="components preview" src="https://img.yzcdn.cn/public_files/2017/12/05/95f5ee7524b7845abb2f51803a01d65e.png">
-</p >
-
 ## Install
 
 ```shell
@@ -100,7 +96,7 @@ Modern browsers and Android 4.0+, iOS 6+.
 ## Links
 
 * [Documentation](https://www.youzanyun.com/zanui/vant)
-* [Changelog](https://www.youzanyun.com/zanui/vant#/en-US/component/changelog)
+* [Changelog](https://www.youzanyun.com/zanui/vant#/en-US/changelog)
 * [React UI](https://www.youzanyun.com/zanui/zent)
 * [Weapp UI](https://github.com/youzan/zanui-weapp)
 * [Vant Demo](https://github.com/youzan/vant-demo)
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 76c8c13fa..82021d5b2 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -5,7 +5,7 @@
 <p align="center">
     <img alt="logo" src="https://img.yzcdn.cn/public_files/2017/12/18/fd78cf6bb5d12e2a119d0576bedfd230.png" width="120" style="margin-bottom: 10px;">
 </p>
-<p align="center">A Vue.js 2.0 Mobile UI at YouZan</p>
+<p align="center" style="margin: 30px 0 35px;">A Vue.js 2.0 Mobile UI at YouZan</p>
 
 [![Build Status](https://travis-ci.org/youzan/vant.svg?branch=master)](https://travis-ci.org/youzan/vant)
 [![downloads](https://img.shields.io/npm/dt/vant.svg)](https://www.npmjs.com/package/vant)
@@ -15,16 +15,13 @@
 
 ## 特性
 
-* 48+ 个经过有赞线上业务检验的组件
+* 50+ 个经过有赞线上业务检验的组件
 * 单元测试覆盖率超过 90%
-* 完善的文档和示例
+* 完善的中英文文档和示例
 * 支持 [babel-plugin-import](https://github.com/ant-design/babel-plugin-import)
 * 支持 TypeScript
 * 支持 SSR
-
-<p align="center">
-  <img alt="components preview" src="https://img.yzcdn.cn/public_files/2017/12/05/95f5ee7524b7845abb2f51803a01d65e.png">
-</p >
+* 
  
 ## 安装
 
@@ -105,7 +102,7 @@ Vue.use(Vant);
 ## 链接
 
 * [详细文档](https://www.youzanyun.com/zanui/vant)
-* [更新日志](https://www.youzanyun.com/zanui/vant#/zh-CN/component/changelog)
+* [更新日志](https://www.youzanyun.com/zanui/vant#/zh-CN/changelog)
 * [React 组件库](https://www.youzanyun.com/zanui/zent)
 * [微信小程序组件库](https://github.com/youzan/zanui-weapp)
 * [vant-demo](https://github.com/youzan/vant-demo)
diff --git a/docs/markdown/en-US/intro.md b/docs/markdown/en-US/intro.md
index b0dab9129..3f44712f2 100644
--- a/docs/markdown/en-US/intro.md
+++ b/docs/markdown/en-US/intro.md
@@ -7,7 +7,7 @@
  
 ### Features
 
-* 48+ Reusable components
+* 50+ Reusable components
 * 90%+ Unit test coverage
 * Extensive documentation and demos
 * Support [babel-plugin-import](https://github.com/ant-design/babel-plugin-import)
diff --git a/docs/markdown/zh-CN/intro.md b/docs/markdown/zh-CN/intro.md
index 7f30e4ebd..48393f4ae 100644
--- a/docs/markdown/zh-CN/intro.md
+++ b/docs/markdown/zh-CN/intro.md
@@ -7,7 +7,7 @@
  
 ### 特性
 
-* 48+ 个经过有赞线上业务检验的组件
+* 50+ 个经过有赞线上业务检验的组件
 * 单元测试覆盖率超过 90%
 * 完善的文档和示例
 * 支持 [babel-plugin-import](https://github.com/ant-design/babel-plugin-import)

From 966c8afce026987108d64406f3b80863300b300e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Fri, 16 Mar 2018 10:24:29 +0800
Subject: [PATCH 21/48] update LICENSE

---
 LICENSE         | 26 ++------------------------
 README.zh-CN.md |  1 -
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/LICENSE b/LICENSE
index 759985dec..8777860c3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,29 +1,7 @@
-Copyright 2017-present Youzan
+Copyright 2016-present Youzan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-The MIT License (MIT)
-
-Copyright (c) 2016 ElemeFE
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 82021d5b2..eedf8a9dc 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -21,7 +21,6 @@
 * 支持 [babel-plugin-import](https://github.com/ant-design/babel-plugin-import)
 * 支持 TypeScript
 * 支持 SSR
-* 
  
 ## 安装
 

From f26ad3b91284e133b897cbd097c0739ae4ec3798 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 16 Mar 2018 13:31:19 +0800
Subject: [PATCH 22/48] [Improvement] Locale: optimize i18 config (#701)

---
 docs/markdown/en-US/address-edit.md    |  2 +-
 docs/markdown/zh-CN/address-edit.md    |  2 +-
 docs/markdown/zh-CN/picker.md          |  2 +-
 packages/address-edit/Detail.vue       |  4 +-
 packages/address-edit/index.vue        | 32 +++++++-------
 packages/contact-card/index.vue        |  2 +-
 packages/contact-edit/index.vue        |  4 +-
 packages/contact-list/index.vue        |  2 +-
 packages/locale/lang/en-US.js          | 55 ++++++++----------------
 packages/locale/lang/zh-CN.js          | 58 ++++++++------------------
 packages/pull-refresh/index.vue        |  4 +-
 packages/sku/components/SkuRowItem.vue |  6 ++-
 12 files changed, 65 insertions(+), 108 deletions(-)

diff --git a/docs/markdown/en-US/address-edit.md b/docs/markdown/en-US/address-edit.md
index e5842ed54..644e8bc6e 100644
--- a/docs/markdown/en-US/address-edit.md
+++ b/docs/markdown/en-US/address-edit.md
@@ -98,7 +98,7 @@ export default {
 | address_detail | Detailed Address | `String` |
 | area_code | Area code | `String` |
 | postal_code | Postal code | `String` |
-| is_default | Is default address | `String` |
+| is_default | Is default address | `Boolean` |
 
 #### searchResult Data Structure
 | key | Description | Type |
diff --git a/docs/markdown/zh-CN/address-edit.md b/docs/markdown/zh-CN/address-edit.md
index ecdfdf24b..35f29180c 100644
--- a/docs/markdown/zh-CN/address-edit.md
+++ b/docs/markdown/zh-CN/address-edit.md
@@ -101,7 +101,7 @@ export default {
 | address_detail | 详细地址 | `String` |
 | area_code | 地区编码，通过省市区选择获取 | `String` |
 | postal_code | 邮政编码 | `String` |
-| is_default | 是否为默认地址 | `String` |
+| is_default | 是否为默认地址 | `Boolean` |
 
 #### searchResult 数据格式
 | key | 说明 | 类型 |
diff --git a/docs/markdown/zh-CN/picker.md b/docs/markdown/zh-CN/picker.md
index 85ba482ec..2659bc869 100644
--- a/docs/markdown/zh-CN/picker.md
+++ b/docs/markdown/zh-CN/picker.md
@@ -131,7 +131,7 @@ export default {
 | show-toolbar | 是否显示顶部栏 | `Boolean` | `false` | - |
 | title | 顶部栏标题 | `String` | `''` | - |
 | loading | 是否显示加载状态 | `Boolean` | `false` | - |
-| confirm-button-text | 确认按钮文字 | `String` | `完成` | - |
+| confirm-button-text | 确认按钮文字 | `String` | `确认` | - |
 | cancel-button-text | 取消按钮文字 | `String` | `取消` | - |
 | item-height | 选项高度 | `Number` | `44` | - |
 | visible-item-count | 可见的选项个数 | `Number` | `5` | - |
diff --git a/packages/address-edit/Detail.vue b/packages/address-edit/Detail.vue
index 3b4dc0df8..30cd52609 100644
--- a/packages/address-edit/Detail.vue
+++ b/packages/address-edit/Detail.vue
@@ -1,8 +1,8 @@
 <template>
   <div ref="root">
     <field
-      :label="$t('label.address')"
-      :placeholder="$t('placeholder.address')"
+      :label="$t('label')"
+      :placeholder="$t('placeholder')"
       maxlength="200"
       type="textarea"
       autosize
diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue
index 7aabac8a0..cc7aecb06 100644
--- a/packages/address-edit/index.vue
+++ b/packages/address-edit/index.vue
@@ -3,7 +3,7 @@
     <cell-group>
       <field
         maxlength="15"
-        :placeholder="$t('placeholder.name')"
+        :placeholder="$t('name')"
         :label="$t('label.name', computedAddressText)"
         v-model="currentInfo.name"
         :error="errorInfo.name"
@@ -11,8 +11,8 @@
       />
       <field
         type="tel"
-        :label="$t('label.tel')"
-        :placeholder="$t('placeholder.tel')"
+        :label="$t('tel')"
+        :placeholder="$t('telPlaceholder')"
         v-model="currentInfo.tel"
         :error="errorInfo.tel"
         @focus="onFocus('tel')"
@@ -20,12 +20,12 @@
       <cell
         clickable
         class="van-address-edit__area"
-        :title="$t('areaTitle')"
-        @click="showAreaSelect = true"
+        :title="$t('area')"
+        @click="showArea = true"
       >
-        <span>{{ currentInfo.province || $t('placeholder.province') }}</span>
-        <span>{{ currentInfo.city || $t('placeholder.city') }}</span>
-        <span>{{ currentInfo.county || $t('placeholder.county') }}</span>
+        <span>{{ currentInfo.province || $t('province') }}</span>
+        <span>{{ currentInfo.city || $t('city') }}</span>
+        <span>{{ currentInfo.county || $t('county') }}</span>
       </cell>
       <address-edit-detail
         :value="currentInfo.address_detail"
@@ -65,14 +65,14 @@
         {{ $t('deleteAddress', computedAddressText) }}
       </van-button>
     </div>
-    <popup v-model="showAreaSelect" position="bottom">
+    <popup v-model="showArea" position="bottom">
       <van-area
         ref="area"
         :loading="!areaListLoaded"
         :value="currentInfo.area_code"
         :area-list="areaList"
         @confirm="onAreaConfirm"
-        @cancel="showAreaSelect = false"
+        @cancel="showArea = false"
       />
     </popup>
   </div>
@@ -143,7 +143,7 @@ export default create({
 
   data() {
     return {
-      showAreaSelect: false,
+      showArea: false,
       currentInfo: {
         ...defaultAddress,
         ...this.addressInfo
@@ -214,11 +214,11 @@ export default create({
     },
 
     onAreaConfirm(values) {
-      if (values.length !== 3 || +values[0].code === -1 || +values[1].code === -1 || +values[2].code === -1) {
-        return Toast(this.$t('areaWrong'));
+      if (values.length !== 3 || values.some(value => +value.code === -1)) {
+        return Toast(this.$t('areaEmpty'));
       }
       this.assignAreaValues(values);
-      this.showAreaSelect = false;
+      this.showArea = false;
       this.$emit('change-area', values);
     },
 
@@ -265,9 +265,9 @@ export default create({
         case 'name':
           return value ? value.length <= 15 ? '' : $t('nameOverlimit') : $t('nameEmpty');
         case 'tel':
-          return this.telValidator(value) ? '' : $t('telWrong');
+          return this.telValidator(value) ? '' : $t('telInvalid');
         case 'area_code':
-          return value ? +value !== -1 ? '' : $t('areaWrong') : $t('areaEmpty');
+          return value && +value !== -1 ? '' : $t('areaEmpty');
         case 'address_detail':
           return value ? value.length <= 200 ? '' : $t('addressOverlimit') : $t('addressEmpty');
         case 'postal_code':
diff --git a/packages/contact-card/index.vue b/packages/contact-card/index.vue
index f33a681c0..0dcc3d876 100644
--- a/packages/contact-card/index.vue
+++ b/packages/contact-card/index.vue
@@ -8,7 +8,7 @@
       <template v-else-if="type === 'edit'">
         <icon class="van-contact-card__icon" name="contact" />
         <div class="van-contact-card__text">
-          <div>{{ $t('name') }}：{{ name }}</div>
+          <div>{{ $t('contact') }}：{{ name }}</div>
           <div>{{ $t('tel') }}：{{ tel }}</div>
         </div>
       </template>
diff --git a/packages/contact-edit/index.vue b/packages/contact-edit/index.vue
index 8283f9cc7..9c548222d 100644
--- a/packages/contact-edit/index.vue
+++ b/packages/contact-edit/index.vue
@@ -4,8 +4,8 @@
       <field
         v-model="currentInfo.name"
         maxlength="30"
-        :label="$t('name')"
-        :placeholder="$t('namePlaceholder')"
+        :label="$t('contact')"
+        :placeholder="$t('name')"
         :error="errorInfo.name"
         @focus="onFocus('name')"
       />
diff --git a/packages/contact-list/index.vue b/packages/contact-list/index.vue
index de781b764..508cef9d6 100644
--- a/packages/contact-list/index.vue
+++ b/packages/contact-list/index.vue
@@ -4,7 +4,7 @@
       <cell-group>
         <cell v-for="(item, index) in list" :key="item.id" is-link>
           <radio :name="item.id" @click="$emit('select', item, index)">
-            <p class="van-contact-list__text">{{ $t('name') }}：{{ item.name }}</p>
+            <p class="van-contact-list__text">{{ $t('contact') }}：{{ item.name }}</p>
             <p class="van-contact-list__text">{{ $t('tel') }}：{{ item.tel }}</p>
           </radio>
           <icon slot="right-icon" name="edit" class="van-contact-list__edit" @click="$emit('edit', item, index)" />
diff --git a/packages/locale/lang/en-US.js b/packages/locale/lang/en-US.js
index c99646601..c159f6d7b 100644
--- a/packages/locale/lang/en-US.js
+++ b/packages/locale/lang/en-US.js
@@ -1,28 +1,26 @@
 export default {
+  name: 'Name',
+  tel: 'Phone',
+  save: 'Save',
   confirm: 'Confirm',
   cancel: 'Cancel',
-  save: 'Save',
   complete: 'Complete',
+  contact: 'Name',
+  province: 'Province',
+  city: 'City',
+  county: 'District',
   loadingTip: 'Loading...',
+  nameEmpty: 'Name can not be empty',
+  nameOverlimit: 'Name length exceeds limit',
+  telInvalid: 'Malformed phone number',
+  telPlaceholder: 'Phone',
   vanContactCard: {
-    name: 'Name',
-    tel: 'Phone',
     addText: 'Add contact info'
   },
   vanContactList: {
-    name: 'Name',
-    tel: 'Phone',
     addText: 'Add new contact'
   },
   vanContactEdit: {
-    name: 'Name',
-    namePlaceholder: 'Name',
-    nameEmpty: 'Name can not be empty',
-    nameOverlimit: 'Name length exceeds limit',
-    tel: 'Phone',
-    telPlaceholder: 'Phone',
-    telInvalid: 'Malformed phone number',
-    save: 'Save',
     delete: 'Delete',
     confirmDelete: 'Are you sure you want to delete this contact?'
   },
@@ -31,8 +29,8 @@ export default {
     next: 'Next'
   },
   vanPullRefresh: {
-    pullingText: 'Pull to refresh...',
-    loosingText: 'Loose to refresh...'
+    pulling: 'Pull to refresh...',
+    loosing: 'Loose to refresh...'
   },
   vanSubmitBar: {
     label: 'Total：'
@@ -55,18 +53,9 @@ export default {
     discount: discount => `${discount * 10}% off`,
     condition: condition => `At least ${condition}`
   },
-  vanArea: {
-    province: 'Province',
-    city: 'City',
-    county: 'District'
-  },
   vanAddressEdit: {
-    areaTitle: 'Area',
-    areaWrong: 'Please select the correct receiving area',
+    area: 'Area',
     areaEmpty: 'Please select a receiving area',
-    nameEmpty: 'Name can not be empty',
-    nameOverlimit: 'Name length exceeds limit',
-    telWrong: 'Wrong format of phone number',
     addressOverlimit: 'The length of the address can not exceed 200 characters',
     addressEmpty: 'Address can not be empty',
     postalEmpty: 'Wrong postal code',
@@ -75,25 +64,15 @@ export default {
     confirmDelete: 'Are you sure you want to delete this address?',
     label: {
       name: 'Receiver',
-      tel: 'Phone',
       postal: 'Postal'
     },
     placeholder: {
-      name: 'Receiver name',
-      tel: 'Phone',
-      postal: 'Postal code (optional)',
-      province: 'Province',
-      city: 'City',
-      county: 'County'
+      postal: 'Postal code (optional)'
     }
   },
   vanAddressEditDetail: {
-    label: {
-      address: 'Address'
-    },
-    placeholder: {
-      address: 'Address'
-    }
+    label: 'Address',
+    placeholder: 'Address'
   },
   vanAddressList: {
     address: 'Address',
diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js
index 6fc73ab27..2e86c9d4a 100644
--- a/packages/locale/lang/zh-CN.js
+++ b/packages/locale/lang/zh-CN.js
@@ -1,41 +1,36 @@
 export default {
+  name: '名字',
+  tel: '联系电话',
+  save: '保存',
   confirm: '确认',
   cancel: '取消',
-  save: '保存',
   complete: '完成',
+  contact: '联系人',
+  province: '选择省份',
+  city: '选择城市',
+  county: '选择地区',
   loadingTip: '加载中...',
+  nameEmpty: '请填写名字',
+  nameOverlimit: '名字过长，请重新输入',
+  telInvalid: '请填写正确的手机号码或电话号码',
+  telPlaceholder: '手机或固定电话',
   vanContactCard: {
-    name: '联系人',
-    tel: '联系电话',
     addText: '添加订单联系人信息'
   },
   vanContactList: {
-    name: '联系人',
-    tel: '联系电话',
     addText: '新建联系人'
   },
   vanContactEdit: {
-    name: '联系人',
-    namePlaceholder: '名字',
-    nameEmpty: '请填写名字',
-    nameOverlimit: '名字过长，请重新输入',
-    tel: '联系电话',
-    telPlaceholder: '手机或固定电话',
-    telInvalid: '请填写正确的手机号码或电话号码',
-    save: '保存',
     delete: '删除联系人',
     confirmDelete: '确定要删除这个联系人么'
   },
-  vanPicker: {
-    confirm: '完成'
-  },
   vanPagination: {
     prev: '上一页',
     next: '下一页'
   },
   vanPullRefresh: {
-    pullingText: '下拉即可刷新...',
-    loosingText: '释放即可刷新...'
+    pulling: '下拉即可刷新...',
+    loosing: '释放即可刷新...'
   },
   vanSubmitBar: {
     label: '合计：'
@@ -58,19 +53,10 @@ export default {
     discount: discount => `${discount}折`,
     condition: (condition) => `满${condition}元可用`
   },
-  vanArea: {
-    province: '选择省份',
-    city: '选择城市',
-    county: '选择地区'
-  },
   vanAddressEdit: {
-    areaTitle: '收件地区',
+    area: '收件地区',
     addressText: '收货',
-    areaWrong: '请选择正确的收件地区',
     areaEmpty: '请选择收件地区',
-    nameEmpty: '请填写名字',
-    nameOverlimit: '名字过长，请重新输入',
-    telWrong: '请填写正确的手机号码或电话号码',
     addressOverlimit: '详细地址不能超过200个字符',
     addressEmpty: '请填写详细地址',
     postalEmpty: '邮政编码格式不正确',
@@ -79,25 +65,15 @@ export default {
     confirmDelete: text => `确定要删除这个${text}地址么`,
     label: {
       name: text => `${text}人`,
-      tel: '联系电话',
       postal: '邮政编码'
     },
     placeholder: {
-      name: '名字',
-      tel: '手机或固定电话',
-      postal: '邮政编码(选填)',
-      province: '选择省份',
-      city: '选择城市',
-      county: '选择地区'
+      postal: '邮政编码(选填)'
     }
   },
   vanAddressEditDetail: {
-    label: {
-      address: '详细地址'
-    },
-    placeholder: {
-      address: '如街道、楼层、门牌号等'
-    }
+    label: '详细地址',
+    placeholder: '如街道、楼层、门牌号等'
   },
   vanAddressList: {
     address: '收货地址',
diff --git a/packages/pull-refresh/index.vue b/packages/pull-refresh/index.vue
index 9646d81cd..528700fc4 100644
--- a/packages/pull-refresh/index.vue
+++ b/packages/pull-refresh/index.vue
@@ -11,10 +11,10 @@
       <div class="van-pull-refresh__head">
         <slot name="normal" v-if="status === 'normal'"/>
         <slot name="pulling" v-if="status === 'pulling'">
-          <span class="van-pull-refresh__text">{{ pullingText || $t('pullingText') }}</span>
+          <span class="van-pull-refresh__text">{{ pullingText || $t('pulling') }}</span>
         </slot>
         <slot name="loosing" v-if="status === 'loosing'">
-          <span class="van-pull-refresh__text">{{ loosingText || $t('loosingText') }}</span>
+          <span class="van-pull-refresh__text">{{ loosingText || $t('loosing') }}</span>
         </slot>
         <slot name="loading" v-if="status === 'loading'">
           <div class="van-pull-refresh__loading">
diff --git a/packages/sku/components/SkuRowItem.vue b/packages/sku/components/SkuRowItem.vue
index 3c0920a0d..7bcfa42bb 100644
--- a/packages/sku/components/SkuRowItem.vue
+++ b/packages/sku/components/SkuRowItem.vue
@@ -12,7 +12,9 @@
 </template>
 
 <script>
-export default {
+import { create } from '../../utils';
+
+export default create({
   name: 'van-sku-row-item',
 
   props: {
@@ -55,5 +57,5 @@ export default {
       }
     }
   }
-};
+});
 </script>

From ffd72e5442c8bb8680cabac412a3dc5e6971c453 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 16 Mar 2018 17:10:46 +0800
Subject: [PATCH 23/48] [Improvement] extract component common part (#703)

---
 build/bin/build-style-entry.js             |  9 ++--
 packages/actionsheet/index.vue             |  2 +-
 packages/address-edit/Detail.vue           |  8 +---
 packages/address-edit/index.vue            | 50 +++++++++-----------
 packages/address-list/index.vue            |  6 +--
 packages/area/index.vue                    |  2 +-
 packages/badge-group/index.vue             |  2 +-
 packages/badge/index.vue                   |  2 +-
 packages/button/index.vue                  |  2 +-
 packages/card/index.vue                    |  2 +-
 packages/cell-group/index.vue              | 10 ++--
 packages/cell-swipe/index.vue              |  2 +-
 packages/cell/index.vue                    | 15 ++++--
 packages/checkbox-group/index.vue          |  2 +-
 packages/checkbox/index.vue                |  2 +-
 packages/circle/index.vue                  |  2 +-
 packages/col/index.vue                     |  2 +-
 packages/collapse-item/index.vue           |  7 +--
 packages/collapse/index.vue                |  2 +-
 packages/contact-card/index.vue            |  2 +-
 packages/contact-edit/index.vue            | 20 ++++----
 packages/contact-list/index.vue            |  6 +--
 packages/coupon-cell/index.vue             |  9 +---
 packages/coupon-list/Item.vue              |  2 +-
 packages/coupon-list/index.vue             |  6 +--
 packages/datetime-picker/index.vue         |  2 +-
 packages/dialog/dialog.vue                 |  2 +-
 packages/field/index.vue                   |  7 +--
 packages/goods-action-big-btn/index.vue    |  2 +-
 packages/goods-action-mini-btn/index.vue   |  2 +-
 packages/goods-action/index.vue            |  2 +-
 packages/icon/index.vue                    |  2 +-
 packages/image-preview/image-preview.vue   |  2 +-
 packages/list/index.vue                    |  2 +-
 packages/loading/index.vue                 |  2 +-
 packages/mixins/popup/Modal.vue            |  2 +-
 packages/nav-bar/index.vue                 |  2 +-
 packages/notice-bar/index.vue              |  2 +-
 packages/number-keyboard/index.vue         |  2 +-
 packages/pagination/index.vue              |  2 +-
 packages/panel/index.vue                   |  2 +-
 packages/password-input/index.vue          |  2 +-
 packages/picker/PickerColumn.vue           |  2 +-
 packages/picker/index.vue                  |  2 +-
 packages/popup/index.vue                   |  2 +-
 packages/progress/index.vue                |  2 +-
 packages/pull-refresh/index.vue            |  2 +-
 packages/radio-group/index.vue             |  2 +-
 packages/radio/index.vue                   |  2 +-
 packages/row/index.vue                     |  2 +-
 packages/search/index.vue                  |  2 +-
 packages/sku/Sku.vue                       |  2 +-
 packages/sku/components/SkuActions.vue     |  2 +-
 packages/sku/components/SkuHeader.vue      |  2 +-
 packages/sku/components/SkuImgUploader.vue |  2 +-
 packages/sku/components/SkuMessages.vue    |  8 +---
 packages/sku/components/SkuRow.vue         |  2 +-
 packages/sku/components/SkuRowItem.vue     |  2 +-
 packages/sku/components/SkuStepper.vue     |  2 +-
 packages/step/index.vue                    |  2 +-
 packages/stepper/index.vue                 |  2 +-
 packages/steps/index.vue                   |  2 +-
 packages/submit-bar/index.vue              |  2 +-
 packages/swipe-item/index.vue              |  2 +-
 packages/swipe/index.vue                   |  2 +-
 packages/switch-cell/index.vue             |  4 +-
 packages/switch/index.vue                  |  2 +-
 packages/tab/index.vue                     |  2 +-
 packages/tabbar-item/index.vue             |  2 +-
 packages/tabbar/index.vue                  |  2 +-
 packages/tabs/index.vue                    |  2 +-
 packages/tag/index.vue                     |  2 +-
 packages/toast/toast.vue                   |  2 +-
 packages/tree-select/index.vue             |  2 +-
 packages/uploader/index.vue                |  2 +-
 packages/utils/create.js                   | 14 ++++--
 packages/utils/validate/mobile.js          |  4 +-
 packages/vant-css/src/base.css             |  4 ++
 packages/vant-css/src/index.css            |  4 --
 test/specs/address-edit.spec.js            | 54 +++++++++++-----------
 test/specs/contact.spec.js                 | 14 +++---
 81 files changed, 174 insertions(+), 207 deletions(-)

diff --git a/build/bin/build-style-entry.js b/build/bin/build-style-entry.js
index 6d7779a2a..cc8c72c18 100644
--- a/build/bin/build-style-entry.js
+++ b/build/bin/build-style-entry.js
@@ -17,19 +17,20 @@ components.forEach(componentName => {
 // Analyze component dependencies
 function analyzeDependencies(componentName, libDir) {
   const checkList = ['base'];
+  const whiteList = ['icon', 'loading', 'cell', 'button'];
   search(dependencyTree({
     directory: libDir,
     filename: path.resolve(libDir, componentName, 'index.js'),
     filter: path => path.indexOf(`vant${SEP}lib${SEP}`) !== -1
-  }), checkList);
+  }), checkList, whiteList);
   return checkList.filter(component => checkComponentHasStyle(component));
 }
 
-function search(tree, checkList) {
+function search(tree, checkList, whiteList) {
   tree && Object.keys(tree).forEach(key => {
-    search(tree[key], checkList);
+    search(tree[key], checkList, whiteList);
     const component = key.split(`${SEP}vant${SEP}lib${SEP}`)[1].replace(`${SEP}index.js`, '').replace(`mixins${SEP}`, '');
-    if (checkList.indexOf(component) === -1) {
+    if (checkList.indexOf(component) === -1 && whiteList.indexOf(component) === -1) {
       checkList.push(component);
     }
   });
diff --git a/packages/actionsheet/index.vue b/packages/actionsheet/index.vue
index 4c2b3ca8a..9b3e6dc38 100644
--- a/packages/actionsheet/index.vue
+++ b/packages/actionsheet/index.vue
@@ -38,7 +38,7 @@ import { create } from '../utils';
 import Popup from '../mixins/popup';
 
 export default create({
-  name: 'van-actionsheet',
+  name: 'actionsheet',
 
   mixins: [Popup],
 
diff --git a/packages/address-edit/Detail.vue b/packages/address-edit/Detail.vue
index 30cd52609..7d6b73e17 100644
--- a/packages/address-edit/Detail.vue
+++ b/packages/address-edit/Detail.vue
@@ -41,17 +41,13 @@
 <script>
 import { create } from '../utils';
 import Field from '../field';
-import Cell from '../cell';
-import CellGroup from '../cell-group';
 import { isAndroid } from '../utils';
 
 export default create({
-  name: 'van-address-edit-detail',
+  name: 'address-edit-detail',
 
   components: {
-    Field,
-    Cell,
-    CellGroup
+    Field
   },
 
   props: {
diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue
index cc7aecb06..e72a38a78 100644
--- a/packages/address-edit/index.vue
+++ b/packages/address-edit/index.vue
@@ -5,7 +5,7 @@
         maxlength="15"
         :placeholder="$t('name')"
         :label="$t('label.name', computedAddressText)"
-        v-model="currentInfo.name"
+        v-model="data.name"
         :error="errorInfo.name"
         @focus="onFocus('name')"
       />
@@ -13,7 +13,7 @@
         type="tel"
         :label="$t('tel')"
         :placeholder="$t('telPlaceholder')"
-        v-model="currentInfo.tel"
+        v-model="data.tel"
         :error="errorInfo.tel"
         @focus="onFocus('tel')"
       />
@@ -23,17 +23,17 @@
         :title="$t('area')"
         @click="showArea = true"
       >
-        <span>{{ currentInfo.province || $t('province') }}</span>
-        <span>{{ currentInfo.city || $t('city') }}</span>
-        <span>{{ currentInfo.county || $t('county') }}</span>
+        <span>{{ data.province || $t('province') }}</span>
+        <span>{{ data.city || $t('city') }}</span>
+        <span>{{ data.county || $t('county') }}</span>
       </cell>
       <address-edit-detail
-        :value="currentInfo.address_detail"
+        :value="data.address_detail"
         :is-error="errorInfo.address_detail"
         :show-search-result="showSearchResult"
         :search-result="searchResult"
         @focus="onFocus('address_detail')"
-        @blur="onDetailBlur"
+        @blur="detailFocused = false"
         @input="onChangeDetail"
         @select-search="$emit('select-search', $event)"
       />
@@ -43,7 +43,7 @@
         type="tel"
         :label="$t('label.postal')"
         :placeholder="$t('placeholder.postal')"
-        v-model="currentInfo.postal_code"
+        v-model="data.postal_code"
         maxlength="6"
         class="van-hairline--top"
         :error="errorInfo.postal_code"
@@ -53,7 +53,7 @@
       <switch-cell
         v-if="showSetDefault"
         v-show="!hideBottomFields"
-        v-model="currentInfo.is_default"
+        v-model="data.is_default"
         :title="$t('defaultAddress', computedAddressText)"
       />
     </cell-group>
@@ -69,7 +69,7 @@
       <van-area
         ref="area"
         :loading="!areaListLoaded"
-        :value="currentInfo.area_code"
+        :value="data.area_code"
         :area-list="areaList"
         @confirm="onAreaConfirm"
         @cancel="showArea = false"
@@ -82,8 +82,6 @@
 /* eslint-disable camelcase */
 import { create, isObj } from '../utils';
 import Field from '../field';
-import Cell from '../cell';
-import CellGroup from '../cell-group';
 import VanButton from '../button';
 import Popup from '../popup';
 import Toast from '../toast';
@@ -106,12 +104,10 @@ const defaultAddress = {
 };
 
 export default create({
-  name: 'van-address-edit',
+  name: 'address-edit',
 
   components: {
     Field,
-    Cell,
-    CellGroup,
     SwitchCell,
     VanButton,
     Popup,
@@ -144,7 +140,7 @@ export default create({
   data() {
     return {
       showArea: false,
-      currentInfo: {
+      data: {
         ...defaultAddress,
         ...this.addressInfo
       },
@@ -162,7 +158,7 @@ export default create({
   watch: {
     addressInfo: {
       handler(val) {
-        this.currentInfo = {
+        this.data = {
           ...defaultAddress,
           ...val
         };
@@ -176,8 +172,8 @@ export default create({
     },
 
     areaList() {
-      if (this.currentInfo.area_code) {
-        this.setAreaCode(this.currentInfo.area_code);
+      if (this.data.area_code) {
+        this.setAreaCode(this.data.area_code);
       }
     }
   },
@@ -204,12 +200,8 @@ export default create({
       this.$emit('focus', key);
     },
 
-    onDetailBlur() {
-      this.detailFocused = false;
-    },
-
     onChangeDetail(val) {
-      this.currentInfo.address_detail = val;
+      this.data.address_detail = val;
       this.$emit('change-detail', val);
     },
 
@@ -223,7 +215,7 @@ export default create({
     },
 
     assignAreaValues(values) {
-      Object.assign(this.currentInfo, {
+      Object.assign(this.data, {
         province: values[0].name,
         city: values[1].name,
         county: values[2].name,
@@ -253,12 +245,12 @@ export default create({
       });
 
       if (isValid && !this.isSaving) {
-        this.$emit('save', this.currentInfo);
+        this.$emit('save', this.data);
       }
     },
 
     getErrorMessageByKey(key) {
-      const value = this.currentInfo[key];
+      const value = this.data[key];
       const { $t } = this;
 
       switch (key) {
@@ -283,7 +275,7 @@ export default create({
       Dialog.confirm({
         message: this.$t('confirmDelete', this.computedAddressText)
       }).then(() => {
-        this.$emit('delete', this.currentInfo);
+        this.$emit('delete', this.data);
       });
     },
 
@@ -295,7 +287,7 @@ export default create({
 
     // set area code to area component
     setAreaCode(code) {
-      this.currentInfo.area_code = code;
+      this.data.area_code = code;
       this.$nextTick(() => {
         this.$nextTick(() => {
           const { area } = this.$refs;
diff --git a/packages/address-list/index.vue b/packages/address-list/index.vue
index 1374030b0..1505d1ffa 100644
--- a/packages/address-list/index.vue
+++ b/packages/address-list/index.vue
@@ -23,18 +23,14 @@
 
 <script>
 import { create } from '../utils';
-import Cell from '../cell';
-import CellGroup from '../cell-group';
 import Radio from '../radio';
 import RadioGroup from '../radio-group';
 
 export default create({
-  name: 'van-address-list',
+  name: 'address-list',
 
   components: {
-    Cell,
     Radio,
-    CellGroup,
     RadioGroup
   },
 
diff --git a/packages/area/index.vue b/packages/area/index.vue
index 4e95ce41c..2dc84b086 100644
--- a/packages/area/index.vue
+++ b/packages/area/index.vue
@@ -20,7 +20,7 @@ import { create, isObj } from '../utils';
 import Picker from '../picker';
 
 export default create({
-  name: 'van-area',
+  name: 'area',
 
   components: {
     Picker
diff --git a/packages/badge-group/index.vue b/packages/badge-group/index.vue
index 1224759cf..12b2982fc 100644
--- a/packages/badge-group/index.vue
+++ b/packages/badge-group/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-badge-group',
+  name: 'badge-group',
 
   props: {
     activeKey: {
diff --git a/packages/badge/index.vue b/packages/badge/index.vue
index bc920b28e..e30d3cde6 100644
--- a/packages/badge/index.vue
+++ b/packages/badge/index.vue
@@ -9,7 +9,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-badge',
+  name: 'badge',
 
   props: {
     url: String,
diff --git a/packages/button/index.vue b/packages/button/index.vue
index 8e9df67d0..7bffa42c8 100644
--- a/packages/button/index.vue
+++ b/packages/button/index.vue
@@ -27,7 +27,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-button',
+  name: 'button',
 
   props: {
     text: String,
diff --git a/packages/card/index.vue b/packages/card/index.vue
index 0de4037a3..e046dd612 100644
--- a/packages/card/index.vue
+++ b/packages/card/index.vue
@@ -30,7 +30,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-card',
+  name: 'card',
 
   props: {
     thumb: String,
diff --git a/packages/cell-group/index.vue b/packages/cell-group/index.vue
index c0e22cedb..59fd60221 100644
--- a/packages/cell-group/index.vue
+++ b/packages/cell-group/index.vue
@@ -5,10 +5,12 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import install from '../utils/install';
 
-export default create({
-  name: 'van-cell-group',
+export default {
+  install,
+
+  name: 'cell-group',
 
   props: {
     border: {
@@ -16,5 +18,5 @@ export default create({
       default: true
     }
   }
-});
+};
 </script>
diff --git a/packages/cell-swipe/index.vue b/packages/cell-swipe/index.vue
index bb9b23e8f..144f38eb7 100644
--- a/packages/cell-swipe/index.vue
+++ b/packages/cell-swipe/index.vue
@@ -27,7 +27,7 @@ import Clickoutside from '../utils/clickoutside';
 const THRESHOLD = 0.15;
 
 export default create({
-  name: 'van-cell-swipe',
+  name: 'cell-swipe',
 
   props: {
     onClose: Function,
diff --git a/packages/cell/index.vue b/packages/cell/index.vue
index 592fa9490..7fe972fc1 100644
--- a/packages/cell/index.vue
+++ b/packages/cell/index.vue
@@ -37,11 +37,18 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import Icon from '../icon';
+import install from '../utils/install';
 import RouterLink from '../mixins/router-link';
 
-export default create({
-  name: 'van-cell',
+export default {
+  install,
+
+  name: 'cell',
+
+  components: {
+    Icon
+  },
 
   mixins: [RouterLink],
 
@@ -65,5 +72,5 @@ export default create({
       this.routerLink();
     }
   }
-});
+};
 </script>
diff --git a/packages/checkbox-group/index.vue b/packages/checkbox-group/index.vue
index 9c00e3d78..576b25254 100644
--- a/packages/checkbox-group/index.vue
+++ b/packages/checkbox-group/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-checkbox-group',
+  name: 'checkbox-group',
 
   props: {
     value: {},
diff --git a/packages/checkbox/index.vue b/packages/checkbox/index.vue
index 08154cd18..712f3d63b 100644
--- a/packages/checkbox/index.vue
+++ b/packages/checkbox/index.vue
@@ -21,7 +21,7 @@ import { create, isDef } from '../utils';
 import findParent from '../mixins/find-parent';
 
 export default create({
-  name: 'van-checkbox',
+  name: 'checkbox',
 
   mixins: [findParent],
 
diff --git a/packages/circle/index.vue b/packages/circle/index.vue
index 6bd78cc92..4939fddef 100644
--- a/packages/circle/index.vue
+++ b/packages/circle/index.vue
@@ -15,7 +15,7 @@ import { create } from '../utils';
 import { raf, cancel } from '../utils/raf';
 
 export default create({
-  name: 'van-circle',
+  name: 'circle',
 
   props: {
     text: String,
diff --git a/packages/col/index.vue b/packages/col/index.vue
index 8b8db3f16..c33fe1ee0 100644
--- a/packages/col/index.vue
+++ b/packages/col/index.vue
@@ -12,7 +12,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-col',
+  name: 'col',
 
   props: {
     span: [Number, String],
diff --git a/packages/collapse-item/index.vue b/packages/collapse-item/index.vue
index 50cc6cf61..af3abf161 100644
--- a/packages/collapse-item/index.vue
+++ b/packages/collapse-item/index.vue
@@ -16,19 +16,14 @@
 </template>
 
 <script>
-import Cell from '../cell';
 import findParent from '../mixins/find-parent';
 import { create, isDef } from '../utils';
 
 export default create({
-  name: 'van-collapse-item',
+  name: 'collapse-item',
 
   mixins: [findParent],
 
-  components: {
-    Cell
-  },
-
   props: {
     name: [String, Number],
     title: String
diff --git a/packages/collapse/index.vue b/packages/collapse/index.vue
index 7d526bbe4..d67c514a5 100644
--- a/packages/collapse/index.vue
+++ b/packages/collapse/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-collapse',
+  name: 'collapse',
 
   model: {
     prop: 'activeNames'
diff --git a/packages/contact-card/index.vue b/packages/contact-card/index.vue
index 0dcc3d876..8dce72eb2 100644
--- a/packages/contact-card/index.vue
+++ b/packages/contact-card/index.vue
@@ -21,7 +21,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-contact-card',
+  name: 'contact-card',
 
   props: {
     tel: String,
diff --git a/packages/contact-edit/index.vue b/packages/contact-edit/index.vue
index 9c548222d..9bcce2fc2 100644
--- a/packages/contact-edit/index.vue
+++ b/packages/contact-edit/index.vue
@@ -2,7 +2,7 @@
   <div class="van-contact-edit">
     <cell-group>
       <field
-        v-model="currentInfo.name"
+        v-model="data.name"
         maxlength="30"
         :label="$t('contact')"
         :placeholder="$t('name')"
@@ -10,7 +10,7 @@
         @focus="onFocus('name')"
       />
       <field
-        v-model="currentInfo.tel"
+        v-model="data.tel"
         type="tel"
         :label="$t('tel')"
         :placeholder="$t('telPlaceholder')"
@@ -28,19 +28,17 @@
 <script>
 import Field from '../field';
 import VanButton from '../button';
-import CellGroup from '../cell-group';
 import Dialog from '../dialog';
 import Toast from '../toast';
 import validateMobile from '../utils/validate/mobile';
 import { create } from '../utils';
 
 export default create({
-  name: 'van-contact-edit',
+  name: 'contact-edit',
 
   components: {
     Field,
-    VanButton,
-    CellGroup
+    VanButton
   },
 
   props: {
@@ -63,7 +61,7 @@ export default create({
 
   data() {
     return {
-      currentInfo: this.contactInfo,
+      data: this.contactInfo,
       errorInfo: {
         name: false,
         tel: false
@@ -73,7 +71,7 @@ export default create({
 
   watch: {
     contactInfo(val) {
-      this.currentInfo = val;
+      this.data = val;
     }
   },
 
@@ -83,7 +81,7 @@ export default create({
     },
 
     getErrorMessageByKey(key) {
-      const value = this.currentInfo[key];
+      const value = this.data[key];
       switch (key) {
         case 'name':
           return value ? value.length <= 15 ? '' : this.$t('nameOverlimit') : this.$t('nameEmpty');
@@ -108,7 +106,7 @@ export default create({
       });
 
       if (isValid && !this.isSaving) {
-        this.$emit('save', this.currentInfo);
+        this.$emit('save', this.data);
       }
     },
 
@@ -120,7 +118,7 @@ export default create({
       Dialog.confirm({
         message: this.$t('confirmDelete')
       }).then(() => {
-        this.$emit('delete', this.currentInfo);
+        this.$emit('delete', this.data);
       });
     }
   }
diff --git a/packages/contact-list/index.vue b/packages/contact-list/index.vue
index 508cef9d6..154886745 100644
--- a/packages/contact-list/index.vue
+++ b/packages/contact-list/index.vue
@@ -22,19 +22,15 @@
 </template>
 
 <script>
-import Cell from '../cell';
 import Radio from '../radio';
-import CellGroup from '../cell-group';
 import RadioGroup from '../radio-group';
 import { create } from '../utils';
 
 export default create({
-  name: 'van-contact-list',
+  name: 'contact-list',
 
   components: {
-    Cell,
     Radio,
-    CellGroup,
     RadioGroup
   },
 
diff --git a/packages/coupon-cell/index.vue b/packages/coupon-cell/index.vue
index f2408be11..7b272638d 100644
--- a/packages/coupon-cell/index.vue
+++ b/packages/coupon-cell/index.vue
@@ -6,16 +6,9 @@
 
 <script>
 import { create } from '../utils';
-import Cell from '../cell';
-import CellGroup from '../cell-group';
 
 export default create({
-  name: 'van-coupon-cell',
-
-  components: {
-    Cell,
-    CellGroup
-  },
+  name: 'coupon-cell',
 
   model: {
     prop: 'chosenCoupon'
diff --git a/packages/coupon-list/Item.vue b/packages/coupon-list/Item.vue
index 9052ffd42..7addf28cf 100644
--- a/packages/coupon-list/Item.vue
+++ b/packages/coupon-list/Item.vue
@@ -22,7 +22,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-coupon-item',
+  name: 'coupon-item',
 
   props: {
     data: Object,
diff --git a/packages/coupon-list/index.vue b/packages/coupon-list/index.vue
index 6d32e172c..455ac20de 100644
--- a/packages/coupon-list/index.vue
+++ b/packages/coupon-list/index.vue
@@ -49,19 +49,15 @@
 
 <script>
 import { create } from '../utils';
-import Cell from '../cell';
-import CellGroup from '../cell-group';
 import CouponItem from './Item';
 import Field from '../field';
 import VanButton from '../button';
 
 export default create({
-  name: 'van-coupon-list',
+  name: 'coupon-list',
 
   components: {
     VanButton,
-    Cell,
-    CellGroup,
     Field,
     CouponItem
   },
diff --git a/packages/datetime-picker/index.vue b/packages/datetime-picker/index.vue
index abcd369ac..970a00391 100644
--- a/packages/datetime-picker/index.vue
+++ b/packages/datetime-picker/index.vue
@@ -17,7 +17,7 @@ import Picker from '../picker';
 const isValidDate = date => Object.prototype.toString.call(date) === '[object Date]' && !isNaN(date.getTime());
 
 export default create({
-  name: 'van-datetime-picker',
+  name: 'datetime-picker',
 
   components: {
     Picker
diff --git a/packages/dialog/dialog.vue b/packages/dialog/dialog.vue
index 2de2eb787..c8351936a 100644
--- a/packages/dialog/dialog.vue
+++ b/packages/dialog/dialog.vue
@@ -36,7 +36,7 @@ import VanButton from '../button';
 import Popup from '../mixins/popup';
 
 export default create({
-  name: 'van-dialog',
+  name: 'dialog',
 
   components: {
     VanButton
diff --git a/packages/field/index.vue b/packages/field/index.vue
index ee454b65f..5fa330b62 100644
--- a/packages/field/index.vue
+++ b/packages/field/index.vue
@@ -50,17 +50,12 @@
 
 <script>
 import { create } from '../utils';
-import Cell from '../cell';
 
 export default create({
-  name: 'van-field',
+  name: 'field',
 
   inheritAttrs: false,
 
-  components: {
-    Cell
-  },
-
   props: {
     type: {
       type: String,
diff --git a/packages/goods-action-big-btn/index.vue b/packages/goods-action-big-btn/index.vue
index bece91fbb..e2c53d687 100644
--- a/packages/goods-action-big-btn/index.vue
+++ b/packages/goods-action-big-btn/index.vue
@@ -17,7 +17,7 @@ import VanButton from '../button';
 import RouterLink from '../mixins/router-link';
 
 export default create({
-  name: 'van-goods-action-big-btn',
+  name: 'goods-action-big-btn',
 
   mixins: [RouterLink],
 
diff --git a/packages/goods-action-mini-btn/index.vue b/packages/goods-action-mini-btn/index.vue
index 88db1a951..5fc63aac1 100644
--- a/packages/goods-action-mini-btn/index.vue
+++ b/packages/goods-action-mini-btn/index.vue
@@ -10,7 +10,7 @@ import { create } from '../utils';
 import RouterLink from '../mixins/router-link';
 
 export default create({
-  name: 'van-goods-action-mini-btn',
+  name: 'goods-action-mini-btn',
 
   mixins: [RouterLink],
 
diff --git a/packages/goods-action/index.vue b/packages/goods-action/index.vue
index 9d74a1bda..a01f4b2ff 100644
--- a/packages/goods-action/index.vue
+++ b/packages/goods-action/index.vue
@@ -8,6 +8,6 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-goods-action'
+  name: 'goods-action'
 });
 </script>
diff --git a/packages/icon/index.vue b/packages/icon/index.vue
index 36d4d9589..62c122341 100644
--- a/packages/icon/index.vue
+++ b/packages/icon/index.vue
@@ -11,7 +11,7 @@ import install from '../utils/install';
 export default {
   install,
 
-  name: 'van-icon',
+  name: 'icon',
 
   props: {
     name: String,
diff --git a/packages/image-preview/image-preview.vue b/packages/image-preview/image-preview.vue
index a98259508..4defc2dc8 100644
--- a/packages/image-preview/image-preview.vue
+++ b/packages/image-preview/image-preview.vue
@@ -22,7 +22,7 @@ import Swipe from '../swipe';
 import SwipeItem from '../swipe-item';
 
 export default create({
-  name: 'van-image-preview',
+  name: 'image-preview',
 
   mixins: [Popup],
 
diff --git a/packages/list/index.vue b/packages/list/index.vue
index 8b3d085b1..223ea2e46 100644
--- a/packages/list/index.vue
+++ b/packages/list/index.vue
@@ -16,7 +16,7 @@ import utils from '../utils/scroll';
 import { on, off } from '../utils/event';
 
 export default create({
-  name: 'van-list',
+  name: 'list',
 
   model: {
     prop: 'loading'
diff --git a/packages/loading/index.vue b/packages/loading/index.vue
index 897ac305e..931799100 100644
--- a/packages/loading/index.vue
+++ b/packages/loading/index.vue
@@ -15,7 +15,7 @@ import install from '../utils/install';
 export default {
   install,
 
-  name: 'van-loading',
+  name: 'loading',
 
   props: {
     size: String,
diff --git a/packages/mixins/popup/Modal.vue b/packages/mixins/popup/Modal.vue
index e76440d8f..654a1193e 100644
--- a/packages/mixins/popup/Modal.vue
+++ b/packages/mixins/popup/Modal.vue
@@ -13,7 +13,7 @@
 
 <script>
 export default {
-  name: 'van-modal',
+  name: 'modal',
 
   props: {
     visible: Boolean,
diff --git a/packages/nav-bar/index.vue b/packages/nav-bar/index.vue
index 3bf32636d..be6dd90a2 100644
--- a/packages/nav-bar/index.vue
+++ b/packages/nav-bar/index.vue
@@ -25,7 +25,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-nav-bar',
+  name: 'nav-bar',
 
   props: {
     title: String,
diff --git a/packages/notice-bar/index.vue b/packages/notice-bar/index.vue
index 1c8d333de..03600602d 100644
--- a/packages/notice-bar/index.vue
+++ b/packages/notice-bar/index.vue
@@ -29,7 +29,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-notice-bar',
+  name: 'notice-bar',
 
   props: {
     text: String,
diff --git a/packages/number-keyboard/index.vue b/packages/number-keyboard/index.vue
index 3d004ac74..7a88907ba 100644
--- a/packages/number-keyboard/index.vue
+++ b/packages/number-keyboard/index.vue
@@ -39,7 +39,7 @@ import { create } from '../utils';
 import Key from './Key';
 
 export default create({
-  name: 'van-number-keyboard',
+  name: 'number-keyboard',
 
   components: { Key },
 
diff --git a/packages/pagination/index.vue b/packages/pagination/index.vue
index 92f68d27e..740654b94 100644
--- a/packages/pagination/index.vue
+++ b/packages/pagination/index.vue
@@ -34,7 +34,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-pagination',
+  name: 'pagination',
 
   props: {
     value: Number,
diff --git a/packages/panel/index.vue b/packages/panel/index.vue
index d175dc9cf..f40b50a17 100644
--- a/packages/panel/index.vue
+++ b/packages/panel/index.vue
@@ -20,7 +20,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-panel',
+  name: 'panel',
   props: {
     desc: String,
     title: String,
diff --git a/packages/password-input/index.vue b/packages/password-input/index.vue
index 8bf8faf00..b02b866e6 100644
--- a/packages/password-input/index.vue
+++ b/packages/password-input/index.vue
@@ -17,7 +17,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-password-input',
+  name: 'password-input',
 
   props: {
     info: String,
diff --git a/packages/picker/PickerColumn.vue b/packages/picker/PickerColumn.vue
index 5ddae8406..3ca032d41 100644
--- a/packages/picker/PickerColumn.vue
+++ b/packages/picker/PickerColumn.vue
@@ -31,7 +31,7 @@ const DEFAULT_DURATION = 200;
 const range = (num, arr) => Math.min(Math.max(num, arr[0]), arr[1]);
 
 export default create({
-  name: 'van-picker-column',
+  name: 'picker-column',
 
   props: {
     valueKey: String,
diff --git a/packages/picker/index.vue b/packages/picker/index.vue
index 843e74091..19a67a1c2 100644
--- a/packages/picker/index.vue
+++ b/packages/picker/index.vue
@@ -33,7 +33,7 @@ import PickerColumn from './PickerColumn';
 import deepClone from '../utils/deep-clone';
 
 export default create({
-  name: 'van-picker',
+  name: 'picker',
 
   components: {
     PickerColumn
diff --git a/packages/popup/index.vue b/packages/popup/index.vue
index 8fa9ed4a6..2824581c2 100644
--- a/packages/popup/index.vue
+++ b/packages/popup/index.vue
@@ -11,7 +11,7 @@ import { create } from '../utils';
 import Popup from '../mixins/popup';
 
 export default create({
-  name: 'van-popup',
+  name: 'popup',
 
   mixins: [Popup],
 
diff --git a/packages/progress/index.vue b/packages/progress/index.vue
index d086b54aa..26c4cd4b3 100644
--- a/packages/progress/index.vue
+++ b/packages/progress/index.vue
@@ -9,7 +9,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-progress',
+  name: 'progress',
 
   props: {
     inactive: Boolean,
diff --git a/packages/pull-refresh/index.vue b/packages/pull-refresh/index.vue
index 528700fc4..15555ccda 100644
--- a/packages/pull-refresh/index.vue
+++ b/packages/pull-refresh/index.vue
@@ -33,7 +33,7 @@ import { create } from '../utils';
 import scrollUtils from '../utils/scroll';
 
 export default create({
-  name: 'van-pull-refresh',
+  name: 'pull-refresh',
 
   props: {
     pullingText: String,
diff --git a/packages/radio-group/index.vue b/packages/radio-group/index.vue
index 884ea789c..cbfcd55dc 100644
--- a/packages/radio-group/index.vue
+++ b/packages/radio-group/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-radio-group',
+  name: 'radio-group',
 
   props: {
     value: {},
diff --git a/packages/radio/index.vue b/packages/radio/index.vue
index 6ac2e43c4..1e93359e0 100644
--- a/packages/radio/index.vue
+++ b/packages/radio/index.vue
@@ -25,7 +25,7 @@ import { create } from '../utils';
 import findParent from '../mixins/find-parent';
 
 export default create({
-  name: 'van-radio',
+  name: 'radio',
 
   mixins: [findParent],
 
diff --git a/packages/row/index.vue b/packages/row/index.vue
index 8334a5642..08aed5efe 100644
--- a/packages/row/index.vue
+++ b/packages/row/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-row',
+  name: 'row',
 
   props: {
     gutter: {
diff --git a/packages/search/index.vue b/packages/search/index.vue
index 12d9fa5e5..4ed535591 100644
--- a/packages/search/index.vue
+++ b/packages/search/index.vue
@@ -28,7 +28,7 @@ import { create } from '../utils';
 import Clickoutside from '../utils/clickoutside';
 
 export default create({
-  name: 'van-search',
+  name: 'search',
 
   inheritAttrs: false,
 
diff --git a/packages/sku/Sku.vue b/packages/sku/Sku.vue
index 2f7c1dcb0..fe80a267c 100644
--- a/packages/sku/Sku.vue
+++ b/packages/sku/Sku.vue
@@ -120,7 +120,7 @@ import { create } from '../utils';
 const { QUOTA_LIMIT } = LIMIT_TYPE;
 
 export default create({
-  name: 'van-sku',
+  name: 'sku',
 
   components: {
     Popup,
diff --git a/packages/sku/components/SkuActions.vue b/packages/sku/components/SkuActions.vue
index 1654c7b29..ae986ece8 100644
--- a/packages/sku/components/SkuActions.vue
+++ b/packages/sku/components/SkuActions.vue
@@ -20,7 +20,7 @@ import VanButton from '../../button';
 import { create } from '../../utils';
 
 export default create({
-  name: 'van-sku-actions',
+  name: 'sku-actions',
 
   components: {
     VanButton
diff --git a/packages/sku/components/SkuHeader.vue b/packages/sku/components/SkuHeader.vue
index 0303121d5..9c5c9ca72 100644
--- a/packages/sku/components/SkuHeader.vue
+++ b/packages/sku/components/SkuHeader.vue
@@ -15,7 +15,7 @@
 import { create } from '../../utils';
 
 export default create({
-  name: 'van-sku-header',
+  name: 'sku-header',
 
   props: {
     skuEventBus: Object,
diff --git a/packages/sku/components/SkuImgUploader.vue b/packages/sku/components/SkuImgUploader.vue
index e2bc4d06b..4f8785eca 100644
--- a/packages/sku/components/SkuImgUploader.vue
+++ b/packages/sku/components/SkuImgUploader.vue
@@ -46,7 +46,7 @@ import Loading from '../../loading';
 import { create } from '../../utils';
 
 export default create({
-  name: 'van-sku-img-uploader',
+  name: 'sku-img-uploader',
 
   components: {
     'van-uploader': Uploader,
diff --git a/packages/sku/components/SkuMessages.vue b/packages/sku/components/SkuMessages.vue
index 720b9a96c..7cc65321b 100644
--- a/packages/sku/components/SkuMessages.vue
+++ b/packages/sku/components/SkuMessages.vue
@@ -30,20 +30,16 @@
 <script>
 import { create } from '../../utils';
 import Field from '../../field';
-import CellGroup from '../../cell-group';
-import Cell from '../../cell';
 import validateEmail from '../../utils/validate/email';
 import validateNumber from '../../utils/validate/number';
 import SkuImgUploader from './SkuImgUploader';
 
 export default create({
-  name: 'van-sku-messages',
+  name: 'sku-messages',
 
   components: {
     SkuImgUploader,
-    Field,
-    Cell,
-    CellGroup
+    Field
   },
 
   props: {
diff --git a/packages/sku/components/SkuRow.vue b/packages/sku/components/SkuRow.vue
index 0325e1bad..77d1f82b3 100644
--- a/packages/sku/components/SkuRow.vue
+++ b/packages/sku/components/SkuRow.vue
@@ -9,7 +9,7 @@
 
 <script>
 export default {
-  name: 'van-sku-row',
+  name: 'sku-row',
 
   props: {
     skuRow: Object
diff --git a/packages/sku/components/SkuRowItem.vue b/packages/sku/components/SkuRowItem.vue
index 7bcfa42bb..7c716af2c 100644
--- a/packages/sku/components/SkuRowItem.vue
+++ b/packages/sku/components/SkuRowItem.vue
@@ -15,7 +15,7 @@
 import { create } from '../../utils';
 
 export default create({
-  name: 'van-sku-row-item',
+  name: 'sku-row-item',
 
   props: {
     skuEventBus: Object,
diff --git a/packages/sku/components/SkuStepper.vue b/packages/sku/components/SkuStepper.vue
index d1f496706..49180d74f 100644
--- a/packages/sku/components/SkuStepper.vue
+++ b/packages/sku/components/SkuStepper.vue
@@ -25,7 +25,7 @@ import { LIMIT_TYPE } from '../constants';
 const { QUOTA_LIMIT, STOCK_LIMIT } = LIMIT_TYPE;
 
 export default create({
-  name: 'van-sku-stepper',
+  name: 'sku-stepper',
 
   components: {
     Stepper
diff --git a/packages/step/index.vue b/packages/step/index.vue
index ab3718d27..774247dc4 100644
--- a/packages/step/index.vue
+++ b/packages/step/index.vue
@@ -15,7 +15,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-step',
+  name: 'step',
 
   beforeCreate() {
     this.$parent.steps.push(this);
diff --git a/packages/stepper/index.vue b/packages/stepper/index.vue
index 4ab313c3c..2870ef930 100644
--- a/packages/stepper/index.vue
+++ b/packages/stepper/index.vue
@@ -24,7 +24,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-stepper',
+  name: 'stepper',
 
   props: {
     value: {},
diff --git a/packages/steps/index.vue b/packages/steps/index.vue
index 2e3a5aae2..9fa3212b4 100644
--- a/packages/steps/index.vue
+++ b/packages/steps/index.vue
@@ -22,7 +22,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-steps',
+  name: 'steps',
 
   props: {
     icon: String,
diff --git a/packages/submit-bar/index.vue b/packages/submit-bar/index.vue
index d52d7f6e4..57dc7e99d 100644
--- a/packages/submit-bar/index.vue
+++ b/packages/submit-bar/index.vue
@@ -24,7 +24,7 @@ import VanButton from '../button';
 import { create } from '../utils';
 
 export default create({
-  name: 'van-submit-bar',
+  name: 'submit-bar',
 
   components: {
     VanButton
diff --git a/packages/swipe-item/index.vue b/packages/swipe-item/index.vue
index 97a757998..9e2d4b835 100644
--- a/packages/swipe-item/index.vue
+++ b/packages/swipe-item/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-swipe-item',
+  name: 'swipe-item',
 
   data() {
     return {
diff --git a/packages/swipe/index.vue b/packages/swipe/index.vue
index 777ec1950..9085a873b 100644
--- a/packages/swipe/index.vue
+++ b/packages/swipe/index.vue
@@ -25,7 +25,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-swipe',
+  name: 'swipe',
 
   props: {
     autoplay: Number,
diff --git a/packages/switch-cell/index.vue b/packages/switch-cell/index.vue
index b896bddeb..2f5b345ff 100644
--- a/packages/switch-cell/index.vue
+++ b/packages/switch-cell/index.vue
@@ -5,15 +5,13 @@
 </template>
 
 <script>
-import Cell from '../cell';
 import VanSwitch from '../switch';
 import { create } from '../utils';
 
 export default create({
-  name: 'van-switch-cell',
+  name: 'switch-cell',
 
   components: {
-    Cell,
     VanSwitch
   },
 
diff --git a/packages/switch/index.vue b/packages/switch/index.vue
index d59908f86..19a1fabf5 100644
--- a/packages/switch/index.vue
+++ b/packages/switch/index.vue
@@ -11,7 +11,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-switch',
+  name: 'switch',
 
   props: {
     value: Boolean,
diff --git a/packages/tab/index.vue b/packages/tab/index.vue
index 0902398d7..13ab4bd18 100644
--- a/packages/tab/index.vue
+++ b/packages/tab/index.vue
@@ -9,7 +9,7 @@ import { create } from '../utils';
 import findParent from '../mixins/find-parent';
 
 export default create({
-  name: 'van-tab',
+  name: 'tab',
 
   mixins: [findParent],
 
diff --git a/packages/tabbar-item/index.vue b/packages/tabbar-item/index.vue
index 9940c2415..7124c1afb 100644
--- a/packages/tabbar-item/index.vue
+++ b/packages/tabbar-item/index.vue
@@ -17,7 +17,7 @@ import { create } from '../utils';
 import RouterLink from '../mixins/router-link';
 
 export default create({
-  name: 'van-tabbar-item',
+  name: 'tabbar-item',
 
   mixins: [RouterLink],
 
diff --git a/packages/tabbar/index.vue b/packages/tabbar/index.vue
index dc38d7b35..9ce4ccbaf 100644
--- a/packages/tabbar/index.vue
+++ b/packages/tabbar/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-tabbar',
+  name: 'tabbar',
 
   data() {
     return {
diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index 34b3bb60c..5f342da20 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -40,7 +40,7 @@ import VanNode from '../utils/node';
 import scrollUtils from '../utils/scroll';
 
 export default create({
-  name: 'van-tabs',
+  name: 'tabs',
 
   components: {
     VanNode
diff --git a/packages/tag/index.vue b/packages/tag/index.vue
index e069c2111..866c3c1b5 100644
--- a/packages/tag/index.vue
+++ b/packages/tag/index.vue
@@ -15,7 +15,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-tag',
+  name: 'tag',
   props: {
     type: String,
     mark: Boolean,
diff --git a/packages/toast/toast.vue b/packages/toast/toast.vue
index 3e5d60526..c9d5f43d7 100644
--- a/packages/toast/toast.vue
+++ b/packages/toast/toast.vue
@@ -24,7 +24,7 @@ import { create } from '../utils';
 const STYLE_LIST = ['success', 'fail', 'loading'];
 
 export default create({
-  name: 'van-toast',
+  name: 'toast',
 
   props: {
     mask: Boolean,
diff --git a/packages/tree-select/index.vue b/packages/tree-select/index.vue
index bdb8bb8eb..b9be749b9 100644
--- a/packages/tree-select/index.vue
+++ b/packages/tree-select/index.vue
@@ -31,7 +31,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-tree-select',
+  name: 'tree-select',
 
   props: {
     items: {
diff --git a/packages/uploader/index.vue b/packages/uploader/index.vue
index 78530c31d..6e37c56ef 100644
--- a/packages/uploader/index.vue
+++ b/packages/uploader/index.vue
@@ -16,7 +16,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-uploader',
+  name: 'uploader',
 
   inheritAttrs: false,
 
diff --git a/packages/utils/create.js b/packages/utils/create.js
index 983e1b073..68b66929f 100644
--- a/packages/utils/create.js
+++ b/packages/utils/create.js
@@ -2,18 +2,24 @@
  * Create a component with common options
  */
 import '../locale';
-import Icon from '../icon';
 import i18n from '../mixins/i18n';
 import install from './install';
+import Icon from '../icon';
 import Loading from '../loading';
+import Cell from '../cell';
+import CellGroup from '../cell-group';
 
 export default function(sfc) {
+  sfc.name = 'van-' + sfc.name;
   sfc.install = sfc.install || install;
   sfc.mixins = sfc.mixins || [];
   sfc.mixins.push(i18n);
-  sfc.components = sfc.components || {};
-  sfc.components.icon = Icon;
-  sfc.components.loading = Loading;
+  sfc.components = Object.assign(sfc.components || {}, {
+    Icon,
+    Loading,
+    Cell,
+    CellGroup
+  });
 
   return sfc;
 };
diff --git a/packages/utils/validate/mobile.js b/packages/utils/validate/mobile.js
index d2d31045a..da6f67c9c 100644
--- a/packages/utils/validate/mobile.js
+++ b/packages/utils/validate/mobile.js
@@ -1,4 +1,4 @@
 export default function mobile(value) {
-  return /^((\+86)|(86))?(1)\d{10}$/.test(value) ||
-  /^\+?(9[976]\d|8[987530]\d|6[987]\d|5[90]\d|42\d|3[875]\d|2[98654321]\d|9[8543210]|8[6421]|6[6543210]|5[87654321]|4[987654310]|3[9643210]|2[70]|7|1|)-?\d{1,14}$/.test(String(value));
+  value = value.replace(/[^-|\d]/g, '');
+  return /^((\+86)|(86))?(1)\d{10}$/.test(value) || /^0[0-9\-]{10,13}$/.test(value);
 }
diff --git a/packages/vant-css/src/base.css b/packages/vant-css/src/base.css
index a5086616b..e07c9f4bd 100644
--- a/packages/vant-css/src/base.css
+++ b/packages/vant-css/src/base.css
@@ -7,3 +7,7 @@
 @import "./common/ellipsis.css";
 @import "./common/hairline.css";
 @import "./common/animation.css";
+@import './icon.css';
+@import './loading.css';
+@import './button.css';
+@import './cell.css';
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index 6cd288e97..15c427c70 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -4,10 +4,6 @@
 
 /* base */
 @import './base.css';
-@import './icon.css';
-@import './loading.css';
-@import './button.css';
-@import './cell.css';
 
 /* common components */
 @import './col.css';
diff --git a/test/specs/address-edit.spec.js b/test/specs/address-edit.spec.js
index d52098aa3..c0b849832 100644
--- a/test/specs/address-edit.spec.js
+++ b/test/specs/address-edit.spec.js
@@ -99,42 +99,42 @@ describe('AddressEdit', () => {
     const saveButton = wrapper.find('.van-button')[0];
 
     // name empty
-    wrapper.vm.currentInfo.name = '';
+    wrapper.vm.data.name = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['name']).to.be.true;
     wrapper.find('.van-field__control')[0].trigger('focus');
     expect(wrapper.vm.errorInfo['name']).to.be.false;
 
     // name too long
-    wrapper.vm.currentInfo.name = '111111111111111111111111111';
+    wrapper.vm.data.name = '111111111111111111111111111';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['name']).to.be.true;
     wrapper.find('.van-field__control')[0].trigger('focus');
     expect(wrapper.vm.errorInfo['name']).to.be.false;
 
     // tel empty
-    wrapper.vm.currentInfo.name = '123';
-    wrapper.vm.currentInfo.tel = '';
+    wrapper.vm.data.name = '123';
+    wrapper.vm.data.tel = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['tel']).to.be.true;
     wrapper.find('.van-field__control')[1].trigger('focus');
     expect(wrapper.vm.errorInfo['tel']).to.be.false;
 
     // area_code empty
-    wrapper.vm.currentInfo.tel = '13000000000';
-    wrapper.vm.currentInfo.area_code = '';
+    wrapper.vm.data.tel = '13000000000';
+    wrapper.vm.data.area_code = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['area_code']).to.be.true;
 
     // area_code invalid
-    wrapper.vm.currentInfo.tel = '13000000000';
-    wrapper.vm.currentInfo.area_code = '-1';
+    wrapper.vm.data.tel = '13000000000';
+    wrapper.vm.data.area_code = '-1';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['area_code']).to.be.true;
 
     // address_detail empty
-    wrapper.vm.currentInfo.area_code = '100000';
-    wrapper.vm.currentInfo.address_detail = '';
+    wrapper.vm.data.area_code = '100000';
+    wrapper.vm.data.address_detail = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['address_detail']).to.be.true;
     wrapper.find('.van-field__control')[2].trigger('focus');
@@ -145,26 +145,26 @@ describe('AddressEdit', () => {
     for (let i = 0; i < 300; i++) {
       longAddress += '1';
     }
-    wrapper.vm.currentInfo.address_detail = longAddress;
+    wrapper.vm.data.address_detail = longAddress;
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['address_detail']).to.be.true;
     wrapper.find('.van-field__control')[2].trigger('focus');
     expect(wrapper.vm.errorInfo['address_detail']).to.be.false;
 
     // postal_code invalid
-    wrapper.vm.currentInfo.address_detail = '123';
-    wrapper.vm.currentInfo.postal_code = '123';
+    wrapper.vm.data.address_detail = '123';
+    wrapper.vm.data.postal_code = '123';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['postal_code']).to.be.true;
     wrapper.find('.van-field__control')[3].trigger('focus');
     expect(wrapper.vm.errorInfo['postal_code']).to.be.false;
 
     // valid result
-    wrapper.vm.currentInfo.postal_code = '123456';
+    wrapper.vm.data.postal_code = '123456';
     saveButton.trigger('click');
 
     // not show postal_code
-    wrapper.vm.currentInfo.postal_code = '156';
+    wrapper.vm.data.postal_code = '156';
     wrapper.vm.showPostal = false;
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['postal_code']).to.be.false;
@@ -235,17 +235,17 @@ describe('AddressEdit', () => {
     wrapper.vm.onAreaConfirm([{ code: -1 }]);
     wrapper.vm.onAreaConfirm([{ code: 1 }, { code: -1 }]);
     wrapper.vm.onAreaConfirm([{ code: 1 }, { code: 1 }, { code: -1 }]);
-    expect(wrapper.vm.currentInfo['area_code']).to.equal('');
+    expect(wrapper.vm.data['area_code']).to.equal('');
 
     wrapper.vm.onAreaConfirm([
       { name: '浙江省' },
       { name: '杭州市' },
       { name: '西湖区', code: '123456' }
     ]);
-    expect(wrapper.vm.currentInfo['province']).to.equal('浙江省');
-    expect(wrapper.vm.currentInfo['city']).to.equal('杭州市');
-    expect(wrapper.vm.currentInfo['county']).to.equal('西湖区');
-    expect(wrapper.vm.currentInfo['area_code']).to.equal('123456');
+    expect(wrapper.vm.data['province']).to.equal('浙江省');
+    expect(wrapper.vm.data['city']).to.equal('杭州市');
+    expect(wrapper.vm.data['county']).to.equal('西湖区');
+    expect(wrapper.vm.data['area_code']).to.equal('123456');
   });
 
   it('delete address', done => {
@@ -308,7 +308,7 @@ describe('AddressEdit', () => {
     wrapper.vm.$nextTick(() => {
       wrapper.find('.van-field__icon')[0].trigger('touchstart');
       wrapper.vm.$nextTick(() => {
-        expect(wrapper.vm.currentInfo.address_detail).to.equal('');
+        expect(wrapper.vm.data.address_detail).to.equal('');
         done();
       });
     });
@@ -352,7 +352,7 @@ describe('AddressEdit', () => {
 
     wrapper.setProps({ addressInfo });
     wrapper.vm.$nextTick(() => {
-      expect(wrapper.vm.currentInfo.name).to.equal('123');
+      expect(wrapper.vm.data.name).to.equal('123');
       done();
     });
   });
@@ -375,7 +375,7 @@ describe('AddressEdit', () => {
 
     wrapper.vm.setAreaCode('110101');
     setTimeout(() => {
-      expect(wrapper.vm.currentInfo.area_code).to.eql('110101');
+      expect(wrapper.vm.data.area_code).to.eql('110101');
       expect(wrapper.vm.getArea()).to.eql([
         { code: '110000', name: '北京市' },
         { code: '110100', name: '北京市' },
@@ -399,22 +399,22 @@ describe('AddressEdit', () => {
       }
     });
 
-    expect(wrapper.vm.currentInfo.city).to.equal('');
+    expect(wrapper.vm.data.city).to.equal('');
     wrapper.vm.areaList = areaList;
 
     setTimeout(() => {
-      expect(wrapper.vm.currentInfo.city).to.equal('温州市');
+      expect(wrapper.vm.data.city).to.equal('温州市');
 
       wrapper.vm.addressInfo = { area_code: '' };
       wrapper.vm.areaList = {};
 
       setTimeout(() => {
-        expect(wrapper.vm.currentInfo.city).to.equal('');
+        expect(wrapper.vm.data.city).to.equal('');
         wrapper.vm.areaList = areaList;
         wrapper.vm.addressInfo = { area_code: '330304' };
 
         setTimeout(() => {
-          expect(wrapper.vm.currentInfo.city).to.equal('温州市');
+          expect(wrapper.vm.data.city).to.equal('温州市');
           done();
         }, 50);
       });
diff --git a/test/specs/contact.spec.js b/test/specs/contact.spec.js
index 362f565c9..7e8cc20d0 100644
--- a/test/specs/contact.spec.js
+++ b/test/specs/contact.spec.js
@@ -179,36 +179,36 @@ describe('ContactEdit', () => {
     const saveButton = wrapper.find('.van-button')[0];
 
     // name empty
-    wrapper.vm.contactInfo.name = '';
+    wrapper.vm.data.name = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['name']).to.be.true;
     wrapper.find('.van-field__control')[0].trigger('focus');
     expect(wrapper.vm.errorInfo['name']).to.be.false;
 
     // name too long
-    wrapper.vm.contactInfo.name = '111111111111111111111111111';
+    wrapper.vm.data.name = '111111111111111111111111111';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['name']).to.be.true;
     wrapper.find('.van-field__control')[0].trigger('focus');
     expect(wrapper.vm.errorInfo['name']).to.be.false;
 
     // tel empty
-    wrapper.vm.contactInfo.name = '123';
-    wrapper.vm.contactInfo.tel = '';
+    wrapper.vm.data.name = '123';
+    wrapper.vm.data.tel = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['tel']).to.be.true;
     wrapper.find('.van-field__control')[1].trigger('focus');
     expect(wrapper.vm.errorInfo['tel']).to.be.false;
 
     // tel invalid
-    wrapper.vm.contactInfo.tel = 'abc';
+    wrapper.vm.data.tel = 'abc';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['tel']).to.be.true;
     wrapper.find('.van-field__control')[1].trigger('focus');
     expect(wrapper.vm.errorInfo['tel']).to.be.false;
 
     // saving
-    wrapper.vm.contactInfo.tel = '13000000000';
+    wrapper.vm.data.tel = '13000000000';
     saveButton.trigger('click');
     wrapper.vm.isSaving = true;
     saveButton.trigger('click');
@@ -260,7 +260,7 @@ describe('ContactEdit', () => {
 
     wrapper.setProps({ contactInfo });
     wrapper.vm.$nextTick(() => {
-      expect(wrapper.vm.currentInfo.name).to.equal('123');
+      expect(wrapper.vm.data.name).to.equal('123');
       done();
     });
   });

From 4c195fd6647ce41034412b3c0a626bb2195329ec Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 16 Mar 2018 20:27:59 +0800
Subject: [PATCH 24/48] [Improvement] Sku: optimize DOM (#704)

---
 docs/demos/views/sku.vue                   |   8 +-
 packages/address-edit/index.vue            |  12 +-
 packages/address-list/index.vue            |   6 +-
 packages/cell-group/index.vue              |   8 +-
 packages/cell/index.vue                    |   8 +-
 packages/contact-list/index.vue            |   6 +-
 packages/icon/index.vue                    |   8 +-
 packages/loading/index.vue                 |   8 +-
 packages/sku/Sku.vue                       | 190 ++++++++++-----------
 packages/sku/components/SkuHeader.vue      |  15 +-
 packages/sku/components/SkuImgUploader.vue |  70 +++-----
 packages/sku/components/SkuMessages.vue    |   4 +-
 packages/sku/components/SkuRow.vue         |   4 +-
 packages/sku/components/SkuRowItem.vue     |   6 +-
 packages/sku/components/SkuStepper.vue     |   5 +
 packages/sku/utils/skuHelper.js            |   9 +-
 packages/utils/create-basic.js             |  18 ++
 packages/utils/create.js                   |  11 +-
 packages/utils/install.js                  |   6 -
 packages/utils/node.js                     |   3 +
 packages/vant-css/src/base.css             |   1 +
 packages/vant-css/src/common/clearfix.css  |   5 +
 packages/vant-css/src/sku.css              |  71 ++++----
 packages/vant-css/src/tree-select.css      |   3 -
 test/specs/address-edit.spec.js            |   2 +-
 test/specs/sku.spec.js                     |   6 +-
 26 files changed, 228 insertions(+), 265 deletions(-)
 create mode 100644 packages/utils/create-basic.js
 delete mode 100644 packages/utils/install.js
 create mode 100644 packages/vant-css/src/common/clearfix.css

diff --git a/docs/demos/views/sku.vue b/docs/demos/views/sku.vue
index 34436aa82..f0e51f1a5 100644
--- a/docs/demos/views/sku.vue
+++ b/docs/demos/views/sku.vue
@@ -33,6 +33,7 @@
           :quota="$t('sku').quota"
           :quota-used="$t('sku').quota_used"
           :custom-stepper-config="customStepperConfig"
+          :message-config="messageConfig"
           @buy-clicked="onBuyClicked"
           @add-cart="onAddCartClicked"
         />
@@ -54,6 +55,7 @@
           show-add-cart-btn
           reset-stepper-on-hide
           :initial-sku="initialSku"
+          :message-config="messageConfig"
           @buy-clicked="onBuyClicked"
           @add-cart="onAddCartClicked"
         >
@@ -119,9 +121,9 @@ export default {
         }
       },
       messageConfig: {
-        uploadImg: () => {
-          return new Promise((resolve) => {
-            setTimeout(() => resolve('https://img.yzcdn.cn/upload_files/2017/02/21/FjKTOxjVgnUuPmHJRdunvYky9OHP.jpg!100x100.jpg'), 1000);
+        uploadImg: (file, img) => {
+          return new Promise(resolve => {
+            setTimeout(() => resolve(img), 1000);
           });
         },
         uploadMaxSize: 3
diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue
index e72a38a78..2864dcd39 100644
--- a/packages/address-edit/index.vue
+++ b/packages/address-edit/index.vue
@@ -58,10 +58,10 @@
       />
     </cell-group>
     <div v-show="!hideBottomFields" class="van-address-edit__buttons">
-      <van-button block :loading="isSaving" @click="onSaveAddress" type="primary">
+      <van-button block :loading="isSaving" @click="onSave" type="primary">
         {{ $t('save') }}
       </van-button>
-      <van-button block :loading="isDeleting" @click="onDeleteAddress" v-if="isEdit">
+      <van-button block :loading="isDeleting" @click="onDelete" v-if="isEdit">
         {{ $t('deleteAddress', computedAddressText) }}
       </van-button>
     </div>
@@ -108,10 +108,10 @@ export default create({
 
   components: {
     Field,
-    SwitchCell,
-    VanButton,
     Popup,
     VanArea,
+    VanButton,
+    SwitchCell,
     AddressEditDetail
   },
 
@@ -223,7 +223,7 @@ export default create({
       });
     },
 
-    onSaveAddress() {
+    onSave() {
       const items = [
         'name',
         'tel',
@@ -267,7 +267,7 @@ export default create({
       }
     },
 
-    onDeleteAddress() {
+    onDelete() {
       if (this.isDeleting) {
         return;
       }
diff --git a/packages/address-list/index.vue b/packages/address-list/index.vue
index 1505d1ffa..8c4aef022 100644
--- a/packages/address-list/index.vue
+++ b/packages/address-list/index.vue
@@ -13,10 +13,10 @@
     </radio-group>
     <cell
       icon="add"
-      class="van-address-list__add van-hairline--top"
-      @click="$emit('add')"
-      :title="addButtonText || $t('add')"
       is-link
+      class="van-address-list__add van-hairline--top"
+      :title="addButtonText || $t('add')"
+      @click="$emit('add')"
     />
   </div>
 </template>
diff --git a/packages/cell-group/index.vue b/packages/cell-group/index.vue
index 59fd60221..ff5d6d81d 100644
--- a/packages/cell-group/index.vue
+++ b/packages/cell-group/index.vue
@@ -5,11 +5,9 @@
 </template>
 
 <script>
-import install from '../utils/install';
-
-export default {
-  install,
+import create from '../utils/create-basic';
 
+export default create({
   name: 'cell-group',
 
   props: {
@@ -18,5 +16,5 @@ export default {
       default: true
     }
   }
-};
+});
 </script>
diff --git a/packages/cell/index.vue b/packages/cell/index.vue
index 7fe972fc1..9c68fe778 100644
--- a/packages/cell/index.vue
+++ b/packages/cell/index.vue
@@ -38,12 +38,10 @@
 
 <script>
 import Icon from '../icon';
-import install from '../utils/install';
 import RouterLink from '../mixins/router-link';
+import create from '../utils/create-basic';
 
-export default {
-  install,
-
+export default create({
   name: 'cell',
 
   components: {
@@ -72,5 +70,5 @@ export default {
       this.routerLink();
     }
   }
-};
+});
 </script>
diff --git a/packages/contact-list/index.vue b/packages/contact-list/index.vue
index 154886745..5804ad7a5 100644
--- a/packages/contact-list/index.vue
+++ b/packages/contact-list/index.vue
@@ -13,10 +13,10 @@
     </radio-group>
     <cell
       icon="add"
-      class="van-contact-list__add van-hairline--top"
-      @click="$emit('add')"
-      :title="addText || $t('addText')"
       is-link
+      class="van-contact-list__add van-hairline--top"
+      :title="addText || $t('addText')"
+      @click="$emit('add')"
     />
   </div>
 </template>
diff --git a/packages/icon/index.vue b/packages/icon/index.vue
index 62c122341..8fb17ab9f 100644
--- a/packages/icon/index.vue
+++ b/packages/icon/index.vue
@@ -6,16 +6,14 @@
 </template>
 
 <script>
-import install from '../utils/install';
-
-export default {
-  install,
+import create from '../utils/create-basic';
 
+export default create({
   name: 'icon',
 
   props: {
     name: String,
     info: String
   }
-};
+});
 </script>
diff --git a/packages/loading/index.vue b/packages/loading/index.vue
index 931799100..ff09f5ff1 100644
--- a/packages/loading/index.vue
+++ b/packages/loading/index.vue
@@ -10,11 +10,9 @@
 </template>
 
 <script>
-import install from '../utils/install';
-
-export default {
-  install,
+import create from '../utils/create-basic';
 
+export default create({
   name: 'loading',
 
   props: {
@@ -37,5 +35,5 @@ export default {
       } : {};
     }
   }
-};
+});
 </script>
diff --git a/packages/sku/Sku.vue b/packages/sku/Sku.vue
index fe80a267c..673c06c65 100644
--- a/packages/sku/Sku.vue
+++ b/packages/sku/Sku.vue
@@ -3,98 +3,91 @@
     v-if="!isSkuEmpty"
     v-model="show"
     position="bottom"
+    class="van-sku-container"
     :close-on-click-overlay="closeOnClickOverlay"
     :get-container="getContainer"
   >
-    <div class="van-sku-container">
-      <div class="van-sku-layout">
-        <!-- sku-header -->
-        <slot
-          name="sku-header"
+    <!-- sku-header -->
+    <slot
+      name="sku-header"
+      :sku-event-bus="skuEventBus"
+      :selected-sku="selectedSku"
+      :selected-sku-comb="selectedSkuComb"
+    >
+      <sku-header
+        :sku-event-bus="skuEventBus"
+        :selected-sku="selectedSku"
+        :selected-sku-comb="selectedSkuComb"
+        :goods="goods"
+        :sku="sku"
+      />
+    </slot>
+    <div class="van-sku-body" :style="bodyStyle">
+      <!-- sku-body-top -->
+      <slot name="sku-body-top" :selected-sku="selectedSku" :sku-event-bus="skuEventBus" />
+      <!-- sku-group -->
+      <slot name="sku-group" :selected-sku="selectedSku" :sku-event-bus="skuEventBus">
+        <div v-if="hasSku" class="van-sku-group-container van-hairline--bottom">
+          <sku-row
+            v-for="(skuTreeItem, index) in skuTree"
+            :key="index"
+            :sku-row="skuTreeItem"
+          >
+            <sku-row-item
+              v-for="(skuValue, index) in skuTreeItem.v"
+              :key="index"
+              :sku-key-str="skuTreeItem.k_s"
+              :sku-value="skuValue"
+              :sku-event-bus="skuEventBus"
+              :selected-sku="selectedSku"
+              :sku-list="sku.list"
+            />
+          </sku-row>
+        </div>
+      </slot>
+      <!-- extra-sku-group -->
+      <slot name="extra-sku-group" :sku-event-bus="skuEventBus"/>
+      <!-- sku-stepper -->
+      <slot
+        name="sku-stepper"
+        :sku-event-bus="skuEventBus"
+        :selected-sku="selectedSku"
+        :selected-sku-comb="selectedSkuComb"
+        :selected-num="selectedNum"
+      >
+        <sku-stepper
+          ref="skuStepper"
           :sku-event-bus="skuEventBus"
           :selected-sku="selectedSku"
           :selected-sku-comb="selectedSkuComb"
-        >
-          <sku-header
-            :sku-event-bus="skuEventBus"
-            :selected-sku="selectedSku"
-            :selected-sku-comb="selectedSkuComb"
-            :goods="goods"
-            :sku="sku"
-          />
-        </slot>
-        <div class="van-sku-body" :style="bodyStyle">
-          <!-- sku-body-top -->
-          <slot name="sku-body-top" :selected-sku="selectedSku" :sku-event-bus="skuEventBus" />
-          <!-- sku-group -->
-          <slot name="sku-group" :selected-sku="selectedSku" :sku-event-bus="skuEventBus">
-            <div v-if="hasSku" class="van-sku-group-container van-hairline--bottom">
-              <div
-                v-for="(skuTreeItem, index) in skuTree"
-                class="van-sku-row-group"
-                :key="index">
-                <sku-row
-                  :sku-event-bus="skuEventBus"
-                  :sku-row="skuTreeItem"
-                >
-                  <sku-row-item
-                    v-for="(skuValue, index) in skuTreeItem.v"
-                    :key="index"
-                    :sku-key-str="skuTreeItem.k_s"
-                    :sku-value="skuValue"
-                    :sku-event-bus="skuEventBus"
-                    :selected-sku="selectedSku"
-                    :sku-list="sku.list"
-                  />
-                </sku-row>
-              </div>
-            </div>
-          </slot>
-          <!-- extra-sku-group -->
-          <slot name="extra-sku-group" :sku-event-bus="skuEventBus"/>
-          <!-- sku-stepper -->
-          <slot
-            name="sku-stepper"
-            :sku-event-bus="skuEventBus"
-            :selected-sku="selectedSku"
-            :selected-sku-comb="selectedSkuComb"
-            :selected-num="selectedNum"
-          >
-            <sku-stepper
-              ref="skuStepper"
-              :sku-event-bus="skuEventBus"
-              :selected-sku="selectedSku"
-              :selected-sku-comb="selectedSkuComb"
-              :selected-num="selectedNum"
-              :stepper-title="stepperTitle"
-              :sku-stock-num="sku.stock_num"
-              :quota="quota"
-              :quota-used="quotaUsed"
-              :disable-stepper-input="disableStepperInput"
-              :hide-stock="hideStock"
-              :custom-stepper-config="customStepperConfig"
-            />
-          </slot>
-          <!-- sku-messages -->
-          <slot name="sku-messages">
-            <sku-messages
-              ref="skuMessages"
-              :goods-id="goodsId"
-              :message-config="messageConfig"
-              :messages="sku.messages"
-            />
-          </slot>
-        </div>
-        <!-- sku-actions -->
-        <slot name="sku-actions" :sku-event-bus="skuEventBus">
-          <sku-actions
-            :sku-event-bus="skuEventBus"
-            :buy-text="buyText"
-            :show-add-cart-btn="showAddCartBtn"
-          />
-        </slot>
-      </div>
+          :selected-num="selectedNum"
+          :stepper-title="stepperTitle"
+          :sku-stock-num="sku.stock_num"
+          :quota="quota"
+          :quota-used="quotaUsed"
+          :disable-stepper-input="disableStepperInput"
+          :hide-stock="hideStock"
+          :custom-stepper-config="customStepperConfig"
+        />
+      </slot>
+      <!-- sku-messages -->
+      <slot name="sku-messages">
+        <sku-messages
+          ref="skuMessages"
+          :goods-id="goodsId"
+          :message-config="messageConfig"
+          :messages="sku.messages"
+        />
+      </slot>
     </div>
+    <!-- sku-actions -->
+    <slot name="sku-actions" :sku-event-bus="skuEventBus">
+      <sku-actions
+        :sku-event-bus="skuEventBus"
+        :buy-text="buyText"
+        :show-add-cart-btn="showAddCartBtn"
+      />
+    </slot>
   </popup>
 </template>
 
@@ -225,9 +218,8 @@ export default create({
         return;
       }
 
-      const windowHeight = window.innerHeight;
       // header高度82px, sku actions高度50px，如果改动了样式自己传下bodyOffsetTop调整下
-      const maxHeight = windowHeight - this.bodyOffsetTop;
+      const maxHeight = window.innerHeight - this.bodyOffsetTop;
 
       return {
         maxHeight: maxHeight + 'px'
@@ -268,12 +260,12 @@ export default create({
     const skuEventBus = new Vue();
     this.skuEventBus = skuEventBus;
 
-    skuEventBus.$on('sku:close', this.onCloseClicked);
-    skuEventBus.$on('sku:select', this.onSkuSelected);
+    skuEventBus.$on('sku:close', this.onClose);
+    skuEventBus.$on('sku:select', this.onSelect);
     skuEventBus.$on('sku:numChange', this.onNumChange);
     skuEventBus.$on('sku:overLimit', this.onOverLimit);
-    skuEventBus.$on('sku:addCart', this.onAddCartClicked);
-    skuEventBus.$on('sku:buy', this.onBuyClicked);
+    skuEventBus.$on('sku:addCart', this.onAddCart);
+    skuEventBus.$on('sku:buy', this.onBuy);
 
     this.resetSelectedSku(this.skuTree);
     // 组件初始化后的钩子，抛出skuEventBus
@@ -315,19 +307,17 @@ export default create({
       }
 
       if (this.isSkuCombSelected) {
-        const error = this.validateSkuMessages();
-        // sku留言没有错误则校验通过
-        return error;
-      } else {
-        return this.$t('spec');
+        return this.validateSkuMessages();
       }
+
+      return this.$t('spec');
     },
 
-    onCloseClicked() {
+    onClose() {
       this.show = false;
     },
 
-    onSkuSelected(skuValue) {
+    onSelect(skuValue) {
       // 点击已选中的sku时则取消选中
       this.selectedSku =
         this.selectedSku[skuValue.skuKeyStr] === skuValue.id
@@ -367,11 +357,11 @@ export default create({
       }
     },
 
-    onAddCartClicked() {
+    onAddCart() {
       this.onBuyOrAddCart('add-cart');
     },
 
-    onBuyClicked() {
+    onBuy() {
       this.onBuyOrAddCart('buy-clicked');
     },
 
diff --git a/packages/sku/components/SkuHeader.vue b/packages/sku/components/SkuHeader.vue
index 9c5c9ca72..24d592a72 100644
--- a/packages/sku/components/SkuHeader.vue
+++ b/packages/sku/components/SkuHeader.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="van-sku-header van-hairline--bottom">
     <div class="van-sku-header__img-wrap">
-      <img class="van-sku__goods-img" :src="goodsImg" >
+      <img :src="goodsImg" >
     </div>
     <div class="van-sku-header__goods-info">
       <div class="van-sku__goods-name van-ellipsis">{{ goods.title }}</div>
-      <div class="van-sku__goods-price"><span class="van-sku__price-symbol">￥</span><span class="van-sku__price-num">{{ price }}</span></div>
-      <span class="van-sku__close-icon" @click="skuEventBus.$emit('sku:close')" />
+      <div class="van-sku__goods-price">
+        <span class="van-sku__price-symbol">￥</span><span class="van-sku__price-num">{{ price }}</span>
+      </div>
+      <icon name="close" class="van-sku__close-icon" @click="skuEventBus.$emit('sku:close')" />
     </div>
   </div>
 </template>
@@ -18,11 +20,11 @@ export default create({
   name: 'sku-header',
 
   props: {
-    skuEventBus: Object,
     sku: Object,
+    goods: Object,
+    skuEventBus: Object,
     selectedSku: Object,
-    selectedSkuComb: Object,
-    goods: Object
+    selectedSkuComb: Object
   },
 
   computed: {
@@ -32,6 +34,7 @@ export default create({
       // 优先使用选中sku的图片
       return skuImg || this.goods.picture;
     },
+
     price() {
       if (this.selectedSkuComb) {
         return (this.selectedSkuComb.price / 100).toFixed(2);
diff --git a/packages/sku/components/SkuImgUploader.vue b/packages/sku/components/SkuImgUploader.vue
index 4f8785eca..c6b472e02 100644
--- a/packages/sku/components/SkuImgUploader.vue
+++ b/packages/sku/components/SkuImgUploader.vue
@@ -2,56 +2,51 @@
   <div class="van-sku-img-uploader">
     <!-- 头部 -->
     <van-uploader
-      :disabled="!canUpload"
-      :before-read="beforeReadFile"
+      :disabled="!!paddingImg"
       :after-read="afterReadFile"
-      accept="image/*">
+      :max-size="maxSize * 1024 * 1024"
+      accept="image/*"
+      @oversize="$toast($t('maxSize', maxSize))"
+    >
       <div class="van-sku-img-uploader__header">
         <div v-if="paddingImg">{{ $t('uploading') }}</div>
         <template v-else>
-          <van-icon name="photograph" />
-          <span class="label">{{ getPhotoText(value) }}</span> {{ $t('or') }}
-          <van-icon name="photo" />
-          <span class="label">{{ getPicText(value) }}</span>
+          <icon name="photograph" />
+          <span class="label">{{ $t(value ? 'rephoto' : 'photo') }}</span> {{ $t('or') }}
+          <icon name="photo" />
+          <span class="label">{{ $t(value ? 'reselect' : 'select') }}</span>
         </template>
       </div>
     </van-uploader>
     <!-- 图片列表区域 -->
-    <div class="van-sku-img-uploader__imglist" v-if="paddingImg || imgList.length > 0">
+    <div class="van-clearfix" v-if="paddingImg || imgList.length > 0">
       <!-- 已有的图片,图片右上角显示删除按钮 -->
       <div
         v-for="(img, index) in imgList"
         :key="index"
-        class="van-sku-img-uploader__img-container">
-        <span class="van-sku-img-uploader__delete-picture" @click="deleteImg(index)">
-          <van-icon name="clear" />
-        </span>
+        class="van-sku-img-uploader__img"
+      >
         <img :src="img">
+        <icon name="clear" class="van-sku-img-uploader__delete" @click="$emit('input', '')" />
       </div>
       <!-- 正在上传的图片,有上传等待提示 -->
-      <div
-        v-if="paddingImg"
-        class="van-sku-img-uploader__img-container">
+      <div v-if="paddingImg" class="van-sku-img-uploader__img">
         <img :src="paddingImg">
-        <van-loading class="van-sku-img-uploader__uploading" type="spinner" color="black" />
+        <loading class="van-sku-img-uploader__uploading" type="spinner" color="black" />
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import Icon from '../../icon';
-import Uploader from '../../uploader';
-import Loading from '../../loading';
+import VanUploader from '../../uploader';
 import { create } from '../../utils';
 
 export default create({
   name: 'sku-img-uploader',
 
   components: {
-    'van-uploader': Uploader,
-    'van-icon': Icon,
-    'van-loading': Loading
+    VanUploader
   },
 
   props: {
@@ -72,50 +67,25 @@ export default create({
       paddingImg: ''
     };
   },
+
   computed: {
     imgList() {
       return this.value && !this.paddingImg ? [this.value] : [];
-    },
-    canUpload() {
-      // 判断当前是否允许上传图片
-      if (this.paddingImg) return false;
-      return true;
     }
   },
 
   methods: {
-    getPhotoText(value) {
-      return value ? this.$t('rephoto') : this.$t('photo');
-    },
-
-    getPicText(value) {
-      return value ? this.$t('reselect') : this.$t('select');
-    },
-    beforeReadFile(file) {
-      // 拦截非图片的文件，以及大小限制
-      if (file.size > this.maxSize * 1024 * 1024) {
-        Toast(this.$t('maxSize', this.maxSize));
-        return false;
-      }
-      return true;
-    },
     afterReadFile(file) {
       // 上传文件
       this.paddingImg = file.content;
-      this.uploadImg(file.file).then(img => {
-        this.updateImg(img);
+      this.uploadImg(file.file, file.content).then(img => {
+        this.$emit('input', img);
         this.$nextTick(() => {
           this.paddingImg = '';
         });
       }).catch(() => {
         this.paddingImg = '';
       });
-    },
-    deleteImg() {
-      this.$emit('input', '');
-    },
-    updateImg(img) {
-      this.$emit('input', img);
     }
   }
 });
diff --git a/packages/sku/components/SkuMessages.vue b/packages/sku/components/SkuMessages.vue
index 7cc65321b..b2f406d5f 100644
--- a/packages/sku/components/SkuMessages.vue
+++ b/packages/sku/components/SkuMessages.vue
@@ -7,7 +7,8 @@
         :label="$t('onePic')"
         :key="`${goodsId}-${index}`"
         :required="message.required == '1'"
-        :title="message.name">
+        :title="message.name"
+      >
         <sku-img-uploader
           v-model="messageValues[index].value"
           :upload-img="messageConfig.uploadImg"
@@ -70,6 +71,7 @@ export default create({
     resetMessageValues(messages) {
       return (messages || []).map(() => ({ value: '' }));
     },
+
     getType(message) {
       if (+message.multiple === 1) {
         return 'textarea';
diff --git a/packages/sku/components/SkuRow.vue b/packages/sku/components/SkuRow.vue
index 77d1f82b3..6c52323e8 100644
--- a/packages/sku/components/SkuRow.vue
+++ b/packages/sku/components/SkuRow.vue
@@ -1,9 +1,7 @@
 <template>
   <div class="van-sku-row">
     <div class="van-sku-row__title">{{ skuRow.k }}：</div>
-    <div class="van-sku-row__items">
-      <slot />
-    </div>
+    <slot />
   </div>
 </template>
 
diff --git a/packages/sku/components/SkuRowItem.vue b/packages/sku/components/SkuRowItem.vue
index 7c716af2c..787ca0c35 100644
--- a/packages/sku/components/SkuRowItem.vue
+++ b/packages/sku/components/SkuRowItem.vue
@@ -5,7 +5,7 @@
       'van-sku-row__item--active': isChoosed,
       'van-sku-row__item--disabled': !isChoosable
     }"
-    @click="onSkuSelected"
+    @click="onSelect"
   >
     {{ skuValue.name }}
   </span>
@@ -41,14 +41,14 @@ export default create({
           return matchedSku[skuKey] == sku[skuKey]; // eslint-disable-line
         });
       });
-      const stock = filteredSku.reduce((total, sku) => (total += sku.stock_num), 0);
 
+      const stock = filteredSku.reduce((total, sku) => (total += sku.stock_num), 0);
       return stock > 0;
     }
   },
 
   methods: {
-    onSkuSelected() {
+    onSelect() {
       if (this.isChoosable) {
         this.skuEventBus.$emit('sku:select', {
           ...this.skuValue,
diff --git a/packages/sku/components/SkuStepper.vue b/packages/sku/components/SkuStepper.vue
index 49180d74f..440ef8c1c 100644
--- a/packages/sku/components/SkuStepper.vue
+++ b/packages/sku/components/SkuStepper.vue
@@ -57,6 +57,7 @@ export default create({
     currentNum(num) {
       this.skuEventBus.$emit('sku:numChange', num);
     },
+
     stepperLimit(limit) {
       if (limit < this.currentNum) {
         this.currentNum = limit;
@@ -71,6 +72,7 @@ export default create({
       }
       return this.skuStockNum;
     },
+
     quotaText() {
       const { quotaText } = this.customStepperConfig;
       let text = '';
@@ -83,6 +85,7 @@ export default create({
 
       return text;
     },
+
     stepperLimit() {
       const quotaLimit = this.quota - this.quotaUsed;
       let limit;
@@ -105,6 +108,7 @@ export default create({
     setCurrentNum(num) {
       this.currentNum = num;
     },
+
     onOverLimit(action) {
       this.skuEventBus.$emit('sku:overLimit', {
         action,
@@ -113,6 +117,7 @@ export default create({
         quotaUsed: this.quotaUsed
       });
     },
+
     onChange(currentValue) {
       const { handleStepperChange } = this.customStepperConfig;
       handleStepperChange && handleStepperChange(currentValue);
diff --git a/packages/sku/utils/skuHelper.js b/packages/sku/utils/skuHelper.js
index 59e1e123d..7387f1394 100644
--- a/packages/sku/utils/skuHelper.js
+++ b/packages/sku/utils/skuHelper.js
@@ -43,7 +43,7 @@ export const normalizeSkuTree = (skuTree) => {
 // 判断是否所有的sku都已经选中
 export const isAllSelected = (skuTree, selectedSku) => {
   // 筛选selectedSku对象中key值不为空的值
-  const selected = Object.keys(selectedSku).filter(skuKeyStr => selectedSku[skuKeyStr] !== '');
+  const selected = Object.keys(selectedSku).filter(skuKeyStr => selectedSku[skuKeyStr]);
   return skuTree.length === selected.length;
 };
 
@@ -53,8 +53,8 @@ export const getSkuComb = (skuList, selectedSku) => {
     return Object.keys(selectedSku).every(skuKeyStr => {
       return String(skuComb[skuKeyStr]) === String(selectedSku[skuKeyStr]); // eslint-disable-line
     });
-  })[0];
-  return skuComb;
+  });
+  return skuComb[0];
 };
 
 // 获取已选择的sku名称
@@ -72,10 +72,9 @@ export const getSelectedSkuValues = (skuTree, selectedSku) => {
   }, []);
 };
 
-const SkuHelper = {
+export default {
   normalizeSkuTree,
   isAllSelected,
   getSkuComb,
   getSelectedSkuValues
 };
-export default SkuHelper;
diff --git a/packages/utils/create-basic.js b/packages/utils/create-basic.js
new file mode 100644
index 000000000..c39e368db
--- /dev/null
+++ b/packages/utils/create-basic.js
@@ -0,0 +1,18 @@
+/**
+ * Create a basic component with common options
+ */
+import '../locale';
+import i18n from '../mixins/i18n';
+
+const install = function(Vue) {
+  Vue.component(this.name, this);
+};
+
+export default function(sfc) {
+  sfc.name = 'van-' + sfc.name;
+  sfc.install = sfc.install || install;
+  sfc.mixins = sfc.mixins || [];
+  sfc.mixins.push(i18n);
+
+  return sfc;
+};
diff --git a/packages/utils/create.js b/packages/utils/create.js
index 68b66929f..e2fede88b 100644
--- a/packages/utils/create.js
+++ b/packages/utils/create.js
@@ -1,25 +1,18 @@
 /**
  * Create a component with common options
  */
-import '../locale';
-import i18n from '../mixins/i18n';
-import install from './install';
+import createBasic from './create-basic';
 import Icon from '../icon';
 import Loading from '../loading';
 import Cell from '../cell';
 import CellGroup from '../cell-group';
 
 export default function(sfc) {
-  sfc.name = 'van-' + sfc.name;
-  sfc.install = sfc.install || install;
-  sfc.mixins = sfc.mixins || [];
-  sfc.mixins.push(i18n);
   sfc.components = Object.assign(sfc.components || {}, {
     Icon,
     Loading,
     Cell,
     CellGroup
   });
-
-  return sfc;
+  return createBasic(sfc);
 };
diff --git a/packages/utils/install.js b/packages/utils/install.js
deleted file mode 100644
index 11f33a1c9..000000000
--- a/packages/utils/install.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Install function to register a component
- */
-export default function(Vue) {
-  Vue.component(this.name, this);
-}
diff --git a/packages/utils/node.js b/packages/utils/node.js
index 929c056ce..e19f98168 100644
--- a/packages/utils/node.js
+++ b/packages/utils/node.js
@@ -1,3 +1,6 @@
+/**
+ * VNode helper
+ */
 export default {
   name: 'van-node',
   functional: true,
diff --git a/packages/vant-css/src/base.css b/packages/vant-css/src/base.css
index e07c9f4bd..1a389c4db 100644
--- a/packages/vant-css/src/base.css
+++ b/packages/vant-css/src/base.css
@@ -5,6 +5,7 @@
 @import "./common/var.css";
 @import "./common/normalize.css";
 @import "./common/ellipsis.css";
+@import "./common/clearfix.css";
 @import "./common/hairline.css";
 @import "./common/animation.css";
 @import './icon.css';
diff --git a/packages/vant-css/src/common/clearfix.css b/packages/vant-css/src/common/clearfix.css
new file mode 100644
index 000000000..1f53bdd27
--- /dev/null
+++ b/packages/vant-css/src/common/clearfix.css
@@ -0,0 +1,5 @@
+@import '../mixins/clearfix.css';
+
+.van-clearfix {
+  @mixin ellipsis;
+}
diff --git a/packages/vant-css/src/sku.css b/packages/vant-css/src/sku.css
index f1d70af18..1b540643d 100644
--- a/packages/vant-css/src/sku.css
+++ b/packages/vant-css/src/sku.css
@@ -3,10 +3,6 @@
 
 .van-sku {
   &-container {
-    background: $background-color;
-  }
-
-  &-layout {
     background: $white;
   }
 
@@ -25,14 +21,6 @@
     padding: 12px 0 2px;
   }
 
-  &-row-group {
-    margin: 0 15px 10px 0;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
   /* sku header */
   &-header {
     margin-left: 15px;
@@ -46,7 +34,7 @@
       background: $background-color;
       border-radius: 2px;
 
-      .van-sku__goods-img {
+      img {
         position: absolute;
         margin: auto;
         top: 0;
@@ -87,19 +75,22 @@
   }
 
   &__close-icon {
+    top: 10px;
+    right: 15px;
+    font-size: 20px;
+    color: $gray-dark;
     position: absolute;
-    top: 0;
-    right: 0;
-    width: 44px;
-    height: 44px;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAAUVBMVEUAAACfn5+bm5uampqZmZmoqKiampqampqZmZmampqampqbm5ubm5uZmZmqqqqampqampqZmZmampqampqampqbm5ubm5uampqdnZ2ampqZmZkjZXmqAAAAGnRSTlMAFYBC5wm+rdPv1Ckl8wzZxKWicm9eUjoN8nSyS9UAAAFVSURBVDjLvZXbrsIgEEWhtAUU6M1a3f//oSeHWKfuVhv7IC+TkJVhz4UZ9bsThq5uYmzqbgifSV04LI4r9Fs0FRHw/WhCugUz9h6IRdpmryVgzfLGWKC8brEF0E58ObVAsUIrC1y2fFwAW9GdhTfb6oyHZQ3+/C7us39VcgXE79o3sIgylayXdZdpIaJVH08rQnTE9BmeEPXsWMK1rV6m01Xz/dO1g5H3nH6yNcoZNnCPPoOXTjplemYlnR4h2wG9YppZ1WPItsOomGZWjeiyrWEU08wqgzrbBkERfWJWBTTZRiTFNLMqIWZ7x43atQYa+lA33EmG5KyB0yyDApT8/uvWFCCnTvIrtKRuLgqzQktRpNzMCi3l5kaymZXqiGS3blGX2Zl2ftGi6+avqtcsUvN/8a2++LCHRsH+kDkwvg4Mxt2Re3yY85pIsiaOLKD91faz8wcoUxux/aS9awAAAABJRU5ErkJggg==);
-    background-size: 22px 22px;
-    background-repeat: no-repeat;
-    background-position: 7px 10px;
+    text-align: center;
   }
 
   /* sku row */
   &-row {
+    margin: 0 15px 10px 0;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
     &__title {
       font-size: 14px;
       padding-bottom: 10px;
@@ -119,13 +110,13 @@
       border-radius: 3px;
       box-sizing: border-box;
 
-      &.van-sku-row__item--active {
+      &--active {
         color: $white;
         border-color: $red;
         background: $red;
       }
 
-      &.van-sku-row__item--disabled {
+      &--disabled {
         background: $active-color;
         border-color: $gray-light;
         color: $gray;
@@ -147,8 +138,6 @@
   }
 
   &__stepper {
-    top: 7px;
-    left: 4px;
     float: right;
 
     &-title {
@@ -172,6 +161,9 @@
   }
 
   &-messages {
+    padding-bottom: 10px;
+    background: $background-color;
+
     &__image-cell {
       .van-cell__title {
         width: 90px;
@@ -187,7 +179,7 @@
 
     &__header {
       padding: 0 10px;
-      border: 1px solid #e5e5e5;
+      border: 1px solid $gray-light;
       line-height: 24px;
       border-radius: 3px;
       font-size: 12px;
@@ -199,18 +191,13 @@
       }
     }
 
-    &__imglist {
-      @mixin clearfix;
-    }
-
-    &__img-container {
+    &__img {
       height: 60px;
       width: 60px;
-      margin-top: 10px;
-      margin-right: 10px;
       float: left;
+      margin: 10px 10px 0 0;
       position: relative;
-      border: #e5e5e5 1px solid;
+      border: $gray-light 1px solid;
 
       img {
         max-width: 100%;
@@ -221,14 +208,19 @@
       }
     }
 
-    &__delete-picture {
+    &__delete {
       position: absolute;
       color: $red;
-      top: -10px;
-      right: -17px;
+      top: -12px;
+      right: -14px;
       z-index: 1;
-      width: 22px;
-      height: 22px;
+      padding: 6px;
+
+      &::before {
+        font-size: 14px;
+        border-radius: 14px;
+        background-color: $white;
+      }
     }
 
     &__uploading {
@@ -246,6 +238,5 @@
   /* sku actions */
   &-actions {
     display: flex;
-    margin-top: 10px;
   }
 }
diff --git a/packages/vant-css/src/tree-select.css b/packages/vant-css/src/tree-select.css
index d08e0200d..d255fd3e5 100644
--- a/packages/vant-css/src/tree-select.css
+++ b/packages/vant-css/src/tree-select.css
@@ -1,11 +1,8 @@
-@import "./mixins/ellipsis.css";
-@import "./mixins/clearfix.css";
 @import './common/var.css';
 
 .van-tree-select {
   user-select: none;
   position: relative;
-  @mixin clearfix;
 
   &__nav {
     width: 143px;
diff --git a/test/specs/address-edit.spec.js b/test/specs/address-edit.spec.js
index c0b849832..342a504b1 100644
--- a/test/specs/address-edit.spec.js
+++ b/test/specs/address-edit.spec.js
@@ -262,7 +262,7 @@ describe('AddressEdit', () => {
 
     const deleteButton = wrapper.find('.van-button')[1];
     deleteButton.trigger('click');
-    wrapper.vm.onDeleteAddress();
+    wrapper.vm.onDelete();
 
     setTimeout(() => {
       wrapper.vm.isDeleting = false;
diff --git a/test/specs/sku.spec.js b/test/specs/sku.spec.js
index 4fbf01613..1dfe4b487 100644
--- a/test/specs/sku.spec.js
+++ b/test/specs/sku.spec.js
@@ -55,7 +55,7 @@ describe('Sku', (done) => {
         '.van-stepper__input': '1'
       },
       src: {
-        '.van-sku__goods-img': 'https://img.yzcdn.cn/upload_files/2017/02/21/FjKTOxjVgnUuPmHJRdunvYky9OHP.jpg!100x100.jpg'
+        '.van-sku-header__img-wrap img': 'https://img.yzcdn.cn/upload_files/2017/02/21/FjKTOxjVgnUuPmHJRdunvYky9OHP.jpg!100x100.jpg'
       }
     });
 
@@ -69,7 +69,7 @@ describe('Sku', (done) => {
     wrapper.vm.$nextTick(() => {
       DOMChecker(wrapper, {
         src: {
-          '.van-sku__goods-img': 'https://img.yzcdn.cn/upload_files/2017/03/16/Fs_OMbSFPa183sBwvG_94llUYiLa.jpeg?imageView2/2/w/100/h/100/q/75/format/jpg'
+          '.van-sku-header__img-wrap img': 'https://img.yzcdn.cn/upload_files/2017/03/16/Fs_OMbSFPa183sBwvG_94llUYiLa.jpeg?imageView2/2/w/100/h/100/q/75/format/jpg'
         }
       });
 
@@ -111,7 +111,7 @@ describe('Sku', (done) => {
       expect(buyCallback.calledOnce).to.be.false;
 
       // 选择完整规格时，未填留言时，弹出toast提示。
-      wrapper.find('.van-sku-row-group')[1].find('.van-sku-row__item')[0].trigger('click');
+      wrapper.find('.van-sku-row')[1].find('.van-sku-row__item')[0].trigger('click');
       buyBtn.trigger('click');
       wrapper.vm.$nextTick(() => {
         expect(toastText.textContent).to.equal('请填写留言1');

From f9445ba4eefd13e68c6837dfa045e7aec93092b8 Mon Sep 17 00:00:00 2001
From: wny <colonD.wny@gmail.com>
Date: Fri, 16 Mar 2018 22:03:42 +0800
Subject: [PATCH 25/48] add sku-header-price slot (#705)

* [new feature] add sku-header-price slot
---
 docs/demos/views/sku.vue              |  5 +++++
 docs/markdown/en-US/sku.md            |  7 +++++++
 docs/markdown/zh-CN/sku.md            |  7 +++++++
 packages/sku/Sku.vue                  | 21 +++++++++++++++++++--
 packages/sku/components/SkuHeader.vue | 16 +++-------------
 5 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/docs/demos/views/sku.vue b/docs/demos/views/sku.vue
index f0e51f1a5..e46eb8204 100644
--- a/docs/demos/views/sku.vue
+++ b/docs/demos/views/sku.vue
@@ -59,6 +59,11 @@
           @buy-clicked="onBuyClicked"
           @add-cart="onAddCartClicked"
         >
+          <template slot="sku-header-price" slot-scope="props">
+            <div class="van-sku__goods-price">
+              <span class="van-sku__price-symbol">￥</span><span class="van-sku__price-num">{{ props.price }}</span> only!!!
+            </div>
+          </template>
           <template slot="sku-actions" slot-scope="props">
             <div class="van-sku-actions">
               <van-button bottom-action @click="onPointClicked">{{ $t('button1') }}</van-button>
diff --git a/docs/markdown/en-US/sku.md b/docs/markdown/en-US/sku.md
index b3b8c27bd..b1a5ec87d 100644
--- a/docs/markdown/en-US/sku.md
+++ b/docs/markdown/en-US/sku.md
@@ -64,6 +64,12 @@ Vue.use(Sku);
   @buy-clicked="onBuyClicked"
   @add-cart="onAddCartClicked"
 >
+  <!-- custom sku-header-price -->
+  <template slot="sku-header-price" slot-scope="props">
+    <div class="van-sku__goods-price">
+      <span class="van-sku__price-symbol">￥</span><span class="van-sku__price-num">{{ props.price }}</span> only!!!
+    </div>
+  </template>
   <!-- custom sku actions -->
   <template slot="sku-actions" slot-scope="props">
     <div class="van-sku-actions">
@@ -114,6 +120,7 @@ Vue.use(Sku);
 | Name | Description | 
 |-----------|-----------|
 | sku-header | Custom header |
+| sku-header-price | Custom header price area |
 | sku-body-top | Custom content before sku-group |
 | sku-group | Custom sku |
 | extra-sku-group | Extra custom content |
diff --git a/docs/markdown/zh-CN/sku.md b/docs/markdown/zh-CN/sku.md
index 760013ea4..b3a7a6bb5 100644
--- a/docs/markdown/zh-CN/sku.md
+++ b/docs/markdown/zh-CN/sku.md
@@ -64,6 +64,12 @@ Vue.use(Sku);
   @buy-clicked="onBuyClicked"
   @add-cart="onAddCartClicked"
 >
+  <!-- 自定义 sku-header-price -->
+  <template slot="sku-header-price" slot-scope="props">
+    <div class="van-sku__goods-price">
+      <span class="van-sku__price-symbol">￥</span><span class="van-sku__price-num">{{ props.price }}</span> only!!!
+    </div>
+  </template>
   <!-- 自定义 sku actions -->
   <template slot="sku-actions" slot-scope="props">
     <div class="van-sku-actions">
@@ -116,6 +122,7 @@ Sku 组件默认划分好了若干区块，这些区块都定义成了 slot，
 | 名称 | 说明 | 
 |-----------|-----------|
 | sku-header | 商品信息展示区，包含商品图片、名称、价格等信息 |
+| sku-header-price | 自定义sku头部价格展示 |
 | sku-body-top | sku展示区上方的slot，无默认展示内容，按需使用 |
 | sku-group | 商品sku展示区 |
 | extra-sku-group | 额外商品sku展示区，一般用不到 |
diff --git a/packages/sku/Sku.vue b/packages/sku/Sku.vue
index 673c06c65..6d9fb9b49 100644
--- a/packages/sku/Sku.vue
+++ b/packages/sku/Sku.vue
@@ -17,10 +17,19 @@
       <sku-header
         :sku-event-bus="skuEventBus"
         :selected-sku="selectedSku"
-        :selected-sku-comb="selectedSkuComb"
         :goods="goods"
         :sku="sku"
-      />
+      >
+        <slot
+          name="sku-header-price"
+          :price="price"
+          :selected-sku-comb="selectedSkuComb"
+        >
+          <div class="van-sku__goods-price">
+            <span class="van-sku__price-symbol">￥</span><span class="van-sku__price-num">{{ price }}</span>
+          </div>
+        </slot>
+      </sku-header>
     </slot>
     <div class="van-sku-body" :style="bodyStyle">
       <!-- sku-body-top -->
@@ -251,6 +260,14 @@ export default create({
       return null;
     },
 
+    price() {
+      if (this.selectedSkuComb) {
+        return (this.selectedSkuComb.price / 100).toFixed(2);
+      }
+      // sku.price是一个格式化好的价格区间
+      return this.sku.price;
+    },
+
     skuTree() {
       return this.sku.tree || [];
     }
diff --git a/packages/sku/components/SkuHeader.vue b/packages/sku/components/SkuHeader.vue
index 24d592a72..6171a783a 100644
--- a/packages/sku/components/SkuHeader.vue
+++ b/packages/sku/components/SkuHeader.vue
@@ -5,9 +5,8 @@
     </div>
     <div class="van-sku-header__goods-info">
       <div class="van-sku__goods-name van-ellipsis">{{ goods.title }}</div>
-      <div class="van-sku__goods-price">
-        <span class="van-sku__price-symbol">￥</span><span class="van-sku__price-num">{{ price }}</span>
-      </div>
+      <!-- price display area -->
+      <slot />
       <icon name="close" class="van-sku__close-icon" @click="skuEventBus.$emit('sku:close')" />
     </div>
   </div>
@@ -23,8 +22,7 @@ export default create({
     sku: Object,
     goods: Object,
     skuEventBus: Object,
-    selectedSku: Object,
-    selectedSkuComb: Object
+    selectedSku: Object
   },
 
   computed: {
@@ -33,14 +31,6 @@ export default create({
       const skuImg = this.getSkuImg(s1Id);
       // 优先使用选中sku的图片
       return skuImg || this.goods.picture;
-    },
-
-    price() {
-      if (this.selectedSkuComb) {
-        return (this.selectedSkuComb.price / 100).toFixed(2);
-      }
-      // sku.price是一个格式化好的价格区间
-      return this.sku.price;
     }
   },
 

From 4ae26ac8be422b723e0405abaab57b9f1db9f771 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 19 Mar 2018 10:21:37 +0800
Subject: [PATCH 26/48] [Improvement] AddressEdit: add show-delete prop (#716)

---
 docs/demos/views/address-edit.vue   |  1 +
 docs/markdown/en-US/address-edit.md |  2 ++
 docs/markdown/zh-CN/address-edit.md |  2 ++
 package.json                        | 12 ++++----
 packages/address-edit/index.vue     |  7 +++--
 yarn.lock                           | 46 +++++++++++++++++++++--------
 6 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/docs/demos/views/address-edit.vue b/docs/demos/views/address-edit.vue
index ea33cf138..f350c0176 100644
--- a/docs/demos/views/address-edit.vue
+++ b/docs/demos/views/address-edit.vue
@@ -4,6 +4,7 @@
       <van-address-edit
         :area-list="areaList"
         show-postal
+        show-delete
         show-set-default
         show-search-result
         :search-result="searchResult"
diff --git a/docs/markdown/en-US/address-edit.md b/docs/markdown/en-US/address-edit.md
index 644e8bc6e..c38677855 100644
--- a/docs/markdown/en-US/address-edit.md
+++ b/docs/markdown/en-US/address-edit.md
@@ -16,6 +16,7 @@ Vue.use(AddressEdit);
 <van-address-edit
   :area-list="areaList"
   show-postal
+  show-delete
   show-set-default
   show-search-result
   :search-result="searchResult"
@@ -64,6 +65,7 @@ export default {
 | address-info | Address Info | `Object` | `{}` | - |
 | search-result | Address search result | `Array` | `[]` | - |
 | show-postal | Whether to show postal field | `Boolean` | `false` | - |
+| show-delete | Whether to show delete button | `Boolean` | `false` | - |
 | show-set-default | Whether to show default address switch | `Boolean` | `false` | - |
 | show-search-result | Whether to show address search result | `Boolean` | `false` | - |
 | is-saving | Whether to show save button loading status | `Boolean` | `false` | - |
diff --git a/docs/markdown/zh-CN/address-edit.md b/docs/markdown/zh-CN/address-edit.md
index 35f29180c..53c6d59f5 100644
--- a/docs/markdown/zh-CN/address-edit.md
+++ b/docs/markdown/zh-CN/address-edit.md
@@ -15,6 +15,7 @@ Vue.use(AddressEdit);
 <van-address-edit
   :area-list="areaList"
   show-postal
+  show-delete
   show-set-default
   show-search-result
   :search-result="searchResult"
@@ -63,6 +64,7 @@ export default {
 | search-result | 详细地址搜索结果 | `Array` | `[]` | - |
 | address-text | "地址"文案前缀 | `String` | `收货` | - |
 | show-postal | 是否显示邮政编码 | `Boolean` | `false` | - |
+| show-delete | 是否显示删除按钮 | `Boolean` | `false` | - |
 | show-set-default | 是否显示默认地址栏 | `Boolean` | `false` | - |
 | show-search-result | 是否显示搜索结果 | `Boolean` | `false` | - |
 | is-saving | 是否显示保存按钮加载动画 | `Boolean` | `false` | - |
diff --git a/package.json b/package.json
index f332e331c..2044ff9ff 100644
--- a/package.json
+++ b/package.json
@@ -62,9 +62,9 @@
     "chai": "^4.1.2",
     "codecov": "^3.0.0",
     "cross-env": "^5.1.4",
-    "css-loader": "^0.28.10",
+    "css-loader": "^0.28.11",
     "dependency-tree": "^6.0.1",
-    "eslint": "^4.18.2",
+    "eslint": "^4.19.0",
     "eslint-plugin-vue": "^4.3.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "fast-vue-md-loader": "^1.0.3",
@@ -80,10 +80,10 @@
     "karma-spec-reporter": "^0.0.32",
     "karma-webpack": "^2.0.13",
     "mocha": "^5.0.4",
-    "postcss": "^6.0.19",
+    "postcss": "^6.0.20",
     "postcss-calc": "^6.0.0",
     "postcss-easy-import": "^3.0.0",
-    "postcss-loader": "^2.1.1",
+    "postcss-loader": "^2.1.2",
     "precss": "2.0.0",
     "progress-bar-webpack-plugin": "^1.11.0",
     "rimraf": "^2.5.4",
@@ -94,12 +94,12 @@
     "uppercamelcase": "^3.0.0",
     "url-loader": "^1.0.1",
     "vant-doc": "1.0.4",
-    "vue": "^2.5.16",
+    "vue": "2.5.16",
     "vue-loader": "^14.2.1",
     "vue-router": "^3.0.1",
     "vue-sfc-compiler": "^0.0.8",
     "vue-style-loader": "^4.0.2",
-    "vue-template-compiler": "^2.5.16",
+    "vue-template-compiler": "2.5.16",
     "vue-template-es2015-compiler": "^1.6.0",
     "webpack": "^4.1.1",
     "webpack-cli": "^2.0.12",
diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue
index 2864dcd39..c1bd25f1b 100644
--- a/packages/address-edit/index.vue
+++ b/packages/address-edit/index.vue
@@ -119,6 +119,7 @@ export default create({
     isSaving: Boolean,
     isDeleting: Boolean,
     areaList: Object,
+    showDelete: Boolean,
     showPostal: Boolean,
     showSetDefault: Boolean,
     showSearchResult: Boolean,
@@ -144,7 +145,6 @@ export default create({
         ...defaultAddress,
         ...this.addressInfo
       },
-      isEdit: !!this.addressInfo.id,
       detailFocused: false,
       errorInfo: {
         name: false,
@@ -162,7 +162,6 @@ export default create({
           ...defaultAddress,
           ...val
         };
-        this.isEdit = !!val.id;
 
         if (val.area_code) {
           this.setAreaCode(val.area_code);
@@ -190,6 +189,10 @@ export default create({
 
     areaListLoaded() {
       return isObj(this.areaList) && Object.keys(this.areaList).length;
+    },
+
+    isEdit() {
+      return this.showDelete || !!this.data.id;
     }
   },
 
diff --git a/yarn.lock b/yarn.lock
index bbcf16ddf..2331c6b12 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -59,7 +59,7 @@ acorn@^5.0.0, acorn@^5.4.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
 
-acorn@^5.2.1, acorn@^5.4.1:
+acorn@^5.2.1, acorn@^5.4.1, acorn@^5.5.0:
   version "5.5.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
 
@@ -2257,9 +2257,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.10:
-  version "0.28.10"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.10.tgz#40282e79230f7bcb4e483efa631d670b735ebf42"
+css-loader@^0.28.11:
+  version "0.28.11"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7"
   dependencies:
     babel-code-frame "^6.26.0"
     css-selector-tokenizer "^0.7.0"
@@ -3000,9 +3000,9 @@ eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
-eslint@^4.18.2:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.18.2.tgz#0f81267ad1012e7d2051e186a9004cc2267b8d45"
+eslint@^4.19.0:
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.0.tgz#9e900efb5506812ac374557034ef6f5c3642fc4c"
   dependencies:
     ajv "^5.3.0"
     babel-code-frame "^6.22.0"
@@ -3013,7 +3013,7 @@ eslint@^4.18.2:
     doctrine "^2.1.0"
     eslint-scope "^3.7.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^3.5.2"
+    espree "^3.5.4"
     esquery "^1.0.0"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
@@ -3035,6 +3035,7 @@ eslint@^4.18.2:
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
+    regexpp "^1.0.1"
     require-uncached "^1.0.3"
     semver "^5.3.0"
     strip-ansi "^4.0.0"
@@ -3049,6 +3050,13 @@ espree@^3.5.2:
     acorn "^5.4.0"
     acorn-jsx "^3.0.0"
 
+espree@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
+  dependencies:
+    acorn "^5.5.0"
+    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"
@@ -6804,9 +6812,9 @@ postcss-load-plugins@^2.3.0:
     cosmiconfig "^2.1.1"
     object-assign "^4.1.0"
 
-postcss-loader@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.1.tgz#208935af3b1d65e1abb1a870a912dd12e7b36895"
+postcss-loader@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.2.tgz#03f54e23be736c9ea4f610e17d2a299254c05130"
   dependencies:
     loader-utils "^1.1.0"
     postcss "^6.0.0"
@@ -7070,6 +7078,14 @@ postcss@^6.0.19:
     source-map "^0.6.1"
     supports-color "^5.2.0"
 
+postcss@^6.0.20:
+  version "6.0.20"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.20.tgz#686107e743a12d5530cb68438c590d5b2bf72c3c"
+  dependencies:
+    chalk "^2.3.2"
+    source-map "^0.6.1"
+    supports-color "^5.3.0"
+
 precinct@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/precinct/-/precinct-4.0.0.tgz#ce67108123b8ae7c156180fb3836c5e5de24654f"
@@ -7560,6 +7576,10 @@ regex-not@^1.0.0:
   dependencies:
     extend-shallow "^2.0.1"
 
+regexpp@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.0.1.tgz#d857c3a741dce075c2848dcb019a0a975b190d43"
+
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
@@ -9263,7 +9283,7 @@ vue-style-loader@^4.0.2:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.5.16:
+vue-template-compiler@2.5.16:
   version "2.5.16"
   resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz#93b48570e56c720cdf3f051cc15287c26fbd04cb"
   dependencies:
@@ -9274,7 +9294,7 @@ vue-template-es2015-compiler@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
 
-vue@^2.5.16:
+vue@2.5.16:
   version "2.5.16"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.16.tgz#07edb75e8412aaeed871ebafa99f4672584a0085"
 

From 326b2d4c5102871dfbf82be7b0f69397234f3e1c Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 19 Mar 2018 11:06:46 +0800
Subject: [PATCH 27/48] [Improvement] Field: support autosize maxHeight &
 minHeight (#718)

---
 docs/demos/views/field.vue   |  2 +-
 docs/markdown/en-US/field.md |  2 +-
 docs/markdown/zh-CN/field.md |  2 +-
 packages/field/index.vue     | 35 ++++++++++++++----------
 test/specs/field.spec.js     | 53 ++++++++++++++++++++++++++++++------
 5 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/docs/demos/views/field.vue b/docs/demos/views/field.vue
index f2ba72d6a..1fbde7350 100644
--- a/docs/demos/views/field.vue
+++ b/docs/demos/views/field.vue
@@ -53,7 +53,7 @@
           type="textarea"
           :placeholder="$t('messagePlaceholder')"
           rows="1"
-          autosize
+          :autosize="{ maxHeight: 100, minHeight: 40 }"
         />
       </van-cell-group>
     </demo-block>
diff --git a/docs/markdown/en-US/field.md b/docs/markdown/en-US/field.md
index eda5c0736..810e06076 100644
--- a/docs/markdown/en-US/field.md
+++ b/docs/markdown/en-US/field.md
@@ -99,7 +99,7 @@ Filed support all native properties of input tag，such as `maxlength`、`placeh
 | disabled | Disable field | `Boolean` | `false` | - |
 | error | Whether to show error info | `Boolean` | `false` | - |
 | error-message | Error message | `String` | `''` | - |
-| autosize | Textarea auto resize | `Boolean` | `false` | - |
+| autosize | Textarea auto resize，can accpet an object, e.g. { maxHeight: 100, minHeight: 50 } | `Boolean | Object` | `false` | - |
 | icon | Right side Icon name | `String` | - | - |
 
 ### Event
diff --git a/docs/markdown/zh-CN/field.md b/docs/markdown/zh-CN/field.md
index 2257df11b..c8c161342 100644
--- a/docs/markdown/zh-CN/field.md
+++ b/docs/markdown/zh-CN/field.md
@@ -101,7 +101,7 @@ Filed 默认支持 Input 标签所有的原生属性，比如 `maxlength`、`pla
 | disabled | 是否禁用输入框 | `Boolean` | `false` | - |
 | error | 输入框是否有错误 | `Boolean` | `false` | - |
 | error-message | 输入框底部错误提示文案 | `String` | `''` | - |
-| autosize | 高度自适应(仅支持textarea) | `Boolean` | `false` | - |
+| autosize | 自适应内容高度，只对 textarea 有效，可传入对象，如 { maxHeight: 100, minHeight: 50 }，单位为 px | `Boolean | Object` | `false` | - |
 | icon | 输入框尾部图标 | `String` | - |  Icon 组件支持的类型 |
 
 ### Event
diff --git a/packages/field/index.vue b/packages/field/index.vue
index 5fa330b62..407a38441 100644
--- a/packages/field/index.vue
+++ b/packages/field/index.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import { create, isObj } from '../utils';
 
 export default create({
   name: 'field',
@@ -67,7 +67,7 @@ export default create({
     error: Boolean,
     border: Boolean,
     required: Boolean,
-    autosize: Boolean,
+    autosize: [Boolean, Object],
     errorMessage: String,
     onIconClick: {
       type: Function,
@@ -77,21 +77,12 @@ export default create({
 
   watch: {
     value() {
-      if (this.autosize && this.type === 'textarea') {
-        this.$nextTick(this.adjustSize);
-      }
+      this.$nextTick(this.adjustSize);
     }
   },
 
   mounted() {
-    if (this.autosize && this.type === 'textarea') {
-      const el = this.$refs.textarea;
-      const scrollHeight = el.scrollHeight;
-      if (scrollHeight !== 0) {
-        el.style.height = scrollHeight + 'px';
-      }
-      el.style.overflowY = 'hidden';
-    }
+    this.$nextTick(this.adjustSize);
   },
 
   computed: {
@@ -131,9 +122,25 @@ export default create({
     },
 
     adjustSize() {
+      if (!(this.type === 'textarea' && this.autosize)) {
+        return;
+      }
+
       const el = this.$refs.textarea;
       el.style.height = 'auto';
-      el.style.height = el.scrollHeight + 'px';
+
+      let height = el.scrollHeight;
+      if (isObj(this.autosize)) {
+        const { maxHeight, minHeight } = this.autosize;
+        if (maxHeight) {
+          height = Math.min(height, maxHeight);
+        }
+        if (minHeight) {
+          height = Math.max(height, minHeight);
+        }
+      }
+
+      el.style.height = height + 'px';
     }
   }
 });
diff --git a/test/specs/field.spec.js b/test/specs/field.spec.js
index 00f4f6a25..2a33d505c 100644
--- a/test/specs/field.spec.js
+++ b/test/specs/field.spec.js
@@ -66,23 +66,26 @@ describe('Field', () => {
     });
   });
 
-  it('create a textarea field', () => {
+  it('create a textarea field', (done) => {
     wrapper = mount(Field, {
       propsData: {
         type: 'textarea',
-        autosize: false
+        autosize: true
       }
     });
 
-    expect(wrapper.hasClass('van-field')).to.be.true;
-    expect(wrapper.hasClass('van-field--has-textarea')).to.be.true;
+    setTimeout(() => {
+      expect(wrapper.hasClass('van-field')).to.be.true;
+      expect(wrapper.hasClass('van-field--has-textarea')).to.be.true;
+      done();
+    }, 50);
   });
 
   it('create a autosize textarea field', (done) => {
     wrapper = mount(Field, {
       propsData: {
         type: 'textarea',
-        autosize: true
+        autosize: {}
       }
     });
 
@@ -98,15 +101,49 @@ describe('Field', () => {
     const textAreaDiff = (parseInt(textareaElement.style.paddingBottom, 10) +
           parseInt(textareaElement.style.paddingTop, 10)) || 0;
 
-    textareaElement.value = 'test';
+    const longText = 'testtesttesttesttesttesttest';
+    textareaElement.value = longText;
     textarea.trigger('input');
 
     wrapper.update();
     setTimeout(() => {
-      expect(wrapper.find('.van-field__control')[0].element.value).to.equal('test');
+      expect(wrapper.find('.van-field__control')[0].element.value).to.equal(longText);
       expect(textareaElement.style.height).to.equal((textareaElement.scrollHeight - textAreaDiff) + 'px');
       done();
-    }, 500);
+    }, 50);
+  });
+
+  it('autosize object', (done) => {
+    wrapper = mount(Field, {
+      propsData: {
+        type: 'textarea',
+        autosize: {
+          maxHeight: 100,
+          minHeight: 50
+        }
+      }
+    });
+
+    wrapper.vm.$on('input', val => {
+      wrapper.vm.value = val;
+    });
+
+    expect(wrapper.hasClass('van-field')).to.be.true;
+    expect(wrapper.hasClass('van-field--autosize')).to.be.true;
+
+    const textarea = wrapper.find('.van-field__control')[0];
+    const textareaElement = textarea.element;
+
+    const longText = 'testtesttesttesttesttesttest';
+    textareaElement.value = longText;
+    textarea.trigger('input');
+
+    wrapper.update();
+    setTimeout(() => {
+      expect(wrapper.find('.van-field__control')[0].element.value).to.equal(longText);
+      expect(textareaElement.style.height).to.equal(('50px'));
+      done();
+    }, 50);
   });
 
   it('show icon when has value and icon props', () => {

From 1489efd9f9059ed1386437858f90d043c3a6ab99 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 19 Mar 2018 13:05:08 +0800
Subject: [PATCH 28/48] [Doc] add click event document (#722)

---
 docs/markdown/en-US/button.md | 6 ++++++
 docs/markdown/en-US/cell.md   | 8 +++++++-
 docs/markdown/en-US/icon.md   | 6 ++++++
 docs/markdown/zh-CN/button.md | 6 ++++++
 docs/markdown/zh-CN/cell.md   | 8 +++++++-
 docs/markdown/zh-CN/icon.md   | 6 ++++++
 6 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/docs/markdown/en-US/button.md b/docs/markdown/en-US/button.md
index 0eb2c63ea..c01436e23 100644
--- a/docs/markdown/en-US/button.md
+++ b/docs/markdown/en-US/button.md
@@ -76,3 +76,9 @@ Use `tag` prop to custom button tag
 | loading | Whether show loading status | `Boolean` | `false` | - |
 | block | Whether to set display block | `Boolean` | `false` | - |
 | bottom-action | Whether to be action button | `Boolean` | `false` | - |
+
+### Event
+
+| Event | Description | Arguments |
+|-----------|-----------|-----------|
+| click | Triggered when click button and not disabled or loading | - |
diff --git a/docs/markdown/en-US/cell.md b/docs/markdown/en-US/cell.md
index 109f09da0..69ec1ca10 100644
--- a/docs/markdown/en-US/cell.md
+++ b/docs/markdown/en-US/cell.md
@@ -82,7 +82,13 @@ Vue.use(Cell).use(CellGroup);
 | is-link | Whether to show link icon | `Boolean` | `false` | - |
 | required | Whether to show required mark | `Boolean` | `false` | - |
 
-### Slot
+### Cell Event
+
+| Event | Description | Arguments |
+|-----------|-----------|-----------|
+| click | Triggered when click cell | - |
+
+### Cell Slot
 
 | name | Description |
 |-----------|-----------|
diff --git a/docs/markdown/en-US/icon.md b/docs/markdown/en-US/icon.md
index 51999d7df..0506c74a9 100644
--- a/docs/markdown/en-US/icon.md
+++ b/docs/markdown/en-US/icon.md
@@ -29,3 +29,9 @@ import 'vant/lib/vant-css/icon-local.css';
 |-----------|-----------|-----------|-------------|-------------|
 | name | Icon name | `String` | `''` | - |
 | info | Info message | `String` | `''` | - |
+
+### Event
+
+| Event | Description | Arguments |
+|-----------|-----------|-----------|
+| click | Triggered when click icon | - |
diff --git a/docs/markdown/zh-CN/button.md b/docs/markdown/zh-CN/button.md
index e107dd4ee..51c134c22 100644
--- a/docs/markdown/zh-CN/button.md
+++ b/docs/markdown/zh-CN/button.md
@@ -80,3 +80,9 @@ Vue.use(Button);
 | loading | 是否显示为加载状态 | `Boolean` |  `false` | - |
 | block | 是否为块级元素 | `Boolean` |   `false` | - |
 | bottom-action | 是否为底部行动按钮 | `Boolean` | `false` | - |
+
+### Event
+
+| 事件名 | 说明 | 参数 |
+|-----------|-----------|-----------|
+| click | 点击按钮且按钮状态不为加载或禁用时触发 | - |
diff --git a/docs/markdown/zh-CN/cell.md b/docs/markdown/zh-CN/cell.md
index 396956561..a3da213d5 100644
--- a/docs/markdown/zh-CN/cell.md
+++ b/docs/markdown/zh-CN/cell.md
@@ -89,7 +89,13 @@ Vue.use(Cell).use(CellGroup);
 | is-link | 是否展示右侧箭头并开启点击反馈 | `Boolean` | `false` | - |
 | required | 是否显示表单必填符号 | `Boolean` | `false` | - |
 
-### Slot
+### Cell Event
+
+| 事件名 | 说明 | 参数 |
+|-----------|-----------|-----------|
+| click | 点击 cell 时触发 | - |
+
+### Cell Slot
 
 | 名称 | 说明 |
 |-----------|-----------|
diff --git a/docs/markdown/zh-CN/icon.md b/docs/markdown/zh-CN/icon.md
index d47fd0c0c..f2c545774 100644
--- a/docs/markdown/zh-CN/icon.md
+++ b/docs/markdown/zh-CN/icon.md
@@ -30,3 +30,9 @@ import 'vant/lib/vant-css/icon-local.css';
 |-----------|-----------|-----------|-------------|-------------|
 | name | 图标名称 | `String` | `''` | - |
 | info | 图标右上角文字提示 | `String` | `''` | - |
+
+### Event
+
+| 事件名 | 说明 | 参数 |
+|-----------|-----------|-----------|
+| click | 点击图标时触发 | - |

From c6a3896ce7e160aef006d679cb056c42c1684f4c Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 19 Mar 2018 13:44:12 +0800
Subject: [PATCH 29/48] [Improvement] Switch: support custom size (#723)

---
 docs/demos/views/address-edit.vue |  8 ++---
 docs/demos/views/switch.vue       |  2 +-
 docs/markdown/en-US/switch.md     |  5 +--
 docs/markdown/zh-CN/switch.md     |  3 +-
 packages/field/index.vue          |  4 +++
 packages/switch/index.vue         | 29 +++++++++++++++---
 packages/vant-css/src/switch.css  | 51 +++++++++++--------------------
 test/specs/switch-cell.spec.js    |  6 ++--
 test/specs/switch.spec.js         | 17 ++---------
 9 files changed, 62 insertions(+), 63 deletions(-)

diff --git a/docs/demos/views/address-edit.vue b/docs/demos/views/address-edit.vue
index f350c0176..97774dfec 100644
--- a/docs/demos/views/address-edit.vue
+++ b/docs/demos/views/address-edit.vue
@@ -26,7 +26,7 @@ export default {
         name: '黄龙万科中心',
         address: '杭州市西湖区'
       }, {
-        name: '黄龙万科中心H座'
+        name: '黄龙万科中心G座'
       }, {
         name: '黄龙万科中心H座',
         address: '杭州市西湖区'
@@ -34,12 +34,12 @@ export default {
     },
     'en-US': {
       searchResult: [{
-        name: 'Name',
+        name: 'Name1',
         address: 'Address'
       }, {
-        name: 'Name'
+        name: 'Name2'
       }, {
-        name: 'Name',
+        name: 'Name3',
         address: 'Address'
       }]
     }
diff --git a/docs/demos/views/switch.vue b/docs/demos/views/switch.vue
index 92df8d9e9..87515b079 100644
--- a/docs/demos/views/switch.vue
+++ b/docs/demos/views/switch.vue
@@ -13,7 +13,7 @@
     </demo-block>
 
     <demo-block :title="$t('advancedUsage')">
-      <van-switch :value="checked2" @input="onInput" />
+      <van-switch :value="checked2" size="36px" @input="onInput" />
     </demo-block>
   </demo-section>
 </template>
diff --git a/docs/markdown/en-US/switch.md b/docs/markdown/en-US/switch.md
index 80589bf0b..9dc759142 100644
--- a/docs/markdown/en-US/switch.md
+++ b/docs/markdown/en-US/switch.md
@@ -41,7 +41,7 @@ export default {
 #### Advanced usage
 
 ```html
-<van-switch :value="checked" @input="onInput" />
+<van-switch :value="checked" size="36px" @input="onInput" />
 ```
 
 ```js
@@ -71,7 +71,8 @@ export default {
 |-----------|-----------|-----------|-------------|-------------|
 | v-model | Check status of Switch | `Boolean` | `false` | - |
 | loading | Whether to show loading icon | `Boolean` | `false` | - |
-| disabled | Disable switch | `Boolean` | `false` | - |
+| disabled | Whether to disable switch | `Boolean` | `false` | - |
+| size | Size of switch | `String` | `30px` | - |
 
 ### Event
 
diff --git a/docs/markdown/zh-CN/switch.md b/docs/markdown/zh-CN/switch.md
index a90c22fbc..8693c0d3b 100644
--- a/docs/markdown/zh-CN/switch.md
+++ b/docs/markdown/zh-CN/switch.md
@@ -36,7 +36,7 @@ export default {
 
 #### 高级用法
 ```html
-<van-switch :value="checked" @input="onInput" />
+<van-switch :value="checked" size="36px" @input="onInput" />
 ```
 
 ```js
@@ -68,6 +68,7 @@ export default {
 | v-model | 开关选中状态 | `Boolean` | `false` | - |
 | loading | 是否为加载状态 | `Boolean` | `false` | - |
 | disabled | 是否为禁用状态 | `Boolean` | `false` | - |
+| size | 开关尺寸 | `String` | `30px` | - |
 
 ### Event
 
diff --git a/packages/field/index.vue b/packages/field/index.vue
index 407a38441..84bd3f55d 100644
--- a/packages/field/index.vue
+++ b/packages/field/index.vue
@@ -127,6 +127,10 @@ export default create({
       }
 
       const el = this.$refs.textarea;
+      if (!el) {
+        return;
+      }
+
       el.style.height = 'auto';
 
       let height = el.scrollHeight;
diff --git a/packages/switch/index.vue b/packages/switch/index.vue
index 19a1fabf5..b58fdc7a8 100644
--- a/packages/switch/index.vue
+++ b/packages/switch/index.vue
@@ -1,9 +1,16 @@
 <template>
-  <div class="van-switch" :class="[`van-switch--${value ? 'on' : 'off'}`, { 'van-switch--disabled': disabled }]" @click="toggleState">
-    <div class="van-switch__node van-hairline-surround">
+  <div
+    class="van-switch"
+    :class="[{
+      'van-switch--on': value,
+      'van-switch--disabled': disabled
+    }]"
+    :style="style"
+    @click="onClick"
+  >
+    <div class="van-switch__node">
       <loading v-if="loading" class="van-switch__loading" />
     </div>
-    <div class="van-switch__bg" />
   </div>
 </template>
 
@@ -16,11 +23,23 @@ export default create({
   props: {
     value: Boolean,
     loading: Boolean,
-    disabled: Boolean
+    disabled: Boolean,
+    size: {
+      type: String,
+      default: '30px'
+    }
+  },
+
+  computed: {
+    style() {
+      return {
+        fontSize: this.size
+      };
+    }
   },
 
   methods: {
-    toggleState() {
+    onClick() {
       if (!this.disabled && !this.loading) {
         this.$emit('input', !this.value);
         this.$emit('change', !this.value);
diff --git a/packages/vant-css/src/switch.css b/packages/vant-css/src/switch.css
index a1341b945..bc75c88aa 100644
--- a/packages/vant-css/src/switch.css
+++ b/packages/vant-css/src/switch.css
@@ -1,59 +1,44 @@
 @import './common/var.css';
 
 .van-switch {
-  height: 33px;
-  width: 53px;
+  height: 1em;
+  width: 1.6em;
   display: inline-block;
   position: relative;
   background: $white;
   border-radius: 16px;
-  box-sizing: border-box;
+  box-sizing: content-box;
   border: 1px solid rgba(0, 0, 0, .1);
-  border-radius: 32px;
+  border-radius: 1em;
 
   &__node {
-    width: 30px;
-    height: 30px;
-    border-radius: 13.5px;
-    background-color: $white;
-    position: absolute;
-    box-shadow: 0 3px 1px 0 rgba(0, 0, 0, .05), 0 2px 2px 0 rgba(0, 0, 0, .1), 0 3px 3px 0 rgba(0, 0, 0, .05);
-    left: 0;
     top: 0;
-    z-index: 2;
-    transition: transform .3s;
-
-    &::after {
-      border-color: rgba(0, 0, 0, .1);
-      border-radius: 27px;
-    }
+    left: 0;
+    z-index: 1;
+    width: 1em;
+    height: 1em;
+    transition: .3s;
+    position: absolute;
+    border-radius: 100%;
+    background-color: $white;
+    box-shadow: 0 3px 1px 0 rgba(0, 0, 0, .05), 0 2px 2px 0 rgba(0, 0, 0, .1), 0 3px 3px 0 rgba(0, 0, 0, .05);
   }
 
   &__loading {
-    top: 50%;
-    left: 50%;
-    width: 16px;
-    height: 16px;
-    transform: translate3d(-50%, -50%, 0);
+    top: 25%;
+    left: 25%;
+    width: 50%;
+    height: 50%;
   }
 
   &--on {
     background-color: #44db5e;
 
-    &::after {
-      border-color: #44db5e;
-    }
-
     .van-switch__node {
-      transform: translateX(21px);
+      transform: translateX(.6em);
     }
   }
 
-  &--off {
-    background-color: $white;
-    border-color: rgba(0, 0, 0, .1);
-  }
-
   &--disabled {
     opacity: .4;
   }
diff --git a/test/specs/switch-cell.spec.js b/test/specs/switch-cell.spec.js
index edfaee56a..cffb11826 100644
--- a/test/specs/switch-cell.spec.js
+++ b/test/specs/switch-cell.spec.js
@@ -15,7 +15,7 @@ describe('SwitchCell', () => {
 
     DOMChecker(wrapper, {
       count: {
-        '.van-switch--off': 1,
+        '.van-switch--on': 0,
         '.van-switch--disabled': 0
       }
     });
@@ -34,7 +34,7 @@ describe('SwitchCell', () => {
         '.van-cell__text': '测试标题'
       },
       count: {
-        '.van-switch--off': 1,
+        '.van-switch--on': 0,
         '.van-switch--disabled': 0
       }
     });
@@ -66,7 +66,7 @@ describe('SwitchCell', () => {
 
     DOMChecker(wrapper, {
       count: {
-        '.van-switch--off': 1,
+        '.van-switch--on': 0,
         '.van-switch--disabled': 1
       }
     });
diff --git a/test/specs/switch.spec.js b/test/specs/switch.spec.js
index 44ee52edb..e8bf85af4 100644
--- a/test/specs/switch.spec.js
+++ b/test/specs/switch.spec.js
@@ -20,17 +20,6 @@ describe('Switch', () => {
     expect(wrapper.hasClass('van-switch--on')).to.be.true;
   });
 
-  it('create off switch', () => {
-    wrapper = mount(Switch, {
-      propsData: {
-        value: false
-      }
-    });
-
-    expect(wrapper.hasClass('van-switch')).to.be.true;
-    expect(wrapper.hasClass('van-switch--off')).to.be.true;
-  });
-
   it('create loading switch', () => {
     wrapper = mount(Switch, {
       propsData: {
@@ -75,9 +64,9 @@ describe('Switch', () => {
       }
     });
 
-    expect(wrapper.hasClass('van-switch--off')).to.be.true;
+    expect(wrapper.hasClass('van-switch--on')).to.be.false;
     wrapper.trigger('click');
-    expect(wrapper.hasClass('van-switch--off')).to.be.true;
+    expect(wrapper.hasClass('van-switch--on')).to.be.false;
   });
 
   it('click should toggle the switch', () => {
@@ -91,7 +80,7 @@ describe('Switch', () => {
       wrapper.vm.value = val;
     });
 
-    expect(wrapper.hasClass('van-switch--off')).to.be.true;
+    expect(wrapper.hasClass('van-switch--on')).to.be.false;
     wrapper.trigger('click');
     expect(wrapper.hasClass('van-switch--on')).to.be.true;
   });

From 107c9574a24703b15b11c784d8c927be1498e0ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 19 Mar 2018 13:46:00 +0800
Subject: [PATCH 30/48] [build] 1.0.0

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

diff --git a/packages/index.js b/packages/index.js
index 0df5c8b6e..5b9e348a1 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -66,7 +66,7 @@ import TreeSelect from './tree-select';
 import Uploader from './uploader';
 import Waterfall from './waterfall';
 
-const version = '0.12.14';
+const version = '1.0.0';
 const components = [
   Actionsheet,
   AddressEdit,
diff --git a/packages/vant-css/package-lock.json b/packages/vant-css/package-lock.json
index 867f3e214..22b8ff0c1 100644
--- a/packages/vant-css/package-lock.json
+++ b/packages/vant-css/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.12.14",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index 56a895d36..e61fcee34 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "0.12.14",
+  "version": "1.0.0",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

From 806524f1b9b522578aad4a71ec57db8ed2ec4120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 19 Mar 2018 13:46:01 +0800
Subject: [PATCH 31/48] [release] 1.0.0

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

diff --git a/package.json b/package.json
index 2044ff9ff..008ed64d3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "0.12.14",
+  "version": "1.0.0",
   "description": "A Vue.js 2.0 Mobile UI at YouZan",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From b5b7d33534111fc08932855859a91ec46bee6b6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 19 Mar 2018 14:13:40 +0800
Subject: [PATCH 32/48] [changelog] 1.0.0

---
 docs/markdown/en-US/changelog.md           | 34 +++++++++++++++
 docs/markdown/zh-CN/changelog-generated.md | 50 ++++++++++++++++++++++
 docs/markdown/zh-CN/changelog.md           | 33 ++++++++++++++
 3 files changed, 117 insertions(+)

diff --git a/docs/markdown/en-US/changelog.md b/docs/markdown/en-US/changelog.md
index fb1889fa6..809639db3 100644
--- a/docs/markdown/en-US/changelog.md
+++ b/docs/markdown/en-US/changelog.md
@@ -1,5 +1,39 @@
 ## Changelog
 
+### [1.0.0](https://github.com/youzan/vant/tree/v1.0.0)
+`2018-03-19`
+
+**Breaking changes**
+
+* add List component [\#682](https://github.com/youzan/vant/pull/682) [@chenjiahan](https://github.com/chenjiahan)
+* add Collapse component [\#674](https://github.com/youzan/vant/pull/674) [@chenjiahan](https://github.com/chenjiahan)
+* Build: upgrade to webpack 4 [\#693](https://github.com/youzan/vant/pull/693) [@chenjiahan](https://github.com/chenjiahan)
+* Popup: add lock-scroll instead of lock-on-scroll & prevent-scroll [\#688](https://github.com/youzan/vant/pull/688) [@chenjiahan](https://github.com/chenjiahan)
+* Deprecate Waterfall component and add deprecate tips [\#683](https://github.com/youzan/vant/pull/683) [@chenjiahan](https://github.com/chenjiahan)
+
+**Improvements**
+
+* AddressEdit: add show-delete prop [\#716](https://github.com/youzan/vant/pull/716) [@chenjiahan](https://github.com/chenjiahan)
+* CellSwipe: optimzie animation fluency [\#685](https://github.com/youzan/vant/pull/685) [@chenjiahan](https://github.com/chenjiahan)
+* Field: support autosize maxHeight & minHeight [\#718](https://github.com/youzan/vant/pull/718) [@chenjiahan](https://github.com/chenjiahan)
+* Locale: optimize i18n config [\#701](https://github.com/youzan/vant/pull/701) [@chenjiahan](https://github.com/chenjiahan)
+* PullRefresh: support trigger loading animation [\#684](https://github.com/youzan/vant/pull/684) [@chenjiahan](https://github.com/chenjiahan)
+* Switch: support custom size [\#723](https://github.com/youzan/vant/pull/723) [@chenjiahan](https://github.com/chenjiahan)
+* Sku: add header price slot [\#705](https://github.com/youzan/vant/pull/705) [@w91](https://github.com/w91)
+* Sku: optimize DOM [\#704](https://github.com/youzan/vant/pull/704) [@chenjiahan](https://github.com/chenjiahan)
+* Tab: support switch tabs with swipe gestrue in the content [\#694](https://github.com/youzan/vant/pull/694) [\#695](https://github.com/youzan/vant/pull/695) [@cookfront](https://github.com/cookfront)
+* Tag: adjust style [\#689](https://github.com/youzan/vant/pull/689) [@chenjiahan](https://github.com/chenjiahan)
+* Toast: support Vue.use to register [\#690](https://github.com/youzan/vant/pull/690) [@chenjiahan](https://github.com/chenjiahan)
+
+
+**Bug Fixes**
+
+* fix Actionsheet bottom border missing [\#686](https://github.com/youzan/vant/pull/686) [@chenjiahan](https://github.com/chenjiahan)
+* fix AddressEdit area not selected when area_code changed [\#680](https://github.com/youzan/vant/pull/680) [@chenjiahan](https://github.com/chenjiahan)
+* fix Stepper value overlimit [\#691](https://github.com/youzan/vant/issues/691)
+* fix Badge info font weight when selected [\#687](https://github.com/youzan/vant/pull/687) [@chenjiahan](https://github.com/chenjiahan)
+
+
 ### [0.12.14](https://github.com/youzan/vant/tree/v0.12.14)
 `2018-03-09`
 
diff --git a/docs/markdown/zh-CN/changelog-generated.md b/docs/markdown/zh-CN/changelog-generated.md
index 66c3f5d06..fb63440b6 100644
--- a/docs/markdown/zh-CN/changelog-generated.md
+++ b/docs/markdown/zh-CN/changelog-generated.md
@@ -1,5 +1,55 @@
 ## 更新日志
 
+## [v1.0.0](https://github.com/youzan/vant/tree/v1.0.0) (2018-03-19)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.12.14...v1.0.0)
+
+**Breaking changes**
+
+- tab切换应该加上左右切换的操作 [\#208](https://github.com/youzan/vant/issues/208)
+
+**Issue**
+
+- stype scoped无法覆盖部分样式例如dialog的.van-dialog\_\_cancel [\#720](https://github.com/youzan/vant/issues/720)
+- Area组件的Event怎么使用api文档上没有说明 [\#719](https://github.com/youzan/vant/issues/719)
+- 搜索框的用了:show-action="true",会报错，显示不出来 [\#713](https://github.com/youzan/vant/issues/713)
+- 如何改变checkBox 选中状态van-checkbox--checked：background-color呢 已经做了样式覆盖,确未生效 [\#712](https://github.com/youzan/vant/issues/712)
+- Popup的method: click-overlay 无效invalid [\#711](https://github.com/youzan/vant/issues/711)
+- Dialog作为子组件如何关闭 [\#709](https://github.com/youzan/vant/issues/709)
+- checkbox, switch开关等能否通过css或者属性绑定设置尺寸 [\#708](https://github.com/youzan/vant/issues/708)
+- 【文档】关于Radio组件描述残缺 [\#706](https://github.com/youzan/vant/issues/706)
+- 请问一下能自己添加语言吗？ [\#700](https://github.com/youzan/vant/issues/700)
+- van-radio-group样式不一致 [\#697](https://github.com/youzan/vant/issues/697)
+- van-nav-bar  通过 slot 定制内容时 触发click-left 或者 click-right事件出现错误 [\#696](https://github.com/youzan/vant/issues/696)
+- stepper 输入达到最大值，如10，后面输入0变为100，value值正确，但是input显示100很尴尬 [\#691](https://github.com/youzan/vant/issues/691)
+- build 之后 文件应用路径没有引号包裹 [\#679](https://github.com/youzan/vant/issues/679)
+- 关于card组件问题 [\#677](https://github.com/youzan/vant/issues/677)
+
+**Improvements**
+
+- \[Improvement\] Switch: support custom size [\#723](https://github.com/youzan/vant/pull/723) ([chenjiahan](https://github.com/chenjiahan))
+- \[Doc\] add click event document [\#722](https://github.com/youzan/vant/pull/722) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] Field: support autosize maxHeight & minHeight [\#718](https://github.com/youzan/vant/pull/718) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] AddressEdit: add show-delete prop [\#716](https://github.com/youzan/vant/pull/716) ([chenjiahan](https://github.com/chenjiahan))
+- Sku header price slot [\#705](https://github.com/youzan/vant/pull/705) ([w91](https://github.com/w91))
+- \[Improvement\] Sku: optimize DOM [\#704](https://github.com/youzan/vant/pull/704) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] extract component common part [\#703](https://github.com/youzan/vant/pull/703) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] Locale: optimize i18 config [\#701](https://github.com/youzan/vant/pull/701) ([chenjiahan](https://github.com/chenjiahan))
+- \[Doc\] improve document detail [\#698](https://github.com/youzan/vant/pull/698) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] Tabs: use touchend event to handle swipe [\#695](https://github.com/youzan/vant/pull/695) ([cookfront](https://github.com/cookfront))
+- \[new feature\] Tabs: support switch tabs with swipe gestrue in the content [\#694](https://github.com/youzan/vant/pull/694) ([cookfront](https://github.com/cookfront))
+- \[Improvement\] upgrade to webpack 4 [\#693](https://github.com/youzan/vant/pull/693) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] Toast: support Vue.use to register [\#690](https://github.com/youzan/vant/pull/690) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] Tag: adjust style [\#689](https://github.com/youzan/vant/pull/689) ([chenjiahan](https://github.com/chenjiahan))
+- \[breaking change\] Popup: add lockScroll instead of lockOnScroll & preventScroll [\#688](https://github.com/youzan/vant/pull/688) ([chenjiahan](https://github.com/chenjiahan))
+- \[bugfix\] Badge info font weight [\#687](https://github.com/youzan/vant/pull/687) ([chenjiahan](https://github.com/chenjiahan))
+- \[bugfix\] Actionsheet: border display error [\#686](https://github.com/youzan/vant/pull/686) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] CellSwipe: optimzie animation fluency [\#685](https://github.com/youzan/vant/pull/685) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] PullRefresh: support trigger loading animation [\#684](https://github.com/youzan/vant/pull/684) ([chenjiahan](https://github.com/chenjiahan))
+- \[Deprecate\] add Waterfall deprecate tip [\#683](https://github.com/youzan/vant/pull/683) ([chenjiahan](https://github.com/chenjiahan))
+- \[new feature\] add List component [\#682](https://github.com/youzan/vant/pull/682) ([chenjiahan](https://github.com/chenjiahan))
+- \[bugfix\] AddressEdit: area code observer [\#680](https://github.com/youzan/vant/pull/680) ([chenjiahan](https://github.com/chenjiahan))
+- \[new feature\] add Collapse component [\#674](https://github.com/youzan/vant/pull/674) ([chenjiahan](https://github.com/chenjiahan))
+
 ## [v0.12.14](https://github.com/youzan/vant/tree/v0.12.14) (2018-03-09)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.12.13...v0.12.14)
 
diff --git a/docs/markdown/zh-CN/changelog.md b/docs/markdown/zh-CN/changelog.md
index a6e786968..ab075d082 100644
--- a/docs/markdown/zh-CN/changelog.md
+++ b/docs/markdown/zh-CN/changelog.md
@@ -1,5 +1,38 @@
 ## 更新日志
 
+### [1.0.0](https://github.com/youzan/vant/tree/v1.0.0)
+`2018-03-19`
+
+**Breaking changes**
+
+* 新增 List 组件 [\#682](https://github.com/youzan/vant/pull/682) [@chenjiahan](https://github.com/chenjiahan)
+* 新增 Collapse 组件 [\#674](https://github.com/youzan/vant/pull/674) [@chenjiahan](https://github.com/chenjiahan)
+* 构建: 升级至 webpack 4，优化构建配置 [\#693](https://github.com/youzan/vant/pull/693) [@chenjiahan](https://github.com/chenjiahan)
+* Popup: 新增 lock-scroll 属性，废弃 lock-on-scroll、prevent-scroll 属性 [\#688](https://github.com/youzan/vant/pull/688) [@chenjiahan](https://github.com/chenjiahan)
+* 废弃 Waterfall 组件，推荐使用 List 组件代替 [\#683](https://github.com/youzan/vant/pull/683) [@chenjiahan](https://github.com/chenjiahan)
+
+**Improvements**
+
+* AddressEdit: 新增 show-delete 属性 [\#716](https://github.com/youzan/vant/pull/716) [@chenjiahan](https://github.com/chenjiahan)
+* CellSwipe: 优化 Swipe 动画流畅度 [\#685](https://github.com/youzan/vant/pull/685) [@chenjiahan](https://github.com/chenjiahan)
+* Field: 支持配置 autosize 最大/最小高度 [\#718](https://github.com/youzan/vant/pull/718) [@chenjiahan](https://github.com/chenjiahan)
+* Locale: 精简 i18n 配置文档 [\#701](https://github.com/youzan/vant/pull/701) [@chenjiahan](https://github.com/chenjiahan)
+* PullRefresh: 支持手动触发 loading 动画 [\#684](https://github.com/youzan/vant/pull/684) [@chenjiahan](https://github.com/chenjiahan)
+* Switch: 新增 size 数组，支持自定义尺寸 [\#723](https://github.com/youzan/vant/pull/723) [@chenjiahan](https://github.com/chenjiahan)
+* Sku: 新增头部金额 slot [\#705](https://github.com/youzan/vant/pull/705) [@w91](https://github.com/w91)
+* Sku: 优化 DOM 结构 [\#704](https://github.com/youzan/vant/pull/704) [@chenjiahan](https://github.com/chenjiahan)
+* Tab: 支持通过滑动手势进行切换 [\#694](https://github.com/youzan/vant/pull/694) [\#695](https://github.com/youzan/vant/pull/695) [@cookfront](https://github.com/cookfront)
+* Tag: 跳转标签样式 [\#689](https://github.com/youzan/vant/pull/689) [@chenjiahan](https://github.com/chenjiahan)
+* Toast: 支持通过 Vue.use 注册 [\#690](https://github.com/youzan/vant/pull/690) [@chenjiahan](https://github.com/chenjiahan)
+
+
+**Bug Fixes**
+
+* 修复 Actionsheet 下边框未展示的问题 [\#686](https://github.com/youzan/vant/pull/686) [@chenjiahan](https://github.com/chenjiahan)
+* 修复 AddressEdit 在数据变更时未正确选中省市区的问题 [\#680](https://github.com/youzan/vant/pull/680) [@chenjiahan](https://github.com/chenjiahan)
+* 修复 Stepper value 溢出的问题 [\#691](https://github.com/youzan/vant/issues/691)
+* 修复 Badge 选中时字体粗细 [\#687](https://github.com/youzan/vant/pull/687) [@chenjiahan](https://github.com/chenjiahan)
+
 ### [0.12.14](https://github.com/youzan/vant/tree/v0.12.14)
 `2018-03-09`
 

From 639ef64d967b7154dec987d73d61d9215173ff44 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 19 Mar 2018 20:49:35 +0800
Subject: [PATCH 33/48] [bugfix] module circular dependency (#728)

---
 docs/markdown/en-US/quickstart.md          | 12 ------------
 docs/markdown/zh-CN/changelog.md           |  4 ++--
 docs/markdown/zh-CN/quickstart.md          | 12 ------------
 packages/actionsheet/index.vue             |  2 +-
 packages/address-edit/Detail.vue           |  2 +-
 packages/address-edit/index.vue            |  3 ++-
 packages/address-list/index.vue            |  2 +-
 packages/area/index.vue                    |  3 ++-
 packages/badge-group/index.vue             |  2 +-
 packages/badge/index.vue                   |  2 +-
 packages/button/index.vue                  |  2 +-
 packages/card/index.vue                    |  2 +-
 packages/cell-swipe/index.vue              |  2 +-
 packages/checkbox-group/index.vue          |  2 +-
 packages/checkbox/index.vue                |  3 ++-
 packages/circle/index.vue                  |  2 +-
 packages/col/index.vue                     |  2 +-
 packages/collapse-item/index.vue           |  3 ++-
 packages/collapse/index.vue                |  2 +-
 packages/contact-card/index.vue            |  2 +-
 packages/contact-edit/index.vue            |  2 +-
 packages/contact-list/index.vue            |  2 +-
 packages/coupon-cell/index.vue             |  2 +-
 packages/coupon-list/Item.vue              |  2 +-
 packages/coupon-list/index.vue             |  2 +-
 packages/datetime-picker/index.vue         |  2 +-
 packages/dialog/dialog.vue                 |  2 +-
 packages/field/index.vue                   |  3 ++-
 packages/goods-action-big-btn/index.vue    |  2 +-
 packages/goods-action-mini-btn/index.vue   |  2 +-
 packages/goods-action/index.vue            |  2 +-
 packages/image-preview/image-preview.vue   |  2 +-
 packages/nav-bar/index.vue                 |  2 +-
 packages/notice-bar/index.vue              |  2 +-
 packages/number-keyboard/index.vue         |  2 +-
 packages/pagination/index.vue              |  2 +-
 packages/panel/index.vue                   |  2 +-
 packages/password-input/index.vue          |  2 +-
 packages/picker/PickerColumn.vue           |  3 ++-
 packages/picker/index.vue                  |  2 +-
 packages/popup/index.vue                   |  2 +-
 packages/progress/index.vue                |  2 +-
 packages/pull-refresh/index.vue            |  2 +-
 packages/radio-group/index.vue             |  2 +-
 packages/radio/index.vue                   |  2 +-
 packages/row/index.vue                     |  2 +-
 packages/search/index.vue                  |  2 +-
 packages/sku/Sku.vue                       |  2 +-
 packages/sku/components/SkuActions.vue     |  2 +-
 packages/sku/components/SkuHeader.vue      |  2 +-
 packages/sku/components/SkuImgUploader.vue |  2 +-
 packages/sku/components/SkuMessages.vue    |  2 +-
 packages/sku/components/SkuRow.vue         |  6 ++++--
 packages/sku/components/SkuRowItem.vue     |  2 +-
 packages/sku/components/SkuStepper.vue     |  2 +-
 packages/step/index.vue                    |  2 +-
 packages/stepper/index.vue                 |  2 +-
 packages/steps/index.vue                   |  2 +-
 packages/submit-bar/index.vue              |  2 +-
 packages/swipe-item/index.vue              |  2 +-
 packages/swipe/index.vue                   |  2 +-
 packages/switch-cell/index.vue             |  2 +-
 packages/switch/index.vue                  |  2 +-
 packages/tab/index.vue                     |  2 +-
 packages/tabbar-item/index.vue             |  2 +-
 packages/tabbar/index.vue                  |  2 +-
 packages/tabs/index.vue                    |  2 +-
 packages/tag/index.vue                     |  2 +-
 packages/toast/toast.vue                   |  2 +-
 packages/tree-select/index.vue             |  2 +-
 packages/uploader/index.vue                |  2 +-
 packages/utils/index.js                    |  2 --
 72 files changed, 79 insertions(+), 97 deletions(-)

diff --git a/docs/markdown/en-US/quickstart.md b/docs/markdown/en-US/quickstart.md
index c3639a0d2..781dfbb34 100644
--- a/docs/markdown/en-US/quickstart.md
+++ b/docs/markdown/en-US/quickstart.md
@@ -64,15 +64,3 @@ Vue.use(Vant);
 ```shell
 vue init youzan/vue-cli-template-vant projectName
 ```
-
-### Props Named Style
-HTML attributes are case-insensitive, so when using non-string templates, camelCased prop names need to use their kebab-case (hyphen-delimited) equivalents.
-
-``` html
-<!-- camelCase in JavaScript -->
-<van-cell isLink />
-
-<!-- kebab-case in HTML -->
-<van-cell is-link />
-```
-
diff --git a/docs/markdown/zh-CN/changelog.md b/docs/markdown/zh-CN/changelog.md
index ab075d082..ffa226846 100644
--- a/docs/markdown/zh-CN/changelog.md
+++ b/docs/markdown/zh-CN/changelog.md
@@ -9,7 +9,7 @@
 * 新增 Collapse 组件 [\#674](https://github.com/youzan/vant/pull/674) [@chenjiahan](https://github.com/chenjiahan)
 * 构建: 升级至 webpack 4，优化构建配置 [\#693](https://github.com/youzan/vant/pull/693) [@chenjiahan](https://github.com/chenjiahan)
 * Popup: 新增 lock-scroll 属性，废弃 lock-on-scroll、prevent-scroll 属性 [\#688](https://github.com/youzan/vant/pull/688) [@chenjiahan](https://github.com/chenjiahan)
-* 废弃 Waterfall 组件，推荐使用 List 组件代替 [\#683](https://github.com/youzan/vant/pull/683) [@chenjiahan](https://github.com/chenjiahan)
+* Waterfall 组件不再维护，推荐使用 List 组件代替 [\#683](https://github.com/youzan/vant/pull/683) [@chenjiahan](https://github.com/chenjiahan)
 
 **Improvements**
 
@@ -22,7 +22,7 @@
 * Sku: 新增头部金额 slot [\#705](https://github.com/youzan/vant/pull/705) [@w91](https://github.com/w91)
 * Sku: 优化 DOM 结构 [\#704](https://github.com/youzan/vant/pull/704) [@chenjiahan](https://github.com/chenjiahan)
 * Tab: 支持通过滑动手势进行切换 [\#694](https://github.com/youzan/vant/pull/694) [\#695](https://github.com/youzan/vant/pull/695) [@cookfront](https://github.com/cookfront)
-* Tag: 跳转标签样式 [\#689](https://github.com/youzan/vant/pull/689) [@chenjiahan](https://github.com/chenjiahan)
+* Tag: 调整标签样式 [\#689](https://github.com/youzan/vant/pull/689) [@chenjiahan](https://github.com/chenjiahan)
 * Toast: 支持通过 Vue.use 注册 [\#690](https://github.com/youzan/vant/pull/690) [@chenjiahan](https://github.com/chenjiahan)
 
 
diff --git a/docs/markdown/zh-CN/quickstart.md b/docs/markdown/zh-CN/quickstart.md
index 6c31efe4b..e48a197bc 100644
--- a/docs/markdown/zh-CN/quickstart.md
+++ b/docs/markdown/zh-CN/quickstart.md
@@ -63,15 +63,3 @@ Vue.use(Vant);
 ```shell
 vue init youzan/vue-cli-template-vant projectName
 ```
-
-### Props 命名风格
-Vant 文档中的 props 默认采用驼峰式命名 (camelCase)。由于 HTML 特性是不区分大小写的，如果在 HTML 中直接书写 Vue 模板，需要使用短横线分割式 (kebab-case) 的命名来传递 props
-
-``` html
-<!-- 在 JavaScript 中使用 camelCase -->
-<van-cell isLink />
-
-<!-- 在 HTML 中使用 kebab-case-->
-<van-cell is-link />
-```
-
diff --git a/packages/actionsheet/index.vue b/packages/actionsheet/index.vue
index 9b3e6dc38..79fb9ec4f 100644
--- a/packages/actionsheet/index.vue
+++ b/packages/actionsheet/index.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import Popup from '../mixins/popup';
 
 export default create({
diff --git a/packages/address-edit/Detail.vue b/packages/address-edit/Detail.vue
index 7d6b73e17..231c809b8 100644
--- a/packages/address-edit/Detail.vue
+++ b/packages/address-edit/Detail.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import Field from '../field';
 import { isAndroid } from '../utils';
 
diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue
index c1bd25f1b..d18080b47 100644
--- a/packages/address-edit/index.vue
+++ b/packages/address-edit/index.vue
@@ -80,7 +80,8 @@
 
 <script>
 /* eslint-disable camelcase */
-import { create, isObj } from '../utils';
+import create from '../utils/create';
+import { isObj } from '../utils';
 import Field from '../field';
 import VanButton from '../button';
 import Popup from '../popup';
diff --git a/packages/address-list/index.vue b/packages/address-list/index.vue
index 8c4aef022..95674ee08 100644
--- a/packages/address-list/index.vue
+++ b/packages/address-list/index.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import Radio from '../radio';
 import RadioGroup from '../radio-group';
 
diff --git a/packages/area/index.vue b/packages/area/index.vue
index 2dc84b086..ee174cefe 100644
--- a/packages/area/index.vue
+++ b/packages/area/index.vue
@@ -16,8 +16,9 @@
 </template>
 
 <script>
-import { create, isObj } from '../utils';
+import create from '../utils/create';
 import Picker from '../picker';
+import { isObj } from '../utils';
 
 export default create({
   name: 'area',
diff --git a/packages/badge-group/index.vue b/packages/badge-group/index.vue
index 12b2982fc..57f885402 100644
--- a/packages/badge-group/index.vue
+++ b/packages/badge-group/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'badge-group',
diff --git a/packages/badge/index.vue b/packages/badge/index.vue
index e30d3cde6..aab91c821 100644
--- a/packages/badge/index.vue
+++ b/packages/badge/index.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'badge',
diff --git a/packages/button/index.vue b/packages/button/index.vue
index 7bffa42c8..eaac3a611 100644
--- a/packages/button/index.vue
+++ b/packages/button/index.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'button',
diff --git a/packages/card/index.vue b/packages/card/index.vue
index e046dd612..44dce6230 100644
--- a/packages/card/index.vue
+++ b/packages/card/index.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'card',
diff --git a/packages/cell-swipe/index.vue b/packages/cell-swipe/index.vue
index 144f38eb7..f80d3547b 100644
--- a/packages/cell-swipe/index.vue
+++ b/packages/cell-swipe/index.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import Clickoutside from '../utils/clickoutside';
 
 const THRESHOLD = 0.15;
diff --git a/packages/checkbox-group/index.vue b/packages/checkbox-group/index.vue
index 576b25254..520fd2419 100644
--- a/packages/checkbox-group/index.vue
+++ b/packages/checkbox-group/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'checkbox-group',
diff --git a/packages/checkbox/index.vue b/packages/checkbox/index.vue
index 712f3d63b..2b03cadaa 100644
--- a/packages/checkbox/index.vue
+++ b/packages/checkbox/index.vue
@@ -17,7 +17,8 @@
 </template>
 
 <script>
-import { create, isDef } from '../utils';
+import create from '../utils/create';
+import { isDef } from '../utils';
 import findParent from '../mixins/find-parent';
 
 export default create({
diff --git a/packages/circle/index.vue b/packages/circle/index.vue
index 4939fddef..4fb7f0091 100644
--- a/packages/circle/index.vue
+++ b/packages/circle/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import { raf, cancel } from '../utils/raf';
 
 export default create({
diff --git a/packages/col/index.vue b/packages/col/index.vue
index c33fe1ee0..55b123363 100644
--- a/packages/col/index.vue
+++ b/packages/col/index.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'col',
diff --git a/packages/collapse-item/index.vue b/packages/collapse-item/index.vue
index af3abf161..bcd41ed17 100644
--- a/packages/collapse-item/index.vue
+++ b/packages/collapse-item/index.vue
@@ -17,7 +17,8 @@
 
 <script>
 import findParent from '../mixins/find-parent';
-import { create, isDef } from '../utils';
+import create from '../utils/create';
+import { isDef } from '../utils';
 
 export default create({
   name: 'collapse-item',
diff --git a/packages/collapse/index.vue b/packages/collapse/index.vue
index d67c514a5..104c88a20 100644
--- a/packages/collapse/index.vue
+++ b/packages/collapse/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'collapse',
diff --git a/packages/contact-card/index.vue b/packages/contact-card/index.vue
index 8dce72eb2..5c604d3b7 100644
--- a/packages/contact-card/index.vue
+++ b/packages/contact-card/index.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'contact-card',
diff --git a/packages/contact-edit/index.vue b/packages/contact-edit/index.vue
index 9bcce2fc2..b98e11e38 100644
--- a/packages/contact-edit/index.vue
+++ b/packages/contact-edit/index.vue
@@ -31,7 +31,7 @@ import VanButton from '../button';
 import Dialog from '../dialog';
 import Toast from '../toast';
 import validateMobile from '../utils/validate/mobile';
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'contact-edit',
diff --git a/packages/contact-list/index.vue b/packages/contact-list/index.vue
index 5804ad7a5..58bd28290 100644
--- a/packages/contact-list/index.vue
+++ b/packages/contact-list/index.vue
@@ -24,7 +24,7 @@
 <script>
 import Radio from '../radio';
 import RadioGroup from '../radio-group';
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'contact-list',
diff --git a/packages/coupon-cell/index.vue b/packages/coupon-cell/index.vue
index 7b272638d..c49719479 100644
--- a/packages/coupon-cell/index.vue
+++ b/packages/coupon-cell/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'coupon-cell',
diff --git a/packages/coupon-list/Item.vue b/packages/coupon-list/Item.vue
index 7addf28cf..9ad446256 100644
--- a/packages/coupon-list/Item.vue
+++ b/packages/coupon-list/Item.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'coupon-item',
diff --git a/packages/coupon-list/index.vue b/packages/coupon-list/index.vue
index 455ac20de..fecee7946 100644
--- a/packages/coupon-list/index.vue
+++ b/packages/coupon-list/index.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import CouponItem from './Item';
 import Field from '../field';
 import VanButton from '../button';
diff --git a/packages/datetime-picker/index.vue b/packages/datetime-picker/index.vue
index 970a00391..64f54ff8b 100644
--- a/packages/datetime-picker/index.vue
+++ b/packages/datetime-picker/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import Picker from '../picker';
 
 const isValidDate = date => Object.prototype.toString.call(date) === '[object Date]' && !isNaN(date.getTime());
diff --git a/packages/dialog/dialog.vue b/packages/dialog/dialog.vue
index c8351936a..fe4496a94 100644
--- a/packages/dialog/dialog.vue
+++ b/packages/dialog/dialog.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import VanButton from '../button';
 import Popup from '../mixins/popup';
 
diff --git a/packages/field/index.vue b/packages/field/index.vue
index 84bd3f55d..768d13a43 100644
--- a/packages/field/index.vue
+++ b/packages/field/index.vue
@@ -49,7 +49,8 @@
 </template>
 
 <script>
-import { create, isObj } from '../utils';
+import create from '../utils/create';
+import { isObj } from '../utils';
 
 export default create({
   name: 'field',
diff --git a/packages/goods-action-big-btn/index.vue b/packages/goods-action-big-btn/index.vue
index e2c53d687..0ff3227ff 100644
--- a/packages/goods-action-big-btn/index.vue
+++ b/packages/goods-action-big-btn/index.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import VanButton from '../button';
 import RouterLink from '../mixins/router-link';
 
diff --git a/packages/goods-action-mini-btn/index.vue b/packages/goods-action-mini-btn/index.vue
index 5fc63aac1..cf2ec4bca 100644
--- a/packages/goods-action-mini-btn/index.vue
+++ b/packages/goods-action-mini-btn/index.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import RouterLink from '../mixins/router-link';
 
 export default create({
diff --git a/packages/goods-action/index.vue b/packages/goods-action/index.vue
index a01f4b2ff..7f0c08d44 100644
--- a/packages/goods-action/index.vue
+++ b/packages/goods-action/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'goods-action'
diff --git a/packages/image-preview/image-preview.vue b/packages/image-preview/image-preview.vue
index 4defc2dc8..49feed3d7 100644
--- a/packages/image-preview/image-preview.vue
+++ b/packages/image-preview/image-preview.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import Popup from '../mixins/popup';
 import Swipe from '../swipe';
 import SwipeItem from '../swipe-item';
diff --git a/packages/nav-bar/index.vue b/packages/nav-bar/index.vue
index be6dd90a2..def66f312 100644
--- a/packages/nav-bar/index.vue
+++ b/packages/nav-bar/index.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'nav-bar',
diff --git a/packages/notice-bar/index.vue b/packages/notice-bar/index.vue
index 03600602d..1ca444839 100644
--- a/packages/notice-bar/index.vue
+++ b/packages/notice-bar/index.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'notice-bar',
diff --git a/packages/number-keyboard/index.vue b/packages/number-keyboard/index.vue
index 7a88907ba..ca5049d16 100644
--- a/packages/number-keyboard/index.vue
+++ b/packages/number-keyboard/index.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import Key from './Key';
 
 export default create({
diff --git a/packages/pagination/index.vue b/packages/pagination/index.vue
index 740654b94..38958b5b8 100644
--- a/packages/pagination/index.vue
+++ b/packages/pagination/index.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'pagination',
diff --git a/packages/panel/index.vue b/packages/panel/index.vue
index f40b50a17..28c3783d3 100644
--- a/packages/panel/index.vue
+++ b/packages/panel/index.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'panel',
diff --git a/packages/password-input/index.vue b/packages/password-input/index.vue
index b02b866e6..7b6fe7b00 100644
--- a/packages/password-input/index.vue
+++ b/packages/password-input/index.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'password-input',
diff --git a/packages/picker/PickerColumn.vue b/packages/picker/PickerColumn.vue
index 3ca032d41..4a58ad918 100644
--- a/packages/picker/PickerColumn.vue
+++ b/packages/picker/PickerColumn.vue
@@ -25,7 +25,8 @@
 </template>
 
 <script>
-import { create, isObj } from '../utils';
+import create from '../utils/create';
+import { isObj } from '../utils';
 
 const DEFAULT_DURATION = 200;
 const range = (num, arr) => Math.min(Math.max(num, arr[0]), arr[1]);
diff --git a/packages/picker/index.vue b/packages/picker/index.vue
index 19a67a1c2..8488a9b76 100644
--- a/packages/picker/index.vue
+++ b/packages/picker/index.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import PickerColumn from './PickerColumn';
 import deepClone from '../utils/deep-clone';
 
diff --git a/packages/popup/index.vue b/packages/popup/index.vue
index 2824581c2..ae307f327 100644
--- a/packages/popup/index.vue
+++ b/packages/popup/index.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import Popup from '../mixins/popup';
 
 export default create({
diff --git a/packages/progress/index.vue b/packages/progress/index.vue
index 26c4cd4b3..c29e8cf82 100644
--- a/packages/progress/index.vue
+++ b/packages/progress/index.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'progress',
diff --git a/packages/pull-refresh/index.vue b/packages/pull-refresh/index.vue
index 15555ccda..038f33423 100644
--- a/packages/pull-refresh/index.vue
+++ b/packages/pull-refresh/index.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import scrollUtils from '../utils/scroll';
 
 export default create({
diff --git a/packages/radio-group/index.vue b/packages/radio-group/index.vue
index cbfcd55dc..6e77cc307 100644
--- a/packages/radio-group/index.vue
+++ b/packages/radio-group/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'radio-group',
diff --git a/packages/radio/index.vue b/packages/radio/index.vue
index 1e93359e0..4c911ae80 100644
--- a/packages/radio/index.vue
+++ b/packages/radio/index.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import findParent from '../mixins/find-parent';
 
 export default create({
diff --git a/packages/row/index.vue b/packages/row/index.vue
index 08aed5efe..6ce0106cd 100644
--- a/packages/row/index.vue
+++ b/packages/row/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'row',
diff --git a/packages/search/index.vue b/packages/search/index.vue
index 4ed535591..08c769fd0 100644
--- a/packages/search/index.vue
+++ b/packages/search/index.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import Clickoutside from '../utils/clickoutside';
 
 export default create({
diff --git a/packages/sku/Sku.vue b/packages/sku/Sku.vue
index 6d9fb9b49..2794bd6c2 100644
--- a/packages/sku/Sku.vue
+++ b/packages/sku/Sku.vue
@@ -117,7 +117,7 @@ import {
   getSelectedSkuValues
 } from './utils/skuHelper';
 import { LIMIT_TYPE } from './constants';
-import { create } from '../utils';
+import create from '../utils/create';
 
 const { QUOTA_LIMIT } = LIMIT_TYPE;
 
diff --git a/packages/sku/components/SkuActions.vue b/packages/sku/components/SkuActions.vue
index ae986ece8..769d19548 100644
--- a/packages/sku/components/SkuActions.vue
+++ b/packages/sku/components/SkuActions.vue
@@ -17,7 +17,7 @@
 
 <script>
 import VanButton from '../../button';
-import { create } from '../../utils';
+import create from '../../utils/create';
 
 export default create({
   name: 'sku-actions',
diff --git a/packages/sku/components/SkuHeader.vue b/packages/sku/components/SkuHeader.vue
index 6171a783a..d389d4183 100644
--- a/packages/sku/components/SkuHeader.vue
+++ b/packages/sku/components/SkuHeader.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { create } from '../../utils';
+import create from '../../utils/create';
 
 export default create({
   name: 'sku-header',
diff --git a/packages/sku/components/SkuImgUploader.vue b/packages/sku/components/SkuImgUploader.vue
index c6b472e02..04e298235 100644
--- a/packages/sku/components/SkuImgUploader.vue
+++ b/packages/sku/components/SkuImgUploader.vue
@@ -40,7 +40,7 @@
 
 <script>
 import VanUploader from '../../uploader';
-import { create } from '../../utils';
+import create from '../../utils/create';
 
 export default create({
   name: 'sku-img-uploader',
diff --git a/packages/sku/components/SkuMessages.vue b/packages/sku/components/SkuMessages.vue
index b2f406d5f..80fa85459 100644
--- a/packages/sku/components/SkuMessages.vue
+++ b/packages/sku/components/SkuMessages.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { create } from '../../utils';
+import create from '../../utils/create';
 import Field from '../../field';
 import validateEmail from '../../utils/validate/email';
 import validateNumber from '../../utils/validate/number';
diff --git a/packages/sku/components/SkuRow.vue b/packages/sku/components/SkuRow.vue
index 6c52323e8..c132ba793 100644
--- a/packages/sku/components/SkuRow.vue
+++ b/packages/sku/components/SkuRow.vue
@@ -6,11 +6,13 @@
 </template>
 
 <script>
-export default {
+import create from '../../utils/create';
+
+export default create({
   name: 'sku-row',
 
   props: {
     skuRow: Object
   }
-};
+});
 </script>
diff --git a/packages/sku/components/SkuRowItem.vue b/packages/sku/components/SkuRowItem.vue
index 787ca0c35..96f4e4cd5 100644
--- a/packages/sku/components/SkuRowItem.vue
+++ b/packages/sku/components/SkuRowItem.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { create } from '../../utils';
+import create from '../../utils/create';
 
 export default create({
   name: 'sku-row-item',
diff --git a/packages/sku/components/SkuStepper.vue b/packages/sku/components/SkuStepper.vue
index 440ef8c1c..dc9d59e49 100644
--- a/packages/sku/components/SkuStepper.vue
+++ b/packages/sku/components/SkuStepper.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { create } from '../../utils';
+import create from '../../utils/create';
 import Stepper from '../../stepper';
 import { LIMIT_TYPE } from '../constants';
 
diff --git a/packages/step/index.vue b/packages/step/index.vue
index 774247dc4..2b25c3cb9 100644
--- a/packages/step/index.vue
+++ b/packages/step/index.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'step',
diff --git a/packages/stepper/index.vue b/packages/stepper/index.vue
index 2870ef930..f9093fcee 100644
--- a/packages/stepper/index.vue
+++ b/packages/stepper/index.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'stepper',
diff --git a/packages/steps/index.vue b/packages/steps/index.vue
index 9fa3212b4..f37feca75 100644
--- a/packages/steps/index.vue
+++ b/packages/steps/index.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'steps',
diff --git a/packages/submit-bar/index.vue b/packages/submit-bar/index.vue
index 57dc7e99d..fd5304030 100644
--- a/packages/submit-bar/index.vue
+++ b/packages/submit-bar/index.vue
@@ -21,7 +21,7 @@
 
 <script>
 import VanButton from '../button';
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'submit-bar',
diff --git a/packages/swipe-item/index.vue b/packages/swipe-item/index.vue
index 9e2d4b835..f23d4d497 100644
--- a/packages/swipe-item/index.vue
+++ b/packages/swipe-item/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'swipe-item',
diff --git a/packages/swipe/index.vue b/packages/swipe/index.vue
index 9085a873b..97c8752d9 100644
--- a/packages/swipe/index.vue
+++ b/packages/swipe/index.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'swipe',
diff --git a/packages/switch-cell/index.vue b/packages/switch-cell/index.vue
index 2f5b345ff..5bd2eb8be 100644
--- a/packages/switch-cell/index.vue
+++ b/packages/switch-cell/index.vue
@@ -6,7 +6,7 @@
 
 <script>
 import VanSwitch from '../switch';
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'switch-cell',
diff --git a/packages/switch/index.vue b/packages/switch/index.vue
index b58fdc7a8..f27730b12 100644
--- a/packages/switch/index.vue
+++ b/packages/switch/index.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'switch',
diff --git a/packages/tab/index.vue b/packages/tab/index.vue
index 13ab4bd18..59e78d2c3 100644
--- a/packages/tab/index.vue
+++ b/packages/tab/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import findParent from '../mixins/find-parent';
 
 export default create({
diff --git a/packages/tabbar-item/index.vue b/packages/tabbar-item/index.vue
index 7124c1afb..bfa2ec3f6 100644
--- a/packages/tabbar-item/index.vue
+++ b/packages/tabbar-item/index.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import RouterLink from '../mixins/router-link';
 
 export default create({
diff --git a/packages/tabbar/index.vue b/packages/tabbar/index.vue
index 9ce4ccbaf..4726734ce 100644
--- a/packages/tabbar/index.vue
+++ b/packages/tabbar/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'tabbar',
diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index 5f342da20..f472d8382 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 import { raf } from '../utils/raf';
 import { on, off } from '../utils/event';
 import VanNode from '../utils/node';
diff --git a/packages/tag/index.vue b/packages/tag/index.vue
index 866c3c1b5..b7cd1a906 100644
--- a/packages/tag/index.vue
+++ b/packages/tag/index.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'tag',
diff --git a/packages/toast/toast.vue b/packages/toast/toast.vue
index c9d5f43d7..1979327db 100644
--- a/packages/toast/toast.vue
+++ b/packages/toast/toast.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 const STYLE_LIST = ['success', 'fail', 'loading'];
 
diff --git a/packages/tree-select/index.vue b/packages/tree-select/index.vue
index b9be749b9..a2fe3402b 100644
--- a/packages/tree-select/index.vue
+++ b/packages/tree-select/index.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'tree-select',
diff --git a/packages/uploader/index.vue b/packages/uploader/index.vue
index 6e37c56ef..286e5ee82 100644
--- a/packages/uploader/index.vue
+++ b/packages/uploader/index.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import create from '../utils/create';
 
 export default create({
   name: 'uploader',
diff --git a/packages/utils/index.js b/packages/utils/index.js
index 3195fdbac..007009123 100644
--- a/packages/utils/index.js
+++ b/packages/utils/index.js
@@ -1,5 +1,4 @@
 import Vue from 'vue';
-import create from './create';
 
 const isServer = Vue.prototype.$isServer;
 
@@ -37,7 +36,6 @@ export {
   get,
   isObj,
   isDef,
-  create,
   isServer,
   camelize,
   isAndroid

From 158fbc6d67f7e3609a55fdb3ffcf6409d480463f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 19 Mar 2018 20:53:58 +0800
Subject: [PATCH 34/48] [build] 1.0.1

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

diff --git a/packages/index.js b/packages/index.js
index 5b9e348a1..d4f7214f8 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -66,7 +66,7 @@ import TreeSelect from './tree-select';
 import Uploader from './uploader';
 import Waterfall from './waterfall';
 
-const version = '1.0.0';
+const version = '1.0.1';
 const components = [
   Actionsheet,
   AddressEdit,
diff --git a/packages/vant-css/package-lock.json b/packages/vant-css/package-lock.json
index 22b8ff0c1..2fb29b1b9 100644
--- a/packages/vant-css/package-lock.json
+++ b/packages/vant-css/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json
index e61fcee34..6870defc1 100644
--- a/packages/vant-css/package.json
+++ b/packages/vant-css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant-css",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "vant css.",
   "main": "lib/index.css",
   "style": "lib/index.css",

From 5a547e8a8d7e4aa09cde70ac3bfcda64e3c62568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 19 Mar 2018 20:53:58 +0800
Subject: [PATCH 35/48] [release] 1.0.1

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

diff --git a/package.json b/package.json
index 008ed64d3..502c96e9c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A Vue.js 2.0 Mobile UI at YouZan",
   "main": "lib/vant.js",
   "style": "lib/vant-css/index.css",

From c0431ba9ff3695c5053f12a285a691e494ae3f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Mon, 19 Mar 2018 21:02:07 +0800
Subject: [PATCH 36/48] [changelog] 1.0.1

---
 docs/markdown/en-US/changelog.md           |  8 +++++++
 docs/markdown/zh-CN/changelog-generated.md | 26 ++++++++++++++++++++++
 docs/markdown/zh-CN/changelog.md           |  8 +++++++
 3 files changed, 42 insertions(+)

diff --git a/docs/markdown/en-US/changelog.md b/docs/markdown/en-US/changelog.md
index 809639db3..2cee0abd3 100644
--- a/docs/markdown/en-US/changelog.md
+++ b/docs/markdown/en-US/changelog.md
@@ -1,5 +1,13 @@
 ## Changelog
 
+### [1.0.1](https://github.com/youzan/vant/tree/v1.0.1)
+`2018-03-19`
+
+**Bug Fixes**
+
+- fix module circular dependency [\#728](https://github.com/youzan/vant/pull/728) [@chenjiahan](https://github.com/chenjiahan)
+
+
 ### [1.0.0](https://github.com/youzan/vant/tree/v1.0.0)
 `2018-03-19`
 
diff --git a/docs/markdown/zh-CN/changelog-generated.md b/docs/markdown/zh-CN/changelog-generated.md
index fb63440b6..d478eeb15 100644
--- a/docs/markdown/zh-CN/changelog-generated.md
+++ b/docs/markdown/zh-CN/changelog-generated.md
@@ -1,5 +1,31 @@
 ## 更新日志
 
+## [v1.0.1](https://github.com/youzan/vant/tree/v1.0.1) (2018-03-19)
+[Full Changelog](https://github.com/youzan/vant/compare/v1.0.0...v1.0.1)
+
+**Breaking changes**
+
+- Waterfall 瀑布流 可以添加一个API不 [\#309](https://github.com/youzan/vant/issues/309)
+
+**Issue**
+
+- Tabs 标签组件 滑动切换问题 [\#725](https://github.com/youzan/vant/issues/725)
+- 在引入Toast后没使用会页面上会出现一个黑块 [\#724](https://github.com/youzan/vant/issues/724)
+- 在使用vant时,首次加载页面时组件尺寸大小正常,再次刷新后组件尺寸缩小 [\#717](https://github.com/youzan/vant/issues/717)
+- 请问AddressEdit 地址编辑 里如何显示删除操作呢？ [\#715](https://github.com/youzan/vant/issues/715)
+- \[共享\]贴出城市数据放置位置，方便大家寻找 \(https://github.com/youzan/vant/blob/dev/docs/demos/mock/area.js\)   [\#714](https://github.com/youzan/vant/issues/714)
+- 为什么Collapse报错了 [\#710](https://github.com/youzan/vant/issues/710)
+- 按照官方文档写show-action为什么会报错 [\#707](https://github.com/youzan/vant/issues/707)
+- Field 组件高度自适应建议加入一个限制最高高度 [\#702](https://github.com/youzan/vant/issues/702)
+- 文档有一处错误，建议修改 [\#699](https://github.com/youzan/vant/issues/699)
+- feature request： PullRefresh 的效果支持手动触发 [\#681](https://github.com/youzan/vant/issues/681)
+- vant组件非常不错,已应用到公司项目中了,还支持ssr.但是能否加一个list组件\(带可以展开和收起那种\) [\#615](https://github.com/youzan/vant/issues/615)
+- Waterfall 和 PullRefresh 在同个页面时，会有冲突 [\#596](https://github.com/youzan/vant/issues/596)
+
+**Improvements**
+
+- \[bugfix\] module circular dependency [\#728](https://github.com/youzan/vant/pull/728) ([chenjiahan](https://github.com/chenjiahan))
+
 ## [v1.0.0](https://github.com/youzan/vant/tree/v1.0.0) (2018-03-19)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.12.14...v1.0.0)
 
diff --git a/docs/markdown/zh-CN/changelog.md b/docs/markdown/zh-CN/changelog.md
index ffa226846..ac8425261 100644
--- a/docs/markdown/zh-CN/changelog.md
+++ b/docs/markdown/zh-CN/changelog.md
@@ -1,5 +1,13 @@
 ## 更新日志
 
+### [1.0.1](https://github.com/youzan/vant/tree/v1.0.1)
+`2018-03-19`
+
+**Bug Fixes**
+
+- 修复 create 模块循环引用导致某些情况下编译错误的问题 [\#728](https://github.com/youzan/vant/pull/728) [@chenjiahan](https://github.com/chenjiahan)
+
+
 ### [1.0.0](https://github.com/youzan/vant/tree/v1.0.0)
 `2018-03-19`
 

From 0501ad51fe88bd9f6112f44d09de9169417f30a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Tue, 20 Mar 2018 12:48:15 +0800
Subject: [PATCH 37/48] [Doc] CollaseItem register guide

---
 docs/markdown/en-US/collapse.md | 4 ++--
 docs/markdown/zh-CN/collapse.md | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/markdown/en-US/collapse.md b/docs/markdown/en-US/collapse.md
index 05d241111..b6b1123a8 100644
--- a/docs/markdown/en-US/collapse.md
+++ b/docs/markdown/en-US/collapse.md
@@ -2,9 +2,9 @@
 
 ### Install
 ``` javascript
-import { Collapse } from 'vant';
+import { Collapse, CollapseItem } from 'vant';
 
-Vue.use(Collapse);
+Vue.use(Collapse).use(CollapseItem);
 ```
 
 ### Usage
diff --git a/docs/markdown/zh-CN/collapse.md b/docs/markdown/zh-CN/collapse.md
index 539549d52..0d03c884b 100644
--- a/docs/markdown/zh-CN/collapse.md
+++ b/docs/markdown/zh-CN/collapse.md
@@ -2,9 +2,9 @@
 
 ### 使用指南
 ``` javascript
-import { Collapse } from 'vant';
+import { Collapse, CollapseItem } from 'vant';
 
-Vue.use(Collapse);
+Vue.use(Collapse).use(CollapseItem);
 ```
 
 ### 代码演示

From 3b17c032672514fc58de1b513bc33eb880e5eaa7 Mon Sep 17 00:00:00 2001
From: skylinety <626660911@qq.com>
Date: Tue, 20 Mar 2018 19:14:17 +0800
Subject: [PATCH 38/48] [Improvement] NoticeBar: adjust padding

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

diff --git a/packages/vant-css/src/notice-bar.css b/packages/vant-css/src/notice-bar.css
index 35436facb..e3b594710 100644
--- a/packages/vant-css/src/notice-bar.css
+++ b/packages/vant-css/src/notice-bar.css
@@ -3,7 +3,7 @@
 .van-notice-bar {
   display: flex;
   color: $orange;
-  padding: 9px 10px;
+  padding: 9px 15px;
   font-size: 12px;
   line-height: 1.5;
   position: relative;

From 11f971579325b6a8ed6c1a5d5235d0a268f96ce2 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 21 Mar 2018 10:09:48 +0800
Subject: [PATCH 39/48] [Doc] fix component link URL (#739)

---
 README.zh-CN.md                       | 2 +-
 docs/markdown/en-US/quickstart.md     | 4 +---
 docs/markdown/en-US/swipe.md          | 2 +-
 docs/markdown/zh-CN/address-edit.md   | 2 +-
 docs/markdown/zh-CN/intro.md          | 4 ++--
 docs/markdown/zh-CN/password-input.md | 2 +-
 docs/markdown/zh-CN/swipe.md          | 2 +-
 docs/src/doc.config.js                | 2 +-
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/README.zh-CN.md b/README.zh-CN.md
index eedf8a9dc..079e6bbe7 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -80,7 +80,7 @@ Vue.use(Vant);
 <script src="https://unpkg.com/vant/lib/vant.min.js"></script>
 ```
 
-更多内容请参考 [快速上手](https://www.youzanyun.com/zanui/vant#/zh-CN/component/quickstart).
+更多内容请参考 [快速上手](https://www.youzanyun.com/zanui/vant#/zh-CN/quickstart).
 
 ## 贡献代码
 
diff --git a/docs/markdown/en-US/quickstart.md b/docs/markdown/en-US/quickstart.md
index 781dfbb34..4e7b13bed 100644
--- a/docs/markdown/en-US/quickstart.md
+++ b/docs/markdown/en-US/quickstart.md
@@ -1,6 +1,4 @@
-## Vant
-
-Mobile UI Component based on `Vue 2.0`
+## Quickstart
 
 ### Install
 
diff --git a/docs/markdown/en-US/swipe.md b/docs/markdown/en-US/swipe.md
index 5c1965515..394a182a5 100644
--- a/docs/markdown/en-US/swipe.md
+++ b/docs/markdown/en-US/swipe.md
@@ -22,7 +22,7 @@ Use `autoplay` prop to set autoplay interval
 ```
 
 #### Image Lazyload
-Use [Lazyload](#/zh-CN/component/lazyload) component to lazyload image
+Use [Lazyload](#/en-US/lazyload) component to lazyload image
 
 ```html
 <van-swipe>
diff --git a/docs/markdown/zh-CN/address-edit.md b/docs/markdown/zh-CN/address-edit.md
index 53c6d59f5..8a51ab1d0 100644
--- a/docs/markdown/zh-CN/address-edit.md
+++ b/docs/markdown/zh-CN/address-edit.md
@@ -112,4 +112,4 @@ export default {
 | address | 详细地址 | `String` |
 
 #### 省市县列表数据格式
-请参考 [Area](#/zh-CN/component/area) 组件。
+请参考 [Area](#/zh-CN/area) 组件。
diff --git a/docs/markdown/zh-CN/intro.md b/docs/markdown/zh-CN/intro.md
index 48393f4ae..479fc9947 100644
--- a/docs/markdown/zh-CN/intro.md
+++ b/docs/markdown/zh-CN/intro.md
@@ -16,7 +16,7 @@
 
 ### 快速上手
 
-请参考 [快速上手](https://www.youzanyun.com/zanui/vant#/zh-CN/component/quickstart).
+请参考 [快速上手](https://www.youzanyun.com/zanui/vant#/zh-CN/quickstart).
 
 ### 贡献代码
 
@@ -32,7 +32,7 @@
 
 * [意见反馈](https://github.com/youzan/vant/issues)
 * [加入我们](https://job.youzan.com)
-* [更新日志](https://www.youzanyun.com/zanui/vant#/zh-CN/component/changelog)
+* [更新日志](https://www.youzanyun.com/zanui/vant#/zh-CN/changelog)
 * [React 组件库](https://www.youzanyun.com/zanui/zent)
 * [微信小程序组件库](https://github.com/youzan/zanui-weapp)
 * [vant-demo](https://github.com/youzan/vant-demo)
diff --git a/docs/markdown/zh-CN/password-input.md b/docs/markdown/zh-CN/password-input.md
index df41942e2..1b1e9ecd0 100644
--- a/docs/markdown/zh-CN/password-input.md
+++ b/docs/markdown/zh-CN/password-input.md
@@ -1,5 +1,5 @@
 ## PasswordInput 密码输入框
-密码输入框组件通常与 [数字键盘](#/zh-CN/component/number-keyboard) 组件配合使用
+密码输入框组件通常与 [数字键盘](#/zh-CN/number-keyboard) 组件配合使用
 
 ### 使用指南
 ``` javascript
diff --git a/docs/markdown/zh-CN/swipe.md b/docs/markdown/zh-CN/swipe.md
index 5b0085e75..28b1a40a5 100644
--- a/docs/markdown/zh-CN/swipe.md
+++ b/docs/markdown/zh-CN/swipe.md
@@ -22,7 +22,7 @@ Vue.use(Swipe).use(SwipeItem);
 ```
 
 #### 图片懒加载
-配合 [Lazyload](#/zh-CN/component/lazyload) 组件实现图片懒加载
+配合 [Lazyload](#/zh-CN/lazyload) 组件实现图片懒加载
 
 ```html
 <van-swipe :autoplay="3000">
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index ab0d46bfb..3cfdb6560 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -323,7 +323,7 @@ module.exports = {
               },
               {
                 path: '/quickstart',
-                title: 'Getting Started',
+                title: 'Quickstart',
                 noExample: true
               },
               {

From bca3401d8163819da2bdff06f0a28ba89e657845 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 21 Mar 2018 15:58:11 +0800
Subject: [PATCH 40/48] [bugfix] Toast: overlay blocked by other element (#740)

---
 packages/mixins/popup/context.js |   6 +-
 packages/mixins/popup/index.js   | 128 +++++++++++++++----------------
 packages/mixins/popup/manager.js |  18 ++---
 packages/toast/index.js          |  19 ++++-
 packages/toast/toast.vue         |  38 ++++-----
 packages/vant-css/src/toast.css  |  15 ----
 test/specs/toast.spec.js         |  26 +++----
 7 files changed, 116 insertions(+), 134 deletions(-)

diff --git a/packages/mixins/popup/context.js b/packages/mixins/popup/context.js
index 9f3e5da27..824941339 100644
--- a/packages/mixins/popup/context.js
+++ b/packages/mixins/popup/context.js
@@ -1,5 +1,5 @@
-const PopupContext = {
-  idSeed: 1,
+export default {
+  id: 1,
   zIndex: 2000,
   stack: [],
 
@@ -11,5 +11,3 @@ const PopupContext = {
     return this.stack[this.stack.length - 1];
   }
 };
-
-export default PopupContext;
diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js
index 2a178cb0a..288a46ada 100644
--- a/packages/mixins/popup/index.js
+++ b/packages/mixins/popup/index.js
@@ -26,17 +26,6 @@ export default {
     }
   },
 
-  data() {
-    this._popupId = 'popup-' + context.plusKey('idSeed');
-    return {
-      opened: false,
-      pos: {
-        x: 0,
-        y: 0
-      }
-    };
-  },
-
   watch: {
     value(val) {
       this[val ? 'open' : 'close']();
@@ -44,6 +33,21 @@ export default {
 
     getContainer() {
       this.move();
+    },
+
+    overlay() {
+      this.renderOverlay();
+    }
+  },
+
+  created() {
+    this._popupId = 'popup-' + context.plusKey('id');
+    this.pos = {
+      x: 0,
+      y: 0
+    };
+    if (this.value) {
+      this.open();
     }
   },
 
@@ -51,24 +55,61 @@ export default {
     if (this.getContainer) {
       this.move();
     }
-    if (this.value) {
-      this.open();
-    }
   },
 
   beforeDestroy() {
-    this.doAfterClose();
+    this.close();
   },
 
   methods: {
-    recordPosition(e) {
+    open() {
+      /* istanbul ignore next */
+      if (this.$isServer) {
+        return;
+      }
+
+      // 如果属性中传入了`zIndex`，则覆盖`context`中对应的`zIndex`
+      if (this.zIndex !== undefined) {
+        context.zIndex = this.zIndex;
+      }
+
+      if (this.lockScroll) {
+        document.body.classList.add('van-overflow-hidden');
+        on(document, 'touchstart', this.onTouchStart);
+        on(document, 'touchmove', this.onTouchMove);
+      }
+
+      this.renderOverlay();
+      this.$emit('input', true);
+    },
+
+    close() {
+      if (this.lockScroll) {
+        document.body.classList.remove('van-overflow-hidden');
+        off(document, 'touchstart', this.onTouchStart);
+        off(document, 'touchmove', this.onTouchMove);
+      }
+
+      manager.close(this._popupId);
+      this.$emit('input', false);
+    },
+
+    move() {
+      if (this.getContainer) {
+        this.getContainer().appendChild(this.$el);
+      } else if (this.$parent) {
+        this.$parent.$el.appendChild(this.$el);
+      }
+    },
+
+    onTouchStart(e) {
       this.pos = {
         x: e.touches[0].clientX,
         y: e.touches[0].clientY
       };
     },
 
-    watchTouchMove(e) {
+    onTouchMove(e) {
       const { pos } = this;
       const dx = e.touches[0].clientX - pos.x;
       const dy = e.touches[0].clientY - pos.y;
@@ -97,64 +138,17 @@ export default {
       }
     },
 
-    open() {
-      /* istanbul ignore next */
-      if (this.opened || this.$isServer) {
-        return;
-      }
-
-      // 如果属性中传入了`zIndex`，则覆盖`context`中对应的`zIndex`
-      if (this.zIndex !== undefined) {
-        context.zIndex = this.zIndex;
-      }
-
+    renderOverlay() {
       if (this.overlay) {
         manager.open(this, {
-          id: this._popupId,
-          dom: this.$el,
           zIndex: context.plusKey('zIndex'),
           className: this.overlayClass,
           customStyle: this.overlayStyle
         });
+      } else {
+        manager.close(this._popupId);
       }
-
-      if (this.lockScroll) {
-        document.body.classList.add('van-overflow-hidden');
-        on(document, 'touchstart', this.recordPosition);
-        on(document, 'touchmove', this.watchTouchMove);
-      }
-
       this.$el.style.zIndex = context.plusKey('zIndex');
-      this.$emit('input', true);
-      this.opened = true;
-    },
-
-    close() {
-      if (!this.opened || this.$isServer) {
-        return;
-      }
-
-      this.$emit('input', false);
-      this.opened = false;
-      this.doAfterClose();
-    },
-
-    doAfterClose() {
-      manager.close(this._popupId);
-
-      if (this.lockScroll) {
-        document.body.classList.remove('van-overflow-hidden');
-        off(document, 'touchstart', this.recordPosition);
-        off(document, 'touchmove', this.watchTouchMove);
-      }
-    },
-
-    move() {
-      if (this.getContainer) {
-        this.getContainer().appendChild(this.$el);
-      } else if (this.$parent) {
-        this.$parent.$el.appendChild(this.$el);
-      }
     }
   }
 };
diff --git a/packages/mixins/popup/manager.js b/packages/mixins/popup/manager.js
index 07e878afe..38e026394 100644
--- a/packages/mixins/popup/manager.js
+++ b/packages/mixins/popup/manager.js
@@ -9,13 +9,13 @@ const defaultConfig = {
 
 export default {
   open(vm, config) {
-    const { id, dom } = config;
-    const exist = context.stack.some(item => item.id === id);
+    const exist = context.stack.some(item => item.id === vm._popupId);
 
     /* istanbul ignore next */
     if (!exist) {
-      const targetNode = dom && dom.parentNode && dom.parentNode.nodeType !== 11 ? dom.parentNode : document.body;
-      context.stack.push({ vm, id, config, targetNode });
+      const el = vm.$el;
+      const targetNode = el && el.parentNode && el.parentNode.nodeType !== 11 ? el.parentNode : document.body;
+      context.stack.push({ vm, config, targetNode });
       this.update();
     };
   },
@@ -24,11 +24,11 @@ export default {
     const { stack } = context;
 
     if (stack.length) {
-      if (context.top.id === id) {
+      if (context.top.vm._popupId === id) {
         stack.pop();
         this.update();
       } else {
-        context.stack = stack.filter(item => item.id !== id);
+        context.stack = stack.filter(item => item.vm._popupId !== id);
       }
     }
   },
@@ -65,10 +65,8 @@ export default {
   onClick() {
     if (context.top) {
       const { vm } = context.top;
-      if (vm) {
-        vm.$emit('click-overlay');
-        vm.closeOnClickOverlay && vm.close();
-      }
+      vm.$emit('click-overlay');
+      vm.closeOnClickOverlay && vm.close();
     }
   }
 };
diff --git a/packages/toast/index.js b/packages/toast/index.js
index 1b29758ef..be6feed13 100644
--- a/packages/toast/index.js
+++ b/packages/toast/index.js
@@ -6,10 +6,11 @@ const defaultOptions = {
   type: 'text',
   mask: false,
   message: '',
-  visible: true,
+  value: true,
   duration: 3000,
   position: 'middle',
-  forbidClick: false
+  forbidClick: false,
+  overlayStyle: {}
 };
 const parseOptions = message => isObj(message) ? message : { message };
 
@@ -28,6 +29,16 @@ function createInstance() {
   return queue[queue.length - 1];
 };
 
+// transform toast options to popup props
+function transformer(options) {
+  options.overlay = options.mask;
+  if (options.forbidClick && !options.overlay) {
+    options.overlay = true;
+    options.overlayStyle = { background: 'transparent' };
+  }
+  return options;
+}
+
 function Toast(options = {}) {
   const toast = createInstance();
 
@@ -35,11 +46,11 @@ function Toast(options = {}) {
     ...currentOptions,
     ...parseOptions(options),
     clear() {
-      toast.visible = false;
+      toast.value = false;
     }
   };
 
-  Object.assign(toast, options);
+  Object.assign(toast, transformer(options));
   clearTimeout(toast.timer);
 
   if (options.duration > 0) {
diff --git a/packages/toast/toast.vue b/packages/toast/toast.vue
index 1979327db..40789632c 100644
--- a/packages/toast/toast.vue
+++ b/packages/toast/toast.vue
@@ -1,35 +1,33 @@
 <template>
   <transition name="van-fade">
-    <div class="van-toast-wrapper" v-show="visible">
-      <div class="van-toast" :class="[`van-toast--${displayStyle}`, `van-toast--${position}`]">
-        <!-- text only -->
-        <div v-if="displayStyle === 'text'">{{ message }}</div>
-        <div v-if="displayStyle === 'html'" v-html="message" />
+    <div class="van-toast" :class="[`van-toast--${displayStyle}`, `van-toast--${position}`]" v-show="value">
+      <!-- text only -->
+      <div v-if="displayStyle === 'text'">{{ message }}</div>
+      <div v-if="displayStyle === 'html'" v-html="message" />
 
-        <!-- with icon -->
-        <template v-if="displayStyle === 'default'">
-          <loading v-if="type === 'loading'" color="white" />
-          <icon v-else class="van-toast__icon" :name="type" />
-          <div v-if="hasMessage" class="van-toast__text">{{ message }}</div>
-        </template>
-      </div>
-      <div class="van-toast__overlay" :class="{ 'van-toast__overlay--mask': mask }" v-if="forbidClick || mask" />
+      <!-- with icon -->
+      <template v-if="displayStyle === 'default'">
+        <loading v-if="type === 'loading'" color="white" />
+        <icon v-else class="van-toast__icon" :name="type" />
+        <div v-if="hasMessage" class="van-toast__text">{{ message }}</div>
+      </template>
     </div>
   </transition>
 </template>
 
 <script>
 import create from '../utils/create';
+import Popup from '../mixins/popup';
 
 const STYLE_LIST = ['success', 'fail', 'loading'];
 
 export default create({
   name: 'toast',
 
+  mixins: [Popup],
+
   props: {
-    mask: Boolean,
     message: [String, Number],
-    forbidClick: Boolean,
     type: {
       type: String,
       default: 'text'
@@ -37,15 +35,13 @@ export default create({
     position: {
       type: String,
       default: 'middle'
+    },
+    lockScroll: {
+      type: Boolean,
+      default: false
     }
   },
 
-  data() {
-    return {
-      visible: false
-    };
-  },
-
   computed: {
     displayStyle() {
       return STYLE_LIST.indexOf(this.type) !== -1 ? 'default' : this.type;
diff --git a/packages/vant-css/src/toast.css b/packages/vant-css/src/toast.css
index ec646313e..9886f026a 100644
--- a/packages/vant-css/src/toast.css
+++ b/packages/vant-css/src/toast.css
@@ -6,7 +6,6 @@
   left: 50%;
   display: flex;  
   color: $white;
-  z-index: 3001;
   font-size: 12px;
   line-height: 1.2;
   border-radius: 5px;
@@ -18,20 +17,6 @@
   transform: translate3d(-50%, -50%, 0);
   background-color: rgba(0, 0, 0, .7);
 
-  &__overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 3000;
-    background-color: transparent;
-
-    &--mask {
-      background-color: rgba(0, 0, 0, .5);
-    }
-  }
-
   &--text {
     padding: 12px;
     min-width: 220px;
diff --git a/test/specs/toast.spec.js b/test/specs/toast.spec.js
index a69a2770e..d03b5ba38 100644
--- a/test/specs/toast.spec.js
+++ b/test/specs/toast.spec.js
@@ -8,13 +8,13 @@ describe('Toast', () => {
 
   it('create a empty toast', () => {
     Toast();
-    expect(document.querySelector('.van-toast-wrapper')).to.exist;
+    expect(document.querySelector('.van-toast')).to.exist;
   });
 
   it('create a toast', () => {
     const toast = Toast('toast');
 
-    expect(document.querySelector('.van-toast-wrapper')).to.exist;
+    expect(document.querySelector('.van-toast')).to.exist;
     expect(toast.message).to.equal('toast');
     expect(toast.type).to.equal('text');
     expect(toast.displayStyle).to.equal('text');
@@ -24,7 +24,7 @@ describe('Toast', () => {
   it('create a loading toast', () => {
     const toast = Toast.loading();
 
-    expect(document.querySelector('.van-toast-wrapper')).to.exist;
+    expect(document.querySelector('.van-toast')).to.exist;
     expect(toast.type).to.equal('loading');
   });
 
@@ -33,7 +33,7 @@ describe('Toast', () => {
       message: 'toast'
     });
 
-    expect(document.querySelector('.van-toast-wrapper')).to.exist;
+    expect(document.querySelector('.van-toast')).to.exist;
     expect(toast.message).to.equal('toast');
     expect(toast.type).to.equal('loading');
   });
@@ -41,7 +41,7 @@ describe('Toast', () => {
   it('create a success toast', () => {
     const toast = Toast.success('success');
 
-    expect(document.querySelector('.van-toast-wrapper')).to.exist;
+    expect(document.querySelector('.van-toast')).to.exist;
     expect(toast.displayStyle).to.equal('default');
     expect(toast.type).to.equal('success');
   });
@@ -51,7 +51,7 @@ describe('Toast', () => {
       message: 'toast'
     });
 
-    expect(document.querySelector('.van-toast-wrapper')).to.exist;
+    expect(document.querySelector('.van-toast')).to.exist;
     expect(toast.message).to.equal('toast');
     expect(toast.type).to.equal('success');
   });
@@ -59,7 +59,7 @@ describe('Toast', () => {
   it('create a fail toast', () => {
     const toast = Toast.fail('fail');
 
-    expect(document.querySelector('.van-toast-wrapper')).to.exist;
+    expect(document.querySelector('.van-toast')).to.exist;
     expect(toast.displayStyle).to.equal('default');
     expect(toast.type).to.equal('fail');
   });
@@ -69,7 +69,7 @@ describe('Toast', () => {
       message: 'toast'
     });
 
-    expect(document.querySelector('.van-toast-wrapper')).to.exist;
+    expect(document.querySelector('.van-toast')).to.exist;
     expect(toast.message).to.equal('toast');
     expect(toast.type).to.equal('fail');
   });
@@ -80,9 +80,9 @@ describe('Toast', () => {
       forbidClick: true
     });
 
-    expect(document.querySelector('.van-toast-wrapper')).to.exist;
+    expect(document.querySelector('.van-toast')).to.exist;
     setTimeout(() => {
-      expect(document.querySelector('.van-toast__overlay')).to.exist;
+      expect(document.querySelector('.van-modal')).to.exist;
       done();
     }, 50);
   });
@@ -116,11 +116,11 @@ describe('Toast', () => {
     const toast1 = Toast.success('1');
     const toast2 = Toast.success('2');
     Toast.clear();
-    expect(toast1.visible).to.be.false;
-    expect(toast2.visible).to.be.true;
+    expect(toast1.value).to.be.false;
+    expect(toast2.value).to.be.true;
     Toast.clear();
     Toast.clear();
-    expect(toast2.visible).to.be.false;
+    expect(toast2.value).to.be.false;
     Toast.allowMultiple(false);
   });
 

From 05dd8fec0e81ac440bc5d26a296502d012acf866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Wed, 21 Mar 2018 16:23:03 +0800
Subject: [PATCH 41/48] [Doc] add tips of babel-plugin-import

---
 docs/markdown/en-US/quickstart.md | 1 +
 docs/markdown/zh-CN/quickstart.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/markdown/en-US/quickstart.md b/docs/markdown/en-US/quickstart.md
index 4e7b13bed..502b13f2a 100644
--- a/docs/markdown/en-US/quickstart.md
+++ b/docs/markdown/en-US/quickstart.md
@@ -38,6 +38,7 @@ import 'vant/lib/vant-css/button.css';
 ```
  
 #### 3. Import all components
+If you configured babel-plugin-import, you won't be allowed to import all components.
 
 ```js
 import Vue from 'vue';
diff --git a/docs/markdown/zh-CN/quickstart.md b/docs/markdown/zh-CN/quickstart.md
index e48a197bc..a8c0b3ce2 100644
--- a/docs/markdown/zh-CN/quickstart.md
+++ b/docs/markdown/zh-CN/quickstart.md
@@ -38,6 +38,7 @@ import 'vant/lib/vant-css/button.css';
 ```
  
 #### 方式三. 导入所有组件
+配置 babel-plugin-import 插件后将不允许导入所有组件的方式
 
 ```js
 import Vue from 'vue';

From 3032d30bf8501f15f7894bd1b59c448b569e1179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=85=B1=E9=85=B1=E9=85=B1=E9=85=B1?= <zqzhong1211@163.com>
Date: Wed, 21 Mar 2018 20:23:37 +0800
Subject: [PATCH 42/48] [Improvement] DatetimePicker: add new type &
 show-toolbar prop (#736)

---
 packages/datetime-picker/index.vue | 13 ++++++++++-
 test/specs/datetime-picker.spec.js | 36 ++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/packages/datetime-picker/index.vue b/packages/datetime-picker/index.vue
index 64f54ff8b..1c9114274 100644
--- a/packages/datetime-picker/index.vue
+++ b/packages/datetime-picker/index.vue
@@ -1,7 +1,7 @@
 <template>
   <picker
     ref="picker"
-    show-toolbar
+    :show-toolbar="showToolbar"
     :columns="columns"
     :visible-item-count="visibleItemCount"
     @change="onChange"
@@ -28,6 +28,10 @@ export default create({
       type: String,
       default: 'datetime'
     },
+    showToolbar: {
+      type: Boolean,
+      default: true
+    },
     format: {
       type: String,
       default: 'YYYY.MM.DD HH时 mm分'
@@ -100,6 +104,7 @@ export default create({
       ];
 
       if (this.type === 'date') result.splice(3, 2);
+      if (this.type === 'date-year-month') result.splice(2, 3);
       return result;
     },
     columns() {
@@ -236,6 +241,9 @@ export default create({
         const month = this.getTrueValue(values[1]);
         const maxDate = this.getMonthEndDay(year, month);
         let date = this.getTrueValue(values[2]);
+        if (this.type === 'date-year-month') {
+          date = 1;
+        }
         date = date > maxDate ? maxDate : date;
         let hour = 0;
         let minute = 0;
@@ -270,6 +278,9 @@ export default create({
             `0${value.getMinutes()}`.slice(-2)
           );
         }
+        if (this.type === 'date-year-month') {
+          values = values.slice(0, 2);
+        }
       }
 
       this.$nextTick(() => {
diff --git a/test/specs/datetime-picker.spec.js b/test/specs/datetime-picker.spec.js
index defb80093..665696c51 100644
--- a/test/specs/datetime-picker.spec.js
+++ b/test/specs/datetime-picker.spec.js
@@ -35,6 +35,17 @@ describe('DatetimePicker', () => {
     expect(wrapper.vm.innerValue.getTime()).to.equal(testDate.getTime());
   });
 
+  it('create a date-year-month', () => {
+    wrapper = mount(DatetimePicker, {
+      attachToDocument: true,
+      propsData: {
+        type: 'date-year-month',
+        value: testDate
+      }
+    });
+    expect(wrapper.vm.innerValue.getTime()).to.equal(testDate.getTime());
+  });
+
   it('create a datetime picker', () => {
     wrapper = mount(DatetimePicker, {
       attachToDocument: true,
@@ -93,6 +104,31 @@ describe('DatetimePicker', () => {
     }, 10);
   });
 
+  it('drag date-year-month picker', (done) => {
+    wrapper = mount(DatetimePicker, {
+      attachToDocument: true,
+      propsData: {
+        type: 'date-year-month',
+        value: testDate,
+        minDate,
+        maxDate
+      }
+    });
+
+    setTimeout(() => {
+      const [year, month] = wrapper.find('.van-picker-column ul');
+      dragHelper(year, 0, -50);
+      dragHelper(month, 0, -50);
+      setTimeout(() => {
+        const newYear = wrapper.vm.innerValue.getFullYear();
+        const newMonth = wrapper.vm.innerValue.getMonth() + 1;
+        expect(newYear).to.equal(2018);
+        expect(newMonth).to.equal(4);
+        done();
+      }, 10);
+    }, 10);
+  });
+
   it('drag datetime picker', (done) => {
     wrapper = mount(DatetimePicker, {
       attachToDocument: true,

From d3114d34b6bc78f937d57931d8f0a4a6f8cc708f Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 21 Mar 2018 21:01:16 +0800
Subject: [PATCH 43/48] [Improvement] NavBar: remove top border (#744)

---
 packages/nav-bar/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nav-bar/index.vue b/packages/nav-bar/index.vue
index def66f312..261680a53 100644
--- a/packages/nav-bar/index.vue
+++ b/packages/nav-bar/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="van-nav-bar van-hairline--top-bottom"
+    class="van-nav-bar van-hairline--bottom"
     :class="{ 'van-nav-bar--fixed': fixed }"
     :style="style"
   >

From 14d7f9dfb029919662d7781301d261bb37936f4f Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 22 Mar 2018 11:38:58 +0800
Subject: [PATCH 44/48] [bugfix] AddressEdit: should auto select area when
 created (#748)

---
 docs/markdown/zh-CN/address-edit.md |  1 -
 docs/src/mobile.js                  |  1 +
 packages/address-edit/index.vue     | 73 ++++++++++++++---------------
 packages/checkbox/index.vue         |  8 ++--
 packages/locale/lang/zh-CN.js       |  8 ++--
 5 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/docs/markdown/zh-CN/address-edit.md b/docs/markdown/zh-CN/address-edit.md
index 8a51ab1d0..b686f609e 100644
--- a/docs/markdown/zh-CN/address-edit.md
+++ b/docs/markdown/zh-CN/address-edit.md
@@ -62,7 +62,6 @@ export default {
 | area-list | 地区列表 | `Object` | - | - |
 | address-info | 收货人信息 | `Object` | `{}` | - |
 | search-result | 详细地址搜索结果 | `Array` | `[]` | - |
-| address-text | "地址"文案前缀 | `String` | `收货` | - |
 | show-postal | 是否显示邮政编码 | `Boolean` | `false` | - |
 | show-delete | 是否显示删除按钮 | `Boolean` | `false` | - |
 | show-set-default | 是否显示默认地址栏 | `Boolean` | `false` | - |
diff --git a/docs/src/mobile.js b/docs/src/mobile.js
index 8a765d9ad..88fab8569 100644
--- a/docs/src/mobile.js
+++ b/docs/src/mobile.js
@@ -5,6 +5,7 @@ import routes from './router';
 import Vant, { Lazyload } from 'packages';
 import VantDoc from 'vant-doc';
 import 'packages/vant-css/src/index.css';
+import 'packages/vant-css/src/icon-local.css';
 import 'vant-doc/src/helper/touch-simulator';
 import './components/nprogress.css';
 
diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue
index d18080b47..46838bc70 100644
--- a/packages/address-edit/index.vue
+++ b/packages/address-edit/index.vue
@@ -4,7 +4,7 @@
       <field
         maxlength="15"
         :placeholder="$t('name')"
-        :label="$t('label.name', computedAddressText)"
+        :label="$t('label.name')"
         v-model="data.name"
         :error="errorInfo.name"
         @focus="onFocus('name')"
@@ -54,7 +54,7 @@
         v-if="showSetDefault"
         v-show="!hideBottomFields"
         v-model="data.is_default"
-        :title="$t('defaultAddress', computedAddressText)"
+        :title="$t('defaultAddress')"
       />
     </cell-group>
     <div v-show="!hideBottomFields" class="van-address-edit__buttons">
@@ -62,7 +62,7 @@
         {{ $t('save') }}
       </van-button>
       <van-button block :loading="isDeleting" @click="onDelete" v-if="isEdit">
-        {{ $t('deleteAddress', computedAddressText) }}
+        {{ $t('deleteAddress') }}
       </van-button>
     </div>
     <popup v-model="showArea" position="bottom">
@@ -124,7 +124,6 @@ export default create({
     showPostal: Boolean,
     showSetDefault: Boolean,
     showSearchResult: Boolean,
-    addressText: String,
     addressInfo: {
       type: Object,
       default: () => ({ ...defaultAddress })
@@ -156,38 +155,12 @@ export default create({
     };
   },
 
-  watch: {
-    addressInfo: {
-      handler(val) {
-        this.data = {
-          ...defaultAddress,
-          ...val
-        };
-
-        if (val.area_code) {
-          this.setAreaCode(val.area_code);
-        }
-      },
-      deep: true
-    },
-
-    areaList() {
-      if (this.data.area_code) {
-        this.setAreaCode(this.data.area_code);
-      }
-    }
-  },
-
   computed: {
     // hide bottom field when use search && detail get focused
     hideBottomFields() {
       return this.searchResult.length && this.detailFocused;
     },
 
-    computedAddressText() {
-      return this.addressText || this.$t('addressText');
-    },
-
     areaListLoaded() {
       return isObj(this.areaList) && Object.keys(this.areaList).length;
     },
@@ -197,6 +170,28 @@ export default create({
     }
   },
 
+  watch: {
+    addressInfo: {
+      handler(val) {
+        this.data = {
+          ...defaultAddress,
+          ...val
+        };
+
+        this.setAreaCode(val.area_code);
+      },
+      deep: true
+    },
+
+    areaList() {
+      this.setAreaCode(this.data.area_code);
+    }
+  },
+
+  created() {
+    this.setAreaCode(this.data.area_code);
+  },
+
   methods: {
     onFocus(key) {
       this.errorInfo[key] = false;
@@ -213,18 +208,20 @@ export default create({
       if (values.length !== 3 || values.some(value => +value.code === -1)) {
         return Toast(this.$t('areaEmpty'));
       }
+      this.data.area_code = values[2].code;
       this.assignAreaValues(values);
       this.showArea = false;
       this.$emit('change-area', values);
     },
 
     assignAreaValues(values) {
-      Object.assign(this.data, {
-        province: values[0].name,
-        city: values[1].name,
-        county: values[2].name,
-        area_code: values[2].code
-      });
+      if (values.length >= 3) {
+        Object.assign(this.data, {
+          province: values[0].name,
+          city: values[1].name,
+          county: values[2].name
+        });
+      }
     },
 
     onSave() {
@@ -277,7 +274,7 @@ export default create({
       }
 
       Dialog.confirm({
-        message: this.$t('confirmDelete', this.computedAddressText)
+        message: this.$t('confirmDelete')
       }).then(() => {
         this.$emit('delete', this.data);
       });
@@ -291,7 +288,7 @@ export default create({
 
     // set area code to area component
     setAreaCode(code) {
-      this.data.area_code = code;
+      this.data.area_code = code || '';
       this.$nextTick(() => {
         this.$nextTick(() => {
           const { area } = this.$refs;
diff --git a/packages/checkbox/index.vue b/packages/checkbox/index.vue
index 2b03cadaa..8114179f8 100644
--- a/packages/checkbox/index.vue
+++ b/packages/checkbox/index.vue
@@ -4,10 +4,10 @@
       name="success"
       class="van-checkbox__icon"
       :class="[
-        `van-checkbox--${shape}`,
-        { 'van-checkbox--disabled': isDisabled },
-        { 'van-checkbox--checked': isChecked }
-      ]"
+        `van-checkbox--${shape}`, {
+          'van-checkbox--disabled': isDisabled,
+          'van-checkbox--checked': isChecked
+      }]"
       @click="onClick"
     />
     <span class="van-checkbox__label" @click="onClick('label')">
diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js
index 2e86c9d4a..3a5e8a966 100644
--- a/packages/locale/lang/zh-CN.js
+++ b/packages/locale/lang/zh-CN.js
@@ -60,11 +60,11 @@ export default {
     addressOverlimit: '详细地址不能超过200个字符',
     addressEmpty: '请填写详细地址',
     postalEmpty: '邮政编码格式不正确',
-    defaultAddress: text => `设为默认${text}地址`,
-    deleteAddress: text => `删除${text}地址`,
-    confirmDelete: text => `确定要删除这个${text}地址么`,
+    defaultAddress: '设为默认收货地址',
+    deleteAddress: '删除收货地址',
+    confirmDelete: '确定要删除这个收货地址么',
     label: {
-      name: text => `${text}人`,
+      name: '收货人',
       postal: '邮政编码'
     },
     placeholder: {

From 4810630215e1cac9f9fa0cedf2be8545ee2c32e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=95=8F?= <cookfront@gmail.com>
Date: Thu, 22 Mar 2018 11:41:22 +0800
Subject: [PATCH 45/48] [bug fix] Tabs: fix tab content not trigger click event
 (#749)

---
 packages/tabs/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index f472d8382..6da2f8702 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -162,14 +162,12 @@ export default create({
 
     // watch swipe touch move
     onTouchMove(event) {
-      event.preventDefault();
       this.deltaX = event.touches[0].clientX - this.startX;
       this.direction = this.getDirection(event.touches[0]);
     },
 
     // watch swipe touch end
-    onTouchEnd(event) {
-      event.preventDefault();
+    onTouchEnd() {
       const { direction, deltaX, curActive } = this;
       const minSwipeDistance = 50;
 

From 70fbdea35d3f4ced817891053cd318546b394148 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 22 Mar 2018 11:48:30 +0800
Subject: [PATCH 46/48] [Doc] DatetimePicker: improve documentation (#747)

---
 docs/demos/views/datetime-picker.vue   | 28 ++++++++-----
 docs/markdown/en-US/datetime-picker.md | 54 ++++++++++++++++++++++----
 docs/markdown/zh-CN/datetime-picker.md | 50 +++++++++++++++++++++---
 packages/datetime-picker/index.vue     | 21 +++++-----
 test/specs/datetime-picker.spec.js     |  8 ++--
 5 files changed, 123 insertions(+), 38 deletions(-)

diff --git a/docs/demos/views/datetime-picker.vue b/docs/demos/views/datetime-picker.vue
index 8e92cbc70..5d5554284 100644
--- a/docs/demos/views/datetime-picker.vue
+++ b/docs/demos/views/datetime-picker.vue
@@ -1,6 +1,6 @@
 <template>
   <demo-section>
-    <demo-block :title="$t('basicUsage')">
+    <demo-block :title="$t('title1')">
       <van-datetime-picker
         v-model="currentDate1"
         type="datetime"
@@ -15,8 +15,6 @@
       <van-datetime-picker
         v-model="currentDate2"
         type="date"
-        :min-hour="minHour"
-        :max-hour="maxHour"
         :min-date="minDate"
       />
     </demo-block>
@@ -24,8 +22,15 @@
     <demo-block :title="$t('title3')">
       <van-datetime-picker
         v-model="currentDate3"
+        type="year-month"
+        :min-date="minDate"
+      />
+    </demo-block>
+
+    <demo-block :title="$t('title4')">
+      <van-datetime-picker
+        v-model="currentDate4"
         type="time"
-        :visibleItemCount="3"
         :min-hour="minHour"
         :max-hour="maxHour"
         :min-date="minDate"
@@ -38,12 +43,16 @@
 export default {
   i18n: {
     'zh-CN': {
-      title2: '选择日期',
-      title3: '选择时间'
+      title1: '选择完整时间',
+      title2: '选择日期（年月日）',
+      title3: '选择日期（年月）',
+      title4: '选择时间'
     },
     'en-US': {
-      title2: 'Date Picker',
-      title3: 'Time Picker'
+      title1: 'Choose DateTime',
+      title2: 'Choose Date',
+      title3: 'Choose Year-Month',
+      title4: 'Choose Time'
     }
   },
 
@@ -55,7 +64,8 @@ export default {
       maxDate: new Date(2019, 10, 1),
       currentDate1: new Date(2018, 0, 1),
       currentDate2: null,
-      currentDate3: '12:00'
+      currentDate3: new Date(2018, 0, 1),
+      currentDate4: '12:00'
     };
   }
 };
diff --git a/docs/markdown/en-US/datetime-picker.md b/docs/markdown/en-US/datetime-picker.md
index 2bd4525ae..1216bf2de 100644
--- a/docs/markdown/en-US/datetime-picker.md
+++ b/docs/markdown/en-US/datetime-picker.md
@@ -9,7 +9,7 @@ Vue.use(DatetimePicker);
 
 ### Usage
 
-#### Basic Usage
+#### Choose DateTime
 
 ```html
 <van-datetime-picker
@@ -30,29 +30,57 @@ export default {
       maxHour: 20,
       minDate: new Date(),
       maxDate: new Date(2019, 10, 1),
-      currentDate: new Date(2018, 0, 1)
+      currentDate: new Date()
     };
   }
 };
 ```
 
-#### Date Picker
+#### Choose Date
 
 ```html
 <van-datetime-picker
   v-model="currentDate"
   type="date"
-  :min-hour="minHour"
-  :max-hour="maxHour"
   :min-date="minDate"
 />
 ```
 
-#### Time Picker
+```js
+export default {
+  data() {
+    return {
+      currentDate: new Date()
+    };
+  }
+}
+```
+
+#### Choose Year-Month
 
 ```html
 <van-datetime-picker
-  v-model="currentDate3"
+  v-model="currentDate"
+  type="year-month"
+  :min-date="minDate"
+/>
+```
+
+```js
+export default {
+  data() {
+    return {
+      currentDate: new Date()
+    };
+  }
+}
+```
+
+#### Choose Time
+
+```html
+<van-datetime-picker
+  v-model="currentDate"
   type="time"
   :min-hour="minHour"
   :max-hour="maxHour"
@@ -60,11 +88,21 @@ export default {
 />
 ```
 
+```js
+export default {
+  data() {
+    return {
+      currentDate: '12:00'
+    };
+  }
+}
+```
+
 ### API
 
 | Attribute | Description | Type | Default | Accepted Values |
 |-----------|-----------|-----------|-------------|-------------|
-| type | Picker type | `String` | 'datetime' |  'date', 'time' |
+| type | Picker type | `String` | `datetime` |  `date` `time` `year-month` |
 | min-date | Min date | `Date` | Ten years ago on January 1 | - |
 | max-date | Max date | `Date` | Ten years later on December 31 | - |
 | min-hour | Min hour | `Number` | `0` | - |
diff --git a/docs/markdown/zh-CN/datetime-picker.md b/docs/markdown/zh-CN/datetime-picker.md
index 6d28581b6..3072284c4 100644
--- a/docs/markdown/zh-CN/datetime-picker.md
+++ b/docs/markdown/zh-CN/datetime-picker.md
@@ -9,7 +9,7 @@ Vue.use(DatetimePicker);
 
 ### 代码演示
 
-#### 基础用法
+#### 选择完整时间
 
 ```html
 <van-datetime-picker
@@ -30,24 +30,52 @@ export default {
       maxHour: 20,
       minDate: new Date(),
       maxDate: new Date(2019, 10, 1),
-      currentDate: new Date(2018, 0, 1)
+      currentDate: new Date()
     };
   }
 };
 ```
 
-#### 选择日期
+#### 选择日期（年月日）
 
 ```html
 <van-datetime-picker
   v-model="currentDate"
   type="date"
-  :min-hour="minHour"
-  :max-hour="maxHour"
   :min-date="minDate"
 />
 ```
 
+```js
+export default {
+  data() {
+    return {
+      currentDate: new Date()
+    };
+  }
+}
+```
+
+#### 选择日期（年月）
+
+```html
+<van-datetime-picker
+  v-model="currentDate"
+  type="year-month"
+  :min-date="minDate"
+/>
+```
+
+```js
+export default {
+  data() {
+    return {
+      currentDate: new Date()
+    };
+  }
+}
+```
+
 #### 选择时间
 
 ```html
@@ -60,11 +88,21 @@ export default {
 />
 ```
 
+```js
+export default {
+  data() {
+    return {
+      currentDate: '12:00'
+    };
+  }
+}
+```
+
 ### API
 
 | 参数 | 说明 | 类型 | 默认值 | 可选值 |
 |-----------|-----------|-----------|-------------|-------------|
-| type | 组件类型 | `String` | 'datetime' |  'date', 'time' |
+| type | 组件类型 | `String` | `datetime` |  `date` `time` `year-month` |
 | min-date | 可选的最小日期 | `Date` | 十年前的 1 月 1 日 | - |
 | max-date | 可选的最大日期 | `Date` | 十年后的 12 月 31 日 | - |
 | min-hour | 可选的最小小时 | `Number` | `0` | - |
diff --git a/packages/datetime-picker/index.vue b/packages/datetime-picker/index.vue
index 1c9114274..c2422aba9 100644
--- a/packages/datetime-picker/index.vue
+++ b/packages/datetime-picker/index.vue
@@ -11,9 +11,10 @@
 </template>
 
 <script>
-import create from '../utils/create';
 import Picker from '../picker';
+import create from '../utils/create';
 
+const currentYear = new Date().getFullYear();
 const isValidDate = date => Object.prototype.toString.call(date) === '[object Date]' && !isNaN(date.getTime());
 
 export default create({
@@ -42,16 +43,12 @@ export default create({
     },
     minDate: {
       type: Date,
-      default() {
-        return new Date(new Date().getFullYear() - 10, 0, 1);
-      },
+      default: () => new Date(currentYear - 10, 0, 1),
       validator: isValidDate
     },
     maxDate: {
       type: Date,
-      default() {
-        return new Date(new Date().getFullYear() + 10, 11, 31);
-      },
+      default: () => new Date(currentYear + 10, 11, 31),
       validator: isValidDate
     },
     minHour: {
@@ -77,6 +74,7 @@ export default create({
       const isEqual = this.type === 'time' ? val === this.innerValue : val.valueOf() === this.innerValue.valueOf();
       if (!isEqual) this.innerValue = val;
     },
+
     innerValue(val) {
       this.updateColumnValue(val);
       this.$emit('input', val);
@@ -104,7 +102,7 @@ export default create({
       ];
 
       if (this.type === 'date') result.splice(3, 2);
-      if (this.type === 'date-year-month') result.splice(2, 3);
+      if (this.type === 'year-month') result.splice(2, 3);
       return result;
     },
     columns() {
@@ -125,7 +123,7 @@ export default create({
   methods: {
     correctValue(value) {
       // validate value
-      const isDateType = this.type.indexOf('date') > -1;
+      const isDateType = this.type !== 'time';
       if (isDateType && !isValidDate(value)) {
         value = this.minDate;
       } else if (!value) {
@@ -241,7 +239,7 @@ export default create({
         const month = this.getTrueValue(values[1]);
         const maxDate = this.getMonthEndDay(year, month);
         let date = this.getTrueValue(values[2]);
-        if (this.type === 'date-year-month') {
+        if (this.type === 'year-month') {
           date = 1;
         }
         date = date > maxDate ? maxDate : date;
@@ -259,6 +257,7 @@ export default create({
     },
 
     updateColumnValue(value) {
+      console.log(value, this.type);
       let values = [];
       if (this.type === 'time') {
         const currentValue = value.split(':');
@@ -278,7 +277,7 @@ export default create({
             `0${value.getMinutes()}`.slice(-2)
           );
         }
-        if (this.type === 'date-year-month') {
+        if (this.type === 'year-month') {
           values = values.slice(0, 2);
         }
       }
diff --git a/test/specs/datetime-picker.spec.js b/test/specs/datetime-picker.spec.js
index 665696c51..08bcabb11 100644
--- a/test/specs/datetime-picker.spec.js
+++ b/test/specs/datetime-picker.spec.js
@@ -35,11 +35,11 @@ describe('DatetimePicker', () => {
     expect(wrapper.vm.innerValue.getTime()).to.equal(testDate.getTime());
   });
 
-  it('create a date-year-month', () => {
+  it('create a year-month', () => {
     wrapper = mount(DatetimePicker, {
       attachToDocument: true,
       propsData: {
-        type: 'date-year-month',
+        type: 'year-month',
         value: testDate
       }
     });
@@ -104,11 +104,11 @@ describe('DatetimePicker', () => {
     }, 10);
   });
 
-  it('drag date-year-month picker', (done) => {
+  it('drag year-month picker', (done) => {
     wrapper = mount(DatetimePicker, {
       attachToDocument: true,
       propsData: {
-        type: 'date-year-month',
+        type: 'year-month',
         value: testDate,
         minDate,
         maxDate

From ddbe3389192a6ac60d7776692d9805816c9254e2 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 22 Mar 2018 13:18:38 +0800
Subject: [PATCH 47/48] [bugfix] List: should not trigger load event when
 hidden (#751)

---
 docs/demos/views/list.vue      | 4 ++--
 packages/list/index.vue        | 2 +-
 packages/mixins/popup/index.js | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/demos/views/list.vue b/docs/demos/views/list.vue
index 36f31ee20..3a5b50e96 100644
--- a/docs/demos/views/list.vue
+++ b/docs/demos/views/list.vue
@@ -3,7 +3,7 @@
     <demo-block :title="$t('basicUsage')">
       <p class="page-desc">{{ $t('text') }}</p>
       <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-        <van-list 
+        <van-list
           v-model="loading"
           :finished="finished"
           @load="onLoad"
@@ -39,7 +39,7 @@ export default {
     onLoad() {
       setTimeout(() => {
         for (let i = 0; i < 10; i++) {
-          let text = this.list.length + 1;
+          const text = this.list.length + 1;
           this.list.push(text < 10 ? '0' + text : text);
         }
         this.loading = false;
diff --git a/packages/list/index.vue b/packages/list/index.vue
index 223ea2e46..c1f484ca1 100644
--- a/packages/list/index.vue
+++ b/packages/list/index.vue
@@ -79,7 +79,7 @@ export default create({
       const scrollerHeight = utils.getVisibleHeight(scroller);
 
       /* istanbul ignore next */
-      if (!scrollerHeight) {
+      if (!scrollerHeight || utils.getComputedStyle(el).display === 'none') {
         return;
       }
 
diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js
index 288a46ada..bca493b4f 100644
--- a/packages/mixins/popup/index.js
+++ b/packages/mixins/popup/index.js
@@ -46,15 +46,15 @@ export default {
       x: 0,
       y: 0
     };
-    if (this.value) {
-      this.open();
-    }
   },
 
   mounted() {
     if (this.getContainer) {
       this.move();
     }
+    if (this.value) {
+      this.open();
+    }
   },
 
   beforeDestroy() {

From 347989bcc50e2046d1d92f4e21f290aed3a735d2 Mon Sep 17 00:00:00 2001
From: wny <colonD.wny@gmail.com>
Date: Thu, 22 Mar 2018 15:59:52 +0800
Subject: [PATCH 48/48] =?UTF-8?q?[bugfix]=20=E4=BF=AE=E5=A4=8Dsku=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E9=80=BB=E8=BE=91=E4=B8=8Esku?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=80=89=E4=B8=AD=E7=9A=84=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=20(#752)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/sku/Sku.vue                   | 22 +++++++++++++------
 packages/sku/components/SkuRowItem.vue | 16 ++++----------
 packages/sku/constants.js              |  5 ++++-
 packages/sku/utils/skuHelper.js        | 30 ++++++++++++++++++++++----
 4 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/packages/sku/Sku.vue b/packages/sku/Sku.vue
index 2794bd6c2..0da5245e6 100644
--- a/packages/sku/Sku.vue
+++ b/packages/sku/Sku.vue
@@ -113,10 +113,11 @@ import SkuMessages from './components/SkuMessages';
 import SkuActions from './components/SkuActions';
 import {
   isAllSelected,
+  isSkuChoosable,
   getSkuComb,
   getSelectedSkuValues
 } from './utils/skuHelper';
-import { LIMIT_TYPE } from './constants';
+import { LIMIT_TYPE, UNSELECTED_SKU_VALUE_ID } from './constants';
 import create from '../utils/create';
 
 const { QUOTA_LIMIT } = LIMIT_TYPE;
@@ -292,12 +293,19 @@ export default create({
   methods: {
     resetSelectedSku(skuTree) {
       this.selectedSku = {};
+      // 重置selectedSku
       skuTree.forEach(item => {
-        // 只有一个sku规格值时默认选中
-        if (item.v.length === 1) {
-          this.selectedSku[item.k_s] = item.v[0].id;
-        } else {
-          this.selectedSku[item.k_s] = this.initialSku[item.k_s] || '';
+        this.selectedSku[item.k_s] = this.initialSku[item.k_s] || UNSELECTED_SKU_VALUE_ID;
+      });
+      // 只有一个sku规格值时默认选中
+      skuTree.forEach(item => {
+        const key = item.k_s;
+        const valueId = item.v[0].id;
+        if (
+          item.v.length === 1 &&
+          isSkuChoosable(this.sku.list, this.selectedSku, { key, valueId })
+        ) {
+          this.selectedSku[key] = valueId;
         }
       });
     },
@@ -338,7 +346,7 @@ export default create({
       // 点击已选中的sku时则取消选中
       this.selectedSku =
         this.selectedSku[skuValue.skuKeyStr] === skuValue.id
-          ? { ...this.selectedSku, [skuValue.skuKeyStr]: '' }
+          ? { ...this.selectedSku, [skuValue.skuKeyStr]: UNSELECTED_SKU_VALUE_ID }
           : { ...this.selectedSku, [skuValue.skuKeyStr]: skuValue.id };
 
       this.$emit('sku-selected', {
diff --git a/packages/sku/components/SkuRowItem.vue b/packages/sku/components/SkuRowItem.vue
index 96f4e4cd5..ec7a29dde 100644
--- a/packages/sku/components/SkuRowItem.vue
+++ b/packages/sku/components/SkuRowItem.vue
@@ -13,6 +13,7 @@
 
 <script>
 import create from '../../utils/create';
+import { isSkuChoosable } from '../utils/skuHelper';
 
 export default create({
   name: 'sku-row-item',
@@ -31,19 +32,10 @@ export default create({
     },
 
     isChoosable() {
-      const matchedSku = Object.assign({}, this.selectedSku, {
-        [this.skuKeyStr]: this.skuValue.id
+      return isSkuChoosable(this.skuList, this.selectedSku, {
+        key: this.skuKeyStr,
+        valueId: this.skuValue.id
       });
-      const skusToCheck = Object.keys(matchedSku).filter(skuKey => matchedSku[skuKey] !== '');
-      const filteredSku = this.skuList.filter(sku => {
-        return skusToCheck.every(skuKey => {
-          // 后端给的skuValue.id有时候是数字有时候是字符串，全等会匹配不上
-          return matchedSku[skuKey] == sku[skuKey]; // eslint-disable-line
-        });
-      });
-
-      const stock = filteredSku.reduce((total, sku) => (total += sku.stock_num), 0);
-      return stock > 0;
     }
   },
 
diff --git a/packages/sku/constants.js b/packages/sku/constants.js
index 0d83bd7ce..e1de2beca 100644
--- a/packages/sku/constants.js
+++ b/packages/sku/constants.js
@@ -3,6 +3,9 @@ export const LIMIT_TYPE = {
   STOCK_LIMIT: 1
 };
 
+export const UNSELECTED_SKU_VALUE_ID = '';
+
 export default {
-  LIMIT_TYPE
+  LIMIT_TYPE,
+  UNSELECTED_SKU_VALUE_ID
 };
diff --git a/packages/sku/utils/skuHelper.js b/packages/sku/utils/skuHelper.js
index 7387f1394..a5e3eceb6 100644
--- a/packages/sku/utils/skuHelper.js
+++ b/packages/sku/utils/skuHelper.js
@@ -1,3 +1,5 @@
+import { UNSELECTED_SKU_VALUE_ID } from '../constants';
+
 /*
   normalize sku tree
 
@@ -43,7 +45,7 @@ export const normalizeSkuTree = (skuTree) => {
 // 判断是否所有的sku都已经选中
 export const isAllSelected = (skuTree, selectedSku) => {
   // 筛选selectedSku对象中key值不为空的值
-  const selected = Object.keys(selectedSku).filter(skuKeyStr => selectedSku[skuKeyStr]);
+  const selected = Object.keys(selectedSku).filter(skuKeyStr => selectedSku[skuKeyStr] !== UNSELECTED_SKU_VALUE_ID);
   return skuTree.length === selected.length;
 };
 
@@ -64,7 +66,7 @@ export const getSelectedSkuValues = (skuTree, selectedSku) => {
     const skuValues = normalizedTree[skuKeyStr];
     const skuValueId = selectedSku[skuKeyStr];
 
-    if (skuValueId) {
+    if (skuValueId !== UNSELECTED_SKU_VALUE_ID) {
       const skuValue = skuValues.filter(skuValue => skuValue.id === skuValueId)[0];
       skuValue && selectedValues.push(skuValue);
     }
@@ -72,9 +74,29 @@ export const getSelectedSkuValues = (skuTree, selectedSku) => {
   }, []);
 };
 
+// 判断sku是否可选
+export const isSkuChoosable = (skuList, selectedSku, skuToChoose) => {
+  const { key, valueId } = skuToChoose;
+  // 先假设sku已选中，拼入已选中sku对象中
+  const matchedSku = Object.assign({}, selectedSku, {
+    [key]: valueId
+  });
+  // 再判断剩余sku是否全部不可选，若不可选则当前sku不可选中
+  const skusToCheck = Object.keys(matchedSku).filter(skuKey => matchedSku[skuKey] !== UNSELECTED_SKU_VALUE_ID);
+  const filteredSku = skuList.filter(sku => {
+    return skusToCheck.every(skuKey => {
+      return String(matchedSku[skuKey]) === String(sku[skuKey]);
+    });
+  });
+
+  const stock = filteredSku.reduce((total, sku) => (total += sku.stock_num), 0);
+  return stock > 0;
+};
+
 export default {
   normalizeSkuTree,
-  isAllSelected,
   getSkuComb,
-  getSelectedSkuValues
+  getSelectedSkuValues,
+  isAllSelected,
+  isSkuChoosable
 };