From 8710ac5acae6075d8062158cb735f4037c2139ae Mon Sep 17 00:00:00 2001
From: MohammedZuhairAhmed <mohammed.ahmed@contentstack.com>
Date: Wed, 23 Apr 2025 12:22:01 +0530
Subject: [PATCH 1/2] fix(collab): add optional chaining for tree shaking and
 fix unknown user issue

---
 src/index.ts                           |  3 ++-
 src/visualBuilder/utils/collabUtils.ts | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index d7226788..1dafad70 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -71,7 +71,8 @@ class LightLivePreviewHoC {
 }
 
 const ContentstackLivePreview =
-    process.env.PURGE_PREVIEW_SDK || process.env.REACT_APP_PURGE_PREVIEW_SDK
+    process?.env?.PURGE_PREVIEW_SDK === "true" ||
+    process?.env?.REACT_APP_PURGE_PREVIEW_SDK === "true"
         ? LightLivePreviewHoC
         : ContentstackLivePreviewHOC;
 
diff --git a/src/visualBuilder/utils/collabUtils.ts b/src/visualBuilder/utils/collabUtils.ts
index a3e5147a..1664dd06 100644
--- a/src/visualBuilder/utils/collabUtils.ts
+++ b/src/visualBuilder/utils/collabUtils.ts
@@ -90,13 +90,17 @@ export const getMessageWithDisplayName = (
 
     let tempText = sanitizeData(comment.message).replace(/<[^>]*>/g, "");
 
-    comment?.toUsers?.forEach((user) => {
+    comment.toUsers?.forEach((user) => {
         const userPattern = new RegExp(`{{${user}}}`, "g");
         const userData = userState.userMap[user];
+        const displayName = userData
+            ? userData.display || getUserName(userData)
+            : `unknown user`;
+
         const replacement =
             profile === "html"
-                ? `<b class="collab-thread-comment--message">@${userData.display || getUserName(userData)}</b>`
-                : `@${userData.display || getUserName(userData)}`;
+                ? `<b class="collab-thread-comment--message">@${displayName}</b>`
+                : `@${displayName}`;
         tempText = tempText.replace(userPattern, replacement);
     });
 

From 26e63f91bba6bbb3e86423cb253c2527fdc8d102 Mon Sep 17 00:00:00 2001
From: Faraaz Biyabani <faraaz.biyabani@contentstack.com>
Date: Wed, 23 Apr 2025 12:52:51 +0530
Subject: [PATCH 2/2] fix: ensure process is defined

---
 src/index.ts         | 5 +++--
 src/logger/logger.ts | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 1dafad70..36b903f5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -71,8 +71,9 @@ class LightLivePreviewHoC {
 }
 
 const ContentstackLivePreview =
-    process?.env?.PURGE_PREVIEW_SDK === "true" ||
-    process?.env?.REACT_APP_PURGE_PREVIEW_SDK === "true"
+    typeof process !== "undefined" &&
+    (process?.env?.PURGE_PREVIEW_SDK === "true" ||
+        process?.env?.REACT_APP_PURGE_PREVIEW_SDK === "true")
         ? LightLivePreviewHoC
         : ContentstackLivePreviewHOC;
 
diff --git a/src/logger/logger.ts b/src/logger/logger.ts
index 66f810c2..fad32d8b 100644
--- a/src/logger/logger.ts
+++ b/src/logger/logger.ts
@@ -8,7 +8,10 @@ export class PublicLogger {
             | Console["info"],
         message: any[]
     ): void {
-        if (process?.env?.NODE_ENV !== "test") {
+        if (
+            typeof process !== "undefined" &&
+            process?.env?.NODE_ENV !== "test"
+        ) {
             logCallback("Live_Preview_SDK:", ...message);
         }
     }