fix(react-native): fix run-macos failing to find Xcode project

microsoft · Oct 25, 2024 · 5f0961a · 5f0961a
1 parent 9ffd3da
commit 5f0961a
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/packages/react-native/local-cli/runMacOS/runMacOS.js b/packages/react-native/local-cli/runMacOS/runMacOS.js
@@ -44,6 +44,14 @@ const {logger, CLIError, getDefaultUserTerminal} = (() => {
   return require(tools);
 })();
 
+/**
+ * @param {string} sourceDir
+ * @param {XcodeProject} xcodeProject
+ */
+function getXcodeProjectPath(sourceDir, xcodeProject) {
+  return path.join(sourceDir, xcodeProject.path || '.', xcodeProject.name);
+}
+
 /**
  * @param {ProjectConfig} ctx
  * @param {Options} args
@@ -117,7 +125,7 @@ function runMacOS(_, ctx, args) {
 async function run(sourceDir, xcodeProject, scheme, args) {
   await buildProject(sourceDir, xcodeProject, scheme, args);
 
-  const buildSettings = getBuildSettings(xcodeProject, args.mode, scheme);
+  const buildSettings = getBuildSettings(sourceDir, xcodeProject, args.mode, scheme);
   const appPath = path.join(
     buildSettings.TARGET_BUILD_DIR,
     buildSettings.FULL_PRODUCT_NAME,
@@ -162,7 +170,7 @@ function buildProject(sourceDir, xcodeProject, scheme, args) {
   return new Promise((resolve, reject) => {
     const xcodebuildArgs = [
       xcodeProject.isWorkspace ? '-workspace' : '-project',
-      path.join(sourceDir, xcodeProject.path || '.', xcodeProject.name),
+      getXcodeProjectPath(sourceDir, xcodeProject),
       '-configuration',
       args.mode,
       '-scheme',
@@ -231,18 +239,19 @@ function buildProject(sourceDir, xcodeProject, scheme, args) {
 }
 
 /**
+ * @param {string} sourceDir
  * @param {XcodeProject} xcodeProject
  * @param {string} configuration
  * @param {string} scheme
  * @returns {{ FULL_PRODUCT_NAME: string, INFOPLIST_PATH: string, TARGET_BUILD_DIR: string }}
  */
-function getBuildSettings(xcodeProject, configuration, scheme) {
+function getBuildSettings(sourceDir, xcodeProject, configuration, scheme) {
   const settings = JSON.parse(
     child_process.execFileSync(
       'xcodebuild',
       [
         xcodeProject.isWorkspace ? '-workspace' : '-project',
-        xcodeProject.name,
+        getXcodeProjectPath(sourceDir, xcodeProject),
         '-scheme',
         scheme,
         '-sdk',
@@ -363,7 +372,7 @@ module.exports = [
       {
         name: '--port [number]',
         default: process.env.RCT_METRO_PORT || 8081,
-        parse: val => Number(val),
+        parse: (/** @type {string} */ val) => Number(val),
       },
       {
         name: '--terminal [string]',