diff --git a/.eslintignore b/.eslintignore index 572364465..c05831264 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,5 +1,4 @@ -es/ -lib/ -dist/ -node_modules/ - +es +lib +dist +node_modules diff --git a/.eslintrc.js b/.eslintrc.js index fe5bbaa23..16a052e6e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,162 +1,24 @@ module.exports = { - parserOptions: { - parser: 'babel-eslint', - ecmaVersion: 6, - ecmaFeatures: { - experimentalObjectRestSpread: true, - jsx: true - }, - sourceType: 'module' - }, - + root: true, env: { - es6: true, - node: true, - mocha: true + jest: true }, - - plugins: ['vue'], - - extends: [ - 'plugin:vue/strongly-recommended' - ], - - globals: { - expect: true, - sinon: true, - document: false, - navigator: false, - window: false, - require: true, - FileReader: true, - File: true - }, - + extends: ['plugin:vue-libs/recommended', 'plugin:vue/strongly-recommended'], rules: { - 'accessor-pairs': 2, - 'arrow-spacing': [2, { 'before': true, 'after': true }], - 'block-spacing': [2, 'always'], - 'brace-style': [2, '1tbs', { 'allowSingleLine': true }], - 'camelcase': [1, { 'properties': 'always' }], - 'comma-dangle': [2, 'never'], - 'comma-spacing': [2, { 'before': false, 'after': true }], - 'comma-style': [2, 'last'], - 'constructor-super': 2, - 'curly': [2, 'multi-line'], - 'dot-location': [2, 'property'], - 'eol-last': 2, - 'eqeqeq': [2, 'allow-null'], - 'generator-star-spacing': [2, { 'before': true, 'after': true }], - 'indent': [2, 2, { 'SwitchCase': 1 }], - 'jsx-quotes': [2, 'prefer-double'], - 'key-spacing': [2, { 'beforeColon': false, 'afterColon': true }], - 'keyword-spacing': [2, { 'before': true, 'after': true }], - 'new-cap': [2, { 'newIsCap': true, 'capIsNew': false }], - 'new-parens': 2, - 'no-array-constructor': 2, - 'no-caller': 2, - 'no-class-assign': 2, - 'no-cond-assign': 2, - 'no-const-assign': 2, - 'no-control-regex': 2, - 'no-delete-var': 2, - 'no-dupe-args': 2, - 'no-dupe-class-members': 2, - 'no-dupe-keys': 2, - 'no-duplicate-case': 2, - 'no-empty-character-class': 2, - 'no-empty-pattern': 2, - 'no-eval': 2, - 'no-ex-assign': 2, - 'no-extend-native': 2, - 'no-extra-bind': 2, - 'no-extra-boolean-cast': 2, - 'no-extra-parens': [2, 'functions'], - 'no-fallthrough': 2, - 'no-floating-decimal': 2, - 'no-func-assign': 2, - 'no-implied-eval': 2, - 'no-inner-declarations': [2, 'functions'], - 'no-invalid-regexp': 2, - 'no-irregular-whitespace': 2, - 'no-iterator': 2, - 'no-label-var': 2, - 'no-labels': [2, { 'allowLoop': false, 'allowSwitch': false }], - 'no-lone-blocks': 2, - 'no-mixed-spaces-and-tabs': 2, - 'no-multi-spaces': 2, - 'no-multi-str': 2, - 'no-multiple-empty-lines': [2, { 'max': 1 }], - 'no-native-reassign': 2, - 'no-negated-in-lhs': 2, - 'no-new-object': 2, - 'no-new-require': 2, - 'no-new-symbol': 2, - 'no-new-wrappers': 2, - 'no-obj-calls': 2, - 'no-octal': 2, - 'no-octal-escape': 2, - 'no-path-concat': 2, - 'no-proto': 2, - 'no-redeclare': 2, - 'no-regex-spaces': 2, - 'no-return-assign': [2, 'except-parens'], - 'no-self-assign': 2, - 'no-self-compare': 2, - 'no-sequences': 2, - 'no-shadow-restricted-names': 2, - 'no-spaced-func': 2, - 'no-sparse-arrays': 2, - 'no-this-before-super': 2, - 'no-throw-literal': 2, - 'no-trailing-spaces': 2, - 'no-undef': 0, - 'no-undef-init': 2, - 'no-unexpected-multiline': 2, - 'no-unmodified-loop-condition': 2, - 'no-unneeded-ternary': [2, { 'defaultAssignment': false }], - 'no-unreachable': 2, - 'no-unsafe-finally': 2, - 'no-unused-vars': [2, { 'vars': 'all', 'args': 'none' }], - 'no-useless-call': 2, - 'no-useless-computed-key': 2, - 'no-useless-constructor': 2, - 'no-useless-escape': 0, - 'no-whitespace-before-property': 2, - 'no-with': 2, - 'one-var': [2, { 'initialized': 'never' }], - 'operator-linebreak': [2, 'after', { 'overrides': { '?': 'before', ':': 'before' } }], - 'padded-blocks': [2, 'never'], - 'quotes': [2, 'single', { 'avoidEscape': true, 'allowTemplateLiterals': true }], - 'semi': [2, 'always'], - 'semi-spacing': [2, { 'before': false, 'after': true }], - 'space-before-blocks': [2, 'always'], - 'space-before-function-paren': [2, 'never'], - 'space-in-parens': [2, 'never'], - 'space-infix-ops': 2, - 'space-unary-ops': [2, { 'words': true, 'nonwords': false }], - 'spaced-comment': [2, 'always', { 'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ','] }], - 'template-curly-spacing': [2, 'never'], - 'use-isnan': 2, - 'valid-typeof': 2, - 'wrap-iife': [2, 'any'], - 'yield-star-spacing': [2, 'both'], - 'yoda': [2, 'never'], - 'prefer-const': 2, - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, - 'object-curly-spacing': [2, 'always', { objectsInObjects: false }], - 'array-bracket-spacing': [2, 'never'], - 'vue/jsx-uses-vars': 2, + semi: ['error', 'always'], + 'space-before-function-paren': ['error', 'never'], 'vue/require-v-for-key': 0, - "vue/require-default-prop": 0, - "vue/name-property-casing": 0, - "vue/no-unused-vars": 0, - 'vue/max-attributes-per-line': [2, { - "singleline": 5, - "multiline": { - "max": 5, - "allowFirstLine": false + 'vue/require-default-prop': 0, + 'vue/name-property-casing': 0, + 'vue/max-attributes-per-line': [ + 2, + { + singleline: 5, + multiline: { + max: 5, + allowFirstLine: false + } } - }] + ] } -} +}; diff --git a/.gitignore b/.gitignore index 18ea47fa3..5744b095c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,12 +3,10 @@ .DS_Store .idea .vscode -packages/**/lib es lib node_modules -example/dist -/docs/dist +docs/dist test/coverage packages/vant-css/build packages/vant-css/icons diff --git a/docs/src/demo-common.js b/docs/src/demo-common.js index 33c514826..f8f892341 100644 --- a/docs/src/demo-common.js +++ b/docs/src/demo-common.js @@ -7,7 +7,7 @@ import i18n from '../../packages/mixins/i18n'; import Vant, { Lazyload } from '../../packages'; import VantDoc, { DemoBlock, DemoSection } from 'vant-doc'; import VueRouter from 'vue-router'; -import { Locale, Toast, Dialog } from '../../packages'; +import { Locale } from '../../packages'; import { camelize } from '../../packages/utils'; Vue @@ -22,9 +22,6 @@ Vue.mixin(i18n); Vue.component('demo-block', DemoBlock); Vue.component('demo-section', DemoSection); -window.Toast = Toast; -window.Dialog = Dialog; - Locale.add({ 'zh-CN': { add: '增加', diff --git a/package.json b/package.json index ba026af31..0ca633e2e 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "license": "MIT", "dependencies": { "babel-runtime": "6.x", - "vue-lazyload": "^1.2.3" + "vue-lazyload": "^1.2.4" }, "peerDependencies": { "vue": ">= 2.5.0" @@ -60,7 +60,6 @@ "autoprefixer": "^8.6.0", "babel-cli": "^6.26.0", "babel-core": "^6.26.3", - "babel-eslint": "^8.2.3", "babel-jest": "^23.0.1", "babel-loader": "^7.1.4", "babel-plugin-transform-runtime": "^6.15.0", @@ -71,14 +70,14 @@ "css-loader": "^0.28.11", "dependency-tree": "^6.1.0", "eslint": "^4.19.1", - "eslint-plugin-vue": "^4.5.0", + "eslint-plugin-vue-libs": "^3.0.0", "fast-glob": "^2.2.2", "fast-vue-md-loader": "^1.0.3", "gh-pages": "^1.2.0", "html-webpack-plugin": "3.2.0", "husky": "^0.14.3", "jest": "^23.1.0", - "jest-serializer-vue": "^2.0.0", + "jest-serializer-vue": "^2.0.2", "lint-staged": "^7.1.3", "postcss": "^6.0.22", "postcss-calc": "^6.0.0", @@ -101,8 +100,8 @@ "vue-sfc-compiler": "^0.0.8", "vue-template-compiler": "2.5.16", "vue-template-es2015-compiler": "^1.6.0", - "webpack": "^4.10.2", - "webpack-cli": "^3.0.1", - "webpack-serve": "^1.0.2" + "webpack": "^4.11.1", + "webpack-cli": "^3.0.3", + "webpack-serve": "^1.0.3" } } diff --git a/packages/actionsheet/demo/index.vue b/packages/actionsheet/demo/index.vue index 0854d726d..aacc1eee8 100644 --- a/packages/actionsheet/demo/index.vue +++ b/packages/actionsheet/demo/index.vue @@ -60,11 +60,11 @@ export default { methods: { onClick(item) { - Toast(item.name); + this.$toast(item.name); }, handleCancel() { - Toast('cancel'); + this.$toast('cancel'); } } }; diff --git a/packages/address-edit/demo/index.vue b/packages/address-edit/demo/index.vue index 922fba0e7..f95ee1b29 100644 --- a/packages/address-edit/demo/index.vue +++ b/packages/address-edit/demo/index.vue @@ -54,11 +54,11 @@ export default { methods: { onSave() { - Toast('save'); + this.$toast('save'); }, onDelete() { - Toast('delete'); + this.$toast('delete'); }, onChangeDetail(val) { diff --git a/packages/address-list/demo/index.vue b/packages/address-list/demo/index.vue index 5d19bd79d..c8718526b 100644 --- a/packages/address-list/demo/index.vue +++ b/packages/address-list/demo/index.vue @@ -72,10 +72,10 @@ export default { methods: { onAdd() { - Toast(this.$t('add')); + this.$toast(this.$t('add')); }, onEdit(item, index) { - Toast(this.$t('edit') + ':' + index); + this.$toast(this.$t('edit') + ':' + index); } } }; diff --git a/packages/cell-swipe/demo/index.vue b/packages/cell-swipe/demo/index.vue index 56fee5629..385641b6a 100644 --- a/packages/cell-swipe/demo/index.vue +++ b/packages/cell-swipe/demo/index.vue @@ -55,7 +55,7 @@ export default { instance.close(); break; case 'right': - Dialog.confirm({ + this.$dialog.confirm({ message: this.$t('confirm') }).then(() => { instance.close(); diff --git a/packages/coupon-list/demo/index.vue b/packages/coupon-list/demo/index.vue index 2524b3943..a8c974dd1 100644 --- a/packages/coupon-list/demo/index.vue +++ b/packages/coupon-list/demo/index.vue @@ -109,7 +109,7 @@ export default { this.chosenCoupon = index; }, onExchange(code) { - Toast(this.$t('exchange')); + this.$toast(this.$t('exchange')); this.exchangedCoupons.push({ ...this.coupon, id: this.randomId() diff --git a/packages/dialog/demo/index.vue b/packages/dialog/demo/index.vue index 38cc7762d..71584296f 100644 --- a/packages/dialog/demo/index.vue +++ b/packages/dialog/demo/index.vue @@ -57,20 +57,20 @@ export default { methods: { onClickAlert() { - Dialog.alert({ + this.$dialog.alert({ title: this.$t('title'), message: this.$t('content') }); }, onClickAlert2() { - Dialog.alert({ + this.$dialog.alert({ message: this.$t('content') }); }, onClickConfirm() { - Dialog.confirm({ + this.$dialog.confirm({ title: this.$t('title'), message: this.$t('content') }); diff --git a/packages/goods-action/demo/index.vue b/packages/goods-action/demo/index.vue index 48dff3c49..0ca7cee42 100644 --- a/packages/goods-action/demo/index.vue +++ b/packages/goods-action/demo/index.vue @@ -48,11 +48,11 @@ export default { methods: { onClickMiniBtn() { - Toast(this.$t('clickIcon')); + this.$toast(this.$t('clickIcon')); }, onClickBigBtn() { - Toast(this.$t('clickButton')); + this.$toast(this.$t('clickButton')); } } }; diff --git a/packages/loading/index.vue b/packages/loading/index.vue index 0a7bef22c..bd5f7ec16 100644 --- a/packages/loading/index.vue +++ b/packages/loading/index.vue @@ -1,7 +1,7 @@