Merge remote-tracking branch 'upstream/main' into replace-package-manager

Author: dougg0k

.changeset/fresh-nails-repair.md

@@ -0,0 +1,8 @@
+---
+"gyp-to-cmake": patch
+"cmake-rn": patch
+"ferric-cli": patch
+"react-native-node-api": patch
+---
+
+Refactored CLIs to use a shared utility package

.changeset/red-candles-sell.md

@@ -0,0 +1,5 @@
+---
+"react-native-node-api": patch
+---
+
+Move REACT_NATIVE_OVERRIDE_HERMES_DIR out of tasks to fail earlier

.changeset/rotten-melons-brush.md

@@ -0,0 +1,5 @@
+---
+"cmake-rn": minor
+---
+
+Breaking: Renamed --target to --triplet to free up --target for passing CMake targets

.changeset/salty-kiwis-turn.md

@@ -0,0 +1,5 @@
+---
+"cmake-rn": patch
+---
+
+Pretty print spawn errors instead of simply rethrowing to commander.

.changeset/shaggy-dots-deny.md

@@ -0,0 +1,5 @@
+---
+"cmake-rn": minor
+---
+
+Add passing of definitions (-D) to cmake when configuring

.changeset/social-rivers-tie.md

@@ -0,0 +1,5 @@
+---
+"cmake-rn": patch
+---
+
+Assert the existence of CMakeList.txt before passing control to CMake

.changeset/swift-loops-create.md

@@ -0,0 +1,5 @@
+---
+"cmake-rn": minor
+---
+
+Pass --target to CMake

.github/workflows/check.yml

@@ -3,6 +3,8 @@ name: Check
 env:
   # Version here should match the one in React Native template and packages/cmake-rn/src/cli.ts
   NDK_VERSION: 27.1.12297006
+  # Enabling the Gradle test on CI (disabled by default because it downloads a lot)
+  ENABLE_GRADLE_TESTS: true
 
 on:
   push:
@@ -110,7 +112,7 @@ jobs:
       - run: pnpm install --frozen-lockfile
       - run: pnpm bootstrap
         env:
-          CMAKE_RN_TARGETS: arm64-apple-ios-sim
+          CMAKE_RN_TRIPLETS: arm64-apple-ios-sim
           FERRIC_TARGETS: aarch64-apple-ios-sim
       - run: pnpm pod-install
         working-directory: apps/test-app
@@ -146,8 +148,8 @@ jobs:
       - run: pnpm install --frozen-lockfile
       - run: pnpm bootstrap
         env:
-          CMAKE_RN_TARGETS: i686-linux-android
-          FERRIC_TARGETS: i686-linux-android
+          CMAKE_RN_TRIPLETS: x86_64-linux-android
+          FERRIC_TARGETS: x86_64-linux-android
       - name: Clone patched Hermes version
         shell: bash
         run: |
@@ -180,9 +182,8 @@ jobs:
         with:
           api-level: 29
           force-avd-creation: false
-          emulator-options: -no-snapshot-save -no-metrics -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          arch: x86
+          arch: x86_64
           ndk: ${{ env.NDK_VERSION }}
           cmake: 3.22.1
           working-directory: apps/test-app

apps/test-app/App.tsx

@@ -72,7 +72,7 @@ function loadTests({
     it("exports a callable sum function", () => {
       const exampleAddon =
         /* eslint-disable-next-line @typescript-eslint/no-require-imports -- TODO: Determine why a dynamic import doesn't work on Android */
-        require("ferric-example") as typeof import("ferric-example");
+        require("@react-native-node-api/ferric-example") as typeof import("@react-native-node-api/ferric-example");
       const result = exampleAddon.sum(1, 3);
       if (result !== 4) {
         throw new Error(`Expected 1 + 3 to equal 4, but got ${result}`);

apps/test-app/CHANGELOG.md

@@ -1,5 +1,20 @@
 # react-native-node-api-test-app
 
+## 0.2.0
+
+### Minor Changes
+
+- a0212c8: Add explicit support for React Native 0.81.1 (0.79.6, 0.80.0, 0.80.1, 0.80.2 & 0.81.0)
+
+### Patch Changes
+
+- a0212c8: Renamed ferric-example in test app to match mono-repo packages
+- Updated dependencies [a0212c8]
+- Updated dependencies [a0212c8]
+  - [email protected]
+  - @react-native-node-api/node-tests@undefined
+  - @react-native-node-api/node-addon-examples@undefined
+
 ## 0.1.2
 
 ### Patch Changes