From bbb66d7ac787db381541fdbd6795bae08c7d7902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20=28Kevin=29?= Date: Fri, 28 Oct 2022 09:39:34 +0800 Subject: [PATCH] ci: check prettier format (#6830) --- .github/workflows/ci.yml | 3 +++ package.json | 1 + packages/compiler-sfc/src/compileScript.ts | 5 ++++- packages/reactivity/src/ref.ts | 6 ++++-- packages/runtime-core/__tests__/componentEmits.spec.ts | 2 +- packages/runtime-core/src/componentEmits.ts | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1daf7f5f58..3581d1e20a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,6 +68,9 @@ jobs: - name: Run eslint run: pnpm run lint + - name: Run prettier + run: pnpm run format-check + - name: Run type declaration tests run: pnpm run test-dts diff --git a/package.json b/package.json index f6dff7e7d7a..fc45ebf6f18 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "size-baseline": "node scripts/build.js runtime-dom runtime-core reactivity shared -f esm-bundler && cd packages/size-check && vite build && node brotli", "lint": "eslint --cache --ext .ts packages/*/{src,__tests__}/**.ts", "format": "prettier --write --cache --parser typescript \"packages/**/*.ts?(x)\"", + "format-check": "prettier --check --cache --parser typescript \"packages/**/*.ts?(x)\"", "test": "run-s \"test-unit {@}\" \"test-e2e {@}\"", "test-unit": "jest --filter ./scripts/filter-unit.js", "test-e2e": "node scripts/build.js vue -f global -d && jest --filter ./scripts/filter-e2e.js --runInBand", diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts index d6f12784986..dc989e4681e 100644 --- a/packages/compiler-sfc/src/compileScript.ts +++ b/packages/compiler-sfc/src/compileScript.ts @@ -553,7 +553,10 @@ export function compileScript( } if (declId) { - emitIdentifier = (declId.type === 'Identifier') ? declId.name : scriptSetup!.content.slice(declId.start!, declId.end!) + emitIdentifier = + declId.type === 'Identifier' + ? declId.name + : scriptSetup!.content.slice(declId.start!, declId.end!) } return true diff --git a/packages/reactivity/src/ref.ts b/packages/reactivity/src/ref.ts index 2632160b318..26c6fe192ba 100644 --- a/packages/reactivity/src/ref.ts +++ b/packages/reactivity/src/ref.ts @@ -282,8 +282,10 @@ export type ShallowUnwrapRef = { [K in keyof T]: T[K] extends Ref ? V // if `V` is `unknown` that means it does not extend `Ref` and is undefined : T[K] extends Ref | undefined - ? unknown extends V ? undefined : V | undefined - : T[K] + ? unknown extends V + ? undefined + : V | undefined + : T[K] } export type UnwrapRef = T extends ShallowRef diff --git a/packages/runtime-core/__tests__/componentEmits.spec.ts b/packages/runtime-core/__tests__/componentEmits.spec.ts index 0c196c763e0..558a42b0496 100644 --- a/packages/runtime-core/__tests__/componentEmits.spec.ts +++ b/packages/runtime-core/__tests__/componentEmits.spec.ts @@ -385,7 +385,7 @@ describe('component: emit', () => { expect(fn2).toHaveBeenCalledTimes(1) expect(fn2).toHaveBeenCalledWith(1) }) - + test('only trim string parameter when work with v-model on component', () => { const Foo = defineComponent({ render() {}, diff --git a/packages/runtime-core/src/componentEmits.ts b/packages/runtime-core/src/componentEmits.ts index 03835b53f20..9a9fe050150 100644 --- a/packages/runtime-core/src/componentEmits.ts +++ b/packages/runtime-core/src/componentEmits.ts @@ -123,7 +123,7 @@ export function emit( }Modifiers` const { number, trim } = props[modifiersKey] || EMPTY_OBJ if (trim) { - args = rawArgs.map(a => isString(a) ? a.trim() : a) + args = rawArgs.map(a => (isString(a) ? a.trim() : a)) } if (number) { args = rawArgs.map(toNumber)