@hot-updater/expo 1.1.2 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/expo",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Hot Updater build and config plugin for Expo",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -28,16 +28,16 @@
     "@babel/core": "7.26.0",
     "@babel/types": "7.26.0",
     "uuidv7": "^1.0.2",
-    "@hot-updater/bare": "1.1.2",
-    "@hot-updater/cli-tools": "1.1.2",
-    "@hot-updater/plugin-core": "1.1.2"
+    "@hot-updater/bare": "1.1.4",
+    "@hot-updater/cli-tools": "1.1.4",
+    "@hot-updater/plugin-core": "1.1.4"
   },
   "devDependencies": {
     "@types/node": "^20",
     "expo": "^50.0.0",
     "execa": "9.5.2",
     "vitest": "4.1.4",
-    "hot-updater": "1.1.2"
+    "hot-updater": "1.1.4"
   },
   "exports": {
     ".": {

package/plugin/build/transformers.js

@@ -111,6 +111,39 @@ function transformAndroidReactHost(contents) {
     ];
     return `${prefix}${jsBundleLines.join("\n")}\n${suffix}`;
 }
+/**
+ * Removes every `override fun getJSBundleFile(): String?` block, matching its
+ * closing brace by depth so a body with nested blocks (`if`, `else`, `try`)
+ * is removed whole.
+ */
+function removeKotlinGetJSBundleFile(source) {
+    const methodStart = /^\s*override fun getJSBundleFile\(\): String\?\s*\{/gm;
+    let result = "";
+    let cursor = 0;
+    for (const match of source.matchAll(methodStart)) {
+        if (match.index < cursor) {
+            continue;
+        }
+        let depth = 1;
+        let end = match.index + match[0].length;
+        while (end < source.length && depth > 0) {
+            if (source[end] === "{") {
+                depth += 1;
+            }
+            else if (source[end] === "}") {
+                depth -= 1;
+            }
+            end += 1;
+        }
+        if (depth !== 0) {
+            // Unbalanced input: leave it for the author instead of cutting it.
+            continue;
+        }
+        result += source.slice(cursor, match.index);
+        cursor = end;
+    }
+    return result + source.slice(cursor);
+}
 /**
  * Android: DefaultReactNativeHost pattern (RN 0.81 / Expo 54).
  * Adds getJSBundleFile() override to the host.
@@ -120,7 +153,6 @@ function transformAndroidDefaultHost(contents) {
     const kotlinImportAnchor = "import com.facebook.react.ReactApplication";
     const kotlinReactNativeHostAnchor = "object : DefaultReactNativeHost(this) {";
     const kotlinMethodCheck = "HotUpdater.getJSBundleFile(applicationContext)";
-    const kotlinExistingMethodRegex = /^\s*override fun getJSBundleFile\(\): String\?\s*\{[\s\S]*?^\s*\}/gm;
     const kotlinHermesAnchor = "override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED";
     const kotlinNewArchAnchor = "override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED";
     // Check if this is the old pattern with DefaultReactNativeHost
@@ -132,7 +164,7 @@ function transformAndroidDefaultHost(contents) {
     // 2. Add/Replace getJSBundleFile method if needed
     if (!result.includes(kotlinMethodCheck)) {
         // Remove potentially existing (different) override first
-        result = result.replace(kotlinExistingMethodRegex, "");
+        result = removeKotlinGetJSBundleFile(result);
         const lines = result.split("\n");
         const findLineIndex = (needle) => {
             for (let i = 0; i < lines.length; i += 1) {