fix(cli): projectDir is only set in recent versions

microsoft · Aug 28, 2024 · 580a073 · 580a073
1 parent e14ca25
commit 580a073
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.changeset/funny-rabbits-eat.md b/.changeset/funny-rabbits-eat.md
@@ -0,0 +1,5 @@
+---
+"@rnx-kit/cli": patch
+---
+
+`projectDir` is only set in recent versions of `@react-native-community/cli`
diff --git a/packages/cli/src/build/ios.ts b/packages/cli/src/build/ios.ts
@@ -13,7 +13,9 @@ export function buildIOS(
   const { sourceDir, xcodeProject } = config.project[platform] ?? {};
   if (!sourceDir || !xcodeProject) {
     const root = platform.substring(0, platform.length - 2);
-    logger.fail(`No ${root}OS project was found`);
+    logger.fail(
+      `No ${root}OS project was found; did you forget to run 'pod install'?`
+    );
     process.exitCode = 1;
     return Promise.resolve(1);
   }
@@ -27,6 +29,8 @@ export function buildIOS(
     return Promise.resolve(1);
   }
 
-  const xcworkspace = path.resolve(sourceDir, projectDir, name);
+  const xcworkspace = projectDir
+    ? path.resolve(sourceDir, projectDir, name)
+    : path.resolve(sourceDir, name);
   return runBuild(xcworkspace, buildParams, logger);
 }
diff --git a/packages/cli/src/run.ts b/packages/cli/src/run.ts
@@ -15,11 +15,6 @@ export function rnxRun(
       return runIOS(config, buildParams);
     case "macos":
       return runMacOS(config, buildParams);
-    default:
-      // @ts-expect-error Safe guard against user input
-      console.error(`Unsupported platform: ${buildParams.platform}`);
-      process.exitCode = 1;
-      return Promise.resolve();
   }
 }