diff --git a/packages/vant-eslint-config/index.js b/packages/vant-eslint-config/index.js index 87ae9e28b..68b129076 100644 --- a/packages/vant-eslint-config/index.js +++ b/packages/vant-eslint-config/index.js @@ -1,6 +1,8 @@ module.exports = { extends: [ 'airbnb-base', + 'plugin:@typescript-eslint/eslint-recommended', + 'plugin:@typescript-eslint/recommended', 'plugin:vue/recommended', 'prettier', 'prettier/vue', @@ -8,7 +10,7 @@ module.exports = { parserOptions: { parser: '@typescript-eslint/parser', - ecmaVersion: 2018, + ecmaVersion: 2019, sourceType: 'module', extraFileExtensions: ['.vue'], }, @@ -23,35 +25,40 @@ module.exports = { }, rules: { - camelcase: 0, - 'no-new': 0, - 'no-shadow': 0, - 'no-bitwise': 0, - 'func-names': 0, - 'no-console': 0, - 'no-plusplus': 0, - 'default-case': 0, - 'prefer-template': 0, - 'consistent-return': 0, - 'no-param-reassign': 0, - 'no-nested-ternary': 0, - 'no-underscore-dangle': 0, - 'no-unused-expressions': 0, - 'no-restricted-globals': 0, - 'class-methods-use-this': 0, + 'no-new': 'off', + 'no-shadow': 'off', + 'no-bitwise': 'off', + 'func-names': 'off', + 'no-console': 'off', + 'no-plusplus': 'off', + 'default-case': 'off', + 'prefer-template': 'off', + 'consistent-return': 'off', + 'no-param-reassign': 'off', + 'no-nested-ternary': 'off', + 'no-underscore-dangle': 'off', + 'no-unused-expressions': 'off', + 'no-restricted-globals': 'off', + 'class-methods-use-this': 'off', 'prefer-destructuring': ['error', { object: true, array: false }], - 'import/order': 0, - 'import/extensions': 0, - 'import/no-unresolved': 0, - 'import/prefer-default-export': 0, - 'import/no-extraneous-dependencies': 0, - 'vue/no-v-html': 0, - 'vue/attributes-order': 0, - 'vue/require-v-for-key': 0, - 'vue/require-default-prop': 0, - 'vue/no-unused-components': 0, + // eslint-plugin-import + 'import/order': 'off', + 'import/extensions': 'off', + 'import/no-unresolved': 'off', + 'import/prefer-default-export': 'off', + 'import/no-extraneous-dependencies': 'off', + // eslint-plugin-vue + 'vue/no-v-html': 'off', + 'vue/attributes-order': 'off', + 'vue/require-v-for-key': 'off', + 'vue/require-default-prop': 'off', + 'vue/no-unused-components': 'off', 'vue/name-property-casing': ['error', 'kebab-case'], 'vue/component-name-in-template-casing': ['error', 'kebab-case'], - '@typescript-eslint/no-unused-vars': ['error'], + // typescript-eslint + '@typescript-eslint/camelcase': 'off', + '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/no-non-null-assertion': 'off', + '@typescript-eslint/explicit-function-return-type': 'off', }, }; diff --git a/packages/vant-eslint-config/package.json b/packages/vant-eslint-config/package.json index e505f66f6..1db0cf757 100644 --- a/packages/vant-eslint-config/package.json +++ b/packages/vant-eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@vant/eslint-config", - "version": "2.1.0", + "version": "2.2.0", "description": "eslint config of vant", "main": "index.js", "publishConfig": { @@ -12,8 +12,8 @@ "eslint": "^6.0.0" }, "dependencies": { - "@typescript-eslint/eslint-plugin": "^2.27.0", - "@typescript-eslint/parser": "^2.27.0", + "@typescript-eslint/eslint-plugin": "^2.28.0", + "@typescript-eslint/parser": "^2.28.0", "eslint-config-airbnb-base": "^14.1.0", "eslint-config-prettier": "^6.10.1", "eslint-plugin-import": "^2.20.2", diff --git a/packages/vant-eslint-config/yarn.lock b/packages/vant-eslint-config/yarn.lock index 170abdaa0..9e72d478c 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.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= +"@typescript-eslint/eslint-plugin@^2.28.0": + version "2.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.28.0.tgz#4431bc6d3af41903e5255770703d4e55a0ccbdec" + integrity sha512-w0Ugcq2iatloEabQP56BRWJowliXUP5Wv6f9fKzjJmDW81hOTBxRoJ4LoEOxRpz9gcY51Libytd2ba3yLmSOfg== dependencies: - "@typescript-eslint/experimental-utils" "2.27.0" + "@typescript-eslint/experimental-utils" "2.28.0" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" tsutils "^3.17.1" -"@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= +"@typescript-eslint/experimental-utils@2.28.0": + version "2.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.28.0.tgz#1fd0961cd8ef6522687b4c562647da6e71f8833d" + integrity sha512-4SL9OWjvFbHumM/Zh/ZeEjUFxrYKtdCi7At4GyKTbQlrj1HcphIDXlje4Uu4cY+qzszR5NdVin4CCm6AXCjd6w== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.27.0" + "@typescript-eslint/typescript-estree" "2.28.0" eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@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= +"@typescript-eslint/parser@^2.28.0": + version "2.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.28.0.tgz#bb761286efd2b0714761cab9d0ee5847cf080385" + integrity sha512-RqPybRDquui9d+K86lL7iPqH6Dfp9461oyqvlXMNtap+PyqYbkY5dB7LawQjDzot99fqzvS0ZLZdfe+1Bt3Jgw== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.27.0" - "@typescript-eslint/typescript-estree" "2.27.0" + "@typescript-eslint/experimental-utils" "2.28.0" + "@typescript-eslint/typescript-estree" "2.28.0" eslint-visitor-keys "^1.1.0" -"@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= +"@typescript-eslint/typescript-estree@2.28.0": + version "2.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.28.0.tgz#d34949099ff81092c36dc275b6a1ea580729ba00" + integrity sha512-HDr8MP9wfwkiuqzRVkuM3BeDrOC4cKbO5a6BymZBHUt5y/2pL0BXD6I/C/ceq2IZoHWhcASk+5/zo+dwgu9V8Q== dependencies: debug "^4.1.1" eslint-visitor-keys "^1.1.0" diff --git a/src/uploader/demo/index.vue b/src/uploader/demo/index.vue index 6d44ec725..a72e2d1df 100644 --- a/src/uploader/demo/index.vue +++ b/src/uploader/demo/index.vue @@ -23,7 +23,7 @@ - {{ this.t('upload') }} + {{ t('upload') }} diff --git a/src/utils/deep-assign.ts b/src/utils/deep-assign.ts index f381a6b19..6a175c57a 100644 --- a/src/utils/deep-assign.ts +++ b/src/utils/deep-assign.ts @@ -13,7 +13,7 @@ function assignKey(to: ObjectIndex, from: ObjectIndex, key: string) { if (!hasOwnProperty.call(to, key) || !isObject(val)) { to[key] = val; } else { - // eslint-disable-next-line no-use-before-define + // eslint-disable-next-line @typescript-eslint/no-use-before-define to[key] = deepAssign(Object(to[key]), from[key]); } } diff --git a/src/utils/dom/raf.ts b/src/utils/dom/raf.ts index 9988d06da..fa32db10b 100644 --- a/src/utils/dom/raf.ts +++ b/src/utils/dom/raf.ts @@ -16,7 +16,7 @@ function fallback(fn: FrameRequestCallback): number { } /* istanbul ignore next */ -const root = (isServer ? global : window); +const root = (isServer ? global : window) as Window; /* istanbul ignore next */ const iRaf = root.requestAnimationFrame || fallback; diff --git a/src/utils/dom/scroll.ts b/src/utils/dom/scroll.ts index 9d59c149c..aa3f7f571 100644 --- a/src/utils/dom/scroll.ts +++ b/src/utils/dom/scroll.ts @@ -19,21 +19,21 @@ export function getScroller(el: HTMLElement, root: ScrollElement = window) { ) { const { overflowY } = window.getComputedStyle(node); - if (overflowScrollReg.test(overflowY)) { + if (overflowScrollReg.test(overflowY)) { if (node.tagName !== 'BODY') { return node; } // see: https://github.com/youzan/vant/issues/3823 const { overflowY: htmlOverflowY } = window.getComputedStyle( - node.parentNode + node.parentNode as Element ); - if (overflowScrollReg.test(htmlOverflowY)) { + if (overflowScrollReg.test(htmlOverflowY)) { return node; } } - node = node.parentNode; + node = node.parentNode as HTMLElement; } return root; diff --git a/src/utils/index.ts b/src/utils/index.ts index 9aa576084..9518cdd99 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -5,6 +5,7 @@ export { addUnit } from './format/unit'; export const isServer: boolean = Vue.prototype.$isServer; +// eslint-disable-next-line @typescript-eslint/no-empty-function export function noop() {} export function isDef(val: any): boolean { diff --git a/src/utils/test/index.spec.js b/src/utils/test/index.spec.js index d4a4353fd..64fe13786 100644 --- a/src/utils/test/index.spec.js +++ b/src/utils/test/index.spec.js @@ -1,6 +1,6 @@ import { deepClone } from '../deep-clone'; import { deepAssign } from '../deep-assign'; -import { isDef, get } from '..'; +import { isDef, get, noop } from '..'; import { raf, cancelRaf } from '../dom/raf'; import { later } from '../../../test'; import { isEmail } from '../validate/email'; @@ -12,22 +12,19 @@ import { camelize } from '../format/string'; test('deepClone', () => { const a = { foo: 0 }; const b = { foo: 0, bar: 1 }; - const fn = () => {}; const arr = [a, b]; expect(deepClone(a)).toEqual(a); expect(deepClone(b)).toEqual(b); - expect(deepClone(fn)).toEqual(fn); + expect(deepClone(noop)).toEqual(noop); expect(deepClone(arr)).toEqual(arr); expect(deepClone(undefined)).toEqual(undefined); expect(deepClone(1)).toEqual(1); }); test('deepAssign', () => { - const fn = () => {}; - expect(deepAssign({}, { foo: null })).toEqual({}); expect(deepAssign({}, { foo: undefined })).toEqual({}); - expect(deepAssign({ fn: null }, { fn })).toEqual({ fn }); + expect(deepAssign({ noop: null }, { noop })).toEqual({ noop }); expect(deepAssign({ foo: 0 }, { bar: 1 })).toEqual({ foo: 0, bar: 1 }); expect( deepAssign({ foo: { bar: false } }, { foo: { bar: true, foo: false } }) @@ -45,7 +42,7 @@ test('isDef', () => { expect(isDef(1)).toBeTruthy(); expect(isDef('1')).toBeTruthy(); expect(isDef({})).toBeTruthy(); - expect(isDef(() => {})).toBeTruthy(); + expect(isDef(noop)).toBeTruthy(); }); test('camelize', () => { diff --git a/yarn.lock b/yarn.lock index 2c47c9afa..c2fe7a12c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1561,10 +1561,10 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^2.27.0": +"@typescript-eslint/eslint-plugin@^2.28.0": version "2.28.0" - resolved "https://registry.npm.taobao.org/@typescript-eslint/eslint-plugin/download/@typescript-eslint/eslint-plugin-2.28.0.tgz#4431bc6d3af41903e5255770703d4e55a0ccbdec" - integrity sha1-RDG8bTr0GQPlJVdwcD1OVaDMvew= + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.28.0.tgz#4431bc6d3af41903e5255770703d4e55a0ccbdec" + integrity sha512-w0Ugcq2iatloEabQP56BRWJowliXUP5Wv6f9fKzjJmDW81hOTBxRoJ4LoEOxRpz9gcY51Libytd2ba3yLmSOfg== dependencies: "@typescript-eslint/experimental-utils" "2.28.0" functional-red-black-tree "^1.0.1" @@ -1581,10 +1581,10 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^2.27.0": +"@typescript-eslint/parser@^2.28.0": version "2.28.0" - resolved "https://registry.npm.taobao.org/@typescript-eslint/parser/download/@typescript-eslint/parser-2.28.0.tgz#bb761286efd2b0714761cab9d0ee5847cf080385" - integrity sha1-u3YShu/SsHFHYcq50O5YR88IA4U= + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.28.0.tgz#bb761286efd2b0714761cab9d0ee5847cf080385" + integrity sha512-RqPybRDquui9d+K86lL7iPqH6Dfp9461oyqvlXMNtap+PyqYbkY5dB7LawQjDzot99fqzvS0ZLZdfe+1Bt3Jgw== dependencies: "@types/eslint-visitor-keys" "^1.0.0" "@typescript-eslint/experimental-utils" "2.28.0" @@ -1672,12 +1672,12 @@ webpackbar "^4.0.0" "@vant/eslint-config@^2.0.0": - version "2.1.0" - resolved "https://registry.npm.taobao.org/@vant/eslint-config/download/@vant/eslint-config-2.1.0.tgz#736cb273ac279a44ab54a922dfd9b21fd8883308" - integrity sha1-c2yyc6wnmkSrVKki39myH9iIMwg= + version "2.2.0" + resolved "https://registry.yarnpkg.com/@vant/eslint-config/-/eslint-config-2.2.0.tgz#b2802ff85a0b5b0b4e84b3d7825d5c8fff3d62e6" + integrity sha512-C8RYiiQNnwi2h9seb9eDqtSiMW5nnPnMFE4pdrIvjaPi7xP887jGb+BD4YLc3VzI4cmp7XbmiDhw8KlfpECsUA== dependencies: - "@typescript-eslint/eslint-plugin" "^2.27.0" - "@typescript-eslint/parser" "^2.27.0" + "@typescript-eslint/eslint-plugin" "^2.28.0" + "@typescript-eslint/parser" "^2.28.0" eslint-config-airbnb-base "^14.1.0" eslint-config-prettier "^6.10.1" eslint-plugin-import "^2.20.2"