ci: check prettier format (#6830)

vuejs · Oct 28, 2022 · bbb66d7 · bbb66d7
1 parent 830454a
commit bbb66d7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)