Updated next. Fixed link RSC fetch.

This commit is contained in:
Mike Cao 2025-12-03 15:11:40 -08:00
parent 41d2a24f9d
commit 64767b1896
8 changed files with 1155 additions and 1148 deletions

View file

@ -1,5 +1,7 @@
ARG NODE_IMAGE_VERSION="22-alpine"
# Install dependencies only when needed # Install dependencies only when needed
FROM node:22-alpine AS deps FROM node:${NODE_IMAGE_VERSION} AS deps
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk add --no-cache libc6-compat RUN apk add --no-cache libc6-compat
WORKDIR /app WORKDIR /app
@ -8,7 +10,7 @@ RUN npm install -g pnpm
RUN pnpm install --frozen-lockfile RUN pnpm install --frozen-lockfile
# Rebuild the source code only when needed # Rebuild the source code only when needed
FROM node:22-alpine AS builder FROM node:${NODE_IMAGE_VERSION} AS builder
WORKDIR /app WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules COPY --from=deps /app/node_modules ./node_modules
COPY . . COPY . .
@ -25,9 +27,10 @@ ENV NEXT_TELEMETRY_DISABLED=1
RUN npm run build-docker RUN npm run build-docker
# Production image, copy all the files and run next # Production image, copy all the files and run next
FROM node:22-alpine AS runner FROM node:${NODE_IMAGE_VERSION} AS runner
WORKDIR /app WORKDIR /app
ARG PRISMA_VERSION="6.19.0"
ARG NODE_OPTIONS ARG NODE_OPTIONS
ENV NODE_ENV=production ENV NODE_ENV=production
@ -36,13 +39,14 @@ ENV NODE_OPTIONS=$NODE_OPTIONS
RUN addgroup --system --gid 1001 nodejs RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs RUN adduser --system --uid 1001 nextjs
RUN npm install -g pnpm
RUN set -x \ RUN set -x \
&& apk add --no-cache curl && apk add --no-cache curl \
&& npm install -g pnpm
# Script dependencies # Script dependencies
RUN pnpm --allow-build='@prisma/engines' add npm-run-all dotenv chalk semver prisma@6.18.0 @prisma/adapter-pg@6.18.0 RUN pnpm --allow-build='@prisma/engines' add npm-run-all dotenv chalk semver \
prisma@${PRISMA_VERSION} \
@prisma/adapter-pg@${PRISMA_VERSION}
COPY --from=builder --chown=nextjs:nodejs /app/public ./public COPY --from=builder --chown=nextjs:nodejs /app/public ./public
COPY --from=builder /app/prisma ./prisma COPY --from=builder /app/prisma ./prisma

View file

@ -72,7 +72,7 @@
"@prisma/extension-read-replicas": "^0.4.1", "@prisma/extension-read-replicas": "^0.4.1",
"@react-spring/web": "^10.0.3", "@react-spring/web": "^10.0.3",
"@svgr/cli": "^8.1.0", "@svgr/cli": "^8.1.0",
"@tanstack/react-query": "^5.90.5", "@tanstack/react-query": "^5.90.11",
"@umami/react-zen": "^0.211.0", "@umami/react-zen": "^0.211.0",
"@umami/redis-client": "^0.29.0", "@umami/redis-client": "^0.29.0",
"bcryptjs": "^3.0.2", "bcryptjs": "^3.0.2",
@ -92,7 +92,7 @@
"esbuild": "^0.25.11", "esbuild": "^0.25.11",
"fs-extra": "^11.3.2", "fs-extra": "^11.3.2",
"immer": "^10.2.0", "immer": "^10.2.0",
"ipaddr.js": "^2.0.1", "ipaddr.js": "^2.3.0",
"is-ci": "^3.0.1", "is-ci": "^3.0.1",
"is-docker": "^3.0.0", "is-docker": "^3.0.0",
"is-localhost-ip": "^2.0.0", "is-localhost-ip": "^2.0.0",
@ -102,15 +102,15 @@
"kafkajs": "^2.1.0", "kafkajs": "^2.1.0",
"lucide-react": "^0.543.0", "lucide-react": "^0.543.0",
"maxmind": "^5.0.0", "maxmind": "^5.0.0",
"next": "15.5.3", "next": "^15.5.7",
"node-fetch": "^3.2.8", "node-fetch": "^3.2.8",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"papaparse": "^5.5.3", "papaparse": "^5.5.3",
"pg": "^8.16.3", "pg": "^8.16.3",
"prisma": "^6.18.0", "prisma": "^6.18.0",
"pure-rand": "^7.0.1", "pure-rand": "^7.0.1",
"react": "^19.2.0", "react": "^19.2.1",
"react-dom": "^19.2.0", "react-dom": "^19.2.1",
"react-error-boundary": "^4.0.4", "react-error-boundary": "^4.0.4",
"react-intl": "^7.1.14", "react-intl": "^7.1.14",
"react-simple-maps": "^2.3.0", "react-simple-maps": "^2.3.0",
@ -122,13 +122,13 @@
"thenby": "^1.3.4", "thenby": "^1.3.4",
"ua-parser-js": "^2.0.6", "ua-parser-js": "^2.0.6",
"uuid": "^11.1.0", "uuid": "^11.1.0",
"zod": "^4.1.12", "zod": "^4.1.13",
"zustand": "^5.0.8" "zustand": "^5.0.9"
}, },
"devDependencies": { "devDependencies": {
"@biomejs/biome": "^2.3.6", "@biomejs/biome": "^2.3.8",
"@formatjs/cli": "^4.2.29", "@formatjs/cli": "^4.2.29",
"@netlify/plugin-nextjs": "^5.14.4", "@netlify/plugin-nextjs": "^5.15.1",
"@rollup/plugin-alias": "^5.0.0", "@rollup/plugin-alias": "^5.0.0",
"@rollup/plugin-commonjs": "^25.0.4", "@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-json": "^6.0.0", "@rollup/plugin-json": "^6.0.0",
@ -138,7 +138,7 @@
"@rollup/plugin-typescript": "^12.3.0", "@rollup/plugin-typescript": "^12.3.0",
"@types/jest": "^30.0.0", "@types/jest": "^30.0.0",
"@types/node": "^24.9.2", "@types/node": "^24.9.2",
"@types/react": "^19.2.2", "@types/react": "^19.2.7",
"@types/react-dom": "^19.2.2", "@types/react-dom": "^19.2.2",
"@types/react-window": "^1.8.8", "@types/react-window": "^1.8.8",
"babel-plugin-react-compiler": "19.1.0-rc.2", "babel-plugin-react-compiler": "19.1.0-rc.2",
@ -156,7 +156,7 @@
"rollup": "^4.52.5", "rollup": "^4.52.5",
"rollup-plugin-copy": "^3.4.0", "rollup-plugin-copy": "^3.4.0",
"rollup-plugin-delete": "^3.0.1", "rollup-plugin-delete": "^3.0.1",
"rollup-plugin-dts": "^6.2.3", "rollup-plugin-dts": "^6.3.0",
"rollup-plugin-node-externals": "^8.1.1", "rollup-plugin-node-externals": "^8.1.1",
"rollup-plugin-peer-deps-external": "^2.2.4", "rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-postcss": "^4.0.2", "rollup-plugin-postcss": "^4.0.2",
@ -165,7 +165,7 @@
"stylelint-config-prettier": "^9.0.3", "stylelint-config-prettier": "^9.0.3",
"stylelint-config-recommended": "^14.0.0", "stylelint-config-recommended": "^14.0.0",
"tar": "^6.1.2", "tar": "^6.1.2",
"ts-jest": "^29.4.5", "ts-jest": "^29.4.6",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"tsup": "^8.5.0", "tsup": "^8.5.0",
"tsx": "^4.19.0", "tsx": "^4.19.0",

2220
pnpm-lock.yaml generated

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
import { Icon, Text } from '@umami/react-zen'; import { IconLabel } from '@umami/react-zen';
import { LinkButton } from '@/components/common/LinkButton'; import { LinkButton } from '@/components/common/LinkButton';
import { PageHeader } from '@/components/common/PageHeader'; import { PageHeader } from '@/components/common/PageHeader';
import { useLink, useMessages, useSlug } from '@/components/hooks'; import { useLink, useMessages, useSlug } from '@/components/hooks';
@ -10,12 +10,9 @@ export function LinkHeader() {
const link = useLink(); const link = useLink();
return ( return (
<PageHeader title={link.name} description={link.url} icon={<Link />} marginBottom="3"> <PageHeader title={link.name} description={link.url} icon={<Link />}>
<LinkButton href={getSlugUrl(link.slug)} target="_blank" prefetch={false}> <LinkButton href={getSlugUrl(link.slug)} target="_blank" prefetch={false} asAnchor>
<Icon> <IconLabel icon={<ExternalLink />} label={formatMessage(labels.view)} />
<ExternalLink />
</Icon>
<Text>{formatMessage(labels.view)}</Text>
</LinkButton> </LinkButton>
</PageHeader> </PageHeader>
); );

View file

@ -1,4 +1,4 @@
import { Icon, Text } from '@umami/react-zen'; import { IconLabel } from '@umami/react-zen';
import { LinkButton } from '@/components/common/LinkButton'; import { LinkButton } from '@/components/common/LinkButton';
import { PageHeader } from '@/components/common/PageHeader'; import { PageHeader } from '@/components/common/PageHeader';
import { useMessages, usePixel, useSlug } from '@/components/hooks'; import { useMessages, usePixel, useSlug } from '@/components/hooks';
@ -10,12 +10,9 @@ export function PixelHeader() {
const pixel = usePixel(); const pixel = usePixel();
return ( return (
<PageHeader title={pixel.name} icon={<Grid2x2 />} marginBottom="3"> <PageHeader title={pixel.name} icon={<Grid2x2 />}>
<LinkButton href={getSlugUrl(pixel.slug)} target="_blank" prefetch={false}> <LinkButton href={getSlugUrl(pixel.slug)} target="_blank" prefetch={false} asAnchor>
<Icon> <IconLabel icon={<ExternalLink />} label={formatMessage(labels.view)} />
<ExternalLink />
</Icon>
<Text>{formatMessage(labels.view)}</Text>
</LinkButton> </LinkButton>
</PageHeader> </PageHeader>
); );

View file

@ -23,7 +23,6 @@ export function WebsiteHeader({ showActions }: { showActions?: boolean }) {
<PageHeader <PageHeader
title={website.name} title={website.name}
icon={<Favicon domain={website.domain} />} icon={<Favicon domain={website.domain} />}
marginBottom="3"
titleHref={renderUrl(`/websites/${website.id}`, false)} titleHref={renderUrl(`/websites/${website.id}`, false)}
> >
<Row alignItems="center" gap="6" wrap="wrap"> <Row alignItems="center" gap="6" wrap="wrap">

View file

@ -9,6 +9,7 @@ export interface LinkButtonProps extends ButtonProps {
scroll?: boolean; scroll?: boolean;
variant?: any; variant?: any;
prefetch?: boolean; prefetch?: boolean;
asAnchor?: boolean;
children?: ReactNode; children?: ReactNode;
} }
@ -19,15 +20,22 @@ export function LinkButton({
target, target,
prefetch, prefetch,
children, children,
asAnchor,
...props ...props
}: LinkButtonProps) { }: LinkButtonProps) {
const { dir } = useLocale(); const { dir } = useLocale();
return ( return (
<Button {...props} variant={variant} asChild> <Button {...props} variant={variant} asChild>
<Link href={href} dir={dir} scroll={scroll} target={target} prefetch={prefetch}> {asAnchor ? (
{children} <a href={href} target={target}>
</Link> {children}
</a>
) : (
<Link href={href} dir={dir} scroll={scroll} target={target} prefetch={prefetch}>
{children}
</Link>
)}
</Button> </Button>
); );
} }

View file

@ -50,7 +50,9 @@ export function PageHeader({
</Text> </Text>
)} )}
</Column> </Column>
<Row justifyContent="flex-end">{children}</Row> <Row justifyContent="flex-end" alignItems="center">
{children}
</Row>
</Grid> </Grid>
); );
} }