Fix start command exit behaviour

This is an eager cherry pick of #39788 for `0.73-stable`.
facebook · Oct 3, 2023 · e5bf39c · e5bf39c
1 parent 047f645
commit e5bf39c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/packages/community-cli-plugin/src/commands/start/attachKeyHandlers.js b/packages/community-cli-plugin/src/commands/start/attachKeyHandlers.js
@@ -15,21 +15,18 @@ import {logger} from '@react-native-community/cli-tools';
 import chalk from 'chalk';
 import execa from 'execa';
 import fetch from 'node-fetch';
-import readline from 'readline';
 import {KeyPressHandler} from '../../utils/KeyPressHandler';
 
 const CTRL_C = '\u0003';
 const CTRL_D = '\u0004';
 
 export default function attachKeyHandlers({
   cliConfig,
-  serverInstance,
   devServerUrl,
   messageSocket,
 }: {
   cliConfig: Config,
   devServerUrl: string,
-  serverInstance: http$Server | https$Server,
   messageSocket: $ReadOnly<{
     broadcast: (type: string, params?: Record<string, mixed> | null) => void,
     ...
@@ -40,10 +37,6 @@ export default function attachKeyHandlers({
     return;
   }
 
-  readline.emitKeypressEvents(process.stdin);
-  // $FlowIgnore[prop-missing]
-  process.stdin.setRawMode(true);
-
   const execaOptions = {
     env: {FORCE_COLOR: chalk.supportsColor ? 'true' : 'false'},
   };
@@ -88,16 +81,14 @@ export default function attachKeyHandlers({
       case CTRL_C:
       case CTRL_D:
         logger.info('Stopping server');
-        listener?.({pause: true});
-        serverInstance.close(() => {
-          process.emit('SIGINT');
-          process.exit();
-        });
+        keyPressHandler.stopInterceptingKeyStrokes();
+        process.emit('SIGINT');
+        process.exit();
     }
   };
 
   const keyPressHandler = new KeyPressHandler(onPress);
-  const listener = keyPressHandler.createInteractionListener();
+  keyPressHandler.createInteractionListener();
   keyPressHandler.startInterceptingKeyStrokes();
 
   logger.log(

diff --git a/packages/community-cli-plugin/src/commands/start/runServer.js b/packages/community-cli-plugin/src/commands/start/runServer.js
@@ -137,7 +137,6 @@ async function runServer(
         attachKeyHandlers({
           cliConfig: ctx,
           devServerUrl,
-          serverInstance,
           messageSocket: messageSocketEndpoint,
         });
       }