one 1.26.0 → 1.26.1

package/dist/esm/vite/plugins/sourceInspectorPlugin.test.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["describe","expect","it","getSourceInspectorPath","resolveEditorFilePath","toBe","fileExists","filePath"],"sources":["../../../../src/vite/plugins/sourceInspectorPlugin.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AAErC,SAASC,sBAAA,EAAwBC,qBAAA,QAA6B;AAE9DJ,QAAA,CAAS,iCAAiC,MAAM;EAC9CA,QAAA,CAAS,0BAA0B,MAAM;IACvCE,EAAA,CAAG,mDAAmD,MAAM;MAC1DD,MAAA,CAAOE,sBAAA,CAAuB,kCAAkC,OAAO,CAAC,EAAEE,IAAA,CACxE,2BACF;IACF,CAAC;IAEDH,EAAA,CAAG,gEAAgE,MAAM;MACvED,MAAA,CACEE,sBAAA,CAAuB,wCAAwC,OAAO,CACxE,EAAEE,IAAA,CAAK,sCAAsC;IAC/C,CAAC;EACH,CAAC;EAEDL,QAAA,CAAS,yBAAyB,MAAM;IACtCE,EAAA,CAAG,sDAAsD,MAAM;MAC7D,MAAMI,UAAA,GAAcC,QAAA,IAClBA,QAAA,KAAa;MAEfN,MAAA,CACEG,qBAAA,CAAsB,6BAA6B,SAASE,UAAU,CACxE,EAAED,IAAA,CAAK,gCAAgC;IACzC,CAAC;IAEDH,EAAA,CAAG,yDAAyD,MAAM;MAChED,MAAA,CACEG,qBAAA,CACE,kCACA,mBACA,MAAM,KACR,CACF,EAAEC,IAAA,CAAK,gCAAgC;IACzC,CAAC;EACH,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["describe","expect","it","getSourceInspectorPath","injectSourceToJsx","resolveEditorFilePath","toBe","fileExists","filePath","out","join","process","cwd","code","toContain","not","toMatch"],"sources":["../../../../src/vite/plugins/sourceInspectorPlugin.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AAErC,SACEC,sBAAA,EACAC,iBAAA,EACAC,qBAAA,QACK;AAEPL,QAAA,CAAS,iCAAiC,MAAM;EAC9CA,QAAA,CAAS,0BAA0B,MAAM;IACvCE,EAAA,CAAG,mDAAmD,MAAM;MAC1DD,MAAA,CAAOE,sBAAA,CAAuB,kCAAkC,OAAO,CAAC,EAAEG,IAAA,CACxE,2BACF;IACF,CAAC;IAEDJ,EAAA,CAAG,gEAAgE,MAAM;MACvED,MAAA,CACEE,sBAAA,CAAuB,wCAAwC,OAAO,CACxE,EAAEG,IAAA,CAAK,sCAAsC;IAC/C,CAAC;EACH,CAAC;EAEDN,QAAA,CAAS,yBAAyB,MAAM;IACtCE,EAAA,CAAG,sDAAsD,MAAM;MAC7D,MAAMK,UAAA,GAAcC,QAAA,IAClBA,QAAA,KAAa;MAEfP,MAAA,CACEI,qBAAA,CAAsB,6BAA6B,SAASE,UAAU,CACxE,EAAED,IAAA,CAAK,gCAAgC;IACzC,CAAC;IAEDJ,EAAA,CAAG,yDAAyD,MAAM;MAChED,MAAA,CACEI,qBAAA,CACE,kCACA,mBACA,MAAM,KACR,CACF,EAAEC,IAAA,CAAK,gCAAgC;IACzC,CAAC;EACH,CAAC;EAEDN,QAAA,CAAS,qBAAqB,MAAM;IAClCE,EAAA,CAAG,4EAA4E,YAAY;MACzF,MAAMO,GAAA,GAAM,MAAML,iBAAA,CAChB,CACE,gCACA,WACA,gBACA,qCACA,2BACA,gDACA,iBACA,0DACA,iBACA,4CACA,YACA,IACF,CAAEM,IAAA,CAAK,IAAI,GACX,GAAGC,OAAA,CAAQC,GAAA,CAAI,CAAC,gBAClB;MACA,MAAMC,IAAA,GAAOJ,GAAA,EAAKI,IAAA,IAAQ;MAC1BZ,MAAA,CAAOY,IAAI,EAAEC,SAAA,CAAU,uBAAuB;MAC9Cb,MAAA,CAAOY,IAAI,EAAEC,SAAA,CAAU,0BAA0B;MACjDb,MAAA,CAAOY,IAAI,EAAEC,SAAA,CAAU,uBAAuB;MAC9Cb,MAAA,CAAOY,IAAI,EAAEC,SAAA,CAAU,kCAAkC;MACzDb,MAAA,CAAOY,IAAI,EAAEC,SAAA,CAAU,iBAAiB;MACxCb,MAAA,CAAOY,IAAI,EAAEC,SAAA,CAAU,iBAAiB;MACxCb,MAAA,CAAOY,IAAI,EAAEC,SAAA,CAAU,8BAA8B;MACrDb,MAAA,CAAOY,IAAI,EAAEC,SAAA,CAAU,sBAAsB;MAC7Cb,MAAA,CAAOY,IAAI,EAAEE,GAAA,CAAIC,OAAA,CAAQ,wEAAwE;IACnG,CAAC;EACH,CAAC;AACH,CAAC","ignoreList":[]}

package/dist/esm/vite/plugins/sourceInspectorPlugin.test.native.js

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { getSourceInspectorPath, resolveEditorFilePath } from "./sourceInspectorPlugin.native.js";
+import { getSourceInspectorPath, injectSourceToJsx, resolveEditorFilePath } from "./sourceInspectorPlugin.native.js";
 describe("sourceInspectorPlugin helpers", function () {
   describe("getSourceInspectorPath", function () {
     it("keeps project files relative to the current cwd", function () {
@@ -22,5 +22,21 @@ describe("sourceInspectorPlugin helpers", function () {
       })).toBe("/Users/n8/shared/ui/Button.tsx");
     });
   });
+  describe("injectSourceToJsx", function () {
+    it("tags dom elements and components but leaves custom reconciler tags alone", async function () {
+      var _ref;
+      var out = await injectSourceToJsx(["export const Scene = () => (", "  <div>", "    <Canvas>", "      <mesh position={[0, 1, 0]}>", "        <boxGeometry />", '        <meshStandardMaterial color="red" />', "      </mesh>", "      <instancedMesh args={[geometry, material, 4]} />", "    </Canvas>", '    <svg><linearGradient id="g" /></svg>', "  </div>", ")"].join("\n"), `${process.cwd()}/src/Scene.tsx`);
+      var code = (_ref = out === null || out === void 0 ? void 0 : out.code) !== null && _ref !== void 0 ? _ref : "";
+      expect(code).toContain("<div data-one-source=");
+      expect(code).toContain("<Canvas data-one-source=");
+      expect(code).toContain("<svg data-one-source=");
+      expect(code).toContain("<linearGradient data-one-source=");
+      expect(code).toContain("<mesh position=");
+      expect(code).toContain("<boxGeometry />");
+      expect(code).toContain("<meshStandardMaterial color=");
+      expect(code).toContain("<instancedMesh args=");
+      expect(code).not.toMatch(/<(mesh|boxGeometry|meshStandardMaterial|instancedMesh) data-one-source/);
+    });
+  });
 });
 //# sourceMappingURL=sourceInspectorPlugin.test.native.js.map

package/dist/esm/vite/plugins/sourceInspectorPlugin.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["describe","expect","it","getSourceInspectorPath","resolveEditorFilePath","toBe","fileExists","filePath"],"sources":["../../../../src/vite/plugins/sourceInspectorPlugin.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AAErC,SAASC,sBAAA,EAAwBC,qBAAA,QAA6B;AAE9DJ,QAAA,CAAS,iCAAiC,YAAM;EAC9CA,QAAA,CAAS,0BAA0B,YAAM;IACvCE,EAAA,CAAG,mDAAmD,YAAM;MAC1DD,MAAA,CAAOE,sBAAA,CAAuB,kCAAkC,OAAO,CAAC,EAAEE,IAAA;IAAA;IACxEH,EACF;MACDD,MAAA,CAAAE,sBAAA,mDAAAE,IAAA;IAED;EACE;EAAAL,QACE,wBAAuB;IAA+CE,EACxE,qDAA6C;MAC9C,IAAAI,UAAA,YAAAA,CAAAC,QAAA;QACF,OAAAA,QAAA;MAED;MACEN,MAAG,CAAAG,qBAAA,4BAAsD,SAAM,EAAAE,UAAA,GAAAD,IAAA;IAC7D;IAGAH,EAAA;MAAAD,MACE,CAAAG,qBAAsB,iCAA6B,EAAS,iBAAU;QACtE,OAAK;MACR,IAAAC,IAAA;IAED;EACE;AAAA","ignoreList":[]}
+{"version":3,"names":["describe","expect","it","getSourceInspectorPath","injectSourceToJsx","resolveEditorFilePath","toBe","fileExists","filePath","_ref","out","join","process","cwd","code","toContain","not","toMatch"],"sources":["../../../../src/vite/plugins/sourceInspectorPlugin.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AAErC,SAAAC,sBAAA,EAAAC,iBAAA,EAAAC,qBAAA;AAAAL,QACE;EACAA,QAAA;IACAE,EAAA;MAAAD,MACK,CAAAE,sBAAA,6CAAAG,IAAA;IAEP;IACEJ,EAAA,+DAAyC;MACvCD,MAAG,CAAAE,sBAAA,uCAAyD,YAAAG,IAAA;IAC1D;EAA0E;EACxEN,QACF;IACFE,EAAC;MAED,IAAGK,UAAA,YAAAA,CAAAC,QAAA;QACD,OAAAA,QAAA;MAAA;MAEAP,MAAE,CAAKI,qBAAA,4BAAsC,WAAAE,UAAA,GAAAD,IAAA;IAC/C,CAAC;IACFJ,EAAA;MAEDD,MAAS,CAAAI,qBAAA,iCAA+B;QACnC;MACD,IAAAC,IAAM,iCACJ;IAEF;EAAA;EACwEN,QACtE,oBAAK;IACTE,EAAC;MAED,IAAGO,IAAA;MACD,IAAAC,GAAA,SAAAN,iBAAA,EACE,yCACE,gBACA,qCACM,EACR,2BACA,8CAAqC,EACxC,iBACF,0DAED,eAAS,EACJ,4CACD,UAAY,EACV,KAAAO,IACE,WAAAC,OAAA,CAAAC,GAAA;MAAA,IACAC,IAAA,IAAAL,IAAA,GAAAC,GAAA,aAAAA,GAAA,uBAAAA,GAAA,CAAAI,IAAA,cAAAL,IAAA,cAAAA,IAAA;MAAAR,MACA,CAAAa,IAAA,EAAAC,SAAA;MAAAd,MACA,CAAAa,IAAA,EAAAC,SAAA;MAAAd,MACA,CAAAa,IAAA,EAAAC,SAAA;MAAAd,MACA,CAAAa,IAAA,EAAAC,SAAA;MAAAd,MACA,CAAAa,IAAA,EAAAC,SAAA;MAAAd,MACA,CAAAa,IAAA,EAAAC,SAAA;MAAAd,MACA,CAAAa,IAAA,EAAAC,SAAA;MAAAd,MACA,CAAAa,IAAA,EAAAC,SAAA;MAAAd,MACA,CAAAa,IAAA,EAAAE,GAAA,CAAAC,OAAA;IAAA;EACA;AACS","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.26.0",
+  "version": "1.26.1",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -197,18 +197,18 @@
     "@react-navigation/routers": "~7.6.4",
     "@cloudflare/vite-plugin": "^1.33.1",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "1.26.0",
-    "@vxrn/compiler": "1.26.0",
-    "@vxrn/resolve": "1.26.0",
-    "@vxrn/tslib-lite": "1.26.0",
-    "@vxrn/use-isomorphic-layout-effect": "1.26.0",
-    "@vxrn/vite-plugin-metro": "1.26.0",
+    "@vxrn/color-scheme": "1.26.1",
+    "@vxrn/compiler": "1.26.1",
+    "@vxrn/resolve": "1.26.1",
+    "@vxrn/tslib-lite": "1.26.1",
+    "@vxrn/use-isomorphic-layout-effect": "1.26.1",
+    "@vxrn/vite-plugin-metro": "1.26.1",
     "babel-dead-code-elimination": "1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-preset-expo": "~57.0.5",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.26.0",
+    "create-vxrn": "1.26.1",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~57.0.5",
     "expo-modules-core": "~57.0.10",
@@ -229,7 +229,7 @@
     "tsconfig-paths": "^4",
     "use-latest-callback": "^0.2.3",
     "vite": "^8.2.2",
-    "vxrn": "1.26.0",
+    "vxrn": "1.26.1",
     "web-streams-polyfill": "^4.3.0",
     "ws": "^8.21.0",
     "xxhashjs": "^0.2.2"
@@ -247,7 +247,7 @@
     "react-native-safe-area-context": ">=5.0.0",
     "react-native-screens": ">=4.0.0",
     "react-native-worklets": ">=0.7.0",
-    "sharp": "^0.35.3"
+    "sharp": "^0.35.4"
   },
   "peerDependenciesMeta": {
     "@bottom-tabs/react-navigation": {
@@ -295,7 +295,7 @@
     "react-native": "0.86.2",
     "react-test-renderer": "^19.2.0",
     "rolldown": "^1.2.4",
-    "sharp": "^0.35.3",
+    "sharp": "^0.35.4",
     "typescript": "^5.7.3",
     "vitest": "^4.1.0"
   },

package/src/router/getNormalizedStatePath.tsx

@@ -1,4 +1,5 @@
 import { stripBaseUrl } from '../fork/getStateFromPath-mods'
+import { stripPathSuffix } from './path'
 
 type SearchParams = Record<string, string | string[]>
 
@@ -21,7 +22,7 @@ export function getNormalizedStatePath(
   },
   baseUrl?: string
 ): Pick<UrlObject, 'segments' | 'params'> {
-  const [pathname] = statePath.split('?')
+  const pathname = stripPathSuffix(statePath)
   return {
     // Strip empty path at the start
     segments: stripBaseUrl(pathname, baseUrl)

package/src/router/getRouteInfo.test.ts

@@ -0,0 +1,33 @@
+import { describe, expect, it } from 'vitest'
+import { getRouteInfoFromState } from './getRouteInfo'
+
+// a hash link (/dev#stack) keeps its hash in the serialized path; route info
+// must still report the bare pathname or the router never sees the pending
+// navigation land and serializes the stale state to history
+describe('getRouteInfoFromState', () => {
+  const state = {
+    routes: [{ name: 'dev', path: '/dev#stack', params: { '#': 'stack' } }],
+  } as any
+
+  it('drops the hash from pathname and segments', () => {
+    const info = getRouteInfoFromState(
+      (_state, asPath) => ({
+        path: asPath ? '/(site)/dev#stack' : '/dev#stack',
+        params: { '#': 'stack' },
+      }),
+      state
+    )
+    expect(info.pathname).toBe('/dev')
+    expect(info.segments).toEqual(['(site)', 'dev'])
+    expect(info.unstable_globalHref).toBe('/dev#stack')
+  })
+
+  it('drops the query and the hash together', () => {
+    const info = getRouteInfoFromState(
+      () => ({ path: '/dev?x=1#stack', params: { x: '1', '#': 'stack' } }),
+      state
+    )
+    expect(info.pathname).toBe('/dev')
+    expect(info.segments).toEqual(['dev'])
+  })
+})

package/src/router/getRouteInfo.ts

@@ -5,6 +5,7 @@ import type { OneRouter } from '../interfaces/router'
 import { getNormalizedStatePath, type UrlObject } from './getNormalizedStatePath'
 import { isIndexPath } from './isIndexPath'
 import { getResolvedLinking } from './linkingConfig'
+import { stripPathSuffix } from './path'
 
 export function getRouteInfo(state: OneRouter.ResultState) {
   return getRouteInfoFromState(
@@ -20,7 +21,7 @@ export function getRouteInfo(state: OneRouter.ResultState) {
   )
 }
 
-function getRouteInfoFromState(
+export function getRouteInfoFromState(
   getPathFromState: (state: State, asPath: boolean) => { path: string; params: any },
   state: State,
   baseUrl?: string
@@ -30,7 +31,9 @@ function getRouteInfoFromState(
 
   return {
     unstable_globalHref: path,
-    pathname: stripBaseUrl(path, baseUrl).split('?')[0],
+    // a hash href serializes as /page#section; the pathname the router compares
+    // against pending navigation and the URL must drop the hash as well as the query
+    pathname: stripPathSuffix(stripBaseUrl(path, baseUrl)),
     isIndex: isIndexPath(state),
     ...getNormalizedStatePath(qualified, baseUrl),
   }

package/src/router/path.ts

@@ -1,6 +1,6 @@
 import { stripBaseUrl } from '../fork/getStateFromPath-mods'
 
-function stripPathSuffix(path: string): string {
+export function stripPathSuffix(path: string): string {
   const queryIndex = path.indexOf('?')
   const hashIndex = path.indexOf('#')
   let end = path.length

package/src/router/routeHmr.native.test.ts

@@ -25,35 +25,48 @@ describe('routeHmr.native', () => {
     expect(typeof globalThis.__VXRN_ON_MODULE_UPDATED__).toBe('function')
   })
 
-  it('bumps the epoch and notifies subscribers, and stops after unsubscribe', () => {
+  it('does not bump the epoch, so Fast Refresh can keep the mounted route', () => {
     const before = routeHmr.getRouteHmrEpoch()
     const listener = vi.fn()
     const unsubscribe = routeHmr.subscribeRouteHmr(listener)
 
     globalThis.__VXRN_ON_MODULE_UPDATED__!('app/index.tsx')
-    expect(routeHmr.getRouteHmrEpoch()).toBe(before + 1)
-    expect(listener).toHaveBeenCalledTimes(1)
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before)
+    expect(listener).not.toHaveBeenCalled()
 
     unsubscribe()
-    globalThis.__VXRN_ON_MODULE_UPDATED__!('app/index.tsx')
-    expect(listener).toHaveBeenCalledTimes(1)
   })
 
   it('evicts the route cache for the updated file when window.__oneRouteCache is present', () => {
-    const clearFile = vi.fn()
+    const clearFile = vi.fn(() => true)
     ;(globalThis as any).window = { __oneRouteCache: { clearFile } }
     globalThis.__VXRN_ON_MODULE_UPDATED__!('app/_layout.tsx')
     expect(clearFile).toHaveBeenCalledWith('app/_layout.tsx')
   })
 
+  it('does not bump the epoch for a non-route module either', () => {
+    const before = routeHmr.getRouteHmrEpoch()
+    const listener = vi.fn()
+    const unsubscribe = routeHmr.subscribeRouteHmr(listener)
+    ;(globalThis as any).window = {
+      __oneRouteCache: { clearFile: () => false },
+    }
+
+    globalThis.__VXRN_ON_MODULE_UPDATED__!('features/onboarding/HmrProbeChild.tsx')
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before)
+    expect(listener).not.toHaveBeenCalled()
+    unsubscribe()
+  })
+
   it('does not throw when window / route cache is absent', () => {
     ;(globalThis as any).window = undefined
     expect(() => globalThis.__VXRN_ON_MODULE_UPDATED__!('x.tsx')).not.toThrow()
   })
 
-  it('still notifies subscribers when route-cache eviction throws', () => {
+  it('does not throw or bump the epoch when route-cache eviction throws', () => {
     const listener = vi.fn()
     const unsubscribe = routeHmr.subscribeRouteHmr(listener)
+    const before = routeHmr.getRouteHmrEpoch()
     ;(globalThis as any).window = {
       __oneRouteCache: {
         clearFile() {
@@ -62,10 +75,9 @@ describe('routeHmr.native', () => {
       },
     }
 
-    expect(() => globalThis.__VXRN_ON_MODULE_UPDATED__!('app/index.tsx')).toThrow(
-      'cache eviction failed'
-    )
-    expect(listener).toHaveBeenCalledOnce()
+    expect(() => globalThis.__VXRN_ON_MODULE_UPDATED__!('app/index.tsx')).not.toThrow()
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before)
+    expect(listener).not.toHaveBeenCalled()
     unsubscribe()
   })
 })

package/src/router/routeHmr.native.ts

@@ -1,7 +1,10 @@
 // native Fast Refresh for One routes
 //
 // vxrn calls the global hook after committing an updated module. One evicts that
-// route and bumps this external-store epoch so mounted screens load fresh exports.
+// route from the loader cache so the next loadRoute() sees fresh exports. it
+// does not bump the epoch: ScreenComponent re-running loadRoute() would render a
+// new function identity and remount the route, which is what made
+// `generation:1` jump to `generation:2` when a route file was Fast Refreshed.
 
 declare global {
   // vxrn's native HMR runtime invokes this (when defined) with each committed
@@ -29,9 +32,8 @@ if (process.env.NODE_ENV === 'development') {
       if (typeof routeCache?.clearFile === 'function') {
         routeCache.clearFile(id)
       }
-    } finally {
-      routeHmrEpoch++
-      routeHmrListeners.forEach((listener) => listener())
+    } catch (error) {
+      console.error('[one] route cache eviction failed', error)
     }
   }
 }

package/src/router/useScreens.test.tsx

@@ -137,3 +137,75 @@ describe('route SuspenseFallback', () => {
     expect(renderer!.toJSON()).toBeNull()
   })
 })
+
+describe('ErrorBoundary route identity', () => {
+  it('preserves page state across a re-render when the route exports ErrorBoundary', async () => {
+    let mounts = 0
+    function Page() {
+      const [count, setCount] = React.useState(0)
+      React.useEffect(() => {
+        mounts += 1
+      }, [])
+      return (
+        <button data-count={count} onClick={() => setCount((value) => value + 1)}>
+          {count}
+        </button>
+      )
+    }
+    function ErrorBoundary() {
+      return <div data-error="1" />
+    }
+
+    const node = createRouteNode('spa', 'onboarding', './auth/onboarding.tsx', () => ({
+      default: Page,
+      ErrorBoundary,
+    }))
+    const Route = getQualifiedRouteComponent(node)
+
+    function Harness({ tick }: { tick: number }) {
+      return <Route tick={tick} />
+    }
+
+    let renderer: TestRenderer.ReactTestRenderer
+    await act(async () => {
+      renderer = TestRenderer.create(<Harness tick={0} />)
+    })
+
+    const button = renderer!.root.findByType('button')
+    expect(button.props['data-count']).toBe(0)
+    await act(async () => {
+      button.props.onClick()
+    })
+    expect(renderer!.root.findByType('button').props['data-count']).toBe(1)
+    expect(mounts).toBe(1)
+
+    await act(async () => {
+      renderer.update(<Harness tick={1} />)
+    })
+
+    expect(renderer!.root.findByType('button').props['data-count']).toBe(1)
+    expect(mounts).toBe(1)
+  })
+
+  it('still renders the exported ErrorBoundary when the page throws', async () => {
+    function Page(): React.ReactNode {
+      throw new Error('boom')
+    }
+    function ErrorBoundary({ error }: { error: Error; retry: () => Promise<void> }) {
+      return <div data-caught={error.message} />
+    }
+
+    const node = createRouteNode('spa', 'broken', './broken.tsx', () => ({
+      default: Page,
+      ErrorBoundary,
+    }))
+    const Route = getQualifiedRouteComponent(node)
+
+    let renderer: TestRenderer.ReactTestRenderer
+    await act(async () => {
+      renderer = TestRenderer.create(<Route />)
+    })
+
+    expect(renderer!.root.findByProps({ 'data-caught': 'boom' })).toBeTruthy()
+  })
+})

package/src/router/useScreens.tsx

@@ -350,26 +350,16 @@ export function useSortedScreens(
 }
 
 function fromImport({ ErrorBoundary, SuspenseFallback, ...component }: LoadedRoute) {
-  if (ErrorBoundary) {
-    return {
-      default: React.forwardRef((props: any, ref: any) => {
-        const children = React.createElement(getPageExport(component) || EmptyRoute, {
-          ...props,
-          ref,
-        })
-        return <Try catch={ErrorBoundary}>{children}</Try>
-      }),
-      SuspenseFallback,
-    }
-  }
+  // keep ErrorBoundary on the returned module and wrap it in JSX below.
+  // a new forwardRef here remounts the route on every ScreenComponent render.
   if (process.env.NODE_ENV !== 'production') {
     const exported = getPageExport(component)
     if (exported && typeof exported === 'object' && Object.keys(exported).length === 0) {
-      return { default: EmptyRoute, SuspenseFallback }
+      return { default: EmptyRoute, ErrorBoundary, SuspenseFallback }
     }
   }
 
-  return { default: getPageExport(component), SuspenseFallback }
+  return { default: getPageExport(component), ErrorBoundary, SuspenseFallback }
 }
 
 function RouteSuspenseFallback({
@@ -422,9 +412,9 @@ export function getQualifiedRouteComponent(value: RouteNode) {
       }, [])
     }
 
-    // native Fast Refresh: subscribe to the route-hot epoch (the routeHmr.native
-    // store bumps it when vxrn reports a route module update) so this component
-    // re-renders and re-runs loadRoute() to pick up the edited module's exports
+    // native Fast Refresh: subscribe to the route-hot epoch. route file patches
+    // are applied in place and do not bump it; a bump re-runs loadRoute() and
+    // remounts the screen.
     if (
       process.env.NODE_ENV === 'development' &&
       process.env.TAMAGUI_TARGET === 'native'
@@ -451,7 +441,8 @@ export function getQualifiedRouteComponent(value: RouteNode) {
     }
 
     const res = fromImport(value.loadRoute())
-    const Component = getPageExport(res) as React.ComponentType<any>
+    const Component = (res.default || EmptyRoute) as React.ComponentType<any>
+    const CatchBoundary = res.ErrorBoundary
     const LayoutSuspenseFallback =
       value.type === 'layout' ? res.SuspenseFallback : undefined
     const match =
@@ -491,9 +482,10 @@ export function getQualifiedRouteComponent(value: RouteNode) {
         />
       )
     } else {
+      const page = <Component {...props} {...slotProps} {...loaderDataProps} ref={ref} />
       rendered = (
         <RouteErrorBoundary routeName={value.route}>
-          <Component {...props} {...slotProps} {...loaderDataProps} ref={ref} />
+          {CatchBoundary ? <Try catch={CatchBoundary}>{page}</Try> : page}
         </RouteErrorBoundary>
       )
     }

package/src/router/useViteRoutes.tsx

@@ -227,17 +227,18 @@ export function globbedRoutesToRouteContext(
         })
       },
       clearFile: (file: string) => {
-        hmrVersion++
         const normalizedFile = file.replace(/\\/g, '/').replace(/^\//, '')
         const routeId = moduleKeys.find(
           (key) =>
             routePaths[key].replace(/\\/g, '/').replace(/^\//, '') === normalizedFile
         )
-        if (!routeId) return
+        if (!routeId) return false
 
+        hmrVersion++
         delete loadedRoutes[routeId]
         delete promises[routeId]
         delete preloadedModules[routePaths[routeId]]
+        return true
       },
       getVersion: () => hmrVersion,
     }

package/src/useFocusEffect.ts

@@ -1,7 +1,7 @@
 // A fork of `useFocusEffect` that waits for the navigation state to load before
 // running the effect. This is especially useful for native redirects.
 
-import { useEffect } from 'react'
+import { useEffect, useRef } from 'react'
 import { useOptionalNavigation } from './link/useLoadedNavigation'
 
 type EffectCallback = () => undefined | void | (() => void)
@@ -30,6 +30,18 @@ type EffectCallback = () => undefined | void | (() => void)
 export function useFocusEffect(effect: EffectCallback, deps: any[] = []) {
   const navigation = useOptionalNavigation()
 
+  const prevDepsRef = useRef(deps)
+  const depsCountRef = useRef(0)
+  if (
+    !Array.isArray(deps) ||
+    !Array.isArray(prevDepsRef.current) ||
+    prevDepsRef.current.length !== deps.length ||
+    prevDepsRef.current.some((d, i) => !Object.is(d, deps[i]))
+  ) {
+    prevDepsRef.current = deps
+    depsCountRef.current++
+  }
+
   useEffect(() => {
     if (!navigation) {
       return
@@ -102,7 +114,5 @@ export function useFocusEffect(effect: EffectCallback, deps: any[] = []) {
       unsubscribeFocus()
       unsubscribeBlur()
     }
-    // guard the spread: a caller passing `undefined` (or a non-array) for `deps`
-    // would otherwise throw "deps is not iterable" and crash the screen.
-  }, [navigation, ...(Array.isArray(deps) ? deps : [])])
+  }, [navigation, depsCountRef.current])
 }

package/src/vite/one.ts

@@ -860,7 +860,9 @@ export function one(options: One.PluginOptions = {}): PluginOption {
     // environment, so nothing in `config.plugins` reaches it. one's own plugins
     // go first, then whatever the app opted in through native.bundlerOptions.
     const viteBundlerOptions =
-      nativeOptions?.bundler === 'metro' ? undefined : (nativeOptions?.bundlerOptions as any)
+      nativeOptions?.bundler === 'metro'
+        ? undefined
+        : (nativeOptions?.bundlerOptions as any)
 
     globalThis.__vxrnAddNativePlugins = [
       clientTreeShakePlugin({ runtime: 'rolldown', routerRoot }),

package/src/vite/plugins/sourceInspectorPlugin.test.ts

@@ -1,6 +1,10 @@
 import { describe, expect, it } from 'vitest'
 
-import { getSourceInspectorPath, resolveEditorFilePath } from './sourceInspectorPlugin'
+import {
+  getSourceInspectorPath,
+  injectSourceToJsx,
+  resolveEditorFilePath,
+} from './sourceInspectorPlugin'
 
 describe('sourceInspectorPlugin helpers', () => {
   describe('getSourceInspectorPath', () => {
@@ -37,4 +41,36 @@ describe('sourceInspectorPlugin helpers', () => {
       ).toBe('/Users/n8/shared/ui/Button.tsx')
     })
   })
+
+  describe('injectSourceToJsx', () => {
+    it('tags dom elements and components but leaves custom reconciler tags alone', async () => {
+      const out = await injectSourceToJsx(
+        [
+          'export const Scene = () => (',
+          '  <div>',
+          '    <Canvas>',
+          '      <mesh position={[0, 1, 0]}>',
+          '        <boxGeometry />',
+          '        <meshStandardMaterial color="red" />',
+          '      </mesh>',
+          '      <instancedMesh args={[geometry, material, 4]} />',
+          '    </Canvas>',
+          '    <svg><linearGradient id="g" /></svg>',
+          '  </div>',
+          ')',
+        ].join('\n'),
+        `${process.cwd()}/src/Scene.tsx`
+      )
+      const code = out?.code ?? ''
+      expect(code).toContain('<div data-one-source=')
+      expect(code).toContain('<Canvas data-one-source=')
+      expect(code).toContain('<svg data-one-source=')
+      expect(code).toContain('<linearGradient data-one-source=')
+      expect(code).toContain('<mesh position=')
+      expect(code).toContain('<boxGeometry />')
+      expect(code).toContain('<meshStandardMaterial color=')
+      expect(code).toContain('<instancedMesh args=')
+      expect(code).not.toMatch(/<(mesh|boxGeometry|meshStandardMaterial|instancedMesh) data-one-source/)
+    })
+  })
 })

package/src/vite/plugins/sourceInspectorPlugin.ts

@@ -18,6 +18,22 @@ interface JsxLocation {
 /**
  * Parse code with oxc and find all JSX opening elements.
  */
+// lowercase jsx tags are host elements. on the web only real html and svg
+// tags accept a data attribute; other lowercase tags belong to a custom
+// reconciler (react-three-fiber's <mesh>, <group>, <instancedMesh>...) which
+// applies props to plain objects and throws on the dashed attribute.
+const DOM_TAGS = new Set(
+  (
+    'a abbr address area article aside audio b base bdi bdo blockquote body br button canvas caption cite code col colgroup data datalist dd del details dfn dialog div dl dt em embed fieldset figcaption figure footer form h1 h2 h3 h4 h5 h6 head header hgroup hr html i iframe img input ins kbd label legend li link main map mark menu meta meter nav noscript object ol optgroup option output p picture pre progress q rp rt ruby s samp script search section select slot small source span strong style sub summary sup table tbody td template textarea tfoot th thead time title tr track u ul var video wbr ' +
+    'svg animate animateMotion animateTransform circle clipPath defs desc ellipse feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feDropShadow feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence filter foreignObject g image line linearGradient marker mask metadata mpath path pattern polygon polyline radialGradient rect set stop switch symbol text textPath tspan use view'
+  ).split(' ')
+)
+
+function isHostTag(tagName: string): boolean {
+  const first = tagName.charCodeAt(0)
+  return first >= 97 && first <= 122 && !tagName.includes('.')
+}
+
 async function findJsxElements(code: string, filename: string): Promise<JsxLocation[]> {
   const result = await parse(filename, code)
 
@@ -52,8 +68,13 @@ async function findJsxElements(code: string, filename: string): Promise<JsxLocat
     if (node.type === 'JSXOpeningElement' && node.name) {
       const tagName = getJsxName(node.name)
 
-      // skip Fragment and already-tagged elements
-      if (tagName && tagName !== 'Fragment' && !tagName.endsWith('.Fragment')) {
+      // skip Fragment, non-dom host elements, and already-tagged elements
+      if (
+        tagName &&
+        tagName !== 'Fragment' &&
+        !tagName.endsWith('.Fragment') &&
+        (!isHostTag(tagName) || DOM_TAGS.has(tagName))
+      ) {
         const hasSourceAttr = node.attributes?.some(
           (attr: any) =>
             attr.type === 'JSXAttribute' && attr.name?.name === 'data-one-source'
@@ -123,7 +144,7 @@ export function resolveEditorFilePath(
 /**
  * Transforms JSX to inject data-one-source attributes using oxc-parser.
  */
-async function injectSourceToJsx(code: string, id: string): Promise<TransformOut> {
+export async function injectSourceToJsx(code: string, id: string): Promise<TransformOut> {
   const [filePath] = id.split('?')
   if (!filePath) return
 

package/types/router/getNormalizedStatePath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getNormalizedStatePath.d.ts","sourceRoot":"","sources":["../../src/router/getNormalizedStatePath.tsx"],"names":[],"mappings":"AAEA,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;AAErD,MAAM,MAAM,SAAS,GAAG;IACtB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAA;IAC7B,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAGD,wBAAgB,sBAAsB,CACpC,EACE,IAAI,EAAE,SAAS,EACf,MAAM,GACP,EAAE;IACD,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,GAAG,CAAA;CACZ,EACD,OAAO,CAAC,EAAE,MAAM,GACf,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,QAAQ,CAAC,CA6BxC"}
+{"version":3,"file":"getNormalizedStatePath.d.ts","sourceRoot":"","sources":["../../src/router/getNormalizedStatePath.tsx"],"names":[],"mappings":"AAGA,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;AAErD,MAAM,MAAM,SAAS,GAAG;IACtB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAA;IAC7B,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAGD,wBAAgB,sBAAsB,CACpC,EACE,IAAI,EAAE,SAAS,EACf,MAAM,GACP,EAAE;IACD,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,GAAG,CAAA;CACZ,EACD,OAAO,CAAC,EAAE,MAAM,GACf,IAAI,CAAC,SAAS,EAAE,UAAU,GAAG,QAAQ,CAAC,CA6BxC"}

package/types/router/getRouteInfo.d.ts

@@ -1,4 +1,9 @@
+import { type State } from '../fork/getPathFromState';
 import type { OneRouter } from '../interfaces/router';
 import { type UrlObject } from './getNormalizedStatePath';
 export declare function getRouteInfo(state: OneRouter.ResultState): UrlObject;
+export declare function getRouteInfoFromState(getPathFromState: (state: State, asPath: boolean) => {
+    path: string;
+    params: any;
+}, state: State, baseUrl?: string): UrlObject;
 //# sourceMappingURL=getRouteInfo.d.ts.map

package/types/router/getRouteInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRouteInfo.d.ts","sourceRoot":"","sources":["../../src/router/getRouteInfo.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAIjF,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,CAAC,WAAW,aAYxD"}
+{"version":3,"file":"getRouteInfo.d.ts","sourceRoot":"","sources":["../../src/router/getRouteInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,KAAK,KAAK,EAAE,MAAM,0BAA0B,CAAA;AAE3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAKjF,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,CAAC,WAAW,aAYxD;AAED,wBAAgB,qBAAqB,CACnC,gBAAgB,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,KAAK;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,GAAG,CAAA;CAAE,EAClF,KAAK,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,SAAS,CAYX"}

package/types/router/getRouteInfo.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=getRouteInfo.test.d.ts.map

package/types/router/getRouteInfo.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getRouteInfo.test.d.ts","sourceRoot":"","sources":["../../src/router/getRouteInfo.test.ts"],"names":[],"mappings":""}

package/types/router/path.d.ts

@@ -1,3 +1,4 @@
+export declare function stripPathSuffix(path: string): string;
 export declare function stripTrailingSlash(pathname: string): string;
 export declare function normalizeRoutePathname(pathname: string): string;
 export declare function hasLostDynamicSegment(path: string): boolean;