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

dougg0k · dougg0k · commit 0f32d7bb7ea3 · 2025-08-09T10:52:57.000-03:00
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -29,8 +29,26 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: lts/jod
+      # Set up JDK and Android SDK only because we need weak-node-api, to build ferric-example and to run the linting
+      # TODO: Remove this once we have a way to run linting without building the native code
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: "17"
+          distribution: "temurin"
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+        with:
+          packages: tools platform-tools ndk;${{ env.NDK_VERSION }}
+      - run: rustup target add x86_64-linux-android
       - run: pnpm install --frozen-lockfile
+      - run: pnpm build
+      # Bootstrap host package to get weak-node-api and ferric-example to get types
+      # TODO: Solve this by adding an option to ferric to build only types or by committing the types into the repo as a fixture for an "init" command
+      - run: pnpm --filter react-native-node-api bootstrap --filter @react-native-node-api/ferric-example bootstrap
       - run: pnpm lint
+        env:
+          DEBUG: eslint:eslint
       - run: pnpm prettier:check
   unit-tests:
     strategy:
diff --git a/apps/test-app/App.tsx b/apps/test-app/App.tsx
@@ -41,7 +41,10 @@ function loadTests({
           it(exampleName, async () => {
             const test = requireExample();
             if (test instanceof Function) {
-              await test();
+              const result = test();
+              if (result instanceof Promise) {
+                await result;
+              }
             }
           });
         }
@@ -67,8 +70,9 @@ function loadTests({
 
   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 */
-      const exampleAddon = require("ferric-example");
+      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");
       const result = exampleAddon.sum(1, 3);
       if (result !== 4) {
         throw new Error(`Expected 1 + 3 to equal 4, but got ${result}`);
diff --git a/eslint.config.js b/eslint.config.js
@@ -9,24 +9,50 @@ import eslintConfigPrettier from "eslint-config-prettier/flat";
 export default tseslint.config(
   globalIgnores([
     "**/dist/**",
+    "**/build/**",
     "apps/test-app/ios/**",
     "packages/host/hermes/**",
     "packages/node-addon-examples/examples/**",
+    "packages/ferric-example/ferric_example.js",
     "packages/ferric-example/ferric_example.d.ts",
+    "packages/ferric-example/target/**",
     "packages/node-tests/node/**",
     "packages/node-tests/tests/**",
+    "packages/node-tests/*.generated.js",
+    "packages/node-tests/*.generated.d.ts",
   ]),
   eslint.configs.recommended,
-  tseslint.configs.recommended,
+  tseslint.configs.recommendedTypeChecked,
+  {
+    rules: {
+      "@typescript-eslint/no-floating-promises": [
+        "error",
+        {
+          allowForKnownSafeCalls: [
+            { from: "package", name: ["suite", "test"], package: "node:test" },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    languageOptions: {
+      parserOptions: {
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+  },
   eslintConfigPrettier,
   {
     files: [
       "apps/test-app/*.js",
-      "packages/node-addon-examples/*.js",
+      "packages/node-addon-examples/**/*.js",
       "packages/host/babel-plugin.js",
       "packages/host/react-native.config.js",
       "packages/node-tests/tests.generated.js",
     ],
+    extends: [tseslint.configs.disableTypeChecked],
     languageOptions: {
       parserOptions: {
         sourceType: "commonjs",
@@ -45,7 +71,10 @@ export default tseslint.config(
       "packages/gyp-to-cmake/bin/*.js",
       "packages/host/bin/*.mjs",
       "packages/host/scripts/*.mjs",
+      "packages/ferric/bin/*.js",
+      "packages/cmake-rn/bin/*.js",
     ],
+    extends: [tseslint.configs.disableTypeChecked],
     languageOptions: {
       globals: {
         ...globals.node,
diff --git a/package.json b/package.json
@@ -33,19 +33,19 @@
   "license": "MIT",
   "devDependencies": {
     "@changesets/cli": "^2.29.5",
-    "@eslint/js": "^9.19.0",
+    "@eslint/js": "^9.32.0",
     "@prettier/plugin-oxc": "^0.0.4",
     "@reporters/github": "^1.7.2",
     "@tsconfig/node22": "^22.0.0",
     "@tsconfig/react-native": "3.0.5",
-    "@types/node": "^22.13.0",
-    "eslint": "^9.19.0",
-    "eslint-config-prettier": "^10.1.5",
+    "@types/node": "^22",
+    "eslint": "^9.32.0",
+    "eslint-config-prettier": "^10.1.8",
     "globals": "^16.0.0",
     "prettier": "^3.6.2",
     "react-native": "0.79.5",
     "tsx": "^4.20.3",
-    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.22.0"
+    "typescript": "^5.8.0",
+    "typescript-eslint": "^8.38.0"
   }
 }
diff --git a/packages/cmake-rn/src/platforms.ts b/packages/cmake-rn/src/platforms.ts
@@ -18,6 +18,11 @@ export function findPlatformForTarget(target: unknown) {
   const platform = Object.values(platforms).find((platform) =>
     platformHasTarget(platform, target),
   );
-  assert(platform, `Unable to determine platform from target: ${target}`);
+  assert(
+    platform,
+    `Unable to determine platform from target: ${
+      typeof target === "string" ? target : JSON.stringify(target)
+    }`,
+  );
   return platform;
 }
diff --git a/packages/cmake-rn/src/weak-node-api.ts b/packages/cmake-rn/src/weak-node-api.ts
@@ -37,7 +37,7 @@ export function getWeakNodeApiPath(triplet: SupportedTriplet): string {
     assert(fs.existsSync(libraryPath), `Expected library at ${libraryPath}`);
     return libraryPath;
   } else {
-    throw new Error(`Unexpected triplet: ${triplet}`);
+    throw new Error(`Unexpected triplet: ${triplet as string}`);
   }
 }
 
diff --git a/packages/cmake-rn/tsconfig.json b/packages/cmake-rn/tsconfig.json
@@ -1,4 +1,7 @@
 {
+  "compilerOptions": {
+    "composite": true
+  },
   "files": [],
   "references": [
     { "path": "./tsconfig.node.json" },
diff --git a/packages/ferric/src/cargo.ts b/packages/ferric/src/cargo.ts
@@ -223,6 +223,6 @@ export function getTargetEnvironmentVariables({
       ].join(String.fromCharCode(0x1f)),
     };
   } else {
-    throw new Error(`Unexpected target: ${target}`);
+    throw new Error(`Unexpected target: ${target as string}`);
   }
 }
diff --git a/packages/ferric/src/targets.ts b/packages/ferric/src/targets.ts
@@ -99,6 +99,6 @@ export function filterTargetsByPlatform(
   } else if (platform === "apple") {
     return [...targets].filter(isAppleTarget);
   } else {
-    throw new Error(`Unexpected platform ${platform}`);
+    throw new Error(`Unexpected platform ${platform as string}`);
   }
 }
diff --git a/packages/gyp-to-cmake/src/cli.ts b/packages/gyp-to-cmake/src/cli.ts
@@ -78,6 +78,6 @@ export const program = new Command("gyp-to-cmake")
     } else if (stat.isDirectory()) {
       transformBindingGypsRecursively(targetPath, options);
     } else {
-      throw new Error(`Expected either a file or a directory: ${path}`);
+      throw new Error(`Expected either a file or a directory: ${targetPath}`);
     }
   });
diff --git a/packages/host/scripts/node-api-functions.ts b/packages/host/scripts/node-api-functions.ts
@@ -51,7 +51,7 @@ export function getNodeApiHeaderAST(version: NodeApiVersion) {
       maxBuffer: 1024 * 1024 * 10,
     },
   );
-  const parsed = JSON.parse(output);
+  const parsed = JSON.parse(output) as unknown;
   return clangAstDump.parse(parsed);
 }
 
diff --git a/packages/host/src/node/babel-plugin/plugin.test.ts b/packages/host/src/node/babel-plugin/plugin.test.ts
@@ -10,7 +10,7 @@ import { setupTempDirectory } from "../test-utils.js";
 type TestTransformationOptions = {
   files: Record<string, string>;
   inputFilePath: string;
-  assertion(code: string): void;
+  assertion: (code: string) => void;
   options?: PluginOptions;
 };
 
diff --git a/packages/host/src/node/cli/link-modules.ts b/packages/host/src/node/cli/link-modules.ts
@@ -152,6 +152,6 @@ export function getLinkedModuleOutputPath(
   } else if (platform === "apple") {
     return path.join(getAutolinkPath(platform), libraryName + ".xcframework");
   } else {
-    throw new Error(`Unsupported platform: ${platform}`);
+    throw new Error(`Unsupported platform: ${platform as string}`);
   }
 }
diff --git a/packages/host/src/node/cli/program.ts b/packages/host/src/node/cli/program.ts
@@ -38,7 +38,7 @@ function getLinker(platform: PlatformName): ModuleLinker {
   } else if (platform === "apple") {
     return linkXcframework;
   } else {
-    throw new Error(`Unknown platform: ${platform}`);
+    throw new Error(`Unknown platform: ${platform as string}`);
   }
 }
 
@@ -48,7 +48,7 @@ function getPlatformDisplayName(platform: PlatformName) {
   } else if (platform === "apple") {
     return "Apple";
   } else {
-    throw new Error(`Unknown platform: ${platform}`);
+    throw new Error(`Unknown platform: ${platform as string}`);
   }
 }
 
diff --git a/packages/host/src/node/path-utils.test.ts b/packages/host/src/node/path-utils.test.ts
@@ -399,7 +399,7 @@ describe("findNodeApiModulePaths", () => {
 });
 
 describe("findNodeApiModulePathsByDependency", () => {
-  it.only("should find Node-API paths by dependency (excluding certain packages)", async (context) => {
+  it("should find Node-API paths by dependency (excluding certain packages)", async (context) => {
     const packagesNames = ["lib-a", "lib-b", "lib-c"];
     const tempDir = setupTempDirectory(context, {
       "app/package.json": JSON.stringify({
@@ -489,16 +489,13 @@ describe("findNodeAddonForBindings()", () => {
   };
 
   for (const [name, relPath] of Object.entries(expectedPaths)) {
-    it(`should look for addons in common paths (${name} in "${relPath}")`, async (context) => {
+    it(`should look for addons in common paths (${name} in "${relPath}")`, (context) => {
       // Arrange
       const tempDirectoryPath = setupTempDirectory(context, {
         [relPath]: "// This is supposed to be a binary file",
       });
       // Act
-      const actualPath = await findNodeAddonForBindings(
-        name,
-        tempDirectoryPath,
-      );
+      const actualPath = findNodeAddonForBindings(name, tempDirectoryPath);
       // Assert
       const expectedAbsPath = path.join(tempDirectoryPath, relPath);
       assert.equal(actualPath, expectedAbsPath);
diff --git a/packages/host/src/node/path-utils.ts b/packages/host/src/node/path-utils.ts
@@ -24,10 +24,7 @@ export type PathSuffixChoice = (typeof PATH_SUFFIX_CHOICES)[number];
 export function assertPathSuffix(
   value: unknown,
 ): asserts value is PathSuffixChoice {
-  assert(
-    typeof value === "string",
-    `Expected a string, got ${typeof value} (${value})`,
-  );
+  assert(typeof value === "string", `Expected a string, got ${typeof value}`);
   assert(
     (PATH_SUFFIX_CHOICES as readonly string[]).includes(value),
     `Expected one of ${PATH_SUFFIX_CHOICES.join(", ")}`,
@@ -259,17 +256,15 @@ export function findPackageDependencyPaths(
   const { dependencies = {} } = readPackageSync({ cwd: packageRoot });
 
   return Object.fromEntries(
-    Object.keys(dependencies)
-      .map((dependencyName) => {
-        const resolvedDependencyRoot = resolvePackageRoot(
-          requireFromPackageRoot,
-          dependencyName,
-        );
-        return resolvedDependencyRoot
-          ? [dependencyName, resolvedDependencyRoot]
-          : undefined;
-      })
-      .filter((item) => typeof item !== "undefined"),
+    Object.keys(dependencies).flatMap((dependencyName) => {
+      const resolvedDependencyRoot = resolvePackageRoot(
+        requireFromPackageRoot,
+        dependencyName,
+      );
+      return resolvedDependencyRoot
+        ? [[dependencyName, resolvedDependencyRoot]]
+        : [];
+    }),
   );
 }
 
diff --git a/packages/host/src/react-native/index.ts b/packages/host/src/react-native/index.ts
@@ -1,5 +1,3 @@
 import native from "./NativeNodeApiHost";
 
-const { requireNodeAddon } = native;
-
-export { requireNodeAddon };
+export const requireNodeAddon = native.requireNodeAddon.bind(native);
diff --git a/packages/host/tsconfig.json b/packages/host/tsconfig.json
@@ -1,4 +1,7 @@
 {
+  "compilerOptions": {
+    "composite": true
+  },
   "files": [],
   "references": [
     { "path": "./tsconfig.node.json" },
diff --git a/packages/node-addon-examples/src/index.ts b/packages/node-addon-examples/src/index.ts
diff --git a/packages/node-addon-examples/tests/async/addon.js b/packages/node-addon-examples/tests/async/addon.js
diff --git a/packages/node-addon-examples/tests/buffers/addon.js b/packages/node-addon-examples/tests/buffers/addon.js
diff --git a/packages/node-addon-examples/tsconfig.json b/packages/node-addon-examples/tsconfig.json
diff --git a/packages/node-tests/tsconfig.json b/packages/node-tests/tsconfig.json
diff --git a/prettier.config.js b/prettier.config.js
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ export function getWeakNodeApiPath(triplet: SupportedTriplet): string {`
`37`	`37`	assert(fs.existsSync(libraryPath), `Expected library at ${libraryPath}`);
`38`	`38`	`return libraryPath;`
`39`	`39`	`} else {`
`40`		- throw new Error(`Unexpected triplet: ${triplet}`);
	`40`	+ throw new Error(`Unexpected triplet: ${triplet as string}`);
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`{`
	`2`	`+ "compilerOptions": {`
	`3`	`+ "composite": true`
	`4`	`+ },`
`2`	`5`	`"files": [],`
`3`	`6`	`"references": [`
`4`	`7`	`{ "path": "./tsconfig.node.json" },`
Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,6 @@ export function getTargetEnvironmentVariables({`
`223`	`223`	`].join(String.fromCharCode(0x1f)),`
`224`	`224`	`};`
`225`	`225`	`} else {`
`226`		- throw new Error(`Unexpected target: ${target}`);
	`226`	+ throw new Error(`Unexpected target: ${target as string}`);
`227`	`227`	`}`
`228`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,6 @@ export function filterTargetsByPlatform(`
`99`	`99`	`} else if (platform === "apple") {`
`100`	`100`	`return [...targets].filter(isAppleTarget);`
`101`	`101`	`} else {`
`102`		- throw new Error(`Unexpected platform ${platform}`);
	`102`	+ throw new Error(`Unexpected platform ${platform as string}`);
`103`	`103`	`}`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,6 @@ export const program = new Command("gyp-to-cmake")`
`78`	`78`	`} else if (stat.isDirectory()) {`
`79`	`79`	`transformBindingGypsRecursively(targetPath, options);`
`80`	`80`	`} else {`
`81`		- throw new Error(`Expected either a file or a directory: ${path}`);
	`81`	+ throw new Error(`Expected either a file or a directory: ${targetPath}`);
`82`	`82`	`}`
`83`	`83`	`});`