chore: revert prettier
This commit is contained in:
parent
b5886189ba
commit
af57ad110f
@ -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",
|
||||
|
@ -77,6 +77,4 @@ export type UnwrapRef<T> = {
|
||||
? 'array'
|
||||
: T extends Function | CollectionTypes
|
||||
? 'ref' // bail out on types that shouldn't be unwrapped
|
||||
: T extends object
|
||||
? 'object'
|
||||
: 'ref']
|
||||
: T extends object ? 'object' : 'ref']
|
||||
|
@ -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,7 +94,8 @@ function doWatch(
|
||||
let getter: () => any
|
||||
if (isArray(source)) {
|
||||
getter = () =>
|
||||
source.map(s =>
|
||||
source.map(
|
||||
s =>
|
||||
isRef(s)
|
||||
? s.value
|
||||
: callWithErrorHandling(s, instance, ErrorCodes.WATCH_GETTER)
|
||||
|
@ -56,9 +56,7 @@ type InferPropType<T> = T extends null
|
||||
? any // somehow `ObjectConstructor` when inferred from { (): T } becomes `any`
|
||||
: T extends ObjectConstructor | { type: ObjectConstructor }
|
||||
? { [key: string]: any }
|
||||
: T extends Prop<infer V>
|
||||
? V
|
||||
: T
|
||||
: T extends Prop<infer V> ? V : T
|
||||
|
||||
export type ExtractPropTypes<
|
||||
O,
|
||||
|
@ -1162,23 +1162,14 @@ export function createRenderer<
|
||||
) {
|
||||
// create reactive effect for rendering
|
||||
let mounted = false
|
||||
instance.update = effect(
|
||||
function componentEffect() {
|
||||
instance.update = effect(function componentEffect() {
|
||||
if (!mounted) {
|
||||
const subTree = (instance.subTree = renderComponentRoot(instance))
|
||||
// beforeMount hook
|
||||
if (instance.bm !== null) {
|
||||
invokeHooks(instance.bm)
|
||||
}
|
||||
patch(
|
||||
null,
|
||||
subTree,
|
||||
container,
|
||||
anchor,
|
||||
instance,
|
||||
parentSuspense,
|
||||
isSVG
|
||||
)
|
||||
patch(null, subTree, container, anchor, instance, parentSuspense, isSVG)
|
||||
initialVNode.el = subTree.el
|
||||
// mounted hook
|
||||
if (instance.m !== null) {
|
||||
@ -1236,9 +1227,7 @@ export function createRenderer<
|
||||
popWarningContext()
|
||||
}
|
||||
}
|
||||
},
|
||||
__DEV__ ? createDevEffectOptions(instance) : prodEffectOptions
|
||||
)
|
||||
}, __DEV__ ? createDevEffectOptions(instance) : prodEffectOptions)
|
||||
}
|
||||
|
||||
function updateComponentPreRender(
|
||||
|
@ -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)
|
||||
|
@ -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:
|
||||
version "1.18.2"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
|
||||
integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
|
||||
prettier@~1.14.0:
|
||||
version "1.14.3"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"
|
||||
integrity sha512-qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg==
|
||||
|
||||
pretty-format@^24.9.0:
|
||||
version "24.9.0"
|
||||
|
Loading…
Reference in New Issue
Block a user