fix: open Metro in the correct terminal

packages/platform-android/src/commands/runAndroid/index.js

@@ -15,7 +15,7 @@ import type {ConfigT} from '../../../../cli/src/tools/config/types.flow';
 
 import adb from './adb';
 import runOnAllDevices from './runOnAllDevices';
-import isPackagerRunning from './isPackagerRunning';
+import {isPackagerRunning} from '@react-native-community/cli-tools';
 import tryRunAdbReverse from './tryRunAdbReverse';
 import tryLaunchAppOnDevice from './tryLaunchAppOnDevice';
 import getAdbPath from './getAdbPath';
@@ -228,7 +228,7 @@ function installAndLaunchOnDevice(
 
 function startServerInNewWindow(
   port,
-  terminal = process.env.REACT_TERMINAL,
+  terminal = process.env.REACT_TERMINAL || process.env.TERM_PROGRAM,
   reactNativePath,
 ) {
   /**
@@ -359,7 +359,7 @@ export default {
       command: '--terminal [string]',
       description:
         'Launches the Metro Bundler in a new window using the specified terminal path.',
-      default: '',
+      default: undefined,
     },
   ],
 };

packages/platform-ios/src/commands/runIOS/index.js

@@ -29,6 +29,7 @@ type FlagsT = {
   packager: boolean,
   verbose: boolean,
   port: number,
+  terminal: string | typeof undefined,
 };
 
 function runIOS(_: Array<string>, ctx: ConfigT, args: FlagsT) {
@@ -77,6 +78,7 @@ function runIOS(_: Array<string>, ctx: ConfigT, args: FlagsT) {
         args.packager,
         args.verbose,
         args.port,
+        args.terminal,
       );
     }
     if (devices && devices.length > 0) {
@@ -111,6 +113,7 @@ function runOnDeviceByUdid(
       args.packager,
       args.verbose,
       args.port,
+      args.terminal,
     );
     return;
   }
@@ -179,6 +182,7 @@ async function runOnSimulator(xcodeProject, args, scheme) {
     args.packager,
     args.verbose,
     args.port,
+    args.terminal,
   );
 
   const appPath = getBuildPath(args.configuration, appName, false, scheme);
@@ -221,6 +225,7 @@ async function runOnDevice(
   launchPackager,
   verbose,
   port,
+  terminal,
 ) {
   const appName = await buildProject(
     xcodeProject,
@@ -230,6 +235,7 @@ async function runOnDevice(
     launchPackager,
     verbose,
     port,
+    terminal,
   );
 
   const iosDeployInstallArgs = [
@@ -240,7 +246,7 @@ async function runOnDevice(
     '--justlaunch',
   ];
 
-  logger.info(`installing and launching your app on ${selectedDevice.name}...`);
+  logger.info(`Installing and launching your app on ${selectedDevice.name}...`);
 
   const iosDeployOutput = child_process.spawnSync(
     'ios-deploy',
@@ -265,6 +271,7 @@ function buildProject(
   launchPackager = false,
   verbose,
   port,
+  terminal = process.env.REACT_TERMINAL || process.env.TERM_PROGRAM,
 ) {
   return new Promise((resolve, reject) => {
     const xcodebuildArgs = [
@@ -291,7 +298,7 @@ function buildProject(
     const buildProcess = child_process.spawn(
       'xcodebuild',
       xcodebuildArgs,
-      getProcessOptions(launchPackager, port),
+      getProcessOptions(launchPackager, port, terminal),
     );
     let buildOutput = '';
     let errorOutput = '';
@@ -418,15 +425,17 @@ function printFoundDevices(devices) {
   return output;
 }
 
-function getProcessOptions(launchPackager, port) {
+function getProcessOptions(launchPackager, port, terminal) {
+  const env = {...process.env, RCT_TERMINAL: terminal};
+
   if (launchPackager) {
     return {
-      env: {...process.env, RCT_METRO_PORT: port},
+      env: {...env, RCT_METRO_PORT: port},
     };
   }
 
   return {
-    env: {...process.env, RCT_NO_LAUNCH_PACKAGER: true},
+    env: {...env, RCT_NO_LAUNCH_PACKAGER: true},
   };
 }
 
@@ -499,5 +508,11 @@ export default {
       default: process.env.RCT_METRO_PORT || 8081,
       parse: (val: string) => Number(val),
     },
+    {
+      command: '--terminal [string]',
+      description:
+        'Launches the Metro Bundler in a new window using the specified terminal path.',
+      default: undefined,
+    },
   ],
 };

packages/tools/src/index.js

@@ -3,5 +3,6 @@
  */
 export {default as logger} from './logger';
 export {default as groupFilesByType} from './groupFilesByType';
+export {default as isPackagerRunning} from './isPackagerRunning';
 
 export * from './errors';