one 1.1.434 → 1.1.435

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

@@ -19,7 +19,7 @@ import { createVirtualEntry } from "./plugins/virtualEntryPlugin";
 events.setMaxListeners(1e3);
 globalThis.__vxrnEnableNativeEnv = !0;
 function one() {
-  var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, _options_config, _options_optimization, _options_react, _options_ssr, _options_ssr1, _options_ssr2, _options_react1;
+  var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, _options_config, _options_optimization, _options_react, _options_ssr, _options_react1;
   if (!globalThis.__oneOptions)
     return setOneOptions(options), globalThis.__vxrnPluginConfig__ = options, [];
   clearCompilerCache(), ((_options_config = options.config) === null || _options_config === void 0 ? void 0 : _options_config.ensureTSConfig) !== !1 && ensureTSConfig();
@@ -39,7 +39,7 @@ function one() {
       "client"
     ] : !0
   });
-  var devAndProdPlugins = [
+  var autoDepsOptions = (_options_ssr = options.ssr) === null || _options_ssr === void 0 ? void 0 : _options_ssr.autoDepsOptimization, devAndProdPlugins = [
     {
       name: "one:config",
       // @ts-ignore
@@ -59,7 +59,7 @@ function one() {
         };
       }
     },
-    ...((_options_ssr = options.ssr) === null || _options_ssr === void 0 ? void 0 : _options_ssr.disableAutoDepsPreBundling) === !0 ? [] : [
+    ...autoDepsOptions === !1 ? [] : [
       autoDepOptimizePlugin({
         onScannedDeps(param) {
           var { hasReanimated, hasNativewind } = param, _options_native, _options_native_css;
@@ -70,7 +70,8 @@ function one() {
           });
         },
         root,
-        exclude: Array.isArray((_options_ssr1 = options.ssr) === null || _options_ssr1 === void 0 ? void 0 : _options_ssr1.disableAutoDepsPreBundling) ? (_options_ssr2 = options.ssr) === null || _options_ssr2 === void 0 ? void 0 : _options_ssr2.disableAutoDepsPreBundling : void 0
+        include: /node_modules/,
+        ...autoDepsOptions === !0 ? {} : autoDepsOptions
       })
     ],
     // proxy because you cant add a plugin inside a plugin
@@ -95,7 +96,7 @@ function one() {
       }
     }),
     {
-      name: "one-slim-deps",
+      name: "one-aliases",
       enforce: "pre",
       config() {
         var tslibLitePath = "";
@@ -107,6 +108,10 @@ function one() {
         return {
           resolve: {
             alias: {
+              // testing getting transition between routes working
+              // 'use-sync-external-store/with-selector': resolvePath(
+              //   'use-sync-external-store/shim/with-selector'
+              // ),
               ...tslibLitePath && {
                 tslib: tslibLitePath
               }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/vite/Users/n8/one/packages/one/src/vite/one.ts"],
-  "mappings": "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",
-  "names": ["configureVXRNCompilerPlugin", "clearCompilerCache", "resolvePath", "events", "path", "barrel", "tsconfigPaths", "autoDepOptimizePlugin", "getOptimizeDeps", "getOptionsFilled", "loadEnv", "CACHE_KEY", "ensureTSConfig", "setOneOptions", "clientTreeShakePlugin", "createFileSystemRouterPlugin", "fixDependenciesPlugin", "generateFileSystemRouteTypesPlugin", "SSRCSSPlugin", "virtualEntryId", "createVirtualEntry", "setMaxListeners", "globalThis", "__vxrnEnableNativeEnv", "one", "options", "__oneOptions", "config", "optimizeDeps", "optimizeIds", "include", "optimizeIdRegex", "RegExp", "map", "id", "replace", "join", "tsConfigPathsPlugin", "vxrnOptions", "root", "process", "cwd", "barrelOption", "optimization", "compiler", "react", "enableCompiler", "devAndProdPlugins", "name", "__get", "packages", "Array", "isArray", "clientEnvDefine", "mode", "define", "ssr", "disableAutoDepsPreBundling", "onScannedDeps", "hasReanimated", "hasNativewind", "enableReanimated", "enableNativeCSS", "native", "css", "enableNativewind", "exclude", "undefined", "Proxy", "configIncoming", "pathsConfig", "tsConfigPaths", "plugins", "flat", "some", "p", "configResolved", "resolveId", "get", "target", "key", "thisArg", "Reflect", "enforce", "tslibLitePath", "err", "console", "info", "env", "DEBUG", "error", "resolve", "alias", "tslib", "web", "defaultRenderMode", "JSON", "stringify", "setupFile", "NODE_ENV", "server", "url", "environments", "client", "ios", "android", "hotUpdate", "modules", "m", "relativePath", "relative", "rootDir", "split", "sep", "acceptedHmrExports", "Set", "_", "transform", "code", "environment", "includes", "scan", "reactScanPlugin", "reactScanConfig", "push", "obj", "configs", "disabled", "enabled", "animationSpeed", "showToolbar", "getConfigFor", "platform", "defaultConfig", "perPlatformConfig", "nativeWebDevAndProdPlugsin", "__vxrnAddNativePlugins", "__vxrnAddWebPluginsProd", "deps", "entries"]
+  "mappings": "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",
+  "names": ["configureVXRNCompilerPlugin", "clearCompilerCache", "resolvePath", "events", "path", "barrel", "tsconfigPaths", "autoDepOptimizePlugin", "getOptimizeDeps", "getOptionsFilled", "loadEnv", "CACHE_KEY", "ensureTSConfig", "setOneOptions", "clientTreeShakePlugin", "createFileSystemRouterPlugin", "fixDependenciesPlugin", "generateFileSystemRouteTypesPlugin", "SSRCSSPlugin", "virtualEntryId", "createVirtualEntry", "setMaxListeners", "globalThis", "__vxrnEnableNativeEnv", "one", "options", "__oneOptions", "config", "optimizeDeps", "optimizeIds", "include", "optimizeIdRegex", "RegExp", "map", "id", "replace", "join", "tsConfigPathsPlugin", "vxrnOptions", "root", "process", "cwd", "barrelOption", "optimization", "compiler", "react", "enableCompiler", "autoDepsOptions", "ssr", "autoDepsOptimization", "devAndProdPlugins", "name", "__get", "packages", "Array", "isArray", "clientEnvDefine", "mode", "define", "onScannedDeps", "hasReanimated", "hasNativewind", "enableReanimated", "enableNativeCSS", "native", "css", "enableNativewind", "Proxy", "configIncoming", "pathsConfig", "tsConfigPaths", "plugins", "flat", "some", "p", "configResolved", "resolveId", "get", "target", "key", "thisArg", "Reflect", "enforce", "tslibLitePath", "err", "console", "info", "env", "DEBUG", "error", "resolve", "alias", "tslib", "web", "defaultRenderMode", "JSON", "stringify", "setupFile", "NODE_ENV", "server", "url", "environments", "client", "ios", "android", "hotUpdate", "modules", "m", "relativePath", "relative", "rootDir", "split", "sep", "acceptedHmrExports", "Set", "_", "transform", "code", "environment", "includes", "scan", "reactScanPlugin", "reactScanConfig", "push", "obj", "configs", "disabled", "enabled", "animationSpeed", "showToolbar", "getConfigFor", "platform", "defaultConfig", "perPlatformConfig", "nativeWebDevAndProdPlugsin", "__vxrnAddNativePlugins", "__vxrnAddWebPluginsProd", "deps", "entries"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.434",
+  "version": "1.1.435",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -94,15 +94,15 @@
     "@react-navigation/routers": "~7",
     "@swc/core": "^1.10.4",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/compiler": "1.1.434",
-    "@vxrn/resolve": "1.1.434",
-    "@vxrn/tslib-lite": "1.1.434",
-    "@vxrn/universal-color-scheme": "1.1.434",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.434",
+    "@vxrn/compiler": "1.1.435",
+    "@vxrn/resolve": "1.1.435",
+    "@vxrn/tslib-lite": "1.1.435",
+    "@vxrn/universal-color-scheme": "1.1.435",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.435",
     "babel-dead-code-elimination": "^1.0.6",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.1.434",
+    "create-vxrn": "1.1.435",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~6.3.1",
     "expo-modules-core": "2.1.2",
@@ -126,10 +126,10 @@
     "react-scan": "^0.1.3",
     "rollup-plugin-node-externals": "^7.1.2",
     "use-latest-callback": "^0.2.3",
-    "vite": "^6.0.11",
+    "vite": "^6.1.0",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.0.1",
-    "vxrn": "1.1.434",
+    "vxrn": "1.1.435",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/Root.tsx

@@ -7,6 +7,7 @@ import {
 import { useColorScheme } from '@vxrn/universal-color-scheme'
 import {
   createContext,
+  StrictMode,
   useContext,
   useEffect,
   useId,
@@ -62,7 +63,6 @@ globalThis['__vxrnGetContextFromReactContext'] = () => useContext(ServerAsyncLoc
 export function Root(props: RootProps) {
   const { path, routes, routeOptions, isClient, navigationContainerProps, onRenderId } = props
 
-  // ⚠️ <StrictMode> breaks routing!
   const context = useViteRoutes(routes, routeOptions, globalThis['__vxrnVersion'])
   const location =
     typeof window !== 'undefined' && window.location
@@ -87,45 +87,46 @@ export function Root(props: RootProps) {
   const value = globalThis['__vxrnrequestAsyncLocalStore']?.getStore() || null
 
   const contents = (
-    // <StrictMode>
-    <ServerAsyncLocalIDContext.Provider value={value}>
-      <ServerRenderID.Provider value={id}>
-        <RootErrorBoundary>
-          {/* for some reason warning if no key here */}
-          <UpstreamNavigationContainer
-            ref={store.navigationRef}
-            initialState={store.initialState}
-            linking={store.linking}
-            onUnhandledAction={onUnhandledAction}
-            theme={colorScheme === 'dark' ? DarkTheme : DefaultTheme}
-            documentTitle={{
-              enabled: false,
-            }}
-            {...navigationContainerProps}
-          >
-            <ServerLocationContext.Provider value={location}>
-              {/* <GestureHandlerRootView> */}
-              {/*
-               * Due to static rendering we need to wrap these top level views in second wrapper
-               * View's like <GestureHandlerRootView /> generate a <div> so if the parent wrapper
-               * is a HTML document, we need to ensure its inside the <body>
-               */}
-              <>
-                {/* default scroll restoration to on, but users can configure it by importing and using themselves */}
-                <ScrollBehavior />
-                <Component />
-
-                {/* Users can override this by adding another StatusBar element anywhere higher in the component tree. */}
-              </>
-              {/* {!hasViewControllerBasedStatusBarAppearance && <StatusBar style="auto" />} */}
-              {/* </GestureHandlerRootView> */}
-            </ServerLocationContext.Provider>
-          </UpstreamNavigationContainer>
-          <PreloadLinks key="preload-links" />
-        </RootErrorBoundary>
-      </ServerRenderID.Provider>
-    </ServerAsyncLocalIDContext.Provider>
-    // </StrictMode>
+    <StrictMode>
+      <ServerAsyncLocalIDContext.Provider value={value}>
+        <ServerRenderID.Provider value={id}>
+          <RootErrorBoundary>
+            {/* for some reason warning if no key here */}
+            <UpstreamNavigationContainer
+              ref={store.navigationRef}
+              initialState={store.initialState}
+              linking={store.linking}
+              onUnhandledAction={onUnhandledAction}
+              theme={colorScheme === 'dark' ? DarkTheme : DefaultTheme}
+              documentTitle={{
+                enabled: false,
+              }}
+              {...navigationContainerProps}
+            >
+              <ServerLocationContext.Provider value={location}>
+                {/* <GestureHandlerRootView> */}
+                {/*
+                 * Due to static rendering we need to wrap these top level views in second wrapper
+                 * View's like <GestureHandlerRootView /> generate a <div> so if the parent wrapper
+                 * is a HTML document, we need to ensure its inside the <body>
+                 */}
+                <>
+                  {/* default scroll restoration to on, but users can configure it by importing and using themselves */}
+                  <ScrollBehavior />
+
+                  <Component />
+
+                  {/* Users can override this by adding another StatusBar element anywhere higher in the component tree. */}
+                </>
+                {/* {!hasViewControllerBasedStatusBarAppearance && <StatusBar style="auto" />} */}
+                {/* </GestureHandlerRootView> */}
+              </ServerLocationContext.Provider>
+            </UpstreamNavigationContainer>
+            <PreloadLinks key="preload-links" />
+          </RootErrorBoundary>
+        </ServerRenderID.Provider>
+      </ServerAsyncLocalIDContext.Provider>
+    </StrictMode>
   )
 
   if (isClient) {

package/src/createApp.tsx

@@ -10,8 +10,9 @@ import type { RenderAppProps } from './types'
 import ReactDOMServer from 'react-dom/server.browser'
 import { getServerHeadInsertions } from './useServerHeadInsertion'
 import { ensureExists } from './utils/ensureExists'
-import { getServerContext, setServerContext } from './vite/one-server-only'
 import { SERVER_CONTEXT_POST_RENDER_STRING } from './vite/constants'
+import { getServerContext, setServerContext } from './vite/one-server-only'
+import { cloneElement } from 'react'
 
 export type CreateAppProps = { routes: Record<string, () => Promise<unknown>> }
 
@@ -76,7 +77,9 @@ export function createApp(options: CreateAppProps) {
           }
 
           if (extraHeadElements.length) {
-            const extraHeadHTML = ReactDOMServer.renderToStaticMarkup(<>{extraHeadElements}</>)
+            const extraHeadHTML = ReactDOMServer.renderToStaticMarkup(
+              <>{extraHeadElements.map((x, i) => cloneElement(x, { key: i }))}</>
+            )
 
             if (extraHeadHTML) {
               html = html.replace(`</head>`, `${extraHeadHTML}</head>`)

package/src/render.tsx

@@ -5,6 +5,7 @@ globalThis['__vxrnVersion'] ||= 0
 
 export function render(element: React.ReactNode) {
   if (typeof document === 'undefined') return
+
   if (globalThis['__vxrnRoot']) {
     globalThis['__vxrnVersion']++
     globalThis['__vxrnRoot'].render(element)

package/src/router/router.ts

@@ -6,28 +6,27 @@ import {
 } from '@react-navigation/native'
 import * as Linking from 'expo-linking'
 import { nanoid } from 'nanoid/non-secure'
-import { act, Fragment, startTransition, useSyncExternalStore, type ComponentType } from 'react'
+import { Fragment, startTransition, type ComponentType, useSyncExternalStore } from 'react'
 import { Platform } from 'react-native'
-import type { RouteNode } from './Route'
-import { getLoaderPath, getPreloadPath } from '../utils/cleanUrl'
 import type { State } from '../fork/getPathFromState'
 import { getPathDataFromState } from '../fork/getPathFromState'
 import { stripBaseUrl } from '../fork/getStateFromPath-mods'
-import { getLinkingConfig, type OneLinkingOptions } from './getLinkingConfig'
-import { getRoutes } from './getRoutes'
 import type { OneRouter } from '../interfaces/router'
 import { resolveHref } from '../link/href'
 import { resolve } from '../link/path'
-import { matchDynamicName } from './matchers'
-import { sortRoutes } from './sortRoutes'
-import { getQualifiedRouteComponent } from './useScreens'
 import { assertIsReady } from '../utils/assertIsReady'
+import { getLoaderPath, getPreloadPath } from '../utils/cleanUrl'
 import { dynamicImport } from '../utils/dynamicImport'
-import { removeSearch } from '../utils/removeSearch'
 import { shouldLinkExternally } from '../utils/url'
 import type { One } from '../vite/types'
+import { getLinkingConfig, type OneLinkingOptions } from './getLinkingConfig'
 import { getNormalizedStatePath, type UrlObject } from './getNormalizedStatePath'
+import { getRoutes } from './getRoutes'
 import { setLastAction } from './lastAction'
+import { matchDynamicName } from './matchers'
+import type { RouteNode } from './Route'
+import { sortRoutes } from './sortRoutes'
+import { getQualifiedRouteComponent } from './useScreens'
 
 // Module-scoped variables
 export let routeNode: RouteNode | null = null
@@ -144,16 +143,20 @@ function subscribeToNavigationChanges() {
     }
 
     if (shouldUpdateSubscribers) {
-      for (const subscriber of rootStateSubscribers) {
-        subscriber(state)
-      }
+      startTransition(() => {
+        for (const subscriber of rootStateSubscribers) {
+          subscriber(state)
+        }
+      })
     }
   })
 
-  updateSnapshot()
-  for (const subscriber of storeSubscribers) {
-    subscriber()
-  }
+  startTransition(() => {
+    updateSnapshot()
+    for (const subscriber of storeSubscribers) {
+      subscriber()
+    }
+  })
 }
 
 // Navigation functions
@@ -285,9 +288,11 @@ export function subscribeToLoadingState(subscriber: OneRouter.LoadingStateListen
 }
 
 export function setLoadingState(state: OneRouter.LoadingState) {
-  for (const listener of loadingStateSubscribers) {
-    listener(state)
-  }
+  startTransition(() => {
+    for (const listener of loadingStateSubscribers) {
+      listener(state)
+    }
+  })
 }
 
 // Snapshot function
@@ -505,7 +510,6 @@ export async function linkTo(href: string, event?: string, options?: OneRouter.L
   preloadRoute(href)
 
   const rootState = navigationRef.getRootState()
-  const action = getNavigateAction(state, rootState, event)
 
   const hash = href.indexOf('#')
   if (rootState.key && hash > 0) {
@@ -516,9 +520,10 @@ export async function linkTo(href: string, event?: string, options?: OneRouter.L
   nextOptions = options ?? null
 
   startTransition(() => {
+    const action = getNavigateAction(state, rootState, event)
     const current = navigationRef.getCurrentRoute()
-
     navigationRef.dispatch(action)
+
     let warningTm
     const interval = setInterval(() => {
       const next = navigationRef.getCurrentRoute()

package/src/router/useScreens.tsx

@@ -7,10 +7,9 @@ import type {
   RouteProp,
   ScreenListeners,
 } from '@react-navigation/native'
-import React, { forwardRef, Suspense, useEffect } from 'react'
+import React, { forwardRef, memo, Suspense } from 'react'
 import { ServerContextScript } from '../server/ServerContextScript'
 import { getPageExport } from '../utils/getPageExport'
-import { useConstant } from '../utils/useConstant'
 import { EmptyRoute } from '../views/EmptyRoute'
 import { RootErrorBoundary } from '../views/RootErrorBoundary'
 import { Try } from '../views/Try'
@@ -171,9 +170,11 @@ export function getQualifiedRouteComponent(value: RouteNode) {
 
   let ScreenComponent: React.ForwardRefExoticComponent<{ segment: string; key?: string }>
 
+  let Component
+
   ScreenComponent = React.forwardRef((props, ref) => {
-    const res = value.loadRoute()
-    const Component = useConstant(() => {
+    Component ||= (() => {
+      const res = value.loadRoute()
       const BaseComponent = getPageExport(fromImport(res)) as React.ComponentType<any>
 
       // root layout do special html handling only
@@ -185,12 +186,15 @@ export function getQualifiedRouteComponent(value: RouteNode) {
           const { children: headChildren, ...headProps } = head?.props || {}
           const serverContext = useServerContext()
 
+          // let finalChildren = <Suspense fallback={null}>{children}</Suspense>
+          let finalChildren = children
+
           if (process.env.TAMAGUI_TARGET === 'native') {
             // on native we just ignore all html/body/head
-            return children
+            return finalChildren
           }
 
-          const contents = (
+          finalChildren = (
             <>
               <head key="head" {...headProps}>
                 <DevHead />
@@ -206,7 +210,7 @@ export function getQualifiedRouteComponent(value: RouteNode) {
                 {headChildren}
               </head>
               <body key="body" suppressHydrationWarning {...bodyProps}>
-                <SafeAreaProviderCompat>{children}</SafeAreaProviderCompat>
+                <SafeAreaProviderCompat>{finalChildren}</SafeAreaProviderCompat>
               </body>
             </>
           )
@@ -215,67 +219,37 @@ export function getQualifiedRouteComponent(value: RouteNode) {
             // tamagui and libraries can add className on hydration to have ssr safe styling
             // so supress hydration warnings here
             <html suppressHydrationWarning lang="en-US" {...htmlProps}>
-              {contents}
+              {finalChildren}
             </html>
           )
         })
       }
 
       return BaseComponent
-    })
+    })()
 
     if (process.env.NODE_ENV === 'development' && process.env.DEBUG === 'one') {
       console.groupCollapsed(`Render ${props.key} ${props.segment}`)
-      console.info(`res`, res)
       console.info(`value`, value)
-      console.info(`fromImport`, fromImport(res))
       console.info(`Component`, Component)
       console.groupEnd()
     }
 
-    return (
-      // <Suspense fallback={null}>
-      <Component {...props} ref={ref} />
-      // </Suspense>
-    )
+    return <Component {...props} ref={ref} />
   })
 
   const wrapSuspense = (children: any) => {
+    // so as far as i understand, adding suspense causes flickers on web during nav because
+    // we can't seem to get react navigation to properly respect startTransition(() => {})
+    // i tried a lot of things, but didn't find the root cause, but native needs suspense or
+    // else it hits an error about no suspense boundary being set
+
     if (process.env.TAMAGUI_TARGET === 'native') {
-      return <Suspense fallback={<SuspenseFallback route={value} />}>{children}</Suspense>
+      return <Suspense fallback={null}>{children}</Suspense>
     }
-    // on web avoiding suspense for now
-    // its causing page flickers, we need to make sure we wrap loaders + page nav
-    // in startTransition
     return children
   }
 
-  const getLoadable = (props: any, ref: any) => {
-    return (
-      <RootErrorBoundary>
-        {wrapSuspense(
-          <ScreenComponent
-            {...{
-              ...props,
-              ref,
-              // Expose the template segment path, e.g. `(home)`, `[foo]`, `index`
-              // the intention is to make it possible to deduce shared routes.
-              segment: value.route,
-            }}
-          />
-        )}
-      </RootErrorBoundary>
-    )
-  }
-
-  const SuspenseFallback = ({ route }: { route: RouteNode }) => {
-    useEffect(() => {
-      // console.info(`⚠️ Suspended:`, route)
-    }, [route])
-
-    return null
-  }
-
   const QualifiedRoute = React.forwardRef(
     (
       {
@@ -289,10 +263,21 @@ export function getQualifiedRouteComponent(value: RouteNode) {
       }: any,
       ref: any
     ) => {
-      const loadable = getLoadable(props, ref)
       return (
         <Route route={route} node={value}>
-          {loadable}
+          <RootErrorBoundary>
+            {wrapSuspense(
+              <ScreenComponent
+                {...{
+                  ...props,
+                  ref,
+                  // Expose the template segment path, e.g. `(home)`, `[foo]`, `index`
+                  // the intention is to make it possible to deduce shared routes.
+                  segment: value.route,
+                }}
+              />
+            )}
+          </RootErrorBoundary>
         </Route>
       )
     }
@@ -301,7 +286,7 @@ export function getQualifiedRouteComponent(value: RouteNode) {
   QualifiedRoute.displayName = `Route(${value.route})`
 
   qualifiedStore.set(value, QualifiedRoute)
-  return QualifiedRoute
+  return memo(QualifiedRoute)
 }
 
 /** @returns a function which provides a screen id that matches the dynamic route name in params. */
@@ -366,6 +351,20 @@ function routeToScreen(route: RouteNode, { options, ...props }: Partial<ScreenPr
 
         return output
       }}
+      // this doesn't work, also probably better to wrap suspense only on root layout in useScreens
+      // but it doesnt seem to pick up our startTransitions which i wrapped in a few places.
+      // now i thought this was due to our use of useSyncExternalStore, but i replaced that with
+      // `use-sync-external-store/shim` and i also replaced the one in react-navigation that does
+      // `use-sync-external-store/with-selector` to `use-sync-external-store/shim/with-selector`
+      // but still it seems something else must be updating state outside a transition.
+
+      // layout={({ children }) => {
+      //   console.log('route.contextKey', route.contextKey)
+      //   if (route.contextKey === '') {
+      //     return <Suspense fallback={null}>{children}</Suspense>
+      //   }
+      //   return children
+      // }}
       getComponent={() => {
         // log here to see which route is rendered
         // console.log('getting', route, getQualifiedRouteComponent(route))

package/src/vite/one.ts

@@ -74,6 +74,8 @@ export function one(options: One.PluginOptions = {}): PluginOption {
     })
   }
 
+  const autoDepsOptions = options.ssr?.autoDepsOptimization
+
   const devAndProdPlugins: Plugin[] = [
     {
       name: 'one:config',
@@ -97,7 +99,7 @@ export function one(options: One.PluginOptions = {}): PluginOption {
       },
     },
 
-    ...(options.ssr?.disableAutoDepsPreBundling === true
+    ...(autoDepsOptions === false
       ? []
       : [
           autoDepOptimizePlugin({
@@ -109,9 +111,8 @@ export function one(options: One.PluginOptions = {}): PluginOption {
               })
             },
             root,
-            exclude: Array.isArray(options.ssr?.disableAutoDepsPreBundling)
-              ? options.ssr?.disableAutoDepsPreBundling
-              : undefined,
+            include: /node_modules/,
+            ...(autoDepsOptions === true ? {} : autoDepsOptions),
           }),
         ]),
 
@@ -155,7 +156,7 @@ export function one(options: One.PluginOptions = {}): PluginOption {
     ),
 
     {
-      name: 'one-slim-deps',
+      name: 'one-aliases',
       enforce: 'pre',
 
       config() {
@@ -177,6 +178,11 @@ export function one(options: One.PluginOptions = {}): PluginOption {
         return {
           resolve: {
             alias: {
+              // testing getting transition between routes working
+              // 'use-sync-external-store/with-selector': resolvePath(
+              //   'use-sync-external-store/shim/with-selector'
+              // ),
+
               ...(tslibLitePath && {
                 tslib: tslibLitePath,
               }),