From 01d2269bd0b4938e25a05542b29f7d94d1eaff81 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charlesBochet@users.noreply.github.com>
Date: Wed, 18 Feb 2026 23:34:36 +0100
Subject: [PATCH] Fix website build (#18061)

As per title
---
 packages/twenty-docker/twenty-website/Dockerfile     |  5 -----
 .../app/_components/contributors/PullRequestItem.tsx |  4 ++--
 .../src/app/emotion-root-style-registry.tsx          | 12 ++----------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/packages/twenty-docker/twenty-website/Dockerfile b/packages/twenty-docker/twenty-website/Dockerfile
index 1dbb0c804c..d006737e41 100644
--- a/packages/twenty-docker/twenty-website/Dockerfile
+++ b/packages/twenty-docker/twenty-website/Dockerfile
@@ -4,8 +4,6 @@ FROM node:24-alpine AS twenty-website-build
 WORKDIR /app
 
 COPY ./package.json .
-COPY ./nx.json .
-COPY ./tsconfig.base.json .
 COPY ./yarn.lock .
 COPY ./.yarnrc.yml .
 COPY ./.yarn/releases /app/.yarn/releases
@@ -22,11 +20,8 @@ ENV KEYSTATIC_GITHUB_CLIENT_SECRET="<fake build value>"
 ENV KEYSTATIC_SECRET="<fake build value>"
 ENV NEXT_PUBLIC_KEYSTATIC_GITHUB_APP_SLUG="<fake build value>"
 
-COPY ./packages/twenty-shared /app/packages/twenty-shared
 COPY ./packages/twenty-ui /app/packages/twenty-ui
 COPY ./packages/twenty-website /app/packages/twenty-website
-RUN npx nx build twenty-shared
-RUN npx nx build twenty-ui
 RUN npx nx build twenty-website
 
 FROM node:24-alpine AS twenty-website
diff --git a/packages/twenty-website/src/app/_components/contributors/PullRequestItem.tsx b/packages/twenty-website/src/app/_components/contributors/PullRequestItem.tsx
index 4088301342..a559180d0a 100644
--- a/packages/twenty-website/src/app/_components/contributors/PullRequestItem.tsx
+++ b/packages/twenty-website/src/app/_components/contributors/PullRequestItem.tsx
@@ -1,10 +1,10 @@
 import styled from '@emotion/styled';
 import { format } from 'date-fns';
+import { Tooltip } from 'react-tooltip';
 
 import { PullRequestIcon } from '@/app/_components/ui/icons/SvgIcons';
 import { Theme } from '@/app/_components/ui/theme/theme';
 import { formatIntoRelativeDate } from '@/shared-utils/formatIntoRelativeDate';
-import { AppTooltip } from 'twenty-ui/display';
 
 const Item = styled.div`
   display: flex;
@@ -95,7 +95,7 @@ export const PullRequestItem = ({
           <span id={`date-${prNumber}`}>
             {formatIntoRelativeDate(mergedAt ? mergedAt : createdAt)}
           </span>
-          <AppTooltip
+          <Tooltip
             anchorSelect={`#date-${prNumber}`}
             content={format(
               new Date(mergedAt ? mergedAt : createdAt),
diff --git a/packages/twenty-website/src/app/emotion-root-style-registry.tsx b/packages/twenty-website/src/app/emotion-root-style-registry.tsx
index bb3c24d1bc..44eab80b90 100644
--- a/packages/twenty-website/src/app/emotion-root-style-registry.tsx
+++ b/packages/twenty-website/src/app/emotion-root-style-registry.tsx
@@ -2,9 +2,8 @@
 
 import { useState } from 'react';
 import createCache from '@emotion/cache';
-import { CacheProvider, ThemeProvider } from '@emotion/react';
+import { CacheProvider } from '@emotion/react';
 import { useServerInsertedHTML } from 'next/navigation';
-import { THEME_LIGHT } from 'twenty-ui/theme';
 
 export default function RootStyleRegistry({
   children,
@@ -48,12 +47,5 @@ export default function RootStyleRegistry({
     );
   });
 
-  return (
-    <CacheProvider value={cache}>
-      <ThemeProvider theme={THEME_LIGHT}>
-        {/* Cast for ReactNode type compatibility between Next and Emotion's @types/react */}
-        {children as any}
-      </ThemeProvider>
-    </CacheProvider>
-  );
+  return <CacheProvider value={cache}>{children}</CacheProvider>;
 }