one 1.1.546 → 1.1.547-1762235181981

package/src/router/router.ts

@@ -1,14 +1,13 @@
-import {
-  StackActions,
-  type NavigationContainerRefWithCurrent,
-  type getPathFromState as originalGetPathFromState,
-} from '@react-navigation/native'
+/**
+ * Note: this entire module is exported as an interface router.*
+ * We need to treat exports as an API and not change them, maybe not
+ * the best decision.
+ */
+
+import { type NavigationContainerRefWithCurrent, StackActions } from '@react-navigation/native'
 import * as Linking from 'expo-linking'
-import { Fragment, startTransition, type ComponentType, useSyncExternalStore } from 'react'
+import { type ComponentType, Fragment, startTransition, useSyncExternalStore } from 'react'
 import { Platform } from 'react-native'
-import type { State } from '../fork/getPathFromState'
-import { getPathDataFromState } from '../fork/getPathFromState'
-import { stripBaseUrl } from '../fork/getStateFromPath-mods'
 import type { OneRouter } from '../interfaces/router'
 import { resolveHref } from '../link/href'
 import { resolve } from '../link/path'
@@ -17,10 +16,11 @@ import { getLoaderPath, getPreloadPath } from '../utils/cleanUrl'
 import { dynamicImport } from '../utils/dynamicImport'
 import { shouldLinkExternally } from '../utils/url'
 import type { One } from '../vite/types'
-import { getLinkingConfig, type OneLinkingOptions } from './getLinkingConfig'
-import { getNormalizedStatePath, type UrlObject } from './getNormalizedStatePath'
+import type { UrlObject } from './getNormalizedStatePath'
+import { getRouteInfo } from './getRouteInfo'
 import { getRoutes } from './getRoutes'
 import { setLastAction } from './lastAction'
+import { getLinking, resetLinking, setupLinking } from './linkingConfig'
 import type { RouteNode } from './Route'
 import { sortRoutes } from './sortRoutes'
 import { getQualifiedRouteComponent } from './useScreens'
@@ -29,7 +29,6 @@ import { getNavigateAction } from './utils/getNavigateAction'
 // Module-scoped variables
 export let routeNode: RouteNode | null = null
 export let rootComponent: ComponentType
-export let linking: OneLinkingOptions | undefined
 
 export let hasAttemptedToHideSplash = false
 export let initialState: OneRouter.ResultState | undefined
@@ -67,7 +66,7 @@ export function initialize(
   }
 
   navigationRef = ref
-  setupLinking(initialLocation)
+  setupLinkingAndRouteInfo(initialLocation)
   subscribeToNavigationChanges()
 }
 
@@ -76,24 +75,14 @@ function cleanUpState() {
   rootState = undefined
   nextState = undefined
   routeInfo = undefined
-  linking = undefined
+  resetLinking()
   navigationRefSubscription?.()
   rootStateSubscribers.clear()
   storeSubscribers.clear()
 }
 
-function setupLinking(initialLocation?: URL) {
-  if (routeNode) {
-    linking = getLinkingConfig(routeNode)
-
-    if (initialLocation) {
-      linking.getInitialURL = () => initialLocation.toString()
-      initialState = linking.getStateFromPath?.(
-        initialLocation.pathname + (initialLocation.search || ''),
-        linking.config
-      )
-    }
-  }
+function setupLinkingAndRouteInfo(initialLocation?: URL) {
+  initialState = setupLinking(routeNode, initialLocation)
 
   if (initialState) {
     rootState = initialState
@@ -232,36 +221,6 @@ export function updateState(state: OneRouter.ResultState, nextStateParam = state
   }
 }
 
-export function getRouteInfo(state: OneRouter.ResultState) {
-  return getRouteInfoFromState(
-    (state: Parameters<typeof originalGetPathFromState>[0], asPath: boolean) => {
-      return getPathDataFromState(state, {
-        screens: [],
-        ...linking?.config,
-        preserveDynamicRoutes: asPath,
-        preserveGroups: asPath,
-      })
-    },
-    state
-  )
-}
-
-function getRouteInfoFromState(
-  getPathFromState: (state: State, asPath: boolean) => { path: string; params: any },
-  state: State,
-  baseUrl?: string
-): UrlObject {
-  const { path } = getPathFromState(state, false)
-  const qualified = getPathFromState(state, true)
-
-  return {
-    unstable_globalHref: path,
-    pathname: stripBaseUrl(path, baseUrl).split('?')[0],
-    isIndex: isIndexPath(state),
-    ...getNormalizedStatePath(qualified, baseUrl),
-  }
-}
-
 // Subscription functions
 export function subscribeToRootState(subscriber: OneRouter.RootStateListener) {
   rootStateSubscribers.add(subscriber)
@@ -310,7 +269,7 @@ function getSnapshot() {
     linkTo,
     routeNode,
     rootComponent,
-    linking,
+    linking: getLinking(),
     hasAttemptedToHideSplash,
     initialState,
     rootState,
@@ -359,39 +318,6 @@ export function useStoreRouteInfo() {
   return useSyncExternalStore(subscribeToRootState, routeInfoSnapshot, routeInfoSnapshot)
 }
 
-// Utility functions
-function isIndexPath(state: State) {
-  const route = getActualLastRoute(state.routes[state.index ?? state.routes.length - 1])
-
-  if (route.state) {
-    return isIndexPath(route.state)
-  }
-
-  if (route.name === 'index') {
-    return true
-  }
-
-  if (route.params && 'screen' in route.params) {
-    return route.params.screen === 'index'
-  }
-
-  if (route.name.match(/.+\/index$/)) {
-    return true
-  }
-
-  return false
-}
-
-type RouteLikeTree = { name: string; state?: { routes?: RouteLikeTree[] } }
-
-function getActualLastRoute<A extends RouteLikeTree>(routeLike: A): A {
-  if (routeLike.name[0] === '(' && routeLike.state?.routes) {
-    const routes = routeLike.state.routes
-    return getActualLastRoute(routes[routes.length - 1]) as any
-  }
-  return routeLike
-}
-
 // Cleanup function
 export function cleanup() {
   if (splashScreenAnimationFrame) {
@@ -454,6 +380,8 @@ export async function linkTo(href: string, event?: string, options?: OneRouter.L
     )
   }
 
+  const linking = getLinking()
+
   if (!linking) {
     throw new Error('Attempted to link to route when no routes are present')
   }

package/src/router/sortRoutes.ts

@@ -1,5 +1,5 @@
-import type { DynamicConvention, RouteNode } from './Route'
 import { matchGroupName } from './matchers'
+import type { DynamicConvention, RouteNode } from './Route'
 
 function sortDynamicConvention(a: DynamicConvention, b: DynamicConvention) {
   if (a.deep && !b.deep) {

package/src/router/useInitializeOneRouter.ts

@@ -1,7 +1,7 @@
 import { useNavigationContainerRef } from '@react-navigation/native'
-import { initialize } from './router'
-import * as routerStore from './router'
 import type { One } from '../vite/types'
+import * as routerStore from './router'
+import { initialize } from './router'
 
 let initialized = false
 

package/src/router/useScreens.tsx

@@ -8,7 +8,7 @@ import type {
   ScreenListeners,
 } from '@react-navigation/native'
 import React, { memo, Suspense, useId } from 'react'
-import { SafeAreaView, ScrollView, View, TouchableOpacity, Text } from 'react-native'
+import { SafeAreaView, ScrollView, Text, TouchableOpacity, View } from 'react-native'
 import { ServerContextScript } from '../server/ServerContextScript'
 import { getPageExport } from '../utils/getPageExport'
 import { EmptyRoute } from '../views/EmptyRoute'
@@ -17,11 +17,11 @@ import { DevHead } from '../vite/DevHead'
 import { useServerContext } from '../vite/one-server-only'
 import { filterRootHTML } from './filterRootHTML'
 import {
-  Route,
-  useRouteNode,
   type DynamicConvention,
   type LoadedRoute,
+  Route,
   type RouteNode,
+  useRouteNode,
 } from './Route'
 import { sortRoutesWithInitial } from './sortRoutes'
 
@@ -185,7 +185,7 @@ export function getQualifiedRouteComponent(value: RouteNode) {
       const out = Component(props, ref)
 
       const { children, bodyProps, head, htmlProps } = filterRootHTML(out)
-      const { children: headChildren, ...headProps } = head?.props || {}
+      const { children: headChildren, ...headProps } = (head?.props || {}) as Record<string, any>
       const serverContext = useServerContext()
 
       // let finalChildren = <Suspense fallback={null}>{children}</Suspense>

package/src/router/useViteRoutes.tsx

@@ -48,7 +48,7 @@ export function globbedRoutesToRouteContext(
   const loadedRoutes = {}
   const clears = {}
 
-  Object.keys(paths).map((path) => {
+  Object.keys(paths).forEach((path) => {
     if (!paths[path]) {
       console.error(`Error: Missing route at path ${path}`)
       return

package/src/router/utils/getNavigateAction.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { getNavigateAction } from './getNavigateAction'
 
 describe('getNavigateAction', () => {

package/src/router/utils/getNavigateAction.ts

@@ -1,8 +1,8 @@
-import { nanoid } from 'nanoid/non-secure'
 import type { NavigationState, PartialRoute } from '@react-navigation/core'
+import { nanoid } from 'nanoid/non-secure'
 import type { OneRouter } from '../../interfaces/router'
-import { matchDynamicName } from '../matchers'
 import { setLastAction } from '../lastAction'
+import { matchDynamicName } from '../matchers'
 
 /**
  * Generates a navigation action to transition from the current state to the desired state.

package/src/server/ServerContextScript.tsx

@@ -7,7 +7,7 @@ export function ServerContextScript() {
     return (
       <script
         async
-        // @ts-ignore
+        // @ts-expect-error
         href={SERVER_CONTEXT_KEY}
         suppressHydrationWarning
         dangerouslySetInnerHTML={{
@@ -23,7 +23,7 @@ export function ServerContextScript() {
     return (
       <script
         async
-        // @ts-ignore
+        // @ts-expect-error
         href={SERVER_CONTEXT_KEY}
         suppressHydrationWarning
         dangerouslySetInnerHTML={{

package/src/server/createRoutesManifest.ts

@@ -1,7 +1,6 @@
-import { type Options, getRoutes } from '../router/getRoutes'
-import { getServerManifest } from './getServerManifest'
-
+import { getRoutes, type Options } from '../router/getRoutes'
 import type { One, RouteInfo } from '../vite/types'
+import { getServerManifest } from './getServerManifest'
 
 export type { Options } from '../router/getRoutes'
 

package/src/server/getServerManifest.ts

@@ -8,8 +8,9 @@
  *
  * Based on https://github.com/vercel/next.js/blob/1df2686bc9964f1a86c444701fa5cbf178669833/packages/next/src/shared/lib/router/utils/route-regex.ts
  */
-import type { RouteNode } from '../router/Route'
+
 import { getContextKey, matchGroupName } from '../router/matchers'
+import type { RouteNode } from '../router/Route'
 import { sortRoutes } from '../router/sortRoutes'
 import type { One, RouteInfo } from '../vite/types'
 

package/src/server/oneServe.ts

@@ -1,22 +1,22 @@
+import { extname, join } from 'node:path'
 import { default as FSExtra } from 'fs-extra'
 import type { Hono, MiddlewareHandler } from 'hono'
 import type { BlankEnv } from 'hono/types'
-import { extname, join } from 'node:path'
+import { serveStaticAssets } from 'vxrn'
 import { getServerEntry, serveStatic } from 'vxrn/serve'
 import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from '../constants'
 import {
   compileManifest,
   getURLfromRequestURL,
-  runMiddlewares,
   type RequestHandlers,
+  runMiddlewares,
 } from '../createHandleRequest'
 import type { RenderAppProps } from '../types'
 import { getPathFromLoaderPath } from '../utils/cleanUrl'
+import { isRolldown } from '../utils/isRolldown'
 import { toAbsolute } from '../utils/toAbsolute'
 import type { One } from '../vite/types'
 import type { RouteInfoCompiled } from './createRoutesManifest'
-import { serveStaticAssets } from 'vxrn'
-import { isRolldown } from '../utils/isRolldown'
 
 export async function oneServe(oneOptions: One.PluginOptions, buildInfo: One.BuildInfo, app: Hono) {
   const { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } = await import(

package/src/server-render.tsx

@@ -1,4 +1,3 @@
-// @ts-ignore
 import ReactDOMServer from 'react-dom/server.browser'
 
 export const renderToString = async (app: React.ReactElement, options: { preloads?: string[] }) => {

package/src/setup.ts

@@ -2,7 +2,7 @@
 // import { afterClientRender } from './render'
 
 // if (process.env.ONE_ENABLE_REACT_SCAN) {
-//   // @ts-ignore (react-scan can be undefined or not depending on if the monorepo uses it)
+//   // @ts-expect-error (react-scan can be undefined or not depending on if the monorepo uses it)
 //   import('react-scan').then(({ scan }) => {
 //     afterClientRender(() => {
 //       scan(JSON.parse(`${process.env.ONE_ENABLE_REACT_SCAN}`))
@@ -13,4 +13,5 @@
 // fixes bad import error in expo-modules-core
 // without this you run into error loading web immediately
 // where globalThis.expo is not defined
-import 'expo-modules-core/src/web/index.web.ts'
+// @zetavg: the actual thing we need to do is maybe import and call `installExpoGlobalPolyfill`. This is currently the file that does it, so we import it.
+// import 'expo-modules-core/src/polyfill/index.web.ts'

package/src/testing-utils.ts

@@ -1,7 +1,6 @@
 import path from 'node:path'
-
-import { getRoutes } from './router/getRoutes'
 import { getReactNavigationConfig } from './getReactNavigationConfig'
+import { getRoutes } from './router/getRoutes'
 
 export type ReactComponent = () => React.ReactElement<any, any> | null
 export type FileStub =

package/src/typed-routes/generateRouteTypes.ts

@@ -1,6 +1,6 @@
-import FSExtra from 'fs-extra'
 import { writeFile } from 'node:fs/promises'
 import { dirname } from 'node:path'
+import FSExtra from 'fs-extra'
 import micromatch from 'micromatch'
 import { globbedRoutesToRouteContext } from '../router/useViteRoutes'
 import { globDir } from '../utils/globDir'

package/src/typed-routes/getTypedRoutesDeclarationFile.ts

@@ -89,6 +89,7 @@ function addRouteNode(
     for (const path of generateCombinations(routePath)) {
       dynamicRouteContextKeys.add(path)
       dynamicRoutes.add(
+        // biome-ignore lint/suspicious/noTemplateCurlyInString: intentionally generating type string
         `${path.replaceAll(CATCH_ALL, '${string}').replaceAll(SLUG, '${OneRouter.SingleRoutePart<T>}')}`
       )
     }

package/src/utils/getPathnameFromFilePath.ts

@@ -7,7 +7,7 @@ export function getPathnameFromFilePath(
   options: { preserveExtensions?: boolean; includeIndex?: boolean } = {}
 ) {
   const path = inputPath.replace(/\+(spa|ssg|ssr|api)\.tsx?$/, '')
-  const dirname = Path.dirname(path).replace(/\([^\/]+\)/gi, '')
+  const dirname = Path.dirname(path).replace(/\([^/]+\)/gi, '')
   const file = Path.basename(path)
   const fileName = options.preserveExtensions ? file : file.replace(/\.[a-z]+$/, '')
 

package/src/utils/isRolldown.ts

@@ -6,8 +6,8 @@ export async function isRolldown(): Promise<boolean> {
   }
 
   try {
-    // @ts-ignore - withFilter only exists in rolldown-vite
     const vite = await import('vite')
+    // withFilter only exists in rolldown-vite
     _isRolldown = 'withFilter' in vite
   } catch {
     _isRolldown = false

package/src/utils/redirect.ts

@@ -1,5 +1,5 @@
-import type { OneRouter } from '../interfaces/router'
 import { getURL } from '../getURL'
+import type { OneRouter } from '../interfaces/router'
 import { router } from '../router/imperative-api'
 
 export const redirect = (path: OneRouter.Href & string, status?: number) => {

package/src/utils/removeSearch.ts

@@ -1,5 +1,5 @@
 export function removeSearch(url: string) {
   return url
-    .replace(/\#.*/, '') // remove hash
+    .replace(/#.*/, '') // remove hash
     .replace(/\?.*/, '') // remove query params
 }

package/src/utils/useConstant.ts

@@ -8,7 +8,7 @@ export function useConstant<T>(fn: () => T): T {
     return React.useMemo(() => fn(), [])
   }
 
-  const ref = React.useRef<ResultBox<T>>()
+  const ref = React.useRef<ResultBox<T> | undefined>(undefined)
 
   if (!ref.current) {
     ref.current = { v: fn() }

package/src/utils/withStaticProperties.ts

@@ -17,7 +17,7 @@ export const withStaticProperties = <A extends Function, B>(
       // attach existing things again
       for (const key in component) {
         const v = component[key]
-        // @ts-ignore
+        // @ts-expect-error
         _[key] = v && typeof v === 'object' ? { ...v } : v
       }
     }

package/src/vercel/build/buildVercelOutputDirectory.ts

@@ -3,14 +3,12 @@ import { join, resolve } from 'node:path'
 import FSExtra from 'fs-extra'
 import type { RollupOutput } from 'rollup'
 import { isMatching, P } from 'ts-pattern'
-
-import { createApiServerlessFunction } from './generate/createApiServerlessFunction'
-import { createSsrServerlessFunction } from './generate/createSsrServerlessFunction'
+import type { One } from '../../vite/types'
+import { vercelBuildOutputConfigBase } from './config/vc-build-output-config-base'
 import { serverlessVercelNodeJsConfig } from './config/vc-config-base'
 import { serverlessVercelPackageJson } from './config/vc-package-base'
-import { vercelBuildOutputConfigBase } from './config/vc-build-output-config-base'
-
-import type { One } from '../../vite/types'
+import { createApiServerlessFunction } from './generate/createApiServerlessFunction'
+import { createSsrServerlessFunction } from './generate/createSsrServerlessFunction'
 import { getPathFromRoute } from './getPathFromRoute'
 
 const { copy, ensureDir, existsSync, writeJSON } = FSExtra

package/src/vercel/build/generate/createApiServerlessFunction.ts

@@ -1,17 +1,15 @@
 import { dirname, join, resolve } from 'node:path'
-import FSExtra from 'fs-extra'
-import { resolvePath } from '@vxrn/resolve'
-
+import generator from '@babel/generator'
 import parser from '@babel/parser'
 import traverse from '@babel/traverse'
 import t from '@babel/types'
-import generator from '@babel/generator'
+import { resolvePath } from '@vxrn/resolve'
+import FSExtra from 'fs-extra'
 
 import fs from 'fs-extra'
 import type { RouteInfo } from '../../../vite/types'
-
-import { serverlessVercelPackageJson } from '../config/vc-package-base'
 import { serverlessVercelNodeJsConfig } from '../config/vc-config-base'
+import { serverlessVercelPackageJson } from '../config/vc-package-base'
 import { getPathFromRoute } from '../getPathFromRoute'
 
 // Documentation - Vercel Build Output v3

package/src/vercel/build/generate/createSsrServerlessFunction.ts

@@ -1,8 +1,8 @@
-import fs from 'fs-extra'
 import { join, resolve } from 'node:path'
+import fs from 'fs-extra'
+import type { One, RouteInfo } from '../../../vite/types'
 import { serverlessVercelNodeJsConfig } from '../config/vc-config-base'
 import { serverlessVercelPackageJson } from '../config/vc-package-base'
-import type { One, RouteInfo } from '../../../vite/types'
 import { getPathFromRoute } from '../getPathFromRoute'
 
 // Documentation - Vercel Build Output v3

package/src/views/Navigator.tsx

@@ -1,12 +1,12 @@
 // Copyright © 2024 650 Industries.
-import { StackRouter, useNavigationBuilder, type RouterFactory } from '@react-navigation/native'
+import { type RouterFactory, StackRouter, useNavigationBuilder } from '@react-navigation/native'
 import * as React from 'react'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { useFilterScreenChildren } from '../layouts/withLayoutContext'
+import { FlagsContext } from '../router/FlagsContext'
 import { useContextKey } from '../router/Route'
 import { useSortedScreens } from '../router/useScreens'
 import { Screen } from './Screen'
-import { FlagsContext } from '../router/FlagsContext'
 
 type NavigatorTypes = ReturnType<typeof useNavigationBuilder>
 

package/src/views/PreloadLinks.tsx

@@ -1,10 +1,9 @@
 import { useEffect } from 'react'
-import { preloadRoute } from '../router/router'
 import { getURL } from '../getURL'
+import { preloadRoute } from '../router/router'
 
 export function PreloadLinks() {
   // only in prod because we don't generate them until build
-  // @ts-ignore
   if (typeof window !== 'undefined' && import.meta.env.PROD) {
     useEffect(() => {
       const url = getURL()

package/src/vite/findDepsToOptimize.ts

@@ -1,9 +1,9 @@
 // thanks vitefu!
 
-import FSExtra from 'fs-extra'
 import fs from 'node:fs/promises'
-import path, { dirname } from 'node:path'
 import { createRequire } from 'node:module'
+import path, { dirname } from 'node:path'
+import FSExtra from 'fs-extra'
 
 // given a package finds its dependencies and sub-dependencies
 export async function getAllDependencies(root: string, depth = 20) {
@@ -33,8 +33,6 @@ async function crawl(pkgJsonPath: string, depth = Number.POSITIVE_INFINITY) {
           dependencies = [...dependencies, ...subDeps]
         }
       } catch (err) {
-        // biome-ignore lint/suspicious/noConsoleLog: <explanation>
-        console.log(`Couldn't resolve`, depName)
         // ok skip
       }
     })

package/src/vite/one.ts

@@ -1,13 +1,18 @@
-import { clearCompilerCache, configureVXRNCompilerPlugin } from '@vxrn/compiler'
-import { resolvePath } from '@vxrn/resolve'
 import events from 'node:events'
 import path from 'node:path'
-import type { Plugin, PluginOption, UserConfig } from 'vite'
+import { configureVXRNCompilerPlugin } from '@vxrn/compiler'
+import { resolvePath } from '@vxrn/resolve'
+import type {
+  ExpoManifestRequestHandlerPluginPluginOptions,
+  MetroPluginOptions,
+} from '@vxrn/vite-plugin-metro'
+import type { Plugin, PluginOption } from 'vite'
 import { barrel } from 'vite-plugin-barrel'
 import tsconfigPaths from 'vite-tsconfig-paths'
 import { autoDepOptimizePlugin, getOptimizeDeps, getOptionsFilled, loadEnv } from 'vxrn'
 import vxrnVitePlugin from 'vxrn/vite-plugin'
 import { CACHE_KEY } from '../constants'
+import { getViteMetroPluginOptions } from '../metro-config/getViteMetroPluginOptions'
 import '../polyfills-server'
 import { getRouterRootFromOneOptions } from '../utils/getRouterRootFromOneOptions'
 import { ensureTSConfig } from './ensureTsConfig'
@@ -20,11 +25,6 @@ import { SSRCSSPlugin } from './plugins/SSRCSSPlugin'
 import { virtualEntryId } from './plugins/virtualEntryConstants'
 import { createVirtualEntry } from './plugins/virtualEntryPlugin'
 import type { One } from './types'
-import type {
-  ExpoManifestRequestHandlerPluginPluginOptions,
-  MetroPluginOptions,
-} from '@vxrn/vite-plugin-metro'
-import { getViteMetroPluginOptions } from '../metro-config/getViteMetroPluginOptions'
 
 type MetroOptions = MetroPluginOptions
 
@@ -116,8 +116,6 @@ export function one(options: One.PluginOptions = {}): PluginOption {
     }
   }
 
-  clearCompilerCache()
-
   // ensure tsconfig
   if (options.config?.ensureTSConfig !== false) {
     void ensureTSConfig()
@@ -151,9 +149,8 @@ export function one(options: One.PluginOptions = {}): PluginOption {
   const devAndProdPlugins: Plugin[] = [
     {
       name: 'one:config',
-      // @ts-ignore
       __get: options,
-    },
+    } as any,
 
     !barrelOption
       ? null

package/src/vite/plugins/clientTreeShakePlugin.ts

@@ -1,8 +1,8 @@
+import { extname, relative } from 'node:path'
 import BabelGenerate from '@babel/generator'
 import { parse } from '@babel/parser'
 import BabelTraverse from '@babel/traverse'
 import { deadCodeElimination, findReferencedIdentifiers } from 'babel-dead-code-elimination'
-import { extname, relative } from 'node:path'
 import type { Plugin } from 'vite'
 import { EMPTY_LOADER_STRING } from '../constants'
 

package/src/vite/plugins/fileSystemRouterPlugin.tsx

@@ -7,6 +7,7 @@ import type { ModuleRunner } from 'vite/module-runner'
 import { getSpaHeaderElements } from '../../constants'
 import { createHandleRequest } from '../../createHandleRequest'
 import type { RenderAppProps } from '../../types'
+import { getRouterRootFromOneOptions } from '../../utils/getRouterRootFromOneOptions'
 import { isResponse } from '../../utils/isResponse'
 import { isStatusRedirect } from '../../utils/isStatus'
 import { promiseWithResolvers } from '../../utils/promiseWithResolvers'
@@ -15,7 +16,6 @@ import { replaceLoader } from '../../vite/replaceLoader'
 import type { One } from '../../vite/types'
 import { setServerContext } from '../one-server-only'
 import { virtalEntryIdClient, virtualEntryId } from './virtualEntryConstants'
-import { getRouterRootFromOneOptions } from '../../utils/getRouterRootFromOneOptions'
 
 // server needs better dep optimization
 const USE_SERVER_ENV = false //!!process.env.USE_SERVER_ENV
@@ -72,7 +72,7 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
             const exported = routeFile === '' ? {} : await runner.import(routeFile)
             const loaderData = await exported.loader?.(loaderProps)
 
-            // biome-ignore lint/security/noGlobalEval: <explanation>
+            // biome-ignore lint/security/noGlobalEval: needed to set server env at runtime
             eval(`process.env.TAMAGUI_IS_SERVER = '1'`)
 
             const entry = await runner.import(virtualEntryId)

package/src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx

@@ -1,9 +1,9 @@
 import { join } from 'node:path'
 import { debounce } from 'perfect-debounce'
 import type { Plugin } from 'vite'
-import type { One } from '../types'
 import { generateRouteTypes } from '../../typed-routes/generateRouteTypes'
 import { getRouterRootFromOneOptions } from '../../utils/getRouterRootFromOneOptions'
+import type { One } from '../types'
 
 export function generateFileSystemRouteTypesPlugin(options: One.PluginOptions): Plugin {
   return {