@@ -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
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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>;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user