vxrn 1.17.11 → 1.18.1

package/dist/utils/createNativeDevEngine.mjs

@@ -78,80 +78,57 @@ function getNativeTransformConfig(platform, dev, root) {
     SSR: false,
     VITE_ENVIRONMENT: platform,
     VITE_NATIVE: "1",
-    EXPO_OS: platform
+    EXPO_OS: platform,
+    TAMAGUI_TARGET: "native",
+    TAMAGUI_ENVIRONMENT: platform
   };
   for (const [key, val] of Object.entries(envDefines)) {
     const match = key.match(/^import\.meta\.env\.(.+)$/);
-    if (match) {
-      try {
-        envObject[match[1]] = JSON.parse(val);
-      } catch {
-        envObject[match[1]] = val;
-      }
+    if (match) try {
+      envObject[match[1]] = JSON.parse(val);
+    } catch {
+      envObject[match[1]] = val;
     }
   }
   return {
     jsx: {
-      // use 'classic' mode (babel plugin-transform-react-jsx)
-      // 'automatic' has files where jsxDEV import fails to resolve
       runtime: "classic"
     },
     define: {
       "process.env.NODE_ENV": JSON.stringify(mode),
       "process.env.VXRN_REACT_19": "false",
       "process.env.VITE_ENVIRONMENT": JSON.stringify(platform),
-      "process.env.VITE_NATIVE": '"1"',
+      "process.env.VITE_NATIVE": "\"1\"",
       "process.env.EXPO_OS": JSON.stringify(platform),
+      "process.env.TAMAGUI_TARGET": "\"native\"",
       "process.env.TAMAGUI_ENVIRONMENT": JSON.stringify(platform),
       __DEV__: dev ? "true" : "false",
-      // import.meta.env as a whole object (for JSON.stringify(import.meta.env) etc.)
       "import.meta.env": JSON.stringify(envObject),
-      // import.meta.env.* individual properties (for direct access)
       "import.meta.env.MODE": JSON.stringify(mode),
       "import.meta.env.DEV": dev ? "true" : "false",
       "import.meta.env.PROD": dev ? "false" : "true",
       "import.meta.env.SSR": "false",
       "import.meta.env.VITE_ENVIRONMENT": JSON.stringify(platform),
-      "import.meta.env.VITE_NATIVE": '"1"',
+      "import.meta.env.VITE_NATIVE": "\"1\"",
       "import.meta.env.EXPO_OS": JSON.stringify(platform),
+      "import.meta.env.TAMAGUI_TARGET": "\"native\"",
+      "import.meta.env.TAMAGUI_ENVIRONMENT": JSON.stringify(platform),
       ...envDefines,
       ...setupFileDefines
     },
-    // auto-inject React import for classic JSX (React.createElement)
     inject: {
       React: "react"
     }
   };
 }
 function getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest) {
-  return [
-  // plugins provided by One (clientTreeShakePlugin for loader removal, etc.)
-  ...(globalThis.__vxrnAddNativePlugins || []),
-  // block .server.* and _middleware.* files from entering the native bundle
-  serverFileExclusionPlugin(),
-  // guard server-only / client-only / web-only / native-only imports
-  environmentGuardPlugin(),
-  // stub CSS imports — native doesn't support CSS and rolldown removed CSS bundling
-  cssStubPlugin(),
-  // handle import.meta.glob (used by One's route system)
-  viteImportGlobPlugin({
+  return [...(globalThis.__vxrnAddNativePlugins || []), serverFileExclusionPlugin(), environmentGuardPlugin(), cssStubPlugin(), viteImportGlobPlugin({
     root
-  }),
-  // strip Flow types from react-native and @react-native packages
-  flowStripPlugin(),
-  // guard undefined native methods in NativeAnimatedHelper
-  nativeAnimatedGuardPlugin(),
-  // handle asset imports (.png, .jpg, .ttf, etc.)
-  assetPlugin({
+  }), flowStripPlugin(), nativeAnimatedGuardPlugin(), assetPlugin({
     root,
     platform,
     assetsDest
-  }),
-  // @vxrn/compiler babel transforms: reanimated worklets, async generators,
-  // react-native codegen, react compiler — same pipeline as metro
-  vxrnCompilerPlugin(platform, dev),
-  // hermes compat: transform class properties and private fields
-  hermesCompatSWCPlugin(dev)];
+  }), vxrnCompilerPlugin(platform, dev), hermesCompatSWCPlugin(dev)];
 }
 function getNativeOutputOptions(prelude) {
   return {
@@ -164,10 +141,10 @@ function getNativeOutputOptions(prelude) {
 }
 function postProcessNativeBundle(code) {
   code = code.replace(/^\s*export\s*\{[^}]*\}\s*;?\s*$/gm, "");
+  code = code.replace(/^\s*export\s+default\s+([^;\n]+);?\s*$/gm, "$1;");
   code = code.replace(/^if \(import\.meta\.hot\).*$/gm, "");
   {
-    const marker = "NativeAnimatedModule_default ?? NativeAnimatedTurboModule_default;";
-    const idx = code.indexOf(marker);
+    const idx = code.indexOf("NativeAnimatedModule_default ?? NativeAnimatedTurboModule_default;");
     if (idx !== -1) {
       const beforeMarker = code.lastIndexOf("NativeAnimatedModule = ", idx);
       if (beforeMarker !== -1) {
@@ -176,7 +153,7 @@ function postProcessNativeBundle(code) {
         if (snippet.includes("(function()") || snippet.includes("new Proxy")) {
           const afterMarker = code.indexOf("})();", idx);
           if (afterMarker !== -1) {
-            const end = afterMarker + "})();".length;
+            const end = afterMarker + 5;
             code = code.slice(0, beforeMarker) + "NativeAnimatedModule = NativeAnimatedModule_default ?? NativeAnimatedTurboModule_default;" + code.slice(end);
           }
         }
@@ -185,6 +162,18 @@ function postProcessNativeBundle(code) {
   }
   return code;
 }
+function wrapNativeBundleModuleScope(code) {
+  const idx = code.indexOf("//#region \\0rolldown/runtime.js");
+  if (idx === -1) return code;
+  const open = ";(function() {\n";
+  const close = "\n})();\n";
+  const sm = code.match(/\n\/\/# sourceMappingURL=[^\n]*\s*$/);
+  if (sm) {
+    const smIdx = code.lastIndexOf(sm[0]);
+    return code.slice(0, idx) + open + code.slice(idx, smIdx) + close + code.slice(smIdx);
+  }
+  return code.slice(0, idx) + open + code.slice(idx) + close;
+}
 async function downlevelClassFieldsInBundle(code) {
   const startMarker = "//#region \\0rolldown/runtime.js";
   const endMarker = "//#endregion";
@@ -192,11 +181,10 @@ async function downlevelClassFieldsInBundle(code) {
   if (startIdx === -1) return code;
   const endIdx = code.indexOf(endMarker, startIdx);
   if (endIdx === -1) return code;
-  const runtimeEnd = endIdx + endMarker.length;
+  const runtimeEnd = endIdx + 12;
   const runtimeSection = code.slice(startIdx, runtimeEnd);
   try {
-    const swc = await import("@swc/core");
-    const result = await swc.transform(runtimeSection, {
+    const result = await (await import("@swc/core")).transform(runtimeSection, {
       filename: "rolldown-runtime.js",
       configFile: false,
       swcrc: false,
@@ -255,7 +243,7 @@ async function createNativeDevEngine(options) {
   let bundleResolve = null;
   let bundlePromise = null;
   const resolvedHost = host === "0.0.0.0" ? "localhost" : host;
-  const inputOptions = {
+  const engine = await dev({
     input: VIRTUAL_NATIVE_ENTRY,
     cwd: root,
     platform: "neutral",
@@ -268,16 +256,9 @@ async function createNativeDevEngine(options) {
         port
       },
       incrementalBuild: true,
-      // lazyBarrel defers barrel re-export initialization — needed in dev mode
-      // to avoid breaking worklet closure serialization order.
-      // removed from prod builds (buildNativeBundle) where it caused build errors.
       lazyBarrel: true
     },
     treeshake: false,
-    // some react-native ecosystem packages import symbols that don't exist in
-    // the declared entry (e.g. @react-navigation/elements imports NavigationProvider
-    // from @react-navigation/native which doesn't export it). metro silently shims
-    // these — rolldown needs an explicit opt-in.
     shimMissingExports: true,
     moduleTypes: {
       ".js": "jsx"
@@ -285,10 +266,8 @@ async function createNativeDevEngine(options) {
     plugins: [nativeVirtualEntryPlugin(root, {
       dev: true
     }), ...getNativePlugins(root, platform, viteImportGlobPlugin, true), ...userPlugins]
-  };
-  const outputOptions = {
+  }, {
     ...getNativeOutputOptions(prelude),
-    // connect HMR WebSocket using RN's WebSocket module (not the global)
     outro: `
 try {
   var __WS = (init_WebSocket(), __toCommonJS(WebSocket_exports)).default;
@@ -318,20 +297,19 @@ try {
   __hmrWS.onerror = function(e) { console.warn('[vxrn] HMR connection error:', e.message || e); };
 } catch(e) {}
 `
-  };
-  const engine = await dev(inputOptions, outputOptions, {
+  }, {
     onOutput: async result => {
       if (result instanceof Error) {
         console.error("[vxrn] native bundle error:", result.message);
         return;
       }
-      const output = result;
-      const chunk = output.output.find(o => o.type === "chunk" && o.isEntry);
+      const chunk = result.output.find(o => o.type === "chunk" && o.isEntry);
       if (chunk && "code" in chunk) {
         let code = postProcessNativeBundle(chunk.code);
         code = await downlevelClassFieldsInBundle(code);
         const hmrClientStub = `registerCallableModule("HMRClient",{setup:function(){},enable:function(){},disable:function(){},registerBundle:function(){},log:function(){}})`;
         code = code.replace(/registerCallableModule\s*\(\s*["']AppRegistry["']/, match => hmrClientStub + "," + match);
+        code = wrapNativeBundleModuleScope(code);
         currentBundle = {
           code,
           map: chunk.map?.toString()
@@ -355,22 +333,16 @@ try {
       const updates = result.updates || [];
       for (const item of updates) {
         const update = item.update || item;
-        if (update.type === "Patch" && update.code) {
-          onHmrUpdate?.({
-            type: "hmr:update",
-            code: update.code
-          });
-        } else if (update.type === "FullReload") {
-          onHmrUpdate?.({
-            type: "hmr:reload"
-          });
-        }
-      }
-      if (updates.length === 0) {
-        onHmrUpdate?.({
+        if (update.type === "Patch" && update.code) onHmrUpdate?.({
+          type: "hmr:update",
+          code: update.code
+        });else if (update.type === "FullReload") onHmrUpdate?.({
           type: "hmr:reload"
         });
       }
+      if (updates.length === 0) onHmrUpdate?.({
+        type: "hmr:reload"
+      });
     },
     rebuildStrategy: "auto",
     watch: {}
@@ -387,7 +359,7 @@ try {
             clearTimeout(timeoutId);
             resolve2(value);
           };
-          timeoutId = setTimeout(() => reject(new Error("[vxrn] bundle build timed out after 120s")), 12e4);
+          timeoutId = setTimeout(() => reject(/* @__PURE__ */new Error("[vxrn] bundle build timed out after 120s")), 12e4);
         });
       }
       await engine.ensureLatestBuildOutput();
@@ -405,6 +377,7 @@ async function buildNativeBundle(options) {
     platform,
     dev = false,
     serverUrl,
+    entryFile,
     assetsDest,
     plugins: userPlugins = []
   } = options;
@@ -419,8 +392,8 @@ async function buildNativeBundle(options) {
     platform,
     serverUrl
   });
-  const result = await build({
-    input: VIRTUAL_NATIVE_ENTRY,
+  const chunk = (await build({
+    input: entryFile ? normalizePath(resolve(root, entryFile)) : VIRTUAL_NATIVE_ENTRY,
     cwd: root,
     platform: "neutral",
     resolve: getNativeResolveConfig(platform),
@@ -430,15 +403,12 @@ async function buildNativeBundle(options) {
     moduleTypes: {
       ".js": "jsx"
     },
-    plugins: [nativeVirtualEntryPlugin(root, {
+    plugins: [...(entryFile ? [] : [nativeVirtualEntryPlugin(root, {
       dev
-    }), ...getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest), ...userPlugins],
+    })]), ...getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest), ...userPlugins],
     output: getNativeOutputOptions(prelude)
-  });
-  const chunk = result.output.find(o => o.type === "chunk" && o.isEntry);
-  if (!chunk || !("code" in chunk)) {
-    throw new Error("[vxrn] production build produced no output");
-  }
+  })).output.find(o => o.type === "chunk" && o.isEntry);
+  if (!chunk || !("code" in chunk)) throw new Error("[vxrn] production build produced no output");
   let code = postProcessNativeBundle(chunk.code);
   code = await downlevelClassFieldsInBundle(code);
   return {
@@ -462,10 +432,9 @@ function nativeVirtualEntryPlugin(root, opts) {
     const resolved = pathToFileURL(resolve(root, file)).href;
     return `import ${JSON.stringify(resolved)};`;
   })();
-  const routeGlobs = [`./${routerRoot}/**/*.tsx`, `./${routerRoot}/**/*.ts`, `!./${routerRoot}/**/*+api.*`, `!./${routerRoot}/**/*.test.*`, `!./${routerRoot}/**/*.d.ts`, `!./${routerRoot}/**/*.server.*`, `!./${routerRoot}/**/_middleware.*`, `!./${routerRoot}/**/*.web.*`,
-  // ignoredRouteFiles from One's router config
-  ...(entryConfig.ignoredRouteFiles || []).map(pattern => `!./${routerRoot}/${pattern}`)];
-  const refreshSetup = isDev ? `
+  const routeGlobs = [`./${routerRoot}/**/*.tsx`, `./${routerRoot}/**/*.ts`, `!./${routerRoot}/**/*+api.*`, `!./${routerRoot}/**/*.test.*`, `!./${routerRoot}/**/*.d.ts`, `!./${routerRoot}/**/*.server.*`, `!./${routerRoot}/**/_middleware.*`, `!./${routerRoot}/**/*.web.*`, ...(entryConfig.ignoredRouteFiles || []).map(pattern => `!./${routerRoot}/${pattern}`)];
+  const entryCode = `
+${isDev ? `
 // react-refresh/runtime MUST initialize before React loads
 import RefreshRuntime from 'react-refresh/runtime';
 RefreshRuntime.injectIntoGlobalHook(globalThis);
@@ -474,12 +443,15 @@ globalThis.$RefreshReg$ = function(type, id) {
   RefreshRuntime.register(type, id);
 };
 globalThis.$RefreshSig$ = RefreshRuntime.createSignatureFunctionForTransform;
-` : "";
-  const entryCode = `
-${refreshSetup}
+` : ""}
+import * as ReactNativeInitializeCore from 'react-native/Libraries/Core/InitializeCore';
+import NativeWebSocket from 'react-native/Libraries/WebSocket/WebSocket';
 ${setupFileImport}
 import { createApp } from 'one';
 
+void ReactNativeInitializeCore;
+globalThis.WebSocket = NativeWebSocket;
+
 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 = {};
@@ -498,14 +470,10 @@ createApp({
   return {
     name: "vxrn:native-virtual-entry",
     resolveId(id) {
-      if (id === VIRTUAL_NATIVE_ENTRY) {
-        return resolvedId;
-      }
+      if (id === VIRTUAL_NATIVE_ENTRY) return resolvedId;
     },
     load(id) {
-      if (id === resolvedId) {
-        return entryCode;
-      }
+      if (id === resolvedId) return entryCode;
     }
   };
 }
@@ -527,18 +495,14 @@ function serverFileExclusionPlugin() {
   return {
     name: "vxrn:server-file-exclusion",
     load(id) {
-      if (/\.server\.\w+$/.test(id)) {
-        return {
-          code: "export default undefined;",
-          moduleType: "js"
-        };
-      }
-      if (/[\\/]_middleware\.\w+$/.test(id)) {
-        return {
-          code: "export default undefined;",
-          moduleType: "js"
-        };
-      }
+      if (/\.server\.\w+$/.test(id)) return {
+        code: "export default undefined;",
+        moduleType: "js"
+      };
+      if (/[\\/]_middleware\.\w+$/.test(id)) return {
+        code: "export default undefined;",
+        moduleType: "js"
+      };
     }
   };
 }
@@ -558,13 +522,10 @@ function environmentGuardPlugin() {
       };
     },
     load(id) {
-      if (id.startsWith("\0env-guard-throw:")) {
-        const pkg = id.slice("\0env-guard-throw:".length);
-        return {
-          code: `throw new Error("Cannot import '${pkg}' in a native bundle.");`,
-          moduleType: "js"
-        };
-      }
+      if (id.startsWith("\0env-guard-throw:")) return {
+        code: `throw new Error("Cannot import '${id.slice(17)}' in a native bundle.");`,
+        moduleType: "js"
+      };
       if (id.startsWith("\0env-guard-noop:")) return {
         code: "",
         moduleType: "js"
@@ -577,12 +538,10 @@ function cssStubPlugin() {
     name: "vxrn:css-stub",
     load: {
       handler(id) {
-        if (id.endsWith(".css")) {
-          return {
-            code: "",
-            moduleType: "js"
-          };
-        }
+        if (id.endsWith(".css")) return {
+          code: "",
+          moduleType: "js"
+        };
       }
     }
   };
@@ -617,14 +576,12 @@ function vxrnCompilerPlugin(platform, dev) {
         const result = await compiler.transformBabel(id, code, babelOptions);
         if (result?.code) {
           let out = result.code;
-          if (needsRefresh) {
-            const escapedId = id.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-            out = `
+          if (needsRefresh) out = `
 var __prevRefreshReg = globalThis.$RefreshReg$;
 var __prevRefreshSig = globalThis.$RefreshSig$;
 if (globalThis.__ReactRefresh) {
   globalThis.$RefreshReg$ = function(type, id) {
-    globalThis.__ReactRefresh.register(type, "${escapedId}" + " " + id);
+    globalThis.__ReactRefresh.register(type, "${id.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}" + " " + id);
   };
   globalThis.$RefreshSig$ = globalThis.__ReactRefresh.createSignatureFunctionForTransform;
 }
@@ -641,22 +598,17 @@ if (import.meta.hot) {
   });
 }
 `;
-          }
           return {
             code: out
           };
         }
       } catch (err) {
-        if (dev) {
-          console.warn(`[vxrn:compiler] ${id}: ${err.message || err}`);
-        }
-        if (needsRefresh) {
-          return {
-            code: code + `
+        if (dev) console.warn(`[vxrn:compiler] ${id}: ${err.message || err}`);
+        if (needsRefresh) return {
+          code: code + `
 if (import.meta.hot) { import.meta.hot.accept(); }
 `
-          };
-        }
+        };
       }
     }
   };
@@ -668,8 +620,7 @@ function flowStripPlugin() {
       async handler(code, id) {
         if (!FLOW_FILE_PATTERN.test(id)) return;
         try {
-          const fft = await import("fast-flow-transform");
-          const result = await fft.default({
+          const result = await (await import("fast-flow-transform")).default({
             filename: id,
             source: code,
             sourcemap: true,
@@ -698,28 +649,25 @@ function assetPlugin(opts) {
         const name = basename(id, `.${ext}`);
         const dir = dirname(id);
         const relativePath = relative(opts.root, id);
-        const httpLocation = "/assets/" + dirname(relativePath).replace(/\\/g, "/");
         const assetData = {
           __packager_asset: true,
           name,
           type: ext,
           scales: [1],
-          httpServerLocation: httpLocation,
+          httpServerLocation: "/assets/" + dirname(relativePath).replace(/\\/g, "/"),
           fileSystemLocation: dir,
           hash: "",
           width: void 0,
           height: void 0
         };
-        if (["png", "jpg", "jpeg", "gif", "webp", "bmp"].includes(ext)) {
-          try {
-            const {
-              imageSize
-            } = await import("image-size");
-            const dims = imageSize(id);
-            assetData.width = dims.width;
-            assetData.height = dims.height;
-          } catch {}
-        }
+        if (["png", "jpg", "jpeg", "gif", "webp", "bmp"].includes(ext)) try {
+          const {
+            imageSize
+          } = await import("image-size");
+          const dims = imageSize(id);
+          assetData.width = dims.width;
+          assetData.height = dims.height;
+        } catch {}
         if (opts.assetsDest) {
           const relativeAssetDir = dirname(relativePath).replace(/\\/g, "/");
           const assetDestDir = join(opts.assetsDest, "assets", relativeAssetDir);
@@ -728,9 +676,8 @@ function assetPlugin(opts) {
           });
           copyFileSync(id, join(assetDestDir, `${name}.${ext}`));
         }
-        const code = `module.exports = require('react-native/Libraries/Image/AssetRegistry').registerAsset(${JSON.stringify(assetData)});`;
         return {
-          code,
+          code: `module.exports = require('react-native/Libraries/Image/AssetRegistry').registerAsset(${JSON.stringify(assetData)});`,
           moduleType: "js"
         };
       }
@@ -751,38 +698,37 @@ function hermesCompatSWCPlugin(dev) {
       try {
         if (!swc) swc = await import("@swc/core");
         const envIncludes = ["transform-class-properties", "transform-class-static-block", "transform-private-methods", "transform-private-property-in-object", ...(!dev ? ["transform-classes", "transform-async-to-generator"] : [])];
-        const result = await swc.transform(code, {
-          filename: id,
-          configFile: false,
-          swcrc: false,
-          sourceMaps: false,
-          inputSourceMap: false,
-          env: {
-            targets: {
-              node: 9999
-            },
-            include: envIncludes
-          },
-          jsc: {
-            parser: {
-              syntax: "typescript",
-              tsx: true
+        return {
+          code: (await swc.transform(code, {
+            filename: id,
+            configFile: false,
+            swcrc: false,
+            sourceMaps: false,
+            inputSourceMap: false,
+            env: {
+              targets: {
+                node: 9999
+              },
+              include: envIncludes
             },
-            transform: {
-              react: {
-                runtime: "preserve"
+            jsc: {
+              parser: {
+                syntax: "typescript",
+                tsx: true
+              },
+              transform: {
+                react: {
+                  runtime: "preserve"
+                }
+              },
+              externalHelpers: false,
+              assumptions: {
+                setPublicClassFields: true,
+                privateFieldsAsProperties: true
               }
             },
-            externalHelpers: false,
-            assumptions: {
-              setPublicClassFields: true,
-              privateFieldsAsProperties: true
-            }
-          },
-          isModule: !id.endsWith(".cjs")
-        });
-        return {
-          code: result.code
+            isModule: !id.endsWith(".cjs")
+          })).code
         };
       } catch (err) {}
     }
@@ -890,5 +836,5 @@ class ReactNativeDevRuntime extends BaseDevRuntime {
 globalThis.__rolldown_runtime__ = new ReactNativeDevRuntime();
 `;
 }
-export { buildNativeBundle, createNativeDevEngine };
+export { buildNativeBundle, createNativeDevEngine, getNativeTransformConfig, wrapNativeBundleModuleScope };
 //# sourceMappingURL=createNativeDevEngine.mjs.map