vxrn 1.24.3 → 1.24.4

package/src/rn-commands/bundle/buildBundle.ts

@@ -66,6 +66,7 @@ export async function buildBundle(
     // 'http://one-server.example.com' and runtime loader fetches fail in prod.
     serverUrl: process.env.ONE_SERVER_URL,
     assetsDest,
+    sourcemap: !!args.sourcemapOutput,
   })
   const builtBundle = result.code
 

package/src/utils/bindKeypressInput.ts

@@ -34,37 +34,31 @@ export function bindKeypressInput() {
     process.exit(0)
   })
 
+  // ONLY ctrl chords are bound, deliberately. a plain `c` used to clear the
+  // screen, and that fired on bytes the user never typed: terminal capability
+  // replies (`ESC[?1;2c`, `ESC[>0;95;0c`) end in the letter `c`, and
+  // emitKeypressEvents turns that trailing byte into a plain `c` keypress. so
+  // did pasting any text containing a `c`, since raw mode delivers a paste as
+  // ordinary keystrokes. the result was a dev server that wiped the terminal
+  // at apparently random moments, with no way to switch it off — vite's
+  // `clearScreen: false` does not cover it, because this never goes through
+  // vite's logger. vite gates its own single-key shortcuts behind an explicit
+  // `bindCLIShortcuts()` opt-in for exactly this reason.
+  //
+  // stdin here is very often not a human at a prompt: it is one pane of a
+  // process runner, a tmux split, or an editor terminal, so anything that
+  // reads a bare letter as a command will misfire.
   process.stdin.on('keypress', (_key, data) => {
     const { ctrl, name } = data
-    if (ctrl === true) {
-      switch (name) {
-        // biome-ignore lint/suspicious/noFallthroughSwitchClause: <explanation>
-        case 'c':
-          restoreTerminal()
-          process.exit()
-        case 'z':
-          process.emit('SIGTSTP', 'SIGTSTP')
-          break
-      }
-    } else {
-      switch (name) {
-        case 'r':
-          // ctx.broadcastToMessageClients({ method: 'reload' })
-          // ctx.log.info({
-          //   msg: 'Reloading app',
-          // })
-          break
-        case 'd':
-          // ctx.broadcastToMessageClients({ method: 'devMenu' })
-          // ctx.log.info({
-          //   msg: 'Opening developer menu',
-          // })
-          break
-        case 'c':
-          process.stdout.write('\u001b[2J\u001b[0;0H')
-          // TODO: after logging we should print information about port and host
-          break
-      }
+    if (ctrl !== true) return
+    switch (name) {
+      // biome-ignore lint/suspicious/noFallthroughSwitchClause: <explanation>
+      case 'c':
+        restoreTerminal()
+        process.exit()
+      case 'z':
+        process.emit('SIGTSTP', 'SIGTSTP')
+        break
     }
   })
 }

package/src/utils/createNativeDevEngine.test.ts

@@ -47,9 +47,8 @@ describe('wrapNativeBundleModuleScope', () => {
     // a top-level `var Headers` in a script becomes a non-configurable global,
     // which is the exact leak that breaks RN's polyfillGlobal in dev
     const body = `${RUNTIME_MARKER}\nvar fetch_hot, fetch$1, Headers, Request, Response$1;\nglobalThis.__rolldown_runtime__ = {};\n`
-    const sourcemap = '\n//# sourceMappingURL=x.js.map'
 
-    const out = wrapNativeBundleModuleScope(prelude + body + sourcemap)
+    const out = wrapNativeBundleModuleScope(prelude + body)
 
     const openIdx = out.indexOf(';(function() {')
     expect(openIdx).toBeGreaterThan(-1)
@@ -57,9 +56,6 @@ describe('wrapNativeBundleModuleScope', () => {
     expect(out.indexOf('globalThis.__DEV__')).toBeLessThan(openIdx)
     // the leaking declaration is now inside the function scope
     expect(out.indexOf('var fetch_hot')).toBeGreaterThan(openIdx)
-    // the wrap closes before the sourceMappingURL, which must remain the last line
-    expect(out.indexOf('})();')).toBeLessThan(out.indexOf('//# sourceMappingURL'))
-    expect(out.trimEnd().endsWith('//# sourceMappingURL=x.js.map')).toBe(true)
     // and the result must still be syntactically valid (balanced wrap)
     expect(() => new Function(out)).not.toThrow()
   })

package/src/utils/createNativeDevEngine.ts

@@ -52,7 +52,7 @@ interface NativeDevEngineOptions {
 
 interface NativeDevEngineResult {
   engine: any
-  getBundle: () => Promise<{ code: string; map?: string }>
+  getBundle: () => Promise<{ code: string }>
   close: () => Promise<void>
 }
 
@@ -242,10 +242,10 @@ function getNativePlugins(
 }
 
 // shared output options for native builds
-function getNativeOutputOptions(prelude: string): OutputOptions {
+function getNativeOutputOptions(prelude: string, sourcemap: boolean): OutputOptions {
   return {
     format: 'esm',
-    sourcemap: true,
+    sourcemap,
     intro: prelude,
     codeSplitting: false,
     strictExecutionOrder: true,
@@ -323,16 +323,7 @@ export function wrapNativeBundleModuleScope(code: string): string {
   const idx = code.indexOf(marker)
   if (idx === -1) return code
 
-  const open = ';(function() {\n'
-  const close = '\n})();\n'
-
-  // keep the sourceMappingURL comment as the final line if present
-  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
+  return code.slice(0, idx) + ';(function() {\n' + code.slice(idx) + '\n})();\n'
 }
 
 /**
@@ -408,7 +399,7 @@ export async function createNativeDevEngine(
     serverUrl: serverUrl || `http://${host}:${port}`,
   })
 
-  let currentBundle: { code: string; map?: string } | null = null
+  let currentBundle: { code: string } | null = null
   let bundleResolve: ((value: any) => void) | null = null
   let bundlePromise: Promise<any> | null = null
 
@@ -449,7 +440,12 @@ export async function createNativeDevEngine(
   }
 
   const outputOptions: OutputOptions = {
-    ...getNativeOutputOptions(prelude),
+    // no dev sourcemap: nothing consumes one. the bundle handler serves .code and
+    // /symbolicate isn't implemented, and the map wouldn't line up anyway — the
+    // served code is post-processed (runtime downleveling, IIFE wrap) after the
+    // map is generated. generating it cost ~90ms and ~250MB RSS per rebuild on a
+    // 6MB bundle, held for the life of the dev server, per platform.
+    ...getNativeOutputOptions(prelude, false),
     // connect HMR WebSocket using RN's WebSocket module (not the global)
     outro: `
 try {
@@ -503,13 +499,8 @@ try {
         // globals and break RN's polyfillGlobal (dev-only redbox). see fn doc.
         code = wrapNativeBundleModuleScope(code)
 
-        currentBundle = {
-          code,
-          map: chunk.map?.toString(),
-        }
-        console.info(
-          `[vxrn] native bundle ready (${Math.round(chunk.code.length / 1024)}KB)`
-        )
+        currentBundle = { code }
+        console.info(`[vxrn] native bundle ready (${Math.round(code.length / 1024)}KB)`)
         if (bundleResolve) {
           bundleResolve(currentBundle)
           bundleResolve = null
@@ -587,6 +578,8 @@ interface NativeBuildOptions {
   entryFile?: string
   assetsDest?: string
   plugins?: Plugin[]
+  /** only pass when the map is written somewhere — it costs a second copy of the bundle */
+  sourcemap?: boolean
 }
 
 export async function buildNativeBundle(
@@ -600,6 +593,7 @@ export async function buildNativeBundle(
     entryFile,
     assetsDest,
     plugins: userPlugins = [],
+    sourcemap = false,
   } = options
 
   const { build } = await import('rolldown')
@@ -636,7 +630,7 @@ export async function buildNativeBundle(
       ...getNativePlugins(root, platform, viteImportGlobPlugin, dev, assetsDest),
       ...userPlugins,
     ],
-    output: getNativeOutputOptions(prelude),
+    output: getNativeOutputOptions(prelude, sourcemap),
   })
   const chunk = result.output.find((o) => o.type === 'chunk' && o.isEntry)
 
@@ -646,7 +640,12 @@ export async function buildNativeBundle(
 
   let code = postProcessNativeBundle(chunk.code)
   code = await downlevelClassFieldsInBundle(code)
-  return { code, map: chunk.map?.toString() }
+  // note: this map is only as good as the chunk's — it describes chunk.code, and
+  // the two post-process passes above shift lines. the per-module transforms
+  // (vxrnCompilerPlugin, hermesCompatSWCPlugin) also return code without maps, so
+  // module positions are post-babel/post-swc. good enough for file attribution,
+  // not for exact line/column symbolication.
+  return { code, map: sourcemap ? chunk.map?.toString() : undefined }
 }
 
 const VIRTUAL_NATIVE_ENTRY = 'virtual:native-entry'

package/types/config/getAdditionalViteConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAdditionalViteConfig.d.ts","sourceRoot":"","sources":["../../src/config/getAdditionalViteConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAc,MAAM,MAAM,CAAA;AAMpD;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAiDvE"}
+{"version":3,"file":"getAdditionalViteConfig.d.ts","sourceRoot":"","sources":["../../src/config/getAdditionalViteConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAc,MAAM,MAAM,CAAA;AAMpD;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAyEvE"}

package/types/exports/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/exports/dev.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAkB3C,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG;IACrC,KAAK,CAAC,EAAE,OAAO,CAAA;IACf;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,GAAG,GAAU,WAAW,UAAU;;;;;;EAsM9C,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/exports/dev.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AA+C3C,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG;IACrC,KAAK,CAAC,EAAE,OAAO,CAAA;IACf;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,GAAG,GAAU,WAAW,UAAU;;;;;;EAwM9C,CAAA"}

package/types/rn-commands/bundle/buildBundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildBundle.d.ts","sourceRoot":"","sources":["../../../src/rn-commands/bundle/buildBundle.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,qCAAqC,CAAA;AAI5C,YAAY,EAAE,iBAAiB,EAAE,CAAA;AAEjC,wBAAsB,WAAW,CAC/B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EACpB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,iBAAiB,EACvB,UAAU,GAAE,GAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CAsEf"}
+{"version":3,"file":"buildBundle.d.ts","sourceRoot":"","sources":["../../../src/rn-commands/bundle/buildBundle.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,qCAAqC,CAAA;AAI5C,YAAY,EAAE,iBAAiB,EAAE,CAAA;AAEjC,wBAAsB,WAAW,CAC/B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EACpB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,iBAAiB,EACvB,UAAU,GAAE,GAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CAuEf"}

package/types/utils/bindKeypressInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bindKeypressInput.d.ts","sourceRoot":"","sources":["../../src/utils/bindKeypressInput.ts"],"names":[],"mappings":"AAeA,wBAAgB,iBAAiB,SAsDhC"}
+{"version":3,"file":"bindKeypressInput.d.ts","sourceRoot":"","sources":["../../src/utils/bindKeypressInput.ts"],"names":[],"mappings":"AAeA,wBAAgB,iBAAiB,SAgDhC"}

package/types/utils/createNativeDevEngine.d.ts

@@ -24,7 +24,6 @@ interface NativeDevEngineResult {
     engine: any;
     getBundle: () => Promise<{
         code: string;
-        map?: string;
     }>;
     close: () => Promise<void>;
 }
@@ -71,6 +70,8 @@ interface NativeBuildOptions {
     entryFile?: string;
     assetsDest?: string;
     plugins?: Plugin[];
+    /** only pass when the map is written somewhere — it costs a second copy of the bundle */
+    sourcemap?: boolean;
 }
 export declare function buildNativeBundle(options: NativeBuildOptions): Promise<{
     code: string;

package/types/utils/createNativeDevEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createNativeDevEngine.d.ts","sourceRoot":"","sources":["../../src/utils/createNativeDevEngine.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAA+B,MAAM,EAAkB,MAAM,UAAU,CAAA;AA0BnF,yFAAyF;AACzF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,EAAE,CAE3D;AAED,UAAU,sBAAsB;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAA;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;CAChE;AAED,UAAU,qBAAqB;IAC7B,MAAM,EAAE,GAAG,CAAA;IACX,SAAS,EAAE,MAAM,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACxD,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3B;AAuBD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,KAAK,GAAG,SAAS,EAC3B,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,MAAM;;;;;;;;EAqHb;AAgGD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAgBhE;AAoDD,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CA4LhC;AAID,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAA;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAwDzC;AA4KD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAuB5C;AAoBD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,CAwGzE"}
+{"version":3,"file":"createNativeDevEngine.d.ts","sourceRoot":"","sources":["../../src/utils/createNativeDevEngine.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAA+B,MAAM,EAAkB,MAAM,UAAU,CAAA;AA0BnF,yFAAyF;AACzF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,EAAE,CAE3D;AAED,UAAU,sBAAsB;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAA;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;CAChE;AAED,UAAU,qBAAqB;IAC7B,MAAM,EAAE,GAAG,CAAA;IACX,SAAS,EAAE,MAAM,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC1C,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3B;AAuBD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,KAAK,GAAG,SAAS,EAC3B,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,MAAM;;;;;;;;EAqHb;AAgGD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAOhE;AAoDD,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CA4LhC;AAID,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAA;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,yFAAyF;IACzF,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA8DzC;AA4KD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAuB5C;AAoBD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,CAwGzE"}