Merge remote-tracking branch 'upstream/main' into improve-build

Author: dougg0k

apps/test-app/App.tsx

@@ -9,6 +9,7 @@ import {
 } from "mocha-remote-react-native";
 
 import { suites as nodeAddonExamplesSuites } from "@react-native-node-api/node-addon-examples";
+import { suites as nodeTestsSuites } from "@react-native-node-api/node-tests";
 
 function describeIf(
   condition: boolean,
@@ -21,12 +22,14 @@ function describeIf(
 type Context = {
   allTests?: boolean;
   nodeAddonExamples?: boolean;
+  nodeTests?: boolean;
   ferricExample?: boolean;
 };
 
 function loadTests({
   allTests = false,
   nodeAddonExamples = allTests,
+  nodeTests = allTests,
   ferricExample = allTests,
 }: Context) {
   describeIf(nodeAddonExamples, "Node Addon Examples", () => {
@@ -46,6 +49,22 @@ function loadTests({
     }
   });
 
+  describeIf(nodeTests, "Node Tests", () => {
+    function registerTestSuite(suite: typeof nodeTestsSuites) {
+      for (const [name, suiteOrTest] of Object.entries(suite)) {
+        if (typeof suiteOrTest === "function") {
+          it(name, suiteOrTest);
+        } else {
+          describe(name, () => {
+            registerTestSuite(suiteOrTest);
+          });
+        }
+      }
+    }
+
+    registerTestSuite(nodeTestsSuites);
+  });
+
   describeIf(ferricExample, "ferric-example", () => {
     it("exports a callable sum function", () => {
       /* eslint-disable-next-line @typescript-eslint/no-require-imports -- TODO: Determine why a dynamic import doesn't work on Android */

apps/test-app/package.json

@@ -10,10 +10,12 @@
     "test:android": "mocha-remote --exit-on-error -- concurrently --kill-others-on-fail --passthrough-arguments npm:metro 'npm:android -- {@}' --",
     "test:android:allTests": "MOCHA_REMOTE_CONTEXT=allTests npm run test:android -- ",
     "test:android:nodeAddonExamples": "MOCHA_REMOTE_CONTEXT=nodeAddonExamples npm run test:android -- ",
+    "test:android:nodeTests": "MOCHA_REMOTE_CONTEXT=nodeTests npm run test:android -- ",
     "test:android:ferricExample": "MOCHA_REMOTE_CONTEXT=ferricExample npm run test:android -- ",
     "test:ios": "mocha-remote --exit-on-error -- concurrently --passthrough-arguments --kill-others-on-fail npm:metro 'npm:ios -- {@}' --",
     "test:ios:allTests": "MOCHA_REMOTE_CONTEXT=allTests npm run test:ios -- ",
     "test:ios:nodeAddonExamples": "MOCHA_REMOTE_CONTEXT=nodeAddonExamples npm run test:ios -- ",
+    "test:ios:nodeTests": "MOCHA_REMOTE_CONTEXT=nodeTests npm run test:ios -- ",
     "test:ios:ferricExample": "MOCHA_REMOTE_CONTEXT=ferricExample npm run test:ios -- "
   },
   "dependencies": {
@@ -23,6 +25,8 @@
     "@react-native-community/cli": "^18.0.0",
     "@react-native-community/cli-platform-android": "^18.0.0",
     "@react-native-community/cli-platform-ios": "^18.0.0",
+    "@react-native-node-api/node-addon-examples": "*",
+    "@react-native-node-api/node-tests": "*",
     "@react-native/babel-preset": "0.79.0",
     "@react-native/metro-config": "0.79.0",
     "@react-native/typescript-config": "0.79.0",
@@ -36,7 +40,6 @@
     "mocha-remote-react-native": "^1.13.2",
     "react": "19.0.0",
     "react-native": "0.79.5",
-    "react-native-node-addon-examples": "*",
     "react-native-node-api": "*",
     "react-native-test-app": "^4.3.3"
   }

eslint.config.js

@@ -13,6 +13,8 @@ export default tseslint.config(
     "packages/host/hermes/**",
     "packages/node-addon-examples/examples/**",
     "packages/ferric-example/dist/ferric_example.d.ts",
+    "packages/node-tests/node/**",
+    "packages/node-tests/tests/**",
   ]),
   eslint.configs.recommended,
   tseslint.configs.recommended,
@@ -23,6 +25,7 @@ export default tseslint.config(
       "packages/node-addon-examples/*.js",
       "packages/host/babel-plugin.js",
       "packages/host/react-native.config.js",
+      "packages/node-tests/tests.generated.js",
     ],
     languageOptions: {
       parserOptions: {