Merge main into refactor branch

- Resolved conflicts in API routes by combining runtime exports with imports
- Updated package-lock.json to reflect Next.js 15.4.0-canary.116
- All API routes now properly export runtime='nodejs' while maintaining functionality

Author: cursoragent

next.config.ts

@@ -38,6 +38,7 @@ const nextConfig: NextConfig = {
       "framer-motion",
       "@tanstack/react-virtual",
     ],
+    nodeMiddleware: true,
     // Server Actions optimization for Google Drive API
     serverActions: {
       allowedOrigins: ["localhost:3000", process.env.VERCEL_URL || ""],

package-lock.json

@@ -64,7 +64,7 @@
     "googleapis": "^150.0.1",
     "input-otp": "^1.4.2",
     "lucide-react": "^0.525.0",
-    "next": "^15.3.5",
+    "next": "^15.4.0-canary.116",
     "next-themes": "^0.4.6",
     "nextjs-toploader": "^3.8.16",
     "react-day-picker": "^9.8.0",

package.json

@@ -6,6 +6,7 @@ import config from "@/config/gIndex.config";
 
 import { encryptionService, gdrive } from "@/lib/utils.server";
 
+export const runtime = "nodejs";
 export const dynamic = "force-static";
 
 export async function GET(

src/app/api/download/[...rest]/route.ts

@@ -4,6 +4,7 @@ import config from "@/config/gIndex.config";
 
 import { encryptionService } from "@/lib/utils.server";
 
+export const runtime = "nodejs";
 export const dynamic = "force-dynamic";
 
 export async function GET() {

src/app/api/internal/check/route.ts

@@ -2,6 +2,8 @@ import { type NextRequest, NextResponse } from "next/server";
 
 import { encryptionService } from "@/lib/utils.server";
 
+export const runtime = "nodejs";
+
 export const dynamic = "force-dynamic";
 
 export async function GET(request: NextRequest) {

src/app/api/internal/encrypt/route.ts

@@ -2,6 +2,8 @@ import { NextResponse } from "next/server";
 
 import { GetStorageInfo } from "@/actions/files";
 
+export const runtime = "nodejs";
+
 export async function GET() {
   try {
     const result = await GetStorageInfo();

src/app/api/internal/storage/route.ts

@@ -4,6 +4,7 @@ import config from "@/config/gIndex.config";
 
 import { encryptionService, gdrive } from "@/lib/utils.server";
 
+export const runtime = "nodejs";
 export const dynamic = "force-static";
 
 type Props = {

src/app/api/og/[encryptedId]/route.ts

@@ -5,6 +5,7 @@ import { ValidatePaths } from "@/actions/paths";
 
 import { encryptionService } from "@/lib/utils.server";
 
+export const runtime = "nodejs";
 export const dynamic = "force-static";
 
 export async function GET(

src/app/api/raw/[...rest]/route.ts

@@ -6,6 +6,8 @@ import { z } from "zod";
 
 import { encryptionService } from "@/lib/utils.server";
 
+export const runtime = "nodejs";
+
 export const dynamic = "force-dynamic";
 
 type Props = {