vxrn 1.1.535 → 1.1.536

package/dist/utils/expoRun.js

@@ -1,17 +1,11 @@
 import module from "node:module";
 import { fillOptions } from "../config/getOptionsFilled";
 import { applyBuiltInPatches } from "../utils/patches";
-import picocolors from "picocolors";
 async function expoRun({
   root,
   platform,
   port
 }) {
-  platform !== "ios" && console.warn(
-    picocolors.yellow(
-      `\u{1F6A7}  The ${platform} platform is less tested and you might encounter unexpected errors. Let us know if anything breaks.`
-    )
-  );
   const options = await fillOptions({ root });
   applyBuiltInPatches(options).catch((err) => {
     console.error(`

package/dist/utils/expoRun.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/utils/expoRun.ts"],
-  "mappings": "AAAA,OAAO,YAAY;AACnB,SAAS,mBAAmB;AAC5B,SAAS,2BAA2B;AACpC,OAAO,gBAAgB;AAEvB,eAAsB,QAAQ;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AACF,GAAiE;AAC/D,EAAI,aAAa,SACf,QAAQ;AAAA,IACN,WAAW;AAAA,MACT,kBAAW,QAAQ;AAAA,IACrB;AAAA,EACF;AAGF,QAAM,UAAU,MAAM,YAAY,EAAE,KAAK,CAAC;AAE1C,sBAAoB,OAAO,EAAE,MAAM,CAAC,QAAQ;AAC1C,YAAQ,MAAM;AAAA,6CAAyC,GAAG;AAAA,EAC5D,CAAC;AAED,MAAI;AAMF,UAAMA,YAAW,MAAM,OAJP,OAAO,cAAc,IAAI,EACd,QAAQ,2BAA2B,QAAQ,aAAa;AAAA,MACjF,OAAO,CAAC,IAAI;AAAA,IACd,CAAC,IAC0C,QACzC,UAAU,SAAS,OAAO,CAAC,EAAE,YAAY,IAAI,SAAS,MAAM,CAAC,CAAC,EAChE;AACA,UAAMA,SAAQ;AAAA;AAAA,MAEZ;AAAA;AAAA;AAAA;AAAA,IAIF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ,MAAM,iCAAiC,CAAC;AAAA,uCAA0C;AAAA,EAC5F;AACF;",
+  "mappings": "AAAA,OAAO,YAAY;AACnB,SAAS,mBAAmB;AAC5B,SAAS,2BAA2B;AAEpC,eAAsB,QAAQ;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AACF,GAAiE;AAC/D,QAAM,UAAU,MAAM,YAAY,EAAE,KAAK,CAAC;AAE1C,sBAAoB,OAAO,EAAE,MAAM,CAAC,QAAQ;AAC1C,YAAQ,MAAM;AAAA,6CAAyC,GAAG;AAAA,EAC5D,CAAC;AAED,MAAI;AAMF,UAAMA,YAAW,MAAM,OAJP,OAAO,cAAc,IAAI,EACd,QAAQ,2BAA2B,QAAQ,aAAa;AAAA,MACjF,OAAO,CAAC,IAAI;AAAA,IACd,CAAC,IAC0C,QACzC,UAAU,SAAS,OAAO,CAAC,EAAE,YAAY,IAAI,SAAS,MAAM,CAAC,CAAC,EAChE;AACA,UAAMA,SAAQ;AAAA;AAAA,MAEZ;AAAA;AAAA;AAAA;AAAA,IAIF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ,MAAM,iCAAiC,CAAC;AAAA,uCAA0C;AAAA,EAC5F;AACF;",
   "names": ["expoRun"]
 }

package/dist/utils/expoRun.mjs

@@ -1,13 +1,11 @@
 import module from "node:module";
 import { fillOptions } from "../config/getOptionsFilled.mjs";
 import { applyBuiltInPatches } from "../utils/patches.mjs";
-import picocolors from "picocolors";
 async function expoRun({
   root,
   platform,
   port
 }) {
-  platform !== "ios" && console.warn(picocolors.yellow(`\u{1F6A7}  The ${platform} platform is less tested and you might encounter unexpected errors. Let us know if anything breaks.`));
   const options = await fillOptions({
     root
   });

package/dist/utils/expoRun.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["module","fillOptions","applyBuiltInPatches","picocolors","expoRun","root","platform","port","console","warn","yellow","options","catch","err","error","expoRun2","createRequire","resolve","paths","default","charAt","toUpperCase","slice","e"],"sources":["../../src/utils/expoRun.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,MAAA,MAAY;AACnB,SAASC,WAAA,QAAmB;AAC5B,SAASC,mBAAA,QAA2B;AACpC,OAAOC,UAAA,MAAgB;AAEvB,eAAsBC,QAAQ;EAC5BC,IAAA;EACAC,QAAA;EACAC;AACF,GAAiE;EAC3DD,QAAA,KAAa,SACfE,OAAA,CAAQC,IAAA,CACNN,UAAA,CAAWO,MAAA,CACT,kBAAWJ,QAAQ,qGACrB,CACF;EAGF,MAAMK,OAAA,GAAU,MAAMV,WAAA,CAAY;IAAEI;EAAK,CAAC;EAE1CH,mBAAA,CAAoBS,OAAO,EAAEC,KAAA,CAAOC,GAAA,IAAQ;IAC1CL,OAAA,CAAQM,KAAA,CAAM;AAAA,6CAAyCD,GAAG;EAC5D,CAAC;EAED,IAAI;IAMF,MAAME,QAAA,IAAW,MAAM,OAJPf,MAAA,CAAOgB,aAAA,CAAcX,IAAI,EACdY,OAAA,CAAQ,2BAA2BX,QAAQ,aAAa;MACjFY,KAAA,EAAO,CAACb,IAAI;IACd,CAAC,IAC0Cc,OAAA,CACzC,UAAUb,QAAA,CAASc,MAAA,CAAO,CAAC,EAAEC,WAAA,CAAY,IAAIf,QAAA,CAASgB,KAAA,CAAM,CAAC,CAAC,EAChE;IACA,MAAMP,QAAA,CAAQ;IAAA;IAEZ;IAAA;IAAA;IAAA;IAAA,CAID;EACH,SAASQ,CAAA,EAAG;IACVf,OAAA,CAAQM,KAAA,CAAM,iCAAiCS,CAAC;AAAA,uCAA0C;EAC5F;AACF","ignoreList":[]}
+{"version":3,"names":["module","fillOptions","applyBuiltInPatches","expoRun","root","platform","port","options","catch","err","console","error","expoRun2","createRequire","resolve","paths","default","charAt","toUpperCase","slice","e"],"sources":["../../src/utils/expoRun.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,MAAA,MAAY;AACnB,SAASC,WAAA,QAAmB;AAC5B,SAASC,mBAAA,QAA2B;AAEpC,eAAsBC,QAAQ;EAC5BC,IAAA;EACAC,QAAA;EACAC;AACF,GAAiE;EAC/D,MAAMC,OAAA,GAAU,MAAMN,WAAA,CAAY;IAAEG;EAAK,CAAC;EAE1CF,mBAAA,CAAoBK,OAAO,EAAEC,KAAA,CAAOC,GAAA,IAAQ;IAC1CC,OAAA,CAAQC,KAAA,CAAM;AAAA,6CAAyCF,GAAG;EAC5D,CAAC;EAED,IAAI;IAMF,MAAMG,QAAA,IAAW,MAAM,OAJPZ,MAAA,CAAOa,aAAA,CAAcT,IAAI,EACdU,OAAA,CAAQ,2BAA2BT,QAAQ,aAAa;MACjFU,KAAA,EAAO,CAACX,IAAI;IACd,CAAC,IAC0CY,OAAA,CACzC,UAAUX,QAAA,CAASY,MAAA,CAAO,CAAC,EAAEC,WAAA,CAAY,IAAIb,QAAA,CAASc,KAAA,CAAM,CAAC,CAAC,EAChE;IACA,MAAMP,QAAA,CAAQ;IAAA;IAEZ;IAAA;IAAA;IAAA;IAAA,CAID;EACH,SAASQ,CAAA,EAAG;IACVV,OAAA,CAAQC,KAAA,CAAM,iCAAiCS,CAAC;AAAA,uCAA0C;EAC5F;AACF","ignoreList":[]}

package/dist/utils/expoRun.native.js

@@ -1,17 +1,15 @@
 import module from "node:module";
 import { fillOptions } from "../config/getOptionsFilled.native.js";
 import { applyBuiltInPatches } from "../utils/patches.native.js";
-import picocolors from "picocolors";
 async function expoRun(param) {
   var {
-    root,
-    platform,
-    port
-  } = param;
-  platform !== "ios" && console.warn(picocolors.yellow(`\u{1F6A7}  The ${platform} platform is less tested and you might encounter unexpected errors. Let us know if anything breaks.`));
-  var options = await fillOptions({
-    root
-  });
+      root,
+      platform,
+      port
+    } = param,
+    options = await fillOptions({
+      root
+    });
   applyBuiltInPatches(options).catch(function (err) {
     console.error(`
  \u{1F97A} error applying built-in patches`, err);

package/dist/utils/expoRun.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["module","fillOptions","applyBuiltInPatches","picocolors","expoRun","param","root","platform","port","console","warn","yellow","options","catch","err","error","require2","createRequire","importPath","resolve","paths","expoRun2","default","charAt","toUpperCase","slice","e"],"sources":["../../src/utils/expoRun.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,MAAA,MAAY;AACnB,SAASC,WAAA,QAAmB;AAC5B,SAASC,mBAAA,QAA2B;AACpC,OAAOC,UAAA,MAAgB;AAEvB,eAAsBC,QAAQC,KAAA;EAC5B;IAAAC,IAAA;IAAAC,QAAA;IAAAC;EAAA,IAAAH,KAAA;EACAE,QAAA,cAAAE,OAAA,CAAAC,IAAA,CAAAP,UAAA,CAAAQ,MAAA,mBAAAJ,QAAA;EACA,IAAAK,OAAA,SAAAX,WAAA;IAC+DK;EAC3D;EACMJ,mBACK,CAAAU,OAAA,EAAAC,KAAA,WAAAC,GAAA;IAAAL,OACT,CAAAM,KAAA;AAAmB,2CACrB,EAAAD,GAAA;EACF;EAGF;IAEA,IAAAE,QAAA,GAAAhB,MAAoB,CAAAiB,aAAgB,CAAAX,IAAA;MAAQY,UAAA,GAAAF,QAAA,CAAAG,OAAA,4BAAAZ,QAAA;QAC1Ca,KAAA,EAAQ,CAAMd,IAAA;MAGhB,EAAI;MAAAe,QAAA,iBAAAH,UAAA,GAAAI,OAAA,WAAAf,QAAA,CAAAgB,MAAA,IAAAC,WAAA,KAAAjB,QAAA,CAAAkB,KAAA;IAMF,MAAMJ,QAAA;IAFJ;IACD,cAEC,CAEF;EAAc,SAAAK,CAAA;IAAAjB,OAEZ,CAAAM,KAAA,kCAAAW,CAAA;AAAA;EAAA;AAAA;AAAA,SAKJtB,OAAA","ignoreList":[]}
+{"version":3,"names":["module","fillOptions","applyBuiltInPatches","expoRun","param","root","platform","port","options","catch","err","console","error","require2","createRequire","importPath","resolve","paths","expoRun2","default","charAt","toUpperCase","slice","e"],"sources":["../../src/utils/expoRun.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,MAAA,MAAY;AACnB,SAASC,WAAA,QAAmB;AAC5B,SAASC,mBAAA,QAA2B;AAEpC,eAAsBC,QAAQC,KAAA;EAC5B;MAAAC,IAAA;MAAAC,QAAA;MAAAC;IAAA,IAAAH,KAAA;IAAAI,OAAA,SAAAP,WAAA;MACAI;IACA;EACFH,mBAAiE,CAAAM,OAAA,EAAAC,KAAA,WAAAC,GAAA;IAC/DC,OAAM,CAAAC,KAAA,CAAU;AAEhB,2CAAoC,EAAAF,GAAQ;EAC1C;EAAc;IACf,IAAAG,QAAA,GAAAb,MAAA,CAAAc,aAAA,CAAAT,IAAA;MAAAU,UAAA,GAAAF,QAAA,CAAAG,OAAA,4BAAAV,QAAA;QAEGW,KAAA,GAMFZ,IAAM;MADN,CAAC;MAAAa,QAC0C,GACzC,aAAU,CAAAH,UAAgB,CAAC,EAAEI,OAAA,WAAgBb,QAAS,CAAAc,MAAQ,EAChE,EAAAC,WAAA,KAAAf,QAAA,CAAAgB,KAAA;IACA,MAAMJ,QAAA,CAAQ;IAAA;IAEZ;EAAA,SAAAK,CAAA;IAAAZ,OAAA,CAAAC,KAAA,kCAAAW,CAAA;AAAA,uCAID;EACH;AACE;AAAgD,SAClDpB,OAAA","ignoreList":[]}

package/expo-plugin.cjs

@@ -1,4 +1,9 @@
-const { withPlugins, withXcodeProject, withAppBuildGradle } = require('@expo/config-plugins')
+const {
+  withPlugins,
+  withXcodeProject,
+  withAppBuildGradle,
+  withMainActivity,
+} = require('@expo/config-plugins')
 
 const plugin = (config, options = {}) => {
   return withPlugins(config, [
@@ -36,6 +41,13 @@ const plugin = (config, options = {}) => {
         return config
       },
     ],
+    [
+      withMainActivity,
+      async (config) => {
+        config.modResults.contents = addReactNativeScreensFix(config.modResults.contents)
+        return config
+      },
+    ],
   ])
 }
 
@@ -221,4 +233,99 @@ gradle.taskGraph.whenReady { taskGraph ->
   )
 }
 
+/**
+ * Add react-native-screens Android fix to prevent crashes on Activity restarts.
+ * This fix passes null to super.onCreate() to prevent Fragment restoration issues.
+ *
+ * On Android the View state is not persisted consistently across Activity restarts,
+ * which can lead to crashes. By passing null to onCreate, we discard any saved
+ * instance state that could cause Fragment restoration issues.
+ *
+ * This fix is required for react-native-screens and is integrated directly into vxrn
+ * since we depend on react-native-screens internally.
+ *
+ * Reference: https://github.com/software-mansion/react-native-screens/issues/17#issuecomment-424704067
+ */
+function addReactNativeScreensFix(input) {
+  console.info(`🔨 Ensuring react-native-screens android fix`, input)
+
+  // Determine if this is Kotlin or Java
+  const isKotlin = input.includes('.kt') || input.includes('class MainActivity : ReactActivity()')
+
+  // Check if the fix is already applied
+  if (input.includes('super.onCreate(null)')) {
+    console.info('ℹ️  Fragment crash fix already applied (super.onCreate(null))')
+    return input
+  }
+
+  if (isKotlin) {
+    // Kotlin version - replace existing super.onCreate or add new method
+    if (input.includes('super.onCreate(savedInstanceState)')) {
+      input = input.replace(
+        /super\.onCreate\(savedInstanceState\)/g,
+        `// Fragment crash fix: Pass null to onCreate to prevent Fragment restoration issues
+        // https://github.com/software-mansion/react-native-screens/issues/17#issuecomment-424704067
+        super.onCreate(null)`
+      )
+      console.info('✅ Applied Fragment crash fix to MainActivity.kt (super.onCreate(null))')
+    } else if (!input.includes('onCreate')) {
+      // Need to add onCreate method for Kotlin
+      const classMatch = input.match(/class\s+MainActivity\s*:\s*ReactActivity\(\)\s*\{/)
+      if (classMatch) {
+        const classDeclarationEnd = input.indexOf('{', classMatch.index) + 1
+
+        const onCreateMethod = `
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        // Fragment crash fix: Pass null to onCreate to prevent Fragment restoration issues
+        // https://github.com/software-mansion/react-native-screens/issues/17#issuecomment-424704067
+        super.onCreate(null)
+    }`
+
+        input =
+          input.slice(0, classDeclarationEnd) + onCreateMethod + input.slice(classDeclarationEnd)
+        console.info('✅ Added onCreate with Fragment crash fix to MainActivity.kt')
+      }
+    }
+  } else {
+    // Java version - replace existing super.onCreate or add new method
+    if (input.includes('super.onCreate(savedInstanceState)')) {
+      input = input.replace(
+        /super\.onCreate\(savedInstanceState\)/g,
+        `// Fragment crash fix: Pass null to onCreate to prevent Fragment restoration issues
+        // https://github.com/software-mansion/react-native-screens/issues/17#issuecomment-424704067
+        super.onCreate(null)`
+      )
+      console.info('✅ Applied Fragment crash fix to MainActivity.java (super.onCreate(null))')
+    } else if (!input.includes('onCreate')) {
+      // Need to add onCreate method for Java
+      // First add Bundle import if needed
+      if (!input.includes('import android.os.Bundle;')) {
+        input = input.replace(/package\s+[\w.]+;/, '$&\nimport android.os.Bundle;')
+      }
+
+      const classMatch = input.match(/public\s+class\s+MainActivity\s+extends\s+ReactActivity\s*\{/)
+      if (classMatch) {
+        const classDeclarationEnd = input.indexOf('{', classMatch.index) + 1
+
+        const onCreateMethod = `
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // Fragment crash fix: Pass null to onCreate to prevent Fragment restoration issues
+        // https://github.com/software-mansion/react-native-screens/issues/17#issuecomment-424704067
+        super.onCreate(null);
+    }`
+
+        input =
+          input.slice(0, classDeclarationEnd) + onCreateMethod + input.slice(classDeclarationEnd)
+        console.info('✅ Added onCreate with Fragment crash fix to MainActivity.java')
+      }
+    }
+  }
+
+  return input
+}
+
 module.exports = plugin
+module.exports.addReactNativeScreensFix = addReactNativeScreensFix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "1.1.535",
+  "version": "1.1.536",
   "sideEffects": false,
   "type": "module",
   "exports": {
@@ -65,17 +65,17 @@
     "@hono/node-server": "^1.13.7",
     "@react-native/dev-middleware": "^0.76.5",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@vxrn/compiler": "1.1.535",
-    "@vxrn/debug": "1.1.535",
-    "@vxrn/query-string": "1.1.535",
-    "@vxrn/react-native-prebuilt": "1.1.535",
-    "@vxrn/resolve": "1.1.535",
-    "@vxrn/safe-area": "1.1.535",
-    "@vxrn/url-parse": "1.1.535",
-    "@vxrn/utils": "1.1.535",
-    "@vxrn/vendor": "1.1.535",
-    "@vxrn/vite-flow": "1.1.535",
-    "@vxrn/vite-plugin-metro": "1.1.535",
+    "@vxrn/compiler": "1.1.536",
+    "@vxrn/debug": "1.1.536",
+    "@vxrn/query-string": "1.1.536",
+    "@vxrn/react-native-prebuilt": "1.1.536",
+    "@vxrn/resolve": "1.1.536",
+    "@vxrn/safe-area": "1.1.536",
+    "@vxrn/url-parse": "1.1.536",
+    "@vxrn/utils": "1.1.536",
+    "@vxrn/vendor": "1.1.536",
+    "@vxrn/vite-flow": "1.1.536",
+    "@vxrn/vite-plugin-metro": "1.1.536",
     "citty": "^0.1.6",
     "dotenv": "^17.2.1",
     "dotenv-expand": "^12.0.2",
@@ -94,8 +94,8 @@
     "qrcode-terminal": "^0.12.0",
     "rollup": "^4.29.1",
     "semver": "^7.6.3",
-    "vite": "^7.0.1",
-    "vite-bundle-analyzer": "^0.9.4",
+    "vite": "^7.1.12",
+    "vite-bundle-analyzer": "^1.2.3",
     "ws": "^8.18.0"
   },
   "devDependencies": {

package/src/utils/expoRun.ts

@@ -1,21 +1,12 @@
 import module from 'node:module'
 import { fillOptions } from '../config/getOptionsFilled'
 import { applyBuiltInPatches } from '../utils/patches'
-import picocolors from 'picocolors'
 
 export async function expoRun({
   root,
   platform,
   port,
 }: { root: string; platform: 'ios' | 'android'; port?: number }) {
-  if (platform !== 'ios') {
-    console.warn(
-      picocolors.yellow(
-        `🚧  The ${platform} platform is less tested and you might encounter unexpected errors. Let us know if anything breaks.`
-      )
-    )
-  }
-
   const options = await fillOptions({ root })
 
   applyBuiltInPatches(options).catch((err) => {

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

@@ -1 +1 @@
-{"version":3,"file":"expoRun.d.ts","sourceRoot":"","sources":["../../src/utils/expoRun.ts"],"names":[],"mappings":"AAKA,wBAAsB,OAAO,CAAC,EAC5B,IAAI,EACJ,QAAQ,EACR,IAAI,GACL,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,iBAkC9D"}
+{"version":3,"file":"expoRun.d.ts","sourceRoot":"","sources":["../../src/utils/expoRun.ts"],"names":[],"mappings":"AAIA,wBAAsB,OAAO,CAAC,EAC5B,IAAI,EACJ,QAAQ,EACR,IAAI,GACL,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,KAAK,GAAG,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,iBA0B9D"}