From 1cb49cacaee6b7b8cb8ee5da48672a5d59ffb27d Mon Sep 17 00:00:00 2001
From: sriram veeraghanta <veeraghanta.sriram@gmail.com>
Date: Thu, 10 Jul 2025 15:26:43 +0530
Subject: [PATCH 1/2] fix: packages dev command failing due to missing
 dependency mapping (#7381)

* fix: packages dev command failing due to missing dependency mapping

* fix: typescript version to match with other packages
---
 packages/logger/package.json | 1 +
 packages/types/package.json  | 3 ++-
 packages/ui/package.json     | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/logger/package.json b/packages/logger/package.json
index 05715d2dea..82666bb5a1 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -30,6 +30,7 @@
     "@plane/eslint-config": "*",
     "@plane/typescript-config": "*",
     "@types/node": "^22.5.4",
+    "tsup": "8.4.0",
     "typescript": "5.8.3"
   }
 }
diff --git a/packages/types/package.json b/packages/types/package.json
index 0c6b0185d7..6965ddf66d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -30,6 +30,7 @@
   "devDependencies": {
     "@plane/eslint-config": "*",
     "@plane/typescript-config": "*",
-    "tsup": "8.4.0"
+    "tsup": "8.4.0",
+    "typescript": "5.8.3"
   }
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
index df13b6dc99..39fd039cc7 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -12,8 +12,8 @@
     "dist/**"
   ],
   "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs --dts --external react --minify",
-    "dev": "tsup src/index.ts --format esm,cjs --watch --dts --external react",
+    "build": "tsup --minify",
+    "dev": "tsup --watch",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build",
     "postcss": "postcss styles/globals.css -o styles/output.css --watch",
@@ -34,6 +34,7 @@
     "@blueprintjs/core": "^4.16.3",
     "@blueprintjs/popover2": "^1.13.3",
     "@headlessui/react": "^1.7.3",
+    "@plane/constants": "*",
     "@plane/hooks": "*",
     "@plane/utils": "*",
     "@popperjs/core": "^2.11.8",

From 4d0a7e4658da89b943cfc0cdae3f20acc67b4c42 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Thu, 10 Jul 2025 15:35:13 +0530
Subject: [PATCH 2/2] [WEB-4470] fix: sidebar custom theme bg (#7379)

---
 .../[workspaceSlug]/(projects)/extended-sidebar-wrapper.tsx     | 2 +-
 apps/web/core/components/sidebar/resizable-sidebar.tsx          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/extended-sidebar-wrapper.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/extended-sidebar-wrapper.tsx
index 22d2b2c48a..bf5fdb4e20 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/extended-sidebar-wrapper.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/extended-sidebar-wrapper.tsx
@@ -29,7 +29,7 @@ export const ExtendedSidebarWrapper: FC<Props> = observer((props) => {
       id={excludedElementId}
       ref={extendedSidebarRef}
       className={cn(
-        `absolute h-full z-[19] flex flex-col py-2 transform transition-all duration-300 ease-in-out bg-custom-background-100 border-r border-custom-sidebar-border-200 p-4 shadow-sm`,
+        `absolute h-full z-[19] flex flex-col py-2 transform transition-all duration-300 ease-in-out bg-custom-sidebar-background-100 border-r border-custom-sidebar-border-200 p-4 shadow-sm`,
         {
           "translate-x-0 opacity-100": isExtendedSidebarOpened,
           [`-translate-x-[${EXTENDED_SIDEBAR_WIDTH}px] opacity-0 hidden`]: !isExtendedSidebarOpened,
diff --git a/apps/web/core/components/sidebar/resizable-sidebar.tsx b/apps/web/core/components/sidebar/resizable-sidebar.tsx
index 9f0741297b..64ae3f56fd 100644
--- a/apps/web/core/components/sidebar/resizable-sidebar.tsx
+++ b/apps/web/core/components/sidebar/resizable-sidebar.tsx
@@ -257,7 +257,7 @@ export function ResizableSidebar({
       >
         <aside
           className={cn(
-            "group/sidebar h-full w-full bg-custom-background-100 overflow-hidden relative flex flex-col z-20 pt-4",
+            "group/sidebar h-full w-full bg-custom-sidebar-background-100 overflow-hidden relative flex flex-col z-20 pt-4",
             "self-center border-r border-custom-sidebar-border-200 rounded-md rounded-tl-none rounded-bl-none",
             isAnyExtendedSidebarExpanded && "rounded-none"
           )}