strtus/Vercel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into static

Browse Source
This commit is contained in:
Sam Becker 2024-03-13 19:31:16 -05:00
commit c683261756
6 changed files with 97 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -39,9 +39,9 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"nanoid": "^5.0.6",
"next": "14.2.0-canary.18",
"next": "14.2.0-canary.21",
"next-auth": "5.0.0-beta.13",
"next-themes": "^0.2.1",
"next-themes": "^0.3.0",
"postcss": "8.4.35",
"react": "18.2.0",
"react-dom": "18.2.0",

100
pnpm-lock.yaml generated
View File

@ -49,7 +49,7 @@ dependencies:
version: 7.2.0(eslint@8.57.0)(typescript@5.4.2)
'@vercel/analytics':
specifier: ^1.2.2
version: 1.2.2(next@14.2.0-canary.18)(react@18.2.0)
version: 1.2.2(next@14.2.0-canary.21)(react@18.2.0)
'@vercel/blob':
specifier: ^0.22.1
version: 0.22.1
@ -58,7 +58,7 @@ dependencies:
version: 0.7.2
'@vercel/speed-insights':
specifier: ^1.0.10
version: 1.0.10(next@14.2.0-canary.18)(react@18.2.0)
version: 1.0.10(next@14.2.0-canary.21)(react@18.2.0)
autoprefixer:
specifier: 10.4.18
version: 10.4.18(postcss@8.4.35)
@ -96,14 +96,14 @@ dependencies:
specifier: ^5.0.6
version: 5.0.6
next:
specifier: 14.2.0-canary.18
version: 14.2.0-canary.18(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0)
specifier: 14.2.0-canary.21
version: 14.2.0-canary.21(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0)
next-auth:
specifier: 5.0.0-beta.13
version: 5.0.0-beta.13(next@14.2.0-canary.18)(react@18.2.0)
version: 5.0.0-beta.13(next@14.2.0-canary.21)(react@18.2.0)
next-themes:
specifier: ^0.2.1
version: 0.2.1(next@14.2.0-canary.18)(react-dom@18.2.0)(react@18.2.0)
specifier: ^0.3.0
version: 0.3.0(react-dom@18.2.0)(react@18.2.0)
postcss:
specifier: 8.4.35
version: 8.4.35
@ -1551,8 +1551,8 @@ packages:
- utf-8-validate
dev: false
/@next/env@14.2.0-canary.18:
resolution: {integrity: sha512-43D/fo0QrVzBcAzI4bRXM6iOfQ4+4y8l7FU6XYoSu/BVc2bD4QwR7j1nRCU9c1Kv2Y0PWU/4kN/7yINH6YMj5Q==}
/@next/env@14.2.0-canary.21:
resolution: {integrity: sha512-J1iLIGns8PUIwTD9EKm3sMWj3tvut872q/LlG80nUM97Pm3nxXGEtBaF102F1bPtaKnEQXSj5OW2WEGjm7Ol6Q==}
dev: false
/@next/eslint-plugin-next@14.1.3:
@ -1561,8 +1561,8 @@ packages:
glob: 10.3.10
dev: false
/@next/swc-darwin-arm64@14.2.0-canary.18:
resolution: {integrity: sha512-qlS1egS1ADnO9tTGAWp9+V1DQlAUiRJ3izoeIzx/AYP0nkVABz83CeVd+kNdcov/9cnYUTfFvO3zId2cwci34g==}
/@next/swc-darwin-arm64@14.2.0-canary.21:
resolution: {integrity: sha512-XU0gVw9TReqFep1C6qPW7+ezcHvyAHd8YfEvGnMo6jzRQgYL3Opf02g48AUV1+mlKN43UiHn9VbFRCwBQqIpig==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [darwin]
@ -1570,8 +1570,8 @@ packages:
dev: false
optional: true
/@next/swc-darwin-x64@14.2.0-canary.18:
resolution: {integrity: sha512-Dc91Dd+eG6VdwlJV2FuIkyXqr0vVpRdkELowc0Tk+L91UUNTn+wdEtxaxJu9+bthtUaMUmB76F5m2ywUSfsUMA==}
/@next/swc-darwin-x64@14.2.0-canary.21:
resolution: {integrity: sha512-FXSyOIP+xmlb42rnOUoDO8cktKE+mFSpWGG2nxjZwPlnRFC9kVhw2b1Djt1gXhu524ts/bYnfPWvNbNfuNU8bg==}
engines: {node: '>= 10'}
cpu: [x64]
os: [darwin]
@ -1579,8 +1579,8 @@ packages:
dev: false
optional: true
/@next/swc-linux-arm64-gnu@14.2.0-canary.18:
resolution: {integrity: sha512-QRsypnnw6c16YAI8t6O3jFo6jPGFle5WosRk8SnBz7n3JHwvsUJBxeH2/kzEZkg0bJyCKJr6JW9sBVZJAFVfzw==}
/@next/swc-linux-arm64-gnu@14.2.0-canary.21:
resolution: {integrity: sha512-fGJxv3g7PlkkAlHP5ahDsQQKGRxggtZfPXuqtPDF3BNPm9Z6e4clyUyeOCD8HUlaB+3yg5mWt9lvR1t82BeqSA==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
@ -1588,8 +1588,8 @@ packages:
dev: false
optional: true
/@next/swc-linux-arm64-musl@14.2.0-canary.18:
resolution: {integrity: sha512-SnHPs7zf/Mf8vC3hI5gdMmr0CpgtYV5A77XkOceTCSByRyiOJ6t+5Ri3TpZIyKWhEH/k6ixO/T9L3KOeWVkDog==}
/@next/swc-linux-arm64-musl@14.2.0-canary.21:
resolution: {integrity: sha512-5N+wkZi7DTNrnw9dm9CME3DYGvARp8qOvUwUd4Jg4yZmYNUK2GjtKx5oGCzPe82HqXyZPWDeTaCi8rCEDrO45w==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
@ -1597,8 +1597,8 @@ packages:
dev: false
optional: true
/@next/swc-linux-x64-gnu@14.2.0-canary.18:
resolution: {integrity: sha512-hWtpuvQkCOrGIv+72ythGDzhKtcymfl5629X7P1pd5blpA0nO8yg6B6U+T3dqwLIGtkzUv033FXOki08CbkSjw==}
/@next/swc-linux-x64-gnu@14.2.0-canary.21:
resolution: {integrity: sha512-gmE/b9WCV5CTtBYygo5TPnBRyGO7jpF+FTHHiTT4IcQD4KenHS7EuEpRKsh+ILZV8LpCCHSiUXKJLjz78OP5Sw==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
@ -1606,8 +1606,8 @@ packages:
dev: false
optional: true
/@next/swc-linux-x64-musl@14.2.0-canary.18:
resolution: {integrity: sha512-6uY/CWQjtNln2OgYP5C0YUQd0eKTnPG8DIDyTE4ufvxJGCGJy54PFpsDkAe5IXEtI/+lPuy66YhnK5hoH+Uztg==}
/@next/swc-linux-x64-musl@14.2.0-canary.21:
resolution: {integrity: sha512-bZtw5eCh00sRyVyKNjofrx6Gyi0xklGUbdvGykQgbh26IiUwNZCXS5wrR5kSF1kMfRZhTdPTIXrEU4aolxdKUw==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
@ -1615,8 +1615,8 @@ packages:
dev: false
optional: true
/@next/swc-win32-arm64-msvc@14.2.0-canary.18:
resolution: {integrity: sha512-rQql3CxCfadEIk3tYD9hsSfJdKO0+DGn3sNDQ4plE0689FHXGjG4ittYSHrV1no0W3II8+YBZxCbuutdE4xtrg==}
/@next/swc-win32-arm64-msvc@14.2.0-canary.21:
resolution: {integrity: sha512-bfPh6G3WYsSWeG0IhA7Kh9XWjMxfmvvd9wkK0YHyl7c2iAZsvY6m9kWNlpMUFpXZRNiagDJNc2Zz5a+lpTMBHg==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [win32]
@ -1624,8 +1624,8 @@ packages:
dev: false
optional: true
/@next/swc-win32-ia32-msvc@14.2.0-canary.18:
resolution: {integrity: sha512-gXypz+UiqXERgpLMuWL6ezY4Izu2ot/SqrzAWBhaWDlgmpWGkBlnAISiAf0S0L6fhYqaC+YLTXjikcLZzgPkfg==}
/@next/swc-win32-ia32-msvc@14.2.0-canary.21:
resolution: {integrity: sha512-nApW0yh16ye/ggHsX6TqYN5PWexsjjJm/EiCHU+7gq+TeVFH274a+uQOUDHJ31H3sthaC6bvnLrTkdZt6/12cA==}
engines: {node: '>= 10'}
cpu: [ia32]
os: [win32]
@ -1633,8 +1633,8 @@ packages:
dev: false
optional: true
/@next/swc-win32-x64-msvc@14.2.0-canary.18:
resolution: {integrity: sha512-+jtEH4Ptr1cfskFsKjwxE9wNihrZv8TujJR1NOYK2eB/yP9D28Ag165H8669ddby6oBIA9JUKcT7n+wpIKf4LA==}
/@next/swc-win32-x64-msvc@14.2.0-canary.21:
resolution: {integrity: sha512-anyhM5mDXz4xMN5qo/naoaGsSPBFiT+3M8jZmY0bPcp251dehNoum6uiGLAShEiF1yFa6m1IzkkOI+3GY5q1DA==}
engines: {node: '>= 10'}
cpu: [x64]
os: [win32]
@ -3088,7 +3088,7 @@ packages:
resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
dev: false
/@vercel/analytics@1.2.2(next@14.2.0-canary.18)(react@18.2.0):
/@vercel/analytics@1.2.2(next@14.2.0-canary.21)(react@18.2.0):
resolution: {integrity: sha512-X0rctVWkQV1e5Y300ehVNqpOfSOufo7ieA5PIdna8yX/U7Vjz0GFsGf4qvAhxV02uQ2CVt7GYcrFfddXXK2Y4A==}
peerDependencies:
next: '>= 13'
@ -3099,7 +3099,7 @@ packages:
react:
optional: true
dependencies:
next: 14.2.0-canary.18(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0)
next: 14.2.0-canary.21(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0)
react: 18.2.0
server-only: 0.0.1
dev: false
@ -3124,7 +3124,7 @@ packages:
ws: 8.14.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)
dev: false
/@vercel/speed-insights@1.0.10(next@14.2.0-canary.18)(react@18.2.0):
/@vercel/speed-insights@1.0.10(next@14.2.0-canary.21)(react@18.2.0):
resolution: {integrity: sha512-4uzdKB0RW6Ff2FkzshzjZ+RlJfLPxgm/00i0XXgxfMPhwnnsk92YgtqsxT9OcPLdJUyVU1DqFlSWWjIQMPkh0g==}
requiresBuild: true
peerDependencies:
@ -3148,7 +3148,7 @@ packages:
vue-router:
optional: true
dependencies:
next: 14.2.0-canary.18(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0)
next: 14.2.0-canary.21(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0)
react: 18.2.0
dev: false
@ -6057,7 +6057,7 @@ packages:
resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
dev: false
/next-auth@5.0.0-beta.13(next@14.2.0-canary.18)(react@18.2.0):
/next-auth@5.0.0-beta.13(next@14.2.0-canary.21)(react@18.2.0):
resolution: {integrity: sha512-2m2Gq69WQ0YXcHCCpHn2y5z1bxSlqD/XOuAgrdtz49/VIAdTFFeYZz97RYqf6xMF8VGmoG32VUnJ6LzaHk6Fwg==}
peerDependencies:
'@simplewebauthn/browser': ^9.0.1
@ -6074,24 +6074,22 @@ packages:
optional: true
dependencies:
'@auth/core': 0.27.0
next: 14.2.0-canary.18(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0)
next: 14.2.0-canary.21(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0)
react: 18.2.0
dev: false
/next-themes@0.2.1(next@14.2.0-canary.18)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-B+AKNfYNIzh0vqQQKqQItTS8evEouKD7H5Hj3kmuPERwddR2TxvDSFZuTj6T7Jfn1oyeUyJMydPl1Bkxkh0W7A==}
/next-themes@0.3.0(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-/QHIrsYpd6Kfk7xakK4svpDI5mmXP0gfvCoJdGpZQ2TOrQZmsW0QxjaiLn8wbIKjtm4BTSqLoix4lxYYOnLJ/w==}
peerDependencies:
next: '*'
react: '*'
react-dom: '*'
react: ^16.8 || ^17 || ^18
react-dom: ^16.8 || ^17 || ^18
dependencies:
next: 14.2.0-canary.18(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0)
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
dev: false
/next@14.2.0-canary.18(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-Tsy1KgyfSazDUlZ39mrcWOPKs3FfCjq2tC4eLJ5MlsccB9tVM4/KRjLdzgAlBz/I6NKsrp1U3A2Q6DxnRLA+PQ==}
/next@14.2.0-canary.21(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-8EjhlMmgnXCD+AzgwuomJBREzj5Kj3ZGuDSGgQuVNAoat+OIUDn/0lmX5yEacUJjiDstV4DopvwjTP8Jgm7l6A==}
engines: {node: '>=18.17.0'}
hasBin: true
peerDependencies:
@ -6105,7 +6103,7 @@ packages:
sass:
optional: true
dependencies:
'@next/env': 14.2.0-canary.18
'@next/env': 14.2.0-canary.21
'@swc/helpers': 0.5.5
busboy: 1.6.0
caniuse-lite: 1.0.30001591
@ -6115,15 +6113,15 @@ packages:
react-dom: 18.2.0(react@18.2.0)
styled-jsx: 5.1.1(@babel/core@7.23.9)(react@18.2.0)
optionalDependencies:
'@next/swc-darwin-arm64': 14.2.0-canary.18
'@next/swc-darwin-x64': 14.2.0-canary.18
'@next/swc-linux-arm64-gnu': 14.2.0-canary.18
'@next/swc-linux-arm64-musl': 14.2.0-canary.18
'@next/swc-linux-x64-gnu': 14.2.0-canary.18
'@next/swc-linux-x64-musl': 14.2.0-canary.18
'@next/swc-win32-arm64-msvc': 14.2.0-canary.18
'@next/swc-win32-ia32-msvc': 14.2.0-canary.18
'@next/swc-win32-x64-msvc': 14.2.0-canary.18
'@next/swc-darwin-arm64': 14.2.0-canary.21
'@next/swc-darwin-x64': 14.2.0-canary.21
'@next/swc-linux-arm64-gnu': 14.2.0-canary.21
'@next/swc-linux-arm64-musl': 14.2.0-canary.21
'@next/swc-linux-x64-gnu': 14.2.0-canary.21
'@next/swc-linux-x64-musl': 14.2.0-canary.21
'@next/swc-win32-arm64-msvc': 14.2.0-canary.21
'@next/swc-win32-ia32-msvc': 14.2.0-canary.21
'@next/swc-win32-x64-msvc': 14.2.0-canary.21
transitivePeerDependencies:
- '@babel/core'
- babel-plugin-macros

7
src/app/layout.tsx
View File

@ -4,7 +4,6 @@ import { clsx } from 'clsx/lite';
import { IBM_Plex_Mono } from 'next/font/google';
import { BASE_URL, SITE_DESCRIPTION, SITE_TITLE } from '@/site/config';
import AppStateProvider from '@/state/AppStateProvider';
import ThemeProviderClient from '@/site/ThemeProviderClient';
import Nav from '@/site/Nav';
import ToasterWithThemes from '@/toast/ToasterWithThemes';
import PhotoEscapeHandler from '@/photo/PhotoEscapeHandler';
@ -16,8 +15,10 @@ import { Metadata } from 'next/types';
import MoreComponentsProvider from '@/state/MoreComponentsProvider';
import CommandK from '@/site/CommandK';
import CommandKClient from '@/components/CommandKClient';
import { ThemeProvider } from 'next-themes';
import '../site/globals.css';
import '../site/sonner.css';
const ibmPlexMono = IBM_Plex_Mono({
subsets: ['latin'],
@ -77,7 +78,7 @@ export default function RootLayout({
<body className={ibmPlexMono.variable}>
<AppStateProvider>
<MoreComponentsProvider>
<ThemeProviderClient>
<ThemeProvider attribute="class">
<main className={clsx(
'mx-3 mb-3',
'lg:mx-6 lg:mb-6',
@ -98,7 +99,7 @@ export default function RootLayout({
<Suspense fallback={<CommandKClient />}>
<CommandK />
</Suspense>
</ThemeProviderClient>
</ThemeProvider>
</MoreComponentsProvider>
<Analytics debug={false} />
<SpeedInsights debug={false} />

15
src/site/ThemeProviderClient.tsx
View File

@ -1,15 +0,0 @@
'use client';
import { ThemeProvider } from 'next-themes';
export default function ThemeProviderClient({
children,
}: {
children: React.ReactNode
}) {
return (
<ThemeProvider attribute="class">
{children}
</ThemeProvider>
);
}

35
src/site/sonner.css Normal file
View File

@ -0,0 +1,35 @@
/* Align toasts to site breakpoints + margins */
@media (max-width: 639px) {
[data-sonner-toaster] {
position: fixed;
--mobile-offset: 12px !important;
right: var(--mobile-offset);
left: var(--mobile-offset);
width: 100% !important;
}
[data-sonner-toaster] [data-sonner-toast] {
left: 0;
right: 0;
width: calc(100% - var(--mobile-offset) * 2) !important;
}
[data-sonner-toaster][data-x-position='left'] {
left: var(--mobile-offset);
}
[data-sonner-toaster][data-y-position='bottom'] {
bottom: 20px !important;
}
[data-sonner-toaster][data-y-position='top'] {
top: 20px;
}
[data-sonner-toaster][data-x-position='center'] {
left: var(--mobile-offset);
right: var(--mobile-offset);
transform: none;
}
}

11
src/toast/ToasterWithThemes.tsx
View File

@ -10,12 +10,15 @@ export default function ToasterWithThemes() {
<Toaster
theme={theme as 'system' | 'light' | 'dark'}
toastOptions={{
unstyled: true,
classNames: {
toast: clsx(
'font-mono font-normal',
'!text-gray-900 dark:!text-gray-100',
'!bg-white dark:!bg-black',
'!border-gray-200 dark:!border-gray-800',
'flex items-center gap-x-1.5 p-4 w-full',
'font-mono text-sm',
'bg-white dark:bg-black',
'text-gray-900 dark:text-gray-100',
'border border-gray-200 dark:border-gray-800',
'rounded-lg',
),
},
}}