one 1.21.12 → 1.22.0

package/src/vite/plugins/bundledDevPlugin.ts

@@ -0,0 +1,116 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import type { Plugin } from 'vite'
+import { virtualEntryId } from './virtualEntryConstants'
+
+// Vite 8.1 experimental bundled dev (FullBundleDevEnvironment): a rolldown-powered
+// single-bundle web client. This plugin wires up the pieces One needs to run under
+// it. Enable with `one({ web: { experimentalBundledDev: true } })`. Only active in
+// dev (serve); a no-op for builds and for non-web environments.
+//
+// Companion changes live where they're structurally required:
+//   - virtualEntryPlugin: installs the react-refresh preamble into the bundled
+//     client entry (the separate /@one/dev.js path can't, since /@vite/client isn't
+//     a standalone module in bundled mode).
+//   - fileSystemRouterPlugin: serves the bundled entry url and drops /@vite/client
+//     from preloads.
+//   - devtoolsPlugin: stubs /@vite/client + /@react-refresh imports in /@one/dev.js.
+
+const MIME: Record<string, string> = {
+  png: 'image/png',
+  jpg: 'image/jpeg',
+  jpeg: 'image/jpeg',
+  gif: 'image/gif',
+  webp: 'image/webp',
+  avif: 'image/avif',
+  bmp: 'image/bmp',
+  ico: 'image/x-icon',
+}
+
+// rolldown's native asset handling drops default-import asset specifiers
+// (`import logo from './logo.png'`) coming from raw-bundled node_modules deps under
+// One's client env — the binding is elided while its usage is kept, crashing with
+// "X is not defined" (e.g. @react-navigation/elements' icon Assets). transform() DOES
+// run in the FullBundleDev pipeline, so rewrite those imports to inline data-uris.
+//
+// The same data-uri must be produced on the SERVER too: SSR otherwise emits the
+// original asset URL (e.g. `<img src="/features/.../mj.jpg">`), which both 404s under
+// FullBundleDev and diverges from the client's inlined data-uri → React hydration
+// mismatch. So the inliner runs on client (rolldown plugin) and ssr (top-level
+// transform) alike — see bundledDevPlugin().
+function inlineAssetImports(code: string, id: string): { code: string; map: null } | null {
+  if (!/\.(png|jpe?g|gif|webp|avif|bmp|ico)/.test(code)) return null
+  const importRe =
+    /import\s+(\w+)\s+from\s*['"]([^'"?]+\.(?:png|jpe?g|gif|webp|avif|bmp|ico))['"]\s*;?/g
+  const base = id.split('?')[0]
+  let result = code
+  let changed = false
+  let m: RegExpExecArray | null
+  const edits: { full: string; name: string; uri: string }[] = []
+  while ((m = importRe.exec(code))) {
+    const [full, name, spec] = m
+    const abs = spec.startsWith('.') ? path.resolve(path.dirname(base), spec) : null
+    if (!abs || !fs.existsSync(abs)) continue
+    const ext = path.extname(abs).slice(1).toLowerCase()
+    const uri = `data:${MIME[ext] || 'application/octet-stream'};base64,${fs.readFileSync(abs).toString('base64')}`
+    edits.push({ full, name, uri })
+  }
+  for (const e of edits) {
+    result = result.replace(e.full, `const ${e.name} = ${JSON.stringify(e.uri)};`)
+    changed = true
+  }
+  return changed ? { code: result, map: null } : null
+}
+
+function webBundledAssetPlugin() {
+  return {
+    name: 'one:web-bundled-asset',
+    transform: (code: string, id: string) => inlineAssetImports(code, id),
+  }
+}
+
+export function bundledDevPlugin(enabled: boolean): Plugin {
+  return {
+    name: 'one:bundled-dev',
+
+    // mirror the client's asset inlining on the server env so SSR emits the same
+    // data-uris (the rolldown client plugin above can't reach the ssr pipeline).
+    transform(code, id) {
+      if (!enabled) return
+      const env = (this as any).environment
+      if (!env || env.name !== 'ssr' || env.mode !== 'dev') return
+      return inlineAssetImports(code, id)
+    },
+
+    config(_userConfig, env) {
+      if (!enabled || env.command !== 'serve') return
+
+      return {
+        experimental: { bundledDev: true },
+        environments: {
+          client: {
+            build: {
+              rolldownOptions: {
+                // bundle the virtual entry so FullBundleDev serves it at
+                // /assets/_virtual_one-entry.js
+                input: [virtualEntryId],
+                plugins: [webBundledAssetPlugin()],
+                experimental: {
+                  // rolldown 1.1.0 defaulted lazyBarrel ON, which breaks One's
+                  // index.mjs barrel re-exports under FullBundleDev (e.g. `Slot`
+                  // resolves to undefined). pin it off.
+                  lazyBarrel: false,
+                },
+                // react-native packages import native-only exports
+                // (codegenNativeComponent, TurboModuleRegistry, …) from react-native
+                // → aliased to react-native-web, which doesn't export them. shim as
+                // undefined instead of failing the build (matches the dep optimizer).
+                shimMissingExports: true,
+              },
+            },
+          },
+        },
+      }
+    },
+  }
+}

package/src/vite/plugins/devtoolsPlugin.ts

@@ -18,6 +18,13 @@ export function createDevtoolsPlugin(options: DevtoolsPluginOptions = {}): Plugi
     apply: 'serve', // only in dev
 
     configureServer(server) {
+      // vite 8.1 bundledDev: /@vite/client and /@react-refresh aren't standalone
+      // modules (the HMR client + refresh runtime are bundled into the entry), so
+      // dev.mjs's top-level imports of them 404 / fail MIME checks and take the whole
+      // devtools script down. stub them: HMR (route/loader/css/cursor) becomes a
+      // no-op here and the refresh preamble is installed by the bundled entry instead.
+      const isBundledDev = !!(server.config as any).experimental?.bundledDev
+
       // serve the devtools script by reading and combining the source files
       server.middlewares.use(async (req, res, next) => {
         if (req.url === DEVTOOLS_VIRTUAL_ID) {
@@ -31,6 +38,18 @@ export function createDevtoolsPlugin(options: DevtoolsPluginOptions = {}): Plugi
               .replace("import './devtools.mjs'", '')
               .replace("import './source-inspector.mjs'", '')
 
+            if (isBundledDev) {
+              code = code
+                .replace(
+                  "import { createHotContext } from '/@vite/client'",
+                  'const createHotContext = () => ({ on() {}, off() {}, accept() {}, dispose() {}, prune() {}, send() {}, invalidate() {} })'
+                )
+                .replace(
+                  "import { injectIntoGlobalHook } from '/@react-refresh'",
+                  'const injectIntoGlobalHook = () => {}'
+                )
+            }
+
             // only include devtools UI if enabled
             if (includeUI) {
               const devtoolsPath = resolvePath('one/devtools/devtools.mjs')

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

@@ -9,7 +9,6 @@ vi.mock('vite', async () => {
   return {
     ...actual,
     createServerModuleRunner: vi.fn(() => ({
-      clearCache: vi.fn(),
       import: vi.fn(),
     })),
   }
@@ -24,6 +23,7 @@ type MiddlewareHandler = (
 type WatcherListener = (...args: string[]) => void | Promise<void>
 
 describe('createFileSystemRouterPlugin', () => {
+  const previousVxrnVersion = globalThis['__vxrnVersion']
   const previousIsVxrnCli = process.env.IS_VXRN_CLI
   const previousViteEnvironment = process.env.VITE_ENVIRONMENT
   let previousVxrnPluginConfig: unknown
@@ -55,6 +55,7 @@ describe('createFileSystemRouterPlugin', () => {
     } else {
       ;(globalThis as any).__vxrnPluginConfig__ = previousVxrnPluginConfig
     }
+    globalThis['__vxrnVersion'] = previousVxrnVersion
     vi.restoreAllMocks()
   })
 
@@ -135,7 +136,6 @@ describe('createFileSystemRouterPlugin', () => {
     let renderCount = 0
     const render = vi.fn(async () => `<html><body>${++renderCount}</body></html>`)
     const runner = {
-      clearCache: vi.fn(),
       import: vi.fn(async (id: string) => {
         if (id === virtualEntryId) {
           return { default: { render } }
@@ -234,15 +234,25 @@ describe('createFileSystemRouterPlugin', () => {
     await expect(request('/')).resolves.toContain('<body>1</body>')
     expect(render).toHaveBeenCalledTimes(1)
 
-    const allListeners = watcherListeners.get('all') || []
-    const invalidateRunner = allListeners[0]
-    if (!invalidateRunner) {
-      throw new Error('Expected runner invalidation listener to be registered')
-    }
-    invalidateRunner('change', routeFile)
+    const versionBeforeChange = globalThis['__vxrnVersion']
+    // vite calls hotUpdate on the ssr environment after invalidating the graph;
+    // that is what tells the next render its route tree is built out of pre-edit
+    // modules
+    ;(plugin as any).hotUpdate.call(
+      {
+        environment: {
+          name: 'ssr',
+          moduleGraph: { getModulesByFile: () => new Set([{ id: routeFile }]) },
+        },
+      },
+      { file: routeFile }
+    )
 
     await expect(request('/')).resolves.toContain('<body>2</body>')
     expect(render).toHaveBeenCalledTimes(2)
-    expect(runner.clearCache).toHaveBeenCalledTimes(2)
+
+    // the render also has to invalidate the route context the tree is built
+    // from, otherwise it renders fresh html out of pre-edit route modules
+    expect(globalThis['__vxrnVersion']).toBe((versionBeforeChange || 0) + 1)
   })
 })

package/src/vite/plugins/fileSystemRouterPlugin.tsx

@@ -45,17 +45,19 @@ const routeTypeColors: Record<string, (s: string) => string> = {
 const USE_SERVER_ENV = false //!!process.env.USE_SERVER_ENV
 
 export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin {
-  const preloads = ['/@vite/client', virtalEntryIdClient]
+  // under vite 8.1 bundledDev the client entry is bundled and served at a fixed
+  // /assets url instead of the unbundled /@id/__x00__virtual url. swapped in
+  // configureServer once we can see whether the client env is bundled.
+  let preloads = ['/@vite/client', virtalEntryIdClient]
 
   let runner: ModuleRunner
   let server: ViteDevServer
 
-  // Only clear the SSR module runner cache when a file actually changed, not on
-  // every request. Clearing per-request forces a full re-evaluation of the whole
-  // server module tree (new AsyncFunction per module) on each page render, which
-  // leaks heap unboundedly under sustained navigation (→ 5-8GB RSS / OOM) and also
-  // re-transforms every module. The file watcher below flips this back to true.
-  let needsCacheClear = true
+  // set by hotUpdate below when the ssr environment sees a file change, consumed
+  // by the next page render. only refresh on an actual change, never per
+  // request: a per-request refresh rebuilds the route tree and re-renders every
+  // ssg page for nothing.
+  let needsRouteRefresh = false
 
   // Track file dependencies from loaders for hot reload
   // Maps file path -> set of route paths that depend on it
@@ -124,7 +126,7 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
       {
         async handlePage({ route, url, loaderProps }) {
           const ssgCacheKey = route.type === 'ssg' ? getSsgHtmlCacheKey(route, url) : null
-          if (ssgCacheKey && !needsCacheClear) {
+          if (ssgCacheKey && !needsRouteRefresh) {
             const cachedHtml = ssgHtmlCache.get(ssgCacheKey)
             if (cachedHtml) {
               return cachedHtml
@@ -166,7 +168,7 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
             await renderPromise
           }
 
-          if (ssgCacheKey && !needsCacheClear) {
+          if (ssgCacheKey && !needsRouteRefresh) {
             const cachedHtml = ssgHtmlCache.get(ssgCacheKey)
             if (cachedHtml) {
               return cachedHtml
@@ -183,10 +185,17 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
             // so we must branch on route.file, not the joined path.
             const isGeneratedNotFound = route.file === ''
             const routeFile = isGeneratedNotFound ? '' : path.join(routerRoot, route.file)
-            if (needsCacheClear) {
-              runner.clearCache()
+            if (needsRouteRefresh) {
+              // the module runner keeps itself fresh: every import re-checks the
+              // server, which has already invalidated the changed file and its
+              // importers, so only that chain re-evaluates. what it can't know
+              // about is our own route cache — the route context in
+              // useViteRoutes holds resolved route modules, and the SSR route
+              // tree is built from that context. bumping the version both watch
+              // rebuilds them from the fresh modules on this render.
+              globalThis['__vxrnVersion'] = (globalThis['__vxrnVersion'] || 0) + 1
               ssgHtmlCache.clear()
-              needsCacheClear = false
+              needsRouteRefresh = false
             }
 
             globalThis['__vxrnresetState']?.()
@@ -587,7 +596,7 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
     try {
       handleRequest = createRequestHandler()
       ssgHtmlCache.clear()
-      needsCacheClear = true
+      needsRouteRefresh = true
     } catch (error) {
       console.warn(`[one] Failed to rebuild routes after ${changedPath} changed.`, error)
     }
@@ -598,6 +607,22 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
     enforce: 'post',
     apply: 'serve',
 
+    // the route tree we rendered from is built out of whatever route modules
+    // were resolved at the time, so any ssr-side change makes it stale. this
+    // runs inside vite's update sequence, after the graph has been invalidated,
+    // so by the time the next render reads the flag the fresh modules are
+    // already there to rebuild from.
+    //
+    // ask the graph rather than reading the `modules` argument: vite calls
+    // hotUpdate for every watcher event including files it knows nothing about,
+    // and an earlier plugin may have replaced `modules` (route-module-hmr-fix
+    // returns [] for ssr app files to suppress the full reload).
+    hotUpdate({ file }) {
+      if (this.environment.name !== 'ssr') return
+      if (!this.environment.moduleGraph.getModulesByFile(file)?.size) return
+      needsRouteRefresh = true
+    },
+
     async config() {
       const setting = options.optimization?.autoEntriesScanning ?? 'flat'
       const routerRoot = normalizePath(getRouterRootFromOneOptions(options))
@@ -651,6 +676,16 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
     configureServer(serverIn) {
       server = serverIn
 
+      // vite 8.1 bundledDev: the client env bundles the virtual entry and serves
+      // it at /assets/_virtual_one-entry.js. the unbundled /@id/__x00__virtual url
+      // 404s in this mode, so point preloads (and bootstrap) at the bundled url.
+      const clientEnv = server.environments?.client as any
+      if (clientEnv?.config?.isBundled || clientEnv?.bundledDev) {
+        // bundled mode: the HMR client + refresh runtime are bundled into the
+        // entry; /@vite/client doesn't exist as a standalone module (404s).
+        preloads = ['/assets/_virtual_one-entry.js']
+      }
+
       // change this to .server to test using the indepedently scoped env
       runner = createServerModuleRunner(
         USE_SERVER_ENV ? server.environments.server : server.environments.ssr
@@ -658,36 +693,6 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
 
       const appDir = path.resolve(process.cwd(), getRouterRootFromOneOptions(options))
 
-      // any watched file change means the SSR runner may be serving stale module
-      // code — mark the cache dirty so the next render re-evaluates once (set
-      // immediately/undebounced so it can't race ahead of a render).
-      //
-      // but only for files the SSR runner has ACTUALLY evaluated. the watcher
-      // fires for EVERY file event under the project root — including build-tool
-      // scratch files (e.g. *.bun-build temp artifacts), freshly created
-      // unrelated files, and other tooling's churn. in a busy monorepo that
-      // churn is near-constant, and marking the cache dirty on it forces a full
-      // re-evaluation of the SSR module tree on the very next render (a new
-      // AsyncFunction per module) — exactly the unbounded heap leak the
-      // needsCacheClear comment above exists to prevent (→ 5-8GB RSS / OOM).
-      //
-      // `runner.evaluatedModules` is the precise set clearCache() would re-evaluate,
-      // so a change outside it can never make the cache stale. it correctly
-      // includes both route files (loaded via runner.import) and shared source
-      // modules — unlike server.environments.ssr.moduleGraph, which misses
-      // runner-imported route files. (route-file adds/removes are still handled
-      // separately below via recreateRequestHandler, so a brand-new route is
-      // never missed.)
-      server.watcher.on('all', (_event, file) => {
-        if (file && runner?.evaluatedModules) {
-          const mods =
-            runner.evaluatedModules.getModulesByFile(file) ||
-            runner.evaluatedModules.getModulesByFile(normalizePath(file))
-          if (!mods || mods.size === 0) return
-        }
-        needsCacheClear = true
-      })
-
       // on change ./app stuff lets reload this to pick up any route changes
       const fileWatcherChangeListener = debounce((type: string, changedPath: string) => {
         if (

package/src/vite/plugins/virtualEntryPlugin.ts

@@ -226,12 +226,39 @@ export function createVirtualEntry(options: {
         const linkingArg = options.router?.linking
           ? `linking: ${JSON.stringify(options.router.linking)},`
           : ''
+
+        // vite 8.1 bundledDev: the client is a single bundle, so the react-refresh
+        // preamble normally provided by /@one/dev.js (which imports /@vite/client —
+        // a module that doesn't exist in bundled mode) never installs $RefreshReg$,
+        // and every compiler-wrapped route module then throws "preamble was not
+        // loaded". install it here instead — this runs at entry-body time, before
+        // the lazily-globbed route modules evaluate. ('one' and /@react-refresh are
+        // node_modules / the runtime, so neither is refresh-wrapped.)
+        // `isBundled` is true for EVERY environment during build, so it alone can't
+        // gate this — a prod build would emit an import of /@react-refresh, which
+        // only exists while serving. dev mode is what makes the preamble necessary.
+        const isBundledClient =
+          this.environment.mode === 'dev' &&
+          this.environment.name === 'client' &&
+          !!(this.environment.config as any)?.isBundled
+        const refreshPreambleImport = isBundledClient
+          ? `import { injectIntoGlobalHook as __oneInjectRefresh } from '/@react-refresh'`
+          : ''
+        const refreshPreambleSetup = isBundledClient
+          ? `if (typeof window !== 'undefined' && !window.$RefreshReg$) {
+  __oneInjectRefresh(window)
+  window.$RefreshReg$ = () => {}
+  window.$RefreshSig$ = () => (type) => type
+}`
+          : ''
         return `
 ${setupResult.promiseDeclaration}
 ${nativewindImport}
+${refreshPreambleImport}
 
 import { createApp, registerPreloadedRoute as _registerPreloadedRoute } from 'one'
 ${setupResult.importStatement}
+${refreshPreambleSetup}
 
 // Export registerPreloadedRoute so preload files can import it from this bundle
 // Named export that wraps the original function

package/src/vite/types.ts

@@ -544,6 +544,17 @@ export namespace One {
        * @default false
        */
       suspendRoutes?: boolean
+
+      /**
+       * Experimental: serve the web client through Vite 8.1's bundled dev mode
+       * (rolldown-powered FullBundleDevEnvironment) instead of unbundled ESM dev.
+       * Fewer requests / faster parse, especially for apps with large icon/util
+       * imports. Dev-only; ignored for builds.
+       *
+       * @experimental
+       * @default false
+       */
+      experimentalBundledDev?: boolean
     }
 
     /**

package/types/cli/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AAmXA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAA;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,iBA0xCA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AAmXA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAA;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,iBAuxCA"}

package/types/fork/NavigationContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NavigationContainer.d.ts","sourceRoot":"","sources":["../../src/fork/NavigationContainer.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAKL,KAAK,wBAAwB,EAC7B,KAAK,sBAAsB,EAK5B,MAAM,wBAAwB,CAAA;AAO/B,OAAO,EAEL,KAAK,oBAAoB,EAEzB,KAAK,cAAc,EAEnB,KAAK,eAAe,EAErB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAS9B,OAAO,CAAC,MAAM,CAAC;IAGb,IAAI,yBAAyB,EAAE,OAAO,CACpC,sBAAsB,CAAC,GAAG,CAAC,EAC3B;QAAE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,CAAA;KAAE,CAC1C,CAAA;CACF;AAOD,KAAK,KAAK,CAAC,SAAS,SAAS,EAAE,IAAI,wBAAwB,GAAG;IAC5D,SAAS,CAAC,EAAE,eAAe,CAAA;IAC3B,OAAO,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,CAAA;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,aAAa,CAAC,EAAE,oBAAoB,CAAA;CACrC,CAAA;AAmKD,eAAO,MAAM,mBAAmB,EAAiD,CAC/E,aAAa,SAAS,EAAE,GAAG,eAAe,CAAC,aAAa,EAExD,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG;IAC5B,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAA;CACvD,KACE,KAAK,CAAC,YAAY,CAAA"}
+{"version":3,"file":"NavigationContainer.d.ts","sourceRoot":"","sources":["../../src/fork/NavigationContainer.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAKL,KAAK,wBAAwB,EAC7B,KAAK,sBAAsB,EAK5B,MAAM,wBAAwB,CAAA;AAO/B,OAAO,EAEL,KAAK,oBAAoB,EAEzB,KAAK,cAAc,EAEnB,KAAK,eAAe,EAErB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAS9B,OAAO,CAAC,MAAM,CAAC;IAGb,IAAI,yBAAyB,EAAE,OAAO,CACpC,sBAAsB,CAAC,GAAG,CAAC,EAC3B;QAAE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,CAAA;KAAE,CAC1C,CAAA;CACF;AAID,KAAK,KAAK,CAAC,SAAS,SAAS,EAAE,IAAI,wBAAwB,GAAG;IAC5D,SAAS,CAAC,EAAE,eAAe,CAAA;IAC3B,OAAO,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,CAAA;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,aAAa,CAAC,EAAE,oBAAoB,CAAA;CACrC,CAAA;AA2ID,eAAO,MAAM,mBAAmB,EAAiD,CAC/E,aAAa,SAAS,EAAE,GAAG,eAAe,CAAC,aAAa,EAExD,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG;IAC5B,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAA;CACvD,KACE,KAAK,CAAC,YAAY,CAAA"}

package/types/fork/useLinking.native.d.ts

@@ -15,24 +15,24 @@ export declare function useLinking(ref: React.RefObject<NavigationContainerRef<P
         index: number;
         routeNames: string[];
         history?: unknown[];
-        routes: import("@react-navigation/routers").NavigationRoute<ParamListBase, string>[];
+        routes: import("@react-navigation/core").NavigationRoute<ParamListBase, string>[];
         type: string;
         stale: false;
     }>, "stale" | "routes">> & Readonly<{
         stale?: true;
-        routes: import("@react-navigation/routers").PartialRoute<import("@react-navigation/routers").Route<string, object | undefined>>[];
+        routes: import("@react-navigation/core").PartialRoute<import("@react-navigation/core").Route<string, object | undefined>>[];
     }> & {
         state?: Partial<Omit<Readonly<{
             key: string;
             index: number;
             routeNames: string[];
             history?: unknown[];
-            routes: import("@react-navigation/routers").NavigationRoute<ParamListBase, string>[];
+            routes: import("@react-navigation/core").NavigationRoute<ParamListBase, string>[];
             type: string;
             stale: false;
         }>, "stale" | "routes">> & Readonly<{
             stale?: true;
-            routes: import("@react-navigation/routers").PartialRoute<import("@react-navigation/routers").Route<string, object | undefined>>[];
+            routes: import("@react-navigation/core").PartialRoute<import("@react-navigation/core").Route<string, object | undefined>>[];
         }> & /*elided*/ any;
     }) | undefined>;
 };

package/types/layouts/Drawer.d.ts

@@ -11,7 +11,7 @@ type DrawerExtraProps = {
      */
     render?: DrawerRender;
 };
-export declare const Drawer: React.ForwardRefExoticComponent<Omit<Omit<Omit<import("@react-navigation/drawer").DrawerNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & ({
+export declare const Drawer: React.ForwardRefExoticComponent<Omit<Omit<Omit<import("@react-navigation/drawer").DrawerNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/core").DefaultRouterOptions<string> & ({
     children: React.ReactNode;
     layout?: ((props: {
         state: DrawerNavigationState<ParamListBase>;
@@ -56,13 +56,13 @@ export declare const Drawer: React.ForwardRefExoticComponent<Omit<Omit<Omit<impo
         payload?: object;
         source?: string;
         target?: string;
-    }>>(original: import("@react-navigation/routers").Router<DrawerNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<DrawerNavigationState<ParamListBase>, Action>>) | undefined;
+    }>>(original: import("@react-navigation/core").Router<DrawerNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/core").Router<DrawerNavigationState<ParamListBase>, Action>>) | undefined;
     UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & ({
     id?: undefined;
 } | {
     id: string;
-})), "children"> & Partial<Pick<Omit<import("@react-navigation/drawer").DrawerNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & ({
+})), "children"> & Partial<Pick<Omit<import("@react-navigation/drawer").DrawerNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/core").DefaultRouterOptions<string> & ({
     children: React.ReactNode;
     layout?: ((props: {
         state: DrawerNavigationState<ParamListBase>;
@@ -107,7 +107,7 @@ export declare const Drawer: React.ForwardRefExoticComponent<Omit<Omit<Omit<impo
         payload?: object;
         source?: string;
         target?: string;
-    }>>(original: import("@react-navigation/routers").Router<DrawerNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<DrawerNavigationState<ParamListBase>, Action>>) | undefined;
+    }>>(original: import("@react-navigation/core").Router<DrawerNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/core").Router<DrawerNavigationState<ParamListBase>, Action>>) | undefined;
     UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & ({
     id?: undefined;

package/types/layouts/Stack.d.ts

@@ -12,7 +12,7 @@ type StackExtraProps = {
      */
     render?: StackRender;
 };
-export declare const Stack: React.ForwardRefExoticComponent<Omit<Omit<Omit<import("@react-navigation/native-stack").NativeStackNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & ({
+export declare const Stack: React.ForwardRefExoticComponent<Omit<Omit<Omit<import("@react-navigation/native-stack").NativeStackNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/core").DefaultRouterOptions<string> & ({
     children: React.ReactNode;
     layout?: ((props: {
         state: StackNavigationState<ParamListBase>;
@@ -53,13 +53,13 @@ export declare const Stack: React.ForwardRefExoticComponent<Omit<Omit<Omit<impor
         payload?: object;
         source?: string;
         target?: string;
-    }>>(original: import("@react-navigation/routers").Router<StackNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<StackNavigationState<ParamListBase>, Action>>) | undefined;
+    }>>(original: import("@react-navigation/core").Router<StackNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/core").Router<StackNavigationState<ParamListBase>, Action>>) | undefined;
     UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & ({
     id?: undefined;
 } | {
     id: string;
-})), "children"> & Partial<Pick<Omit<import("@react-navigation/native-stack").NativeStackNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & ({
+})), "children"> & Partial<Pick<Omit<import("@react-navigation/native-stack").NativeStackNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/core").DefaultRouterOptions<string> & ({
     children: React.ReactNode;
     layout?: ((props: {
         state: StackNavigationState<ParamListBase>;
@@ -100,7 +100,7 @@ export declare const Stack: React.ForwardRefExoticComponent<Omit<Omit<Omit<impor
         payload?: object;
         source?: string;
         target?: string;
-    }>>(original: import("@react-navigation/routers").Router<StackNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<StackNavigationState<ParamListBase>, Action>>) | undefined;
+    }>>(original: import("@react-navigation/core").Router<StackNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/core").Router<StackNavigationState<ParamListBase>, Action>>) | undefined;
     UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & ({
     id?: undefined;

package/types/layouts/Tabs.d.ts

@@ -11,7 +11,7 @@ type TabsExtraProps = {
      */
     render?: TabsRender;
 };
-export declare const Tabs: React.ForwardRefExoticComponent<Omit<Omit<Omit<import("@react-navigation/bottom-tabs").BottomTabNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & ({
+export declare const Tabs: React.ForwardRefExoticComponent<Omit<Omit<Omit<import("@react-navigation/bottom-tabs").BottomTabNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/core").DefaultRouterOptions<string> & ({
     children: React.ReactNode;
     layout?: ((props: {
         state: TabNavigationState<ParamListBase>;
@@ -52,13 +52,13 @@ export declare const Tabs: React.ForwardRefExoticComponent<Omit<Omit<Omit<import
         payload?: object;
         source?: string;
         target?: string;
-    }>>(original: import("@react-navigation/routers").Router<TabNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<TabNavigationState<ParamListBase>, Action>>) | undefined;
+    }>>(original: import("@react-navigation/core").Router<TabNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/core").Router<TabNavigationState<ParamListBase>, Action>>) | undefined;
     UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & ({
     id?: undefined;
 } | {
     id: string;
-})), "children"> & Partial<Pick<Omit<import("@react-navigation/bottom-tabs").BottomTabNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/routers").DefaultRouterOptions<string> & ({
+})), "children"> & Partial<Pick<Omit<import("@react-navigation/bottom-tabs").BottomTabNavigatorProps, "children" | "initialRouteName" | "layout" | "id" | "screenOptions" | "screenListeners" | "screenLayout" | "UNSTABLE_router" | "UNSTABLE_routeNamesChangeBehavior"> & import("@react-navigation/core").DefaultRouterOptions<string> & ({
     children: React.ReactNode;
     layout?: ((props: {
         state: TabNavigationState<ParamListBase>;
@@ -99,7 +99,7 @@ export declare const Tabs: React.ForwardRefExoticComponent<Omit<Omit<Omit<import
         payload?: object;
         source?: string;
         target?: string;
-    }>>(original: import("@react-navigation/routers").Router<TabNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/routers").Router<TabNavigationState<ParamListBase>, Action>>) | undefined;
+    }>>(original: import("@react-navigation/core").Router<TabNavigationState<ParamListBase>, Action>) => Partial<import("@react-navigation/core").Router<TabNavigationState<ParamListBase>, Action>>) | undefined;
     UNSTABLE_routeNamesChangeBehavior?: "firstMatch" | "lastUnhandled";
 } & ({
     id?: undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"useInitializeOneRouter.d.ts","sourceRoot":"","sources":["../../src/router/useInitializeOneRouter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,KAAK,WAAW,MAAM,UAAU,CAAA;AAYvC,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,GAAG,CAAC,YAAY,EACzB,eAAe,EAAE,GAAG,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,gBAAgB,sBAsC3B;AAGD,wBAAgB,mBAAmB,SAElC;AAKD,wBAAgB,UAAU,SAGzB"}
+{"version":3,"file":"useInitializeOneRouter.d.ts","sourceRoot":"","sources":["../../src/router/useInitializeOneRouter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,KAAK,WAAW,MAAM,UAAU,CAAA;AAevC,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,GAAG,CAAC,YAAY,EACzB,eAAe,EAAE,GAAG,GAAG,SAAS,EAChC,OAAO,CAAC,EAAE,gBAAgB,sBAsC3B;AAGD,wBAAgB,mBAAmB,SAElC;AAKD,wBAAgB,UAAU,SAGzB"}

package/types/ui/TabContext.d.ts

@@ -75,7 +75,7 @@ export declare const TabsDescriptorsContext: import("react").Context<Record<stri
         merge?: boolean;
     } : never): void;
     preload<RouteName extends string>(...args: RouteName extends unknown ? [screen: RouteName, params?: object | undefined] : never): void;
-    reset(state: TabNavigationState<any> | import("@react-navigation/routers").PartialState<TabNavigationState<any>>): void;
+    reset(state: TabNavigationState<any> | import("@react-navigation/core").PartialState<TabNavigationState<any>>): void;
     goBack(): void;
     isFocused(): boolean;
     canGoBack(): boolean;
@@ -88,7 +88,7 @@ export declare const TabsDescriptorsContext: import("react").Context<Record<stri
         index: number;
         routeNames: string[];
         history?: unknown[];
-        routes: import("@react-navigation/routers").NavigationRoute<ParamListBase, string>[];
+        routes: import("@react-navigation/core").NavigationRoute<ParamListBase, string>[];
         type: string;
         stale: false;
     }>, {}, {}> | undefined>(id?: string | undefined): T;
@@ -111,7 +111,7 @@ export declare const TabsNavigatorContext: import("react").Context<({
         index: number;
         routeNames: string[];
         history?: unknown[];
-        routes: import("@react-navigation/routers").NavigationRoute<ParamListBase, string>[];
+        routes: import("@react-navigation/core").NavigationRoute<ParamListBase, string>[];
         type: string;
         stale: false;
     }>>) => Readonly<{
@@ -151,15 +151,15 @@ export declare const TabsNavigatorContext: import("react").Context<({
         index: number;
         routeNames: string[];
         history?: unknown[];
-        routes: import("@react-navigation/routers").NavigationRoute<ParamListBase, string>[];
+        routes: import("@react-navigation/core").NavigationRoute<ParamListBase, string>[];
         type: string;
         stale: false;
-    }> | import("@react-navigation/routers").PartialState<Readonly<{
+    }> | import("@react-navigation/core").PartialState<Readonly<{
         key: string;
         index: number;
         routeNames: string[];
         history?: unknown[];
-        routes: import("@react-navigation/routers").NavigationRoute<ParamListBase, string>[];
+        routes: import("@react-navigation/core").NavigationRoute<ParamListBase, string>[];
         type: string;
         stale: false;
     }>>): void;
@@ -173,7 +173,7 @@ export declare const TabsNavigatorContext: import("react").Context<({
         index: number;
         routeNames: string[];
         history?: unknown[];
-        routes: import("@react-navigation/routers").NavigationRoute<ParamListBase, string>[];
+        routes: import("@react-navigation/core").NavigationRoute<ParamListBase, string>[];
         type: string;
         stale: false;
     }>;