From: Evan You Date: Mon, 14 Oct 2019 19:07:43 +0000 (-0400) Subject: chore: lint + include tsx files for lint X-Git-Tag: v3.0.0-alpha.0~446 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37cbd0098d8545643934dba778d1a1ff22fd1904;p=thirdparty%2Fvuejs%2Fcore.git chore: lint + include tsx files for lint --- diff --git a/package.json b/package.json index 103d933655..edf9f47d92 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "size-runtime": "node scripts/build.js runtime-dom -p -f global", "size-compiler": "node scripts/build.js compiler-dom -p -f global", "size": "yarn size-runtime && yarn size-compiler", - "lint": "prettier --write --parser typescript \"packages/**/*.ts\"", + "lint": "prettier --write --parser typescript \"packages/**/*.ts?(x)\"", "test": "jest" }, "gitHooks": { @@ -21,7 +21,7 @@ "prettier --write", "git add" ], - "*.ts": [ + "*.ts?(x)": [ "prettier --parser=typescript --write", "git add" ] diff --git a/packages/compiler-dom/src/transforms/vOn.ts b/packages/compiler-dom/src/transforms/vOn.ts index 73e7fdb945..b0838acf1e 100644 --- a/packages/compiler-dom/src/transforms/vOn.ts +++ b/packages/compiler-dom/src/transforms/vOn.ts @@ -41,7 +41,7 @@ export const transformOn: DirectiveTransform = (dir, node, context) => { if ( // if event name is dynamic, always wrap with keys guard key.type === NodeTypes.COMPOUND_EXPRESSION || - !(key.isStatic) || + !key.isStatic || key.content.toLowerCase() in KEYBOARD_EVENTS ) { handler = createCallExpression(context.helper(V_ON_KEYS_GUARD), [ diff --git a/packages/runtime-core/__tests__/apiCreateComponent.spec.tsx b/packages/runtime-core/__tests__/apiCreateComponent.spec.tsx index c64eaa0748..f02b089f07 100644 --- a/packages/runtime-core/__tests__/apiCreateComponent.spec.tsx +++ b/packages/runtime-core/__tests__/apiCreateComponent.spec.tsx @@ -67,7 +67,7 @@ test('createComponent type inference', () => { } }) // test TSX props inference - ;() + ; }) test('type inference w/ optional props declaration', () => { @@ -85,14 +85,14 @@ test('type inference w/ optional props declaration', () => { return h('div', this.msg) } }) - ;() + ; }) test('type inference w/ direct setup function', () => { const Comp = createComponent((props: { msg: string }) => { return () =>
{props.msg}
}) - ;() + ; }) test('type inference w/ array props declaration', () => { @@ -113,7 +113,7 @@ test('type inference w/ array props declaration', () => { this.c } }) - ;() + ; }) test('with legacy options', () => { diff --git a/packages/runtime-core/src/apiLifecycle.ts b/packages/runtime-core/src/apiLifecycle.ts index f8303616bc..8a22af2390 100644 --- a/packages/runtime-core/src/apiLifecycle.ts +++ b/packages/runtime-core/src/apiLifecycle.ts @@ -50,10 +50,8 @@ function injectHook( const createHook = any>( lifecycle: LifecycleHooks -) => ( - hook: T, - target: ComponentInternalInstance | null = currentInstance -) => injectHook(lifecycle, hook, target) +) => (hook: T, target: ComponentInternalInstance | null = currentInstance) => + injectHook(lifecycle, hook, target) export const onBeforeMount = createHook(LifecycleHooks.BEFORE_MOUNT) export const onMounted = createHook(LifecycleHooks.MOUNTED) diff --git a/packages/runtime-core/src/helpers/renderList.ts b/packages/runtime-core/src/helpers/renderList.ts index 43841f31ca..5cd92e5b2f 100644 --- a/packages/runtime-core/src/helpers/renderList.ts +++ b/packages/runtime-core/src/helpers/renderList.ts @@ -16,10 +16,7 @@ export function renderList( } } else if (isObject(source)) { if (source[Symbol.iterator as any]) { - ret = Array.from( - source as Iterable, - renderItem - ) + ret = Array.from(source as Iterable, renderItem) } else { const keys = Object.keys(source) ret = new Array(keys.length) diff --git a/packages/runtime-dom/src/directives/vOn.ts b/packages/runtime-dom/src/directives/vOn.ts index b064799561..ccfda3758c 100644 --- a/packages/runtime-dom/src/directives/vOn.ts +++ b/packages/runtime-dom/src/directives/vOn.ts @@ -28,7 +28,6 @@ export const vOnModifiersGuard = (fn: Function, modifiers: string[]) => { } } - // Kept for 2.x compat. // Note: IE11 compat for `spacebar` and `del` is removed for now. const keyNames: Record = {