ci: check prettier format (#6830)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1daf7f5f588a0bd36198c94aea0ea1cb1d549ee..3581d1e20a5176f98a4cd467957ac14e3d098fb7 100644 (file)
--- 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 f6dff7e7d7aab30db2a7b9a4def1709df4f71722..fc45ebf6f18b09db7593dea9acc57994211353c5 100644 (file)
--- 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 d6f1278498608b9ec17f373f9b495511a1d5697e..dc989e4681e15bac77d5d69f2d3184865de48299 100644 (file)
--- 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 2632160b31872201dd46ad80571af2bab4d86ae9..26c6fe192baeb9267ddabab4dbd94c89eacf7da6 100644 (file)
--- a/packages/reactivity/src/ref.ts
+++ b/packages/reactivity/src/ref.ts
@@ -282,8 +282,10 @@ export type ShallowUnwrapRef<T> = {
   [K in keyof T]: T[K] extends Ref<infer V>
     ? V // if `V` is `unknown` that means it does not extend `Ref` and is undefined
     : T[K] extends Ref<infer V> | undefined
-      ? unknown extends V ? undefined : V | undefined
-      : T[K]
+    ? unknown extends V
+      ? undefined
+      : V | undefined
+    : T[K]
 }
 
 export type UnwrapRef<T> = T extends ShallowRef<infer V>

diff --git a/packages/runtime-core/__tests__/componentEmits.spec.ts b/packages/runtime-core/__tests__/componentEmits.spec.ts
index 0c196c763e054c0b032c35db35228f3cc1360c2a..558a42b04965b84245795f126e2a20c69b526e3d 100644 (file)
--- 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 03835b53f20940c207e380956be3eb8f010d81b0..9a9fe050150495d01c10d6c8ef08f65bdf3c59f6 100644 (file)
--- 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)