one 1.1.381 → 1.1.383

package/dist/esm/vite.mjs

@@ -4,8 +4,8 @@ import { removeReactNativeWebAnimatedPlugin } from "./vite/plugins/removeReactNa
 import { SSRCSSPlugin } from "./vite/plugins/SSRCSSPlugin.mjs";
 import { createFileSystemRouterPlugin } from "./vite/plugins/fileSystemRouterPlugin.mjs";
 import { makePluginWebOnly } from "./vite/makePluginWebOnly.mjs";
-import { setCurrentRequestHeaders } from "./vite/headers.mjs";
+import { setResponseHeaders } from "./vite/server.mjs";
 import { build } from "./cli/build.mjs";
 import { one } from "./vite/one.mjs";
-export { SSRCSSPlugin, build, clientTreeShakePlugin, createFileSystemRouterPlugin, makePluginWebOnly, one, removeReactNativeWebAnimatedPlugin, resolvePath, setCurrentRequestHeaders };
+export { SSRCSSPlugin, build, clientTreeShakePlugin, createFileSystemRouterPlugin, makePluginWebOnly, one, removeReactNativeWebAnimatedPlugin, resolvePath, setResponseHeaders };
 //# sourceMappingURL=vite.mjs.map

package/dist/esm/vite.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["resolvePath","clientTreeShakePlugin","removeReactNativeWebAnimatedPlugin","SSRCSSPlugin","createFileSystemRouterPlugin","makePluginWebOnly","setCurrentRequestHeaders","build","one"],"sources":["../../src/vite.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,WAAA,QAAmB;AAC5B,SAASC,qBAAA,QAA6B;AACtC,SAASC,kCAAA,QAA0C;AACnD,SAASC,YAAA,QAAoB;AAC7B,SAASC,4BAAA,QAAoC;AAE7C,SAASC,iBAAA,QAAyB;AAElC,SAASC,wBAAA,QAAgC;AAEzC,SAASC,KAAA,QAAa;AACtB,SAASC,GAAA,QAAW","ignoreList":[]}
+{"version":3,"names":["resolvePath","clientTreeShakePlugin","removeReactNativeWebAnimatedPlugin","SSRCSSPlugin","createFileSystemRouterPlugin","makePluginWebOnly","setResponseHeaders","build","one"],"sources":["../../src/vite.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,WAAA,QAAmB;AAC5B,SAASC,qBAAA,QAA6B;AACtC,SAASC,kCAAA,QAA0C;AACnD,SAASC,YAAA,QAAoB;AAC7B,SAASC,4BAAA,QAAoC;AAE7C,SAASC,iBAAA,QAAyB;AAElC,SAASC,kBAAA,QAA0B;AAEnC,SAASC,KAAA,QAAa;AACtB,SAASC,GAAA,QAAW","ignoreList":[]}

package/dist/esm/vite.native.js

@@ -4,7 +4,7 @@ import { removeReactNativeWebAnimatedPlugin } from "./vite/plugins/removeReactNa
 import { SSRCSSPlugin } from "./vite/plugins/SSRCSSPlugin";
 import { createFileSystemRouterPlugin } from "./vite/plugins/fileSystemRouterPlugin";
 import { makePluginWebOnly } from "./vite/makePluginWebOnly";
-import { setCurrentRequestHeaders } from "./vite/headers";
+import { setResponseHeaders } from "./vite/server";
 import { build } from "./cli/build";
 import { one } from "./vite/one";
 export {
@@ -16,6 +16,6 @@ export {
   one,
   removeReactNativeWebAnimatedPlugin,
   resolvePath,
-  setCurrentRequestHeaders
+  setResponseHeaders
 };
 //# sourceMappingURL=vite.js.map

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/one/packages/one/src/vite.ts"],
-  "mappings": "AACA,SAASA,mBAAmB;AAC5B,SAASC,6BAA6B;AACtC,SAASC,0CAA0C;AACnD,SAASC,oBAAoB;AAC7B,SAASC,oCAAoC;AAE7C,SAASC,yBAAyB;AAElC,SAASC,gCAAgC;AAEzC,SAASC,aAAa;AACtB,SAASC,WAAW;",
-  "names": ["resolvePath", "clientTreeShakePlugin", "removeReactNativeWebAnimatedPlugin", "SSRCSSPlugin", "createFileSystemRouterPlugin", "makePluginWebOnly", "setCurrentRequestHeaders", "build", "one"]
+  "mappings": "AACA,SAASA,mBAAmB;AAC5B,SAASC,6BAA6B;AACtC,SAASC,0CAA0C;AACnD,SAASC,oBAAoB;AAC7B,SAASC,oCAAoC;AAE7C,SAASC,yBAAyB;AAElC,SAASC,0BAA0B;AAEnC,SAASC,aAAa;AACtB,SAASC,WAAW;",
+  "names": ["resolvePath", "clientTreeShakePlugin", "removeReactNativeWebAnimatedPlugin", "SSRCSSPlugin", "createFileSystemRouterPlugin", "makePluginWebOnly", "setResponseHeaders", "build", "one"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.381",
+  "version": "1.1.383",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -53,14 +53,14 @@
       "import": "./dist/esm/server-render.mjs",
       "require": "./dist/cjs/server-render.js"
     },
-    "./headers": {
+    "./server": {
       "react-native": {
-        "import": "./dist/esm/vite/headers.native.js",
-        "require": "./dist/cjs/vite/headers.native.js"
+        "import": "./server.js",
+        "require": "./server.js"
       },
-      "types": "./types/vite/headers.d.ts",
-      "import": "./dist/esm/vite/headers.mjs",
-      "require": "./dist/cjs/vite/headers.js"
+      "types": "./types/vite/server.d.ts",
+      "import": "./dist/esm/vite/server.mjs",
+      "require": "./dist/cjs/vite/server.js"
     },
     "./react-18": {
       "require": "./vendor/react/cjs/react.development.js",
@@ -91,6 +91,7 @@
     "lint:fix": "../../node_modules/.bin/biome check --apply-unsafe src",
     "test": "vitest --run --pool=forks",
     "test:dev": "TEST_ONLY=dev yarn test",
+    "test:prod": "TEST_ONLY=prod yarn test",
     "test:watch": "vitest --watch",
     "watch": "tamagui-build --watch"
   },
@@ -112,15 +113,15 @@
     "@react-navigation/routers": "~7",
     "@swc/core": "^1.10.4",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/resolve": "1.1.381",
-    "@vxrn/tslib-lite": "1.1.381",
-    "@vxrn/universal-color-scheme": "1.1.381",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.381",
+    "@vxrn/resolve": "1.1.383",
+    "@vxrn/tslib-lite": "1.1.383",
+    "@vxrn/universal-color-scheme": "1.1.383",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.383",
     "babel-dead-code-elimination": "^1.0.6",
     "babel-plugin-react-compiler": "^19.0.0-beta-201e55d-20241215",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.1.381",
+    "create-vxrn": "1.1.383",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~6.3.1",
     "expo-modules-core": "2.1.2",
@@ -146,7 +147,7 @@
     "vite": "^6.0.6",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.0.1",
-    "vxrn": "1.1.381",
+    "vxrn": "1.1.383",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/Route.tsx

@@ -42,6 +42,8 @@ export type RouteNode = {
   entryPoints?: string[]
   /** Parent layouts */
   layouts?: RouteNode[]
+  /** Parent middlewares */
+  middlewares?: RouteNode[]
 }
 
 const CurrentRouteContext = React.createContext<RouteNode | null>(null)

package/src/cli/build.ts

@@ -1,8 +1,8 @@
 import FSExtra from 'fs-extra'
 import MicroMatch from 'micromatch'
 import { createRequire } from 'node:module'
-import Path, { join, relative } from 'node:path'
-import type { OutputAsset } from 'rollup'
+import Path, { join, relative, resolve } from 'node:path'
+import type { OutputAsset, RollupOutput } from 'rollup'
 import { nodeExternals } from 'rollup-plugin-node-externals'
 import { mergeConfig, build as viteBuild, type InlineConfig } from 'vite'
 import {
@@ -16,6 +16,7 @@ import { getLoaderPath, getPreloadPath } from '../cleanUrl'
 import * as constants from '../constants'
 import type { RouteInfo } from '../server/createRoutesManifest'
 import type { LoaderProps, RenderApp } from '../types'
+import { toAbsolute } from '../utils/toAbsolute'
 import { getManifest } from '../vite/getManifest'
 import { loadUserOneOptions } from '../vite/loadConfig'
 import { replaceLoader } from '../vite/replaceLoader'
@@ -35,6 +36,8 @@ export async function build(args: {
   labelProcess('build')
 
   const oneOptions = await loadUserOneOptions('build')
+  const manifest = getManifest()!
+
   const serverOutputFormat = oneOptions.build?.server?.outputFormat ?? 'esm'
 
   // TODO make this better, this ensures we get react 19
@@ -61,8 +64,6 @@ export async function build(args: {
 
   const options = await fillOptions(vxrnOutput.options)
 
-  const toAbsolute = (p) => Path.resolve(options.root, p)
-  const manifest = getManifest()!
   const { optimizeDeps } = getOptimizeDeps('build')
 
   const apiBuildConfig = mergeConfig(
@@ -75,26 +76,24 @@ export async function build(args: {
     } satisfies InlineConfig
   )
 
-  if (manifest.apiRoutes.length) {
-    console.info(`\n 🔨 build api routes\n`)
-
-    const processEnvDefines = Object.fromEntries(
-      Object.entries(process.env).map(([key, value]) => {
-        return [`process.env.${key}`, JSON.stringify(value)]
-      })
-    )
-
-    const apiRouteExternalRegex = buildRegexExcludingDeps(optimizeDeps.include)
+  const externalRegex = buildRegexExcludingDeps(optimizeDeps.include)
+  const processEnvDefines = Object.fromEntries(
+    Object.entries(process.env).map(([key, value]) => {
+      return [`process.env.${key}`, JSON.stringify(value)]
+    })
+  )
 
-    const apiEntryPoints = manifest.apiRoutes.reduce((entries, { page, file }) => {
+  async function buildCustomRoutes(subFolder: string, routes: RouteInfo<string>[]) {
+    const input = routes.reduce((entries, { page, file }) => {
       entries[page.slice(1) + '.js'] = join('app', file)
       return entries
     }, {}) as Record<string, string>
 
-    const apiOutputFormat = oneOptions?.build?.api?.outputFormat ?? serverOutputFormat
+    // TODO this is specific to API but used for middelwares too now
+    const outputFormat = oneOptions?.build?.api?.outputFormat ?? serverOutputFormat
     const treeshake = oneOptions?.build?.api?.treeshake
 
-    await viteBuild(
+    const output = await viteBuild(
       mergeConfig(apiBuildConfig, {
         appType: 'custom',
         configFile: false,
@@ -119,7 +118,7 @@ export async function build(args: {
         build: {
           ssr: true,
           emptyOutDir: false,
-          outDir: 'dist/api',
+          outDir: `dist/${subFolder}`,
           copyPublicDir: false,
           minify: false,
           rollupOptions: {
@@ -129,7 +128,7 @@ export async function build(args: {
 
             plugins: [
               // otherwise rollup is leaving commonjs-only top level imports...
-              apiOutputFormat === 'esm' ? rollupRemoveUnusedImportsPlugin : null,
+              outputFormat === 'esm' ? rollupRemoveUnusedImportsPlugin : null,
             ].filter(Boolean),
 
             // too many issues
@@ -138,12 +137,12 @@ export async function build(args: {
             // },
             // prevents it from shaking out the exports
             preserveEntrySignatures: 'strict',
-            input: apiEntryPoints,
-            external: apiRouteExternalRegex,
+            input: input,
+            external: externalRegex,
             output: {
               entryFileNames: '[name]',
               exports: 'auto',
-              ...(apiOutputFormat === 'esm'
+              ...(outputFormat === 'esm'
                 ? {
                     format: 'esm',
                     esModule: true,
@@ -173,6 +172,29 @@ export async function build(args: {
         },
       } satisfies InlineConfig)
     )
+
+    return output as RollupOutput
+  }
+
+  if (manifest.apiRoutes.length) {
+    console.info(`\n 🔨 build api routes\n`)
+    await buildCustomRoutes('api', manifest.apiRoutes)
+  }
+
+  const builtMiddlewares: Record<string, string> = {}
+
+  if (manifest.middlewareRoutes.length) {
+    console.info(`\n 🔨 build middlewares\n`)
+    const middlewareBuildInfo = await buildCustomRoutes('middlewares', manifest.middlewareRoutes)
+
+    for (const middleware of manifest.middlewareRoutes) {
+      const absoluteRoot = resolve(process.cwd(), options.root)
+      const fullPath = join(absoluteRoot, 'app', middleware.file)
+      const outChunks = middlewareBuildInfo.output.filter((x) => x.type === 'chunk')
+      const chunk = outChunks.find((x) => x.facadeModuleId === fullPath)
+      if (!chunk) throw new Error(`internal err finding middleware`)
+      builtMiddlewares[middleware.file] = join('dist', 'middlewares', chunk.fileName)
+    }
   }
 
   // for the require Sitemap in getRoutes
@@ -258,18 +280,12 @@ export async function build(args: {
 
     const clientManifestEntry = vxrnOutput.clientManifest[clientManifestKey]
 
-    const findMatchingRoute = (route: RouteInfo<string>) => {
-      return route.file && clientManifestKey.endsWith(route.file.slice(1))
-    }
-
-    const foundRoute = manifest.pageRoutes.find(findMatchingRoute)
+    const foundRoute = manifest.pageRoutes.find((route: RouteInfo<string>) => {
+      return route.file && clientManifestKey.replace(/^app/, '') === route.file.slice(1)
+    })
 
     if (!foundRoute) {
-      if (clientManifestKey.startsWith('app')) {
-        console.error(` No html route found!`, { id, clientManifestKey })
-        console.error(` In manifest`, manifest)
-        process.exit(1)
-      }
+      // should probably error?
       continue
     }
 
@@ -362,11 +378,11 @@ export async function build(args: {
       console.info('[one] building routes', { foundRoute, layoutEntries, allEntries, allCSS })
     }
 
-    const serverJsPath = toAbsolute(join('dist/server', output.fileName))
+    const serverJsPath = join('dist/server', output.fileName)
 
     let exported
     try {
-      exported = await import(serverJsPath)
+      exported = await import(toAbsolute(serverJsPath))
     } catch (err) {
       console.error(`Error importing page (original error)`, err)
       // err cause not showing in vite or something
@@ -427,8 +443,14 @@ export async function build(args: {
           preloads.map((preload) => `import "${preload}"`).join('\n')
         )
 
+        const middlewares = (foundRoute.middlewares || []).map(
+          (x) => builtMiddlewares[x.contextKey]
+        )
+
         builtRoutes.push({
           type: foundRoute.type,
+          routeFile: foundRoute.file,
+          middlewares,
           cleanPath,
           preloadPath,
           clientJsPath,
@@ -503,17 +525,44 @@ ${JSON.stringify(params || null, null, 2)}`
   await moveAllFiles(staticDir, clientDir)
   await FSExtra.rm(staticDir, { force: true, recursive: true })
 
-  // write out the pathname => html map for the server
-  const routeMap = builtRoutes.reduce((acc, { cleanPath, htmlPath }) => {
-    acc[cleanPath] = htmlPath
-    return acc
-  }, {}) satisfies Record<string, string>
+  // write out the static paths (pathname => html) for the server
+  const routeMap: Record<string, string> = {}
+  for (const route of builtRoutes) {
+    if (!route.cleanPath.includes('*')) {
+      routeMap[route.cleanPath] = route.htmlPath
+    }
+  }
+
+  const routeToBuildInfo: Record<string, One.RouteBuildInfo> = {}
+  for (const route of builtRoutes) {
+    routeToBuildInfo[route.routeFile] = route
+  }
+
+  function createBuildManifestRoute(route: RouteInfo) {
+    // remove layouts, they are huge due to keeping all children, not needed after build
+    // TODO would be clean it up in manifst
+    const { layouts, ...built } = route
+
+    // swap out for the built middleware path
+    const buildInfo = builtRoutes.find((x) => x.routeFile === route.file)
+    if (built.middlewares && buildInfo?.middlewares) {
+      for (const [index, mw] of built.middlewares.entries()) {
+        mw.contextKey = buildInfo.middlewares[index]
+      }
+    }
+
+    return built
+  }
 
-  const buildInfoForWriting = {
+  const buildInfoForWriting: One.BuildInfo = {
     oneOptions,
+    routeToBuildInfo,
+    manifest: {
+      pageRoutes: manifest.pageRoutes.map(createBuildManifestRoute),
+      apiRoutes: manifest.apiRoutes.map(createBuildManifestRoute),
+    },
     routeMap,
-    builtRoutes,
-    constants: JSON.parse(JSON.stringify({ ...constants })),
+    constants: JSON.parse(JSON.stringify({ ...constants })) as any,
   }
 
   await FSExtra.writeJSON(toAbsolute(`dist/buildInfo.json`), buildInfoForWriting)
@@ -593,6 +642,19 @@ function getPathnameFromFilePath(path: string, params = {}, strict = false) {
   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 '/'
@@ -600,7 +662,10 @@ function getPathnameFromFilePath(path: string, params = {}, strict = false) {
     if (fileName.startsWith('[...')) {
       const part = fileName.replace('[...', '').replace(']', '')
       if (!params[part]) {
-        console.warn(`couldn't resolve ${fileName} segment in path ${path}`)
+        if (strict) {
+          throw paramsError(part)
+        }
+        return `/*`
       }
       return `/${params[part]}`
     }
@@ -611,16 +676,7 @@ function getPathnameFromFilePath(path: string, params = {}, strict = false) {
           const found = params[part.slice(1, part.length - 1)]
           if (!found) {
             if (strict) {
-              throw new Error(
-                `[one] Params doesn't fit route:
-                
-                - path: ${path} 
-                - part: ${part}
-                - fileName: ${fileName}
-                - params:
-  
-  ${JSON.stringify(params, null, 2)}`
-              )
+              throw paramsError(part)
             }
 
             return ':' + part.replace('[', '').replace(']', '')
@@ -632,6 +688,7 @@ function getPathnameFromFilePath(path: string, params = {}, strict = false) {
       .join('/')}`
   })()
 
+  // hono path will convert +not-found etc too
   return `${dirname}${nameWithParams}`.replace(/\/\/+/gi, '/')
 }
 

package/src/cli/{run.ts → dev.ts}

@@ -1,7 +1,7 @@
 import { virtualEntryIdNative } from '../vite/plugins/virtualEntryConstants'
 import { labelProcess } from './label-process'
 
-export async function run(args: {
+export async function dev(args: {
   clean?: boolean
   host?: string
   port?: string
@@ -21,7 +21,6 @@ export async function run(args: {
     debugBundle: args.debugBundle,
     debug: args.debug,
     server: {
-      https: args.https,
       host: args.host,
       port: args.port ? +args.port : undefined,
     },

package/src/cli/main.ts

@@ -1,6 +1,6 @@
 import { existsSync } from 'node:fs'
 import { createRequire } from 'node:module'
-import { run } from './run'
+import { dev } from './dev'
 
 async function getLatestVersion(packageName: string) {
   const require = createRequire(import.meta.url)
@@ -29,7 +29,7 @@ export async function cliMain(args: { name?: string } = {}) {
 
   if (existsSync('vite.config.ts')) {
     // Inside existing app, let's just run the damn thing
-    await run({})
+    await dev({})
     process.exit(0)
   }
 

package/src/cli.ts

@@ -68,8 +68,8 @@ const dev = defineCommand({
     },
   },
   async run({ args }) {
-    const { run } = await import('./cli/run')
-    await run({
+    const { dev } = await import('./cli/dev')
+    await dev({
       ...args,
       debugBundle: !!args['debug-bundle'],
       mode: modes[args.mode],
@@ -121,9 +121,6 @@ const serveCommand = defineCommand({
     compress: {
       type: 'boolean',
     },
-    cacheHeaders: {
-      type: 'boolean',
-    },
     loadEnv: {
       type: 'boolean',
     },
@@ -133,7 +130,6 @@ const serveCommand = defineCommand({
     await serve({
       port: args.port ? +args.port : undefined,
       host: args.host,
-      cacheHeaders: args.cacheHeaders === false ? 'off' : undefined,
       compress: args.compress,
       platform: args.platform === 'vercel' ? 'vercel' : 'node',
       loadEnv: !!args.loadEnv,

package/src/constants.ts

@@ -5,7 +5,8 @@ export const isNative = process.env.TAMAGUI_TARGET === 'native'
 export const CACHE_KEY = `${process.env.ONE_CACHE_KEY ?? Math.round(Math.random() * 100_000_000)}`
 
 export const LOADER_JS_POSTFIX_UNCACHED = `_vxrn_loader.js`
-export const LOADER_JS_POSTFIX_REGEX = new RegExp(`_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`)
+export const LOADER_JS_POSTFIX_REGEX_STRING = `_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`
+export const LOADER_JS_POSTFIX_REGEX = new RegExp(LOADER_JS_POSTFIX_REGEX_STRING)
 export const LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`
 
 export const PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`