Remove incremental linking

Author: kraenhansen

packages/host/src/node/cli/android.ts

@@ -2,7 +2,7 @@ import assert from "node:assert/strict";
 import fs from "node:fs";
 import path from "node:path";
 
-import { getLatestMtime, getLibraryName, MAGIC_FILENAME } from "../path-utils";
+import { getLibraryName, MAGIC_FILENAME } from "../path-utils";
 import {
   getLinkedModuleOutputPath,
   LinkModuleResult,
@@ -17,27 +17,13 @@ const ANDROID_ARCHITECTURES = [
 ] as const;
 
 export async function linkAndroidDir({
-  incremental,
   modulePath,
   naming,
   platform,
 }: LinkModuleOptions): Promise<LinkModuleResult> {
   const libraryName = getLibraryName(modulePath, naming);
   const outputPath = getLinkedModuleOutputPath(platform, modulePath, naming);
 
-  if (incremental && fs.existsSync(outputPath)) {
-    const moduleModified = getLatestMtime(modulePath);
-    const outputModified = getLatestMtime(outputPath);
-    if (moduleModified < outputModified) {
-      return {
-        originalPath: modulePath,
-        libraryName,
-        outputPath,
-        skipped: true,
-      };
-    }
-  }
-
   await fs.promises.rm(outputPath, { recursive: true, force: true });
   await fs.promises.cp(modulePath, outputPath, { recursive: true });
   for (const arch of ANDROID_ARCHITECTURES) {

packages/host/src/node/cli/apple.ts

@@ -7,16 +7,15 @@ import * as xcode from "@bacons/xcode";
 import * as xcodeJson from "@bacons/xcode/json";
 import * as zod from "zod";
 
-import { assertFixable, chalk, spawn } from "@react-native-node-api/cli-utils";
+import { chalk, spawn } from "@react-native-node-api/cli-utils";
 
-import { getLatestMtime, getLibraryName } from "../path-utils.js";
+import { getLibraryName } from "../path-utils.js";
 import {
-  getLinkedModuleOutputPath,
   LinkModuleOptions,
   LinkModuleResult,
   ModuleLinker,
 } from "./link-modules.js";
-import { findXcodeProject, getBuildDirPath } from "./xcode-helpers.js";
+import { findXcodeProject } from "./xcode-helpers.js";
 
 const PACKAGE_ROOT = path.resolve(__dirname, "..", "..", "..");
 const CLI_PATH = path.resolve(PACKAGE_ROOT, "bin", "react-native-node-api.mjs");
@@ -461,21 +460,13 @@ export function determineFrameworkSlice(): {
 export async function linkXcframework({
   platform,
   modulePath,
-  incremental,
   naming,
   outputPath: outputParentPath,
   signingIdentity,
 }: LinkModuleOptions & {
   outputPath: string;
   signingIdentity?: string;
 }): Promise<LinkModuleResult> {
-  assertFixable(
-    !incremental,
-    "Incremental linking is not supported for Apple frameworks",
-    {
-      instructions: "Run the command with the --force flag",
-    },
-  );
   // Copy the xcframework to the output directory and rename the framework and binary
   const newLibraryName = getLibraryName(modulePath, naming);
   const frameworkOutputPath = path.join(

packages/host/src/node/cli/link-modules.ts

@@ -23,7 +23,6 @@ export type ModuleLinker = (
 
 export type LinkModulesOptions = {
   platform: PlatformName;
-  incremental: boolean;
   naming: NamingStrategy;
   fromPath: string;
   linker: ModuleLinker;
@@ -61,7 +60,6 @@ type ModuleOutput = ModuleOutputBase &
 
 export async function linkModules({
   fromPath,
-  incremental,
   naming,
   platform,
   linker,
@@ -96,7 +94,6 @@ export async function linkModules({
       try {
         return await linker({
           modulePath: originalPath,
-          incremental,
           naming,
           platform,
         });

packages/host/src/node/cli/program.ts

@@ -62,11 +62,6 @@ function getPlatformDisplayName(platform: PlatformName) {
 program
   .command("link")
   .argument("[path]", "Some path inside the app package", process.cwd())
-  .option(
-    "--force",
-    "Don't check timestamps of input files to skip unnecessary rebuilds",
-    false,
-  )
   .option(
     "--prune",
     "Delete vendored modules that are no longer auto-linked",
@@ -78,10 +73,7 @@ program
   .addOption(pathSuffixOption)
   .action(
     wrapAction(
-      async (
-        pathArg,
-        { force, prune, pathSuffix, android, apple, packageName },
-      ) => {
+      async (pathArg, { prune, pathSuffix, android, apple, packageName }) => {
         console.log("Auto-linking Node-API modules from", chalk.dim(pathArg));
         const platforms: PlatformName[] = [];
         if (android) {
@@ -107,7 +99,6 @@ program
               await linkModules({
                 platform,
                 fromPath: path.resolve(pathArg),
-                incremental: !force,
                 naming: { packageName, pathSuffix },
                 linker: await createLinker(platform, path.resolve(pathArg)),
               }),

packages/host/src/node/cli/xcode-helpers.ts

@@ -6,8 +6,6 @@ import cp from "node:child_process";
 // Using xmldom here because this is what @expo/plist uses internally and we might as well re-use it here.
 // Types come from packages/host/types/xmldom.d.ts (path mapping in tsconfig.node.json) to avoid pulling in lib "dom".
 import { DOMParser } from "@xmldom/xmldom";
-import xcode from "@bacons/xcode";
-import * as zod from "zod";
 
 export type XcodeWorkspace = {
   version: string;
@@ -90,49 +88,3 @@ export async function findXcodeProject(fromPath: string) {
     throw new Error(`Unexpected scheme: ${scheme}`);
   }
 }
-
-const BuildSettingsSchema = zod.array(
-  zod.object({
-    target: zod.string(),
-    buildSettings: zod.partialRecord(zod.string(), zod.string()),
-  }),
-);
-
-export function getBuildSettings(
-  xcodeProjectPath: string,
-  mainTarget: xcode.PBXNativeTarget,
-) {
-  const result = cp.spawnSync(
-    "xcodebuild",
-    [
-      "-showBuildSettings",
-      "-project",
-      xcodeProjectPath,
-      "-target",
-      mainTarget.getDisplayName(),
-      "-json",
-    ],
-    {
-      cwd: xcodeProjectPath,
-      encoding: "utf-8",
-    },
-  );
-  assert.equal(
-    result.status,
-    0,
-    `Failed to run xcodebuild -showBuildSettings: ${result.stderr}`,
-  );
-  return BuildSettingsSchema.parse(JSON.parse(result.stdout));
-}
-
-export function getBuildDirPath(
-  xcodeProjectPath: string,
-  mainTarget: xcode.PBXNativeTarget,
-) {
-  const buildSettings = getBuildSettings(xcodeProjectPath, mainTarget);
-  assert(buildSettings.length === 1, "Expected exactly one build setting");
-  const [targetBuildSettings] = buildSettings;
-  const { BUILD_DIR: buildDirPath } = targetBuildSettings.buildSettings;
-  assert(buildDirPath, "Expected a build directory");
-  return buildDirPath;
-}