blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

feat(eslint-config): extends typescript-eslint recommended (#6076)

Browse Source
This commit is contained in:
neverland 2020-04-17 14:51:55 +08:00 committed by GitHub
parent 28bbef6b6f
commit 31674a162c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
packages/vant-eslint-config/index.js
View File

@ -1,6 +1,8 @@
module.exports = { module.exports = {
extends: [ extends: [
'airbnb-base', 'airbnb-base',
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'plugin:vue/recommended', 'plugin:vue/recommended',
'prettier', 'prettier',
'prettier/vue', 'prettier/vue',
@ -8,7 +10,7 @@ module.exports = {
parserOptions: { parserOptions: {
parser: '@typescript-eslint/parser', parser: '@typescript-eslint/parser',
ecmaVersion: 2018, ecmaVersion: 2019,
sourceType: 'module', sourceType: 'module',
extraFileExtensions: ['.vue'], extraFileExtensions: ['.vue'],
}, },
@ -23,35 +25,40 @@ module.exports = {
}, },
rules: { rules: {
camelcase: 0, 'no-new': 'off',
'no-new': 0, 'no-shadow': 'off',
'no-shadow': 0, 'no-bitwise': 'off',
'no-bitwise': 0, 'func-names': 'off',
'func-names': 0, 'no-console': 'off',
'no-console': 0, 'no-plusplus': 'off',
'no-plusplus': 0, 'default-case': 'off',
'default-case': 0, 'prefer-template': 'off',
'prefer-template': 0, 'consistent-return': 'off',
'consistent-return': 0, 'no-param-reassign': 'off',
'no-param-reassign': 0, 'no-nested-ternary': 'off',
'no-nested-ternary': 0, 'no-underscore-dangle': 'off',
'no-underscore-dangle': 0, 'no-unused-expressions': 'off',
'no-unused-expressions': 0, 'no-restricted-globals': 'off',
'no-restricted-globals': 0, 'class-methods-use-this': 'off',
'class-methods-use-this': 0,
'prefer-destructuring': ['error', { object: true, array: false }], 'prefer-destructuring': ['error', { object: true, array: false }],
'import/order': 0, // eslint-plugin-import
'import/extensions': 0, 'import/order': 'off',
'import/no-unresolved': 0, 'import/extensions': 'off',
'import/prefer-default-export': 0, 'import/no-unresolved': 'off',
'import/no-extraneous-dependencies': 0, 'import/prefer-default-export': 'off',
'vue/no-v-html': 0, 'import/no-extraneous-dependencies': 'off',
'vue/attributes-order': 0, // eslint-plugin-vue
'vue/require-v-for-key': 0, 'vue/no-v-html': 'off',
'vue/require-default-prop': 0, 'vue/attributes-order': 'off',
'vue/no-unused-components': 0, 'vue/require-v-for-key': 'off',
'vue/require-default-prop': 'off',
'vue/no-unused-components': 'off',
'vue/name-property-casing': ['error', 'kebab-case'], 'vue/name-property-casing': ['error', 'kebab-case'],
'vue/component-name-in-template-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',
}, },
}; };

6
packages/vant-eslint-config/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@vant/eslint-config", "name": "@vant/eslint-config",
"version": "2.1.0", "version": "2.2.0",
"description": "eslint config of vant", "description": "eslint config of vant",
"main": "index.js", "main": "index.js",
"publishConfig": { "publishConfig": {
@ -12,8 +12,8 @@
"eslint": "^6.0.0" "eslint": "^6.0.0"
}, },
"dependencies": { "dependencies": {
"@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/eslint-plugin": "^2.28.0",
"@typescript-eslint/parser": "^2.27.0", "@typescript-eslint/parser": "^2.28.0",
"eslint-config-airbnb-base": "^14.1.0", "eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.10.1", "eslint-config-prettier": "^6.10.1",
"eslint-plugin-import": "^2.20.2", "eslint-plugin-import": "^2.20.2",

40
packages/vant-eslint-config/yarn.lock
View File

@ -28,40 +28,40 @@
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A== integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==
"@typescript-eslint/eslint-plugin@^2.27.0": "@typescript-eslint/eslint-plugin@^2.28.0":
version "2.27.0" version "2.28.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" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.28.0.tgz#4431bc6d3af41903e5255770703d4e55a0ccbdec"
integrity sha1-5HnNxMnPRvlrTCh3VXMzEbDQuks= integrity sha512-w0Ugcq2iatloEabQP56BRWJowliXUP5Wv6f9fKzjJmDW81hOTBxRoJ4LoEOxRpz9gcY51Libytd2ba3yLmSOfg==
dependencies: dependencies:
"@typescript-eslint/experimental-utils" "2.27.0" "@typescript-eslint/experimental-utils" "2.28.0"
functional-red-black-tree "^1.0.1" functional-red-black-tree "^1.0.1"
regexpp "^3.0.0" regexpp "^3.0.0"
tsutils "^3.17.1" tsutils "^3.17.1"
"@typescript-eslint/experimental-utils@2.27.0": "@typescript-eslint/experimental-utils@2.28.0":
version "2.27.0" version "2.28.0"
resolved "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-2.27.0.tgz#801a952c10b58e486c9a0b36cf21e2aab1e9e01a" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.28.0.tgz#1fd0961cd8ef6522687b4c562647da6e71f8833d"
integrity sha1-gBqVLBC1jkhsmgs2zyHiqrHp4Bo= integrity sha512-4SL9OWjvFbHumM/Zh/ZeEjUFxrYKtdCi7At4GyKTbQlrj1HcphIDXlje4Uu4cY+qzszR5NdVin4CCm6AXCjd6w==
dependencies: dependencies:
"@types/json-schema" "^7.0.3" "@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-scope "^5.0.0"
eslint-utils "^2.0.0" eslint-utils "^2.0.0"
"@typescript-eslint/parser@^2.27.0": "@typescript-eslint/parser@^2.28.0":
version "2.27.0" version "2.28.0"
resolved "https://registry.npm.taobao.org/@typescript-eslint/parser/download/@typescript-eslint/parser-2.27.0.tgz#d91664335b2c46584294e42eb4ff35838c427287" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.28.0.tgz#bb761286efd2b0714761cab9d0ee5847cf080385"
integrity sha1-2RZkM1ssRlhClOQutP81g4xCcoc= integrity sha512-RqPybRDquui9d+K86lL7iPqH6Dfp9461oyqvlXMNtap+PyqYbkY5dB7LawQjDzot99fqzvS0ZLZdfe+1Bt3Jgw==
dependencies: dependencies:
"@types/eslint-visitor-keys" "^1.0.0" "@types/eslint-visitor-keys" "^1.0.0"
"@typescript-eslint/experimental-utils" "2.27.0" "@typescript-eslint/experimental-utils" "2.28.0"
"@typescript-eslint/typescript-estree" "2.27.0" "@typescript-eslint/typescript-estree" "2.28.0"
eslint-visitor-keys "^1.1.0" eslint-visitor-keys "^1.1.0"
"@typescript-eslint/typescript-estree@2.27.0": "@typescript-eslint/typescript-estree@2.28.0":
version "2.27.0" version "2.28.0"
resolved "https://registry.npm.taobao.org/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-2.27.0.tgz#a288e54605412da8b81f1660b56c8b2e42966ce8" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.28.0.tgz#d34949099ff81092c36dc275b6a1ea580729ba00"
integrity sha1-oojlRgVBLai4HxZgtWyLLkKWbOg= integrity sha512-HDr8MP9wfwkiuqzRVkuM3BeDrOC4cKbO5a6BymZBHUt5y/2pL0BXD6I/C/ceq2IZoHWhcASk+5/zo+dwgu9V8Q==
dependencies: dependencies:
debug "^4.1.1" debug "^4.1.1"
eslint-visitor-keys "^1.1.0" eslint-visitor-keys "^1.1.0"

2
src/uploader/demo/index.vue
View File

@ -23,7 +23,7 @@
<demo-block :title="t('uploadStyle')"> <demo-block :title="t('uploadStyle')">
<van-uploader> <van-uploader>
<van-button type="primary" icon="photo"> <van-button type="primary" icon="photo">
{{ this.t('upload') }} {{ t('upload') }}
</van-button> </van-button>
</van-uploader> </van-uploader>
</demo-block> </demo-block>

2
src/utils/deep-assign.ts
View File

@ -13,7 +13,7 @@ function assignKey(to: ObjectIndex, from: ObjectIndex, key: string) {
if (!hasOwnProperty.call(to, key) || !isObject(val)) { if (!hasOwnProperty.call(to, key) || !isObject(val)) {
to[key] = val; to[key] = val;
} else { } 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]); to[key] = deepAssign(Object(to[key]), from[key]);
} }
} }

2
src/utils/dom/raf.ts
View File

@ -16,7 +16,7 @@ function fallback(fn: FrameRequestCallback): number {
} }
/* istanbul ignore next */ /* istanbul ignore next */
const root = <Window>(isServer ? global : window); const root = (isServer ? global : window) as Window;
/* istanbul ignore next */ /* istanbul ignore next */
const iRaf = root.requestAnimationFrame || fallback; const iRaf = root.requestAnimationFrame || fallback;

8
src/utils/dom/scroll.ts
View File

@ -19,21 +19,21 @@ export function getScroller(el: HTMLElement, root: ScrollElement = window) {
) { ) {
const { overflowY } = window.getComputedStyle(node); const { overflowY } = window.getComputedStyle(node);
if (overflowScrollReg.test(<string>overflowY)) { if (overflowScrollReg.test(overflowY)) {
if (node.tagName !== 'BODY') { if (node.tagName !== 'BODY') {
return node; return node;
} }
// see: https://github.com/youzan/vant/issues/3823 // see: https://github.com/youzan/vant/issues/3823
const { overflowY: htmlOverflowY } = window.getComputedStyle( const { overflowY: htmlOverflowY } = window.getComputedStyle(
<Element>node.parentNode node.parentNode as Element
); );
if (overflowScrollReg.test(<string>htmlOverflowY)) { if (overflowScrollReg.test(htmlOverflowY)) {
return node; return node;
} }
} }
node = <HTMLElement>node.parentNode; node = node.parentNode as HTMLElement;
} }
return root; return root;

1
src/utils/index.ts
View File

@ -5,6 +5,7 @@ export { addUnit } from './format/unit';
export const isServer: boolean = Vue.prototype.$isServer; export const isServer: boolean = Vue.prototype.$isServer;
// eslint-disable-next-line @typescript-eslint/no-empty-function
export function noop() {} export function noop() {}
export function isDef(val: any): boolean { export function isDef(val: any): boolean {

11
src/utils/test/index.spec.js
View File

@ -1,6 +1,6 @@
import { deepClone } from '../deep-clone'; import { deepClone } from '../deep-clone';
import { deepAssign } from '../deep-assign'; import { deepAssign } from '../deep-assign';
import { isDef, get } from '..'; import { isDef, get, noop } from '..';
import { raf, cancelRaf } from '../dom/raf'; import { raf, cancelRaf } from '../dom/raf';
import { later } from '../../../test'; import { later } from '../../../test';
import { isEmail } from '../validate/email'; import { isEmail } from '../validate/email';
@ -12,22 +12,19 @@ import { camelize } from '../format/string';
test('deepClone', () => { test('deepClone', () => {
const a = { foo: 0 }; const a = { foo: 0 };
const b = { foo: 0, bar: 1 }; const b = { foo: 0, bar: 1 };
const fn = () => {};
const arr = [a, b]; const arr = [a, b];
expect(deepClone(a)).toEqual(a); expect(deepClone(a)).toEqual(a);
expect(deepClone(b)).toEqual(b); expect(deepClone(b)).toEqual(b);
expect(deepClone(fn)).toEqual(fn); expect(deepClone(noop)).toEqual(noop);
expect(deepClone(arr)).toEqual(arr); expect(deepClone(arr)).toEqual(arr);
expect(deepClone(undefined)).toEqual(undefined); expect(deepClone(undefined)).toEqual(undefined);
expect(deepClone(1)).toEqual(1); expect(deepClone(1)).toEqual(1);
}); });
test('deepAssign', () => { test('deepAssign', () => {
const fn = () => {};
expect(deepAssign({}, { foo: null })).toEqual({}); expect(deepAssign({}, { foo: null })).toEqual({});
expect(deepAssign({}, { foo: undefined })).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: 0 }, { bar: 1 })).toEqual({ foo: 0, bar: 1 });
expect( expect(
deepAssign({ foo: { bar: false } }, { foo: { bar: true, foo: false } }) 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('1')).toBeTruthy(); expect(isDef('1')).toBeTruthy();
expect(isDef({})).toBeTruthy(); expect(isDef({})).toBeTruthy();
expect(isDef(() => {})).toBeTruthy(); expect(isDef(noop)).toBeTruthy();
}); });
test('camelize', () => { test('camelize', () => {

22
yarn.lock
View File

@ -1561,10 +1561,10 @@
dependencies: dependencies:
"@types/yargs-parser" "*" "@types/yargs-parser" "*"
"@typescript-eslint/eslint-plugin@^2.27.0": "@typescript-eslint/eslint-plugin@^2.28.0":
version "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" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.28.0.tgz#4431bc6d3af41903e5255770703d4e55a0ccbdec"
integrity sha1-RDG8bTr0GQPlJVdwcD1OVaDMvew= integrity sha512-w0Ugcq2iatloEabQP56BRWJowliXUP5Wv6f9fKzjJmDW81hOTBxRoJ4LoEOxRpz9gcY51Libytd2ba3yLmSOfg==
dependencies: dependencies:
"@typescript-eslint/experimental-utils" "2.28.0" "@typescript-eslint/experimental-utils" "2.28.0"
functional-red-black-tree "^1.0.1" functional-red-black-tree "^1.0.1"
@ -1581,10 +1581,10 @@
eslint-scope "^5.0.0" eslint-scope "^5.0.0"
eslint-utils "^2.0.0" eslint-utils "^2.0.0"
"@typescript-eslint/parser@^2.27.0": "@typescript-eslint/parser@^2.28.0":
version "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" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.28.0.tgz#bb761286efd2b0714761cab9d0ee5847cf080385"
integrity sha1-u3YShu/SsHFHYcq50O5YR88IA4U= integrity sha512-RqPybRDquui9d+K86lL7iPqH6Dfp9461oyqvlXMNtap+PyqYbkY5dB7LawQjDzot99fqzvS0ZLZdfe+1Bt3Jgw==
dependencies: dependencies:
"@types/eslint-visitor-keys" "^1.0.0" "@types/eslint-visitor-keys" "^1.0.0"
"@typescript-eslint/experimental-utils" "2.28.0" "@typescript-eslint/experimental-utils" "2.28.0"
@ -1672,12 +1672,12 @@
webpackbar "^4.0.0" webpackbar "^4.0.0"
"@vant/eslint-config@^2.0.0": "@vant/eslint-config@^2.0.0":
version "2.1.0" version "2.2.0"
resolved "https://registry.npm.taobao.org/@vant/eslint-config/download/@vant/eslint-config-2.1.0.tgz#736cb273ac279a44ab54a922dfd9b21fd8883308" resolved "https://registry.yarnpkg.com/@vant/eslint-config/-/eslint-config-2.2.0.tgz#b2802ff85a0b5b0b4e84b3d7825d5c8fff3d62e6"
integrity sha1-c2yyc6wnmkSrVKki39myH9iIMwg= integrity sha512-C8RYiiQNnwi2h9seb9eDqtSiMW5nnPnMFE4pdrIvjaPi7xP887jGb+BD4YLc3VzI4cmp7XbmiDhw8KlfpECsUA==
dependencies: dependencies:
"@typescript-eslint/eslint-plugin" "^2.27.0" "@typescript-eslint/eslint-plugin" "^2.28.0"
"@typescript-eslint/parser" "^2.27.0" "@typescript-eslint/parser" "^2.28.0"
eslint-config-airbnb-base "^14.1.0" eslint-config-airbnb-base "^14.1.0"
eslint-config-prettier "^6.10.1" eslint-config-prettier "^6.10.1"
eslint-plugin-import "^2.20.2" eslint-plugin-import "^2.20.2"