[build] update to babel 7 (#656)

youzan · Sep 27, 2018 · 27ed2e5 · 27ed2e5
1 parent bce7f20
commit 27ed2e5
Show file tree

Hide file tree

Showing 14 changed files with 635 additions and 746 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1,14 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        loose: true,
+        modules: 'commonjs'
+      }
+    ]
+  ],
+  plugins: [
+    '@babel/plugin-syntax-dynamic-import'
+  ]
+};
diff --git a/dist/badge-group/index.js b/dist/badge-group/index.js
@@ -4,11 +4,11 @@ VantComponent({
         name: 'badge',
         type: 'descendant',
         linked(target) {
-            this.data.badges.push(target);
+            this.badges.push(target);
             this.setActive();
         },
         unlinked(target) {
-            this.data.badges = this.data.badges.filter(item => item !== target);
+            this.badges = this.badges.filter(item => item !== target);
             this.setActive();
         }
     },
@@ -18,19 +18,17 @@ VantComponent({
             value: 0
         }
     },
-    data: {
-        badges: []
-    },
     watch: {
         active: 'setActive'
     },
     beforeCreate() {
+        this.badges = [];
         this.currentActive = -1;
     },
     methods: {
         setActive(badge) {
             let { active } = this.data;
-            const { badges } = this.data;
+            const { badges } = this;
             if (badge) {
                 active = badges.indexOf(badge);
             }

diff --git a/dist/field/index.js b/dist/field/index.js
@@ -33,10 +33,6 @@ VantComponent({
             type: Number,
             value: -1
         },
-        value: {
-            type: null,
-            value: ''
-        },
         type: {
             type: String,
             value: 'text'
@@ -51,7 +47,6 @@ VantComponent({
         }
     },
     data: {
-        focused: false,
         showClear: false
     },
     computed: {
@@ -65,42 +60,44 @@ VantComponent({
             });
         }
     },
+    beforeCreate() {
+        this.focused = false;
+    },
     methods: {
         onInput(event) {
             const { value = '' } = event.detail || {};
             this.$emit('input', value);
             this.$emit('change', value);
             this.setData({
                 value,
-                showClear: this.getShowClear({ value })
+                showClear: this.getShowClear(value)
             });
         },
         onFocus() {
             this.$emit('focus');
+            this.focused = true;
             this.setData({
-                focused: true,
-                showClear: this.getShowClear({ focused: true })
+                showClear: this.getShowClear()
             });
         },
         onBlur() {
             this.focused = false;
             this.$emit('blur');
             this.setData({
-                focused: false,
-                showClear: this.getShowClear({ focused: false })
+                showClear: this.getShowClear()
             });
         },
         onClickIcon() {
             this.$emit('click-icon');
         },
-        getShowClear(options) {
-            const { focused = this.data.focused, value = this.data.value } = options;
-            return (this.data.clearable && focused && value !== '' && !this.data.readonly);
+        getShowClear(value) {
+            value = value === undefined ? this.data.value : value;
+            return (this.data.clearable && this.focused && value && !this.data.readonly);
         },
         onClear() {
             this.setData({
                 value: '',
-                showClear: this.getShowClear({ value: '' })
+                showClear: this.getShowClear('')
             });
             this.$emit('input', '');
             this.$emit('change', '');

diff --git a/dist/search/index.js b/dist/search/index.js
@@ -18,9 +18,6 @@ VantComponent({
             value: -1
         }
     },
-    data: {
-        value: ''
-    },
     methods: {
         onChange(event) {
             this.setData({ value: event.detail });

diff --git a/dist/stepper/index.js b/dist/stepper/index.js
@@ -26,9 +26,6 @@ VantComponent({
             value: 1
         }
     },
-    data: {
-        value: 0
-    },
     created() {
         this.setData({
             value: this.range(this.data.value)

diff --git a/package.json b/package.json
@@ -22,11 +22,11 @@
   },
   "homepage": "https://github.com/youzan/vant-weapp#readme",
   "devDependencies": {
+    "@babel/core": "^7.1.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/preset-env": "^7.1.0",
     "autoprefixer": "^9.1.5",
-    "babel-core": "^6.26.3",
-    "babel-loader": "7.1.5",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-stage-0": "^6.24.1",
+    "babel-loader": "8.0.2",
     "cross-env": "^5.1.4",
     "css-loader": "^1.0.0",
     "eslint": "^5.6.0",

diff --git a/packages/badge-group/index.ts b/packages/badge-group/index.ts
@@ -5,11 +5,11 @@ VantComponent({
     name: 'badge',
     type: 'descendant',
     linked(target: Weapp.Component) {
-      this.data.badges.push(target);
+      this.badges.push(target);
       this.setActive();
     },
     unlinked(target: Weapp.Component) {
-      this.data.badges = this.data.badges.filter(item => item !== target);
+      this.badges = this.badges.filter(item => item !== target);
       this.setActive();
     }
   },
@@ -21,22 +21,19 @@ VantComponent({
     }
   },
 
-  data: {
-    badges: []
-  },
-
   watch: {
     active: 'setActive'
   },
 
   beforeCreate() {
+    this.badges = [];
     this.currentActive = -1;
   },
 
   methods: {
-    setActive(badge) {
+    setActive(badge: Weapp.Component) {
       let { active } = this.data;
-      const { badges } = this.data;
+      const { badges } = this;
 
       if (badge) {
         active = badges.indexOf(badge);

diff --git a/packages/field/index.ts b/packages/field/index.ts
@@ -36,10 +36,6 @@ VantComponent({
       type: Number,
       value: -1
     },
-    value: {
-      type: null,
-      value: ''
-    },
     type: {
       type: String,
       value: 'text'
@@ -55,7 +51,6 @@ VantComponent({
   },
 
   data: {
-    focused: false,
     showClear: false
   },
 
@@ -71,50 +66,52 @@ VantComponent({
     }
   },
 
+  beforeCreate() {
+    this.focused = false;
+  },
+
   methods: {
     onInput(event: Weapp.Event) {
       const { value = '' } = event.detail || {};
       this.$emit('input', value);
       this.$emit('change', value);
       this.setData({
         value,
-        showClear: this.getShowClear({ value })
+        showClear: this.getShowClear(value)
       });
     },
 
     onFocus() {
       this.$emit('focus');
+      this.focused = true;
       this.setData({
-        focused: true,
-        showClear: this.getShowClear({ focused: true })
+        showClear: this.getShowClear()
       });
     },
 
     onBlur() {
       this.focused = false;
       this.$emit('blur');
       this.setData({
-        focused: false,
-        showClear: this.getShowClear({ focused: false })
+        showClear: this.getShowClear()
       });
     },
 
     onClickIcon() {
       this.$emit('click-icon');
     },
 
-    getShowClear(options): boolean {
-      const { focused = this.data.focused, value = this.data.value } = options;
-
+    getShowClear(value?: string): boolean {
+      value = value === undefined ? this.data.value : value;
       return (
-        this.data.clearable && focused && value !== '' && !this.data.readonly
+        this.data.clearable && this.focused && value && !this.data.readonly
       );
     },
 
     onClear() {
       this.setData({
         value: '',
-        showClear: this.getShowClear({ value: '' })
+        showClear: this.getShowClear('')
       });
       this.$emit('input', '');
       this.$emit('change', '');

diff --git a/packages/search/index.ts b/packages/search/index.ts
@@ -22,10 +22,6 @@ VantComponent({
     }
   },
 
-  data: {
-    value: ''
-  },
-
   methods: {
     onChange(event: Weapp.Event) {
       this.setData({ value: event.detail });

diff --git a/packages/stepper/index.ts b/packages/stepper/index.ts
@@ -31,10 +31,6 @@ VantComponent({
     }
   },
 
-  data: {
-    value: 0
-  },
-
   created() {
     this.setData({
       value: this.range(this.data.value)

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -29,6 +29,7 @@ export type CombinedComponentInstance<
 > = Methods &
   LooseObject &
   Weapp.Component &
+  Weapp.FormField &
   ComponentInstance & {
     data: Data & RecordToAny<Props> & RecordToReturn<Computed>;
   };

diff --git a/types/weapp.d.ts b/types/weapp.d.ts
@@ -18,6 +18,13 @@ declare namespace Weapp {
     setData(data: any, callback?: Function): void;
   }
 
+  interface FormField {
+    data: {
+      name: string;
+      value: any;
+    }
+  }
+
   interface Target {
     id: string;
     tagName: string;