chore: revert prettier

package.json

@@ -37,7 +37,7 @@
     "lerna": "^3.16.4",
     "lint-staged": "^9.2.3",
     "minimist": "^1.2.0",
-    "prettier": "^1.18.2",
+    "prettier": "~1.14.0",
     "rollup": "^1.19.4",
     "rollup-plugin-alias": "^2.0.0",
     "rollup-plugin-json": "^4.0.0",

packages/reactivity/src/ref.ts

@@ -72,11 +72,9 @@ export type UnwrapRef<T> = {
 }[T extends ComputedRef<any>
   ? 'cRef'
   : T extends Ref
-  ? 'ref'
+    ? 'ref'
-  : T extends Array<any>
+    : T extends Array<any>
-  ? 'array'
+      ? 'array'
-  : T extends Function | CollectionTypes
+      : T extends Function | CollectionTypes
-  ? 'ref' // bail out on types that shouldn't be unwrapped
+        ? 'ref' // bail out on types that shouldn't be unwrapped
-  : T extends object
+        : T extends object ? 'object' : 'ref']
-  ? 'object'
-  : 'ref']

packages/runtime-core/src/apiOptions.ts

@@ -288,12 +288,12 @@ export function applyOptions(
             set: isFunction(set)
               ? set.bind(ctx)
               : __DEV__
-              ? () => {
+                ? () => {
-                  warn(
+                    warn(
-                    `Computed property "${key}" was assigned to but it has no setter.`
+                      `Computed property "${key}" was assigned to but it has no setter.`
-                  )
+                    )
-                }
+                  }
-              : NOOP
+                : NOOP
           })
         } else if (__DEV__) {
           warn(`Computed property "${key}" has no getter.`)

packages/runtime-core/src/apiWatch.ts

@@ -61,7 +61,7 @@ export function watch<T>(
 ): StopHandle
 
 // overload #3: array of multiple sources + cb
-export function watch<T extends readonly WatcherSource<unknown>[]>(
+export function watch<T extends Readonly<WatcherSource<unknown>[]>>(
   sources: T,
   cb: WatchHandler<MapSources<T>>,
   options?: WatchOptions
@@ -94,10 +94,11 @@ function doWatch(
   let getter: () => any
   if (isArray(source)) {
     getter = () =>
-      source.map(s =>
+      source.map(
-        isRef(s)
+        s =>
-          ? s.value
+          isRef(s)
-          : callWithErrorHandling(s, instance, ErrorCodes.WATCH_GETTER)
+            ? s.value
+            : callWithErrorHandling(s, instance, ErrorCodes.WATCH_GETTER)
       )
   } else if (isRef(source)) {
     getter = () => source.value

packages/runtime-core/src/componentProps.ts

@@ -53,12 +53,10 @@ type OptionalKeys<T, MakeDefaultRequired> = Exclude<
 type InferPropType<T> = T extends null
   ? any // null & true would fail to infer
   : T extends { type: null | true }
-  ? any // somehow `ObjectConstructor` when inferred from { (): T } becomes `any`
+    ? any // somehow `ObjectConstructor` when inferred from { (): T } becomes `any`
-  : T extends ObjectConstructor | { type: ObjectConstructor }
+    : T extends ObjectConstructor | { type: ObjectConstructor }
-  ? { [key: string]: any }
+      ? { [key: string]: any }
-  : T extends Prop<infer V>
+      : T extends Prop<infer V> ? V : T
-  ? V
-  : T
 
 export type ExtractPropTypes<
   O,

packages/runtime-core/src/createRenderer.ts

@@ -1162,83 +1162,72 @@ export function createRenderer<
   ) {
     // create reactive effect for rendering
     let mounted = false
-    instance.update = effect(
+    instance.update = effect(function componentEffect() {
-      function componentEffect() {
+      if (!mounted) {
-        if (!mounted) {
+        const subTree = (instance.subTree = renderComponentRoot(instance))
-          const subTree = (instance.subTree = renderComponentRoot(instance))
+        // beforeMount hook
-          // beforeMount hook
+        if (instance.bm !== null) {
-          if (instance.bm !== null) {
+          invokeHooks(instance.bm)
-            invokeHooks(instance.bm)
-          }
-          patch(
-            null,
-            subTree,
-            container,
-            anchor,
-            instance,
-            parentSuspense,
-            isSVG
-          )
-          initialVNode.el = subTree.el
-          // mounted hook
-          if (instance.m !== null) {
-            queuePostRenderEffect(instance.m, parentSuspense)
-          }
-          mounted = true
-        } else {
-          // updateComponent
-          // This is triggered by mutation of component's own state (next: null)
-          // OR parent calling processComponent (next: HostVNode)
-          const { next } = instance
-
-          if (__DEV__) {
-            pushWarningContext(next || instance.vnode)
-          }
-
-          if (next !== null) {
-            updateComponentPreRender(instance, next)
-          }
-          const prevTree = instance.subTree
-          const nextTree = (instance.subTree = renderComponentRoot(instance))
-          // beforeUpdate hook
-          if (instance.bu !== null) {
-            invokeHooks(instance.bu)
-          }
-          // reset refs
-          // only needed if previous patch had refs
-          if (instance.refs !== EMPTY_OBJ) {
-            instance.refs = {}
-          }
-          patch(
-            prevTree,
-            nextTree,
-            // parent may have changed if it's in a portal
-            hostParentNode(prevTree.el as HostNode) as HostElement,
-            // anchor may have changed if it's in a fragment
-            getNextHostNode(prevTree),
-            instance,
-            parentSuspense,
-            isSVG
-          )
-          instance.vnode.el = nextTree.el
-          if (next === null) {
-            // self-triggered update. In case of HOC, update parent component
-            // vnode el. HOC is indicated by parent instance's subTree pointing
-            // to child component's vnode
-            updateHOCHostEl(instance, nextTree.el)
-          }
-          // updated hook
-          if (instance.u !== null) {
-            queuePostRenderEffect(instance.u, parentSuspense)
-          }
-
-          if (__DEV__) {
-            popWarningContext()
-          }
         }
-      },
+        patch(null, subTree, container, anchor, instance, parentSuspense, isSVG)
-      __DEV__ ? createDevEffectOptions(instance) : prodEffectOptions
+        initialVNode.el = subTree.el
-    )
+        // mounted hook
+        if (instance.m !== null) {
+          queuePostRenderEffect(instance.m, parentSuspense)
+        }
+        mounted = true
+      } else {
+        // updateComponent
+        // This is triggered by mutation of component's own state (next: null)
+        // OR parent calling processComponent (next: HostVNode)
+        const { next } = instance
+
+        if (__DEV__) {
+          pushWarningContext(next || instance.vnode)
+        }
+
+        if (next !== null) {
+          updateComponentPreRender(instance, next)
+        }
+        const prevTree = instance.subTree
+        const nextTree = (instance.subTree = renderComponentRoot(instance))
+        // beforeUpdate hook
+        if (instance.bu !== null) {
+          invokeHooks(instance.bu)
+        }
+        // reset refs
+        // only needed if previous patch had refs
+        if (instance.refs !== EMPTY_OBJ) {
+          instance.refs = {}
+        }
+        patch(
+          prevTree,
+          nextTree,
+          // parent may have changed if it's in a portal
+          hostParentNode(prevTree.el as HostNode) as HostElement,
+          // anchor may have changed if it's in a fragment
+          getNextHostNode(prevTree),
+          instance,
+          parentSuspense,
+          isSVG
+        )
+        instance.vnode.el = nextTree.el
+        if (next === null) {
+          // self-triggered update. In case of HOC, update parent component
+          // vnode el. HOC is indicated by parent instance's subTree pointing
+          // to child component's vnode
+          updateHOCHostEl(instance, nextTree.el)
+        }
+        // updated hook
+        if (instance.u !== null) {
+          queuePostRenderEffect(instance.u, parentSuspense)
+        }
+
+        if (__DEV__) {
+          popWarningContext()
+        }
+      }
+    }, __DEV__ ? createDevEffectOptions(instance) : prodEffectOptions)
   }
 
   function updateComponentPreRender(

packages/runtime-core/src/helpers/toString.ts

@@ -5,6 +5,6 @@ export function toString(val: unknown): string {
   return val == null
     ? ''
     : isArray(val) || (isPlainObject(val) && val.toString === objectToString)
-    ? JSON.stringify(val, null, 2)
+      ? JSON.stringify(val, null, 2)
-    : String(val)
+      : String(val)
 }

packages/runtime-dom/src/directives/vModel.ts

@@ -35,7 +35,9 @@ function toNumber(val: string): number | string {
 
 // We are exporting the v-model runtime directly as vnode hooks so that it can
 // be tree-shaken in case v-model is never used.
-export const vModelText: ObjectDirective<HTMLInputElement | HTMLTextAreaElement> = {
+export const vModelText: ObjectDirective<
+  HTMLInputElement | HTMLTextAreaElement
+> = {
   beforeMount(el, { value, modifiers: { lazy, trim, number } }, vnode) {
     el.value = value
     const assign = getModelAssigner(vnode)

yarn.lock

@@ -5597,10 +5597,10 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prettier@^1.18.2:
+prettier@~1.14.0:
-  version "1.18.2"
+  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"
-  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
+  integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg==
 
 pretty-format@^24.9.0:
   version "24.9.0"