diff --git a/package.json b/package.json index 0cb9944..5c5027c 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite dev --port 3000", "build": "vite build", - "preview": "vite preview", + "start": "vite preview", "test": "vitest run" }, "dependencies": { diff --git a/src/bknd.ts b/src/bknd.ts index 7ff907d..b6dcf81 100644 --- a/src/bknd.ts +++ b/src/bknd.ts @@ -1,7 +1,15 @@ -// Both work just fine -// import { getApp as getBkndApp } from "bknd/adapter/react-router"; -import { getApp as getBkndApp } from "bknd/adapter/nextjs"; +// import { getApp as getBkndApp } from "bknd/adapter/nextjs"; import config from "../bknd.config"; +import { BkndConfig, createFrameworkApp } from "bknd/adapter"; + +// --------------------------------- TANSTACK ADAPTER PROTOTYPE ----------------------------------- +export async function getApp( + config: BkndConfig, + args: Env = process.env as Env, +) { + return await createFrameworkApp(config, args); +} +// --------------------------------- TANSTACK ADAPTER PROTOTYPE ----------------------------------- export async function getApi({ headers, @@ -10,7 +18,8 @@ export async function getApi({ verify?: boolean; headers?: Headers; }) { - const app = await getBkndApp(config, process.env); + const app = await getApp(config, process.env); + // const app = await getBkndApp(config, process.env); if (verify) { const api = app.getApi({ headers }); diff --git a/src/routes/__root.tsx b/src/routes/__root.tsx index f4095a8..fdd1c10 100644 --- a/src/routes/__root.tsx +++ b/src/routes/__root.tsx @@ -37,7 +37,7 @@ function RootDocument({ children }: { children: React.ReactNode }) { - + {children} ); } diff --git a/src/routes/api.$.ts b/src/routes/api.$.ts index f7c0c99..4249327 100644 --- a/src/routes/api.$.ts +++ b/src/routes/api.$.ts @@ -1,12 +1,31 @@ import { createFileRoute } from "@tanstack/react-router"; import config from "../../bknd.config"; +import { BkndConfig, createFrameworkApp } from "bknd/adapter"; -// Works fine -import { serve } from "bknd/adapter/nextjs"; +// import { getApp } from "bknd/adapter/nextjs"; +// const handler = serve({ +// ...config, +// }); -const handler = serve({ - ...config, -}); +// --------------------------------- TANSTACK ADAPTER PROTOTYPE ----------------------------------- + +export async function getApp( + config: BkndConfig, + args: Env = process.env as Env, +) { + return await createFrameworkApp(config, args); +} + +function serve(config: BkndConfig) { + return async (request: Request) => { + const app = await getApp(config, process.env); + return app.fetch(request); + }; +} + +const handler = serve(config); + +// --------------------------------- TANSTACK ADAPTER PROTOTYPE ----------------------------------- export const Route = createFileRoute("/api/$")({ server: {