From a7e94c049f3215d894dfc634dcbe20b263ce3406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= Date: Fri, 29 Jul 2022 13:30:19 +0800 Subject: [PATCH 1/4] fix(reactivity): markRaw typing --- packages/reactivity/src/reactive.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/reactivity/src/reactive.ts b/packages/reactivity/src/reactive.ts index 1a947499710..83e1c7abee1 100644 --- a/packages/reactivity/src/reactive.ts +++ b/packages/reactivity/src/reactive.ts @@ -241,9 +241,9 @@ export function toRaw(observed: T): T { return raw ? toRaw(raw) : observed } -export function markRaw( - value: T -): T & { [RawSymbol]?: true } { +export type Raw = T & { [RawSymbol]?: true } + +export function markRaw(value: T): Raw { def(value, ReactiveFlags.SKIP, true) return value } From d786600981403bd06b7a9dc0086cc4c10c9a2cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= Date: Fri, 29 Jul 2022 13:37:57 +0800 Subject: [PATCH 2/4] fix: export --- packages/reactivity/src/index.ts | 1 + packages/runtime-core/src/index.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/reactivity/src/index.ts b/packages/reactivity/src/index.ts index a7a03b8c573..5c65cd52ae2 100644 --- a/packages/reactivity/src/index.ts +++ b/packages/reactivity/src/index.ts @@ -28,6 +28,7 @@ export { shallowReadonly, markRaw, toRaw, + Raw, ReactiveFlags, DeepReadonly, ShallowReactive, diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts index 735bea7d1e4..2b9bde82c44 100644 --- a/packages/runtime-core/src/index.ts +++ b/packages/runtime-core/src/index.ts @@ -172,7 +172,8 @@ export { DebuggerEvent, DebuggerEventExtraInfo, TrackOpTypes, - TriggerOpTypes + TriggerOpTypes, + Raw } from '@vue/reactivity' export { WatchEffect, From 05caeb8d3f4b11eada7fb49ba155909f59c15c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= Date: Mon, 3 Oct 2022 16:14:45 +0800 Subject: [PATCH 3/4] refactor: rename --- packages/reactivity/src/index.ts | 2 +- packages/reactivity/src/reactive.ts | 4 ++-- packages/runtime-core/src/index.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/reactivity/src/index.ts b/packages/reactivity/src/index.ts index 5c65cd52ae2..b90b3f383e5 100644 --- a/packages/reactivity/src/index.ts +++ b/packages/reactivity/src/index.ts @@ -28,7 +28,7 @@ export { shallowReadonly, markRaw, toRaw, - Raw, + MarkRaw, ReactiveFlags, DeepReadonly, ShallowReactive, diff --git a/packages/reactivity/src/reactive.ts b/packages/reactivity/src/reactive.ts index 83e1c7abee1..25806f84456 100644 --- a/packages/reactivity/src/reactive.ts +++ b/packages/reactivity/src/reactive.ts @@ -241,9 +241,9 @@ export function toRaw(observed: T): T { return raw ? toRaw(raw) : observed } -export type Raw = T & { [RawSymbol]?: true } +export type MarkRaw = T & { [RawSymbol]?: true } -export function markRaw(value: T): Raw { +export function markRaw(value: T): MarkRaw { def(value, ReactiveFlags.SKIP, true) return value } diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts index 2b9bde82c44..2bb34e6c344 100644 --- a/packages/runtime-core/src/index.ts +++ b/packages/runtime-core/src/index.ts @@ -173,7 +173,7 @@ export { DebuggerEventExtraInfo, TrackOpTypes, TriggerOpTypes, - Raw + MarkRaw } from '@vue/reactivity' export { WatchEffect, From f6ba5eab5318dc9859a5a67d553c62d22434364d Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 8 Nov 2022 10:00:44 +0800 Subject: [PATCH 4/4] refactor: MarkRaw -> Raw --- packages/reactivity/src/index.ts | 2 +- packages/reactivity/src/reactive.ts | 4 ++-- packages/runtime-core/src/index.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/reactivity/src/index.ts b/packages/reactivity/src/index.ts index b90b3f383e5..5c65cd52ae2 100644 --- a/packages/reactivity/src/index.ts +++ b/packages/reactivity/src/index.ts @@ -28,7 +28,7 @@ export { shallowReadonly, markRaw, toRaw, - MarkRaw, + Raw, ReactiveFlags, DeepReadonly, ShallowReactive, diff --git a/packages/reactivity/src/reactive.ts b/packages/reactivity/src/reactive.ts index 25806f84456..83e1c7abee1 100644 --- a/packages/reactivity/src/reactive.ts +++ b/packages/reactivity/src/reactive.ts @@ -241,9 +241,9 @@ export function toRaw(observed: T): T { return raw ? toRaw(raw) : observed } -export type MarkRaw = T & { [RawSymbol]?: true } +export type Raw = T & { [RawSymbol]?: true } -export function markRaw(value: T): MarkRaw { +export function markRaw(value: T): Raw { def(value, ReactiveFlags.SKIP, true) return value } diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts index 2bb34e6c344..2b9bde82c44 100644 --- a/packages/runtime-core/src/index.ts +++ b/packages/runtime-core/src/index.ts @@ -173,7 +173,7 @@ export { DebuggerEventExtraInfo, TrackOpTypes, TriggerOpTypes, - MarkRaw + Raw } from '@vue/reactivity' export { WatchEffect,