Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/up next 15 react 19 #123

Merged
merged 4 commits into from
Dec 22, 2024
+1,190 −885
Merged

Feature/up next 15 react 19 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e804656
upgrade to next 15 and react 19
emiljohansson Dec 22, 2024
4768e91
disable oauth-app
emiljohansson Dec 22, 2024
ee45103
upgrade @radix-ui/react-slider to the latest version
emiljohansson Dec 22, 2024
fa32442
upgrade all radix packages
emiljohansson Dec 22, 2024
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
2 changes: 1 addition & 1 deletion apps/code-not-found/next-env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
6 changes: 3 additions & 3 deletions apps/code-not-found/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"lint": "next lint"
},
"dependencies": {
"next": "14.0.4",
"react": "18.2.0",
"react-dom": "18.2.0"
"next": "15.1.2",
"react": "19.0.0",
"react-dom": "19.0.0"
},
"devDependencies": {
"config": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion apps/design/next-env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
14 changes: 7 additions & 7 deletions apps/design/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"lint": "next lint"
},
"dependencies": {
"@radix-ui/react-icons": "1.1.1",
"@radix-ui/react-label": "1.0.0",
"@radix-ui/react-progress": "1.0.0",
"@radix-ui/react-radio-group": "latest",
"@radix-ui/react-icons": "1.3.2",
"@radix-ui/react-label": "2.1.1",
"@radix-ui/react-progress": "1.1.1",
"@radix-ui/react-radio-group": "^1.2.2",
"framer-motion": "6.2.3",
"lib": "workspace:*",
"next": "14.0.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"next": "15.1.2",
"react": "19.0.0",
"react-dom": "19.0.0",
"ui": "workspace:*"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion apps/games/next-env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
6 changes: 3 additions & 3 deletions apps/games/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"lz-string": "1.5.0",
"million": "2.6.4",
"nanostores": "0.9.5",
"next": "14.0.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"next": "15.1.2",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-icons": "4.7.1",
"ui": "workspace:*"
},
Expand Down
2 changes: 1 addition & 1 deletion apps/next/next-env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
16 changes: 8 additions & 8 deletions apps/next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"@emiljohansson/random-string": "1.1.2",
"@faker-js/faker": "7.4.0",
"@nanostores/react": "0.7.1",
"@radix-ui/react-accessible-icon": "1.0.2",
"@radix-ui/react-label": "1.0.0",
"@radix-ui/react-progress": "1.0.0",
"@radix-ui/react-select": "1.0.0",
"@radix-ui/react-tabs": "1.0.0",
"@radix-ui/react-accessible-icon": "1.1.1",
"@radix-ui/react-label": "2.1.1",
"@radix-ui/react-progress": "1.1.1",
"@radix-ui/react-select": "2.1.4",
"@radix-ui/react-tabs": "1.1.2",
"@supabase/ssr": "0.0.10",
"@vercel/analytics": "1.1.1",
"@vercel/kv": "1.0.0",
Expand All @@ -33,9 +33,9 @@
"lib": "workspace:*",
"lucide-react": "0.323.0",
"nanostores": "0.9.5",
"next": "14.0.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"next": "15.1.2",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-icons": "4.7.1",
"swr": "1.3.0",
"ui": "workspace:*"
Expand Down
12 changes: 6 additions & 6 deletions apps/next/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export const metadata: Metadata = {
}

export default async function Layout({ children }: PropsWithChildren<unknown>) {
const headersList = headers()
const headersList = await headers()
const pathname = headersList.get('x-url-pathname') || ''
const projects = await getProjects()
const currentProject = (projects as Tables<'project'>[]).find(
Expand Down Expand Up @@ -92,19 +92,19 @@ export default async function Layout({ children }: PropsWithChildren<unknown>) {
</head>
<body
className={`
${inter.className}
${inter.className}
bg-[length:15px_15px] bg-dots
bg-slate-50 dark:bg-gray-900
dark:text-white
bg-slate-50 dark:bg-gray-900
dark:text-white
flex flex-col h-full`}
>
{/* background-image: conic-gradient(at 92% 8%, rgb(134, 143, 151) 90deg, transparent 0deg, transparent 225deg, transparent 0deg);
background-size: 15px 15px; */}
<nav
className="
flex justify-between items-center
bg-white dark:bg-black
border-b border-slate-200 dark:border-zinc-700
bg-white dark:bg-black
border-b border-slate-200 dark:border-zinc-700
px-4 py-3
"
>
Expand Down
13 changes: 6 additions & 7 deletions apps/next/src/app/login/callback/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
'use client'

import { useSearchParams } from 'next/navigation'
import { createTokens } from '../tokens'

export default async function Page({
searchParams,
}: {
searchParams: { [key: string]: string }
}) {
export default async function Page() {
console.log('GET /login/callback')

const code = searchParams.code || 'error'
const searchParams = useSearchParams()
const code = searchParams.get('code') || 'error'
const json = await createTokens(code)

return (
Expand Down
6 changes: 3 additions & 3 deletions apps/next/src/lib/supabase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { createServerClient } from '@supabase/ssr'
import { cookies } from 'next/headers'
import { Database } from './database.types'

const createClient = () => {
const cookieStore = cookies()
const createClient = async () => {
const cookieStore = await cookies()

return createServerClient<Database>(
process.env.SUPABASE_URL!,
Expand All @@ -19,7 +19,7 @@ const createClient = () => {
}

export async function getProjects() {
const supabase = createClient()
const supabase = await createClient()
const { data: projects } = await supabase
.from('project')
.select('*')
Expand Down
14 changes: 7 additions & 7 deletions apps/oauth-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "PORT=3006 next dev",
"build": "PORT=3006 next build",
"start": "PORT=3006 next start",
"lint": "next lint"
"x_dev": "PORT=3006 next dev",
"x_build": "PORT=3006 next build",
"x_start": "PORT=3006 next start",
"x_lint": "next lint"
},
"dependencies": {
"@types/node": "18.0.1",
Expand All @@ -16,11 +16,11 @@
"eslint": "8.54.0",
"eslint-config-next": "14.0.3",
"jsonwebtoken": "9.0.2",
"next": "14.0.4",
"next": "15.1.2",
"node-cache": "5.1.2",
"postcss": "8.4.31",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "19.0.0",
"react-dom": "19.0.0",
"tailwindcss": "3.4.0",
"typescript": "5.0.4"
},
Expand Down
77 changes: 48 additions & 29 deletions apps/oauth-app/src/app/callback/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,61 @@
'use client'

import { Silkscreen } from 'next/font/google'
import { useSearchParams } from 'next/navigation'
import { Suspense, useEffect, useState } from 'react'

const silkscreen = Silkscreen({ weight: '400', subsets: ['latin'] })

export default async function Page({
searchParams,
}: {
searchParams: { [key: string]: string | string[] | undefined }
}) {
const code = searchParams.code
function Code() {
const [json, setJson] = useState()
const searchParams = useSearchParams()
const code = searchParams.get('code')
console.log({ code })
const formData = new URLSearchParams({
grant_type: 'authorization_code',
code,
redirect_uri: 'http://localhost:3000',
} as Record<string, string>)
const response = await fetch('http://localhost:3006/token', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
Accept: 'application/json',
},
body: formData.toString(),
})
const json = await response.json()
console.log({ json })
// // console.log(headers())
// // console.log(userAgent({ headers: headers() as Headers }))
// const authCode = crypto.randomBytes(16).toString('hex')
// const authCodes = getCache<{ [key: string]: boolean }>('authCodes') || {}
// authCodes[authCode] = true
// setCache('authCodes', authCodes, 120)

useEffect(() => {
async function createTokens() {
const formData = new URLSearchParams({
grant_type: 'authorization_code',
code,
redirect_uri: 'http://localhost:3000',
} as Record<string, string>)
const response = await fetch('http://localhost:3006/token', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
Accept: 'application/json',
},
body: formData.toString(),
})
const json = await response.json()
console.log({ json })
setJson(json)
// // console.log(headers())
// // console.log(userAgent({ headers: headers() as Headers }))
// const authCode = crypto.randomBytes(16).toString('hex')
// const authCodes = getCache<{ [key: string]: boolean }>('authCodes') || {}
// authCodes[authCode] = true
// setCache('authCodes', authCodes, 120)
}
createTokens()
}, [code])

return (
<>
<div>{code}</div>
{json && <code>{JSON.stringify(json)}</code>}
</>
)
}

export default function Page() {
return (
<main
className={`${silkscreen.className} flex min-h-screen flex-col items-center justify-between p-24`}
>
<div>{code}</div>
<code>{JSON.stringify(json)}</code>
<Suspense>
<Code />
</Suspense>
</main>
)
}
2 changes: 1 addition & 1 deletion apps/password-manager/next-env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
10 changes: 5 additions & 5 deletions apps/password-manager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
"lint": "next lint"
},
"dependencies": {
"@radix-ui/react-icons": "1.1.1",
"@radix-ui/react-label": "1.0.0",
"@radix-ui/react-icons": "1.3.2",
"@radix-ui/react-label": "2.1.1",
"@supabase/auth-helpers-nextjs": "0.2.7",
"@supabase/auth-helpers-react": "0.2.3",
"@supabase/supabase-js": "1.35.6",
"@supabase/ui": "0.36.5",
"crypto-js": "4.2.0",
"lib": "workspace:*",
"next": "14.0.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"next": "15.1.2",
"react": "19.0.0",
"react-dom": "19.0.0",
"ui": "workspace:*"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"main": "eslint-preset.js",
"license": "MIT",
"dependencies": {
"next": "14.0.4",
"react": "18.2.0",
"react-dom": "18.2.0"
"next": "15.1.2",
"react": "19.0.0",
"react-dom": "19.0.0"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "6.12.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"dependencies": {
"@preact/signals-core": "1.5.0",
"@preact/signals-react": "1.3.7",
"next": "14.0.4",
"react": "18.2.0",
"react-dom": "18.2.0"
"next": "15.1.2",
"react": "19.0.0",
"react-dom": "19.0.0"
},
"devDependencies": {
"config": "workspace:*",
Expand Down
18 changes: 9 additions & 9 deletions packages/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
}
},
"scripts": {
"build": "tsup",
"build": "tsup && tailwindcss -i ./src/globals.css -o ./dist/index.css",
"dev": "tsup --watch",
"lint": "eslint ./**/*.tsx"
},
"peerDependencies": {
"react": "18.2.0"
},
"dependencies": {
"@radix-ui/react-checkbox": "1.0.0",
"@radix-ui/react-icons": "1.1.1",
"@radix-ui/react-progress": "1.0.0",
"@radix-ui/react-select": "1.0.0",
"@radix-ui/react-slider": "1.0.0",
"@radix-ui/react-checkbox": "1.1.3",
"@radix-ui/react-icons": "1.3.2",
"@radix-ui/react-progress": "1.1.1",
"@radix-ui/react-select": "2.1.4",
"@radix-ui/react-slider": "1.2.2",
"framer-motion": "6.2.3",
"lib": "workspace:*",
"next": "14.0.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"next": "15.1.2",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-icons": "4.7.1"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/ui/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
const sharedConfig = require('config/tailwind.config.js')

module.exports = {
content: ['./src/**/*.tsx'],
// prefix ui lib classes to avoid conflicting with the app
// prefix: 'ui-',
presets: [sharedConfig],
Expand Down
Loading
Loading