one 1.2.46 → 1.2.48

package/src/cli/build.ts

@@ -56,7 +56,9 @@ export async function build(args: {
   const manifest = getManifest({ routerRoot })!
 
   const serverOutputFormat =
-    oneOptions.build?.server === false ? 'esm' : (oneOptions.build?.server?.outputFormat ?? 'esm')
+    oneOptions.build?.server === false
+      ? 'esm'
+      : (oneOptions.build?.server?.outputFormat ?? 'esm')
 
   const vxrnOutput = await vxrnBuild(
     {
@@ -163,7 +165,10 @@ export async function build(args: {
                   },
                   chunkFileNames: (chunkInfo) => {
                     const dir = Path.dirname(chunkInfo.name)
-                    const name = Path.basename(chunkInfo.name, Path.extname(chunkInfo.name))
+                    const name = Path.basename(
+                      chunkInfo.name,
+                      Path.extname(chunkInfo.name)
+                    )
                     return Path.join(dir, `${name}-[hash].cjs`)
                   },
                   assetFileNames: (assetInfo) => {
@@ -203,7 +208,10 @@ export async function build(args: {
 
   if (manifest.middlewareRoutes.length) {
     console.info(`\n 🔨 build middlewares\n`)
-    const middlewareBuildInfo = await buildCustomRoutes('middlewares', manifest.middlewareRoutes)
+    const middlewareBuildInfo = await buildCustomRoutes(
+      'middlewares',
+      manifest.middlewareRoutes
+    )
 
     for (const middleware of manifest.middlewareRoutes) {
       const absoluteRoot = resolve(process.cwd(), options.root)
@@ -319,7 +327,9 @@ export async function build(args: {
           ]
             .flat()
             .filter((x) => x && (type === 'css' || x.endsWith('.js')))
-            .map((x) => (type === 'css' ? x : x.startsWith('assets/') ? x : `assets/${x.slice(1)}`))
+            .map((x) =>
+              type === 'css' ? x : x.startsWith('assets/') ? x : `assets/${x.slice(1)}`
+            )
         ),
       ]
     }
@@ -436,7 +446,12 @@ export async function build(args: {
 
     // Non-critical: component imports, utilities - will be modulepreload hints only
     const deferredPreloads = needsSeparatedPreloads
-      ? [...new Set([...entryImports, ...layoutEntries.flatMap((entry) => collectImports(entry))])]
+      ? [
+          ...new Set([
+            ...entryImports,
+            ...layoutEntries.flatMap((entry) => collectImports(entry)),
+          ]),
+        ]
           .filter((path) => !criticalPreloads!.includes(`/${path}`))
           .map((path) => `/${path}`)
       : undefined
@@ -469,7 +484,12 @@ export async function build(args: {
     }
 
     if (process.env.DEBUG) {
-      console.info('[one] building routes', { foundRoute, layoutEntries, allEntries, allCSS })
+      console.info('[one] building routes', {
+        foundRoute,
+        layoutEntries,
+        allEntries,
+        allCSS,
+      })
     }
 
     const serverJsPath = join('dist/server', output.fileName)
@@ -684,7 +704,9 @@ export async function build(args: {
       const middlewareRouteMap: string[] = []
 
       // Generate lazy imports for SSR/SSG page server bundles
-      for (const [routeFile, info] of Object.entries(buildInfoForWriting.routeToBuildInfo)) {
+      for (const [routeFile, info] of Object.entries(
+        buildInfoForWriting.routeToBuildInfo
+      )) {
         if (info.serverJsPath) {
           const importPath = './' + info.serverJsPath.replace(/^dist\//, '')
           pageRouteMap.push(`  '${routeFile}': () => import('${importPath}')`)
@@ -859,7 +881,10 @@ export default {
   "assets": { "directory": "client", "binding": "ASSETS", "run_worker_first": true }
 }
 `
-      await FSExtra.writeFile(join(options.root, 'dist', 'wrangler.jsonc'), wranglerConfig)
+      await FSExtra.writeFile(
+        join(options.root, 'dist', 'wrangler.jsonc'),
+        wranglerConfig
+      )
 
       postBuildLogs.push(`Cloudflare worker bundled at dist/worker.js`)
       postBuildLogs.push(`To deploy: cd dist && wrangler deploy`)

package/src/cli/buildPage.ts

@@ -3,12 +3,20 @@ import FSExtra from 'fs-extra'
 import * as constants from '../constants'
 import type { LoaderProps, RenderApp } from '../types'
 import { getLoaderPath, getPreloadPath, getPreloadCSSPath } from '../utils/cleanUrl'
+import { isResponse } from '../utils/isResponse'
 import { toAbsolute } from '../utils/toAbsolute'
 import { replaceLoader } from '../vite/replaceLoader'
 import type { One, RouteInfo } from '../vite/types'
 
 const { readFile, outputFile } = FSExtra
 
+// Convert URL path (with forward slashes) to filesystem path for cross-platform compatibility
+function urlPathToFilePath(urlPath: string): string {
+  // Remove leading slash and split by forward slash (URL separator)
+  const parts = urlPath.replace(/^\//, '').split('/')
+  return join(...parts)
+}
+
 export async function buildPage(
   serverEntry: string,
   path: string,
@@ -66,7 +74,10 @@ export async function buildPage(
       ...registrationCalls,
     ].join('\n')
 
-    await FSExtra.writeFile(join(clientDir, preloadPath), preloadContent)
+    await FSExtra.writeFile(
+      join(clientDir, urlPathToFilePath(preloadPath)),
+      preloadContent
+    )
 
     // Generate CSS preload file with prefetch (on hover) and inject (on navigation) functions
     // Deduplicate CSS URLs to avoid loading the same file multiple times
@@ -126,12 +137,26 @@ export function injectCSS() {
 // For backwards compatibility, also prefetch on import
 prefetchCSS()
 `
-    await FSExtra.writeFile(join(clientDir, cssPreloadPath), cssPreloadContent)
+    await FSExtra.writeFile(
+      join(clientDir, urlPathToFilePath(cssPreloadPath)),
+      cssPreloadContent
+    )
 
     const exported = await import(toAbsolute(serverJsPath))
 
     if (exported.loader) {
-      loaderData = (await exported.loader?.({ path, params })) ?? null
+      try {
+        loaderData = (await exported.loader?.({ path, params })) ?? null
+      } catch (err) {
+        // Handle thrown responses (e.g., redirect) - skip loader data generation for this page
+        // The redirect will happen at runtime instead
+        if (isResponse(err)) {
+          // Keep loaderData as empty object, the redirect will happen at runtime
+        } else {
+          throw err
+        }
+      }
+
       const code = await readFile(clientJsPath, 'utf-8')
       const withLoader =
         // super dirty to quickly make ssr loaders work until we have better
@@ -142,7 +167,7 @@ if (typeof document === 'undefined') globalThis.document = {}
           code,
           loaderData,
         })
-      const loaderPartialPath = join(clientDir, getLoaderPath(path))
+      const loaderPartialPath = join(clientDir, urlPathToFilePath(getLoaderPath(path)))
       await outputFile(loaderPartialPath, withLoader)
       loaderPath = getLoaderPath(path)
     }
@@ -195,7 +220,10 @@ if (typeof document === 'undefined') globalThis.document = {}
 
         // Non-critical scripts as modulepreload hints only
         const deferredLinks = (deferredPreloads || [])
-          .map((preload) => `   <link rel="modulepreload" fetchPriority="low" href="${preload}"/>`)
+          .map(
+            (preload) =>
+              `   <link rel="modulepreload" fetchPriority="low" href="${preload}"/>`
+          )
           .join('\n')
 
         await outputFile(
@@ -224,7 +252,9 @@ params:\n\n${JSON.stringify(params || null, null, 2)}`
     process.exit(1)
   }
 
-  const middlewares = (foundRoute.middlewares || []).map((x) => builtMiddlewares[x.contextKey])
+  const middlewares = (foundRoute.middlewares || []).map(
+    (x) => builtMiddlewares[x.contextKey]
+  )
 
   const cleanPath = path === '/' ? path : removeTrailingSlash(path)
 

package/src/cli/generateRoutes.ts

@@ -54,7 +54,9 @@ export async function run(args: { appDir?: string; typed?: string } = {}) {
     if (args.typed === 'type' || args.typed === 'runtime') {
       typedRoutesMode = args.typed
     } else {
-      console.error(`Error: Invalid --typed value "${args.typed}". Must be "type" or "runtime"`)
+      console.error(
+        `Error: Invalid --typed value "${args.typed}". Must be "type" or "runtime"`
+      )
       process.exit(1)
     }
   } else if (oneOptions) {

package/src/cli/generateSitemap.test.ts

@@ -19,13 +19,19 @@ describe('generateSitemap', () => {
   })
 
   it('generates basic sitemap XML', () => {
-    const routes: RouteSitemapData[] = [{ path: '/' }, { path: '/about' }, { path: '/blog' }]
+    const routes: RouteSitemapData[] = [
+      { path: '/' },
+      { path: '/about' },
+      { path: '/blog' },
+    ]
     const options: One.SitemapOptions = {}
 
     const result = generateSitemap(routes, options)
 
     expect(result).toContain('<?xml version="1.0" encoding="UTF-8"?>')
-    expect(result).toContain('<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">')
+    expect(result).toContain(
+      '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'
+    )
     expect(result).toContain('<loc>/</loc>')
     expect(result).toContain('<loc>/about</loc>')
     expect(result).toContain('<loc>/blog</loc>')
@@ -75,7 +81,9 @@ describe('generateSitemap', () => {
 
     const result = generateSitemap(routes, options)
 
-    expect(result).toMatch(/<url>\s*<loc>\/about<\/loc>\s*<priority>0\.8<\/priority>\s*<\/url>/s)
+    expect(result).toMatch(
+      /<url>\s*<loc>\/about<\/loc>\s*<priority>0\.8<\/priority>\s*<\/url>/s
+    )
   })
 
   it('applies default changefreq to all routes', () => {
@@ -177,7 +185,9 @@ describe('generateSitemap', () => {
     const result = generateSitemap(routes, options)
 
     expect(result).toContain('<?xml version="1.0" encoding="UTF-8"?>')
-    expect(result).toContain('<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">')
+    expect(result).toContain(
+      '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'
+    )
     expect(result).toContain('</urlset>')
     expect(result).not.toContain('<url>')
   })

package/src/cli/generateSitemap.ts

@@ -13,7 +13,10 @@ export type RouteSitemapData = {
   routeExport?: One.RouteSitemap
 }
 
-export function generateSitemap(routes: RouteSitemapData[], options: One.SitemapOptions): string {
+export function generateSitemap(
+  routes: RouteSitemapData[],
+  options: One.SitemapOptions
+): string {
   const envUrl = process.env.ONE_SERVER_URL
   const baseUrl = options.baseUrl ?? (envUrl && envUrl !== 'undefined' ? envUrl : '')
   const defaultPriority = options.priority ?? 0.5
@@ -59,7 +62,9 @@ function buildSitemapXml(entries: SitemapEntry[], baseUrl: string): string {
 
       if (entry.lastmod) {
         const date =
-          entry.lastmod instanceof Date ? entry.lastmod.toISOString().split('T')[0] : entry.lastmod
+          entry.lastmod instanceof Date
+            ? entry.lastmod.toISOString().split('T')[0]
+            : entry.lastmod
         xml += `\n    <lastmod>${escapeXml(date)}</lastmod>`
       }
 

package/src/cli/main.ts

@@ -16,7 +16,9 @@ async function getLatestVersion(packageName: string) {
     if (latest && currentVersion !== latest) {
       // Step 4: Log the message
       console.info(`\n❶ Update available: ${currentVersion} → ${latest}`)
-      console.info('Run "npx one@latest" or "npm install -g one@latest" to update globally.\n')
+      console.info(
+        'Run "npx one@latest" or "npm install -g one@latest" to update globally.\n'
+      )
     }
   } catch (error) {
     console.error('Failed to fetch the latest version:', error)

package/src/cli/prebuild.ts

@@ -1,4 +1,8 @@
-export async function run(args: { platform?: string; expo: boolean; 'no-install'?: boolean }) {
+export async function run(args: {
+  platform?: string
+  expo: boolean
+  'no-install'?: boolean
+}) {
   const { prebuild } = await import('vxrn')
 
   await prebuild({

package/src/clientLoaderResolver.ts

@@ -1,6 +1,9 @@
 import type { RenderAppProps } from './types'
 
-type LoaderResolverProps = Pick<RenderAppProps, 'loaderData' | 'loaderServerData' | 'loaderProps'>
+type LoaderResolverProps = Pick<
+  RenderAppProps,
+  'loaderData' | 'loaderServerData' | 'loaderProps'
+>
 type ClientLoaderResolver = (props: LoaderResolverProps) => any
 
 let clientLoaderResolver: null | ClientLoaderResolver = null

package/src/config.ts

@@ -3,12 +3,16 @@ import type { One } from './vite/types'
 
 // works client or server
 export const getDefaultRenderMode = () => {
-  const CLIENT_RENDER_MODE = process.env.ONE_DEFAULT_RENDER_MODE as One.RouteRenderMode | undefined
+  const CLIENT_RENDER_MODE = process.env.ONE_DEFAULT_RENDER_MODE as
+    | One.RouteRenderMode
+    | undefined
   const serverConfig = globalThis['__vxrnPluginConfig__'] as One.PluginOptions | undefined
 
   if (!CLIENT_RENDER_MODE && isWebServer && !serverConfig) {
     if (process.env.IS_VXRN_CLI) {
-      throw new Error(`Internal one error: should call setServerConfig before createManifest`)
+      throw new Error(
+        `Internal one error: should call setServerConfig before createManifest`
+      )
     }
   }
 

package/src/constants.ts

@@ -1,7 +1,9 @@
 import type { One } from './vite/types'
 
-export const isWebClient = process.env.TAMAGUI_TARGET !== 'native' && typeof window !== 'undefined'
-export const isWebServer = process.env.TAMAGUI_TARGET !== 'native' && typeof window === 'undefined'
+export const isWebClient =
+  process.env.TAMAGUI_TARGET !== 'native' && typeof window !== 'undefined'
+export const isWebServer =
+  process.env.TAMAGUI_TARGET !== 'native' && typeof window === 'undefined'
 export const isNative = process.env.TAMAGUI_TARGET === 'native'
 
 export const CACHE_KEY = `${process.env.ONE_CACHE_KEY ?? Math.round(Math.random() * 100_000_000)}`

package/src/createApp.tsx

@@ -31,11 +31,19 @@ export function createApp(options: CreateAppProps) {
         ])
 
         const renderToStaticMarkup =
-          ReactDOMServer.renderToStaticMarkup || ReactDOMServer.default?.renderToStaticMarkup
+          ReactDOMServer.renderToStaticMarkup ||
+          ReactDOMServer.default?.renderToStaticMarkup
         const renderToString = serverRender.renderToString
 
-        let { loaderData, loaderProps, css, cssContents, mode, loaderServerData, routePreloads } =
-          props
+        let {
+          loaderData,
+          loaderProps,
+          css,
+          cssContents,
+          mode,
+          loaderServerData,
+          routePreloads,
+        } = props
 
         setServerContext({
           postRenderData: loaderServerData,

package/src/createHandleRequest.ts

@@ -16,7 +16,7 @@ export type RequestHandlers = {
   loadMiddleware?: (route: RouteNode) => Promise<any>
 }
 
-type RequestHandlerProps<RouteExtraProps extends Object = {}> = {
+type RequestHandlerProps<RouteExtraProps extends object = {}> = {
   request: Request
   route: RouteInfo<string> & RouteExtraProps
   url: URL
@@ -68,7 +68,9 @@ export async function runMiddlewares(
       | undefined
 
     if (!exported) {
-      throw new Error(`No valid export found in middleware: ${middlewareModule.contextKey}`)
+      throw new Error(
+        `No valid export found in middleware: ${middlewareModule.contextKey}`
+      )
     }
 
     // go to next middleware
@@ -81,7 +83,9 @@ export async function runMiddlewares(
 
     if (response) {
       if (debugRouter) {
-        console.info(`[one]   ← middleware[${index}] returned early (status: ${response.status})`)
+        console.info(
+          `[one]   ← middleware[${index}] returned early (status: ${response.status})`
+        )
       }
       return response
     }
@@ -235,7 +239,10 @@ function compileRouteRegex(route: RouteInfo): RouteInfoCompiled {
   }
 }
 
-export function compileManifest(manifest: { pageRoutes: RouteInfo[]; apiRoutes: RouteInfo[] }): {
+export function compileManifest(manifest: {
+  pageRoutes: RouteInfo[]
+  apiRoutes: RouteInfo[]
+}): {
   pageRoutes: RouteInfoCompiled[]
   apiRoutes: RouteInfoCompiled[]
 } {
@@ -258,7 +265,9 @@ export function createHandleRequest(
 
   return {
     manifest,
-    handler: async function handleRequest(request: Request): Promise<RequestHandlerResponse> {
+    handler: async function handleRequest(
+      request: Request
+    ): Promise<RequestHandlerResponse> {
       const url = getURLfromRequestURL(request)
       const { pathname, search } = url
 
@@ -325,7 +334,9 @@ export function createHandleRequest(
             continue
           }
           if (debugRouter) {
-            console.info(`[one] ⚡ ${pathname} → matched page route: ${route.page} (${route.type})`)
+            console.info(
+              `[one] ⚡ ${pathname} → matched page route: ${route.page} (${route.type})`
+            )
           }
           return resolvePageRoute(handlers, request, url, route)
         }