callstackincubator
diff --git a/‎.changeset/eighty-moons-shave.md‎
Lines changed: 14 additions & 0 deletions b/‎.changeset/eighty-moons-shave.md‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎AGENTS.md‎
Lines changed: 1 addition & 1 deletion b/‎AGENTS.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 6 additions & 6 deletions b/‎README.md‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎apps/test-app/android/gradle.properties‎
Lines changed: 19 additions & 1 deletion b/‎apps/test-app/android/gradle.properties‎
Lines changed: 19 additions & 1 deletion
diff --git a/‎apps/test-app/android/gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 1 addition & 1 deletion b/‎apps/test-app/android/gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/test-app/package.json‎
Lines changed: 9 additions & 8 deletions b/‎apps/test-app/package.json‎
Lines changed: 9 additions & 8 deletions
diff --git a/‎apps/test-app/scripts/android-crash-watchdog.mts‎
Lines changed: 101 additions & 0 deletions b/‎apps/test-app/scripts/android-crash-watchdog.mts‎
Lines changed: 101 additions & 0 deletions
diff --git a/‎apps/test-app/tsconfig.json‎
Lines changed: 1 addition & 1 deletion b/‎apps/test-app/tsconfig.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/test-app/tsconfig.node-scripts.json‎
Lines changed: 1 addition & 1 deletion b/‎apps/test-app/tsconfig.node-scripts.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎docs/ANDROID.md‎
Lines changed: 3 additions & 3 deletions b/‎docs/ANDROID.md‎
Lines changed: 3 additions & 3 deletions
@@ -0,0 +1,14 @@
+---
+"react-native-node-api": major
+"weak-node-api": minor
+---
+
+Adopt Hermes' first-party Node-API (the `hermesNapi` target on the `static_h`
+branch) instead of patching Hermes with our own implementation. Addons now run
+against a real Node-API environment created with `hermes_napi_create_env()`, one
+per addon as in Node, and Node-API is bumped from v8 to v10.
+
+This drops support for React Native 0.79–0.81: the vendored Hermes is built from
+a pinned `static_h` commit and requires the Hermes build scripts shipped with
+React Native 0.87 and later. Older React Native versions are still served by
+previously published releases.
@@ -60,7 +60,7 @@ patch or workaround:
 
 ## Critical Build Dependencies
 
-- **Custom Hermes**: Currently depends on a patched Hermes with Node-API support (see [facebook/hermes#1377](https://github.com/facebook/hermes/pull/1377))
+- **Vendored Hermes**: Builds Hermes from a pinned commit on the `static_h` branch, which carries Hermes' first-party Node-API implementation (`API/napi`, target `hermesNapi`). The pin lives in `packages/host/src/node/cli/hermes.ts` and is fetched by the `vendor-hermes` command.
 - **Prebuilt Binary Spec**: All tools must output to the exact naming scheme:
   - Android: `*.android.node/` with jniLibs structure + `react-native-node-api-module` marker file
   - iOS: `*.apple.node` (XCFramework renamed) + marker file
 
@@ -19,8 +19,9 @@
 ## How does this work?
 
 > [!IMPORTANT]
-> This library is currently dependent on a custom version of Hermes and therefore has a very limited range of supported React Native versions.
-> Once the [PR adding Node-API support to Hermes](https://github.com/facebook/hermes/pull/1377) merges, we expect this restriction to be lifted.
+> This library builds Hermes from a pinned commit on its `static_h` branch, which carries [Hermes' first-party Node-API implementation](https://github.com/facebook/hermes/tree/static_h/API/napi).
+> React Native has not shipped that Hermes yet, so the range of supported React Native versions is very limited — see the `react-native` peer dependency of the [host package](packages/host/package.json) for the version we currently build against.
+> We expect this restriction to be lifted once React Native ships a Hermes with Node-API included.
 
 > [!NOTE]
 > This library only works for iOS and Android and we want to eventually support React Native for Windows, macOS, visionOS and other out-of-tree platforms too.
@@ -35,10 +36,9 @@ This mono-repository hosts the development of a few packages:
 
 Responsible for adding Node-API support to your React Native application:
 
-- Declares a Podspec which downloads a special version of Hermes, with Node-API support,
-  - instructing React Native's Hermes Podspecs to compile from this custom source-code.
-  - patching React Native's JSI copy, with the updates introduced by our special version of Hermes.
-  - we expect this to eventually be removed, as Node-API support gets merged into Hermes upstream.
+- Declares a Podspec which vendors Hermes from a pinned commit on its `static_h` branch, where Node-API is implemented,
+  - instructing React Native's Hermes Podspecs to compile from this checkout.
+  - we expect this to eventually be removed, as React Native starts shipping a Hermes with Node-API included.
 - Automatically discovers and adds Node-API binaries, matching the [the prebuilt binary specification](./docs/PREBUILDS.md)
   - This is driven by the platform specific build tools (through the Podspec on iOS and eventually Gradle on Android)
 - Implements a TurboModule with a `requireNodeAddon` function responsible for
 
@@ -50,4 +50,22 @@ react.buildFromSource=true
 #ANDROID_NDK_VERSION=26.1.10909125
 
 # Version of Kotlin to build against.
-#KOTLIN_VERSION=1.8.22
+#KOTLIN_VERSION=1.8.22
+
+# Opt out of built-in Kotlin and the new DSL, both of which ship enabled in
+# AGP 9. AGP 10 removes both opt outs, so they are on borrowed time — tracked in
+# https://github.com/callstackincubator/react-native-node-api/issues/389, which
+# links the upstream code that has to migrate first.
+#
+# Both are blocked on react-native-test-app, not on us. Its Gradle modules still
+# use the old DSL (`compileSdkVersion`, `lintOptions`), and its app module adds
+# version-specific Kotlin sources through `main.java.srcDirs +=`. The Kotlin
+# plugin compiles those; AGP's built-in Kotlin only picks up the standard source
+# directories, so building without this leaves every symbol defined in an added
+# directory (`testApp`, `ComponentActivityDelegate`, …) unresolved.
+#
+# Note that react-native-node-api itself is built-in-Kotlin ready — it applies
+# the Kotlin plugin only when built-in Kotlin is unavailable — so this is purely
+# about the test harness.
+android.builtInKotlin=false
+android.newDsl=false
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 
@@ -6,10 +6,11 @@
   "scripts": {
     "metro": "react-native start --no-interactive",
     "android": "react-native run-android --no-packager --active-arch-only",
+    "android:crash-watchdog": "node scripts/android-crash-watchdog.mts",
     "ios": "react-native run-ios --no-packager",
     "pod-install": "cd ios && pod install",
     "mocha-and-metro": "mocha-remote --watch -- react-native start",
-    "test:android": "mocha-remote --exit-on-error -- concurrently --kill-others-on-fail --passthrough-arguments npm:metro 'npm:android -- {@}' --",
+    "test:android": "mocha-remote --exit-on-error -- concurrently --kill-others-on-fail --passthrough-arguments npm:metro 'npm:android -- {@}' npm:android:crash-watchdog --",
     "test:android:allTests": "MOCHA_REMOTE_CONTEXT=allTests node --run test:android -- ",
     "test:android:nodeAddonExamples": "MOCHA_REMOTE_CONTEXT=nodeAddonExamples node --run test:android -- ",
     "test:android:nodeTests": "MOCHA_REMOTE_CONTEXT=nodeTests node --run test:android -- ",
@@ -30,20 +31,20 @@
     "@react-native-node-api/ferric-example": "workspace:*",
     "@react-native-node-api/node-addon-examples": "workspace:*",
     "@react-native-node-api/node-tests": "workspace:*",
-    "@react-native/babel-preset": "0.81.4",
-    "@react-native/metro-config": "0.81.4",
-    "@react-native/typescript-config": "0.81.4",
-    "@rnx-kit/metro-config": "^2.1.1",
+    "@react-native/babel-preset": "0.88.0-nightly-20260809-db662caea",
+    "@react-native/metro-config": "0.88.0-nightly-20260809-db662caea",
+    "@react-native/typescript-config": "0.88.0-nightly-20260809-db662caea",
+    "@rnx-kit/metro-config": "^2.2.4",
     "@types/mocha": "^10.0.10",
     "@types/react": "^19.1.0",
     "concurrently": "^9.1.2",
     "mocha": "^11.6.0",
     "mocha-remote-cli": "^1.13.2",
     "mocha-remote-react-native": "^1.13.2",
-    "react": "19.1.0",
-    "react-native": "0.81.4",
+    "react": "19.2.3",
+    "react-native": "0.88.0-nightly-20260809-db662caea",
     "react-native-node-api": "workspace:*",
-    "react-native-test-app": "^4.4.7",
+    "react-native-test-app": "^5.4.8",
     "weak-node-api": "workspace:*"
   }
 }
@@ -0,0 +1,101 @@
+/**
+ * Fails the Android test run as soon as the app crashes.
+ *
+ * `mocha-remote` waits indefinitely for a client to connect and has no notion
+ * of the app dying: when the app crashes on startup, nothing ever connects and
+ * the run hangs until the CI job hits its timeout — 68 minutes of an emulator
+ * idling for a crash that happened one second after `am start`.
+ *
+ * Run alongside the app (through `concurrently --kill-others-on-fail`), this
+ * turns such a crash into an immediate failure with the stack trace inlined in
+ * the log, instead of a timeout with the cause buried in a logcat artifact.
+ *
+ * It only reacts to crashes: a hung or never-launched app still relies on the
+ * job timeout.
+ */
+import cp from "node:child_process";
+import readline from "node:readline";
+
+// The application id used by react-native-test-app, which the CI workflow also
+// hardcodes when uninstalling any leftover copy of the app.
+const APP_ID = "com.microsoft.reacttestapp";
+
+// How long to keep reading after the first line mentioning the app, to capture
+// the rest of the stack trace before exiting.
+const TRACE_GRACE_MS = 1000;
+
+/**
+ * Runs adb, resolving false if it couldn't run at all (not installed, no
+ * device, etc). The watchdog stays out of the way in that case: the build or
+ * the run itself will fail with a better message than anything we could add.
+ */
+function adb(...args: string[]): Promise<boolean> {
+  return new Promise((resolve) => {
+    const child = cp.spawn("adb", args, { stdio: "ignore" });
+    child.on("error", () => resolve(false));
+    child.on("close", (code) => resolve(code === 0));
+  });
+}
+
+function skip(reason: string): never {
+  console.warn(`[crash-watchdog] Not watching for crashes: ${reason}`);
+  process.exit(0);
+}
+
+async function main() {
+  if (!(await adb("wait-for-device"))) {
+    skip("failed to wait for an adb device");
+  }
+
+  // Drop any crash from an earlier run, so we only react to this one. The app
+  // hasn't been installed yet at this point, so this can't discard a crash we
+  // care about.
+  await adb("logcat", "-b", "crash", "-c");
+
+  // Never let this child inherit our stderr: GitHub's `@actions/exec` resolves
+  // a step only once the stdio streams it handed out are closed, so an adb
+  // orphaned by our exit would hold the step open long after we failed it.
+  const logcat = cp.spawn("adb", ["logcat", "-b", "crash"], {
+    stdio: ["ignore", "pipe", "ignore"],
+  });
+
+  // ... and don't leave it running at all: killing it on the way out covers
+  // both failing on a crash and getting terminated once the tests pass.
+  process.on("exit", () => logcat.kill("SIGKILL"));
+  for (const signal of ["SIGINT", "SIGTERM"] as const) {
+    process.on(signal, () => process.exit(0));
+  }
+
+  // The line naming the app is preceded by the header of the crash it belongs
+  // to ("FATAL EXCEPTION: main"), so keep a few lines of lead-in around.
+  const LEAD_IN_LINES = 5;
+  const trace: string[] = [];
+  let crashed = false;
+
+  logcat.on("error", () => skip("failed to spawn adb logcat"));
+  logcat.on("close", () => {
+    // Getting killed once the tests pass is the expected way for this to end.
+    if (!crashed) {
+      skip("adb logcat exited");
+    }
+  });
+
+  for await (const line of readline.createInterface({ input: logcat.stdout })) {
+    trace.push(line);
+    if (crashed) {
+      continue;
+    } else if (line.includes(APP_ID)) {
+      crashed = true;
+      // Give the rest of the stack trace a moment to arrive before printing it.
+      setTimeout(() => {
+        console.error(`\n[crash-watchdog] ${APP_ID} crashed:\n`);
+        console.error(trace.join("\n"));
+        process.exit(1);
+      }, TRACE_GRACE_MS);
+    } else if (trace.length > LEAD_IN_LINES) {
+      trace.shift();
+    }
+  }
+}
+
+await main();
@@ -1,5 +1,5 @@
 {
-  "extends": "@react-native/typescript-config/tsconfig.json",
+  "extends": "@react-native/typescript-config",
   "compilerOptions": {
     "types": ["react-native", "mocha"]
   },
 
@@ -7,5 +7,5 @@
     "rootDir": "scripts",
     "types": ["node"]
   },
-  "include": ["scripts/**/*.ts"]
+  "include": ["scripts"]
 }
@@ -2,7 +2,7 @@
 
 ## Building Hermes from source
 
-Because we're using a version of Hermes patched with Node-API support, we need to build React Native from source.
+Because we build Hermes from source (a pinned commit carrying its Node-API implementation), we need to build React Native from source too.
 
 Follow [the React Native documentation on how to build from source](https://reactnative.dev/contributing/how-to-build-from-source#update-your-project-to-build-from-source).
 
@@ -23,7 +23,7 @@ In particular, you will have to edit the `android/settings.gradle` file as follo
 > + }
 > ```
 
-To download our custom version of Hermes, you need to run from your app package:
+To fetch the pinned Hermes, you need to run from your app package:
 
 ```
 npx react-native-node-api vendor-hermes
@@ -39,7 +39,7 @@ export REACT_NATIVE_OVERRIDE_HERMES_DIR=$(npx react-native-node-api vendor-herme
 
 ## Cleaning your React Native build folders
 
-If you've accidentally built your app without Hermes patched, you can clean things up by deleting the `ReactAndroid` build folder.
+If you've accidentally built your app without the vendored Hermes, you can clean things up by deleting the `ReactAndroid` build folder.
 
 ```
 rm -rf node_modules/react-native/ReactAndroid/build
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "extends": "@react-native/typescript-config/tsconfig.json",`
	`2`	`+ "extends": "@react-native/typescript-config",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"types": ["react-native", "mocha"]`
`5`	`5`	`},`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@`
`7`	`7`	`"rootDir": "scripts",`
`8`	`8`	`"types": ["node"]`
`9`	`9`	`},`
`10`		`- "include": ["scripts/*/.ts"]`
	`10`	`+ "include": ["scripts"]`
`11`	`11`	`}`