Add react-native run-macos command (#300)

* Update scripts to publish react-native-macos-init

* Clean up merge markers

* Start of run-macos cli

* run-macos working

* Add JSDoc

* Fix script to only pass argument when installed

* Fixed var name

* Added run-macs CI step

* Log success or failure

Author: tom-un

.ado/templates/react-native-macos-init.yml

@@ -87,7 +87,7 @@ steps:
   - task: CmdLine@2
     displayName: Init new project
     inputs:
-      script: react-native init testcli
+      script: npx react-native init testcli
       workingDirectory: $(Agent.BuildDirectory)
 
   - task: CmdLine@2
@@ -96,4 +96,8 @@ steps:
       script: npx react-native-macos-init --version latest --overwrite --prerelease
       workingDirectory: $(Agent.BuildDirectory)/testcli
 
-  # TODO: react-native run-macos and test when implemented
+  - task: CmdLine@2
+    displayName: Run macos
+    inputs:
+      script: npx react-native run-macos
+      workingDirectory: $(Agent.BuildDirectory)/testcli

local-cli/generator-macos/index.js

@@ -59,10 +59,14 @@ function copyProjectTemplateAndReplace(
     { from: path.join(srcRootPath, 'metro.config.macos.js'), to: 'metro.config.macos.js' },
   ].forEach((mapping) => copyAndReplaceWithChangedCallback(mapping.from, destPath, mapping.to, templateVars, options.overwrite));
 
-  console.log(chalk.white.bold('To run your app on macOS:'));
-  console.log(chalk.white(`   open ${macOSDir}/${xcodeProjName}`));
-  console.log(chalk.white('   yarn start:macos'));
-  console.log(chalk.white.bold(`In Xcode switch to the ${projectNameMacOS} scheme then click Run.`));
+  console.log(`
+  ${chalk.blue(`Run instructions for ${chalk.bold('macOS')}`)}:
+    • npx react-native run-macos
+    ${chalk.dim('- or -')}
+    • Open ${macOSDir}/${xcodeProjName} in Xcode or run "xed -b ${macOSDir}"
+    • yarn start:macos
+    • Hit the Run button
+`);
 }
 
 function installDependencies(options) {

local-cli/generator-macos/templates/macos/HelloWorld.xcodeproj/project.pbxproj

@@ -1299,7 +1299,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.HelloWorld.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = HelloWorld;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -1317,7 +1317,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.HelloWorld.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = HelloWorld;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -1337,7 +1337,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.HelloWorld.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = HelloWorld;
 				SDKROOT = macosx;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -1358,7 +1358,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.HelloWorld.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = HelloWorld;
 				SDKROOT = macosx;
 				TARGETED_DEVICE_FAMILY = 1;

local-cli/runMacOS/findXcodeProject.js

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * @format
+ * @ts-check
+ */
+'use strict';
+
+const path = require('path');
+
+/**
+ * @param {string[]} files
+ */
+function findXcodeProject(files) {
+  const sortedFiles = files.sort();
+  for (let i = sortedFiles.length - 1; i >= 0; i--) {
+    const fileName = files[i];
+    const ext = path.extname(fileName);
+
+    if (ext === '.xcworkspace') {
+      return {
+        name: fileName,
+        isWorkspace: true,
+      };
+    }
+    if (ext === '.xcodeproj') {
+      return {
+        name: fileName,
+        isWorkspace: false,
+      };
+    }
+  }
+
+  return null;
+}
+
+module.exports = findXcodeProject;