one 1.1.483 → 1.1.485

package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],
-  "mappings": "AAAA,SAAS,YAAY;AACrB,SAAS,gBAAgB;AAGzB,SAAS,0BAA0B;AACnC,SAAS,mCAAmC;AAErC,SAAS,mCAAmC,SAAoC;AACrF,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA,IAEP,gBAAgB,QAAQ;AACtB,YAAM,SAAS,KAAK,QAAQ,IAAI,GAAG,4BAA4B,OAAO,CAAC,GACjE,UAAU,KAAK,QAAQ,IAAI,GAAG,aAAa,GAE3C,aAAa,4BAA4B,OAAO,GAGhD,4BAA4B,SAAS,OAAO,MAAc,SAAiB;AAC/E,SAAI,SAAS,SAAS,SAAS,aACzB,KAAK,WAAW,MAAM,KAExB,mBAAmB,SAAS,UAAU;AAAA,MAG5C,GAAG,GAAG;AAEN,oBAAO,QAAQ,YAAY,OAAO,yBAAyB,GAEpD,MAAM;AAGX,2BAAmB,SAAS,UAAU;AAAA,MACxC;AAAA,IACF;AAAA,EACF;AACF;",
+  "mappings": "AAAA,SAAS,SAAS,YAAY;AAC9B,SAAS,gBAAgB;AAGzB,SAAS,0BAA0B;AACnC,SAAS,mCAAmC;AAErC,SAAS,mCAAmC,SAAoC;AACrF,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA,IAEP,gBAAgB,QAAQ;AACtB,YAAM,SAAS,KAAK,QAAQ,IAAI,GAAG,4BAA4B,OAAO,CAAC,GACjE,UACA,QAAQ,MAAM,MAAM,QAAQ,IAAI,KAClC,QAAQ,KAAK,8LAA8L,GACpM,KAAK,QAAQ,MAAM,GAAG,aAAa,KAGrC,KAAK,QAAQ,IAAI,GAAG,aAAa,GAGpC,aAAa,4BAA4B,OAAO,GAGhD,4BAA4B,SAAS,OAAO,MAAc,SAAiB;AAC/E,SAAI,SAAS,SAAS,SAAS,aACzB,KAAK,WAAW,MAAM,KAExB,mBAAmB,SAAS,UAAU;AAAA,MAG5C,GAAG,GAAG;AAEN,oBAAO,QAAQ,YAAY,OAAO,yBAAyB,GAEpD,MAAM;AAGX,2BAAmB,SAAS,UAAU;AAAA,MACxC;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs

@@ -1,4 +1,4 @@
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { debounce } from "perfect-debounce";
 import { generateRouteTypes } from "../../typed-routes/generateRouteTypes.mjs";
 import { getRouterRootFromOneOptions } from "../../utils/getRouterRootFromOneOptions.mjs";
@@ -9,7 +9,7 @@ function generateFileSystemRouteTypesPlugin(options) {
     apply: "serve",
     configureServer(server) {
       const appDir = join(process.cwd(), getRouterRootFromOneOptions(options)),
-        outFile = join(process.cwd(), "routes.d.ts"),
+        outFile = dirname(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), join(dirname(appDir), "routes.d.ts")) : join(process.cwd(), "routes.d.ts"),
         routerRoot = getRouterRootFromOneOptions(options),
         fileWatcherChangeListener = debounce(async (type, path) => {
           (type === "add" || type === "delete") && path.startsWith(appDir) && generateRouteTypes(outFile, routerRoot);

package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,QAAY;AACrB,SAASC,QAAA,QAAgB;AAGzB,SAASC,kBAAA,QAA0B;AACnC,SAASC,2BAAA,QAAmC;AAErC,SAASC,mCAAmCC,OAAA,EAAoC;EACrF,OAAO;IACLC,IAAA,EAAM;IACNC,OAAA,EAAS;IACTC,KAAA,EAAO;IAEPC,gBAAgBC,MAAA,EAAQ;MACtB,MAAMC,MAAA,GAASX,IAAA,CAAKY,OAAA,CAAQC,GAAA,CAAI,GAAGV,2BAAA,CAA4BE,OAAO,CAAC;QACjES,OAAA,GAAUd,IAAA,CAAKY,OAAA,CAAQC,GAAA,CAAI,GAAG,aAAa;QAE3CE,UAAA,GAAaZ,2BAAA,CAA4BE,OAAO;QAGhDW,yBAAA,GAA4Bf,QAAA,CAAS,OAAOgB,IAAA,EAAcC,IAAA,KAAiB;UAC/E,CAAID,IAAA,KAAS,SAASA,IAAA,KAAS,aACzBC,IAAA,CAAKC,UAAA,CAAWR,MAAM,KAExBT,kBAAA,CAAmBY,OAAA,EAASC,UAAU;QAG5C,GAAG,GAAG;MAEN,OAAAL,MAAA,CAAOU,OAAA,CAAQC,WAAA,CAAY,OAAOL,yBAAyB,GAEpD,MAAM;QAGXd,kBAAA,CAAmBY,OAAA,EAASC,UAAU;MACxC;IACF;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["dirname","join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","console","warn","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,EAASC,IAAA,QAAY;AAC9B,SAASC,QAAA,QAAgB;AAGzB,SAASC,kBAAA,QAA0B;AACnC,SAASC,2BAAA,QAAmC;AAErC,SAASC,mCAAmCC,OAAA,EAAoC;EACrF,OAAO;IACLC,IAAA,EAAM;IACNC,OAAA,EAAS;IACTC,KAAA,EAAO;IAEPC,gBAAgBC,MAAA,EAAQ;MACtB,MAAMC,MAAA,GAASX,IAAA,CAAKY,OAAA,CAAQC,GAAA,CAAI,GAAGV,2BAAA,CAA4BE,OAAO,CAAC;QACjES,OAAA,GACAf,OAAA,CAAQY,MAAM,MAAMC,OAAA,CAAQC,GAAA,CAAI,KAClCE,OAAA,CAAQC,IAAA,CAAK,8LAA8L,GACpMhB,IAAA,CAAKD,OAAA,CAAQY,MAAM,GAAG,aAAa,KAGrCX,IAAA,CAAKY,OAAA,CAAQC,GAAA,CAAI,GAAG,aAAa;QAGpCI,UAAA,GAAad,2BAAA,CAA4BE,OAAO;QAGhDa,yBAAA,GAA4BjB,QAAA,CAAS,OAAOkB,IAAA,EAAcC,IAAA,KAAiB;UAC/E,CAAID,IAAA,KAAS,SAASA,IAAA,KAAS,aACzBC,IAAA,CAAKC,UAAA,CAAWV,MAAM,KAExBT,kBAAA,CAAmBY,OAAA,EAASG,UAAU;QAG5C,GAAG,GAAG;MAEN,OAAAP,MAAA,CAAOY,OAAA,CAAQC,WAAA,CAAY,OAAOL,yBAAyB,GAEpD,MAAM;QAGXhB,kBAAA,CAAmBY,OAAA,EAASG,UAAU;MACxC;IACF;EACF;AACF","ignoreList":[]}

package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js

@@ -1,4 +1,4 @@
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { debounce } from "perfect-debounce";
 import { generateRouteTypes } from "../../typed-routes/generateRouteTypes.native.js";
 import { getRouterRootFromOneOptions } from "../../utils/getRouterRootFromOneOptions.native.js";
@@ -9,7 +9,9 @@ function generateFileSystemRouteTypesPlugin(options) {
     apply: "serve",
     configureServer(server) {
       var appDir = join(process.cwd(), getRouterRootFromOneOptions(options)),
-        outFile = join(process.cwd(), "routes.d.ts"),
+        outFile = function () {
+          return dirname(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), join(dirname(appDir), "routes.d.ts")) : join(process.cwd(), "routes.d.ts");
+        }(),
         routerRoot = getRouterRootFromOneOptions(options),
         fileWatcherChangeListener = debounce(async function (type, path) {
           (type === "add" || type === "delete") && path.startsWith(appDir) && generateRouteTypes(outFile, routerRoot);

package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,QAAY;AACrB,SAASC,QAAA,QAAgB;AAGzB,SAASC,kBAAA,QAA0B;AACnC,SAASC,2BAAA,QAAmC;AAErC,SAASC,mCAAmCC,OAAA,EAAoC;EACrF,OAAO;IACLC,IAAA,EAAM;IACNC,OAAA,EAAS;IACTC,KAAA,EAAO;IAEPC,gBAAgBC,MAAA,EAAQ;MACtB,IAAAC,MAAM,GAAAX,IAAS,CAAAY,OAAK,CAAAC,GAAQ,IAAIV,2BAAG,CAAAE,OAA4B,EAAO;QAACS,OACjE,GAAAd,IAAU,CAAAY,OAAK,CAAAC,GAAQ,IAAI,aAAG;QAAaE,UAE3C,GAAAZ,2BAAa,CAAAE,OAA4B;QAAOW,yBAGhD,GAAAf,QAA4B,iBAA8BgB,IAAA,EAAAC,IAAiB;UAC/E,CAAID,IAAA,KAAS,SAASA,IAAA,KAAS,aACzBC,IAAA,CAAKC,UAAA,CAAWR,MAAM,KAExBT,kBAAA,CAAmBY,OAAA,EAASC,UAAU;QAG5C,GAAG,GAAG;MAEN,OAAAL,MAAA,CAAOU,OAAA,CAAQC,WAAA,CAAY,OAAOL,yBAAyB,GAEpD,YAAM;QAGXd,kBAAA,CAAmBY,OAAA,EAASC,UAAU;MACxC;IACF;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["dirname","join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","console","warn","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,EAASC,IAAA,QAAY;AAC9B,SAASC,QAAA,QAAgB;AAGzB,SAASC,kBAAA,QAA0B;AACnC,SAASC,2BAAA,QAAmC;AAErC,SAASC,mCAAmCC,OAAA,EAAoC;EACrF,OAAO;IACLC,IAAA,EAAM;IACNC,OAAA,EAAS;IACTC,KAAA,EAAO;IAEPC,gBAAgBC,MAAA,EAAQ;MACtB,IAAAC,MAAM,GAAAX,IAAS,CAAAY,OAAK,CAAAC,GAAQ,IAAIV,2BAAG,CAAAE,OAA4B,EAAO;QAACS,OACjE,eACQ;UAYZ,OAAIf,OAAS,CAAAY,MAAS,MAAAC,OAAS,CAAAC,GAAA,MACzBE,OAAK,CAAAC,IAAA,CAAW,8LAEoB,GAAAhB,IAAA,CAAAD,OAAA,CAAAY,MAAA,qBAAAX,IAAA,CAAAY,OAAA,CAAAC,GAAA;QAG5C,GAAG;QAAAI,UAAG,GAAAd,2BAAA,CAAAE,OAAA;QAAAa,yBAAA,GAAAjB,QAAA,iBAAAkB,IAAA,EAAAC,IAAA;UAEN,CAAAD,IAAA,UAAO,IAAAA,IAAQ,aAAY,KAAOC,IAAA,CAAAC,UAAA,CAAAV,MAAA,CAAyB,IAEpDT,kBAAM,CAAAY,OAAA,EAAAG,UAAA;QAGX;MACF,OAAAP,MAAA,CAAAY,OAAA,CAAAC,WAAA,QAAAL,yBAAA;QACFhB,kBAAA,CAAAY,OAAA,EAAAG,UAAA;MACF;IACF","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.483",
+  "version": "1.1.485",
   "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.485",
+    "@vxrn/resolve": "1.1.485",
+    "@vxrn/tslib-lite": "1.1.485",
+    "@vxrn/universal-color-scheme": "1.1.485",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.485",
     "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.485",
     "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.485",
     "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/createHandleRequest.ts

@@ -25,7 +25,7 @@ type RequestHandlerProps<RouteExtraProps extends Object = {}> = {
 
 type RequestHandlerResponse = null | string | Response
 
-async function runMiddlewares(
+export async function runMiddlewares(
   handlers: RequestHandlers,
   request: Request,
   route: RouteInfo,

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/server/oneServe.ts

@@ -4,12 +4,18 @@ import type { BlankEnv } from 'hono/types'
 import { extname, join } from 'node:path'
 import { getServerEntry, serveStatic } from 'vxrn/serve'
 import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from '../constants'
-import { compileManifest, getURLfromRequestURL, type RequestHandlers } from '../createHandleRequest'
+import {
+  compileManifest,
+  getURLfromRequestURL,
+  runMiddlewares,
+  type RequestHandlers,
+} from '../createHandleRequest'
 import type { RenderAppProps } from '../types'
 import { getPathFromLoaderPath } from '../utils/cleanUrl'
 import { toAbsolute } from '../utils/toAbsolute'
 import type { One } from '../vite/types'
 import type { RouteInfoCompiled } from './createRoutesManifest'
+import { serveStaticAssets } from 'vxrn'
 
 export async function oneServe(oneOptions: One.PluginOptions, buildInfo: One.BuildInfo, app: Hono) {
   const { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } = await import(
@@ -135,26 +141,25 @@ url: ${url}`)
 
   function createHonoHandler(route: RouteInfoCompiled): MiddlewareHandler<BlankEnv, never, {}> {
     return async (context, next) => {
-      if (route.page.endsWith('/+not-found')) {
-        let didCallNext = false
-
-        const response = await serveStatic({
-          root: './dist/client',
-          onFound: (_path, c) => {
-            c.header('Cache-Control', `public, immutable, max-age=31536000`)
-          },
-        })(context, async () => {
-          didCallNext = true
-        })
-
-        if (response && !didCallNext) {
-          return response
-        }
-      }
-
       try {
         const request = context.req.raw
 
+        if (route.page.endsWith('/+not-found') || Reflect.ownKeys(route.routeKeys).length > 0) {
+          // Static assets should have the highest priority - which is the behavior of the dev server.
+          // But if we handle every matching static asset here, it seems to break some of the static routes.
+          // So we only handle it if there's a matching not-found or dynamic route, to prevent One from taking over the static asset.
+          // If there's no matching not-found or dynamic route, it's very likely that One won't handle it and will fallback to VxRN serving the static asset so it will also work.
+          const staticAssetResponse = await serveStaticAssets({ context })
+          if (staticAssetResponse) {
+            return await runMiddlewares(
+              requestHandlers,
+              request,
+              route,
+              async () => staticAssetResponse
+            )
+          }
+        }
+
         // for js we want to serve our js files directly, as they can match a route on accident
         // middleware my want to handle this eventually as well but for now this is a fine balance
         if (extname(request.url) === '.js' || extname(request.url) === '.css') {

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,
+    // },
   ],
 }