vxrn 1.26.1 → 1.27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "1.26.1",
+  "version": "1.27.0",
   "sideEffects": false,
   "type": "module",
   "exports": {
@@ -65,16 +65,16 @@
     "@jridgewell/trace-mapping": "^0.3.25",
     "@react-native/codegen": "^0.86.2",
     "@react-native/dev-middleware": "^0.86.2",
-    "@vxrn/compiler": "1.26.1",
-    "@vxrn/debug": "1.26.1",
-    "@vxrn/query-string": "1.26.1",
-    "@vxrn/resolve": "1.26.1",
-    "@vxrn/safe-area": "1.26.1",
-    "@vxrn/url-parse": "1.26.1",
-    "@vxrn/utils": "1.26.1",
-    "@vxrn/vendor": "1.26.1",
-    "@vxrn/vite-flow": "1.26.1",
-    "@vxrn/vite-plugin-metro": "1.26.1",
+    "@vxrn/compiler": "1.27.0",
+    "@vxrn/debug": "1.27.0",
+    "@vxrn/query-string": "1.27.0",
+    "@vxrn/resolve": "1.27.0",
+    "@vxrn/safe-area": "1.27.0",
+    "@vxrn/url-parse": "1.27.0",
+    "@vxrn/utils": "1.27.0",
+    "@vxrn/vendor": "1.27.0",
+    "@vxrn/vite-flow": "1.27.0",
+    "@vxrn/vite-plugin-metro": "1.27.0",
     "citty": "^0.1.6",
     "dotenv": "^17.2.1",
     "dotenv-expand": "^12.0.2",
@@ -95,7 +95,7 @@
     "perfect-debounce": "^1.0.0",
     "picocolors": "^1.0.0",
     "pkg-types": "^1.0.3",
-    "rolldown": "^1.2.4",
+    "rolldown": "^1.2.8",
     "semver": "^7.6.3",
     "vite": "^8.2.2",
     "ws": "^8.21.0"

package/src/plugins/reactNativeDevServer.ts

@@ -83,6 +83,7 @@ export function createReactNativeDevServerPlugin(
       > = {}
       const devEngineCreating: Record<string, Promise<unknown> | null> = {}
       const warnedProdBundleRequest = new Set<string>()
+      const pendingReloadPlatforms = new Set<'ios' | 'android'>()
 
       const devToolsSocketEndpoints = ['/inspector/device', '/inspector/debug']
       const reactNativeDevToolsUrl = `http://${host}:${getBoundPort(server)}`
@@ -210,6 +211,9 @@ export function createReactNativeDevServerPlugin(
           return
         }
         addConnectedNativeClient()
+        if (pendingReloadPlatforms.has(socket.vxrnPlatform)) {
+          socket.send(JSON.stringify({ type: 'hmr:reload' }))
+        }
 
         socket.on('message', (message) => {
           const value = message.toString()
@@ -244,66 +248,6 @@ export function createReactNativeDevServerPlugin(
         })
       })
 
-      const reloadNativeClients = (platform: string) => {
-        const reload = JSON.stringify({ type: 'hmr:reload' })
-        hmrWSS.clients.forEach((client) => {
-          const nativeClient = client as NativeHmrSocket
-          if (nativeClient.readyState === 1 && nativeClient.vxrnPlatform === platform) {
-            nativeClient.send(reload)
-          }
-        })
-      }
-
-      // a created route file: rolldown's addWatchFile on the route directories
-      // is supposed to report it, and the engine rebuilds only then. github's
-      // macos runners do not always surface that, so vite's watcher is the
-      // backup, still scoped to route files inside handleAddedFile.
-      //
-      // a deletion it cannot survive. rolldown's dev engine panics its worker
-      // when it retires a module that left the disk ("index out of bounds" out
-      // of oxc_index), and from then on every bundle request answers 500 even
-      // once the file comes back. that engine cannot be repaired, so drop it
-      // and let the next bundle request build a fresh one.
-      let deletionTimer: ReturnType<typeof setTimeout> | undefined
-      let addTimer: ReturnType<typeof setTimeout> | undefined
-      const addedFiles = new Set<string>()
-      server.watcher.on('add', (file) => {
-        if (file.split('/').some((segment) => segment.startsWith('.'))) return
-        addedFiles.add(file)
-        clearTimeout(addTimer)
-        addTimer = setTimeout(() => {
-          const files = [...addedFiles]
-          addedFiles.clear()
-          for (const platform of Object.keys(devEngines)) {
-            const devEngine = devEngines[platform]
-            if (!devEngine) continue
-            for (const added of files) {
-              devEngine.handleAddedFile(added).catch((error) => {
-                console.error(`[vxrn] handling added ${added} for ${platform} failed`, error)
-              })
-            }
-          }
-        }, 50)
-      })
-      server.watcher.on('unlink', (file) => {
-        // vite's watcher already skips node_modules and .git. keep out the rest
-        // of what a dev server writes into a project while it runs: caches and
-        // build output under a dot directory, editor swap files.
-        if (file.split('/').some((segment) => segment.startsWith('.'))) return
-        // one pass for a burst (a branch switch, a generator, a rename)
-        clearTimeout(deletionTimer)
-        deletionTimer = setTimeout(() => {
-          for (const platform of Object.keys(devEngines)) {
-            const devEngine = devEngines[platform]
-            if (!devEngine) continue
-            devEngines[platform] = null
-            devEngineCreating[platform] = null
-            devEngine.close().catch(() => {})
-            reloadNativeClients(platform)
-          }
-        }, 500)
-      })
-
       clientWSS.on('connection', (socket) => {
         socket.on('message', (messageRaw) => {
           const message = JSON.parse(messageRaw.toString()) as any as ClientMessage
@@ -335,10 +279,10 @@ export function createReactNativeDevServerPlugin(
       })
 
       const getDevEngine = async (platform: 'ios' | 'android') => {
-        if (!devEngines[platform]) {
+        while (!devEngines[platform]) {
           // prevent duplicate creation from concurrent requests
           if (!devEngineCreating[platform]) {
-            devEngineCreating[platform] = (async () => {
+            const creating = (async () => {
               try {
                 console.info(`[vxrn] creating rolldown DevEngine for ${platform}...`)
                 devEngines[platform] = await createNativeDevEngine({
@@ -352,6 +296,12 @@ export function createReactNativeDevServerPlugin(
                     // an update with no clientId is for every client on the
                     // platform: an error, or a reload after a full rebuild
                     const target = 'clientId' in update ? update.clientId : undefined
+                    if (update.type === 'hmr:reload' && !target) {
+                      // keep this pending until the rebuilt bundle is served.
+                      // a previous app instance can leave a live socket while
+                      // its replacement is still mounting and connecting.
+                      pendingReloadPlatforms.add(platform)
+                    }
                     hmrWSS.clients.forEach((client) => {
                       const nativeClient = client as NativeHmrSocket
                       if (
@@ -365,12 +315,12 @@ export function createReactNativeDevServerPlugin(
                   },
                 })
                 console.info(`[vxrn] rolldown DevEngine ready for ${platform}`)
-              } catch (err) {
-                // clear so next request retries instead of permanently failing
+              } finally {
+                // clear so a failed creation can be retried.
                 devEngineCreating[platform] = null
-                throw err
               }
             })()
+            devEngineCreating[platform] = creating
           }
           await devEngineCreating[platform]
         }
@@ -403,8 +353,18 @@ export function createReactNativeDevServerPlugin(
 
         try {
           const bundle = await (await getDevEngine(platform)).getBundle()
-
-          res.writeHead(200, { 'Content-Type': 'text/javascript' })
+          // a client that connects after this response starts from the current
+          // route map and does not need the pending reload intended for the
+          // previous runtime.
+          res.once('finish', () => pendingReloadPlatforms.delete(platform))
+
+          // a DevSettings reload requests this exact URL again. native URL
+          // loading may otherwise reuse the first response and restart the app
+          // on a route map from before a file was added or removed.
+          res.writeHead(200, {
+            'Cache-Control': 'no-store',
+            'Content-Type': 'text/javascript',
+          })
           res.end(bundle.code)
         } catch (err) {
           console.error(` Error building React Native bundle`)

package/src/utils/createNativeDevEngine.ts

@@ -16,6 +16,9 @@ import {
   readdirSync,
   statSync,
   readFileSync,
+  writeFileSync,
+  watch,
+  type FSWatcher,
 } from 'node:fs'
 import { pathToFileURL } from 'node:url'
 import micromatch from 'micromatch'
@@ -23,6 +26,7 @@ import type { InputOptions, OutputOptions, Plugin, RolldownOutput } from 'rolldo
 import type { DevEngine } from 'rolldown/experimental'
 import { loadEnv as loadViteEnv, normalizePath } from 'vite'
 import { shouldStripFlow, transformHermesAsync } from '@vxrn/compiler'
+import { resolvePath } from '@vxrn/resolve'
 import { DEFAULT_ASSET_EXTS } from '../constants/defaults'
 import { getNativePrelude } from '../runtime/native-prelude'
 import { rnCodegenPlugin } from '../plugins/rnCodegenPlugin'
@@ -98,7 +102,6 @@ interface NativeDevEngineResult {
   getBundle: () => Promise<NativeDevBundle>
   getAsset: (pathname: string, hash?: string) => NativeDevAsset | undefined
   close: () => Promise<void>
-  handleAddedFile: (file: string) => Promise<void>
 }
 
 // shared resolve extensions for native builds
@@ -262,6 +265,7 @@ function getNativePlugins(
     // rolldown-runtime WebSocket); RN's client otherwise opens a /hot socket and
     // red-boxes "unknown-message [object Object]" on every edit (new arch)
     hmrClientNoopPlugin(),
+    ...(dev ? [reactNativeDedupePlugin(root)] : []),
     // stub CSS imports — native doesn't support CSS and rolldown removed CSS bundling
     cssStubPlugin(),
     // handle import.meta.glob (used by One's route system)
@@ -556,7 +560,11 @@ export async function createNativeDevEngine(
   let bundlePromise: Promise<NativeDevBundle> | null = null
 
   const resolvedHost = host === '0.0.0.0' ? 'localhost' : host
-  const virtualEntry = nativeVirtualEntryPlugin(root, { dev: true })
+  const virtualEntry = nativeVirtualEntryPlugin(root, {
+    dev: true,
+    platform,
+    dynamicRoutes: true,
+  })
 
   // one build at a time: a bundle request and a full rebuild can arrive
   // together (a reload lands on the bundle route while a new route file is
@@ -645,27 +653,26 @@ try {
   let outputProcessed: Promise<void> = Promise.resolve()
 
   let engine: Awaited<ReturnType<typeof dev>>
-
-  const rebuildIfNewRoute = async (files: string[]): Promise<boolean> => {
-    const { routeRoot, files: knownRoutes, isRouteFile } = virtualEntry.routes
-    const routeRootPrefix = `${normalizePath(routeRoot)}/`
-    const routeAdded = files.some((file) => {
-      const normalized = normalizePath(file)
-      if (isRouteFile(normalized)) return !knownRoutes.has(normalized)
-      return (
-        normalized.startsWith(routeRootPrefix) &&
-        statSync(file, { throwIfNoEntry: false })?.isDirectory() === true
-      )
+  let routeWatcher: FSWatcher | undefined
+
+  const rebuildIfRouteGraphChanged = (): Promise<boolean> =>
+    queueEngineWork(async () => {
+      // decide from the complete route set after all earlier engine work. a
+      // watcher can report a directory, a rename, or several events for one
+      // write, and none of those event shapes are the source of truth.
+      const { files: knownRoutes, scanFiles, updateFiles } = virtualEntry.routes
+      const currentRoutes = scanFiles()
+      const routeSetChanged =
+        currentRoutes.size !== knownRoutes.size ||
+        [...currentRoutes].some((route) => !knownRoutes.has(route))
+      if (!routeSetChanged) return false
+
+      // changing this small imported module lets Rolldown compile only the new
+      // route and the registry delta. rebuilding a multi-megabyte native bundle
+      // makes route creation scale with the entire app.
+      updateFiles(currentRoutes)
+      return true
     })
-    if (!routeAdded) return false
-    await queueEngineWork(async () => {
-      engine.triggerFullBuild()
-      await engine.ensureLatestBuildOutput()
-      await outputProcessed
-    })
-    onHmrUpdate?.({ type: 'hmr:reload' })
-    return true
-  }
 
   engine = await dev(inputOptions, outputOptions, {
     onOutput: async (result) => {
@@ -687,12 +694,10 @@ try {
         return
       }
 
-      // a route file that was just created has no module, so rolldown reports
-      // the change and stops: in devMode it never re-scans, and the entry's
-      // `import.meta.glob` was expanded back when it transformed the entry.
-      // only a full build re-expands it, and rolldown tells no client that
-      // happened, so the reload is sent from here.
-      if (await rebuildIfNewRoute(result.changedFiles)) return
+      // adding or deleting a route changes a route map that was expanded when
+      // the entry transformed. only a full build re-expands it, and rolldown
+      // tells no client that happened, so the reload is sent from here.
+      if (await rebuildIfRouteGraphChanged()) return
 
       for (const { clientId, update } of result.updates) {
         if (update.type === 'Patch' && update.code) {
@@ -778,6 +783,35 @@ try {
 
   await engine.run()
 
+  // import.meta.glob records the files it matched, not the directory whose
+  // membership defines the route map. own that directory watch next to the
+  // engine and compare complete route sets on every event. this also covers a
+  // router root created after the dev server starts.
+  let routeWatchTarget = virtualEntry.routes.routeRoot
+  while (!statSync(routeWatchTarget, { throwIfNoEntry: false })?.isDirectory()) {
+    const parent = dirname(routeWatchTarget)
+    if (parent === routeWatchTarget) break
+    routeWatchTarget = parent
+  }
+  const normalizedRouteRoot = normalizePath(virtualEntry.routes.routeRoot)
+  routeWatcher = watch(routeWatchTarget, { recursive: true }, (_eventType, file) => {
+    if (file === null) return
+    const changed = normalizePath(resolve(routeWatchTarget, file.toString()))
+    if (
+      changed !== normalizedRouteRoot &&
+      !changed.startsWith(`${normalizedRouteRoot}/`)
+    ) {
+      return
+    }
+    rebuildIfRouteGraphChanged().catch((error) => {
+      console.error(`[vxrn] rebuilding the native route map failed`, error)
+    })
+  })
+  routeWatcher.on('error', (error) => {
+    console.error(`[vxrn] watching the native route map failed`, error)
+  })
+  await rebuildIfRouteGraphChanged()
+
   return {
     engine,
 
@@ -817,16 +851,9 @@ try {
     },
 
     async close() {
+      routeWatcher?.close()
       await engine.close()
     },
-
-    // vite's watcher sees a created file even when rolldown's addWatchFile
-    // directory watches do not, which is what happens on github's macos
-    // runners. scoped to route files so a random write in the project is not
-    // a full rebuild.
-    async handleAddedFile(file: string) {
-      await rebuildIfNewRoute([file])
-    },
   }
 }
 
@@ -894,7 +921,7 @@ export async function buildNativeBundle(
     shimMissingExports: true,
     moduleTypes: { '.js': 'jsx' },
     plugins: [
-      ...(entryFile ? [] : [nativeVirtualEntryPlugin(root, { dev }).plugin]),
+      ...(entryFile ? [] : [nativeVirtualEntryPlugin(root, { dev, platform }).plugin]),
       ...getNativePlugins(
         root,
         platform,
@@ -942,13 +969,20 @@ interface NativeRouteRegistry {
   routeRoot: string
   files: Set<string>
   isRouteFile: (file: string) => boolean
+  scanFiles: () => Set<string>
+  updateFiles: (files: Set<string>) => void
 }
 
 function nativeVirtualEntryPlugin(
   root: string,
-  opts?: { dev?: boolean }
+  opts: {
+    dev?: boolean
+    platform: 'ios' | 'android'
+    dynamicRoutes?: boolean
+  }
 ): { plugin: Plugin; routes: NativeRouteRegistry } {
   const isDev = opts?.dev !== false
+  const useDynamicRouteRegistry = opts.dynamicRoutes === true
   // absolute for import.meta.glob resolution; forward-slash for module-graph convention
   const resolvedId = normalizePath(resolve(root, '__virtual-native-entry.tsx'))
 
@@ -1001,23 +1035,24 @@ globalThis.$RefreshSig$ = RefreshRuntime.createSignatureFunctionForTransform;
 `
     : ''
 
-  const entryCode = `
+  const entryCode = () => `
 ${refreshSetup}
 import * as ReactNativeInitializeCore from 'react-native/Libraries/Core/InitializeCore';
 import NativeWebSocket from 'react-native/Libraries/WebSocket/WebSocket';
+import DevSettings from 'react-native/Libraries/Utilities/DevSettings';
 ${setupFileImport}
+${routeImports}
 import { createApp } from 'one';
 
 void ReactNativeInitializeCore;
 globalThis.WebSocket = NativeWebSocket;
+globalThis.__VXRN_RELOAD_NATIVE_DEV_BUNDLE__ = function(reason) {
+  DevSettings.reload(reason);
+};
 
-var _routes = import.meta.glob(${JSON.stringify(routeGlobs)}, { exhaustive: true });
-// fix route keys: One expects '/${routerRoot}/...' prefix but import.meta.glob returns './${routerRoot}/...'
-var routes = {};
-Object.keys(_routes).forEach(function(key) {
-  var normalizedKey = key.replace(/^\\.\\//, '');
-  routes['/' + normalizedKey] = _routes[key];
-});
+// React Native reloads a dev bundle in the existing JS runtime. Advance One's
+// route-cache version so a full reload cannot reuse the previous context.
+globalThis.__vxrnVersion = (globalThis.__vxrnVersion || 0) + 1;
 
 createApp({
   routes: routes,
@@ -1025,6 +1060,8 @@ createApp({
   flags: ${JSON.stringify(flags)},
   linking: ${JSON.stringify(linking)},
 });
+
+${routeHmr}
 `
 
   const routeRoot = resolve(root, routerRoot)
@@ -1045,11 +1082,66 @@ createApp({
       !micromatch.isMatch(relativeToRoot, excludeGlobs)
     )
   }
+  const scanFiles = () => {
+    const files = new Set<string>()
+    const walkRouteRoot = (dir: string) => {
+      for (const entry of readdirSync(dir, { withFileTypes: true })) {
+        const child = resolve(dir, entry.name)
+        if (entry.isDirectory()) walkRouteRoot(child)
+        else if (isRouteFile(child)) files.add(normalizePath(child))
+      }
+    }
+    if (statSync(routeRoot, { throwIfNoEntry: false })?.isDirectory()) {
+      walkRouteRoot(routeRoot)
+    }
+    return files
+  }
+  const registrySpecifier = `./node_modules/.vxrn/native-routes-${opts.platform}.mjs`
+  const registryPath = resolve(root, registrySpecifier)
   const routes: NativeRouteRegistry = {
     routeRoot,
     files: new Set(),
     isRouteFile,
+    scanFiles,
+    updateFiles(files) {
+      routes.files = files
+      if (!useDynamicRouteRegistry) return
+
+      const source = `export const routes = {\n${[...files]
+        .sort()
+        .map((file) => {
+          const routeKey = `/${normalizePath(relative(root, file))}`
+          let importPath = normalizePath(relative(dirname(registryPath), file))
+          if (!importPath.startsWith('.')) importPath = `./${importPath}`
+          return `  ${JSON.stringify(routeKey)}: () => import(${JSON.stringify(importPath)})`
+        })
+        .join(',\n')}\n}\n`
+      mkdirSync(dirname(registryPath), { recursive: true })
+      if (!existsSync(registryPath) || readFileSync(registryPath, 'utf8') !== source) {
+        writeFileSync(registryPath, source)
+      }
+    },
   }
+  routes.updateFiles(routes.scanFiles())
+
+  const routeImports = useDynamicRouteRegistry
+    ? `import { routes } from ${JSON.stringify(registrySpecifier)};`
+    : `var _routes = import.meta.glob(${JSON.stringify(routeGlobs)}, { exhaustive: true });
+// fix route keys: One expects '/${routerRoot}/...' prefix but import.meta.glob returns './${routerRoot}/...'
+var routes = {};
+Object.keys(_routes).forEach(function(key) {
+  var normalizedKey = key.replace(/^\\.\\//, '');
+  routes['/' + normalizedKey] = _routes[key];
+});`
+  const routeHmr = useDynamicRouteRegistry
+    ? `if (import.meta.hot) {
+  import.meta.hot.accept(${JSON.stringify(registrySpecifier)}, function(next) {
+    if (globalThis.__VXRN_UPDATE_NATIVE_ROUTES__) {
+      globalThis.__VXRN_UPDATE_NATIVE_ROUTES__(next.routes);
+    }
+  });
+}`
+    : ''
 
   return {
     routes,
@@ -1062,35 +1154,7 @@ createApp({
       },
       load(id) {
         if (id !== resolvedId) return
-        // rolldown expands `import.meta.glob` during transform and records a
-        // dependency on the files it matched, never on the directories it
-        // searched. registering those directories is what makes its own watcher
-        // report a route file appearing, and walking them is what lets the
-        // engine tell that report apart from an edit.
-        //
-        // watching a directory is not recursive, so every directory under the
-        // route root is registered. a new subdirectory is itself a change to
-        // its watched parent, and the full build that follows re-runs this
-        // hook, so the build that picks up `app/foo/index.tsx` is also what
-        // starts watching `app/foo`.
-        routes.files.clear()
-        const walkRouteRoot = (dir: string) => {
-          this.addWatchFile(dir)
-          for (const entry of readdirSync(dir, { withFileTypes: true })) {
-            const child = resolve(dir, entry.name)
-            if (entry.isDirectory()) walkRouteRoot(child)
-            else if (isRouteFile(child)) routes.files.add(normalizePath(child))
-          }
-        }
-        // a project can have no route root at all: `import.meta.glob` then
-        // expands to nothing and the app builds fine. watch the directory that
-        // would hold it, so creating it is the change that starts the walk.
-        if (statSync(routeRoot, { throwIfNoEntry: false })?.isDirectory()) {
-          walkRouteRoot(routeRoot)
-        } else {
-          this.addWatchFile(dirname(routeRoot))
-        }
-        return entryCode
+        return entryCode()
       },
     },
   }
@@ -1226,6 +1290,29 @@ export function hmrClientNoopPlugin(): Plugin {
   }
 }
 
+function reactNativeDedupePlugin(root: string): Plugin {
+  // package managers can install the same react native version at multiple
+  // physical paths. rolldown assigns each path a module identity, so resolving
+  // every entry through the app's instance prevents initializeCore from running twice.
+  let reactNativeRoot: string | undefined
+
+  return {
+    name: 'vxrn:react-native-dedupe',
+    async resolveId(source, importer) {
+      if (source !== 'react-native' && !source.startsWith('react-native/')) return
+
+      reactNativeRoot ||= realpathSync(
+        dirname(resolvePath('react-native/package.json', root))
+      )
+      const subpath =
+        source === 'react-native' ? 'index.js' : source.slice('react-native/'.length)
+      return this.resolve(normalizePath(resolve(reactNativeRoot, subpath)), importer, {
+        skipSelf: true,
+      })
+    },
+  }
+}
+
 /**
  * Stub CSS imports for native builds.
  * Native doesn't support CSS and rolldown removed CSS bundling support.
@@ -1324,20 +1411,33 @@ export function vxrnCompilerPlugin(
             if (prepared.map) intermediateMaps.push(prepared.map)
           }
         }
-        const compilerTarget =
-          (babelOptions!.plugins![compilerPluginIndex] as any[])[1]?.target ?? '19'
-        const compilerOut = await compiler.transformOxcReactCompiler(
-          id,
-          curCode,
-          compilerTarget,
-          sourceMaps
-        )
-        if (compilerOut?.code) {
-          curCode = compilerOut.code
-          if (sourceMaps && compilerOut.map) intermediateMaps.push(compilerOut.map)
+        const compilerPluginConfig = babelOptions!.plugins![compilerPluginIndex] as any[]
+        const compilerPluginOptions = compilerPluginConfig[1] || {}
+        const useBabelCompiler =
+          compilerPluginOptions.compiler === 'babel' ||
+          process.env.ONE_REACT_COMPILER === 'babel' ||
+          process.env.VXRN_REACT_COMPILER === 'babel'
+
+        if (!useBabelCompiler) {
+          const compilerOut = await compiler.transformOxcReactCompiler(
+            id,
+            curCode,
+            compilerPluginOptions,
+            sourceMaps
+          )
+          if (compilerOut?.code) {
+            curCode = compilerOut.code
+            if (sourceMaps && compilerOut.map) intermediateMaps.push(compilerOut.map)
+          }
+          babelOptions!.plugins!.splice(compilerPluginIndex, 1)
+          if (
+            babelOptions!.plugins!.length === 0 &&
+            !babelOptions!.configFile &&
+            !babelOptions!.babelrc
+          ) {
+            babelOptions = null
+          }
         }
-        babelOptions!.plugins!.splice(compilerPluginIndex, 1)
-        if (babelOptions!.plugins!.length === 0) babelOptions = null
       }
 
       if (useWorklets) {
@@ -1353,7 +1453,13 @@ export function vxrnCompilerPlugin(
           babelOptions.plugins = babelOptions.plugins.filter(
             (entry) => !isWorkletPlugin(entry)
           )
-          if (babelOptions.plugins.length === 0) babelOptions = null
+          if (
+            babelOptions.plugins.length === 0 &&
+            !babelOptions.configFile &&
+            !babelOptions.babelrc
+          ) {
+            babelOptions = null
+          }
         }
       }
 
@@ -2069,11 +2175,13 @@ class ReactNativeDevRuntime extends BaseDevRuntime {
     }
   }
 
-  reload() {
-    var proxy = globalThis.__turboModuleProxy
-      ? globalThis.__turboModuleProxy('DevSettings')
-      : globalThis.nativeModuleProxy && globalThis.nativeModuleProxy.DevSettings;
-    if (proxy && proxy.reload) proxy.reload();
+  reload(reason) {
+    var reloadNativeBundle = globalThis.__VXRN_RELOAD_NATIVE_DEV_BUNDLE__;
+    if (typeof reloadNativeBundle === 'function') {
+      reloadNativeBundle(reason);
+      return;
+    }
+    console.error('[vxrn HMR]: DevSettings.reload is unavailable');
   }
 
   setup(socket) {
@@ -2095,10 +2203,10 @@ class ReactNativeDevRuntime extends BaseDevRuntime {
         if (message.type === 'hmr:update') {
           // a patch that cannot be applied in place is the reload signal
           if (!runtime.applyHmrUpdate(message.code, message.changedIds, message.seq)) {
-            runtime.reload();
+            runtime.reload('native HMR update could not be applied');
           }
         } else if (message.type === 'hmr:reload') {
-          runtime.reload();
+          runtime.reload('native route map changed');
         }
       } catch (error) {
         console.error('[vxrn HMR]: failed to apply update', error);

package/types/plugins/reactNativeDevServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reactNativeDevServer.d.ts","sourceRoot":"","sources":["../../src/plugins/reactNativeDevServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,MAAM,EAAiB,MAAM,MAAM,CAAA;AAO1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAwBnE,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA4B9D;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,CAAC,EAAE,OAAO,CACf,IAAI,CAAC,iBAAiB,EAAE,UAAU,GAAG,aAAa,GAAG,kBAAkB,GAAG,SAAS,CAAC,CACrF,GACA,MAAM,CAyZR"}
+{"version":3,"file":"reactNativeDevServer.d.ts","sourceRoot":"","sources":["../../src/plugins/reactNativeDevServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,MAAM,EAAiB,MAAM,MAAM,CAAA;AAO1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAwBnE,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA4B9D;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,CAAC,EAAE,OAAO,CACf,IAAI,CAAC,iBAAiB,EAAE,UAAU,GAAG,aAAa,GAAG,kBAAkB,GAAG,SAAS,CAAC,CACrF,GACA,MAAM,CAiXR"}

package/types/utils/createNativeDevEngine.d.ts

@@ -49,7 +49,6 @@ interface NativeDevEngineResult {
     getBundle: () => Promise<NativeDevBundle>;
     getAsset: (pathname: string, hash?: string) => NativeDevAsset | undefined;
     close: () => Promise<void>;
-    handleAddedFile: (file: string) => Promise<void>;
 }
 export declare function getNativeTransformConfig(platform: 'ios' | 'android', dev: boolean, root: string): {
     jsx: {