one 1.1.483 → 1.1.484

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

@@ -2,10 +2,12 @@ import fs from "fs-extra";
 import { join, resolve } from "node:path";
 import { serverlessVercelNodeJsConfig } from "../config/vc-config-base";
 import { serverlessVercelPackageJson } from "../config/vc-package-base";
-async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot, postBuildLogs) {
+import { getPathFromRoute } from "../getPathFromRoute";
+async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
-    const buildInfoAsString = JSON.stringify(buildInfo), funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`));
+    const path = getPathFromRoute(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] path: ${path}`);
+    const buildInfoAsString = JSON.stringify(buildInfo), funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${path}.func`));
     await fs.ensureDir(funcFolder);
     const distServerFrom = resolve(join(oneOptionsRoot, "dist", "server")), distServerTo = resolve(join(funcFolder, "server"));
     await fs.ensureDir(distServerTo), postBuildLogs.push(
@@ -19,6 +21,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       `
   const buildInfoConfig = await import('../buildInfo.js');
   const entry = await import('../server/_virtual_one-entry.js');
+  const routeFile = ${JSON.stringify(route.file)}
 
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
@@ -28,7 +31,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       params: Object.fromEntries(url.searchParams.entries())
     }
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
-    const routeFile = \`.\${url.pathname}\${postfix}\`;
+    // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
 
     // If we cannot find the route by direct match, try to find it by looking it up in the
@@ -80,7 +83,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
     });
   } 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
     );
   }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],
-  "mappings": "AAAA,OAAO,QAAQ;AACf,SAAS,MAAM,eAAe;AAC9B,SAAS,oCAAoC;AAC7C,SAAS,mCAAmC;AAK5C,eAAsB,4BACpB,UACA,WACA,gBACA,eACA;AACA,MAAI;AACF,kBAAc,KAAK,6DAA6D,QAAQ,EAAE;AAE1F,UAAM,oBAAoB,KAAK,UAAU,SAAS,GAC5C,aAAa,QAAQ,KAAK,gBAAgB,4BAA4B,QAAQ,OAAO,CAAC;AAC5F,UAAM,GAAG,UAAU,UAAU;AAE7B,UAAM,iBAAiB,QAAQ,KAAK,gBAAgB,QAAQ,QAAQ,CAAC,GAC/D,eAAe,QAAQ,KAAK,YAAY,QAAQ,CAAC;AACvD,UAAM,GAAG,UAAU,YAAY,GAC/B,cAAc;AAAA,MACZ,+EAA+E,cAAc,OAAO,YAAY;AAAA,IAClH,GACA,MAAM,GAAG,KAAK,gBAAgB,YAAY,GAE1C,cAAc,KAAK,wEAAwE,GAC3F,MAAM,GAAG,UAAU,KAAK,YAAY,cAAc,GAAG,kBAAkB,iBAAiB,EAAE,GAE1F,MAAM,GAAG,UAAU,KAAK,YAAY,YAAY,CAAC;AACjD,UAAM,qBAAqB,QAAQ,KAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,GAAG;AAAA,MACP;AAAA,MACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IA8CF;AAEA,UAAM,sBAAsB,QAAQ,KAAK,YAAY,cAAc,CAAC;AACpE,kBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,GAAG,UAAU,qBAAqB,2BAA2B;AAInE,UAAM,mBAAmB,QAAQ,KAAK,YAAY,iBAAiB,CAAC;AACpE,yBAAc;AAAA,MACZ,8EAA8E,gBAAgB;AAAA,IAChG,GACO,GAAG,UAAU,kBAAkB;AAAA,MACpC,GAAG;AAAA,MACH,SAAS;AAAA,MACT,aAAa;AAAA,QACX,GAAG,6BAA6B;AAAA,QAChC,yBAAyB;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,QAAQ;AAAA,MACvF;AAAA,IACF;AAAA,EACF;AACF;",
+  "mappings": "AAAA,OAAO,QAAQ;AACf,SAAS,MAAM,eAAe;AAC9B,SAAS,oCAAoC;AAC7C,SAAS,mCAAmC;AAE5C,SAAS,wBAAwB;AAIjC,eAAsB,4BACpB,OACA,WACA,gBACA,eACA;AACA,MAAI;AACF,UAAM,OAAO,iBAAiB,KAAK;AACnC,kBAAc,KAAK,yDAAyD,IAAI,EAAE;AAElF,UAAM,oBAAoB,KAAK,UAAU,SAAS,GAC5C,aAAa,QAAQ,KAAK,gBAAgB,4BAA4B,IAAI,OAAO,CAAC;AACxF,UAAM,GAAG,UAAU,UAAU;AAE7B,UAAM,iBAAiB,QAAQ,KAAK,gBAAgB,QAAQ,QAAQ,CAAC,GAC/D,eAAe,QAAQ,KAAK,YAAY,QAAQ,CAAC;AACvD,UAAM,GAAG,UAAU,YAAY,GAC/B,cAAc;AAAA,MACZ,+EAA+E,cAAc,OAAO,YAAY;AAAA,IAClH,GACA,MAAM,GAAG,KAAK,gBAAgB,YAAY,GAE1C,cAAc,KAAK,wEAAwE,GAC3F,MAAM,GAAG,UAAU,KAAK,YAAY,cAAc,GAAG,kBAAkB,iBAAiB,EAAE,GAE1F,MAAM,GAAG,UAAU,KAAK,YAAY,YAAY,CAAC;AACjD,UAAM,qBAAqB,QAAQ,KAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,GAAG;AAAA,MACP;AAAA,MACA;AAAA;AAAA;AAAA,sBAGgB,KAAK,UAAU,MAAM,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IA4C5C;AAEA,UAAM,sBAAsB,QAAQ,KAAK,YAAY,cAAc,CAAC;AACpE,kBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,GAAG,UAAU,qBAAqB,2BAA2B;AAInE,UAAM,mBAAmB,QAAQ,KAAK,YAAY,iBAAiB,CAAC;AACpE,yBAAc;AAAA,MACZ,8EAA8E,gBAAgB;AAAA,IAChG,GACO,GAAG,UAAU,kBAAkB;AAAA,MACpC,GAAG;AAAA,MACH,SAAS;AAAA,MACT,aAAa;AAAA,QACX,GAAG,6BAA6B;AAAA,QAChC,yBAAyB;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,MAAM,IAAI;AAAA,MACzF;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs

@@ -2,11 +2,13 @@ import fs from "fs-extra";
 import { join, resolve } from "node:path";
 import { serverlessVercelNodeJsConfig } from "../config/vc-config-base.mjs";
 import { serverlessVercelPackageJson } from "../config/vc-package-base.mjs";
-async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot, postBuildLogs) {
+import { getPathFromRoute } from "../getPathFromRoute.mjs";
+async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
+    const path = getPathFromRoute(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] path: ${path}`);
     const buildInfoAsString = JSON.stringify(buildInfo),
-      funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`));
+      funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${path}.func`));
     await fs.ensureDir(funcFolder);
     const distServerFrom = resolve(join(oneOptionsRoot, "dist", "server")),
       distServerTo = resolve(join(funcFolder, "server"));
@@ -15,6 +17,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
     postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await fs.writeFile(entrypointFilePath, `
   const buildInfoConfig = await import('../buildInfo.js');
   const entry = await import('../server/_virtual_one-entry.js');
+  const routeFile = ${JSON.stringify(route.file)}
 
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
@@ -24,7 +27,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       params: Object.fromEntries(url.searchParams.entries())
     }
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
-    const routeFile = \`.\${url.pathname}\${postfix}\`;
+    // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
 
     // If we cannot find the route by direct match, try to find it by looking it up in the
@@ -70,7 +73,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       }
     });
   } catch (e) {
-    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${pageName}`, e);
+    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${route.file}`, e);
   }
 }
 export { createSsrServerlessFunction };

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["fs","join","resolve","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","createSsrServerlessFunction","pageName","buildInfo","oneOptionsRoot","postBuildLogs","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,EAAA,MAAQ;AACf,SAASC,IAAA,EAAMC,OAAA,QAAe;AAC9B,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAK5C,eAAsBC,4BACpBC,QAAA,EACAC,SAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACFA,aAAA,CAAcC,IAAA,CAAK,6DAA6DJ,QAAQ,EAAE;IAE1F,MAAMK,iBAAA,GAAoBC,IAAA,CAAKC,SAAA,CAAUN,SAAS;MAC5CO,UAAA,GAAaZ,OAAA,CAAQD,IAAA,CAAKO,cAAA,EAAgB,4BAA4BF,QAAQ,OAAO,CAAC;IAC5F,MAAMN,EAAA,CAAGe,SAAA,CAAUD,UAAU;IAE7B,MAAME,cAAA,GAAiBd,OAAA,CAAQD,IAAA,CAAKO,cAAA,EAAgB,QAAQ,QAAQ,CAAC;MAC/DS,YAAA,GAAef,OAAA,CAAQD,IAAA,CAAKa,UAAA,EAAY,QAAQ,CAAC;IACvD,MAAMd,EAAA,CAAGe,SAAA,CAAUE,YAAY,GAC/BR,aAAA,CAAcC,IAAA,CACZ,+EAA+EM,cAAc,OAAOC,YAAY,EAClH,GACA,MAAMjB,EAAA,CAAGkB,IAAA,CAAKF,cAAA,EAAgBC,YAAY,GAE1CR,aAAA,CAAcC,IAAA,CAAK,wEAAwE,GAC3F,MAAMV,EAAA,CAAGmB,SAAA,CAAUlB,IAAA,CAAKa,UAAA,EAAY,cAAc,GAAG,kBAAkBH,iBAAiB,EAAE,GAE1F,MAAMX,EAAA,CAAGe,SAAA,CAAUd,IAAA,CAAKa,UAAA,EAAY,YAAY,CAAC;IACjD,MAAMM,kBAAA,GAAqBlB,OAAA,CAAQD,IAAA,CAAKa,UAAA,EAAY,cAAc,UAAU,CAAC;IAC7EL,aAAA,CAAcC,IAAA,CACZ,yEAAyEU,kBAAkB,EAC7F,GACA,MAAMpB,EAAA,CAAGmB,SAAA,CACPC,kBAAA,EACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GA8CF;IAEA,MAAMC,mBAAA,GAAsBnB,OAAA,CAAQD,IAAA,CAAKa,UAAA,EAAY,cAAc,CAAC;IACpEL,aAAA,CAAcC,IAAA,CACZ,2EAA2EW,mBAAmB,EAChG,GACA,MAAMrB,EAAA,CAAGsB,SAAA,CAAUD,mBAAA,EAAqBjB,2BAA2B;IAInE,MAAMmB,gBAAA,GAAmBrB,OAAA,CAAQD,IAAA,CAAKa,UAAA,EAAY,iBAAiB,CAAC;IACpE,OAAAL,aAAA,CAAcC,IAAA,CACZ,8EAA8Ea,gBAAgB,EAChG,GACOvB,EAAA,CAAGwB,SAAA,CAAUD,gBAAA,EAAkB;MACpC,GAAGpB,4BAAA;MACHsB,OAAA,EAAS;MACTC,WAAA,EAAa;QACX,GAAGvB,4BAAA,CAA6BuB,WAAA;QAChCC,uBAAA,EAAyB;MAC3B;IACF,CAAC;EACH,SAASC,CAAA,EAAG;IACVC,OAAA,CAAQC,KAAA,CACN,+EAA+ExB,QAAQ,IACvFsB,CACF;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["fs","join","resolve","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","getPathFromRoute","createSsrServerlessFunction","route","buildInfo","oneOptionsRoot","postBuildLogs","path","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","file","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,EAAA,MAAQ;AACf,SAASC,IAAA,EAAMC,OAAA,QAAe;AAC9B,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAE5C,SAASC,gBAAA,QAAwB;AAIjC,eAAsBC,4BACpBC,KAAA,EACAC,SAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACF,MAAMC,IAAA,GAAON,gBAAA,CAAiBE,KAAK;IACnCG,aAAA,CAAcE,IAAA,CAAK,yDAAyDD,IAAI,EAAE;IAElF,MAAME,iBAAA,GAAoBC,IAAA,CAAKC,SAAA,CAAUP,SAAS;MAC5CQ,UAAA,GAAad,OAAA,CAAQD,IAAA,CAAKQ,cAAA,EAAgB,4BAA4BE,IAAI,OAAO,CAAC;IACxF,MAAMX,EAAA,CAAGiB,SAAA,CAAUD,UAAU;IAE7B,MAAME,cAAA,GAAiBhB,OAAA,CAAQD,IAAA,CAAKQ,cAAA,EAAgB,QAAQ,QAAQ,CAAC;MAC/DU,YAAA,GAAejB,OAAA,CAAQD,IAAA,CAAKe,UAAA,EAAY,QAAQ,CAAC;IACvD,MAAMhB,EAAA,CAAGiB,SAAA,CAAUE,YAAY,GAC/BT,aAAA,CAAcE,IAAA,CACZ,+EAA+EM,cAAc,OAAOC,YAAY,EAClH,GACA,MAAMnB,EAAA,CAAGoB,IAAA,CAAKF,cAAA,EAAgBC,YAAY,GAE1CT,aAAA,CAAcE,IAAA,CAAK,wEAAwE,GAC3F,MAAMZ,EAAA,CAAGqB,SAAA,CAAUpB,IAAA,CAAKe,UAAA,EAAY,cAAc,GAAG,kBAAkBH,iBAAiB,EAAE,GAE1F,MAAMb,EAAA,CAAGiB,SAAA,CAAUhB,IAAA,CAAKe,UAAA,EAAY,YAAY,CAAC;IACjD,MAAMM,kBAAA,GAAqBpB,OAAA,CAAQD,IAAA,CAAKe,UAAA,EAAY,cAAc,UAAU,CAAC;IAC7EN,aAAA,CAAcE,IAAA,CACZ,yEAAyEU,kBAAkB,EAC7F,GACA,MAAMtB,EAAA,CAAGqB,SAAA,CACPC,kBAAA,EACA;AAAA;AAAA;AAAA,sBAGgBR,IAAA,CAAKC,SAAA,CAAUR,KAAA,CAAMgB,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GA4C5C;IAEA,MAAMC,mBAAA,GAAsBtB,OAAA,CAAQD,IAAA,CAAKe,UAAA,EAAY,cAAc,CAAC;IACpEN,aAAA,CAAcE,IAAA,CACZ,2EAA2EY,mBAAmB,EAChG,GACA,MAAMxB,EAAA,CAAGyB,SAAA,CAAUD,mBAAA,EAAqBpB,2BAA2B;IAInE,MAAMsB,gBAAA,GAAmBxB,OAAA,CAAQD,IAAA,CAAKe,UAAA,EAAY,iBAAiB,CAAC;IACpE,OAAAN,aAAA,CAAcE,IAAA,CACZ,8EAA8Ec,gBAAgB,EAChG,GACO1B,EAAA,CAAG2B,SAAA,CAAUD,gBAAA,EAAkB;MACpC,GAAGvB,4BAAA;MACHyB,OAAA,EAAS;MACTC,WAAA,EAAa;QACX,GAAG1B,4BAAA,CAA6B0B,WAAA;QAChCC,uBAAA,EAAyB;MAC3B;IACF,CAAC;EACH,SAASC,CAAA,EAAG;IACVC,OAAA,CAAQC,KAAA,CACN,+EAA+E1B,KAAA,CAAMgB,IAAI,IACzFQ,CACF;EACF;AACF","ignoreList":[]}

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js

@@ -2,11 +2,13 @@ import fs from "fs-extra";
 import { join, resolve } from "node:path";
 import { serverlessVercelNodeJsConfig } from "../config/vc-config-base.native.js";
 import { serverlessVercelPackageJson } from "../config/vc-package-base.native.js";
-async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot, postBuildLogs) {
+import { getPathFromRoute } from "../getPathFromRoute.native.js";
+async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, postBuildLogs) {
   try {
-    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`);
+    var path = getPathFromRoute(route);
+    postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] path: ${path}`);
     var buildInfoAsString = JSON.stringify(buildInfo),
-      funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`));
+      funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${path}.func`));
     await fs.ensureDir(funcFolder);
     var distServerFrom = resolve(join(oneOptionsRoot, "dist", "server")),
       distServerTo = resolve(join(funcFolder, "server"));
@@ -15,6 +17,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
     postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] writing entrypoint to ${entrypointFilePath}`), await fs.writeFile(entrypointFilePath, `
   const buildInfoConfig = await import('../buildInfo.js');
   const entry = await import('../server/_virtual_one-entry.js');
+  const routeFile = ${JSON.stringify(route.file)}
 
   const handler = async (req, res) => {
     // console.debug("req.url", req.url);
@@ -24,7 +27,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       params: Object.fromEntries(url.searchParams.entries())
     }
     const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
-    const routeFile = \`.\${url.pathname}\${postfix}\`;
+    // const routeFile = \`.\${url.pathname}\${postfix}\`;
     let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
 
     // If we cannot find the route by direct match, try to find it by looking it up in the
@@ -70,7 +73,7 @@ async function createSsrServerlessFunction(pageName, buildInfo, oneOptionsRoot,
       }
     });
   } catch (e) {
-    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${pageName}`, e);
+    console.error(`[one.build][vercel.createSsrServerlessFunction] failed to generate func for ${route.file}`, e);
   }
 }
 export { createSsrServerlessFunction };

package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["fs","join","resolve","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","createSsrServerlessFunction","pageName","buildInfo","oneOptionsRoot","postBuildLogs","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,EAAA,MAAQ;AACf,SAASC,IAAA,EAAMC,OAAA,QAAe;AAC9B,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAK5C,eAAsBC,4BACpBC,QAAA,EACAC,SAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACFA,aAAA,CAAcC,IAAA,CAAK,6DAA6DJ,QAAQ,EAAE;IAE1F,IAAAK,iBAAM,GAAAC,IAAoB,CAAAC,SAAK,CAAAN,SAAU;MAASO,UAC5C,GAAAZ,OAAa,CAAAD,IAAQ,CAAAO,cAAK,8BAAgBF,QAA4B,OAAQ,EAAO;IAC3F,MAAMN,EAAA,CAAGe,SAAA,CAAUD,UAAU;IAE7B,IAAAE,cAAM,GAAAd,OAAiB,CAAAD,IAAQ,CAAAO,cAAK,QAAgB,UAAQ,EAAQ;MAACS,YAC/D,GAAAf,OAAe,CAAAD,IAAQ,CAAAa,UAAK,UAAY,EAAQ;IACtD,MAAMd,EAAA,CAAGe,SAAA,CAAUE,YAAY,GAC/BR,aAAA,CAAcC,IAAA,gFAAAM,cAAA,OAAAC,YAAA,WAAAjB,EAAA,CAAAkB,IAAA,CAAAF,cAAA,EAAAC,YAAA,GAAAR,aAAA,CAAAC,IAAA,kFAAAV,EAAA,CAAAmB,SAAA,CAAAlB,IAAA,CAAAa,UAAA,qCAAAH,iBAAA,WAAAX,EAAA,CAAAe,SAAA,CAAAd,IAAA,CAAAa,UAAA;IAAA,IACZM,kBAAA,GAAAlB,OAAA,CAAAD,IAAA,CAAAa,UAAA;IACFL,aACS,CAAAC,IAAK,0EAEKU,kBAAA,WAAApB,EAAA,CAAAmB,SAAA,CAAAC,kBACV;AAGT;AACA;AAAc;AAC+E;AAEpF;AACP;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IAAA,IAAAC,mBAAA,GAAAnB,OAAA,CAAAD,IAAA,CAAAa,UAAA;IAAAL,aAAA,CAAAC,IAAA,4EAAAW,mBAAA,WAAArB,EAAA,CAAAsB,SAAA,CAAAD,mBAAA,EAAAjB,2BAAA;IAAA,IAAAmB,gBAAA,GAAArB,OAAA,CAAAD,IAAA,CAAAa,UAAA;IAAA,OAAAL,aAAA,CAAAC,IAAA,+EAAAa,gBAAA,KAAAvB,EAAA,CAAAwB,SAAA,CAAAD,gBAAA;MAAA,GAAApB,4BAAA;MAAAsB,OAAA;MA8CFC,WAAA;QAEA,GAAMvB,4BAAsB,CAAQuB,WAAK;QACzCC,uBAAc;MACZ;IACF;EAKA,SAAMC,CAAA;IACNC,OAAA,CAAAC,KAAA,gFAAcxB,QAAA,IAAAsB,CAAA;EAAA;AACkF;AAE1D,SACjCvB,2BACM","ignoreList":[]}
+{"version":3,"names":["fs","join","resolve","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","getPathFromRoute","createSsrServerlessFunction","route","buildInfo","oneOptionsRoot","postBuildLogs","path","push","buildInfoAsString","JSON","stringify","funcFolder","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","file","packageJsonFilePath","writeJSON","vcConfigFilePath","writeJson","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,EAAA,MAAQ;AACf,SAASC,IAAA,EAAMC,OAAA,QAAe;AAC9B,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAE5C,SAASC,gBAAA,QAAwB;AAIjC,eAAsBC,4BACpBC,KAAA,EACAC,SAAA,EACAC,cAAA,EACAC,aAAA,EACA;EACA,IAAI;IACF,IAAAC,IAAM,GAAAN,gBAAO,CAAAE,KAAiB;IAC9BG,aAAA,CAAcE,IAAA,CAAK,yDAAyDD,IAAI,EAAE;IAElF,IAAAE,iBAAM,GAAAC,IAAoB,CAAAC,SAAK,CAAAP,SAAU;MAASQ,UAC5C,GAAAd,OAAa,CAAAD,IAAQ,CAAAQ,cAAK,8BAAgBE,IAA4B,OAAI,EAAO;IACvF,MAAMX,EAAA,CAAGiB,SAAA,CAAUD,UAAU;IAE7B,IAAAE,cAAM,GAAAhB,OAAiB,CAAAD,IAAQ,CAAAQ,cAAK,QAAgB,UAAQ,EAAQ;MAACU,YAC/D,GAAAjB,OAAe,CAAAD,IAAQ,CAAAe,UAAK,UAAY,EAAQ;IACtD,MAAMhB,EAAA,CAAGiB,SAAA,CAAUE,YAAY,GAC/BT,aAAA,CAAcE,IAAA,gFAAAM,cAAA,OAAAC,YAAA,WAAAnB,EAAA,CAAAoB,IAAA,CAAAF,cAAA,EAAAC,YAAA,GAAAT,aAAA,CAAAE,IAAA,kFAAAZ,EAAA,CAAAqB,SAAA,CAAApB,IAAA,CAAAe,UAAA,qCAAAH,iBAAA,WAAAb,EAAA,CAAAiB,SAAA,CAAAhB,IAAA,CAAAe,UAAA;IAAA,IACZM,kBAAA,GAAApB,OAAA,CAAAD,IAAA,CAAAe,UAAA;IACFN,aACS,CAAAE,IAAK,0EAEKU,kBAAA,WAAAtB,EAAA,CAAAqB,SAAA,CAAAC,kBACV;AAGT;AACA;AAAc,sBACZR,IAAA,CAAAC,SAAA,CAAAR,KAAA,CAAAgB,IAAA;AAA2F;AAEpF;AACP;AACA;AAAA;AAAA;AAG0C;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IAAA,IAAAC,mBAAA,GAAAtB,OAAA,CAAAD,IAAA,CAAAe,UAAA;IAAAN,aAAA,CAAAE,IAAA,4EAAAY,mBAAA,WAAAxB,EAAA,CAAAyB,SAAA,CAAAD,mBAAA,EAAApB,2BAAA;IAAA,IAAAsB,gBAAA,GAAAxB,OAAA,CAAAD,IAAA,CAAAe,UAAA;IAAA,OAAAN,aAAA,CAAAE,IAAA,+EAAAc,gBAAA,KAAA1B,EAAA,CAAA2B,SAAA,CAAAD,gBAAA;MAAA,GAAAvB,4BAAA;MAAAyB,OAAA;MA4C5CC,WAAA;QAEA,GAAM1B,4BAAsB,CAAQ0B,WAAK;QACzCC,uBAAc;MACZ;IACF;EAKA,SAAMC,CAAA;IACNC,OAAA,CAAAC,KAAA,gFAAc1B,KAAA,CAAAgB,IAAA,IAAAQ,CAAA;EAAA;AACkF;AAE1D,SACjCzB,2BACM","ignoreList":[]}

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

@@ -0,0 +1,8 @@
+import { getPathnameFromFilePath } from "../../utils/getPathnameFromFilePath";
+function getPathFromRoute(route) {
+  return getPathnameFromFilePath(route.file, {}, !1, { preserveExtensions: !0 }).replace(/^\.\//, "/").replace(/\/+$/, "");
+}
+export {
+  getPathFromRoute
+};
+//# sourceMappingURL=getPathFromRoute.js.map

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

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/vercel/build/getPathFromRoute.ts"],
+  "mappings": "AAAA,SAAS,+BAA+B;AAGjC,SAAS,iBAAiB,OAA0B;AACzD,SAAO,wBAAwB,MAAM,MAAM,CAAC,GAAG,IAAO,EAAE,oBAAoB,GAAK,CAAC,EAC/E,QAAQ,SAAS,GAAG,EACpB,QAAQ,QAAQ,EAAE;AACvB;",
+  "names": []
+}

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

@@ -0,0 +1,8 @@
+import { getPathnameFromFilePath } from "../../utils/getPathnameFromFilePath.mjs";
+function getPathFromRoute(route) {
+  return getPathnameFromFilePath(route.file, {}, !1, {
+    preserveExtensions: !0
+  }).replace(/^\.\//, "/").replace(/\/+$/, "");
+}
+export { getPathFromRoute };
+//# sourceMappingURL=getPathFromRoute.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["getPathnameFromFilePath","getPathFromRoute","route","file","preserveExtensions","replace"],"sources":["../../../../src/vercel/build/getPathFromRoute.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,uBAAA,QAA+B;AAGjC,SAASC,iBAAiBC,KAAA,EAA0B;EACzD,OAAOF,uBAAA,CAAwBE,KAAA,CAAMC,IAAA,EAAM,CAAC,GAAG,IAAO;IAAEC,kBAAA,EAAoB;EAAK,CAAC,EAC/EC,OAAA,CAAQ,SAAS,GAAG,EACpBA,OAAA,CAAQ,QAAQ,EAAE;AACvB","ignoreList":[]}

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

@@ -0,0 +1,8 @@
+import { getPathnameFromFilePath } from "../../utils/getPathnameFromFilePath.native.js";
+function getPathFromRoute(route) {
+  return getPathnameFromFilePath(route.file, {}, !1, {
+    preserveExtensions: !0
+  }).replace(/^\.\//, "/").replace(/\/+$/, "");
+}
+export { getPathFromRoute };
+//# sourceMappingURL=getPathFromRoute.native.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["getPathnameFromFilePath","getPathFromRoute","route","file","preserveExtensions"],"sources":["../../../../src/vercel/build/getPathFromRoute.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,uBAAA,QAA+B;AAGjC,SAASC,iBAAiBC,KAAA,EAA0B;EACzD,OAAOF,uBAAA,CAAwBE,KAAA,CAAMC,IAAA,EAAM,CAAC,GAAG,IAAO;IAGxDC,kBAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.483",
+  "version": "1.1.484",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -84,6 +84,7 @@
     "@babel/generator": "^7.26.8",
     "@babel/parser": "^7.26.8",
     "@babel/traverse": "^7.26.8",
+    "@babel/types": "^7.26.10",
     "@radix-ui/react-slot": "^1.0.2",
     "@react-native-masked-view/masked-view": "^0.3.1",
     "@react-navigation/bottom-tabs": "~7",
@@ -95,15 +96,15 @@
     "@react-navigation/routers": "~7",
     "@swc/core": "^1.10.4",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/compiler": "1.1.483",
-    "@vxrn/resolve": "1.1.483",
-    "@vxrn/tslib-lite": "1.1.483",
-    "@vxrn/universal-color-scheme": "1.1.483",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.483",
+    "@vxrn/compiler": "1.1.484",
+    "@vxrn/resolve": "1.1.484",
+    "@vxrn/tslib-lite": "1.1.484",
+    "@vxrn/universal-color-scheme": "1.1.484",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.484",
     "babel-dead-code-elimination": "^1.0.9",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.1.483",
+    "create-vxrn": "1.1.484",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~6.3.1",
     "expo-modules-core": "2.1.2",
@@ -129,7 +130,7 @@
     "vite": "^6.1.0",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.0.1",
-    "vxrn": "1.1.483",
+    "vxrn": "1.1.484",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/cli/build.ts

@@ -26,6 +26,7 @@ import { getRouterRootFromOneOptions } from '../utils/getRouterRootFromOneOption
 import { buildPage } from './buildPage'
 import { checkNodeVersion } from './checkNodeVersion'
 import { labelProcess } from './label-process'
+import { getPathnameFromFilePath } from '../utils/getPathnameFromFilePath'
 
 const { ensureDir, writeJSON } = FSExtra
 
@@ -425,8 +426,7 @@ export async function build(args: {
     }
 
     for (const params of paramsList) {
-      const cleanId = relativeId.replace(/\+(spa|ssg|ssr)\.tsx?$/, '')
-      const path = getPathnameFromFilePath(cleanId, params, foundRoute.type === 'ssg')
+      const path = getPathnameFromFilePath(relativeId, params, foundRoute.type === 'ssg')
       console.info(`  ↦ route ${path}`)
 
       const built = await runWithAsyncLocalContext(async () => {
@@ -506,6 +506,7 @@ export async function build(args: {
     manifest: {
       pageRoutes: manifest.pageRoutes.map(createBuildManifestRoute),
       apiRoutes: manifest.apiRoutes.map(createBuildManifestRoute),
+      allRoutes: manifest.allRoutes.map(createBuildManifestRoute),
     },
     routeMap,
     constants: JSON.parse(JSON.stringify({ ...constants })) as any,
@@ -602,61 +603,6 @@ async function moveAllFiles(src: string, dest: string) {
   }
 }
 
-function getPathnameFromFilePath(path: string, params = {}, strict = false) {
-  const dirname = Path.dirname(path).replace(/\([^\/]+\)/gi, '')
-  const file = Path.basename(path)
-  const fileName = file.replace(/\.[a-z]+$/, '')
-
-  function paramsError(part: string) {
-    throw new Error(
-      `[one] Params doesn't fit route:
-
-      - path: ${path}
-      - part: ${part}
-      - fileName: ${fileName}
-      - params:
-
-${JSON.stringify(params, null, 2)}`
-    )
-  }
-
-  const nameWithParams = (() => {
-    if (fileName === 'index') {
-      return '/'
-    }
-    if (fileName.startsWith('[...')) {
-      const part = fileName.replace('[...', '').replace(']', '')
-      if (!params[part]) {
-        if (strict) {
-          throw paramsError(part)
-        }
-        return `/*`
-      }
-      return `/${params[part]}`
-    }
-    return `/${fileName
-      .split('/')
-      .map((part) => {
-        if (part[0] === '[') {
-          const found = params[part.slice(1, part.length - 1)]
-          if (!found) {
-            if (strict) {
-              throw paramsError(part)
-            }
-
-            return ':' + part.replace('[', '').replace(']', '')
-          }
-          return found
-        }
-        return part
-      })
-      .join('/')}`
-  })()
-
-  // hono path will convert +not-found etc too
-  return `${dirname}${nameWithParams}`.replace(/\/\/+/gi, '/')
-}
-
 function escapeRegex(string: string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string
 }

package/src/server/createRoutesManifest.ts

@@ -13,6 +13,7 @@ export type RoutesManifest<TRegex = string> = {
   apiRoutes: RouteInfo<TRegex>[]
   middlewareRoutes: RouteInfo<TRegex>[]
   pageRoutes: RouteInfo<TRegex>[]
+  allRoutes: RouteInfo<TRegex>[]
 }
 
 function createMockModuleWithContext(map: string[] = []) {

package/src/server/getServerManifest.ts

@@ -22,6 +22,7 @@ export type OneRouterServerManifestV1<TRegex = string> = {
   apiRoutes: OneRouterServerManifestV1Route<TRegex>[]
   middlewareRoutes: OneRouterServerManifestV1Route<TRegex>[]
   pageRoutes: OneRouterServerManifestV1Route<TRegex>[]
+  allRoutes: OneRouterServerManifestV1Route<TRegex>[]
 }
 
 export interface Group {
@@ -63,7 +64,9 @@ export function getServerManifest(route: RouteNode): OneRouterServerManifestV1 {
         return [key]
       })
 
-      key = parentSegments + getContextKey(route.route).replace(/\/index$/, '') || '/'
+      key =
+        (parentSegments ? parentSegments.join('') : '') +
+          getContextKey(route.route).replace(/\/index$/, '') || '/'
     }
 
     return [[key, { ...route, layouts }]]
@@ -92,12 +95,15 @@ export function getServerManifest(route: RouteNode): OneRouterServerManifestV1 {
   const apiRoutes: OneRouterServerManifestV1Route[] = []
   const middlewareRoutes: OneRouterServerManifestV1Route[] = []
   const pageRoutes: OneRouterServerManifestV1Route[] = []
+  const allRoutes: OneRouterServerManifestV1Route[] = []
 
   const addedMiddlewares: Record<string, boolean> = {}
 
   for (const [path, node] of flat) {
     if (node.type === 'api') {
-      apiRoutes.push(getGeneratedNamedRouteRegex(path, node))
+      const route = getGeneratedNamedRouteRegex(path, node)
+      apiRoutes.push(route)
+      allRoutes.push(route)
       continue
     }
 
@@ -110,13 +116,16 @@ export function getServerManifest(route: RouteNode): OneRouterServerManifestV1 {
       }
     }
 
-    pageRoutes.push(getGeneratedNamedRouteRegex(path, node))
+    const route = getGeneratedNamedRouteRegex(path, node)
+    pageRoutes.push(route)
+    allRoutes.push(route)
   }
 
   return {
     apiRoutes,
     middlewareRoutes,
     pageRoutes,
+    allRoutes,
   }
 }
 

package/src/utils/getPathnameFromFilePath.ts

@@ -0,0 +1,62 @@
+import Path from 'node:path'
+
+export function getPathnameFromFilePath(
+  inputPath: string,
+  params = {},
+  strict = false,
+  options: { preserveExtensions?: boolean } = {}
+) {
+  const path = inputPath.replace(/\+(spa|ssg|ssr|api)\.tsx?$/, '')
+  const dirname = Path.dirname(path).replace(/\([^\/]+\)/gi, '')
+  const file = Path.basename(path)
+  const fileName = options.preserveExtensions ? file : file.replace(/\.[a-z]+$/, '')
+
+  function paramsError(part: string) {
+    throw new Error(
+      `[one] Params doesn't fit route:
+
+      - path: ${path}
+      - part: ${part}
+      - fileName: ${fileName}
+      - params:
+
+${JSON.stringify(params, null, 2)}`
+    )
+  }
+
+  const nameWithParams = (() => {
+    if (fileName === 'index') {
+      return '/'
+    }
+    if (fileName.startsWith('[...')) {
+      const part = fileName.replace('[...', '').replace(']', '')
+      if (!params[part]) {
+        if (strict) {
+          throw paramsError(part)
+        }
+        return `/*`
+      }
+      return `/${params[part]}`
+    }
+    return `/${fileName
+      .split('/')
+      .map((part) => {
+        if (part[0] === '[') {
+          const found = params[part.slice(1, part.length - 1)]
+          if (!found) {
+            if (strict) {
+              throw paramsError(part)
+            }
+
+            return ':' + part.replace('[', '').replace(']', '')
+          }
+          return found
+        }
+        return part
+      })
+      .join('/')}`
+  })()
+
+  // hono path will convert +not-found etc too
+  return `${dirname}${nameWithParams}`.replace(/\/\/+/gi, '/')
+}

package/src/vercel/build/buildVercelOutputDirectory.ts

@@ -8,9 +8,10 @@ import { createApiServerlessFunction } from './generate/createApiServerlessFunct
 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 type { One } from '../../vite/types'
+import { getPathFromRoute } from './getPathFromRoute'
 
 const { copy, ensureDir, existsSync, writeJSON } = FSExtra
 
@@ -49,21 +50,8 @@ export const buildVercelOutputDirectory = async ({
         postBuildLogs.push(
           `[one.build][vercel] generating serverless function for apiRoute ${route.page}`
         )
-        await createApiServerlessFunction(
-          route.page,
-          compiledRoute.code,
-          oneOptionsRoot,
-          postBuildLogs
-        )
 
-        if (route.page !== route.urlCleanPath ) {
-          await createApiServerlessFunction(
-            route.urlCleanPath,
-            compiledRoute.code,
-            oneOptionsRoot,
-            postBuildLogs
-          )
-        }
+        await createApiServerlessFunction(route, compiledRoute.code, oneOptionsRoot, postBuildLogs)
       } else {
         console.warn('\n 🔨[one.build][vercel] apiRoute missing code compilation for', route.file)
       }
@@ -83,7 +71,7 @@ export const buildVercelOutputDirectory = async ({
             `[one.build][vercel] generate serverless function for ${route.page} with ${route.type}`
           )
           await createSsrServerlessFunction(
-            route.page,
+            route,
             buildInfoForWriting,
             oneOptionsRoot,
             postBuildLogs
@@ -101,7 +89,7 @@ export 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(
@@ -113,13 +101,35 @@ export const buildVercelOutputDirectory = async ({
       `[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`
     )
     await writeJSON(vercelMiddlewarePackageJsonFilePath, serverlessVercelPackageJson)
+    const wrappedMiddlewareEntryPointFilename = '_wrapped_middleware.js'
+    const 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,
     })
   }
 
@@ -134,6 +144,31 @@ export const buildVercelOutputDirectory = async ({
   // Documentation - Vercel Build Output v3 config.json
   //   https://vercel.com/docs/build-output-api/v3/configuration#config.json-supported-properties
   const vercelConfigFilePath = resolve(join(oneOptionsRoot, '.vercel/output', 'config.json'))
-  await writeJSON(vercelConfigFilePath, vercelBuildOutputConfig)
+  await writeJSON(vercelConfigFilePath, {
+    ...vercelBuildOutputConfigBase,
+    routes: [
+      ...vercelBuildOutputConfigBase.routes,
+      ...(existsSync(distMiddlewareDir)
+        ? [
+            {
+              src: '/(.*)',
+              middlewarePath: '_middleware',
+              continue: true,
+            },
+          ]
+        : []),
+      {
+        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}`)
 }

package/src/vercel/build/config/vc-build-output-config-base.ts

@@ -1,12 +1,13 @@
 // Documentation - Vercel Build Output v3 Config
 //   https://vercel.com/docs/build-output-api/v3/configuration#config.json-supported-properties
-export const vercelBuildOutputConfig = {
+export 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,
+    // },
   ],
 }