fix(android): support ESM config files (#2323)

tido64 · web-flow · commit de3c5df3b1b3 · 2024-11-20T15:05:07.000Z
diff --git a/.github/actions/setup-toolchain/action.yml b/.github/actions/setup-toolchain/action.yml
@@ -72,7 +72,7 @@ runs:
     - name: Set up Node.js
       uses: actions/setup-node@v4.1.0
       with:
-        node-version: "20"
+        node-version: "22"
         cache: ${{ inputs.cache-npm-dependencies }}
     - name: Set up Xcode
       if: ${{ inputs.xcode-developer-dir != '' }}
diff --git a/android/autolink.mjs b/android/autolink.mjs
@@ -1,6 +1,6 @@
 // @ts-check
 import { getCurrentState } from "@rnx-kit/tools-react-native/cache";
-import { loadContext } from "@rnx-kit/tools-react-native/context";
+import { loadContextAsync } from "@rnx-kit/tools-react-native";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import {
@@ -83,16 +83,16 @@ export function pruneDependencies(config) {
 /**
  * @param {string} json
  * @param {string} projectRoot
- * @returns {Config}
+ * @returns {Promise<Config>}
  */
-function loadConfig(json, projectRoot) {
+async function loadConfig(json, projectRoot) {
   const state = getCurrentState(projectRoot);
   const stateFile = json.substring(0, json.length - "json".length) + "sha256";
   if (fs.existsSync(stateFile) && readTextFile(stateFile) === state) {
     return readJSONFile(json);
   }
 
-  const config = loadContext(projectRoot);
+  const config = await loadContextAsync(projectRoot);
   const prunedConfig = pruneDependencies(config);
 
   ensureDirForFile(json);
@@ -101,10 +101,13 @@ function loadConfig(json, projectRoot) {
   return prunedConfig;
 }
 
-if (isMain(import.meta.url)) {
-  const [, , projectRoot = process.cwd(), output] = process.argv;
-
-  const config = loadConfig(
+/**
+ * @param {string} projectRoot
+ * @param {string} output
+ * @returns {Promise<void>}
+ */
+async function main(projectRoot, output) {
+  const config = await loadConfig(
     output.replace(
       /[/\\]app[/\\]build[/\\]generated[/\\]rnta[/\\]/,
       "/build/generated/autolinking/"
@@ -121,3 +124,8 @@ if (isMain(import.meta.url)) {
     writeTextFile(output, json + "\n");
   }
 }
+
+if (isMain(import.meta.url)) {
+  const [, , projectRoot = process.cwd(), output = ""] = process.argv;
+  await main(projectRoot, output);
+}
diff --git a/package.json b/package.json
@@ -81,15 +81,15 @@
     "postpack": "node scripts/internal/pack.mjs post",
     "release-notes": "node scripts/internal/release-notes.mjs",
     "set-react-version": "node scripts/internal/set-react-version.mjs",
-    "show-affected": "node --import tsx scripts/build/affected.ts",
+    "show-affected": "node --experimental-transform-types --no-warnings scripts/build/affected.ts",
     "test": "node scripts/internal/test.mjs",
-    "test:js": "node --import tsx --test $(git ls-files '*.test.ts')",
+    "test:js": "node --experimental-transform-types --no-warnings --test $(git ls-files '*.test.ts')",
     "test:matrix": "node scripts/testing/test-matrix.mjs",
     "test:rb": "bundle exec ruby -Ilib:test -e \"Dir.glob('./test/test_*.rb').each { |file| require(file) }\""
   },
   "dependencies": {
     "@rnx-kit/react-native-host": "^0.5.0",
-    "@rnx-kit/tools-react-native": "^2.0.0",
+    "@rnx-kit/tools-react-native": "^2.0.1",
     "ajv": "^8.0.0",
     "cliui": "^8.0.0",
     "fast-xml-parser": "^4.0.0",
@@ -146,7 +146,6 @@
     "react-native-windows": "^0.75.0",
     "semantic-release": "^24.0.0",
     "suggestion-bot": "^3.0.0",
-    "tsx": "^4.16.2",
     "typescript": "^5.0.0"
   },
   "engines": {
diff --git a/scripts/internal/test.mjs b/scripts/internal/test.mjs
@@ -31,8 +31,8 @@ switch (getTarget(input)) {
     break;
   case "typescript":
     testWith(process.argv0, [
-      "--import",
-      "tsx",
+      "--experimental-transform-types",
+      "--no-warnings",
       "--test",
       "--experimental-test-coverage",
       ...input,
diff --git a/test/android/gradle.ts b/test/android/gradle.ts
@@ -6,8 +6,8 @@ import * as path from "node:path";
 import { URL, fileURLToPath } from "node:url";
 import { gatherConfig, writeAllFiles } from "../../scripts/configure.mjs";
 import { findNearest, readJSONFile } from "../../scripts/helpers.js";
-import type { ConfigureParams } from "../../scripts/types.js";
-import { templatePath } from "../template.js";
+import type { ConfigureParams } from "../../scripts/types.ts";
+import { templatePath } from "../template.ts";
 
 const GRADLE_TEST_TASK = "nodeTest";
 const MKDIR_OPTIONS = { recursive: true, mode: 0o755 };
diff --git a/test/android/test-app-util.test.ts b/test/android/test-app-util.test.ts
@@ -6,7 +6,7 @@ import {
   reactNativeVersion,
   removeProject,
   runGradleWithProject,
-} from "./gradle.js";
+} from "./gradle.ts";
 
 describe("test-app-util.gradle", () => {
   const defaultTestProject = "TestAppUtilTest";
diff --git a/test/configure/gatherConfig.test.ts b/test/configure/gatherConfig.test.ts
@@ -3,9 +3,9 @@ import { describe, it } from "node:test";
 import { gatherConfig as gatherConfigActual } from "../../scripts/configure.mjs";
 import { readTextFile } from "../../scripts/helpers.js";
 import { join } from "../../scripts/template.mjs";
-import type { Configuration, ConfigureParams } from "../../scripts/types.js";
-import { templatePath } from "../template.js";
-import { mockParams } from "./mockParams.js";
+import type { Configuration, ConfigureParams } from "../../scripts/types.ts";
+import { templatePath } from "../template.ts";
+import { mockParams } from "./mockParams.ts";
 
 describe("gatherConfig()", () => {
   const templateDir = templatePath.substring(
diff --git a/test/configure/getAppName.test.ts b/test/configure/getAppName.test.ts
@@ -1,7 +1,7 @@
 import { equal } from "node:assert/strict";
 import { afterEach, describe, it } from "node:test";
 import { getAppName as getAppNameActual } from "../../scripts/configure.mjs";
-import { fs, setMockFiles } from "../fs.mock.js";
+import { fs, setMockFiles } from "../fs.mock.ts";
 
 describe("getAppName()", () => {
   const getAppName: typeof getAppNameActual = (p) => getAppNameActual(p, fs);
diff --git a/test/configure/getConfig.test.ts b/test/configure/getConfig.test.ts
@@ -5,9 +5,9 @@ import {
   getConfig as getConfigActual,
   getPlatformPackage,
 } from "../../scripts/configure.mjs";
-import type { ConfigureParams, Platform } from "../../scripts/types.js";
-import { templatePath } from "../template.js";
-import { mockParams } from "./mockParams.js";
+import type { ConfigureParams, Platform } from "../../scripts/types.ts";
+import { templatePath } from "../template.ts";
+import { mockParams } from "./mockParams.ts";
 
 describe("getConfig()", () => {
   const getConfig: typeof getConfigActual = (params, platform) =>
diff --git a/test/configure/isDestructive.test.ts b/test/configure/isDestructive.test.ts
@@ -1,7 +1,7 @@
 import { equal, ok } from "node:assert/strict";
 import { afterEach, describe, it } from "node:test";
 import { isDestructive as isDestructiveActual } from "../../scripts/configure.mjs";
-import { fs, setMockFiles } from "../fs.mock.js";
+import { fs, setMockFiles } from "../fs.mock.ts";
 
 describe("isDestructive()", () => {
   /**
diff --git a/test/configure/mockParams.ts b/test/configure/mockParams.ts
@@ -1,5 +1,5 @@
 /* node:coverage disable */
-import type { ConfigureParams } from "../../scripts/types.js";
+import type { ConfigureParams } from "../../scripts/types.ts";
 
 /**
  * Returns mock parameters.
diff --git a/test/configure/reactNativeConfig.test.ts b/test/configure/reactNativeConfig.test.ts
@@ -1,8 +1,8 @@
 import { equal, ok } from "node:assert/strict";
 import { describe, it } from "node:test";
 import { reactNativeConfig as reactNativeConfigActual } from "../../scripts/configure.mjs";
-import type { ConfigureParams } from "../../scripts/types.js";
-import { mockParams } from "./mockParams.js";
+import type { ConfigureParams } from "../../scripts/types.ts";
+import { mockParams } from "./mockParams.ts";
 
 describe("reactNativeConfig()", () => {
   const reactNativeConfig = (params: ConfigureParams): string => {
diff --git a/test/configure/removeAllFiles.test.ts b/test/configure/removeAllFiles.test.ts
@@ -1,7 +1,7 @@
 import { ok } from "node:assert/strict";
 import { after, beforeEach, describe, it } from "node:test";
 import { removeAllFiles as removeAllFilesActual } from "../../scripts/configure.mjs";
-import { fs, setMockFiles } from "../fs.mock.js";
+import { fs, setMockFiles } from "../fs.mock.ts";
 
 describe("removeAllFiles()", () => {
   const removeAllFiles: typeof removeAllFilesActual = (files, destination) =>
diff --git a/test/configure/updatePackageManifest.test.ts b/test/configure/updatePackageManifest.test.ts
@@ -3,8 +3,8 @@ import { afterEach, describe, it } from "node:test";
 import { URL } from "node:url";
 import { updatePackageManifest as updatePackageManifestActual } from "../../scripts/configure.mjs";
 import { readJSONFile } from "../../scripts/helpers.js";
-import type { Manifest } from "../../scripts/types.js";
-import { fs, setMockFiles } from "../fs.mock.js";
+import type { Manifest } from "../../scripts/types.ts";
+import { fs, setMockFiles } from "../fs.mock.ts";
 
 function getExampleManifest() {
   const p = new URL("../../example/package.json", import.meta.url);
diff --git a/test/configure/writeAllFiles.test.ts b/test/configure/writeAllFiles.test.ts
@@ -3,7 +3,7 @@ import * as path from "node:path";
 import { afterEach, describe, it } from "node:test";
 import { writeAllFiles as writeAllFilesActual } from "../../scripts/configure.mjs";
 import { readTextFile as readTextFileActual } from "../../scripts/helpers.js";
-import { fs, setMockFiles } from "../fs.mock.js";
+import { fs, setMockFiles } from "../fs.mock.ts";
 
 describe("writeAllFiles()", () => {
   const readTextFile: typeof readTextFileActual = (p) =>
diff --git a/test/embed-manifest/cpp.test.ts b/test/embed-manifest/cpp.test.ts
@@ -1,7 +1,7 @@
 import { equal } from "node:assert/strict";
 import { describe, it } from "node:test";
 import { generate as generateActual } from "../../scripts/embed-manifest/cpp.mjs";
-import * as fixtures from "./fixtures.js";
+import * as fixtures from "./fixtures.ts";
 
 describe("embed manifest (C++)", () => {
   const generate = (json: Record<string, unknown>) => generateActual(json, "0");
diff --git a/test/embed-manifest/kotlin.test.ts b/test/embed-manifest/kotlin.test.ts
@@ -1,7 +1,7 @@
 import { equal } from "node:assert/strict";
 import { describe, it } from "node:test";
 import { generate as generateActual } from "../../scripts/embed-manifest/kotlin.mjs";
-import * as fixtures from "./fixtures.js";
+import * as fixtures from "./fixtures.ts";
 
 describe("embed manifest (Kotlin)", () => {
   const generate = (json: Record<string, unknown>) => generateActual(json, "0");
diff --git a/test/embed-manifest/swift.test.ts b/test/embed-manifest/swift.test.ts
@@ -1,7 +1,7 @@
 import { equal } from "node:assert/strict";
 import { describe, it } from "node:test";
 import { generate as generateActual } from "../../scripts/embed-manifest/swift.mjs";
-import * as fixtures from "./fixtures.js";
+import * as fixtures from "./fixtures.ts";
 
 describe("embed manifest (Swift)", () => {
   const generate = (json: Record<string, unknown>) => generateActual(json, "0");
diff --git a/test/embed-manifest/validate.test.ts b/test/embed-manifest/validate.test.ts
@@ -2,7 +2,7 @@ import { deepEqual, equal, match, notEqual } from "node:assert/strict";
 import { afterEach, describe, it } from "node:test";
 import { validate as validateActual } from "../../scripts/embed-manifest/validate.mjs";
 import { findFile as findFileActual } from "../../scripts/helpers.js";
-import { fs, setMockFiles } from "../fs.mock.js";
+import { fs, setMockFiles } from "../fs.mock.ts";
 
 describe("validate()", () => {
   const findFile: typeof findFileActual = (file, startDir = undefined) =>
diff --git a/test/windows/copyAndReplace.test.ts b/test/windows/copyAndReplace.test.ts
@@ -2,7 +2,7 @@ import { equal, fail, match, rejects } from "node:assert/strict";
 import { afterEach, describe, it } from "node:test";
 import { readTextFile as readTextFileActual } from "../../scripts/helpers.js";
 import { copyAndReplace as copyAndReplaceActual } from "../../windows/test-app.mjs";
-import { fs, setMockFiles } from "../fs.mock.js";
+import { fs, setMockFiles } from "../fs.mock.ts";
 
 describe("copyAndReplace()", () => {
   const copyAndReplace: typeof copyAndReplaceActual = (src, dst, r) =>
diff --git a/test/windows/generateSolution.test.ts b/test/windows/generateSolution.test.ts
@@ -2,7 +2,7 @@ import { equal } from "node:assert/strict";
 import * as path from "node:path";
 import { afterEach, beforeEach, describe, it } from "node:test";
 import { generateSolution as generateSolutionActual } from "../../windows/test-app.mjs";
-import { fs, setMockFiles } from "../fs.mock.js";
+import { fs, setMockFiles } from "../fs.mock.ts";
 
 describe("generateSolution()", () => {
   const generateSolution: typeof generateSolutionActual = (d, cfg) =>
diff --git a/test/windows/getBundleResources.test.ts b/test/windows/getBundleResources.test.ts
@@ -2,7 +2,7 @@ import { deepEqual, equal, match } from "node:assert/strict";
 import * as path from "node:path";
 import { afterEach, describe, it } from "node:test";
 import { getBundleResources as getBundleResourcesActual } from "../../windows/project.mjs";
-import { fs, setMockFiles } from "../fs.mock.js";
+import { fs, setMockFiles } from "../fs.mock.ts";
 
 describe("getBundleResources()", () => {
   const getBundleResources: typeof getBundleResourcesActual = (p) =>
diff --git a/test/windows/parseResources.test.ts b/test/windows/parseResources.test.ts
@@ -1,7 +1,7 @@
 import { deepEqual, equal, match } from "node:assert/strict";
 import { afterEach, describe, it } from "node:test";
 import { parseResources as parseResourcesActual } from "../../windows/project.mjs";
-import { fs, setMockFiles } from "../fs.mock.js";
+import { fs, setMockFiles } from "../fs.mock.ts";
 
 describe("parseResources()", () => {
   const parseResources: typeof parseResourcesActual = (r, p) =>
diff --git a/tsconfig.json b/tsconfig.json
@@ -3,6 +3,7 @@
   "compilerOptions": {
     "target": "ES2022",
     "module": "ES2022",
+    "allowImportingTsExtensions": true,
     "moduleResolution": "Node",
     "noEmit": true,
     "lib": ["ES2022", "DOM"]
diff --git a/yarn.lock b/yarn.lock
