fix: edge

drizzle.config.ts

@@ -1,12 +1,12 @@
-import { type Config } from "drizzle-kit";
+import { type Config } from 'drizzle-kit';
 
-import { env } from "@src/env.mjs";
+import { env } from '@src/env.mjs';
 
 export default {
-  schema: "./src/server/db/schema.ts",
-  driver: "mysql2",
-  dbCredentials: {
-    connectionString: env.DATABASE_URL
-  },
-  tablesFilter: ["goods_*"],
+    schema: './src/server/db/schema.ts',
+    driver: 'mysql2',
+    dbCredentials: {
+        connectionString: env.DATABASE_URL
+    },
+    tablesFilter: ['goods_*'],
 } satisfies Config;

package.json

@@ -30,8 +30,9 @@
         "clsx": "^2.0.0",
         "drizzle-orm": "^0.28.5",
         "framer-motion": "^10.16.4",
+        "nanoid": "^5.0.2",
         "next": "^13.5.4",
-        "next-auth": "^4.23.0",
+        "next-auth": "0.0.0-manual.cfb42ae7",
         "react": "18.2.0",
         "react-dom": "18.2.0",
         "react-dropzone": "^14.2.3",

src/app/admin/add/page.tsx → src/app/(withAuth)/admin/add/page.tsx

@@ -20,3 +20,5 @@ export default async function AddItem() {
         <AdminAddItemPage />
     );
 }
+
+export const runtime = 'edge';

src/app/admin/edit/[id]/page.tsx → src/app/(withAuth)/admin/edit/[id]/page.tsx

@@ -25,7 +25,7 @@ export default async function Auth({ params: { id } }: Props) {
         return redirect(ROUTES.HOME.get());
     }
 
-    const [item] = await db.select().from(items).where(eq(items.id, Number(id)));
+    const [item] = await db.select().from(items).where(eq(items.id, id));
 
     if (!item) {
         return redirect(ROUTES.ADMIN.get());
@@ -35,3 +35,5 @@ export default async function Auth({ params: { id } }: Props) {
         <AdminEditItemPage item={item} />
     );
 }
+
+export const runtime = 'edge';

src/app/admin/page.tsx → src/app/(withAuth)/admin/page.tsx

@@ -20,3 +20,5 @@ export default async function Admin() {
         <AdminHomePage />
     );
 }
+
+export const runtime = 'edge';

src/app/auth/page.tsx → src/app/(withAuth)/auth/page.tsx

@@ -15,3 +15,5 @@ export default async function Auth() {
         <AuthPage />
     );
 }
+
+export const runtime = 'edge';

src/app/auth/validate/page.tsx → src/app/(withAuth)/auth/validate/page.tsx

@@ -20,3 +20,5 @@ export default async function Auth() {
         <ValidatePage />
     );
 }
+
+export const runtime = 'edge';

src/app/(withAuth)/layout.tsx

@@ -0,0 +1,13 @@
+import { Providers } from './providers';
+
+export default function Layout({
+    children,
+}: {
+    children: React.ReactNode;
+}) {
+    return (
+        <Providers>
+            {children}
+        </Providers>
+    );
+}

src/app/api/auth/[...nextauth]/route.ts

@@ -1,7 +1,5 @@
-import NextAuth from 'next-auth';
+import { handlers } from '@src/server/auth';
 
-import { authOptions } from '@src/server/auth';
+export const { GET, POST } = handlers;
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-const handler = NextAuth(authOptions);
-export { handler as GET, handler as POST };
+export const runtime = 'edge';

src/app/api/trpc/[trpc]/route.ts

@@ -22,3 +22,5 @@ const handler = (req: NextRequest) =>
     });
 
 export { handler as GET, handler as POST };
+
+export const runtime = 'edge';

src/app/api/upload/route.ts

@@ -1,6 +1,5 @@
-import { randomUUID } from 'crypto';
-
 import { NextResponse } from 'next/server';
+import { nanoid } from 'nanoid';
 
 import { s3 } from '@src/server/s3';
 import { FOLDERS } from '@src/constants/s3';
@@ -46,7 +45,7 @@ const handler = async (req: Request) => {
         }, 400);
     }
 
-    const id = `${Date.now()}_${randomUUID()}`;
+    const id = `${Date.now()}_${nanoid(24)}`;
 
     const arrayBuffer = await file.arrayBuffer();
 
@@ -73,3 +72,5 @@ const handler = async (req: Request) => {
 };
 
 export { handler as POST };
+
+export const runtime = 'edge';

src/app/layout.tsx

@@ -9,8 +9,6 @@ import { TRPCReactProvider } from '@src/trpc/react';
 import { DOMAIN_NAME, ROUTES } from '@src/constants/routes';
 import { Toaster } from '@src/components/Toaster';
 
-import { Providers } from './providers';
-
 const inter = Inter({
     subsets: ['latin'],
 });
@@ -40,10 +38,8 @@ export default function RootLayout({
     return (
         <html lang="en">
             <body className={inter.className}>
-                <Providers>
-                    <TRPCReactProvider headers={headers()}>{children}</TRPCReactProvider>
-                    <Toaster />
-                </Providers>
+                <TRPCReactProvider headers={headers()}>{children}</TRPCReactProvider>
+                <Toaster />
             </body>
         </html>
     );

src/app/page.tsx

@@ -12,3 +12,5 @@ export default async function Home() {
         </Container>
     );
 }
+
+export const runtime = 'edge';

src/constants/routes.ts

@@ -31,7 +31,7 @@ export const ROUTES = {
     ADMIN: new Route('/admin'),
 
     ADD_ITEM: new Route('/admin/add'),
-    EDIT_ITEM: new Route<{ id: number }>('/admin/edit/:id'),
+    EDIT_ITEM: new Route<{ id: string }>('/admin/edit/:id'),
 
     API: {
         UPLOAD: new Route('/api/upload'),

src/server/api/routers/admin.ts

@@ -1,6 +1,7 @@
 import { DeleteObjectCommand } from '@aws-sdk/client-s3';
 import { z } from 'zod';
 import { eq } from 'drizzle-orm';
+import { nanoid } from 'nanoid';
 
 import { FOLDERS } from '@src/constants/s3';
 import { itemSchema } from '@src/schemas/item';
@@ -30,42 +31,23 @@ export const adminRouter = createTRPCRouter({
         .mutation(async ({ ctx, input }) => {
             const { user } = ctx.session;
 
-            // const item = await ctx.prisma.item.create({
-            //   data: {
-            //     ...input,
-            //     user: { connect: { id: user.id } },
-            //   },
-            // });
+            const id = nanoid(24);
 
-            const item = await ctx.db.insert(items).values({
+            await ctx.db.insert(items).values({
+                id,
                 ...input,
                 createdById: user.id,
             });
-
-            console.log({ item });
-
-            return item;
         }),
     editItem: protectedProcedure
         .input(z.object({
-            id: z.number(),
+            id: z.string(),
             data: itemSchema,
         }))
-        .mutation(async ({ ctx, input: { id, data } }) => {
-            // const item = await ctx.prisma.item.update({
-            //   where: { id },
-            //   data: {
-            //     ...data,
-            //   },
-            // });
-
-            const item = await ctx.db.update(items).set(data).where(eq(items.id, id));
-
-            return item;
-        }),
+        .mutation(({ ctx, input: { id, data } }) => ctx.db.update(items).set(data).where(eq(items.id, id))),
     removeItem: protectedProcedure
         .input(z.object({
-            id: z.number(),
+            id: z.string(),
         }))
         .mutation(async ({ ctx, input: { id } }) => {
             await ctx.db.delete(items).where(eq(items.id, id));