Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@
"start": "next start",
"lint": "next lint",
"pull": "vercel env pull .env.local",
"sanity:typegen": "pnpx sanity@latest schema extract --path=src/sanity/schema.json && pnpx sanity@latest typegen generate --config-path=src/sanity/sanity-typegen.json"
"sanity:typegen": "pnpx sanity@latest schema extract --path=src/sanity/schema.json --force && pnpx sanity@latest typegen generate --config-path=src/sanity/sanity-typegen.json"
},
"dependencies": {
"@sanity/asset-utils": "^2.3.0",
"@sanity/client": "^7.22.0",
"@sanity/icons": "^3.7.4",
"@sanity/image-url": "^1.2.0",
"@sanity/image-url": "^2.1.1",
"@sanity/vision": "^3.99.0",
"@sentry/nextjs": "^8.55.2",
"@vercel/analytics": "^1.6.1",
"@vercel/analytics": "^2.0.1",
"flags": "^4.0.0",
"@vercel/speed-insights": "^1.3.1",
"@vercel/speed-insights": "^2.0.0",
"@vercel/toolbar": "^0.2.0",
"clsx": "^2.1.1",
"dayjs": "^1.11.20",
"import-in-the-middle": "^1.15.0",
"import-in-the-middle": "^3.3.2",
"next": "15.5.19",
"next-sanity": "^9.12.3",
"react": "19.2.7",
"react-cookie": "^7.2.2",
"react-cookie": "^8.1.2",
"react-dom": "19.2.7",
"react-icons": "^5.6.0",
"require-in-the-middle": "^7.5.2",
Expand All @@ -43,10 +43,14 @@
"@types/react-dom": "^19.2.3",
"eslint": "^9.39.4",
"eslint-config-next": "15.5.19",
"@tailwindcss/postcss": "^4.3.3",
"postcss": "^8.5.14",
"tailwindcss": "^3.4.19",
"tailwindcss": "^4.3.3",
"typescript": "^5.9.3"
},
"engines": {
"node": "24.x"
},
"packageManager": "pnpm@9.15.9",
"pnpm": {
"pnpm": {
Expand Down
1,914 changes: 1,063 additions & 851 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion postcss.config.mjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @type {import('postcss-load-config').Config} */
const config = {
plugins: {
tailwindcss: {},
'@tailwindcss/postcss': {},
},
};

Expand Down
16 changes: 16 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,29 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended"],
"schedule": ["before 9am on Monday"],
"dependencyDashboard": true,
"platformAutomerge": true,
"lockFileMaintenance": {
"enabled": true,
"automerge": true
},
"packageRules": [
{
"matchUpdateTypes": ["minor", "patch"],
"groupName": "all non-major dependencies",
"automerge": true,
"automergeType": "pr",
"automergeStrategy": "squash"
},
{
"matchUpdateTypes": ["pin", "pinDigest", "digest"],
"automerge": true,
"automergeType": "pr",
"automergeStrategy": "squash"
},
{
"matchUpdateTypes": ["major"],
"automerge": false
}
]
}
2 changes: 1 addition & 1 deletion src/app/[theme]/Project.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ function ProjectImage({
function ProjectLink({ title, href }: { title: string; href: string }) {
return (
<a
className="hover:underline pl-2 leading-[1.75rem] first:pl-0 text-nowrap"
className="hover:underline pr-2 leading-[1.75rem] last:pr-0 text-nowrap"
href={href}
target="_blank"
>
Expand Down
2 changes: 1 addition & 1 deletion src/app/[theme]/Providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export function Providers({ children }: { children: React.ReactNode }) {
defaultSetOptions={{
maxAge: /* 1 year */ 1000 * 365 * 60 * 60 * 24,
path: '/',
sameSite: 'strict',
sameSite: 'lax',
secure: process.env.NEXT_PUBLIC_ENV !== 'development',
}}
>
Expand Down
15 changes: 8 additions & 7 deletions src/app/globals.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import 'tailwindcss';
@config '../../tailwind.config.ts';

:root {
--background: #ffffff;
Expand All @@ -14,8 +13,10 @@
}
}

body {
color: var(--foreground);
background: var(--background);
font-family: Arial, Helvetica, sans-serif;
@layer base {
body {
color: var(--foreground);
background: var(--background);
font-family: Arial, Helvetica, sans-serif;
}
}
22 changes: 13 additions & 9 deletions src/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,24 @@ export function middleware(request: NextRequest) {
).toString(),
)

// Keep these attributes in sync with the client CookiesProvider
// (src/app/[theme]/Providers.tsx) so the server and client never write the
// same cookie with drifting attributes.
const cookieOptions = {
maxAge: /* 1 year */ 365 * 60 * 60 * 24,
path: '/',
sameSite: 'lax' as const,
secure: process.env.NEXT_PUBLIC_ENV !== 'development',
}

if (storedTheme) {
response.cookies.set(THEME_COOKIE_NAME, storedTheme, {
maxAge: /* 1 year */ 1000 * 365 * 60 * 60 * 24,
})
response.cookies.set(THEME_COOKIE_NAME, storedTheme, cookieOptions)
}

response.cookies.set(ANONYMOUS_ID_COOKIE_NAME, ajsAnonymousId, {
maxAge: /* 1 year */ 1000 * 365 * 60 * 60 * 24,
})
response.cookies.set(ANONYMOUS_ID_COOKIE_NAME, ajsAnonymousId, cookieOptions)

if (overrideParam) {
response.cookies.set(OVERRIDE_COOKIE_NAME, overrideParam, {
maxAge: /* 1 year */ 1000 * 365 * 60 * 60 * 24,
})
response.cookies.set(OVERRIDE_COOKIE_NAME, overrideParam, cookieOptions)
}

response.headers.set('Accept-CH', 'Sec-CH-Prefers-Color-Scheme')
Expand Down
3 changes: 1 addition & 2 deletions src/sanity/lib/image.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import createImageUrlBuilder from '@sanity/image-url'
import { SanityImageSource } from '@sanity/image-url/lib/types/types'
import createImageUrlBuilder, { SanityImageSource } from '@sanity/image-url'

import { dataset, projectId } from '../env'

Expand Down