Fixed mapping of PS output to right Promise

facebook · Sep 7, 2017 · 1a7907f · 1a7907f
1 parent 5b2f6ae
commit 1a7907f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/packages/react-dev-utils/errorOverlayMiddleware.js b/packages/react-dev-utils/errorOverlayMiddleware.js
@@ -8,14 +8,11 @@
  */
 'use strict';
 
-const { launchEditor } = require('./launchEditor');
+const { launchEditor, tryLaunchPowerShellAgent } = require('./launchEditor');
 const launchEditorEndpoint = require('./launchEditorEndpoint');
 
 module.exports = function createLaunchEditorMiddleware() {
   if (process.platform === 'win32' && !process.env.REACT_EDITOR) {
-    const {
-      tryLaunchPowerShellAgent,
-    } = require('react-dev-utils/launchEditor');
     tryLaunchPowerShellAgent();
   }
 

diff --git a/packages/react-dev-utils/launchEditor.js b/packages/react-dev-utils/launchEditor.js
@@ -38,10 +38,15 @@ class PowerShell extends EventEmitter {
       throw new Error('Failed to start PowerShell');
     }
 
+    // Initialize counters for mapping events
+    this._callbackCounter = 0;
+    this._resolveCounter = 0;
+
     let output = [];
     this._proc.stdout.on('data', data => {
       if (data.indexOf(EOI) !== -1) {
-        this.emit('resolve', output.join(''));
+        const eventName = 'resolve' + ++this._callbackCounter;
+        this.emit(eventName, output.join(''));
         output = [];
       } else {
         output.push(data);
@@ -51,10 +56,8 @@ class PowerShell extends EventEmitter {
 
   invoke(cmd) {
     return new Promise(resolve => {
-      this.on('resolve', data => {
-        resolve(data);
-        this.removeAllListeners('resolve');
-      });
+      const eventName = 'resolve' + ++this._resolveCounter;
+      this.once(eventName, resolve);
 
       this._proc.stdin.write(cmd);
       this._proc.stdin.write(os.EOL);