From c4641a9de4264a0122815150e7829d636b0ed8ce Mon Sep 17 00:00:00 2001
From: chen fan <1490040662@qq.com>
Date: Thu, 31 Aug 2023 22:04:22 +0800
Subject: [PATCH 1/3] chore: improve readonly/reactive warning message

---
 packages/reactivity/src/reactive.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/reactivity/src/reactive.ts b/packages/reactivity/src/reactive.ts
index 1881955cf1c..5482e93ac4f 100644
--- a/packages/reactivity/src/reactive.ts
+++ b/packages/reactivity/src/reactive.ts
@@ -254,7 +254,11 @@ function createReactiveObject(
 ) {
   if (!isObject(target)) {
     if (__DEV__) {
-      console.warn(`value cannot be made reactive: ${String(target)}`)
+      console.warn(
+        `value cannot be made ${isReadonly ? 'readonly' : 'reactive'}: ${String(
+          target
+        )}`
+      )
     }
     return target
   }

From c5c08c9ca3ffa468f2204bf2f556265414cf8dcc Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 27 May 2024 17:28:31 +0800
Subject: [PATCH 2/3] Update reactive.ts

---
 packages/reactivity/src/reactive.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/reactivity/src/reactive.ts b/packages/reactivity/src/reactive.ts
index eebe204bb5b..1a1ffe8dd82 100644
--- a/packages/reactivity/src/reactive.ts
+++ b/packages/reactivity/src/reactive.ts
@@ -248,15 +248,11 @@ function createReactiveObject(
 ) {
   if (!isObject(target)) {
     if (__DEV__) {
-<<<<<<< chore/hint
-      console.warn(
+      warn(
         `value cannot be made ${isReadonly ? 'readonly' : 'reactive'}: ${String(
           target
         )}`
       )
-=======
-      warn(`value cannot be made reactive: ${String(target)}`)
->>>>>>> main
     }
     return target
   }

From 42ba9202d76fd37d89bbaa6f120310bb15881775 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 09:29:15 +0000
Subject: [PATCH 3/3] [autofix.ci] apply automated fixes

---
 packages/reactivity/src/reactive.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/reactivity/src/reactive.ts b/packages/reactivity/src/reactive.ts
index 1a1ffe8dd82..a3e7ecc7b56 100644
--- a/packages/reactivity/src/reactive.ts
+++ b/packages/reactivity/src/reactive.ts
@@ -250,8 +250,8 @@ function createReactiveObject(
     if (__DEV__) {
       warn(
         `value cannot be made ${isReadonly ? 'readonly' : 'reactive'}: ${String(
-          target
-        )}`
+          target,
+        )}`,
       )
     }
     return target