vxrn 1.26.1 → 1.27.0

package/dist/utils/createNativeDevEngine.native.js

@@ -1,10 +1,11 @@
 import { createHash } from "crypto";
 import { basename, dirname, extname, join, relative, resolve } from "path";
-import { copyFileSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync } from "fs";
+import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync, watch, writeFileSync } from "fs";
 import { pathToFileURL } from "url";
 import micromatch from "micromatch";
 import { loadEnv, normalizePath } from "vite";
 import { shouldStripFlow, transformHermesAsync } from "@vxrn/compiler";
+import { resolvePath } from "@vxrn/resolve";
 import { DEFAULT_ASSET_EXTS } from "../constants/defaults.native.js";
 import { getNativePrelude } from "../runtime/native-prelude.native.js";
 import { rnCodegenPlugin } from "../plugins/rnCodegenPlugin.native.js";
@@ -153,7 +154,7 @@ function getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest,
     platform,
     dev
   };
-  return [...(globalThis.__vxrnAddNativePlugins || []), serverFileExclusionPlugin(), environmentGuardPlugin(), hmrClientNoopPlugin(), cssStubPlugin(), viteImportGlobPlugin({
+  return [...(globalThis.__vxrnAddNativePlugins || []), serverFileExclusionPlugin(), environmentGuardPlugin(), hmrClientNoopPlugin(), ...(dev ? [reactNativeDedupePlugin(root)] : []), cssStubPlugin(), viteImportGlobPlugin({
     root
   }), vxrnCompilerPlugin(platform, dev, root, sourceMaps), rnCodegenPlugin({
     projectRoot: root
@@ -273,6 +274,7 @@ function nativeBundlePostProcessPlugin() {
   };
 }
 async function createNativeDevEngine(options) {
+  var _statSync;
   var {
     root,
     port,
@@ -300,7 +302,9 @@ async function createNativeDevEngine(options) {
   var bundlePromise = null;
   var resolvedHost = host === "0.0.0.0" ? "localhost" : host;
   var virtualEntry = nativeVirtualEntryPlugin(root, {
-    dev: true
+    dev: true,
+    platform,
+    dynamicRoutes: true
   });
   var engineWork = Promise.resolve();
   var queueEngineWork = function (work) {
@@ -346,30 +350,21 @@ try {
   };
   var outputProcessed = Promise.resolve();
   var engine;
-  var rebuildIfNewRoute = async function (files) {
-    var {
-      routeRoot,
-      files: knownRoutes,
-      isRouteFile
-    } = virtualEntry.routes;
-    var routeRootPrefix = `${normalizePath(routeRoot)}/`;
-    if (!files.some(function (file) {
-      var _statSync;
-      var normalized = normalizePath(file);
-      if (isRouteFile(normalized)) return !knownRoutes.has(normalized);
-      return normalized.startsWith(routeRootPrefix) && ((_statSync = statSync(file, {
-        throwIfNoEntry: false
-      })) === null || _statSync === void 0 ? void 0 : _statSync.isDirectory()) === true;
-    })) return false;
-    await queueEngineWork(async function () {
-      engine.triggerFullBuild();
-      await engine.ensureLatestBuildOutput();
-      await outputProcessed;
-    });
-    onHmrUpdate === null || onHmrUpdate === void 0 || onHmrUpdate({
-      type: "hmr:reload"
+  var routeWatcher;
+  var rebuildIfRouteGraphChanged = function () {
+    return queueEngineWork(async function () {
+      var {
+        files: knownRoutes,
+        scanFiles,
+        updateFiles
+      } = virtualEntry.routes;
+      var currentRoutes = scanFiles();
+      if (!(currentRoutes.size !== knownRoutes.size || [...currentRoutes].some(function (route) {
+        return !knownRoutes.has(route);
+      }))) return false;
+      updateFiles(currentRoutes);
+      return true;
     });
-    return true;
   };
   engine = await dev(inputOptions, outputOptions, {
     onOutput: async function (result) {
@@ -391,7 +386,7 @@ try {
         });
         return;
       }
-      if (await rebuildIfNewRoute(result.changedFiles)) return;
+      if (await rebuildIfRouteGraphChanged()) return;
       var _iteratorNormalCompletion = true,
         _didIteratorError = false,
         _iteratorError = void 0;
@@ -466,6 +461,29 @@ try {
     }
   }
   await engine.run();
+  var routeWatchTarget = virtualEntry.routes.routeRoot;
+  while (!((_statSync = statSync(routeWatchTarget, {
+    throwIfNoEntry: false
+  })) === null || _statSync === void 0 ? void 0 : _statSync.isDirectory())) {
+    var parent = dirname(routeWatchTarget);
+    if (parent === routeWatchTarget) break;
+    routeWatchTarget = parent;
+  }
+  var normalizedRouteRoot = normalizePath(virtualEntry.routes.routeRoot);
+  routeWatcher = watch(routeWatchTarget, {
+    recursive: true
+  }, function (_eventType, file) {
+    if (file === null) return;
+    var changed = normalizePath(resolve(routeWatchTarget, file.toString()));
+    if (changed !== normalizedRouteRoot && !changed.startsWith(`${normalizedRouteRoot}/`)) return;
+    rebuildIfRouteGraphChanged().catch(function (error) {
+      console.error(`[vxrn] rebuilding the native route map failed`, error);
+    });
+  });
+  routeWatcher.on("error", function (error) {
+    console.error(`[vxrn] watching the native route map failed`, error);
+  });
+  await rebuildIfRouteGraphChanged();
   return {
     engine,
     async getBundle() {
@@ -500,10 +518,8 @@ try {
       return assetRegistry.resolve(pathname, hash);
     },
     async close() {
+      routeWatcher === null || routeWatcher === void 0 || routeWatcher.close();
       await engine.close();
-    },
-    async handleAddedFile(file) {
-      await rebuildIfNewRoute([file]);
     }
   };
 }
@@ -546,7 +562,8 @@ async function buildNativeBundle(options) {
       ".js": "jsx"
     },
     plugins: [...(entryFile ? [] : [nativeVirtualEntryPlugin(root, {
-      dev
+      dev,
+      platform
     }).plugin]), ...getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest, void 0, sourcemap, userPlugins), nativeBundlePostProcessPlugin()],
     output: getNativeOutputOptions(prelude, sourcemap, minify)
   })).output.find(function (o) {
@@ -562,6 +579,7 @@ async function buildNativeBundle(options) {
 var VIRTUAL_NATIVE_ENTRY = "virtual:native-entry";
 function nativeVirtualEntryPlugin(root, opts) {
   var isDev = (opts === null || opts === void 0 ? void 0 : opts.dev) !== false;
+  var useDynamicRouteRegistry = opts.dynamicRoutes === true;
   var resolvedId = normalizePath(resolve(root, "__virtual-native-entry.tsx"));
   var entryConfig = globalThis.__vxrnNativeEntryConfig || {};
   var routerRoot = entryConfig.routerRoot || "app";
@@ -578,8 +596,7 @@ function nativeVirtualEntryPlugin(root, opts) {
   var routeGlobs = [`./${routerRoot}/**/*.tsx`, `./${routerRoot}/**/*.ts`, `!./${routerRoot}/**/*+api.*`, `!./${routerRoot}/**/*.test.*`, `!./${routerRoot}/**/*.d.ts`, `!./${routerRoot}/**/*.server.*`, `!./${routerRoot}/**/_middleware.*`, `!./${routerRoot}/**/*.web.*`, ...(entryConfig.ignoredRouteFiles || []).map(function (pattern) {
     return `!./${routerRoot}/${pattern}`;
   })];
-  var entryCode = `
-${isDev ? `
+  var refreshSetup = isDev ? `
 // react-refresh/runtime MUST initialize before React loads
 import RefreshRuntime from 'react-refresh/runtime';
 RefreshRuntime.injectIntoGlobalHook(globalThis);
@@ -588,22 +605,26 @@ globalThis.$RefreshReg$ = function(type, id) {
   RefreshRuntime.register(type, id);
 };
 globalThis.$RefreshSig$ = RefreshRuntime.createSignatureFunctionForTransform;
-` : ""}
+` : "";
+  var entryCode = function () {
+    return `
+${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,
@@ -611,7 +632,10 @@ createApp({
   flags: ${JSON.stringify(flags)},
   linking: ${JSON.stringify(linking)},
 });
+
+${routeHmr}
 `;
+  };
   var routeRoot = resolve(root, routerRoot);
   var stripDot = function (pattern) {
     return pattern.replace(/^\.\//, "");
@@ -628,11 +652,77 @@ createApp({
     var relativeToRoot = normalizePath(relative(root, file));
     return micromatch.isMatch(relativeToRoot, includeGlobs) && !micromatch.isMatch(relativeToRoot, excludeGlobs);
   };
+  var scanFiles = function () {
+    var _statSync;
+    var files = /* @__PURE__ */new Set();
+    var walkRouteRoot = function (dir) {
+      var _iteratorNormalCompletion = true,
+        _didIteratorError = false,
+        _iteratorError = void 0;
+      try {
+        for (var _iterator = readdirSync(dir, {
+            withFileTypes: true
+          })[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var entry = _step.value;
+          var child = resolve(dir, entry.name);
+          if (entry.isDirectory()) walkRouteRoot(child);else if (isRouteFile(child)) files.add(normalizePath(child));
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
+        } finally {
+          if (_didIteratorError) throw _iteratorError;
+        }
+      }
+    };
+    if ((_statSync = statSync(routeRoot, {
+      throwIfNoEntry: false
+    })) === null || _statSync === void 0 ? void 0 : _statSync.isDirectory()) walkRouteRoot(routeRoot);
+    return files;
+  };
+  var registrySpecifier = `./node_modules/.vxrn/native-routes-${opts.platform}.mjs`;
+  var registryPath = resolve(root, registrySpecifier);
   var routes = {
     routeRoot,
     files: /* @__PURE__ */new Set(),
-    isRouteFile
+    isRouteFile,
+    scanFiles,
+    updateFiles(files) {
+      routes.files = files;
+      if (!useDynamicRouteRegistry) return;
+      var source = `export const routes = {
+${[...files].sort().map(function (file) {
+        var routeKey = `/${normalizePath(relative(root, file))}`;
+        var importPath = normalizePath(relative(dirname(registryPath), file));
+        if (!importPath.startsWith(".")) importPath = `./${importPath}`;
+        return `  ${JSON.stringify(routeKey)}: () => import(${JSON.stringify(importPath)})`;
+      }).join(",\n")}
+}
+`;
+      mkdirSync(dirname(registryPath), {
+        recursive: true
+      });
+      if (!existsSync(registryPath) || readFileSync(registryPath, "utf8") !== source) writeFileSync(registryPath, source);
+    }
   };
+  routes.updateFiles(routes.scanFiles());
+  var 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];
+});`;
+  var 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,
     plugin: {
@@ -641,38 +731,8 @@ createApp({
         if (id === VIRTUAL_NATIVE_ENTRY) return resolvedId;
       },
       load(id) {
-        var _this = this;
-        var _statSync;
         if (id !== resolvedId) return;
-        routes.files.clear();
-        var walkRouteRoot = function (dir) {
-          _this.addWatchFile(dir);
-          var _iteratorNormalCompletion = true,
-            _didIteratorError = false,
-            _iteratorError = void 0;
-          try {
-            for (var _iterator = readdirSync(dir, {
-                withFileTypes: true
-              })[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-              var entry = _step.value;
-              var child = resolve(dir, entry.name);
-              if (entry.isDirectory()) walkRouteRoot(child);else if (isRouteFile(child)) routes.files.add(normalizePath(child));
-            }
-          } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-          } finally {
-            try {
-              if (!_iteratorNormalCompletion && _iterator.return != null) _iterator.return();
-            } finally {
-              if (_didIteratorError) throw _iteratorError;
-            }
-          }
-        };
-        if ((_statSync = statSync(routeRoot, {
-          throwIfNoEntry: false
-        })) === null || _statSync === void 0 ? void 0 : _statSync.isDirectory()) walkRouteRoot(routeRoot);else this.addWatchFile(dirname(routeRoot));
-        return entryCode;
+        return entryCode();
       }
     }
   };
@@ -760,6 +820,20 @@ export default HMRClient`,
     }
   };
 }
+function reactNativeDedupePlugin(root) {
+  var reactNativeRoot;
+  return {
+    name: "vxrn:react-native-dedupe",
+    async resolveId(source, importer) {
+      if (source !== "react-native" && !source.startsWith("react-native/")) return;
+      reactNativeRoot || (reactNativeRoot = realpathSync(dirname(resolvePath("react-native/package.json", root))));
+      var subpath = source === "react-native" ? "index.js" : source.slice(13);
+      return this.resolve(normalizePath(resolve(reactNativeRoot, subpath)), importer, {
+        skipSelf: true
+      });
+    }
+  };
+}
 function cssStubPlugin() {
   return {
     name: "vxrn:css-stub",
@@ -815,8 +889,6 @@ function vxrnCompilerPlugin(platform, dev) {
         return Array.isArray(x) && x[0] === "babel-plugin-react-compiler";
       })) !== null && _ref !== void 0 ? _ref : -1;
       if (compilerPluginIndex !== -1) {
-        var _ref1;
-        var _babelOptions_plugins_compilerPluginIndex_;
         if (useWorklets) {
           var prepared = compiler.prepareWorkletsForReactCompiler(id, curCode, sourceMaps);
           if (prepared) {
@@ -824,14 +896,16 @@ function vxrnCompilerPlugin(platform, dev) {
             if (prepared.map) intermediateMaps.push(prepared.map);
           }
         }
-        var compilerTarget = (_ref1 = (_babelOptions_plugins_compilerPluginIndex_ = babelOptions.plugins[compilerPluginIndex][1]) === null || _babelOptions_plugins_compilerPluginIndex_ === void 0 ? void 0 : _babelOptions_plugins_compilerPluginIndex_.target) !== null && _ref1 !== void 0 ? _ref1 : "19";
-        var compilerOut = await compiler.transformOxcReactCompiler(id, curCode, compilerTarget, sourceMaps);
-        if (compilerOut === null || compilerOut === void 0 ? void 0 : compilerOut.code) {
-          curCode = compilerOut.code;
-          if (sourceMaps && compilerOut.map) intermediateMaps.push(compilerOut.map);
+        var compilerPluginOptions = babelOptions.plugins[compilerPluginIndex][1] || {};
+        if (!(compilerPluginOptions.compiler === "babel" || process.env.ONE_REACT_COMPILER === "babel" || process.env.VXRN_REACT_COMPILER === "babel")) {
+          var compilerOut = await compiler.transformOxcReactCompiler(id, curCode, compilerPluginOptions, sourceMaps);
+          if (compilerOut === null || compilerOut === void 0 ? void 0 : 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) {
         var workletOut = await compiler.transformWorklets(id, curCode, sourceMaps, {
@@ -846,7 +920,7 @@ function vxrnCompilerPlugin(platform, dev) {
           babelOptions.plugins = babelOptions.plugins.filter(function (entry) {
             return !isWorkletPlugin(entry);
           });
-          if (babelOptions.plugins.length === 0) babelOptions = null;
+          if (babelOptions.plugins.length === 0 && !babelOptions.configFile && !babelOptions.babelrc) babelOptions = null;
         }
       }
       if (!babelOptions && !needsRefresh) {
@@ -1466,11 +1540,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) {
@@ -1492,10 +1568,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);