From 525a184b0eeb26054894d7ce6d9cc9f7c78e95c7 Mon Sep 17 00:00:00 2001 From: juliusmarminge Date: Tue, 23 Jan 2024 09:38:53 +0100 Subject: [PATCH 01/14] bump trpc to use next tag --- cli/package.json | 25 +- cli/src/installers/dependencyVersionMap.ts | 22 +- cli/src/installers/trpc.ts | 4 - .../extras/src/app/page/with-auth-trpc-tw.tsx | 4 +- .../extras/src/app/page/with-auth-trpc.tsx | 4 +- .../extras/src/app/page/with-trpc-tw.tsx | 4 +- .../extras/src/app/page/with-trpc.tsx | 4 +- cli/template/extras/src/server/api/root.ts | 11 +- .../extras/src/server/api/trpc-app/base.ts | 7 + .../src/server/api/trpc-app/with-auth-db.ts | 7 + .../src/server/api/trpc-app/with-auth.ts | 7 + .../extras/src/server/api/trpc-app/with-db.ts | 7 + .../extras/src/server/api/trpc-pages/base.ts | 7 + .../src/server/api/trpc-pages/with-auth-db.ts | 7 + .../src/server/api/trpc-pages/with-auth.ts | 7 + .../src/server/api/trpc-pages/with-db.ts | 7 + cli/template/extras/src/trpc/react.tsx | 17 +- cli/template/extras/src/trpc/server.ts | 47 +- cli/template/extras/src/trpc/shared.ts | 30 - pnpm-lock.yaml | 578 ++++++++++++------ 20 files changed, 514 insertions(+), 292 deletions(-) delete mode 100644 cli/template/extras/src/trpc/shared.ts diff --git a/cli/package.json b/cli/package.json index 9032543c58..dcb1c08828 100644 --- a/cli/package.json +++ b/cli/package.json @@ -62,34 +62,35 @@ "sort-package-json": "^2.4.1" }, "devDependencies": { - "@auth/drizzle-adapter": "^0.3.6", + "@auth/drizzle-adapter": "^0.3.16", + "@auth/prisma-adapter": "^1.0.16", "@next-auth/prisma-adapter": "^1.0.7", - "@planetscale/database": "^1.11.0", + "@planetscale/database": "^1.14.0", "@prisma/adapter-planetscale": "^5.6.0", "@prisma/client": "^5.6.0", "@t3-oss/env-nextjs": "^0.7.1", - "@tanstack/react-query": "^4.36.1", - "@trpc/client": "^10.43.6", - "@trpc/next": "^10.43.6", - "@trpc/react-query": "^10.43.6", - "@trpc/server": "^10.43.6", + "@tanstack/react-query": "^5.17.19", + "@trpc/client": "next", + "@trpc/next": "next", + "@trpc/react-query": "next", + "@trpc/server": "next", "@types/fs-extra": "^11.0.1", "@types/gradient-string": "^1.1.2", "@types/node": "^18.17.0", - "drizzle-kit": "^0.20.9", + "drizzle-kit": "^0.20.13", "drizzle-orm": "^0.29.3", - "next": "^14.0.3", + "next": "^14.1.0", "next-auth": "^4.24.5", "prettier": "^3.1.0", - "prettier-plugin-tailwindcss": "^0.5.7", + "prettier-plugin-tailwindcss": "^0.5.11", "prisma": "^5.6.0", "react": "18.2.0", "react-dom": "18.2.0", "superjson": "^2.2.1", - "tailwindcss": "^3.3.5", + "tailwindcss": "^3.4.1", "tsup": "^6.7.0", "type-fest": "^3.7.0", - "typescript": "^5.0.4", + "typescript": "^5.3.3", "zod": "^3.22.4" } } diff --git a/cli/src/installers/dependencyVersionMap.ts b/cli/src/installers/dependencyVersionMap.ts index 6cd177d4a0..19340aa8d7 100644 --- a/cli/src/installers/dependencyVersionMap.ts +++ b/cli/src/installers/dependencyVersionMap.ts @@ -5,8 +5,8 @@ export const dependencyVersionMap = { // NextAuth.js "next-auth": "^4.24.5", - "@next-auth/prisma-adapter": "^1.0.7", - "@auth/drizzle-adapter": "^0.3.6", + "@next-auth/prisma-adapter": "^1.0.16", + "@auth/drizzle-adapter": "^0.3.16", // Prisma prisma: "^5.6.0", @@ -15,26 +15,26 @@ export const dependencyVersionMap = { // Drizzle "drizzle-orm": "^0.29.3", - "drizzle-kit": "^0.20.9", + "drizzle-kit": "^0.20.13", mysql2: "^3.6.1", - "@planetscale/database": "^1.11.0", + "@planetscale/database": "^1.14.0", postgres: "^3.4.3", "@types/better-sqlite3": "^7.6.6", "better-sqlite3": "^9.0.0", // TailwindCSS - tailwindcss: "^3.3.5", + tailwindcss: "^3.4.1", autoprefixer: "^10.4.14", postcss: "^8.4.31", prettier: "^3.1.0", - "prettier-plugin-tailwindcss": "^0.5.7", + "prettier-plugin-tailwindcss": "^0.5.11", // tRPC - "@trpc/client": "^10.43.6", - "@trpc/server": "^10.43.6", - "@trpc/react-query": "^10.43.6", - "@trpc/next": "^10.43.6", - "@tanstack/react-query": "^4.36.1", + "@trpc/client": "next", + "@trpc/server": "next", + "@trpc/react-query": "next", + "@trpc/next": "next", + "@tanstack/react-query": "^5.17.19", superjson: "^2.2.1", "server-only": "^0.0.1", } as const; diff --git a/cli/src/installers/trpc.ts b/cli/src/installers/trpc.ts index 481c4e62d1..ddad8b7cbe 100644 --- a/cli/src/installers/trpc.ts +++ b/cli/src/installers/trpc.ts @@ -103,10 +103,6 @@ export const trpcInstaller: Installer = ({ path.join(trpcDir, "react.tsx"), path.join(projectDir, "src/trpc/react.tsx"), ], - [ - path.join(trpcDir, "shared.ts"), - path.join(projectDir, "src/trpc/shared.ts"), - ], [ path.join( extrasDir, diff --git a/cli/template/extras/src/app/page/with-auth-trpc-tw.tsx b/cli/template/extras/src/app/page/with-auth-trpc-tw.tsx index bc55fc1597..03a3486215 100644 --- a/cli/template/extras/src/app/page/with-auth-trpc-tw.tsx +++ b/cli/template/extras/src/app/page/with-auth-trpc-tw.tsx @@ -7,7 +7,7 @@ import { api } from "~/trpc/server"; export default async function Home() { noStore(); - const hello = await api.post.hello.query({ text: "from tRPC" }); + const hello = await api.post.hello({ text: "from tRPC" }); const session = await getServerAuthSession(); return ( @@ -68,7 +68,7 @@ async function CrudShowcase() { const session = await getServerAuthSession(); if (!session?.user) return null; - const latestPost = await api.post.getLatest.query(); + const latestPost = await api.post.getLatest(); return (
diff --git a/cli/template/extras/src/app/page/with-auth-trpc.tsx b/cli/template/extras/src/app/page/with-auth-trpc.tsx index 2b5bdc10b4..8e0becd7f4 100644 --- a/cli/template/extras/src/app/page/with-auth-trpc.tsx +++ b/cli/template/extras/src/app/page/with-auth-trpc.tsx @@ -8,7 +8,7 @@ import styles from "./index.module.css"; export default async function Home() { noStore(); - const hello = await api.post.hello.query({ text: "from tRPC" }); + const hello = await api.post.hello({ text: "from tRPC" }); const session = await getServerAuthSession(); return ( @@ -69,7 +69,7 @@ async function CrudShowcase() { const session = await getServerAuthSession(); if (!session?.user) return null; - const latestPost = await api.post.getLatest.query(); + const latestPost = await api.post.getLatest(); return (
diff --git a/cli/template/extras/src/app/page/with-trpc-tw.tsx b/cli/template/extras/src/app/page/with-trpc-tw.tsx index b81d7e0fa1..369cb7bd60 100644 --- a/cli/template/extras/src/app/page/with-trpc-tw.tsx +++ b/cli/template/extras/src/app/page/with-trpc-tw.tsx @@ -6,7 +6,7 @@ import { api } from "~/trpc/server"; export default async function Home() { noStore(); - const hello = await api.post.hello.query({ text: "from tRPC" }); + const hello = await api.post.hello({ text: "from tRPC" }); return (
@@ -51,7 +51,7 @@ export default async function Home() { } async function CrudShowcase() { - const latestPost = await api.post.getLatest.query(); + const latestPost = await api.post.getLatest(); return (
diff --git a/cli/template/extras/src/app/page/with-trpc.tsx b/cli/template/extras/src/app/page/with-trpc.tsx index 544ba46f60..39d854c2f0 100644 --- a/cli/template/extras/src/app/page/with-trpc.tsx +++ b/cli/template/extras/src/app/page/with-trpc.tsx @@ -7,7 +7,7 @@ import styles from "./index.module.css"; export default async function Home() { noStore(); - const hello = await api.post.hello.query({ text: "from tRPC" }); + const hello = await api.post.hello({ text: "from tRPC" }); return (
@@ -52,7 +52,7 @@ export default async function Home() { } async function CrudShowcase() { - const latestPost = await api.post.getLatest.query(); + const latestPost = await api.post.getLatest(); return (
diff --git a/cli/template/extras/src/server/api/root.ts b/cli/template/extras/src/server/api/root.ts index 3d629a7a5b..b341fc4d64 100644 --- a/cli/template/extras/src/server/api/root.ts +++ b/cli/template/extras/src/server/api/root.ts @@ -1,5 +1,5 @@ import { postRouter } from "~/server/api/routers/post"; -import { createTRPCRouter } from "~/server/api/trpc"; +import { createCallerFactory, createTRPCRouter } from "~/server/api/trpc"; /** * This is the primary router for your server. @@ -12,3 +12,12 @@ export const appRouter = createTRPCRouter({ // export type definition of API export type AppRouter = typeof appRouter; + +/** + * Create a server-side caller for the tRPC API. + * @example + * const trpc = createCaller(createContext); + * const res = await trpc.post.all(); + * ^? Post[] + */ +export const createCaller = createCallerFactory(appRouter); diff --git a/cli/template/extras/src/server/api/trpc-app/base.ts b/cli/template/extras/src/server/api/trpc-app/base.ts index f5f6e4870e..abd41371f5 100644 --- a/cli/template/extras/src/server/api/trpc-app/base.ts +++ b/cli/template/extras/src/server/api/trpc-app/base.ts @@ -49,6 +49,13 @@ const t = initTRPC.context().create({ }, }); +/** + * Create a server-side caller. + * + * @see https://trpc.io/docs/server/server-side-calls + */ +export const createCallerFactory = t.createCallerFactory; + /** * 3. ROUTER & PROCEDURE (THE IMPORTANT BIT) * diff --git a/cli/template/extras/src/server/api/trpc-app/with-auth-db.ts b/cli/template/extras/src/server/api/trpc-app/with-auth-db.ts index 9b04ce80f4..486a81673d 100644 --- a/cli/template/extras/src/server/api/trpc-app/with-auth-db.ts +++ b/cli/template/extras/src/server/api/trpc-app/with-auth-db.ts @@ -57,6 +57,13 @@ const t = initTRPC.context().create({ }, }); +/** + * Create a server-side caller. + * + * @see https://trpc.io/docs/server/server-side-calls + */ +export const createCallerFactory = t.createCallerFactory; + /** * 3. ROUTER & PROCEDURE (THE IMPORTANT BIT) * diff --git a/cli/template/extras/src/server/api/trpc-app/with-auth.ts b/cli/template/extras/src/server/api/trpc-app/with-auth.ts index d0d5a4e9d1..c6f8177fe1 100644 --- a/cli/template/extras/src/server/api/trpc-app/with-auth.ts +++ b/cli/template/extras/src/server/api/trpc-app/with-auth.ts @@ -54,6 +54,13 @@ const t = initTRPC.context().create({ }, }); +/** + * Create a server-side caller. + * + * @see https://trpc.io/docs/server/server-side-calls + */ +export const createCallerFactory = t.createCallerFactory; + /** * 3. ROUTER & PROCEDURE (THE IMPORTANT BIT) * diff --git a/cli/template/extras/src/server/api/trpc-app/with-db.ts b/cli/template/extras/src/server/api/trpc-app/with-db.ts index 7fca50e6c1..b760382481 100644 --- a/cli/template/extras/src/server/api/trpc-app/with-db.ts +++ b/cli/template/extras/src/server/api/trpc-app/with-db.ts @@ -52,6 +52,13 @@ const t = initTRPC.context().create({ }, }); +/** + * Create a server-side caller. + * + * @see https://trpc.io/docs/server/server-side-calls + */ +export const createCallerFactory = t.createCallerFactory; + /** * 3. ROUTER & PROCEDURE (THE IMPORTANT BIT) * diff --git a/cli/template/extras/src/server/api/trpc-pages/base.ts b/cli/template/extras/src/server/api/trpc-pages/base.ts index 3bda296a6f..a1429e18a8 100644 --- a/cli/template/extras/src/server/api/trpc-pages/base.ts +++ b/cli/template/extras/src/server/api/trpc-pages/base.ts @@ -68,6 +68,13 @@ const t = initTRPC.context().create({ }, }); +/** + * Create a server-side caller. + * + * @see https://trpc.io/docs/server/server-side-calls + */ +export const createCallerFactory = t.createCallerFactory; + /** * 3. ROUTER & PROCEDURE (THE IMPORTANT BIT) * diff --git a/cli/template/extras/src/server/api/trpc-pages/with-auth-db.ts b/cli/template/extras/src/server/api/trpc-pages/with-auth-db.ts index f76d522e9e..3e75c9ea71 100644 --- a/cli/template/extras/src/server/api/trpc-pages/with-auth-db.ts +++ b/cli/template/extras/src/server/api/trpc-pages/with-auth-db.ts @@ -84,6 +84,13 @@ const t = initTRPC.context().create({ }, }); +/** + * Create a server-side caller. + * + * @see https://trpc.io/docs/server/server-side-calls + */ +export const createCallerFactory = t.createCallerFactory; + /** * 3. ROUTER & PROCEDURE (THE IMPORTANT BIT) * diff --git a/cli/template/extras/src/server/api/trpc-pages/with-auth.ts b/cli/template/extras/src/server/api/trpc-pages/with-auth.ts index d4c3b51caa..fc648166b6 100644 --- a/cli/template/extras/src/server/api/trpc-pages/with-auth.ts +++ b/cli/template/extras/src/server/api/trpc-pages/with-auth.ts @@ -82,6 +82,13 @@ const t = initTRPC.context().create({ }, }); +/** + * Create a server-side caller. + * + * @see https://trpc.io/docs/server/server-side-calls + */ +export const createCallerFactory = t.createCallerFactory; + /** * 3. ROUTER & PROCEDURE (THE IMPORTANT BIT) * diff --git a/cli/template/extras/src/server/api/trpc-pages/with-db.ts b/cli/template/extras/src/server/api/trpc-pages/with-db.ts index dc3b40b241..11edbdb051 100644 --- a/cli/template/extras/src/server/api/trpc-pages/with-db.ts +++ b/cli/template/extras/src/server/api/trpc-pages/with-db.ts @@ -71,6 +71,13 @@ const t = initTRPC.context().create({ }, }); +/** + * Create a server-side caller. + * + * @see https://trpc.io/docs/server/server-side-calls + */ +export const createCallerFactory = t.createCallerFactory; + /** * 3. ROUTER & PROCEDURE (THE IMPORTANT BIT) * diff --git a/cli/template/extras/src/trpc/react.tsx b/cli/template/extras/src/trpc/react.tsx index 8fbdc3128f..6265a60efe 100644 --- a/cli/template/extras/src/trpc/react.tsx +++ b/cli/template/extras/src/trpc/react.tsx @@ -4,9 +4,9 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { loggerLink, unstable_httpBatchStreamLink } from "@trpc/client"; import { createTRPCReact } from "@trpc/react-query"; import { useState } from "react"; +import SuperJSON from "superjson"; import { type AppRouter } from "~/server/api/root"; -import { getUrl, transformer } from "./shared"; export const api = createTRPCReact(); @@ -15,7 +15,7 @@ export function TRPCReactProvider(props: { children: React.ReactNode }) { const [trpcClient] = useState(() => api.createClient({ - transformer, + transformer: SuperJSON, links: [ loggerLink({ enabled: (op) => @@ -23,7 +23,12 @@ export function TRPCReactProvider(props: { children: React.ReactNode }) { (op.direction === "down" && op.result instanceof Error), }), unstable_httpBatchStreamLink({ - url: getUrl(), + url: getBaseUrl() + "/api/trpc", + async headers() { + const headers = new Headers(); + headers.set("x-trpc-source", "nextjs-react"); + return headers; + }, }), ], }) @@ -37,3 +42,9 @@ export function TRPCReactProvider(props: { children: React.ReactNode }) { ); } + +function getBaseUrl() { + if (typeof window !== "undefined") return window.location.origin; + if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`; + return `http://localhost:${process.env.PORT ?? 3000}`; +} diff --git a/cli/template/extras/src/trpc/server.ts b/cli/template/extras/src/trpc/server.ts index 0d6dd7506c..07a9f69a64 100644 --- a/cli/template/extras/src/trpc/server.ts +++ b/cli/template/extras/src/trpc/server.ts @@ -1,19 +1,10 @@ import "server-only"; -import { - createTRPCProxyClient, - loggerLink, - TRPCClientError, -} from "@trpc/client"; -import { callProcedure } from "@trpc/server"; -import { observable } from "@trpc/server/observable"; -import { type TRPCErrorResponse } from "@trpc/server/rpc"; import { headers } from "next/headers"; import { cache } from "react"; -import { appRouter, type AppRouter } from "~/server/api/root"; +import { createCaller } from "~/server/api/root"; import { createTRPCContext } from "~/server/api/trpc"; -import { transformer } from "./shared"; /** * This wraps the `createTRPCContext` helper and provides the required context for the tRPC API when @@ -28,38 +19,4 @@ const createContext = cache(() => { }); }); -export const api = createTRPCProxyClient({ - transformer, - links: [ - loggerLink({ - enabled: (op) => - process.env.NODE_ENV === "development" || - (op.direction === "down" && op.result instanceof Error), - }), - /** - * Custom RSC link that lets us invoke procedures without using http requests. Since Server - * Components always run on the server, we can just call the procedure as a function. - */ - () => - ({ op }) => - observable((observer) => { - createContext() - .then((ctx) => { - return callProcedure({ - procedures: appRouter._def.procedures, - path: op.path, - rawInput: op.input, - ctx, - type: op.type, - }); - }) - .then((data) => { - observer.next({ result: { data } }); - observer.complete(); - }) - .catch((cause: TRPCErrorResponse) => { - observer.error(TRPCClientError.from(cause)); - }); - }), - ], -}); +export const api = createCaller(createContext); diff --git a/cli/template/extras/src/trpc/shared.ts b/cli/template/extras/src/trpc/shared.ts deleted file mode 100644 index 46005045df..0000000000 --- a/cli/template/extras/src/trpc/shared.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { type inferRouterInputs, type inferRouterOutputs } from "@trpc/server"; -import superjson from "superjson"; - -import { type AppRouter } from "~/server/api/root"; - -export const transformer = superjson; - -function getBaseUrl() { - if (typeof window !== "undefined") return ""; - if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`; - return `http://localhost:${process.env.PORT ?? 3000}`; -} - -export function getUrl() { - return getBaseUrl() + "/api/trpc"; -} - -/** - * Inference helper for inputs. - * - * @example type HelloInput = RouterInputs['example']['hello'] - */ -export type RouterInputs = inferRouterInputs; - -/** - * Inference helper for outputs. - * - * @example type HelloOutput = RouterOutputs['example']['hello'] - */ -export type RouterOutputs = inferRouterOutputs; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 33a957de89..7c92799989 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,9 +1,5 @@ lockfileVersion: '6.0' -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - importers: .: @@ -100,38 +96,41 @@ importers: version: 2.4.1 devDependencies: '@auth/drizzle-adapter': - specifier: ^0.3.6 - version: 0.3.6 + specifier: ^0.3.16 + version: 0.3.16 + '@auth/prisma-adapter': + specifier: ^1.0.16 + version: 1.0.16(@prisma/client@5.6.0) '@next-auth/prisma-adapter': specifier: ^1.0.7 version: 1.0.7(@prisma/client@5.6.0)(next-auth@4.24.5) '@planetscale/database': - specifier: ^1.11.0 - version: 1.11.0 + specifier: ^1.14.0 + version: 1.14.0 '@prisma/adapter-planetscale': specifier: ^5.6.0 - version: 5.6.0(@planetscale/database@1.11.0) + version: 5.6.0(@planetscale/database@1.14.0) '@prisma/client': specifier: ^5.6.0 version: 5.6.0(prisma@5.6.0) '@t3-oss/env-nextjs': specifier: ^0.7.1 - version: 0.7.1(typescript@5.0.4)(zod@3.22.4) + version: 0.7.1(typescript@5.3.3)(zod@3.22.4) '@tanstack/react-query': - specifier: ^4.36.1 - version: 4.36.1(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.17.19 + version: 5.17.19(react@18.2.0) '@trpc/client': - specifier: ^10.43.6 - version: 10.43.6(@trpc/server@10.43.6) + specifier: next + version: 11.0.0-next-beta.228(@trpc/server@11.0.0-next-beta.228) '@trpc/next': - specifier: ^10.43.6 - version: 10.43.6(@tanstack/react-query@4.36.1)(@trpc/client@10.43.6)(@trpc/react-query@10.43.6)(@trpc/server@10.43.6)(next@14.0.3)(react-dom@18.2.0)(react@18.2.0) + specifier: next + version: 11.0.0-next-beta.228(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.228)(@trpc/react-query@11.0.0-next-beta.228)(@trpc/server@11.0.0-next-beta.228)(next@14.1.0)(react-dom@18.2.0)(react@18.2.0) '@trpc/react-query': - specifier: ^10.43.6 - version: 10.43.6(@tanstack/react-query@4.36.1)(@trpc/client@10.43.6)(@trpc/server@10.43.6)(react-dom@18.2.0)(react@18.2.0) + specifier: next + version: 11.0.0-next-beta.228(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.228)(@trpc/server@11.0.0-next-beta.228)(react-dom@18.2.0)(react@18.2.0) '@trpc/server': - specifier: ^10.43.6 - version: 10.43.6 + specifier: next + version: 11.0.0-next-beta.228 '@types/fs-extra': specifier: ^11.0.1 version: 11.0.1 @@ -142,23 +141,23 @@ importers: specifier: ^18.17.0 version: 18.17.0 drizzle-kit: - specifier: ^0.20.9 - version: 0.20.9 + specifier: ^0.20.13 + version: 0.20.13 drizzle-orm: specifier: ^0.29.3 - version: 0.29.3(@planetscale/database@1.11.0)(react@18.2.0) + version: 0.29.3(@planetscale/database@1.14.0)(react@18.2.0) next: - specifier: ^14.0.3 - version: 14.0.3(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0) + specifier: ^14.1.0 + version: 14.1.0(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0) next-auth: specifier: ^4.24.5 - version: 4.24.5(next@14.0.3)(react-dom@18.2.0)(react@18.2.0) + version: 4.24.5(next@14.1.0)(react-dom@18.2.0)(react@18.2.0) prettier: specifier: ^3.1.0 version: 3.1.0 prettier-plugin-tailwindcss: - specifier: ^0.5.7 - version: 0.5.7(@ianvs/prettier-plugin-sort-imports@4.1.0)(prettier-plugin-astro@0.11.0)(prettier@3.1.0) + specifier: ^0.5.11 + version: 0.5.11(@ianvs/prettier-plugin-sort-imports@4.1.0)(prettier@3.1.0) prisma: specifier: ^5.6.0 version: 5.6.0 @@ -172,17 +171,17 @@ importers: specifier: ^2.2.1 version: 2.2.1 tailwindcss: - specifier: ^3.3.5 - version: 3.3.5 + specifier: ^3.4.1 + version: 3.4.1 tsup: specifier: ^6.7.0 - version: 6.7.0(postcss@8.4.31)(typescript@5.0.4) + version: 6.7.0(postcss@8.4.31)(typescript@5.3.3) type-fest: specifier: ^3.7.0 version: 3.7.0 typescript: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^5.3.3 + version: 5.3.3 zod: specifier: ^3.22.4 version: 3.22.4 @@ -795,8 +794,8 @@ packages: dependencies: undici: 5.22.1 - /@auth/core@0.18.1: - resolution: {integrity: sha512-L4MehYt/A7e5djsEid3jTSkRZ8sysxbirhmCXqSCPimGoFUtMCwTZrpzTALTSRwXGw/mps5fYlHROo3UQk9B3w==} + /@auth/core@0.22.0: + resolution: {integrity: sha512-BwngPhtcEtJPV+sfs8pGPZ+RdKnpBeXRk2K2Os10DyMfaL/Vszj2TJU6sRaS38hXzo+xycYX+83olBElqc2Ngw==} peerDependencies: nodemailer: ^6.8.0 peerDependenciesMeta: @@ -804,17 +803,29 @@ packages: optional: true dependencies: '@panva/hkdf': 1.1.1 - cookie: 0.5.0 - jose: 5.1.1 - oauth4webapi: 2.3.0 + '@types/cookie': 0.6.0 + cookie: 0.6.0 + jose: 5.2.0 + oauth4webapi: 2.7.0 preact: 10.11.3 preact-render-to-string: 5.2.3(preact@10.11.3) dev: true - /@auth/drizzle-adapter@0.3.6: - resolution: {integrity: sha512-NcVjmFKaNDgR8sIiWdtt6tPuoOulW3tRnRA0F8FTJrCxwrLB/YK+rW0FkKZSDOFV8S50XESnz7SAinwRFzV0mQ==} + /@auth/drizzle-adapter@0.3.16: + resolution: {integrity: sha512-08uS3j6Omzhshgtn8bjKxZlVOrO2Y3eXdTCYDFdhVAG7KpnotRYFhjrXqVlb9kjaNIxavnyad37+DtpIoOYqmg==} dependencies: - '@auth/core': 0.18.1 + '@auth/core': 0.22.0 + transitivePeerDependencies: + - nodemailer + dev: true + + /@auth/prisma-adapter@1.0.16(@prisma/client@5.6.0): + resolution: {integrity: sha512-i7+XCxrbv5n8Yp9r+FznvnOBG7BrjpfmXr4Fl7pL7LPgTGhDJPE10BokVf5tGTsR8SGnAp04qhBzgjTrTrmpPQ==} + peerDependencies: + '@prisma/client': '>=2.26.0 || >=3 || >=4 || >=5' + dependencies: + '@auth/core': 0.22.0 + '@prisma/client': 5.6.0(prisma@5.6.0) transitivePeerDependencies: - nodemailer dev: true @@ -1278,8 +1289,8 @@ packages: - '@algolia/client-search' dev: false - /@drizzle-team/studio@0.0.37: - resolution: {integrity: sha512-LZyAPGJBX43jsrVZh7+w1Jig/BC6PJx63ReHUYK+GRQYNY9UJNlPXmn1uC/LMRX+A7JwYM4Sr4Fg/hnJSqlfgA==} + /@drizzle-team/studio@0.0.39: + resolution: {integrity: sha512-c5Hkm7MmQC2n5qAsKShjQrHoqlfGslB8+qWzsGGZ+2dHMRTNG60UuzalF0h0rvBax5uzPXuGkYLGaQ+TUX3yMw==} dependencies: superjson: 2.2.1 dev: true @@ -2370,11 +2381,16 @@ packages: next-auth: ^4 dependencies: '@prisma/client': 5.6.0(prisma@5.6.0) - next-auth: 4.24.5(next@14.0.3)(react-dom@18.2.0)(react@18.2.0) + next-auth: 4.24.5(next@14.1.0)(react-dom@18.2.0)(react@18.2.0) dev: true /@next/env@14.0.3: resolution: {integrity: sha512-7xRqh9nMvP5xrW4/+L0jgRRX+HoNRGnfJpD+5Wq6/13j3dsdzxO3BCXn7D3hMqsDb+vjZnJq+vI7+EtgrYZTeA==} + dev: false + + /@next/env@14.1.0: + resolution: {integrity: sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==} + dev: true /@next/eslint-plugin-next@14.0.0: resolution: {integrity: sha512-Ye37nNI09V3yt7pzuzSQtwlvuJ2CGzFszHXkcTHHZgNr7EhTMFLipn3VSJChy+e5+ahTdNApPphc3qCPUsn10A==} @@ -2403,6 +2419,16 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true + dev: false + optional: true + + /@next/swc-darwin-arm64@14.1.0: + resolution: {integrity: sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true optional: true /@next/swc-darwin-x64@14.0.3: @@ -2411,6 +2437,16 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true + dev: false + optional: true + + /@next/swc-darwin-x64@14.1.0: + resolution: {integrity: sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true optional: true /@next/swc-linux-arm64-gnu@14.0.3: @@ -2419,6 +2455,16 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-arm64-gnu@14.1.0: + resolution: {integrity: sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true optional: true /@next/swc-linux-arm64-musl@14.0.3: @@ -2427,6 +2473,16 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-arm64-musl@14.1.0: + resolution: {integrity: sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true optional: true /@next/swc-linux-x64-gnu@14.0.3: @@ -2435,6 +2491,16 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-x64-gnu@14.1.0: + resolution: {integrity: sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true optional: true /@next/swc-linux-x64-musl@14.0.3: @@ -2443,6 +2509,16 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-x64-musl@14.1.0: + resolution: {integrity: sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true optional: true /@next/swc-win32-arm64-msvc@14.0.3: @@ -2451,6 +2527,16 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true + dev: false + optional: true + + /@next/swc-win32-arm64-msvc@14.1.0: + resolution: {integrity: sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true optional: true /@next/swc-win32-ia32-msvc@14.0.3: @@ -2459,6 +2545,16 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true + dev: false + optional: true + + /@next/swc-win32-ia32-msvc@14.1.0: + resolution: {integrity: sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==} + engines: {node: '>= 10'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true optional: true /@next/swc-win32-x64-msvc@14.0.3: @@ -2467,6 +2563,16 @@ packages: cpu: [x64] os: [win32] requiresBuild: true + dev: false + optional: true + + /@next/swc-win32-x64-msvc@14.1.0: + resolution: {integrity: sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true optional: true /@nodelib/fs.scandir@2.1.5: @@ -2526,10 +2632,6 @@ packages: '@octokit/openapi-types': 18.0.0 dev: false - /@panva/hkdf@1.0.4: - resolution: {integrity: sha512-003xWiCuvePbLaPHT+CRuaV4GlyCAVm6XYSbBZDHoWZGn1mNkVKFaDbGJjjxmEFvizUwlCoM6O18FCBMMky2zQ==} - dev: true - /@panva/hkdf@1.1.1: resolution: {integrity: sha512-dhPeilub1NuIG0X5Kvhh9lH4iW3ZsHlnzwgwbOlgwQ2wG1IqFzsgHqmKPk3WzsdWAeaxKJxgM0+W433RmN45GA==} dev: true @@ -2545,17 +2647,17 @@ packages: tiny-glob: 0.2.9 tslib: 2.5.0 - /@planetscale/database@1.11.0: - resolution: {integrity: sha512-aWbU+D/IRHoDE9975y+Q4c+EwwAWxCPwFId+N1AhQVFXzbeJMkj6KN2iQtoi03elcLMRdfT+V3i9Z4WRw+/oIA==} + /@planetscale/database@1.14.0: + resolution: {integrity: sha512-7BB+iH6EH4YJuDeVeEbxpo60BFz3wIXJNXCmBGl40eC4HStRMGZ1COxKfiuPcINWwwrJhAhI9AEI97AOZYT7JQ==} engines: {node: '>=16'} dev: true - /@prisma/adapter-planetscale@5.6.0(@planetscale/database@1.11.0): + /@prisma/adapter-planetscale@5.6.0(@planetscale/database@1.14.0): resolution: {integrity: sha512-VhBEXKcRDbkozzo3W0mXd4lIHxvpR6YJkZRCHhPTyAx7gba7kpu/lJ83y/P1+YXRiyN2Qmf91pDVYr1qcpfCwQ==} peerDependencies: '@planetscale/database': ^1.11.0 dependencies: - '@planetscale/database': 1.11.0 + '@planetscale/database': 1.14.0 '@prisma/driver-adapter-utils': 5.6.0 transitivePeerDependencies: - supports-color @@ -3155,6 +3257,20 @@ packages: dependencies: typescript: 5.0.4 zod: 3.22.4 + dev: false + + /@t3-oss/env-core@0.7.1(typescript@5.3.3)(zod@3.22.4): + resolution: {integrity: sha512-3+SQt39OlmSaRLqYVFv8uRm1BpFepM5TIiMytRqO9cjH+wB77o6BIJdeyM5h5U4qLBMEzOJWCY4MBaU/rLwbYw==} + peerDependencies: + typescript: '>=4.7.2' + zod: ^3.0.0 + peerDependenciesMeta: + typescript: + optional: true + dependencies: + typescript: 5.3.3 + zod: 3.22.4 + dev: true /@t3-oss/env-nextjs@0.7.1(typescript@5.0.4)(zod@3.22.4): resolution: {integrity: sha512-tQDbNLGCOvKGi+JoGuJ/CJInJI7/kLWJqtgGppAKS7ZFLdVOqZYR/uRjxlXOWPnxmUKF8VswOAsq7fXUpNZDhA==} @@ -3168,81 +3284,90 @@ packages: '@t3-oss/env-core': 0.7.1(typescript@5.0.4)(zod@3.22.4) typescript: 5.0.4 zod: 3.22.4 + dev: false - /@tanstack/query-core@4.36.1: - resolution: {integrity: sha512-DJSilV5+ytBP1FbFcEJovv4rnnm/CokuVvrBEtW/Va9DvuJ3HksbXUJEpI0aV1KtuL4ZoO9AVE6PyNLzF7tLeA==} - dev: true - - /@tanstack/react-query@4.36.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-y7ySVHFyyQblPl3J3eQBWpXZkliroki3ARnBKsdJchlgt7yJLRDUcf4B8soufgiYt3pEQIkBWBx1N9/ZPIeUWw==} + /@t3-oss/env-nextjs@0.7.1(typescript@5.3.3)(zod@3.22.4): + resolution: {integrity: sha512-tQDbNLGCOvKGi+JoGuJ/CJInJI7/kLWJqtgGppAKS7ZFLdVOqZYR/uRjxlXOWPnxmUKF8VswOAsq7fXUpNZDhA==} peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-native: '*' + typescript: '>=4.7.2' + zod: ^3.0.0 peerDependenciesMeta: - react-dom: - optional: true - react-native: + typescript: optional: true dependencies: - '@tanstack/query-core': 4.36.1 + '@t3-oss/env-core': 0.7.1(typescript@5.3.3)(zod@3.22.4) + typescript: 5.3.3 + zod: 3.22.4 + dev: true + + /@tanstack/query-core@5.17.19: + resolution: {integrity: sha512-Lzw8FUtnLCc9Jwz0sw9xOjZB+/mCCmJev38v2wHMUl/ioXNIhnNWeMxu0NKUjIhAd62IRB3eAtvxAGDJ55UkyA==} + dev: true + + /@tanstack/react-query@5.17.19(react@18.2.0): + resolution: {integrity: sha512-qaQENB6/03Gj3dFZGvdmUoqeUGlGm7P1p0RmaR04Bf1Ib1T9lLGimcC9T3oCFbrx0b2ZF21ngjFZNjj9uPJMcg==} + peerDependencies: + react: ^18.0.0 + dependencies: + '@tanstack/query-core': 5.17.19 react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - use-sync-external-store: 1.2.0(react@18.2.0) dev: true /@total-typescript/ts-reset@0.3.7: resolution: {integrity: sha512-yXt2BRRVCJVvzWaxac5n0nCXzIrQEBE/MeYlNQ8/Iq7UeelNmm/AdnUAu18ilSS893mbEQ4u6whPt/HvOPc4rw==} dev: false - /@trpc/client@10.43.6(@trpc/server@10.43.6): - resolution: {integrity: sha512-gQSxCQgPeBn/wqBEScu5Nq9UKqA16e965vWBj+BbdvI4URV72T44/yg0cl/E6xtBgycCVwdzwn7CuZaM8FA/VQ==} + /@trpc/client@11.0.0-next-beta.228(@trpc/server@11.0.0-next-beta.228): + resolution: {integrity: sha512-LM7vHbzJBzOs31nONUQV0Mdxsuz7YNt6KDe+5BnLDFS7qXcUcgVj6lpFgtglWEOEDBa02OHQYujyzrajvb3asA==} peerDependencies: - '@trpc/server': 10.43.6 + '@trpc/server': 11.0.0-next-beta.228+38f3240e9 dependencies: - '@trpc/server': 10.43.6 + '@trpc/server': 11.0.0-next-beta.228 dev: true - /@trpc/next@10.43.6(@tanstack/react-query@4.36.1)(@trpc/client@10.43.6)(@trpc/react-query@10.43.6)(@trpc/server@10.43.6)(next@14.0.3)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-srV4twQKp8FohivGZ5wxNUdTzgPjjKeuNWG3Bpy5hVrIvg8VHDcglPMHS+3eWTUDDtCbhWpvANre+81B8b9Fgg==} + /@trpc/next@11.0.0-next-beta.228(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.228)(@trpc/react-query@11.0.0-next-beta.228)(@trpc/server@11.0.0-next-beta.228)(next@14.1.0)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-LAs46G8rdO0wqDLaodBFMtPqVz6sV1Yizvn8GgFSplSqeV5ofdGhvFU4p3ScoKRWgzQhzhrI3T7zVf10xZQCCA==} peerDependencies: - '@tanstack/react-query': ^4.18.0 - '@trpc/client': 10.43.6 - '@trpc/react-query': 10.43.6 - '@trpc/server': 10.43.6 + '@tanstack/react-query': ^5.0.0 + '@trpc/client': 11.0.0-next-beta.228+38f3240e9 + '@trpc/react-query': 11.0.0-next-beta.228+38f3240e9 + '@trpc/server': 11.0.0-next-beta.228+38f3240e9 next: '*' react: '>=16.8.0' react-dom: '>=16.8.0' + peerDependenciesMeta: + '@tanstack/react-query': + optional: true + '@trpc/react-query': + optional: true dependencies: - '@tanstack/react-query': 4.36.1(react-dom@18.2.0)(react@18.2.0) - '@trpc/client': 10.43.6(@trpc/server@10.43.6) - '@trpc/react-query': 10.43.6(@tanstack/react-query@4.36.1)(@trpc/client@10.43.6)(@trpc/server@10.43.6)(react-dom@18.2.0)(react@18.2.0) - '@trpc/server': 10.43.6 - next: 14.0.3(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0) + '@tanstack/react-query': 5.17.19(react@18.2.0) + '@trpc/client': 11.0.0-next-beta.228(@trpc/server@11.0.0-next-beta.228) + '@trpc/react-query': 11.0.0-next-beta.228(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.228)(@trpc/server@11.0.0-next-beta.228)(react-dom@18.2.0)(react@18.2.0) + '@trpc/server': 11.0.0-next-beta.228 + next: 14.1.0(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-ssr-prepass: 1.5.0(react@18.2.0) dev: true - /@trpc/react-query@10.43.6(@tanstack/react-query@4.36.1)(@trpc/client@10.43.6)(@trpc/server@10.43.6)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-Twf0/wvcrDwmaJ6OLf0YVNwiv8+gtoSFyKYqe+5lMkFtUYSl+4KGvSqiN9ynbnofHCvuPgjJmjdS8pxYkcWxCw==} + /@trpc/react-query@11.0.0-next-beta.228(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.228)(@trpc/server@11.0.0-next-beta.228)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-c50um14znXEU8WIx/oS6/GtO09OZj3F44KsliC55icS+ugU7z3VNXv79iYyVsulz/unkOvQLVeAkSBhSUfM+7g==} peerDependencies: - '@tanstack/react-query': ^4.18.0 - '@trpc/client': 10.43.6 - '@trpc/server': 10.43.6 - react: '>=16.8.0' - react-dom: '>=16.8.0' - dependencies: - '@tanstack/react-query': 4.36.1(react-dom@18.2.0)(react@18.2.0) - '@trpc/client': 10.43.6(@trpc/server@10.43.6) - '@trpc/server': 10.43.6 + '@tanstack/react-query': ^5.0.0 + '@trpc/client': 11.0.0-next-beta.228+38f3240e9 + '@trpc/server': 11.0.0-next-beta.228+38f3240e9 + react: '>=18.2.0' + react-dom: '>=18.2.0' + dependencies: + '@tanstack/react-query': 5.17.19(react@18.2.0) + '@trpc/client': 11.0.0-next-beta.228(@trpc/server@11.0.0-next-beta.228) + '@trpc/server': 11.0.0-next-beta.228 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true - /@trpc/server@10.43.6: - resolution: {integrity: sha512-ziN7UXGAycxe4i3FwJstTe6jzCcKBlPociCrC9XtfPzFpMTf0hNbRQQlFiZjJk23ZGQSVYDjk9RO4yIHt94mJg==} - engines: {node: '>=18.0.0'} + /@trpc/server@11.0.0-next-beta.228: + resolution: {integrity: sha512-8pRT1Ixrh8310KlPLLwlfEmfWXL9yrJK+mz9jFgvsiEtazR2N7rUFV8SoG2SWGxLkTaPc03o4k1JSf83XDwWRw==} dev: true /@types/acorn@4.0.6: @@ -3276,6 +3401,10 @@ packages: dependencies: '@babel/types': 7.22.5 + /@types/cookie@0.6.0: + resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} + dev: true + /@types/debug@4.1.7: resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==} dependencies: @@ -3321,13 +3450,6 @@ packages: dependencies: '@types/unist': 2.0.6 - /@types/inquirer@9.0.3: - resolution: {integrity: sha512-CzNkWqQftcmk2jaCWdBTf9Sm7xSw4rkI1zpU/Udw3HX5//adEZUIm9STtoRP1qgWj0CWQtJ9UTvqmO2NNjhMJw==} - dependencies: - '@types/through': 0.0.30 - rxjs: 7.8.1 - dev: true - /@types/is-ci@3.0.0: resolution: {integrity: sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ==} dependencies: @@ -3449,12 +3571,6 @@ packages: /@types/semver@7.3.13: resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==} - /@types/through@0.0.30: - resolution: {integrity: sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==} - dependencies: - '@types/node': 18.17.0 - dev: true - /@types/tinycolor2@1.4.3: resolution: {integrity: sha512-Kf1w9NE5HEgGxCRyIcRXR/ZYtDv0V8FVPtYHwLxl0O+maGX0erE77pQlD0gpP+/KByMZ87mOA79SjifhSB3PjQ==} @@ -4116,7 +4232,7 @@ packages: strip-ansi: 7.0.1 supports-esm: 1.0.0 tsconfig-resolver: 3.0.1 - typescript: 5.0.4 + typescript: 5.3.3 unist-util-visit: 4.1.2 vfile: 5.3.7 vite: 4.4.6(@types/node@18.17.0) @@ -4290,7 +4406,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001515 + caniuse-lite: 1.0.30001579 electron-to-chromium: 1.4.459 node-releases: 2.0.13 update-browserslist-db: 1.0.11(browserslist@4.21.9) @@ -4300,7 +4416,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001571 + caniuse-lite: 1.0.30001579 electron-to-chromium: 1.4.616 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.22.2) @@ -4410,9 +4526,8 @@ packages: /caniuse-lite@1.0.30001515: resolution: {integrity: sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA==} - /caniuse-lite@1.0.30001571: - resolution: {integrity: sha512-tYq/6MoXhdezDLFZuCO/TKboTzuQ/xR5cFdgXPfDtM7/kchBO3b4VWghE/OAi/DV7tTdhmLjZiZBZi1fA/GheQ==} - dev: false + /caniuse-lite@1.0.30001579: + resolution: {integrity: sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==} /ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} @@ -4633,6 +4748,11 @@ packages: resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} engines: {node: '>= 0.6'} + /cookie@0.6.0: + resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} + engines: {node: '>= 0.6'} + dev: true + /copy-anything@3.0.3: resolution: {integrity: sha512-fpW2W/BqEzqPp29QS+MwwfisHCQZtiduTe/m8idFo0xbti9fIZ2WVhAsCv4ggFVH3AgCkVdpoOCtQC6gBrdhjw==} engines: {node: '>=12.13'} @@ -4937,11 +5057,11 @@ packages: wordwrap: 1.0.0 dev: true - /drizzle-kit@0.20.9: - resolution: {integrity: sha512-5oIbPFdfEEfzVSOB3MWGt70VSHv6W7qMAWCJ5xc6W1BxgGASipxuAuyXD59fx9S6QYTNNnuSuQFoIdnNTRWY2A==} + /drizzle-kit@0.20.13: + resolution: {integrity: sha512-j9oZSQXNWG+KBJm0Sg3S/zJpncHGKnpqNfFuM4NUxUMGTcihDHhP9SW6Jncqwb5vsP1Xm0a8JLm3PZUIspC/oA==} hasBin: true dependencies: - '@drizzle-team/studio': 0.0.37 + '@drizzle-team/studio': 0.0.39 '@esbuild-kit/esm-loader': 2.5.5 camelcase: 7.0.1 chalk: 5.2.0 @@ -4959,7 +5079,7 @@ packages: - supports-color dev: true - /drizzle-orm@0.29.3(@planetscale/database@1.11.0)(react@18.2.0): + /drizzle-orm@0.29.3(@planetscale/database@1.14.0)(react@18.2.0): resolution: {integrity: sha512-uSE027csliGSGYD0pqtM+SAQATMREb3eSM/U8s6r+Y0RFwTKwftnwwSkqx3oS65UBgqDOM0gMTl5UGNpt6lW0A==} peerDependencies: '@aws-sdk/client-rds-data': '>=3' @@ -5030,7 +5150,7 @@ packages: sqlite3: optional: true dependencies: - '@planetscale/database': 1.11.0 + '@planetscale/database': 1.14.0 react: 18.2.0 dev: true @@ -6303,6 +6423,7 @@ packages: /glob-to-regexp@0.4.1: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} + dev: false /glob@7.1.6: resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} @@ -7075,12 +7196,12 @@ packages: resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==} dev: false - /jose@4.13.1: - resolution: {integrity: sha512-MSJQC5vXco5Br38mzaQKiq9mwt7lwj2eXpgpRyQYNHYt2lq1PjkWa7DLXX0WVcQLE9HhMh3jPiufS7fhJf+CLQ==} + /jose@4.15.4: + resolution: {integrity: sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==} dev: true - /jose@5.1.1: - resolution: {integrity: sha512-bfB+lNxowY49LfrBO0ITUn93JbUhxUN8I11K6oI5hJu/G6PO6fEUddVLjqdD0cQ9SXIHWXuWh7eJYwZF7Z0N/g==} + /jose@5.2.0: + resolution: {integrity: sha512-oW3PCnvyrcm1HMvGTzqjxxfnEs9EoFOFWi2HsEGhlFVOXxTE3K9GKWVMFoFw06yPUqwpvEWic1BmtUZBI/tIjw==} dev: true /joycon@3.1.1: @@ -8033,7 +8154,7 @@ packages: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} dev: false - /next-auth@4.24.5(next@14.0.3)(react-dom@18.2.0)(react@18.2.0): + /next-auth@4.24.5(next@14.1.0)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-3RafV3XbfIKk6rF6GlLE4/KxjTcuMCifqrmD+98ejFq73SRoj2rmzoca8u764977lH/Q7jo6Xu6yM+Re1Mz/Og==} peerDependencies: next: ^12.2.5 || ^13 || ^14 @@ -8045,14 +8166,14 @@ packages: optional: true dependencies: '@babel/runtime': 7.21.0 - '@panva/hkdf': 1.0.4 + '@panva/hkdf': 1.1.1 cookie: 0.5.0 - jose: 4.13.1 - next: 14.0.3(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0) + jose: 4.15.4 + next: 14.1.0(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0) oauth: 0.9.15 - openid-client: 5.4.0 - preact: 10.13.1 - preact-render-to-string: 5.2.6(preact@10.13.1) + openid-client: 5.6.4 + preact: 10.11.3 + preact-render-to-string: 5.2.3(preact@10.11.3) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) uuid: 8.3.2 @@ -8099,6 +8220,46 @@ packages: transitivePeerDependencies: - '@babel/core' - babel-plugin-macros + dev: false + + /next@14.1.0(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-wlzrsbfeSU48YQBjZhDzOwhWhGsy+uQycR8bHAOt1LY1bn3zZEcDyHQOEoN3aWzQ8LHCAJ1nqrWCc9XF2+O45Q==} + engines: {node: '>=18.17.0'} + hasBin: true + peerDependencies: + '@opentelemetry/api': ^1.1.0 + react: ^18.2.0 + react-dom: ^18.2.0 + sass: ^1.3.0 + peerDependenciesMeta: + '@opentelemetry/api': + optional: true + sass: + optional: true + dependencies: + '@next/env': 14.1.0 + '@swc/helpers': 0.5.2 + busboy: 1.6.0 + caniuse-lite: 1.0.30001579 + graceful-fs: 4.2.11 + postcss: 8.4.31 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + styled-jsx: 5.1.1(@babel/core@7.22.9)(react@18.2.0) + optionalDependencies: + '@next/swc-darwin-arm64': 14.1.0 + '@next/swc-darwin-x64': 14.1.0 + '@next/swc-linux-arm64-gnu': 14.1.0 + '@next/swc-linux-arm64-musl': 14.1.0 + '@next/swc-linux-x64-gnu': 14.1.0 + '@next/swc-linux-x64-musl': 14.1.0 + '@next/swc-win32-arm64-msvc': 14.1.0 + '@next/swc-win32-ia32-msvc': 14.1.0 + '@next/swc-win32-x64-msvc': 14.1.0 + transitivePeerDependencies: + - '@babel/core' + - babel-plugin-macros + dev: true /nlcst-to-string@3.1.1: resolution: {integrity: sha512-63mVyqaqt0cmn2VcI2aH6kxe1rLAmSROqHMA0i4qqg1tidkfExgpb0FGMikMCn86mw5dFtBtEANfmSSK7TjNHw==} @@ -8191,8 +8352,8 @@ packages: set-blocking: 2.0.0 dev: false - /oauth4webapi@2.3.0: - resolution: {integrity: sha512-JGkb5doGrwzVDuHwgrR4nHJayzN4h59VCed6EW8Tql6iHDfZIabCJvg6wtbn5q6pyB2hZruI3b77Nudvq7NmvA==} + /oauth4webapi@2.7.0: + resolution: {integrity: sha512-XxmYWOSL9jO4K/ufyZL0YeqE1M+3ZNJ4gdo8C3bpuBemibFBLAlAXiVia2HCiErTzX+q+CFDlhf4o7P0HVsZ0w==} dev: true /oauth@0.9.15: @@ -8293,8 +8454,8 @@ packages: define-properties: 1.2.0 es-abstract: 1.22.3 - /oidc-token-hash@5.0.1: - resolution: {integrity: sha512-EvoOtz6FIEBzE+9q253HsLCVRiK/0doEJ2HCvvqMQb3dHZrP3WlJKYtJ55CRTw4jmYomzH4wkPuCj/I3ZvpKxQ==} + /oidc-token-hash@5.0.3: + resolution: {integrity: sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==} engines: {node: ^10.13.0 || >=12.0.0} dev: true @@ -8323,13 +8484,13 @@ packages: is-docker: 2.2.1 is-wsl: 2.2.0 - /openid-client@5.4.0: - resolution: {integrity: sha512-hgJa2aQKcM2hn3eyVtN12tEA45ECjTJPXCgUh5YzTzy9qwapCvmDTVPWOcWVL0d34zeQoQ/hbG9lJhl3AYxJlQ==} + /openid-client@5.6.4: + resolution: {integrity: sha512-T1h3B10BRPKfcObdBklX639tVz+xh34O7GjofqrqiAQdm7eHsQ00ih18x6wuJ/E6FxdtS2u3FmUGPDeEcMwzNA==} dependencies: - jose: 4.13.1 + jose: 4.15.4 lru-cache: 6.0.0 object-hash: 2.2.0 - oidc-token-hash: 5.0.1 + oidc-token-hash: 5.0.3 dev: true /optionator@0.9.1: @@ -8670,23 +8831,10 @@ packages: pretty-format: 3.8.0 dev: true - /preact-render-to-string@5.2.6(preact@10.13.1): - resolution: {integrity: sha512-JyhErpYOvBV1hEPwIxc/fHWXPfnEGdRKxc8gFdAZ7XV4tlzyzG847XAyEZqoDnynP88akM4eaHcSOzNcLWFguw==} - peerDependencies: - preact: '>=10' - dependencies: - preact: 10.13.1 - pretty-format: 3.8.0 - dev: true - /preact@10.11.3: resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==} dev: true - /preact@10.13.1: - resolution: {integrity: sha512-KyoXVDU5OqTpG9LXlB3+y639JAGzl8JSBXLn1J9HTSB3gbKcuInga7bZnXLlxmK94ntTs1EFeZp0lrja2AuBYQ==} - dev: true - /prebuild-install@7.1.1: resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==} engines: {node: '>=10'} @@ -8735,7 +8883,7 @@ packages: engines: {node: ^14.15.0 || >=16.0.0, pnpm: '>=7.14.0'} dependencies: '@astrojs/compiler': 1.6.1 - prettier: 3.1.0 + prettier: 3.2.4 sass-formatter: 0.7.6 dev: true @@ -8748,6 +8896,59 @@ packages: sass-formatter: 0.7.6 synckit: 0.8.5 + /prettier-plugin-tailwindcss@0.5.11(@ianvs/prettier-plugin-sort-imports@4.1.0)(prettier@3.1.0): + resolution: {integrity: sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==} + engines: {node: '>=14.21.3'} + peerDependencies: + '@ianvs/prettier-plugin-sort-imports': '*' + '@prettier/plugin-pug': '*' + '@shopify/prettier-plugin-liquid': '*' + '@trivago/prettier-plugin-sort-imports': '*' + prettier: ^3.0 + prettier-plugin-astro: '*' + prettier-plugin-css-order: '*' + prettier-plugin-import-sort: '*' + prettier-plugin-jsdoc: '*' + prettier-plugin-marko: '*' + prettier-plugin-organize-attributes: '*' + prettier-plugin-organize-imports: '*' + prettier-plugin-style-order: '*' + prettier-plugin-svelte: '*' + prettier-plugin-twig-melody: '*' + peerDependenciesMeta: + '@ianvs/prettier-plugin-sort-imports': + optional: true + '@prettier/plugin-pug': + optional: true + '@shopify/prettier-plugin-liquid': + optional: true + '@trivago/prettier-plugin-sort-imports': + optional: true + prettier-plugin-astro: + optional: true + prettier-plugin-css-order: + optional: true + prettier-plugin-import-sort: + optional: true + prettier-plugin-jsdoc: + optional: true + prettier-plugin-marko: + optional: true + prettier-plugin-organize-attributes: + optional: true + prettier-plugin-organize-imports: + optional: true + prettier-plugin-style-order: + optional: true + prettier-plugin-svelte: + optional: true + prettier-plugin-twig-melody: + optional: true + dependencies: + '@ianvs/prettier-plugin-sort-imports': 4.1.0(prettier@3.1.0) + prettier: 3.1.0 + dev: true + /prettier-plugin-tailwindcss@0.5.7(@ianvs/prettier-plugin-sort-imports@4.1.0)(prettier-plugin-astro@0.11.0)(prettier@3.1.0): resolution: {integrity: sha512-4v6uESAgwCni6YF6DwJlRaDjg9Z+al5zM4JfngcazMy4WEf/XkPS5TEQjbD+DZ5iNuG6RrKQLa/HuX2SYzC3kQ==} engines: {node: '>=14.21.3'} @@ -8815,6 +9016,12 @@ packages: engines: {node: '>=14'} hasBin: true + /prettier@3.2.4: + resolution: {integrity: sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==} + engines: {node: '>=14'} + hasBin: true + dev: true + /pretty-format@3.8.0: resolution: {integrity: sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==} dev: true @@ -8956,14 +9163,6 @@ packages: use-sidecar: 1.1.2(@types/react@18.2.33)(react@18.2.0) dev: false - /react-ssr-prepass@1.5.0(react@18.2.0): - resolution: {integrity: sha512-yFNHrlVEReVYKsLI5lF05tZoHveA5pGzjFbFJY/3pOqqjGOmMmqx83N4hIjN2n6E1AOa+eQEUxs3CgRnPmT0RQ==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - dependencies: - react: 18.2.0 - dev: true - /react-style-singleton@2.2.1(@types/react@18.2.33)(react@18.2.0): resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==} engines: {node: '>=10'} @@ -9362,12 +9561,6 @@ packages: dependencies: queue-microtask: 1.2.3 - /rxjs@7.8.1: - resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} - dependencies: - tslib: 2.5.0 - dev: true - /s.color@0.0.15: resolution: {integrity: sha512-AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA==} @@ -10004,6 +10197,37 @@ packages: transitivePeerDependencies: - ts-node + /tailwindcss@3.4.1: + resolution: {integrity: sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==} + engines: {node: '>=14.0.0'} + hasBin: true + dependencies: + '@alloc/quick-lru': 5.2.0 + arg: 5.0.2 + chokidar: 3.5.3 + didyoumean: 1.2.2 + dlv: 1.1.3 + fast-glob: 3.3.1 + glob-parent: 6.0.2 + is-glob: 4.0.3 + jiti: 1.21.0 + lilconfig: 2.1.0 + micromatch: 4.0.5 + normalize-path: 3.0.0 + object-hash: 3.0.0 + picocolors: 1.0.0 + postcss: 8.4.31 + postcss-import: 15.1.0(postcss@8.4.31) + postcss-js: 4.0.1(postcss@8.4.31) + postcss-load-config: 4.0.1(postcss@8.4.31) + postcss-nested: 6.0.1(postcss@8.4.31) + postcss-selector-parser: 6.0.11 + resolve: 1.22.8 + sucrase: 3.32.0 + transitivePeerDependencies: + - ts-node + dev: true + /tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} @@ -10219,7 +10443,7 @@ packages: /tslib@2.5.0: resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} - /tsup@6.7.0(postcss@8.4.31)(typescript@5.0.4): + /tsup@6.7.0(postcss@8.4.31)(typescript@5.3.3): resolution: {integrity: sha512-L3o8hGkaHnu5TdJns+mCqFsDBo83bJ44rlK7e6VdanIvpea4ArPcU3swWGsLVbXak1PqQx/V+SSmFPujBK+zEQ==} engines: {node: '>=14.18'} hasBin: true @@ -10250,7 +10474,7 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.32.0 tree-kill: 1.2.2 - typescript: 5.0.4 + typescript: 5.3.3 transitivePeerDependencies: - supports-color - ts-node @@ -10421,6 +10645,11 @@ packages: engines: {node: '>=12.20'} hasBin: true + /typescript@5.3.3: + resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} + engines: {node: '>=14.17'} + hasBin: true + /unbox-primitive@1.0.2: resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} dependencies: @@ -10618,14 +10847,6 @@ packages: tslib: 2.5.0 dev: false - /use-sync-external-store@1.2.0(react@18.2.0): - resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - dependencies: - react: 18.2.0 - dev: true - /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -10784,6 +11005,7 @@ packages: dependencies: glob-to-regexp: 0.4.1 graceful-fs: 4.2.11 + dev: false /wcwidth@1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} From d7d4d4ec617b2c7fa830d5f724a53e74aab48035 Mon Sep 17 00:00:00 2001 From: juliusmarminge Date: Tue, 23 Jan 2024 09:40:51 +0100 Subject: [PATCH 02/14] up base package.json --- cli/template/base/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/template/base/package.json b/cli/template/base/package.json index ddb758b809..12e6cf5e09 100644 --- a/cli/template/base/package.json +++ b/cli/template/base/package.json @@ -11,20 +11,20 @@ }, "dependencies": { "@t3-oss/env-nextjs": "^0.7.1", - "next": "^14.0.4", + "next": "^14.1.0", "react": "18.2.0", "react-dom": "18.2.0", "zod": "^3.22.4" }, "devDependencies": { "@types/eslint": "^8.44.7", - "@types/node": "^18.17.0", + "@types/node": "^20.11.5", "@types/react": "^18.2.37", "@types/react-dom": "^18.2.15", "@typescript-eslint/eslint-plugin": "^6.11.0", "@typescript-eslint/parser": "^6.11.0", "eslint": "^8.54.0", - "eslint-config-next": "^14.0.4", - "typescript": "^5.1.6" + "eslint-config-next": "^14.1.0", + "typescript": "^5.3.3" } } From 581180323df95796f09055cf1f6cc3453d7fb617 Mon Sep 17 00:00:00 2001 From: juliusmarminge Date: Tue, 23 Jan 2024 09:44:52 +0100 Subject: [PATCH 03/14] lint-fix --- cli/package.json | 6 +- pnpm-lock.yaml | 273 +++---------------------------------------- upgrade/package.json | 2 +- 3 files changed, 17 insertions(+), 264 deletions(-) diff --git a/cli/package.json b/cli/package.json index dcb1c08828..706833a46f 100644 --- a/cli/package.json +++ b/cli/package.json @@ -82,15 +82,15 @@ "next": "^14.1.0", "next-auth": "^4.24.5", "prettier": "^3.1.0", - "prettier-plugin-tailwindcss": "^0.5.11", + "prettier-plugin-tailwindcss": "^0.5.7", "prisma": "^5.6.0", "react": "18.2.0", "react-dom": "18.2.0", "superjson": "^2.2.1", - "tailwindcss": "^3.4.1", + "tailwindcss": "^3.3.5", "tsup": "^6.7.0", "type-fest": "^3.7.0", - "typescript": "^5.3.3", + "typescript": "^5.0.4", "zod": "^3.22.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7c92799989..0264b8e3e0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -115,7 +115,7 @@ importers: version: 5.6.0(prisma@5.6.0) '@t3-oss/env-nextjs': specifier: ^0.7.1 - version: 0.7.1(typescript@5.3.3)(zod@3.22.4) + version: 0.7.1(typescript@5.0.4)(zod@3.22.4) '@tanstack/react-query': specifier: ^5.17.19 version: 5.17.19(react@18.2.0) @@ -156,8 +156,8 @@ importers: specifier: ^3.1.0 version: 3.1.0 prettier-plugin-tailwindcss: - specifier: ^0.5.11 - version: 0.5.11(@ianvs/prettier-plugin-sort-imports@4.1.0)(prettier@3.1.0) + specifier: ^0.5.7 + version: 0.5.7(@ianvs/prettier-plugin-sort-imports@4.1.0)(prettier-plugin-astro@0.11.0)(prettier@3.1.0) prisma: specifier: ^5.6.0 version: 5.6.0 @@ -171,17 +171,17 @@ importers: specifier: ^2.2.1 version: 2.2.1 tailwindcss: - specifier: ^3.4.1 - version: 3.4.1 + specifier: ^3.3.5 + version: 3.3.5 tsup: specifier: ^6.7.0 - version: 6.7.0(postcss@8.4.31)(typescript@5.3.3) + version: 6.7.0(postcss@8.4.31)(typescript@5.0.4) type-fest: specifier: ^3.7.0 version: 3.7.0 typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.0.4 + version: 5.0.4 zod: specifier: ^3.22.4 version: 3.22.4 @@ -231,8 +231,8 @@ importers: specifier: ^0.263.1 version: 0.263.1(react@18.2.0) next: - specifier: ^14.0.3 - version: 14.0.3(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0) + specifier: ^14.1.0 + version: 14.1.0(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -2384,13 +2384,8 @@ packages: next-auth: 4.24.5(next@14.1.0)(react-dom@18.2.0)(react@18.2.0) dev: true - /@next/env@14.0.3: - resolution: {integrity: sha512-7xRqh9nMvP5xrW4/+L0jgRRX+HoNRGnfJpD+5Wq6/13j3dsdzxO3BCXn7D3hMqsDb+vjZnJq+vI7+EtgrYZTeA==} - dev: false - /@next/env@14.1.0: resolution: {integrity: sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==} - dev: true /@next/eslint-plugin-next@14.0.0: resolution: {integrity: sha512-Ye37nNI09V3yt7pzuzSQtwlvuJ2CGzFszHXkcTHHZgNr7EhTMFLipn3VSJChy+e5+ahTdNApPphc3qCPUsn10A==} @@ -2413,31 +2408,12 @@ packages: source-map: 0.7.4 dev: false - /@next/swc-darwin-arm64@14.0.3: - resolution: {integrity: sha512-64JbSvi3nbbcEtyitNn2LEDS/hcleAFpHdykpcnrstITFlzFgB/bW0ER5/SJJwUPj+ZPY+z3e+1jAfcczRLVGw==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - /@next/swc-darwin-arm64@14.1.0: resolution: {integrity: sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] requiresBuild: true - dev: true - optional: true - - /@next/swc-darwin-x64@14.0.3: - resolution: {integrity: sha512-RkTf+KbAD0SgYdVn1XzqE/+sIxYGB7NLMZRn9I4Z24afrhUpVJx6L8hsRnIwxz3ERE2NFURNliPjJ2QNfnWicQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: false optional: true /@next/swc-darwin-x64@14.1.0: @@ -2446,16 +2422,6 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true - dev: true - optional: true - - /@next/swc-linux-arm64-gnu@14.0.3: - resolution: {integrity: sha512-3tBWGgz7M9RKLO6sPWC6c4pAw4geujSwQ7q7Si4d6bo0l6cLs4tmO+lnSwFp1Tm3lxwfMk0SgkJT7EdwYSJvcg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: false optional: true /@next/swc-linux-arm64-gnu@14.1.0: @@ -2464,16 +2430,6 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: true - optional: true - - /@next/swc-linux-arm64-musl@14.0.3: - resolution: {integrity: sha512-v0v8Kb8j8T23jvVUWZeA2D8+izWspeyeDGNaT2/mTHWp7+37fiNfL8bmBWiOmeumXkacM/AB0XOUQvEbncSnHA==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: false optional: true /@next/swc-linux-arm64-musl@14.1.0: @@ -2482,16 +2438,6 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: true - optional: true - - /@next/swc-linux-x64-gnu@14.0.3: - resolution: {integrity: sha512-VM1aE1tJKLBwMGtyBR21yy+STfl0MapMQnNrXkxeyLs0GFv/kZqXS5Jw/TQ3TSUnbv0QPDf/X8sDXuMtSgG6eg==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: false optional: true /@next/swc-linux-x64-gnu@14.1.0: @@ -2500,16 +2446,6 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: true - optional: true - - /@next/swc-linux-x64-musl@14.0.3: - resolution: {integrity: sha512-64EnmKy18MYFL5CzLaSuUn561hbO1Gk16jM/KHznYP3iCIfF9e3yULtHaMy0D8zbHfxset9LTOv6cuYKJgcOxg==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: false optional: true /@next/swc-linux-x64-musl@14.1.0: @@ -2518,16 +2454,6 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: true - optional: true - - /@next/swc-win32-arm64-msvc@14.0.3: - resolution: {integrity: sha512-WRDp8QrmsL1bbGtsh5GqQ/KWulmrnMBgbnb+59qNTW1kVi1nG/2ndZLkcbs2GX7NpFLlToLRMWSQXmPzQm4tog==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: false optional: true /@next/swc-win32-arm64-msvc@14.1.0: @@ -2536,16 +2462,6 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true - dev: true - optional: true - - /@next/swc-win32-ia32-msvc@14.0.3: - resolution: {integrity: sha512-EKffQeqCrj+t6qFFhIFTRoqb2QwX1mU7iTOvMyLbYw3QtqTw9sMwjykyiMlZlrfm2a4fA84+/aeW+PMg1MjuTg==} - engines: {node: '>= 10'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: false optional: true /@next/swc-win32-ia32-msvc@14.1.0: @@ -2554,16 +2470,6 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true - dev: true - optional: true - - /@next/swc-win32-x64-msvc@14.0.3: - resolution: {integrity: sha512-ERhKPSJ1vQrPiwrs15Pjz/rvDHZmkmvbf/BjPN/UCOI++ODftT0GtasDPi0j+y6PPJi5HsXw+dpRaXUaw4vjuQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: false optional: true /@next/swc-win32-x64-msvc@14.1.0: @@ -2572,7 +2478,6 @@ packages: cpu: [x64] os: [win32] requiresBuild: true - dev: true optional: true /@nodelib/fs.scandir@2.1.5: @@ -3257,20 +3162,6 @@ packages: dependencies: typescript: 5.0.4 zod: 3.22.4 - dev: false - - /@t3-oss/env-core@0.7.1(typescript@5.3.3)(zod@3.22.4): - resolution: {integrity: sha512-3+SQt39OlmSaRLqYVFv8uRm1BpFepM5TIiMytRqO9cjH+wB77o6BIJdeyM5h5U4qLBMEzOJWCY4MBaU/rLwbYw==} - peerDependencies: - typescript: '>=4.7.2' - zod: ^3.0.0 - peerDependenciesMeta: - typescript: - optional: true - dependencies: - typescript: 5.3.3 - zod: 3.22.4 - dev: true /@t3-oss/env-nextjs@0.7.1(typescript@5.0.4)(zod@3.22.4): resolution: {integrity: sha512-tQDbNLGCOvKGi+JoGuJ/CJInJI7/kLWJqtgGppAKS7ZFLdVOqZYR/uRjxlXOWPnxmUKF8VswOAsq7fXUpNZDhA==} @@ -3284,21 +3175,6 @@ packages: '@t3-oss/env-core': 0.7.1(typescript@5.0.4)(zod@3.22.4) typescript: 5.0.4 zod: 3.22.4 - dev: false - - /@t3-oss/env-nextjs@0.7.1(typescript@5.3.3)(zod@3.22.4): - resolution: {integrity: sha512-tQDbNLGCOvKGi+JoGuJ/CJInJI7/kLWJqtgGppAKS7ZFLdVOqZYR/uRjxlXOWPnxmUKF8VswOAsq7fXUpNZDhA==} - peerDependencies: - typescript: '>=4.7.2' - zod: ^3.0.0 - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@t3-oss/env-core': 0.7.1(typescript@5.3.3)(zod@3.22.4) - typescript: 5.3.3 - zod: 3.22.4 - dev: true /@tanstack/query-core@5.17.19: resolution: {integrity: sha512-Lzw8FUtnLCc9Jwz0sw9xOjZB+/mCCmJev38v2wHMUl/ioXNIhnNWeMxu0NKUjIhAd62IRB3eAtvxAGDJ55UkyA==} @@ -4525,6 +4401,7 @@ packages: /caniuse-lite@1.0.30001515: resolution: {integrity: sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA==} + dev: true /caniuse-lite@1.0.30001579: resolution: {integrity: sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==} @@ -8183,45 +8060,6 @@ packages: resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} dev: true - /next@14.0.3(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-AbYdRNfImBr3XGtvnwOxq8ekVCwbFTv/UJoLwmaX89nk9i051AEY4/HAWzU0YpaTDw8IofUpmuIlvzWF13jxIw==} - engines: {node: '>=18.17.0'} - hasBin: true - peerDependencies: - '@opentelemetry/api': ^1.1.0 - react: ^18.2.0 - react-dom: ^18.2.0 - sass: ^1.3.0 - peerDependenciesMeta: - '@opentelemetry/api': - optional: true - sass: - optional: true - dependencies: - '@next/env': 14.0.3 - '@swc/helpers': 0.5.2 - busboy: 1.6.0 - caniuse-lite: 1.0.30001515 - postcss: 8.4.31 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - styled-jsx: 5.1.1(@babel/core@7.22.9)(react@18.2.0) - watchpack: 2.4.0 - optionalDependencies: - '@next/swc-darwin-arm64': 14.0.3 - '@next/swc-darwin-x64': 14.0.3 - '@next/swc-linux-arm64-gnu': 14.0.3 - '@next/swc-linux-arm64-musl': 14.0.3 - '@next/swc-linux-x64-gnu': 14.0.3 - '@next/swc-linux-x64-musl': 14.0.3 - '@next/swc-win32-arm64-msvc': 14.0.3 - '@next/swc-win32-ia32-msvc': 14.0.3 - '@next/swc-win32-x64-msvc': 14.0.3 - transitivePeerDependencies: - - '@babel/core' - - babel-plugin-macros - dev: false - /next@14.1.0(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-wlzrsbfeSU48YQBjZhDzOwhWhGsy+uQycR8bHAOt1LY1bn3zZEcDyHQOEoN3aWzQ8LHCAJ1nqrWCc9XF2+O45Q==} engines: {node: '>=18.17.0'} @@ -8259,7 +8097,6 @@ packages: transitivePeerDependencies: - '@babel/core' - babel-plugin-macros - dev: true /nlcst-to-string@3.1.1: resolution: {integrity: sha512-63mVyqaqt0cmn2VcI2aH6kxe1rLAmSROqHMA0i4qqg1tidkfExgpb0FGMikMCn86mw5dFtBtEANfmSSK7TjNHw==} @@ -8896,59 +8733,6 @@ packages: sass-formatter: 0.7.6 synckit: 0.8.5 - /prettier-plugin-tailwindcss@0.5.11(@ianvs/prettier-plugin-sort-imports@4.1.0)(prettier@3.1.0): - resolution: {integrity: sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==} - engines: {node: '>=14.21.3'} - peerDependencies: - '@ianvs/prettier-plugin-sort-imports': '*' - '@prettier/plugin-pug': '*' - '@shopify/prettier-plugin-liquid': '*' - '@trivago/prettier-plugin-sort-imports': '*' - prettier: ^3.0 - prettier-plugin-astro: '*' - prettier-plugin-css-order: '*' - prettier-plugin-import-sort: '*' - prettier-plugin-jsdoc: '*' - prettier-plugin-marko: '*' - prettier-plugin-organize-attributes: '*' - prettier-plugin-organize-imports: '*' - prettier-plugin-style-order: '*' - prettier-plugin-svelte: '*' - prettier-plugin-twig-melody: '*' - peerDependenciesMeta: - '@ianvs/prettier-plugin-sort-imports': - optional: true - '@prettier/plugin-pug': - optional: true - '@shopify/prettier-plugin-liquid': - optional: true - '@trivago/prettier-plugin-sort-imports': - optional: true - prettier-plugin-astro: - optional: true - prettier-plugin-css-order: - optional: true - prettier-plugin-import-sort: - optional: true - prettier-plugin-jsdoc: - optional: true - prettier-plugin-marko: - optional: true - prettier-plugin-organize-attributes: - optional: true - prettier-plugin-organize-imports: - optional: true - prettier-plugin-style-order: - optional: true - prettier-plugin-svelte: - optional: true - prettier-plugin-twig-melody: - optional: true - dependencies: - '@ianvs/prettier-plugin-sort-imports': 4.1.0(prettier@3.1.0) - prettier: 3.1.0 - dev: true - /prettier-plugin-tailwindcss@0.5.7(@ianvs/prettier-plugin-sort-imports@4.1.0)(prettier-plugin-astro@0.11.0)(prettier@3.1.0): resolution: {integrity: sha512-4v6uESAgwCni6YF6DwJlRaDjg9Z+al5zM4JfngcazMy4WEf/XkPS5TEQjbD+DZ5iNuG6RrKQLa/HuX2SYzC3kQ==} engines: {node: '>=14.21.3'} @@ -10197,37 +9981,6 @@ packages: transitivePeerDependencies: - ts-node - /tailwindcss@3.4.1: - resolution: {integrity: sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==} - engines: {node: '>=14.0.0'} - hasBin: true - dependencies: - '@alloc/quick-lru': 5.2.0 - arg: 5.0.2 - chokidar: 3.5.3 - didyoumean: 1.2.2 - dlv: 1.1.3 - fast-glob: 3.3.1 - glob-parent: 6.0.2 - is-glob: 4.0.3 - jiti: 1.21.0 - lilconfig: 2.1.0 - micromatch: 4.0.5 - normalize-path: 3.0.0 - object-hash: 3.0.0 - picocolors: 1.0.0 - postcss: 8.4.31 - postcss-import: 15.1.0(postcss@8.4.31) - postcss-js: 4.0.1(postcss@8.4.31) - postcss-load-config: 4.0.1(postcss@8.4.31) - postcss-nested: 6.0.1(postcss@8.4.31) - postcss-selector-parser: 6.0.11 - resolve: 1.22.8 - sucrase: 3.32.0 - transitivePeerDependencies: - - ts-node - dev: true - /tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} @@ -10443,7 +10196,7 @@ packages: /tslib@2.5.0: resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} - /tsup@6.7.0(postcss@8.4.31)(typescript@5.3.3): + /tsup@6.7.0(postcss@8.4.31)(typescript@5.0.4): resolution: {integrity: sha512-L3o8hGkaHnu5TdJns+mCqFsDBo83bJ44rlK7e6VdanIvpea4ArPcU3swWGsLVbXak1PqQx/V+SSmFPujBK+zEQ==} engines: {node: '>=14.18'} hasBin: true @@ -10474,7 +10227,7 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.32.0 tree-kill: 1.2.2 - typescript: 5.3.3 + typescript: 5.0.4 transitivePeerDependencies: - supports-color - ts-node diff --git a/upgrade/package.json b/upgrade/package.json index 29390dc7a1..fec8173a87 100644 --- a/upgrade/package.json +++ b/upgrade/package.json @@ -29,7 +29,7 @@ "clsx": "^1.2.1", "gitdiff-parser": "^0.3.1", "lucide-react": "^0.263.1", - "next": "^14.0.3", + "next": "^14.1.0", "react": "18.2.0", "react-diff-view": "^3.0.3", "react-dom": "18.2.0", From 54bd7f750f208e78afd7a7565d183b92b192e25d Mon Sep 17 00:00:00 2001 From: juliusmarminge Date: Tue, 23 Jan 2024 09:57:24 +0100 Subject: [PATCH 04/14] fix adapter version --- cli/package.json | 1 - cli/src/installers/dependencyVersionMap.ts | 2 +- cli/src/installers/nextAuth.ts | 2 +- .../extras/src/server/auth-app/with-prisma.ts | 5 +++-- .../extras/src/server/auth-pages/with-prisma.ts | 5 +++-- pnpm-lock.yaml | 13 ------------- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/cli/package.json b/cli/package.json index 706833a46f..e917c98d42 100644 --- a/cli/package.json +++ b/cli/package.json @@ -64,7 +64,6 @@ "devDependencies": { "@auth/drizzle-adapter": "^0.3.16", "@auth/prisma-adapter": "^1.0.16", - "@next-auth/prisma-adapter": "^1.0.7", "@planetscale/database": "^1.14.0", "@prisma/adapter-planetscale": "^5.6.0", "@prisma/client": "^5.6.0", diff --git a/cli/src/installers/dependencyVersionMap.ts b/cli/src/installers/dependencyVersionMap.ts index 19340aa8d7..ab18ed3a20 100644 --- a/cli/src/installers/dependencyVersionMap.ts +++ b/cli/src/installers/dependencyVersionMap.ts @@ -5,7 +5,7 @@ export const dependencyVersionMap = { // NextAuth.js "next-auth": "^4.24.5", - "@next-auth/prisma-adapter": "^1.0.16", + "@auth/prisma-adapter": "^1.0.16", "@auth/drizzle-adapter": "^0.3.16", // Prisma diff --git a/cli/src/installers/nextAuth.ts b/cli/src/installers/nextAuth.ts index 3317eee0b0..0886e90d7e 100644 --- a/cli/src/installers/nextAuth.ts +++ b/cli/src/installers/nextAuth.ts @@ -15,7 +15,7 @@ export const nextAuthInstaller: Installer = ({ const usingDrizzle = packages?.drizzle.inUse; const deps: AvailableDependencies[] = ["next-auth"]; - if (usingPrisma) deps.push("@next-auth/prisma-adapter"); + if (usingPrisma) deps.push("@auth/prisma-adapter"); if (usingDrizzle) deps.push("@auth/drizzle-adapter"); addPackageDependency({ diff --git a/cli/template/extras/src/server/auth-app/with-prisma.ts b/cli/template/extras/src/server/auth-app/with-prisma.ts index d1f119f936..117984c9bd 100644 --- a/cli/template/extras/src/server/auth-app/with-prisma.ts +++ b/cli/template/extras/src/server/auth-app/with-prisma.ts @@ -1,9 +1,10 @@ -import { PrismaAdapter } from "@next-auth/prisma-adapter"; +import { PrismaAdapter } from "@auth/prisma-adapter"; import { getServerSession, type DefaultSession, type NextAuthOptions, } from "next-auth"; +import { type Adapter } from "next-auth/adapters"; import DiscordProvider from "next-auth/providers/discord"; import { env } from "~/env"; @@ -45,7 +46,7 @@ export const authOptions: NextAuthOptions = { }, }), }, - adapter: PrismaAdapter(db), + adapter: PrismaAdapter(db) as Adapter, providers: [ DiscordProvider({ clientId: env.DISCORD_CLIENT_ID, diff --git a/cli/template/extras/src/server/auth-pages/with-prisma.ts b/cli/template/extras/src/server/auth-pages/with-prisma.ts index 1c5d36808b..ee03a40d73 100644 --- a/cli/template/extras/src/server/auth-pages/with-prisma.ts +++ b/cli/template/extras/src/server/auth-pages/with-prisma.ts @@ -1,10 +1,11 @@ -import { PrismaAdapter } from "@next-auth/prisma-adapter"; +import { PrismaAdapter } from "@auth/prisma-adapter"; import { type GetServerSidePropsContext } from "next"; import { getServerSession, type DefaultSession, type NextAuthOptions, } from "next-auth"; +import { type Adapter } from "next-auth/adapters"; import DiscordProvider from "next-auth/providers/discord"; import { env } from "~/env"; @@ -46,7 +47,7 @@ export const authOptions: NextAuthOptions = { }, }), }, - adapter: PrismaAdapter(db), + adapter: PrismaAdapter(db) as Adapter, providers: [ DiscordProvider({ clientId: env.DISCORD_CLIENT_ID, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0264b8e3e0..b1c04462cc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -101,9 +101,6 @@ importers: '@auth/prisma-adapter': specifier: ^1.0.16 version: 1.0.16(@prisma/client@5.6.0) - '@next-auth/prisma-adapter': - specifier: ^1.0.7 - version: 1.0.7(@prisma/client@5.6.0)(next-auth@4.24.5) '@planetscale/database': specifier: ^1.14.0 version: 1.14.0 @@ -2374,16 +2371,6 @@ packages: - supports-color dev: false - /@next-auth/prisma-adapter@1.0.7(@prisma/client@5.6.0)(next-auth@4.24.5): - resolution: {integrity: sha512-Cdko4KfcmKjsyHFrWwZ//lfLUbcLqlyFqjd/nYE2m3aZ7tjMNUjpks47iw7NTCnXf+5UWz5Ypyt1dSs1EP5QJw==} - peerDependencies: - '@prisma/client': '>=2.26.0 || >=3' - next-auth: ^4 - dependencies: - '@prisma/client': 5.6.0(prisma@5.6.0) - next-auth: 4.24.5(next@14.1.0)(react-dom@18.2.0)(react@18.2.0) - dev: true - /@next/env@14.1.0: resolution: {integrity: sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==} From d11fb91cd236588b45775a42440b6b33add393ec Mon Sep 17 00:00:00 2001 From: juliusmarminge Date: Tue, 23 Jan 2024 09:59:19 +0100 Subject: [PATCH 05/14] isPending --- cli/template/extras/src/app/_components/create-post-tw.tsx | 4 ++-- cli/template/extras/src/app/_components/create-post.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/template/extras/src/app/_components/create-post-tw.tsx b/cli/template/extras/src/app/_components/create-post-tw.tsx index 02d7c382b8..da3a1c8ff8 100644 --- a/cli/template/extras/src/app/_components/create-post-tw.tsx +++ b/cli/template/extras/src/app/_components/create-post-tw.tsx @@ -34,9 +34,9 @@ export function CreatePost() { ); diff --git a/cli/template/extras/src/app/_components/create-post.tsx b/cli/template/extras/src/app/_components/create-post.tsx index df7088c7b9..a23e035566 100644 --- a/cli/template/extras/src/app/_components/create-post.tsx +++ b/cli/template/extras/src/app/_components/create-post.tsx @@ -35,9 +35,9 @@ export function CreatePost() { ); From b6c8ea7bba766649359906edddd4ef26599b0ec9 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 23 Jan 2024 11:15:08 +0100 Subject: [PATCH 06/14] Create thirty-onions-tickle.md --- .changeset/thirty-onions-tickle.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/thirty-onions-tickle.md diff --git a/.changeset/thirty-onions-tickle.md b/.changeset/thirty-onions-tickle.md new file mode 100644 index 0000000000..c77401c960 --- /dev/null +++ b/.changeset/thirty-onions-tickle.md @@ -0,0 +1,5 @@ +--- +"create-t3-app": patch +--- + +feat: use trpc 11 From 3af78ac4e5cb392cde4b02f9946fc6dcce93717e Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Thu, 15 Feb 2024 01:56:25 +0100 Subject: [PATCH 07/14] move-transformer-1 --- cli/template/extras/src/trpc/react.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/template/extras/src/trpc/react.tsx b/cli/template/extras/src/trpc/react.tsx index 6265a60efe..06c119c3bf 100644 --- a/cli/template/extras/src/trpc/react.tsx +++ b/cli/template/extras/src/trpc/react.tsx @@ -15,7 +15,6 @@ export function TRPCReactProvider(props: { children: React.ReactNode }) { const [trpcClient] = useState(() => api.createClient({ - transformer: SuperJSON, links: [ loggerLink({ enabled: (op) => @@ -23,6 +22,7 @@ export function TRPCReactProvider(props: { children: React.ReactNode }) { (op.direction === "down" && op.result instanceof Error), }), unstable_httpBatchStreamLink({ + transformer: SuperJSON, url: getBaseUrl() + "/api/trpc", async headers() { const headers = new Headers(); From 4851a616c6c17d1eec9dcb685fe28c266a5085ec Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Thu, 15 Feb 2024 01:57:55 +0100 Subject: [PATCH 08/14] move-transformer 2 --- cli/template/extras/src/utils/api.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/cli/template/extras/src/utils/api.ts b/cli/template/extras/src/utils/api.ts index f4f4ad5ca4..22d18fea31 100644 --- a/cli/template/extras/src/utils/api.ts +++ b/cli/template/extras/src/utils/api.ts @@ -21,13 +21,6 @@ const getBaseUrl = () => { export const api = createTRPCNext({ config() { return { - /** - * Transformer used for data de-serialization from the server. - * - * @see https://trpc.io/docs/data-transformers - */ - transformer: superjson, - /** * Links used to determine request flow from client to server. * @@ -40,6 +33,12 @@ export const api = createTRPCNext({ (opts.direction === "down" && opts.result instanceof Error), }), httpBatchLink({ + /** + * Transformer used for data de-serialization from the server. + * + * @see https://trpc.io/docs/data-transformers + */ + transformer: superjson, url: `${getBaseUrl()}/api/trpc`, }), ], From 4a9f6e1f2dea75c936e430038e10f9ffd3d64650 Mon Sep 17 00:00:00 2001 From: juliusmarminge Date: Thu, 15 Feb 2024 10:36:22 +0100 Subject: [PATCH 09/14] bump --- pnpm-lock.yaml | 347 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 263 insertions(+), 84 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b1c04462cc..92328651f9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -117,17 +117,17 @@ importers: specifier: ^5.17.19 version: 5.17.19(react@18.2.0) '@trpc/client': - specifier: next - version: 11.0.0-next-beta.228(@trpc/server@11.0.0-next-beta.228) + specifier: 11.0.0-next-beta.283 + version: 11.0.0-next-beta.283(@trpc/server@11.0.0-next-beta.283) '@trpc/next': - specifier: next - version: 11.0.0-next-beta.228(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.228)(@trpc/react-query@11.0.0-next-beta.228)(@trpc/server@11.0.0-next-beta.228)(next@14.1.0)(react-dom@18.2.0)(react@18.2.0) + specifier: 11.0.0-next-beta.283 + version: 11.0.0-next-beta.283(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.283)(@trpc/react-query@11.0.0-next-beta.283)(@trpc/server@11.0.0-next-beta.283)(next@14.1.0)(react-dom@18.2.0)(react@18.2.0) '@trpc/react-query': - specifier: next - version: 11.0.0-next-beta.228(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.228)(@trpc/server@11.0.0-next-beta.228)(react-dom@18.2.0)(react@18.2.0) + specifier: 11.0.0-next-beta.283 + version: 11.0.0-next-beta.283(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.283)(@trpc/server@11.0.0-next-beta.283)(react-dom@18.2.0)(react@18.2.0) '@trpc/server': - specifier: next - version: 11.0.0-next-beta.228 + specifier: 11.0.0-next-beta.283 + version: 11.0.0-next-beta.283 '@types/fs-extra': specifier: ^11.0.1 version: 11.0.1 @@ -190,7 +190,7 @@ importers: version: 4.1.0(prettier@3.1.0) '@mdx-js/loader': specifier: ^2.3.0 - version: 2.3.0(webpack@5.88.2) + version: 2.3.0(webpack@5.90.1) '@next/mdx': specifier: ^13.4.1 version: 13.4.1(@mdx-js/loader@2.3.0) @@ -317,7 +317,7 @@ importers: version: 0.16.8(astro@2.5.5)(sharp@0.32.6) '@astrojs/mdx': specifier: ^0.19.1 - version: 0.19.1(astro@2.5.5)(rollup@3.26.3) + version: 0.19.1(astro@2.5.5)(rollup@4.11.0) '@astrojs/sitemap': specifier: ^1.3.1 version: 1.3.1 @@ -677,14 +677,14 @@ packages: transitivePeerDependencies: - supports-color - /@astrojs/mdx@0.19.1(astro@2.5.5)(rollup@3.26.3): + /@astrojs/mdx@0.19.1(astro@2.5.5)(rollup@4.11.0): resolution: {integrity: sha512-9GNNZbGT+lGvbRkQK/NaEJcnjj1T94/ne0KwPjJgNCBQrJuskX5IW1hKiE5bRSOFvkAOrBGneYKg0GXYArBOQQ==} engines: {node: '>=16.12.0'} dependencies: '@astrojs/markdown-remark': 2.2.1(astro@2.5.5) '@astrojs/prism': 2.1.2 '@mdx-js/mdx': 2.3.0 - '@mdx-js/rollup': 2.3.0(rollup@3.26.3) + '@mdx-js/rollup': 2.3.0(rollup@4.11.0) acorn: 8.8.2 es-module-lexer: 1.3.0 estree-util-visit: 1.2.1 @@ -2208,10 +2208,24 @@ packages: '@jridgewell/sourcemap-codec': 1.4.14 '@jridgewell/trace-mapping': 0.3.17 + /@jridgewell/gen-mapping@0.3.3: + resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} + engines: {node: '>=6.0.0'} + dependencies: + '@jridgewell/set-array': 1.1.2 + '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/trace-mapping': 0.3.22 + dev: false + /@jridgewell/resolve-uri@3.1.0: resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} engines: {node: '>=6.0.0'} + /@jridgewell/resolve-uri@3.1.2: + resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} + engines: {node: '>=6.0.0'} + dev: false + /@jridgewell/set-array@1.1.2: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} engines: {node: '>=6.0.0'} @@ -2219,19 +2233,30 @@ packages: /@jridgewell/source-map@0.3.5: resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==} dependencies: - '@jridgewell/gen-mapping': 0.3.2 - '@jridgewell/trace-mapping': 0.3.17 + '@jridgewell/gen-mapping': 0.3.3 + '@jridgewell/trace-mapping': 0.3.22 dev: false /@jridgewell/sourcemap-codec@1.4.14: resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} + /@jridgewell/sourcemap-codec@1.4.15: + resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + dev: false + /@jridgewell/trace-mapping@0.3.17: resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==} dependencies: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.14 + /@jridgewell/trace-mapping@0.3.22: + resolution: {integrity: sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==} + dependencies: + '@jridgewell/resolve-uri': 3.1.2 + '@jridgewell/sourcemap-codec': 1.4.15 + dev: false + /@ljharb/has-package-exports-patterns@0.0.2: resolution: {integrity: sha512-4/RWEeXDO6bocPONheFe6gX/oQdP/bEpv0oL4HqjPP5DCenBSt0mHgahppY49N0CpsaqffdwPq+TlX9CYOq2Dw==} @@ -2321,14 +2346,14 @@ packages: - supports-color dev: false - /@mdx-js/loader@2.3.0(webpack@5.88.2): + /@mdx-js/loader@2.3.0(webpack@5.90.1): resolution: {integrity: sha512-IqsscXh7Q3Rzb+f5DXYk0HU71PK+WuFsEhf+mSV3fOhpLcEpgsHvTQ2h0T6TlZ5gHOaBeFjkXwB52by7ypMyNg==} peerDependencies: webpack: '>=4' dependencies: '@mdx-js/mdx': 2.3.0 source-map: 0.7.4 - webpack: 5.88.2 + webpack: 5.90.1 transitivePeerDependencies: - supports-color dev: false @@ -2357,14 +2382,14 @@ packages: - supports-color dev: false - /@mdx-js/rollup@2.3.0(rollup@3.26.3): + /@mdx-js/rollup@2.3.0(rollup@4.11.0): resolution: {integrity: sha512-wLvRfJS/M4UmdqTd+WoaySEE7q4BIejYf1xAHXYvtT1du/1Tl/z2450Gg2+Hu7fh05KwRRiehiTP9Yc/Dtn0fA==} peerDependencies: rollup: '>=2' dependencies: '@mdx-js/mdx': 2.3.0 - '@rollup/pluginutils': 5.0.2(rollup@3.26.3) - rollup: 3.26.3 + '@rollup/pluginutils': 5.0.2(rollup@4.11.0) + rollup: 4.11.0 source-map: 0.7.4 vfile: 5.3.7 transitivePeerDependencies: @@ -2391,7 +2416,7 @@ packages: '@mdx-js/react': optional: true dependencies: - '@mdx-js/loader': 2.3.0(webpack@5.88.2) + '@mdx-js/loader': 2.3.0(webpack@5.90.1) source-map: 0.7.4 dev: false @@ -3089,7 +3114,7 @@ packages: picomatch: 2.3.1 dev: false - /@rollup/pluginutils@5.0.2(rollup@3.26.3): + /@rollup/pluginutils@5.0.2(rollup@4.11.0): resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -3101,8 +3126,112 @@ packages: '@types/estree': 1.0.0 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 3.26.3 + rollup: 4.11.0 + dev: false + + /@rollup/rollup-android-arm-eabi@4.11.0: + resolution: {integrity: sha512-BV+u2QSfK3i1o6FucqJh5IK9cjAU6icjFFhvknzFgu472jzl0bBojfDAkJLBEsHFMo+YZg6rthBvBBt8z12IBQ==} + cpu: [arm] + os: [android] + requiresBuild: true + dev: false + optional: true + + /@rollup/rollup-android-arm64@4.11.0: + resolution: {integrity: sha512-0ij3iw7sT5jbcdXofWO2NqDNjSVVsf6itcAkV2I6Xsq4+6wjW1A8rViVB67TfBEan7PV2kbLzT8rhOVWLI2YXw==} + cpu: [arm64] + os: [android] + requiresBuild: true dev: false + optional: true + + /@rollup/rollup-darwin-arm64@4.11.0: + resolution: {integrity: sha512-yPLs6RbbBMupArf6qv1UDk6dzZvlH66z6NLYEwqTU0VHtss1wkI4UYeeMS7TVj5QRVvaNAWYKP0TD/MOeZ76Zg==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + + /@rollup/rollup-darwin-x64@4.11.0: + resolution: {integrity: sha512-OvqIgwaGAwnASzXaZEeoJY3RltOFg+WUbdkdfoluh2iqatd090UeOG3A/h0wNZmE93dDew9tAtXgm3/+U/B6bw==} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + + /@rollup/rollup-linux-arm-gnueabihf@4.11.0: + resolution: {integrity: sha512-X17s4hZK3QbRmdAuLd2EE+qwwxL8JxyVupEqAkxKPa/IgX49ZO+vf0ka69gIKsaYeo6c1CuwY3k8trfDtZ9dFg==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@rollup/rollup-linux-arm64-gnu@4.11.0: + resolution: {integrity: sha512-673Lu9EJwxVB9NfYeA4AdNu0FOHz7g9t6N1DmT7bZPn1u6bTF+oZjj+fuxUcrfxWXE0r2jxl5QYMa9cUOj9NFg==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@rollup/rollup-linux-arm64-musl@4.11.0: + resolution: {integrity: sha512-yFW2msTAQNpPJaMmh2NpRalr1KXI7ZUjlN6dY/FhWlOclMrZezm5GIhy3cP4Ts2rIAC+IPLAjNibjp1BsxCVGg==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@rollup/rollup-linux-riscv64-gnu@4.11.0: + resolution: {integrity: sha512-kKT9XIuhbvYgiA3cPAGntvrBgzhWkGpBMzuk1V12Xuoqg7CI41chye4HU0vLJnGf9MiZzfNh4I7StPeOzOWJfA==} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@rollup/rollup-linux-x64-gnu@4.11.0: + resolution: {integrity: sha512-6q4ESWlyTO+erp1PSCmASac+ixaDv11dBk1fqyIuvIUc/CmRAX2Zk+2qK1FGo5q7kyDcjHCFVwgGFCGIZGVwCA==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@rollup/rollup-linux-x64-musl@4.11.0: + resolution: {integrity: sha512-vIAQUmXeMLmaDN78HSE4Kh6xqof2e3TJUKr+LPqXWU4NYNON0MDN9h2+t4KHrPAQNmU3w1GxBQ/n01PaWFwa5w==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@rollup/rollup-win32-arm64-msvc@4.11.0: + resolution: {integrity: sha512-LVXo9dDTGPr0nezMdqa1hK4JeoMZ02nstUxGYY/sMIDtTYlli1ZxTXBYAz3vzuuvKO4X6NBETciIh7N9+abT1g==} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: false + optional: true + + /@rollup/rollup-win32-ia32-msvc@4.11.0: + resolution: {integrity: sha512-xZVt6K70Gr3I7nUhug2dN6VRR1ibot3rXqXS3wo+8JP64t7djc3lBFyqO4GiVrhNaAIhUCJtwQ/20dr0h0thmQ==} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: false + optional: true + + /@rollup/rollup-win32-x64-msvc@4.11.0: + resolution: {integrity: sha512-f3I7h9oTg79UitEco9/2bzwdciYkWr8pITs3meSDSlr1TdvQ7IxkQaaYN2YqZXX5uZhiYL+VuYDmHwNzhx+HOg==} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: false + optional: true /@rushstack/eslint-patch@1.3.3: resolution: {integrity: sha512-0xd7qez0AQ+MbHatZTlI1gu5vkG8r7MYRUJAHPAHJBmGLs16zpkrpAVLvjQKQOqaXPDUBwOiJzNc00znHSCVBw==} @@ -3180,21 +3309,21 @@ packages: resolution: {integrity: sha512-yXt2BRRVCJVvzWaxac5n0nCXzIrQEBE/MeYlNQ8/Iq7UeelNmm/AdnUAu18ilSS893mbEQ4u6whPt/HvOPc4rw==} dev: false - /@trpc/client@11.0.0-next-beta.228(@trpc/server@11.0.0-next-beta.228): - resolution: {integrity: sha512-LM7vHbzJBzOs31nONUQV0Mdxsuz7YNt6KDe+5BnLDFS7qXcUcgVj6lpFgtglWEOEDBa02OHQYujyzrajvb3asA==} + /@trpc/client@11.0.0-next-beta.283(@trpc/server@11.0.0-next-beta.283): + resolution: {integrity: sha512-lnYvtXagHbwZXS7XHeb/nfPc9JsFIIp7j2/24FTEF/tsgrBZ2Ax1keqXNt3+nOUp4bZ+d60QCHg+ZpBG2t6M5w==} peerDependencies: - '@trpc/server': 11.0.0-next-beta.228+38f3240e9 + '@trpc/server': 11.0.0-next-beta.283+44a1b58a3 dependencies: - '@trpc/server': 11.0.0-next-beta.228 + '@trpc/server': 11.0.0-next-beta.283 dev: true - /@trpc/next@11.0.0-next-beta.228(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.228)(@trpc/react-query@11.0.0-next-beta.228)(@trpc/server@11.0.0-next-beta.228)(next@14.1.0)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-LAs46G8rdO0wqDLaodBFMtPqVz6sV1Yizvn8GgFSplSqeV5ofdGhvFU4p3ScoKRWgzQhzhrI3T7zVf10xZQCCA==} + /@trpc/next@11.0.0-next-beta.283(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.283)(@trpc/react-query@11.0.0-next-beta.283)(@trpc/server@11.0.0-next-beta.283)(next@14.1.0)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Pmq38nnibyfhbB1s8UaKBrBn4XMjIJpfIvPdg1tWsZvJMAU4EiGDKSWcfOAyTOJDx0AiXUFDbLLXU3D9bDSYug==} peerDependencies: '@tanstack/react-query': ^5.0.0 - '@trpc/client': 11.0.0-next-beta.228+38f3240e9 - '@trpc/react-query': 11.0.0-next-beta.228+38f3240e9 - '@trpc/server': 11.0.0-next-beta.228+38f3240e9 + '@trpc/client': 11.0.0-next-beta.283+44a1b58a3 + '@trpc/react-query': 11.0.0-next-beta.283+44a1b58a3 + '@trpc/server': 11.0.0-next-beta.283+44a1b58a3 next: '*' react: '>=16.8.0' react-dom: '>=16.8.0' @@ -3205,32 +3334,32 @@ packages: optional: true dependencies: '@tanstack/react-query': 5.17.19(react@18.2.0) - '@trpc/client': 11.0.0-next-beta.228(@trpc/server@11.0.0-next-beta.228) - '@trpc/react-query': 11.0.0-next-beta.228(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.228)(@trpc/server@11.0.0-next-beta.228)(react-dom@18.2.0)(react@18.2.0) - '@trpc/server': 11.0.0-next-beta.228 + '@trpc/client': 11.0.0-next-beta.283(@trpc/server@11.0.0-next-beta.283) + '@trpc/react-query': 11.0.0-next-beta.283(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.283)(@trpc/server@11.0.0-next-beta.283)(react-dom@18.2.0)(react@18.2.0) + '@trpc/server': 11.0.0-next-beta.283 next: 14.1.0(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true - /@trpc/react-query@11.0.0-next-beta.228(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.228)(@trpc/server@11.0.0-next-beta.228)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-c50um14znXEU8WIx/oS6/GtO09OZj3F44KsliC55icS+ugU7z3VNXv79iYyVsulz/unkOvQLVeAkSBhSUfM+7g==} + /@trpc/react-query@11.0.0-next-beta.283(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.283)(@trpc/server@11.0.0-next-beta.283)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Wsnp9Go9g/l0Hb6VURmRlnVhp6kpi67S3U6hCRG4yvkDu83p8Z6/5dIH3lsmg9NYhMx5+NrjLr9Dr1PIr0vv6A==} peerDependencies: '@tanstack/react-query': ^5.0.0 - '@trpc/client': 11.0.0-next-beta.228+38f3240e9 - '@trpc/server': 11.0.0-next-beta.228+38f3240e9 + '@trpc/client': 11.0.0-next-beta.283+44a1b58a3 + '@trpc/server': 11.0.0-next-beta.283+44a1b58a3 react: '>=18.2.0' react-dom: '>=18.2.0' dependencies: '@tanstack/react-query': 5.17.19(react@18.2.0) - '@trpc/client': 11.0.0-next-beta.228(@trpc/server@11.0.0-next-beta.228) - '@trpc/server': 11.0.0-next-beta.228 + '@trpc/client': 11.0.0-next-beta.283(@trpc/server@11.0.0-next-beta.283) + '@trpc/server': 11.0.0-next-beta.283 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true - /@trpc/server@11.0.0-next-beta.228: - resolution: {integrity: sha512-8pRT1Ixrh8310KlPLLwlfEmfWXL9yrJK+mz9jFgvsiEtazR2N7rUFV8SoG2SWGxLkTaPc03o4k1JSf83XDwWRw==} + /@trpc/server@11.0.0-next-beta.283: + resolution: {integrity: sha512-xIQYavC4bIn+FI1v6oZMw1+QoXw5YlZotTeHDSvG+L56MLGcWP6iDcftRuMBxe7XP/1NgF+IL2AlnWicS5KV4g==} dev: true /@types/acorn@4.0.6: @@ -3273,11 +3402,11 @@ packages: dependencies: '@types/ms': 0.7.31 - /@types/eslint-scope@3.7.4: - resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==} + /@types/eslint-scope@3.7.7: + resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==} dependencies: '@types/eslint': 8.37.0 - '@types/estree': 1.0.0 + '@types/estree': 1.0.5 dev: false /@types/eslint@8.37.0: @@ -3295,6 +3424,10 @@ packages: /@types/estree@1.0.0: resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==} + /@types/estree@1.0.5: + resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} + dev: false + /@types/fs-extra@11.0.1: resolution: {integrity: sha512-MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA==} dependencies: @@ -3322,6 +3455,10 @@ packages: /@types/json-schema@7.0.11: resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} + /@types/json-schema@7.0.15: + resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} + dev: false + /@types/json5@0.0.29: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} @@ -3757,12 +3894,12 @@ packages: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} dev: false - /acorn-import-assertions@1.9.0(acorn@8.8.2): + /acorn-import-assertions@1.9.0(acorn@8.11.3): resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==} peerDependencies: acorn: ^8 dependencies: - acorn: 8.8.2 + acorn: 8.11.3 dev: false /acorn-jsx@5.3.2(acorn@8.8.2): @@ -3772,6 +3909,12 @@ packages: dependencies: acorn: 8.8.2 + /acorn@8.11.3: + resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} + engines: {node: '>=0.4.0'} + hasBin: true + dev: false + /acorn@8.8.2: resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==} engines: {node: '>=0.4.0'} @@ -4274,15 +4417,15 @@ packages: node-releases: 2.0.13 update-browserslist-db: 1.0.11(browserslist@4.21.9) - /browserslist@4.22.2: - resolution: {integrity: sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==} + /browserslist@4.23.0: + resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001579 - electron-to-chromium: 1.4.616 + caniuse-lite: 1.0.30001587 + electron-to-chromium: 1.4.670 node-releases: 2.0.14 - update-browserslist-db: 1.0.13(browserslist@4.22.2) + update-browserslist-db: 1.0.13(browserslist@4.23.0) dev: false /buffer-from@1.1.2: @@ -4393,6 +4536,10 @@ packages: /caniuse-lite@1.0.30001579: resolution: {integrity: sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==} + /caniuse-lite@1.0.30001587: + resolution: {integrity: sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==} + dev: false + /ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} @@ -4444,7 +4591,7 @@ packages: normalize-path: 3.0.0 readdirp: 3.6.0 optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 /chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} @@ -5032,8 +5179,8 @@ packages: /electron-to-chromium@1.4.459: resolution: {integrity: sha512-XXRS5NFv8nCrBL74Rm3qhJjA2VCsRFx0OjHKBMPI0otij56aun8UWiKTDABmd5/7GTR021pA4wivs+Ri6XCElg==} - /electron-to-chromium@1.4.616: - resolution: {integrity: sha512-1n7zWYh8eS0L9Uy+GskE0lkBUNK83cXTVJI0pU3mGprFsbfSdAc15VTFbo+A+Bq4pwstmL30AVcEU3Fo463lNg==} + /electron-to-chromium@1.4.670: + resolution: {integrity: sha512-hcijYOWjOtjKrKPtNA6tuLlA/bTLO3heFG8pQA6mLpq7dRydSWicXova5lyxDzp1iVJaYhK7J2OQlGE52KYn7A==} dev: false /embla-carousel-autoplay@7.1.0(embla-carousel@7.1.0): @@ -5213,6 +5360,10 @@ packages: /es-module-lexer@1.3.0: resolution: {integrity: sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==} + /es-module-lexer@1.4.1: + resolution: {integrity: sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==} + dev: false + /es-set-tostringtag@2.0.1: resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==} engines: {node: '>= 0.4'} @@ -5402,6 +5553,11 @@ packages: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} + /escalade@3.1.2: + resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} + engines: {node: '>=6'} + dev: false + /escape-string-regexp@1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} @@ -6151,8 +6307,8 @@ packages: /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - /fsevents@2.3.2: - resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} + /fsevents@2.3.3: + resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] requiresBuild: true @@ -9317,7 +9473,7 @@ packages: engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 dev: true /rollup@3.26.3: @@ -9325,7 +9481,30 @@ packages: engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 + + /rollup@4.11.0: + resolution: {integrity: sha512-2xIbaXDXjf3u2tajvA5xROpib7eegJ9Y/uPlSFhXLNpK9ampCczXAhLEb5yLzJyG3LAdI1NWtNjDXiLyniNdjQ==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + dependencies: + '@types/estree': 1.0.5 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.11.0 + '@rollup/rollup-android-arm64': 4.11.0 + '@rollup/rollup-darwin-arm64': 4.11.0 + '@rollup/rollup-darwin-x64': 4.11.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.11.0 + '@rollup/rollup-linux-arm64-gnu': 4.11.0 + '@rollup/rollup-linux-arm64-musl': 4.11.0 + '@rollup/rollup-linux-riscv64-gnu': 4.11.0 + '@rollup/rollup-linux-x64-gnu': 4.11.0 + '@rollup/rollup-linux-x64-musl': 4.11.0 + '@rollup/rollup-win32-arm64-msvc': 4.11.0 + '@rollup/rollup-win32-ia32-msvc': 4.11.0 + '@rollup/rollup-win32-x64-msvc': 4.11.0 + fsevents: 2.3.3 + dev: false /run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -9397,7 +9576,7 @@ packages: resolution: {integrity: sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/json-schema': 7.0.11 + '@types/json-schema': 7.0.15 ajv: 6.12.6 ajv-keywords: 3.5.2(ajv@6.12.6) dev: false @@ -9444,8 +9623,8 @@ packages: dependencies: lru-cache: 6.0.0 - /serialize-javascript@6.0.1: - resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==} + /serialize-javascript@6.0.2: + resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} dependencies: randombytes: 2.1.0 dev: false @@ -10021,8 +10200,8 @@ packages: engines: {node: '>=8'} dev: false - /terser-webpack-plugin@5.3.9(webpack@5.88.2): - resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} + /terser-webpack-plugin@5.3.10(webpack@5.90.1): + resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==} engines: {node: '>= 10.13.0'} peerDependencies: '@swc/core': '*' @@ -10037,21 +10216,21 @@ packages: uglify-js: optional: true dependencies: - '@jridgewell/trace-mapping': 0.3.17 + '@jridgewell/trace-mapping': 0.3.22 jest-worker: 27.5.1 schema-utils: 3.3.0 - serialize-javascript: 6.0.1 - terser: 5.19.2 - webpack: 5.88.2 + serialize-javascript: 6.0.2 + terser: 5.27.0 + webpack: 5.90.1 dev: false - /terser@5.19.2: - resolution: {integrity: sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==} + /terser@5.27.0: + resolution: {integrity: sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==} engines: {node: '>=10'} hasBin: true dependencies: '@jridgewell/source-map': 0.3.5 - acorn: 8.8.2 + acorn: 8.11.3 commander: 2.20.3 source-map-support: 0.5.21 dev: false @@ -10520,14 +10699,14 @@ packages: escalade: 3.1.1 picocolors: 1.0.0 - /update-browserslist-db@1.0.13(browserslist@4.22.2): + /update-browserslist-db@1.0.13(browserslist@4.23.0): resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: - browserslist: 4.22.2 - escalade: 3.1.1 + browserslist: 4.23.0 + escalade: 3.1.2 picocolors: 1.0.0 dev: false @@ -10671,7 +10850,7 @@ packages: postcss: 8.4.31 rollup: 3.26.3 optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 /vitefu@0.2.4(vite@4.4.6): resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==} @@ -10772,8 +10951,8 @@ packages: engines: {node: '>=10.13.0'} dev: false - /webpack@5.88.2: - resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==} + /webpack@5.90.1: + resolution: {integrity: sha512-SstPdlAC5IvgFnhiRok8hqJo/+ArAbNv7rhU4fnWGHNVfN59HSQFaxZDSAL3IFG2YmqxuRs+IU33milSxbPlog==} engines: {node: '>=10.13.0'} hasBin: true peerDependencies: @@ -10782,17 +10961,17 @@ packages: webpack-cli: optional: true dependencies: - '@types/eslint-scope': 3.7.4 - '@types/estree': 1.0.0 + '@types/eslint-scope': 3.7.7 + '@types/estree': 1.0.5 '@webassemblyjs/ast': 1.11.6 '@webassemblyjs/wasm-edit': 1.11.6 '@webassemblyjs/wasm-parser': 1.11.6 - acorn: 8.8.2 - acorn-import-assertions: 1.9.0(acorn@8.8.2) - browserslist: 4.22.2 + acorn: 8.11.3 + acorn-import-assertions: 1.9.0(acorn@8.11.3) + browserslist: 4.23.0 chrome-trace-event: 1.0.3 enhanced-resolve: 5.15.0 - es-module-lexer: 1.3.0 + es-module-lexer: 1.4.1 eslint-scope: 5.1.1 events: 3.3.0 glob-to-regexp: 0.4.1 @@ -10803,7 +10982,7 @@ packages: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.9(webpack@5.88.2) + terser-webpack-plugin: 5.3.10(webpack@5.90.1) watchpack: 2.4.0 webpack-sources: 3.2.3 transitivePeerDependencies: From 2b254bd794f12d55891724bb35f2fe6327fe6847 Mon Sep 17 00:00:00 2001 From: juliusmarminge Date: Thu, 15 Feb 2024 10:38:08 +0100 Subject: [PATCH 10/14] sync lock --- pnpm-lock.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 92328651f9..d6dc865c7c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -117,16 +117,16 @@ importers: specifier: ^5.17.19 version: 5.17.19(react@18.2.0) '@trpc/client': - specifier: 11.0.0-next-beta.283 + specifier: next version: 11.0.0-next-beta.283(@trpc/server@11.0.0-next-beta.283) '@trpc/next': - specifier: 11.0.0-next-beta.283 + specifier: next version: 11.0.0-next-beta.283(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.283)(@trpc/react-query@11.0.0-next-beta.283)(@trpc/server@11.0.0-next-beta.283)(next@14.1.0)(react-dom@18.2.0)(react@18.2.0) '@trpc/react-query': - specifier: 11.0.0-next-beta.283 + specifier: next version: 11.0.0-next-beta.283(@tanstack/react-query@5.17.19)(@trpc/client@11.0.0-next-beta.283)(@trpc/server@11.0.0-next-beta.283)(react-dom@18.2.0)(react@18.2.0) '@trpc/server': - specifier: 11.0.0-next-beta.283 + specifier: next version: 11.0.0-next-beta.283 '@types/fs-extra': specifier: ^11.0.1 From d8e6c14ae82e3aad8d70fc03a822b23cbf992460 Mon Sep 17 00:00:00 2001 From: juliusmarminge Date: Thu, 22 Feb 2024 18:38:37 +0100 Subject: [PATCH 11/14] transformer here too? --- cli/template/extras/src/utils/api.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/template/extras/src/utils/api.ts b/cli/template/extras/src/utils/api.ts index 22d18fea31..0f03d307e1 100644 --- a/cli/template/extras/src/utils/api.ts +++ b/cli/template/extras/src/utils/api.ts @@ -50,6 +50,7 @@ export const api = createTRPCNext({ * @see https://trpc.io/docs/nextjs#ssr-boolean-default-false */ ssr: false, + transformer: superjson, }); /** From 0dfe617a3fb0c86628434042aa38a5a041f040c8 Mon Sep 17 00:00:00 2001 From: juliusmarminge Date: Thu, 7 Mar 2024 21:35:41 +0100 Subject: [PATCH 12/14] oki --- cli/package.json | 2 +- cli/src/installers/dependencyVersionMap.ts | 2 +- .../extras/src/app/page/with-auth-trpc-tw.tsx | 2 - .../extras/src/app/page/with-auth-trpc.tsx | 2 - .../extras/src/app/page/with-trpc-tw.tsx | 2 - .../extras/src/app/page/with-trpc.tsx | 2 - pnpm-lock.yaml | 47 ++++++------------- 7 files changed, 17 insertions(+), 42 deletions(-) diff --git a/cli/package.json b/cli/package.json index 23606e218b..b06f84099d 100644 --- a/cli/package.json +++ b/cli/package.json @@ -68,7 +68,7 @@ "@prisma/adapter-planetscale": "^5.10.2", "@prisma/client": "^5.10.2", "@t3-oss/env-nextjs": "^0.9.2", - "@tanstack/react-query": "^4.36.1", + "@tanstack/react-query": "^5.25.0", "@trpc/client": "next", "@trpc/next": "next", "@trpc/react-query": "next", diff --git a/cli/src/installers/dependencyVersionMap.ts b/cli/src/installers/dependencyVersionMap.ts index 2eb234a8d3..53ff251e74 100644 --- a/cli/src/installers/dependencyVersionMap.ts +++ b/cli/src/installers/dependencyVersionMap.ts @@ -35,7 +35,7 @@ export const dependencyVersionMap = { "@trpc/server": "next", "@trpc/react-query": "next", "@trpc/next": "next", - "@tanstack/react-query": "^5.17.19", + "@tanstack/react-query": "^5.25.0", superjson: "^2.2.1", "server-only": "^0.0.1", } as const; diff --git a/cli/template/extras/src/app/page/with-auth-trpc-tw.tsx b/cli/template/extras/src/app/page/with-auth-trpc-tw.tsx index 03a3486215..15053a9468 100644 --- a/cli/template/extras/src/app/page/with-auth-trpc-tw.tsx +++ b/cli/template/extras/src/app/page/with-auth-trpc-tw.tsx @@ -1,4 +1,3 @@ -import { unstable_noStore as noStore } from "next/cache"; import Link from "next/link"; import { CreatePost } from "~/app/_components/create-post"; @@ -6,7 +5,6 @@ import { getServerAuthSession } from "~/server/auth"; import { api } from "~/trpc/server"; export default async function Home() { - noStore(); const hello = await api.post.hello({ text: "from tRPC" }); const session = await getServerAuthSession(); diff --git a/cli/template/extras/src/app/page/with-auth-trpc.tsx b/cli/template/extras/src/app/page/with-auth-trpc.tsx index 8e0becd7f4..d20987bd1d 100644 --- a/cli/template/extras/src/app/page/with-auth-trpc.tsx +++ b/cli/template/extras/src/app/page/with-auth-trpc.tsx @@ -1,4 +1,3 @@ -import { unstable_noStore as noStore } from "next/cache"; import Link from "next/link"; import { CreatePost } from "~/app/_components/create-post"; @@ -7,7 +6,6 @@ import { api } from "~/trpc/server"; import styles from "./index.module.css"; export default async function Home() { - noStore(); const hello = await api.post.hello({ text: "from tRPC" }); const session = await getServerAuthSession(); diff --git a/cli/template/extras/src/app/page/with-trpc-tw.tsx b/cli/template/extras/src/app/page/with-trpc-tw.tsx index 369cb7bd60..098c79499c 100644 --- a/cli/template/extras/src/app/page/with-trpc-tw.tsx +++ b/cli/template/extras/src/app/page/with-trpc-tw.tsx @@ -1,11 +1,9 @@ -import { unstable_noStore as noStore } from "next/cache"; import Link from "next/link"; import { CreatePost } from "~/app/_components/create-post"; import { api } from "~/trpc/server"; export default async function Home() { - noStore(); const hello = await api.post.hello({ text: "from tRPC" }); return ( diff --git a/cli/template/extras/src/app/page/with-trpc.tsx b/cli/template/extras/src/app/page/with-trpc.tsx index 39d854c2f0..b8d3bed61c 100644 --- a/cli/template/extras/src/app/page/with-trpc.tsx +++ b/cli/template/extras/src/app/page/with-trpc.tsx @@ -1,4 +1,3 @@ -import { unstable_noStore as noStore } from "next/cache"; import Link from "next/link"; import { CreatePost } from "~/app/_components/create-post"; @@ -6,7 +5,6 @@ import { api } from "~/trpc/server"; import styles from "./index.module.css"; export default async function Home() { - noStore(); const hello = await api.post.hello({ text: "from tRPC" }); return ( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7671c06b7..eef2d8380c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -114,17 +114,17 @@ importers: specifier: ^0.9.2 version: 0.9.2(typescript@5.4.2)(zod@3.22.4) '@tanstack/react-query': - specifier: ^4.36.1 - version: 4.36.1(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.25.0 + version: 5.25.0(react@18.2.0) '@trpc/client': specifier: next version: 11.0.0-next-beta.315(@trpc/server@11.0.0-next-beta.315) '@trpc/next': specifier: next - version: 11.0.0-next-beta.315(@tanstack/react-query@4.36.1)(@trpc/client@11.0.0-next-beta.315)(@trpc/react-query@11.0.0-next-beta.315)(@trpc/server@11.0.0-next-beta.315)(next@14.1.3)(react-dom@18.2.0)(react@18.2.0) + version: 11.0.0-next-beta.315(@tanstack/react-query@5.25.0)(@trpc/client@11.0.0-next-beta.315)(@trpc/react-query@11.0.0-next-beta.315)(@trpc/server@11.0.0-next-beta.315)(next@14.1.3)(react-dom@18.2.0)(react@18.2.0) '@trpc/react-query': specifier: next - version: 11.0.0-next-beta.315(@tanstack/react-query@4.36.1)(@trpc/client@11.0.0-next-beta.315)(@trpc/server@11.0.0-next-beta.315)(react-dom@18.2.0)(react@18.2.0) + version: 11.0.0-next-beta.315(@tanstack/react-query@5.25.0)(@trpc/client@11.0.0-next-beta.315)(@trpc/server@11.0.0-next-beta.315)(react-dom@18.2.0)(react@18.2.0) '@trpc/server': specifier: next version: 11.0.0-next-beta.315 @@ -3232,26 +3232,17 @@ packages: typescript: 5.4.2 zod: 3.22.4 - /@tanstack/query-core@4.36.1: - resolution: {integrity: sha512-DJSilV5+ytBP1FbFcEJovv4rnnm/CokuVvrBEtW/Va9DvuJ3HksbXUJEpI0aV1KtuL4ZoO9AVE6PyNLzF7tLeA==} + /@tanstack/query-core@5.25.0: + resolution: {integrity: sha512-vlobHP64HTuSE68lWF1mEhwSRC5Q7gaT+a/m9S+ItuN+ruSOxe1rFnR9j0ACWQ314BPhBEVKfBQ6mHL0OWfdbQ==} dev: true - /@tanstack/react-query@4.36.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-y7ySVHFyyQblPl3J3eQBWpXZkliroki3ARnBKsdJchlgt7yJLRDUcf4B8soufgiYt3pEQIkBWBx1N9/ZPIeUWw==} + /@tanstack/react-query@5.25.0(react@18.2.0): + resolution: {integrity: sha512-u+n5R7mLO7RmeiIonpaCRVXNRWtZEef/aVZ/XGWRPa7trBIvGtzlfo0Ah7ZtnTYfrKEVwnZ/tzRCBcoiqJ/tFw==} peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-native: '*' - peerDependenciesMeta: - react-dom: - optional: true - react-native: - optional: true + react: ^18.0.0 dependencies: - '@tanstack/query-core': 4.36.1 + '@tanstack/query-core': 5.25.0 react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - use-sync-external-store: 1.2.0(react@18.2.0) dev: true /@total-typescript/ts-reset@0.3.7: @@ -3266,7 +3257,7 @@ packages: '@trpc/server': 11.0.0-next-beta.315 dev: true - /@trpc/next@11.0.0-next-beta.315(@tanstack/react-query@4.36.1)(@trpc/client@11.0.0-next-beta.315)(@trpc/react-query@11.0.0-next-beta.315)(@trpc/server@11.0.0-next-beta.315)(next@14.1.3)(react-dom@18.2.0)(react@18.2.0): + /@trpc/next@11.0.0-next-beta.315(@tanstack/react-query@5.25.0)(@trpc/client@11.0.0-next-beta.315)(@trpc/react-query@11.0.0-next-beta.315)(@trpc/server@11.0.0-next-beta.315)(next@14.1.3)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-kvGwwffiGgDzbImpJ1qjJMt4MUfIaBDhEQGyLDeTsbAB/XsuR6lok84DDJqVXwaB06bzOFOHSw90c0gvXtJMVg==} peerDependencies: '@tanstack/react-query': ^5.25.0 @@ -3282,16 +3273,16 @@ packages: '@trpc/react-query': optional: true dependencies: - '@tanstack/react-query': 4.36.1(react-dom@18.2.0)(react@18.2.0) + '@tanstack/react-query': 5.25.0(react@18.2.0) '@trpc/client': 11.0.0-next-beta.315(@trpc/server@11.0.0-next-beta.315) - '@trpc/react-query': 11.0.0-next-beta.315(@tanstack/react-query@4.36.1)(@trpc/client@11.0.0-next-beta.315)(@trpc/server@11.0.0-next-beta.315)(react-dom@18.2.0)(react@18.2.0) + '@trpc/react-query': 11.0.0-next-beta.315(@tanstack/react-query@5.25.0)(@trpc/client@11.0.0-next-beta.315)(@trpc/server@11.0.0-next-beta.315)(react-dom@18.2.0)(react@18.2.0) '@trpc/server': 11.0.0-next-beta.315 next: 14.1.3(@babel/core@7.22.9)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true - /@trpc/react-query@11.0.0-next-beta.315(@tanstack/react-query@4.36.1)(@trpc/client@11.0.0-next-beta.315)(@trpc/server@11.0.0-next-beta.315)(react-dom@18.2.0)(react@18.2.0): + /@trpc/react-query@11.0.0-next-beta.315(@tanstack/react-query@5.25.0)(@trpc/client@11.0.0-next-beta.315)(@trpc/server@11.0.0-next-beta.315)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-RfbSoXi/vc2UlhvPA8H2Ea/D+5qKx6vAkHBSZ/iofgmBh/DPruQIsLUCasD2RNcaboHJlq+chN5I2rjbqKXgXw==} peerDependencies: '@tanstack/react-query': ^5.25.0 @@ -3300,7 +3291,7 @@ packages: react: '>=18.2.0' react-dom: '>=18.2.0' dependencies: - '@tanstack/react-query': 4.36.1(react-dom@18.2.0)(react@18.2.0) + '@tanstack/react-query': 5.25.0(react@18.2.0) '@trpc/client': 11.0.0-next-beta.315(@trpc/server@11.0.0-next-beta.315) '@trpc/server': 11.0.0-next-beta.315 react: 18.2.0 @@ -10876,14 +10867,6 @@ packages: tslib: 2.5.0 dev: false - /use-sync-external-store@1.2.0(react@18.2.0): - resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - dependencies: - react: 18.2.0 - dev: true - /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} From 774d851d1d920def9503b1b55ddd3893c7c66469 Mon Sep 17 00:00:00 2001 From: juliusmarminge Date: Thu, 7 Mar 2024 21:36:56 +0100 Subject: [PATCH 13/14] fix cs --- .changeset/thirty-onions-tickle.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/thirty-onions-tickle.md b/.changeset/thirty-onions-tickle.md index c77401c960..12eebe91d7 100644 --- a/.changeset/thirty-onions-tickle.md +++ b/.changeset/thirty-onions-tickle.md @@ -1,5 +1,5 @@ --- -"create-t3-app": patch +"create-t3-app": minor --- feat: use trpc 11 From 4a3d9842abcab0f7c22501ac996ab859e2ac0107 Mon Sep 17 00:00:00 2001 From: juliusmarminge Date: Thu, 7 Mar 2024 21:42:37 +0100 Subject: [PATCH 14/14] style --- cli/template/extras/src/trpc/react.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/template/extras/src/trpc/react.tsx b/cli/template/extras/src/trpc/react.tsx index 1a228566d2..1c45f1d4c7 100644 --- a/cli/template/extras/src/trpc/react.tsx +++ b/cli/template/extras/src/trpc/react.tsx @@ -36,7 +36,7 @@ export function TRPCReactProvider(props: { children: React.ReactNode }) { unstable_httpBatchStreamLink({ transformer: SuperJSON, url: getBaseUrl() + "/api/trpc", - async headers() { + headers: () => { const headers = new Headers(); headers.set("x-trpc-source", "nextjs-react"); return headers;