diff --git a/package.json b/package.json
index f1c720cc7..57558c5cf 100644
--- a/package.json
+++ b/package.json
@@ -68,6 +68,7 @@
"devDependencies": {
"@ls-lint/ls-lint": "^1.8.0",
"@vant/cli": "^2.4.0",
+ "prettier": "^2.0.4",
"vue": "^2.6.11",
"vue-template-compiler": "^2.6.11"
},
diff --git a/packages/vant-eslint-config/index.js b/packages/vant-eslint-config/index.js
index 147213acc..87ae9e28b 100644
--- a/packages/vant-eslint-config/index.js
+++ b/packages/vant-eslint-config/index.js
@@ -1,5 +1,10 @@
module.exports = {
- extends: ['airbnb-base', 'plugin:vue/recommended'],
+ extends: [
+ 'airbnb-base',
+ 'plugin:vue/recommended',
+ 'prettier',
+ 'prettier/vue',
+ ],
parserOptions: {
parser: '@typescript-eslint/parser',
@@ -17,46 +22,23 @@ module.exports = {
browser: true,
},
- globals: {
- window: false,
- document: false,
- navigator: false,
- },
-
rules: {
+ camelcase: 0,
'no-new': 0,
'no-shadow': 0,
- camelcase: 1,
'no-bitwise': 0,
'func-names': 0,
'no-console': 0,
'no-plusplus': 0,
- 'arrow-parens': 0,
'default-case': 0,
- 'comma-dangle': [
- 'error',
- {
- arrays: 'always-multiline',
- objects: 'always-multiline',
- imports: 'always-multiline',
- exports: 'always-multiline',
- functions: 'never',
- },
- ],
'prefer-template': 0,
'consistent-return': 0,
'no-param-reassign': 0,
'no-nested-ternary': 0,
- 'operator-linebreak': 0,
- 'object-curly-newline': 0,
- 'no-underscore-dangle': 1,
+ 'no-underscore-dangle': 0,
'no-unused-expressions': 0,
'no-restricted-globals': 0,
- 'function-paren-newline': 0,
'class-methods-use-this': 0,
- 'implicit-arrow-linebreak': 0,
- 'space-before-function-paren': 0,
- 'max-len': ['error', { code: 150 }],
'prefer-destructuring': ['error', { object: true, array: false }],
'import/order': 0,
'import/extensions': 0,
@@ -68,19 +50,8 @@ module.exports = {
'vue/require-v-for-key': 0,
'vue/require-default-prop': 0,
'vue/no-unused-components': 0,
- 'vue/max-attributes-per-line': 0,
- 'vue/singleline-html-element-content-newline': 0,
'vue/name-property-casing': ['error', 'kebab-case'],
'vue/component-name-in-template-casing': ['error', 'kebab-case'],
- 'vue/html-closing-bracket-newline': 2,
- 'vue/html-self-closing': [
- 'error',
- {
- html: {
- void: 'always',
- },
- },
- ],
'@typescript-eslint/no-unused-vars': ['error'],
},
};
diff --git a/packages/vant-eslint-config/package.json b/packages/vant-eslint-config/package.json
index 407bd7dd8..19883f388 100644
--- a/packages/vant-eslint-config/package.json
+++ b/packages/vant-eslint-config/package.json
@@ -9,14 +9,15 @@
"license": "MIT",
"repository": "https://github.com/youzan/vant/tree/dev/packages/vant-eslint-config",
"peerDependencies": {
- "eslint": "^6.8.0"
+ "eslint": "^6.0.0"
},
"dependencies": {
- "@typescript-eslint/eslint-plugin": "^2.16.0",
- "@typescript-eslint/parser": "^2.16.0",
- "eslint-config-airbnb-base": "^14.0.0",
- "eslint-plugin-import": "^2.20.0",
- "eslint-plugin-vue": "^6.1.2"
+ "@typescript-eslint/eslint-plugin": "^2.27.0",
+ "@typescript-eslint/parser": "^2.27.0",
+ "eslint-config-airbnb-base": "^14.1.0",
+ "eslint-config-prettier": "^6.10.1",
+ "eslint-plugin-import": "^2.20.2",
+ "eslint-plugin-vue": "^6.2.2"
},
"devDependencies": {
"eslint": "^6.8.0"
diff --git a/packages/vant-eslint-config/yarn.lock b/packages/vant-eslint-config/yarn.lock
index 788e09350..170abdaa0 100644
--- a/packages/vant-eslint-config/yarn.lock
+++ b/packages/vant-eslint-config/yarn.lock
@@ -28,40 +28,40 @@
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==
-"@typescript-eslint/eslint-plugin@^2.16.0":
- version "2.23.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.23.0.tgz#aa7133bfb7b685379d9eafe4ae9e08b9037e129d"
- integrity sha512-8iA4FvRsz8qTjR0L/nK9RcRUN3QtIHQiOm69FzV7WS3SE+7P7DyGGwh3k4UNR2JBbk+Ej2Io+jLAaqKibNhmtw==
+"@typescript-eslint/eslint-plugin@^2.27.0":
+ version "2.27.0"
+ resolved "https://registry.npm.taobao.org/@typescript-eslint/eslint-plugin/download/@typescript-eslint/eslint-plugin-2.27.0.tgz?cache=0&sync_timestamp=1586453146898&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Feslint-plugin%2Fdownload%2F%40typescript-eslint%2Feslint-plugin-2.27.0.tgz#e479cdc4c9cf46f96b4c287755733311b0d0ba4b"
+ integrity sha1-5HnNxMnPRvlrTCh3VXMzEbDQuks=
dependencies:
- "@typescript-eslint/experimental-utils" "2.23.0"
- eslint-utils "^1.4.3"
+ "@typescript-eslint/experimental-utils" "2.27.0"
functional-red-black-tree "^1.0.1"
regexpp "^3.0.0"
tsutils "^3.17.1"
-"@typescript-eslint/experimental-utils@2.23.0":
- version "2.23.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz#5d2261c8038ec1698ca4435a8da479c661dc9242"
- integrity sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ==
+"@typescript-eslint/experimental-utils@2.27.0":
+ version "2.27.0"
+ resolved "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-2.27.0.tgz#801a952c10b58e486c9a0b36cf21e2aab1e9e01a"
+ integrity sha1-gBqVLBC1jkhsmgs2zyHiqrHp4Bo=
dependencies:
"@types/json-schema" "^7.0.3"
- "@typescript-eslint/typescript-estree" "2.23.0"
+ "@typescript-eslint/typescript-estree" "2.27.0"
eslint-scope "^5.0.0"
+ eslint-utils "^2.0.0"
-"@typescript-eslint/parser@^2.16.0":
- version "2.23.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.23.0.tgz#f3d4e2928ff647fe77fc2fcef1a3534fee6a3212"
- integrity sha512-k61pn/Nepk43qa1oLMiyqApC6x5eP5ddPz6VUYXCAuXxbmRLqkPYzkFRKl42ltxzB2luvejlVncrEpflgQoSUg==
+"@typescript-eslint/parser@^2.27.0":
+ version "2.27.0"
+ resolved "https://registry.npm.taobao.org/@typescript-eslint/parser/download/@typescript-eslint/parser-2.27.0.tgz#d91664335b2c46584294e42eb4ff35838c427287"
+ integrity sha1-2RZkM1ssRlhClOQutP81g4xCcoc=
dependencies:
"@types/eslint-visitor-keys" "^1.0.0"
- "@typescript-eslint/experimental-utils" "2.23.0"
- "@typescript-eslint/typescript-estree" "2.23.0"
+ "@typescript-eslint/experimental-utils" "2.27.0"
+ "@typescript-eslint/typescript-estree" "2.27.0"
eslint-visitor-keys "^1.1.0"
-"@typescript-eslint/typescript-estree@2.23.0":
- version "2.23.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz#d355960fab96bd550855488dcc34b9a4acac8d36"
- integrity sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw==
+"@typescript-eslint/typescript-estree@2.27.0":
+ version "2.27.0"
+ resolved "https://registry.npm.taobao.org/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-2.27.0.tgz#a288e54605412da8b81f1660b56c8b2e42966ce8"
+ integrity sha1-oojlRgVBLai4HxZgtWyLLkKWbOg=
dependencies:
debug "^4.1.1"
eslint-visitor-keys "^1.1.0"
@@ -203,10 +203,10 @@ concat-map@0.0.1:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-confusing-browser-globals@^1.0.7:
+confusing-browser-globals@^1.0.9:
version "1.0.9"
- resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd"
- integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==
+ resolved "https://registry.npm.taobao.org/confusing-browser-globals/download/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd"
+ integrity sha1-crwTtIPAJ2gBaBhx1ImFFvj1T90=
contains-path@^0.1.0:
version "0.1.0"
@@ -329,14 +329,21 @@ escape-string-regexp@^1.0.5:
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-eslint-config-airbnb-base@^14.0.0:
- version "14.0.0"
- resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.0.0.tgz#8a7bcb9643d13c55df4dd7444f138bf4efa61e17"
- integrity sha512-2IDHobw97upExLmsebhtfoD3NAKhV4H0CJWP3Uprd/uk+cHuWYOczPVxQ8PxLFUAw7o3Th1RAU8u1DoUpr+cMA==
+eslint-config-airbnb-base@^14.1.0:
+ version "14.1.0"
+ resolved "https://registry.npm.taobao.org/eslint-config-airbnb-base/download/eslint-config-airbnb-base-14.1.0.tgz?cache=0&sync_timestamp=1584079908616&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-config-airbnb-base%2Fdownload%2Feslint-config-airbnb-base-14.1.0.tgz#2ba4592dd6843258221d9bff2b6831bd77c874e4"
+ integrity sha1-K6RZLdaEMlgiHZv/K2gxvXfIdOQ=
dependencies:
- confusing-browser-globals "^1.0.7"
+ confusing-browser-globals "^1.0.9"
object.assign "^4.1.0"
- object.entries "^1.1.0"
+ object.entries "^1.1.1"
+
+eslint-config-prettier@^6.10.1:
+ version "6.10.1"
+ resolved "https://registry.npm.taobao.org/eslint-config-prettier/download/eslint-config-prettier-6.10.1.tgz?cache=0&sync_timestamp=1584871355061&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-config-prettier%2Fdownload%2Feslint-config-prettier-6.10.1.tgz#129ef9ec575d5ddc0e269667bf09defcd898642a"
+ integrity sha1-Ep757FddXdwOJpZnvwne/NiYZCo=
+ dependencies:
+ get-stdin "^6.0.0"
eslint-import-resolver-node@^0.3.2:
version "0.3.2"
@@ -354,10 +361,10 @@ eslint-module-utils@^2.4.1:
debug "^2.6.9"
pkg-dir "^2.0.0"
-eslint-plugin-import@^2.20.0:
- version "2.20.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3"
- integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==
+eslint-plugin-import@^2.20.2:
+ version "2.20.2"
+ resolved "https://registry.npm.taobao.org/eslint-plugin-import/download/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d"
+ integrity sha1-kfw4B84Ivkg3FBJyyLmQc5BuWI0=
dependencies:
array-includes "^3.0.3"
array.prototype.flat "^1.2.1"
@@ -372,10 +379,10 @@ eslint-plugin-import@^2.20.0:
read-pkg-up "^2.0.0"
resolve "^1.12.0"
-eslint-plugin-vue@^6.1.2:
+eslint-plugin-vue@^6.2.2:
version "6.2.2"
- resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz#27fecd9a3a24789b0f111ecdd540a9e56198e0fe"
- integrity sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==
+ resolved "https://registry.npm.taobao.org/eslint-plugin-vue/download/eslint-plugin-vue-6.2.2.tgz#27fecd9a3a24789b0f111ecdd540a9e56198e0fe"
+ integrity sha1-J/7NmjokeJsPER7N1UCp5WGY4P4=
dependencies:
natural-compare "^1.4.0"
semver "^5.6.0"
@@ -396,6 +403,13 @@ eslint-utils@^1.4.3:
dependencies:
eslint-visitor-keys "^1.1.0"
+eslint-utils@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.npm.taobao.org/eslint-utils/download/eslint-utils-2.0.0.tgz?cache=0&sync_timestamp=1577351142754&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-utils%2Fdownload%2Feslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
+ integrity sha1-e+HMcPJ6cqds0UqmmLyr7WiQ4c0=
+ dependencies:
+ eslint-visitor-keys "^1.1.0"
+
eslint-visitor-keys@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
@@ -557,6 +571,11 @@ functional-red-black-tree@^1.0.1:
resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+get-stdin@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.npm.taobao.org/get-stdin/download/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
+ integrity sha1-ngm/cSs2CrkiXoEgSPcf3pyJZXs=
+
glob-parent@^5.0.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
@@ -878,13 +897,13 @@ object.assign@^4.1.0:
has-symbols "^1.0.0"
object-keys "^1.0.11"
-object.entries@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"
- integrity sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==
+object.entries@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.npm.taobao.org/object.entries/download/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b"
+ integrity sha1-7hzwQVPeArsJP+wzaDkA9XzlOZs=
dependencies:
define-properties "^1.1.3"
- es-abstract "^1.12.0"
+ es-abstract "^1.17.0-next.1"
function-bind "^1.1.1"
has "^1.0.3"
diff --git a/packages/vant-waterfall/src/directive.js b/packages/vant-waterfall/src/directive.js
index 2bd668d93..e7114e322 100644
--- a/packages/vant-waterfall/src/directive.js
+++ b/packages/vant-waterfall/src/directive.js
@@ -70,7 +70,7 @@ function doBindEvent() {
const disabledExpr = this.el.getAttribute('waterfall-disabled');
let disabled = false;
if (disabledExpr) {
- this.vm.$watch(disabledExpr, value => {
+ this.vm.$watch(disabledExpr, (value) => {
this.disabled = value;
this.scrollEventListener();
});
@@ -99,7 +99,6 @@ function startBind(el) {
function doCheckStartBind(el) {
const context = el[CONTEXT];
- // eslint-disable-next-line no-underscore-dangle
if (context.vm._isMounted) {
startBind(el);
} else {
@@ -109,7 +108,7 @@ function doCheckStartBind(el) {
}
}
-export default function(type) {
+export default function (type) {
return {
bind(el, binding, vnode) {
if (!el[CONTEXT]) {
diff --git a/src/utils/vnodes.ts b/src/utils/vnodes.ts
index e44f56b43..09871e603 100644
--- a/src/utils/vnodes.ts
+++ b/src/utils/vnodes.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-underscore-dangle */
import { VNode } from 'vue';
function flattenVNodes(vnodes: VNode[]) {
diff --git a/types/sku.d.ts b/types/sku.d.ts
index d197d9c1f..6e4d7c6ff 100644
--- a/types/sku.d.ts
+++ b/types/sku.d.ts
@@ -1,4 +1,3 @@
-/* eslint-disable camelcase */
import { VanComponent } from './component';
export type SkuData = {
diff --git a/yarn.lock b/yarn.lock
index 6a49d9761..0cb675f51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9034,6 +9034,11 @@ prettier@^2.0.2:
resolved "https://registry.npm.taobao.org/prettier/download/prettier-2.0.2.tgz?cache=0&sync_timestamp=1585003590220&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprettier%2Fdownload%2Fprettier-2.0.2.tgz#1ba8f3eb92231e769b7fcd7cb73ae1b6b74ade08"
integrity sha1-G6jz65IjHnabf818tzrhtrdK3gg=
+prettier@^2.0.4:
+ version "2.0.4"
+ resolved "https://registry.npm.taobao.org/prettier/download/prettier-2.0.4.tgz?cache=0&sync_timestamp=1586174218833&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprettier%2Fdownload%2Fprettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef"
+ integrity sha1-LRuuFz41WZbuNV7Jgwp6HuBUV+8=
+
pretty-error@^2.1.1:
version "2.1.1"
resolved "https://registry.npm.taobao.org/pretty-error/download/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"