one 1.1.482 → 1.1.484

package/dist/esm/vercel/build/buildVercelOutputDirectory.js

@@ -3,9 +3,9 @@ import FSExtra from "fs-extra";
 import { isMatching, P } from "ts-pattern";
 import { createApiServerlessFunction } from "./generate/createApiServerlessFunction";
 import { createSsrServerlessFunction } from "./generate/createSsrServerlessFunction";
-import { serverlessVercelNodeJsConfig } from "./config/vc-config-base";
 import { serverlessVercelPackageJson } from "./config/vc-package-base";
-import { vercelBuildOutputConfig } from "./config/vc-build-output-config-base";
+import { vercelBuildOutputConfigBase } from "./config/vc-build-output-config-base";
+import { getPathFromRoute } from "./getPathFromRoute";
 const { copy, ensureDir, existsSync, writeJSON } = FSExtra;
 async function moveAllFiles(src, dest) {
   try {
@@ -30,17 +30,7 @@ const buildVercelOutputDirectory = async ({
       const compiledRoute = compiltedApiRoutes.find((compiled) => compiled.facadeModuleId.includes(route.file.replace("./", "")));
       compiledRoute ? (postBuildLogs.push(
         `[one.build][vercel] generating serverless function for apiRoute ${route.page}`
-      ), await createApiServerlessFunction(
-        route.page,
-        compiledRoute.code,
-        oneOptionsRoot,
-        postBuildLogs
-      ), route.page !== route.urlCleanPath && await createApiServerlessFunction(
-        route.urlCleanPath,
-        compiledRoute.code,
-        oneOptionsRoot,
-        postBuildLogs
-      )) : console.warn(`
+      ), await createApiServerlessFunction(route, compiledRoute.code, oneOptionsRoot, postBuildLogs)) : console.warn(`
  \u{1F528}[one.build][vercel] apiRoute missing code compilation for`, route.file);
     }
   }
@@ -52,7 +42,7 @@ const buildVercelOutputDirectory = async ({
         routeToBuildInfo[route.file] && (postBuildLogs.push(
           `[one.build][vercel] generate serverless function for ${route.page} with ${route.type}`
         ), await createSsrServerlessFunction(
-          route.page,
+          route,
           buildInfoForWriting,
           oneOptionsRoot,
           postBuildLogs
@@ -65,7 +55,7 @@ const buildVercelOutputDirectory = async ({
   const distMiddlewareDir = resolve(join(oneOptionsRoot, "dist", "middlewares"));
   if (existsSync(distMiddlewareDir)) {
     const vercelMiddlewareDir = resolve(
-      join(oneOptionsRoot, ".vercel/output/functions/_middleware")
+      join(oneOptionsRoot, ".vercel/output/functions/_middleware.func")
     );
     await ensureDir(vercelMiddlewareDir), postBuildLogs.push(
       `[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`
@@ -74,12 +64,34 @@ const buildVercelOutputDirectory = async ({
     postBuildLogs.push(
       `[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`
     ), await writeJSON(vercelMiddlewarePackageJsonFilePath, serverlessVercelPackageJson);
+    const wrappedMiddlewareEntryPointFilename = "_wrapped_middleware.js", wrappedMiddlewareEntryPointPath = resolve(
+      join(vercelMiddlewareDir, wrappedMiddlewareEntryPointFilename)
+    );
+    await FSExtra.writeFile(
+      wrappedMiddlewareEntryPointPath,
+      `
+import middlewareFunction from './_middleware.js'
+
+const next = (e) => {
+  const t = new Headers(null == e ? void 0 : e.headers)
+  t.set('x-middleware-next', '1')
+  return new Response(null, { ...e, headers: t })
+}
+
+const wrappedMiddlewareFunction = (request, event) => {
+  return middlewareFunction({ request, event, next })
+}
+
+export { wrappedMiddlewareFunction as default }
+  `
+    );
     const middlewareVercelConfigFilePath = resolve(join(vercelMiddlewareDir, ".vc-config.json"));
     postBuildLogs.push(
       `[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`
     ), await writeJSON(middlewareVercelConfigFilePath, {
-      ...serverlessVercelNodeJsConfig,
-      handler: "_middleware.js"
+      runtime: "edge",
+      // Seems that middlewares only work with edge runtime
+      entrypoint: wrappedMiddlewareEntryPointFilename
     });
   }
   const vercelOutputStaticDir = resolve(join(oneOptionsRoot, ".vercel/output/static"));
@@ -87,7 +99,26 @@ const buildVercelOutputDirectory = async ({
     `[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`
   ), await moveAllFiles(clientDir, vercelOutputStaticDir);
   const vercelConfigFilePath = resolve(join(oneOptionsRoot, ".vercel/output", "config.json"));
-  await writeJSON(vercelConfigFilePath, vercelBuildOutputConfig), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
+  await writeJSON(vercelConfigFilePath, {
+    ...vercelBuildOutputConfigBase,
+    routes: [
+      ...vercelBuildOutputConfigBase.routes,
+      ...existsSync(distMiddlewareDir) ? [
+        {
+          src: "/(.*)",
+          middlewarePath: "_middleware",
+          continue: !0
+        }
+      ] : [],
+      {
+        handle: "rewrite"
+      },
+      ...buildInfoForWriting.manifest.allRoutes.filter((r) => r.routeKeys && Object.keys(r.routeKeys).length > 0).map((r) => ({
+        src: r.namedRegex,
+        dest: `${getPathFromRoute(r)}?${Object.entries(r.routeKeys).map(([k, v]) => `${k}=$${v}`).join("&")}`
+      }))
+    ]
+  }), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
 };
 export {
   buildVercelOutputDirectory

package/dist/esm/vercel/build/buildVercelOutputDirectory.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],
-  "mappings": "AAAA,SAAS,MAAM,eAAe;AAE9B,OAAO,aAAa;AAEpB,SAAS,YAAY,SAAS;AAE9B,SAAS,mCAAmC;AAC5C,SAAS,mCAAmC;AAC5C,SAAS,oCAAoC;AAC7C,SAAS,mCAAmC;AAC5C,SAAS,+BAA+B;AAIxC,MAAM,EAAE,MAAM,WAAW,YAAY,UAAU,IAAI;AAEnD,eAAe,aAAa,KAAa,MAAc;AACrD,MAAI;AACF,UAAM,KAAK,KAAK,MAAM,EAAE,WAAW,IAAM,cAAc,GAAM,CAAC;AAAA,EAChE,SAAS,KAAK;AACZ,YAAQ,MAAM,uBAAuB,GAAG;AAAA,EAC1C;AACF;AAEO,MAAM,6BAA6B,OAAO;AAAA,EAC/C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAMM;AACJ,QAAM,EAAE,iBAAiB,IAAI;AAC7B,MAAI,WAAW;AACb,UAAM,sBAAsB,WAAW,UAAU,CAAC,GAAG;AAAA,MAAO,CAAC,MAC3D,WAAW,EAAE,MAAM,EAAE,QAAQ,gBAAgB,EAAE,OAAO,GAAG,CAAC;AAAA,IAC5D;AACA,eAAW,SAAS,oBAAoB,SAAS,WAAW;AAC1D,YAAM,gBAAgB,mBAAmB,KAAK,CAAC,aAChC,SAAS,eAAe,SAAS,MAAM,KAAK,QAAQ,MAAM,EAAE,CAAC,CAE3E;AACD,MAAI,iBACF,cAAc;AAAA,QACZ,mEAAmE,MAAM,IAAI;AAAA,MAC/E,GACA,MAAM;AAAA,QACJ,MAAM;AAAA,QACN,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,GAEI,MAAM,SAAS,MAAM,gBACvB,MAAM;AAAA,QACJ,MAAM;AAAA,QACN,cAAc;AAAA,QACd;AAAA,QACA;AAAA,MACF,KAGF,QAAQ,KAAK;AAAA,sEAAkE,MAAM,IAAI;AAAA,IAE7F;AAAA,EACF;AAEA,QAAM,2BAA2B,KAAK,gBAAgB,0BAA0B;AAChF,QAAM,UAAU,wBAAwB;AAExC,aAAW,SAAS,oBAAoB,SAAS;AAC/C,YAAQ,MAAM,MAAM;AAAA,MAClB,KAAK,OAAO;AAGV,QADuB,iBAAiB,MAAM,IAAI,MAEhD,cAAc;AAAA,UACZ,wDAAwD,MAAM,IAAI,SAAS,MAAM,IAAI;AAAA,QACvF,GACA,MAAM;AAAA,UACJ,MAAM;AAAA,UACN;AAAA,UACA;AAAA,UACA;AAAA,QACF;AAEF;AAAA,MACF;AAAA,MACA;AAGE;AAAA,IACJ;AAGF,QAAM,oBAAoB,QAAQ,KAAK,gBAAgB,QAAQ,aAAa,CAAC;AAC7E,MAAI,WAAW,iBAAiB,GAAG;AACjC,UAAM,sBAAsB;AAAA,MAC1B,KAAK,gBAAgB,sCAAsC;AAAA,IAC7D;AACA,UAAM,UAAU,mBAAmB,GACnC,cAAc;AAAA,MACZ,gDAAgD,iBAAiB,OAAO,mBAAmB;AAAA,IAC7F,GACA,MAAM,aAAa,QAAQ,KAAK,gBAAgB,QAAQ,aAAa,CAAC,GAAG,mBAAmB;AAC5F,UAAM,sCAAsC,QAAQ,KAAK,qBAAqB,UAAU,CAAC;AACzF,kBAAc;AAAA,MACZ,+CAA+C,mCAAmC;AAAA,IACpF,GACA,MAAM,UAAU,qCAAqC,2BAA2B;AAChF,UAAM,iCAAiC,QAAQ,KAAK,qBAAqB,iBAAiB,CAAC;AAC3F,kBAAc;AAAA,MACZ,kDAAkD,8BAA8B;AAAA,IAClF,GACA,MAAM,UAAU,gCAAgC;AAAA,MAC9C,GAAG;AAAA,MACH,SAAS;AAAA,IACX,CAAC;AAAA,EACH;AAEA,QAAM,wBAAwB,QAAQ,KAAK,gBAAgB,uBAAuB,CAAC;AACnF,QAAM,UAAU,qBAAqB,GAErC,cAAc;AAAA,IACZ,iDAAiD,SAAS,OAAO,qBAAqB;AAAA,EACxF,GACA,MAAM,aAAa,WAAW,qBAAqB;AAInD,QAAM,uBAAuB,QAAQ,KAAK,gBAAgB,kBAAkB,aAAa,CAAC;AAC1F,QAAM,UAAU,sBAAsB,uBAAuB,GAC7D,cAAc,KAAK,uCAAuC,oBAAoB,EAAE;AAClF;",
+  "mappings": "AAAA,SAAS,MAAM,eAAe;AAE9B,OAAO,aAAa;AAEpB,SAAS,YAAY,SAAS;AAE9B,SAAS,mCAAmC;AAC5C,SAAS,mCAAmC;AAE5C,SAAS,mCAAmC;AAC5C,SAAS,mCAAmC;AAG5C,SAAS,wBAAwB;AAEjC,MAAM,EAAE,MAAM,WAAW,YAAY,UAAU,IAAI;AAEnD,eAAe,aAAa,KAAa,MAAc;AACrD,MAAI;AACF,UAAM,KAAK,KAAK,MAAM,EAAE,WAAW,IAAM,cAAc,GAAM,CAAC;AAAA,EAChE,SAAS,KAAK;AACZ,YAAQ,MAAM,uBAAuB,GAAG;AAAA,EAC1C;AACF;AAEO,MAAM,6BAA6B,OAAO;AAAA,EAC/C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAMM;AACJ,QAAM,EAAE,iBAAiB,IAAI;AAC7B,MAAI,WAAW;AACb,UAAM,sBAAsB,WAAW,UAAU,CAAC,GAAG;AAAA,MAAO,CAAC,MAC3D,WAAW,EAAE,MAAM,EAAE,QAAQ,gBAAgB,EAAE,OAAO,GAAG,CAAC;AAAA,IAC5D;AACA,eAAW,SAAS,oBAAoB,SAAS,WAAW;AAC1D,YAAM,gBAAgB,mBAAmB,KAAK,CAAC,aAChC,SAAS,eAAe,SAAS,MAAM,KAAK,QAAQ,MAAM,EAAE,CAAC,CAE3E;AACD,MAAI,iBACF,cAAc;AAAA,QACZ,mEAAmE,MAAM,IAAI;AAAA,MAC/E,GAEA,MAAM,4BAA4B,OAAO,cAAc,MAAM,gBAAgB,aAAa,KAE1F,QAAQ,KAAK;AAAA,sEAAkE,MAAM,IAAI;AAAA,IAE7F;AAAA,EACF;AAEA,QAAM,2BAA2B,KAAK,gBAAgB,0BAA0B;AAChF,QAAM,UAAU,wBAAwB;AAExC,aAAW,SAAS,oBAAoB,SAAS;AAC/C,YAAQ,MAAM,MAAM;AAAA,MAClB,KAAK,OAAO;AAGV,QADuB,iBAAiB,MAAM,IAAI,MAEhD,cAAc;AAAA,UACZ,wDAAwD,MAAM,IAAI,SAAS,MAAM,IAAI;AAAA,QACvF,GACA,MAAM;AAAA,UACJ;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QACF;AAEF;AAAA,MACF;AAAA,MACA;AAGE;AAAA,IACJ;AAGF,QAAM,oBAAoB,QAAQ,KAAK,gBAAgB,QAAQ,aAAa,CAAC;AAC7E,MAAI,WAAW,iBAAiB,GAAG;AACjC,UAAM,sBAAsB;AAAA,MAC1B,KAAK,gBAAgB,2CAA2C;AAAA,IAClE;AACA,UAAM,UAAU,mBAAmB,GACnC,cAAc;AAAA,MACZ,gDAAgD,iBAAiB,OAAO,mBAAmB;AAAA,IAC7F,GACA,MAAM,aAAa,QAAQ,KAAK,gBAAgB,QAAQ,aAAa,CAAC,GAAG,mBAAmB;AAC5F,UAAM,sCAAsC,QAAQ,KAAK,qBAAqB,UAAU,CAAC;AACzF,kBAAc;AAAA,MACZ,+CAA+C,mCAAmC;AAAA,IACpF,GACA,MAAM,UAAU,qCAAqC,2BAA2B;AAChF,UAAM,sCAAsC,0BACtC,kCAAkC;AAAA,MACtC,KAAK,qBAAqB,mCAAmC;AAAA,IAC/D;AACA,UAAM,QAAQ;AAAA,MACZ;AAAA,MACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAeF;AACA,UAAM,iCAAiC,QAAQ,KAAK,qBAAqB,iBAAiB,CAAC;AAC3F,kBAAc;AAAA,MACZ,kDAAkD,8BAA8B;AAAA,IAClF,GACA,MAAM,UAAU,gCAAgC;AAAA,MAC9C,SAAS;AAAA;AAAA,MACT,YAAY;AAAA,IACd,CAAC;AAAA,EACH;AAEA,QAAM,wBAAwB,QAAQ,KAAK,gBAAgB,uBAAuB,CAAC;AACnF,QAAM,UAAU,qBAAqB,GAErC,cAAc;AAAA,IACZ,iDAAiD,SAAS,OAAO,qBAAqB;AAAA,EACxF,GACA,MAAM,aAAa,WAAW,qBAAqB;AAInD,QAAM,uBAAuB,QAAQ,KAAK,gBAAgB,kBAAkB,aAAa,CAAC;AAC1F,QAAM,UAAU,sBAAsB;AAAA,IACpC,GAAG;AAAA,IACH,QAAQ;AAAA,MACN,GAAG,4BAA4B;AAAA,MAC/B,GAAI,WAAW,iBAAiB,IAC5B;AAAA,QACE;AAAA,UACE,KAAK;AAAA,UACL,gBAAgB;AAAA,UAChB,UAAU;AAAA,QACZ;AAAA,MACF,IACA,CAAC;AAAA,MACL;AAAA,QACE,QAAQ;AAAA,MACV;AAAA,MACA,GAAG,oBAAoB,SAAS,UAC7B,OAAO,CAAC,MAAM,EAAE,aAAa,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC,EAChE,IAAI,CAAC,OAAO;AAAA,QACX,KAAK,EAAE;AAAA,QACP,MAAM,GAAG,iBAAiB,CAAC,CAAC,IAAI,OAAO,QAAQ,EAAE,SAAS,EACvD,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,EAC5B,KAAK,GAAG,CAAC;AAAA,MACd,EAAE;AAAA,IACN;AAAA,EACF,CAAC,GACD,cAAc,KAAK,uCAAuC,oBAAoB,EAAE;AAClF;",
   "names": []
 }

package/dist/esm/vercel/build/buildVercelOutputDirectory.mjs

@@ -3,9 +3,9 @@ import FSExtra from "fs-extra";
 import { isMatching, P } from "ts-pattern";
 import { createApiServerlessFunction } from "./generate/createApiServerlessFunction.mjs";
 import { createSsrServerlessFunction } from "./generate/createSsrServerlessFunction.mjs";
-import { serverlessVercelNodeJsConfig } from "./config/vc-config-base.mjs";
 import { serverlessVercelPackageJson } from "./config/vc-package-base.mjs";
-import { vercelBuildOutputConfig } from "./config/vc-build-output-config-base.mjs";
+import { vercelBuildOutputConfigBase } from "./config/vc-build-output-config-base.mjs";
+import { getPathFromRoute } from "./getPathFromRoute.mjs";
 const {
   copy,
   ensureDir,
@@ -39,7 +39,7 @@ const buildVercelOutputDirectory = async ({
     }, o));
     for (const route of buildInfoForWriting.manifest.apiRoutes) {
       const compiledRoute = compiltedApiRoutes.find(compiled => compiled.facadeModuleId.includes(route.file.replace("./", "")));
-      compiledRoute ? (postBuildLogs.push(`[one.build][vercel] generating serverless function for apiRoute ${route.page}`), await createApiServerlessFunction(route.page, compiledRoute.code, oneOptionsRoot, postBuildLogs), route.page !== route.urlCleanPath && (await createApiServerlessFunction(route.urlCleanPath, compiledRoute.code, oneOptionsRoot, postBuildLogs))) : console.warn(`
+      compiledRoute ? (postBuildLogs.push(`[one.build][vercel] generating serverless function for apiRoute ${route.page}`), await createApiServerlessFunction(route, compiledRoute.code, oneOptionsRoot, postBuildLogs)) : console.warn(`
  \u{1F528}[one.build][vercel] apiRoute missing code compilation for`, route.file);
     }
   }
@@ -48,7 +48,7 @@ const buildVercelOutputDirectory = async ({
   for (const route of buildInfoForWriting.manifest.pageRoutes) switch (route.type) {
     case "ssr":
       {
-        routeToBuildInfo[route.file] && (postBuildLogs.push(`[one.build][vercel] generate serverless function for ${route.page} with ${route.type}`), await createSsrServerlessFunction(route.page, buildInfoForWriting, oneOptionsRoot, postBuildLogs));
+        routeToBuildInfo[route.file] && (postBuildLogs.push(`[one.build][vercel] generate serverless function for ${route.page} with ${route.type}`), await createSsrServerlessFunction(route, buildInfoForWriting, oneOptionsRoot, postBuildLogs));
         break;
       }
     default:
@@ -56,20 +56,50 @@ const buildVercelOutputDirectory = async ({
   }
   const distMiddlewareDir = resolve(join(oneOptionsRoot, "dist", "middlewares"));
   if (existsSync(distMiddlewareDir)) {
-    const vercelMiddlewareDir = resolve(join(oneOptionsRoot, ".vercel/output/functions/_middleware"));
+    const vercelMiddlewareDir = resolve(join(oneOptionsRoot, ".vercel/output/functions/_middleware.func"));
     await ensureDir(vercelMiddlewareDir), postBuildLogs.push(`[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`), await moveAllFiles(resolve(join(oneOptionsRoot, "dist", "middlewares")), vercelMiddlewareDir);
     const vercelMiddlewarePackageJsonFilePath = resolve(join(vercelMiddlewareDir, "index.js"));
     postBuildLogs.push(`[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`), await writeJSON(vercelMiddlewarePackageJsonFilePath, serverlessVercelPackageJson);
+    const wrappedMiddlewareEntryPointFilename = "_wrapped_middleware.js",
+      wrappedMiddlewareEntryPointPath = resolve(join(vercelMiddlewareDir, wrappedMiddlewareEntryPointFilename));
+    await FSExtra.writeFile(wrappedMiddlewareEntryPointPath, `
+import middlewareFunction from './_middleware.js'
+
+const next = (e) => {
+  const t = new Headers(null == e ? void 0 : e.headers)
+  t.set('x-middleware-next', '1')
+  return new Response(null, { ...e, headers: t })
+}
+
+const wrappedMiddlewareFunction = (request, event) => {
+  return middlewareFunction({ request, event, next })
+}
+
+export { wrappedMiddlewareFunction as default }
+  `);
     const middlewareVercelConfigFilePath = resolve(join(vercelMiddlewareDir, ".vc-config.json"));
     postBuildLogs.push(`[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`), await writeJSON(middlewareVercelConfigFilePath, {
-      ...serverlessVercelNodeJsConfig,
-      handler: "_middleware.js"
+      runtime: "edge",
+      // Seems that middlewares only work with edge runtime
+      entrypoint: wrappedMiddlewareEntryPointFilename
     });
   }
   const vercelOutputStaticDir = resolve(join(oneOptionsRoot, ".vercel/output/static"));
   await ensureDir(vercelOutputStaticDir), postBuildLogs.push(`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`), await moveAllFiles(clientDir, vercelOutputStaticDir);
   const vercelConfigFilePath = resolve(join(oneOptionsRoot, ".vercel/output", "config.json"));
-  await writeJSON(vercelConfigFilePath, vercelBuildOutputConfig), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
+  await writeJSON(vercelConfigFilePath, {
+    ...vercelBuildOutputConfigBase,
+    routes: [...vercelBuildOutputConfigBase.routes, ...(existsSync(distMiddlewareDir) ? [{
+      src: "/(.*)",
+      middlewarePath: "_middleware",
+      continue: !0
+    }] : []), {
+      handle: "rewrite"
+    }, ...buildInfoForWriting.manifest.allRoutes.filter(r => r.routeKeys && Object.keys(r.routeKeys).length > 0).map(r => ({
+      src: r.namedRegex,
+      dest: `${getPathFromRoute(r)}?${Object.entries(r.routeKeys).map(([k, v]) => `${k}=$${v}`).join("&")}`
+    }))]
+  }), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
 };
 export { buildVercelOutputDirectory };
 //# sourceMappingURL=buildVercelOutputDirectory.mjs.map

package/dist/esm/vercel/build/buildVercelOutputDirectory.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["join","resolve","FSExtra","isMatching","P","createApiServerlessFunction","createSsrServerlessFunction","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","vercelBuildOutputConfig","copy","ensureDir","existsSync","writeJSON","moveAllFiles","src","dest","overwrite","errorOnExist","err","console","error","buildVercelOutputDirectory","apiOutput","buildInfoForWriting","clientDir","oneOptionsRoot","postBuildLogs","routeToBuildInfo","compiltedApiRoutes","output","filter","o","code","string","facadeModuleId","route","manifest","apiRoutes","compiledRoute","find","compiled","includes","file","replace","push","page","urlCleanPath","warn","vercelOutputFunctionsDir","pageRoutes","type","distMiddlewareDir","vercelMiddlewareDir","vercelMiddlewarePackageJsonFilePath","middlewareVercelConfigFilePath","handler","vercelOutputStaticDir","vercelConfigFilePath"],"sources":["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["join","resolve","FSExtra","isMatching","P","createApiServerlessFunction","createSsrServerlessFunction","serverlessVercelPackageJson","vercelBuildOutputConfigBase","getPathFromRoute","copy","ensureDir","existsSync","writeJSON","moveAllFiles","src","dest","overwrite","errorOnExist","err","console","error","buildVercelOutputDirectory","apiOutput","buildInfoForWriting","clientDir","oneOptionsRoot","postBuildLogs","routeToBuildInfo","compiltedApiRoutes","output","filter","o","code","string","facadeModuleId","route","manifest","apiRoutes","compiledRoute","find","compiled","includes","file","replace","push","page","warn","vercelOutputFunctionsDir","pageRoutes","type","distMiddlewareDir","vercelMiddlewareDir","vercelMiddlewarePackageJsonFilePath","wrappedMiddlewareEntryPointFilename","wrappedMiddlewareEntryPointPath","writeFile","middlewareVercelConfigFilePath","runtime","entrypoint","vercelOutputStaticDir","vercelConfigFilePath","routes","middlewarePath","continue","handle","allRoutes","r","routeKeys","Object","keys","length","map","namedRegex","entries","k","v"],"sources":["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/vercel/build/buildVercelOutputDirectory.native.js

@@ -3,9 +3,9 @@ import FSExtra from "fs-extra";
 import { isMatching, P } from "ts-pattern";
 import { createApiServerlessFunction } from "./generate/createApiServerlessFunction.native.js";
 import { createSsrServerlessFunction } from "./generate/createSsrServerlessFunction.native.js";
-import { serverlessVercelNodeJsConfig } from "./config/vc-config-base.native.js";
 import { serverlessVercelPackageJson } from "./config/vc-package-base.native.js";
-import { vercelBuildOutputConfig } from "./config/vc-build-output-config-base.native.js";
+import { vercelBuildOutputConfigBase } from "./config/vc-build-output-config-base.native.js";
+import { getPathFromRoute } from "./getPathFromRoute.native.js";
 var {
   copy,
   ensureDir,
@@ -51,7 +51,7 @@ var buildVercelOutputDirectory = async function (param) {
               var flag = compiled.facadeModuleId.includes(route2.file.replace("./", ""));
               return flag;
             });
-          compiledRoute ? (postBuildLogs.push(`[one.build][vercel] generating serverless function for apiRoute ${route2.page}`), await createApiServerlessFunction(route2.page, compiledRoute.code, oneOptionsRoot, postBuildLogs), route2.page !== route2.urlCleanPath && (await createApiServerlessFunction(route2.urlCleanPath, compiledRoute.code, oneOptionsRoot, postBuildLogs))) : console.warn(`
+          compiledRoute ? (postBuildLogs.push(`[one.build][vercel] generating serverless function for apiRoute ${route2.page}`), await createApiServerlessFunction(route2, compiledRoute.code, oneOptionsRoot, postBuildLogs)) : console.warn(`
  \u{1F528}[one.build][vercel] apiRoute missing code compilation for`, route2.file);
         }, _iterator = buildInfoForWriting.manifest.apiRoutes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) await _loop();
     } catch (err) {
@@ -76,7 +76,7 @@ var buildVercelOutputDirectory = async function (param) {
         case "ssr":
           {
             var builtPageRoute = routeToBuildInfo[route.file];
-            builtPageRoute && (postBuildLogs.push(`[one.build][vercel] generate serverless function for ${route.page} with ${route.type}`), await createSsrServerlessFunction(route.page, buildInfoForWriting, oneOptionsRoot, postBuildLogs));
+            builtPageRoute && (postBuildLogs.push(`[one.build][vercel] generate serverless function for ${route.page} with ${route.type}`), await createSsrServerlessFunction(route, buildInfoForWriting, oneOptionsRoot, postBuildLogs));
             break;
           }
         default:
@@ -94,20 +94,57 @@ var buildVercelOutputDirectory = async function (param) {
   }
   var distMiddlewareDir = resolve(join(oneOptionsRoot, "dist", "middlewares"));
   if (existsSync(distMiddlewareDir)) {
-    var vercelMiddlewareDir = resolve(join(oneOptionsRoot, ".vercel/output/functions/_middleware"));
+    var vercelMiddlewareDir = resolve(join(oneOptionsRoot, ".vercel/output/functions/_middleware.func"));
     await ensureDir(vercelMiddlewareDir), postBuildLogs.push(`[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`), await moveAllFiles(resolve(join(oneOptionsRoot, "dist", "middlewares")), vercelMiddlewareDir);
     var vercelMiddlewarePackageJsonFilePath = resolve(join(vercelMiddlewareDir, "index.js"));
     postBuildLogs.push(`[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`), await writeJSON(vercelMiddlewarePackageJsonFilePath, serverlessVercelPackageJson);
+    var wrappedMiddlewareEntryPointFilename = "_wrapped_middleware.js",
+      wrappedMiddlewareEntryPointPath = resolve(join(vercelMiddlewareDir, wrappedMiddlewareEntryPointFilename));
+    await FSExtra.writeFile(wrappedMiddlewareEntryPointPath, `
+import middlewareFunction from './_middleware.js'
+
+const next = (e) => {
+  const t = new Headers(null == e ? void 0 : e.headers)
+  t.set('x-middleware-next', '1')
+  return new Response(null, { ...e, headers: t })
+}
+
+const wrappedMiddlewareFunction = (request, event) => {
+  return middlewareFunction({ request, event, next })
+}
+
+export { wrappedMiddlewareFunction as default }
+  `);
     var middlewareVercelConfigFilePath = resolve(join(vercelMiddlewareDir, ".vc-config.json"));
     postBuildLogs.push(`[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`), await writeJSON(middlewareVercelConfigFilePath, {
-      ...serverlessVercelNodeJsConfig,
-      handler: "_middleware.js"
+      runtime: "edge",
+      // Seems that middlewares only work with edge runtime
+      entrypoint: wrappedMiddlewareEntryPointFilename
     });
   }
   var vercelOutputStaticDir = resolve(join(oneOptionsRoot, ".vercel/output/static"));
   await ensureDir(vercelOutputStaticDir), postBuildLogs.push(`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`), await moveAllFiles(clientDir, vercelOutputStaticDir);
   var vercelConfigFilePath = resolve(join(oneOptionsRoot, ".vercel/output", "config.json"));
-  await writeJSON(vercelConfigFilePath, vercelBuildOutputConfig), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
+  await writeJSON(vercelConfigFilePath, {
+    ...vercelBuildOutputConfigBase,
+    routes: [...vercelBuildOutputConfigBase.routes, ...(existsSync(distMiddlewareDir) ? [{
+      src: "/(.*)",
+      middlewarePath: "_middleware",
+      continue: !0
+    }] : []), {
+      handle: "rewrite"
+    }, ...buildInfoForWriting.manifest.allRoutes.filter(function (r) {
+      return r.routeKeys && Object.keys(r.routeKeys).length > 0;
+    }).map(function (r) {
+      return {
+        src: r.namedRegex,
+        dest: `${getPathFromRoute(r)}?${Object.entries(r.routeKeys).map(function (param2) {
+          var [k, v] = param2;
+          return `${k}=$${v}`;
+        }).join("&")}`
+      };
+    })]
+  }), postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`);
 };
 export { buildVercelOutputDirectory };
 //# sourceMappingURL=buildVercelOutputDirectory.native.js.map

package/dist/esm/vercel/build/buildVercelOutputDirectory.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["join","resolve","FSExtra","isMatching","P","createApiServerlessFunction","createSsrServerlessFunction","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","vercelBuildOutputConfig","copy","ensureDir","existsSync","writeJSON","moveAllFiles","src","dest","overwrite","errorOnExist","err","console","error","buildVercelOutputDirectory","param","apiOutput","buildInfoForWriting","clientDir","oneOptionsRoot","postBuildLogs","routeToBuildInfo","_apiOutput_output","compiltedApiRoutes","output","filter","o","code","string","facadeModuleId","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","route2","_step","value","compiledRoute","find","compiled","flag","includes","file","replace","push","page","urlCleanPath","warn","_iterator","manifest","apiRoutes","Symbol","iterator","next","done","return","vercelOutputFunctionsDir","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","pageRoutes","_step1","route","type","builtPageRoute","distMiddlewareDir","vercelMiddlewareDir","vercelMiddlewarePackageJsonFilePath","middlewareVercelConfigFilePath","handler","vercelOutputStaticDir","vercelConfigFilePath"],"sources":["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["join","resolve","FSExtra","isMatching","P","createApiServerlessFunction","createSsrServerlessFunction","serverlessVercelPackageJson","vercelBuildOutputConfigBase","getPathFromRoute","copy","ensureDir","existsSync","writeJSON","moveAllFiles","src","dest","overwrite","errorOnExist","err","console","error","buildVercelOutputDirectory","param","apiOutput","buildInfoForWriting","clientDir","oneOptionsRoot","postBuildLogs","routeToBuildInfo","_apiOutput_output","compiltedApiRoutes","output","filter","o","code","string","facadeModuleId","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","route2","_step","value","compiledRoute","find","compiled","flag","includes","file","replace","push","page","warn","_iterator","manifest","apiRoutes","Symbol","iterator","next","done","return","vercelOutputFunctionsDir","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","pageRoutes","_step1","route","type","builtPageRoute","distMiddlewareDir","vercelMiddlewareDir","vercelMiddlewarePackageJsonFilePath","wrappedMiddlewareEntryPointFilename","wrappedMiddlewareEntryPointPath","writeFile","middlewareVercelConfigFilePath","runtime","entrypoint","vercelOutputStaticDir","vercelConfigFilePath","routes","middlewarePath","continue","handle","allRoutes","r","routeKeys","Object","keys","length"],"sources":["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/vercel/build/config/vc-build-output-config-base.js

@@ -1,14 +1,15 @@
-const vercelBuildOutputConfig = {
+const vercelBuildOutputConfigBase = {
   version: 3,
   // https://vercel.com/docs/build-output-api/v3/configuration#routes
   routes: [
-    {
-      src: "/(.*)",
-      status: 200
-    }
+    // Not sure if we really need this, but having this seems to break the 'rewrite's we will add to handle dynamic routes.
+    // {
+    //   src: '/(.*)',
+    //   status: 200,
+    // },
   ]
 };
 export {
-  vercelBuildOutputConfig
+  vercelBuildOutputConfigBase
 };
 //# sourceMappingURL=vc-build-output-config-base.js.map

package/dist/esm/vercel/build/config/vc-build-output-config-base.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/config/vc-build-output-config-base.ts"],
-  "mappings": "AAEO,MAAM,0BAA0B;AAAA,EACrC,SAAS;AAAA;AAAA,EAET,QAAQ;AAAA,IACN;AAAA,MACE,KAAK;AAAA,MACL,QAAQ;AAAA,IACV;AAAA,EACF;AACF;",
+  "mappings": "AAEO,MAAM,8BAA8B;AAAA,EACzC,SAAS;AAAA;AAAA,EAET,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAMR;AACF;",
   "names": []
 }

package/dist/esm/vercel/build/config/vc-build-output-config-base.mjs

@@ -1,10 +1,13 @@
-const vercelBuildOutputConfig = {
+const vercelBuildOutputConfigBase = {
   version: 3,
   // https://vercel.com/docs/build-output-api/v3/configuration#routes
-  routes: [{
-    src: "/(.*)",
-    status: 200
-  }]
+  routes: [
+    // Not sure if we really need this, but having this seems to break the 'rewrite's we will add to handle dynamic routes.
+    // {
+    //   src: '/(.*)',
+    //   status: 200,
+    // },
+  ]
 };
-export { vercelBuildOutputConfig };
+export { vercelBuildOutputConfigBase };
 //# sourceMappingURL=vc-build-output-config-base.mjs.map

package/dist/esm/vercel/build/config/vc-build-output-config-base.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["vercelBuildOutputConfig","version","routes","src","status"],"sources":["../../../../../src/vercel/build/config/vc-build-output-config-base.ts"],"sourcesContent":[null],"mappings":"AAEO,MAAMA,uBAAA,GAA0B;EACrCC,OAAA,EAAS;EAAA;EAETC,MAAA,EAAQ,CACN;IACEC,GAAA,EAAK;IACLC,MAAA,EAAQ;EACV;AAEJ","ignoreList":[]}
+{"version":3,"names":["vercelBuildOutputConfigBase","version","routes"],"sources":["../../../../../src/vercel/build/config/vc-build-output-config-base.ts"],"sourcesContent":[null],"mappings":"AAEO,MAAMA,2BAAA,GAA8B;EACzCC,OAAA,EAAS;EAAA;EAETC,MAAA,EAAQ;IAAA;IAAA;IAAA;IAAA;IAAA;EAAA;AAOV","ignoreList":[]}

package/dist/esm/vercel/build/config/vc-build-output-config-base.native.js

@@ -1,10 +1,7 @@
-var vercelBuildOutputConfig = {
+var vercelBuildOutputConfigBase = {
   version: 3,
   // https://vercel.com/docs/build-output-api/v3/configuration#routes
-  routes: [{
-    src: "/(.*)",
-    status: 200
-  }]
+  routes: []
 };
-export { vercelBuildOutputConfig };
+export { vercelBuildOutputConfigBase };
 //# sourceMappingURL=vc-build-output-config-base.native.js.map

package/dist/esm/vercel/build/config/vc-build-output-config-base.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["vercelBuildOutputConfig","version","routes","src","status"],"sources":["../../../../../src/vercel/build/config/vc-build-output-config-base.ts"],"sourcesContent":[null],"mappings":"AAEO,IAAAA,uBAAM;EACXC,OAAA,EAAS;EAAA;EAETC,MAAA,EAAQ,CACN;IACEC,GAAA,EAAK;IACLC,MAAA,EAAQ;EACV;AAEJ","ignoreList":[]}
+{"version":3,"names":["vercelBuildOutputConfigBase","version","routes"],"sources":["../../../../../src/vercel/build/config/vc-build-output-config-base.ts"],"sourcesContent":[null],"mappings":"AAEO,IAAAA,2BAAM;EACXC,OAAA,EAAS;EAAA;EAETC,MAAA,EAAQ;AAAA;AAAA,SAAAF,2BAAA","ignoreList":[]}

package/dist/esm/vercel/build/generate/createApiServerlessFunction.js

@@ -1,25 +1,36 @@
-import { join, resolve } from "node:path";
+import { dirname, join, resolve } from "node:path";
+import FSExtra from "fs-extra";
+import { resolvePath } from "@vxrn/resolve";
+import parser from "@babel/parser";
+import traverse from "@babel/traverse";
+import t from "@babel/types";
+import generator from "@babel/generator";
 import fs from "fs-extra";
 import { serverlessVercelPackageJson } from "../config/vc-package-base";
 import { serverlessVercelNodeJsConfig } from "../config/vc-config-base";
-async function createApiServerlessFunction(pageName, code, oneOptionsRoot, postBuildLogs) {
+import { getPathFromRoute } from "../getPathFromRoute";
+async function createApiServerlessFunction(route, code, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
-    const funcFolder = join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`);
-    await fs.ensureDir(funcFolder), code.includes("react") && (postBuildLogs.push(
-      `[one.build][vercel.createSsrServerlessFunction] detected react in depenency tree for ${pageName}`
-    ), await fs.copy(
-      resolve(join(oneOptionsRoot, "..", "..", "node_modules", "react")),
-      resolve(join(funcFolder, "node_modules", "react"))
-    ));
+    const path = getPathFromRoute(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${path}`);
+    const funcFolder = join(oneOptionsRoot, `.vercel/output/functions/${path}.func`);
+    if (await fs.ensureDir(funcFolder), code.includes("react")) {
+      postBuildLogs.push(
+        `[one.build][vercel.createSsrServerlessFunction] detected react in depenency tree for ${path}`
+      );
+      const reactPath = dirname(resolvePath("react/package.json", oneOptionsRoot));
+      await fs.copy(resolve(reactPath), resolve(join(funcFolder, "node_modules", "react")));
+    }
     const distAssetsFolder = resolve(join(funcFolder, "assets"));
     postBuildLogs.push(
       `[one.build][vercel.createSsrServerlessFunction] copy shared assets to ${distAssetsFolder}`
-    ), await fs.copy(resolve(join(oneOptionsRoot, "dist", "api", "assets")), distAssetsFolder), await fs.ensureDir(resolve(join(funcFolder, "entrypoint")));
+    );
+    const sourceAssetsFolder = resolve(join(oneOptionsRoot, "dist", "api", "assets"));
+    await FSExtra.pathExists(sourceAssetsFolder) && await fs.copy(sourceAssetsFolder, distAssetsFolder), await fs.ensureDir(resolve(join(funcFolder, "entrypoint")));
     const entrypointFilePath = resolve(join(funcFolder, "entrypoint", "index.js"));
     postBuildLogs.push(
       `[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`
-    ), await fs.writeFile(entrypointFilePath, code);
+    ), await fs.writeFile(entrypointFilePath, wrapHandlerFunctions(code));
     const packageJsonFilePath = resolve(join(funcFolder, "package.json"));
     return postBuildLogs.push(
       `[one.build][vercel.createSsrServerlessFunction] writing package.json to ${packageJsonFilePath}`
@@ -31,11 +42,75 @@ async function createApiServerlessFunction(pageName, code, oneOptionsRoot, postB
     });
   } catch (e) {
     console.error(
-      `[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${pageName}`,
+      `[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${route.file}`,
       e
     );
   }
 }
+function wrapHandlerFunctions(code) {
+  const ast = parser.parse(code, {
+    sourceType: "module"
+  });
+  return traverse.default(ast, {
+    FunctionDeclaration(path) {
+      const { node } = path, functionNamesToHandle = [
+        "GET",
+        "POST",
+        "PUT",
+        "PATCH",
+        "DELETE",
+        "HEAD",
+        "OPTIONS"
+        // TODO: more possibilities?
+      ];
+      if (!node.id || !functionNamesToHandle.includes(node.id.name) || node.extra && node.extra.isWrapper || node.extra && node.extra.isWrapped) return;
+      const originalName = `orig_${node.id.name}`, originalFunction = t.functionDeclaration(
+        t.identifier(originalName),
+        node.params,
+        node.body,
+        node.generator,
+        node.async
+      ), requestIdentifier = t.identifier("request"), wrapperParams = [requestIdentifier], urlIdentifier = t.identifier("url"), paramsIdentifier = t.identifier("params"), urlDecl = t.variableDeclaration("const", [
+        t.variableDeclarator(
+          urlIdentifier,
+          t.newExpression(t.identifier("URL"), [
+            t.memberExpression(requestIdentifier, t.identifier("url"))
+          ])
+        )
+      ]), paramsDecl = t.variableDeclaration("const", [
+        t.variableDeclarator(
+          paramsIdentifier,
+          t.callExpression(
+            t.memberExpression(t.identifier("Object"), t.identifier("fromEntries")),
+            [
+              t.callExpression(
+                t.memberExpression(
+                  t.memberExpression(
+                    urlIdentifier,
+                    t.identifier("searchParams")
+                  ),
+                  t.identifier("entries")
+                ),
+                []
+              )
+            ]
+          )
+        )
+      ]), callOrigFnStatement = t.callExpression(t.identifier(originalName), [
+        requestIdentifier,
+        t.objectExpression([t.objectProperty(t.identifier("params"), paramsIdentifier)])
+      ]), wrapperFunction = t.functionDeclaration(
+        t.identifier(node.id.name + ""),
+        wrapperParams,
+        t.blockStatement([urlDecl, paramsDecl, t.returnStatement(callOrigFnStatement)])
+        // No need to care if the wrapper function should be async,
+        // since we didn't use any await in the wrapper function, and we'll
+        // just return what the original function returns.
+      );
+      node.extra = node.extra || {}, node.extra.isWrapped = !0, wrapperFunction.extra = wrapperFunction.extra || {}, wrapperFunction.extra.isWrapper = !0, path.parentPath.isExportNamedDeclaration() ? path.replaceWithMultiple([originalFunction, t.exportNamedDeclaration(wrapperFunction, [])]) : path.replaceWithMultiple([originalFunction, wrapperFunction]);
+    }
+  }), generator.default(ast, {}).code;
+}
 export {
   createApiServerlessFunction
 };

package/dist/esm/vercel/build/generate/createApiServerlessFunction.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/generate/createApiServerlessFunction.ts"],
-  "mappings": "AAAA,SAAS,MAAM,eAAe;AAE9B,OAAO,QAAQ;AAEf,SAAS,mCAAmC;AAC5C,SAAS,oCAAoC;AAI7C,eAAsB,4BACpB,UACA,MACA,gBACA,eACA;AACA,MAAI;AACF,kBAAc,KAAK,6DAA6D,QAAQ,EAAE;AAE1F,UAAM,aAAa,KAAK,gBAAgB,4BAA4B,QAAQ,OAAO;AACnF,UAAM,GAAG,UAAU,UAAU,GAEzB,KAAK,SAAS,OAAO,MACvB,cAAc;AAAA,MACZ,wFAAwF,QAAQ;AAAA,IAClG,GACA,MAAM,GAAG;AAAA,MACP,QAAQ,KAAK,gBAAgB,MAAM,MAAM,gBAAgB,OAAO,CAAC;AAAA,MACjE,QAAQ,KAAK,YAAY,gBAAgB,OAAO,CAAC;AAAA,IACnD;AAGF,UAAM,mBAAmB,QAAQ,KAAK,YAAY,QAAQ,CAAC;AAC3D,kBAAc;AAAA,MACZ,yEAAyE,gBAAgB;AAAA,IAC3F,GACA,MAAM,GAAG,KAAK,QAAQ,KAAK,gBAAgB,QAAQ,OAAO,QAAQ,CAAC,GAAG,gBAAgB,GAEtF,MAAM,GAAG,UAAU,QAAQ,KAAK,YAAY,YAAY,CAAC,CAAC;AAC1D,UAAM,qBAAqB,QAAQ,KAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,GAAG,UAAU,oBAAoB,IAAI;AAE3C,UAAM,sBAAsB,QAAQ,KAAK,YAAY,cAAc,CAAC;AACpE,yBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,GAAG,UAAU,qBAAqB,2BAA2B,GAEnE,cAAc;AAAA,MACZ,8EAA8E,KAAK,YAAY,iBAAiB,CAAC;AAAA,IACnH,GAGO,GAAG,UAAU,KAAK,YAAY,iBAAiB,GAAG;AAAA,MACvD,GAAG;AAAA,MACH,SAAS;AAAA,IACX,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,QAAQ;AAAA,MACvF;AAAA,IACF;AAAA,EACF;AACF;",
+  "mappings": "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",
   "names": []
 }