JSFIX patches

open-cli-tools · May 19, 2022 · 2eeee42 · 2eeee42
1 parent 6f1e11d
commit 2eeee42
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "chalk": "^4.1.0",
     "date-fns": "^2.16.1",
     "lodash": "^4.17.21",
-    "rxjs": "^6.6.3",
+    "rxjs": "^7.0.0",
     "shell-quote": "^1.7.3",
     "spawn-command": "^0.0.2-1",
     "supports-color": "^8.1.0",

diff --git a/src/completion-listener.ts b/src/completion-listener.ts
@@ -75,16 +75,14 @@ export class CompletionListener {
      */
     listen(commands: Command[]): Promise<CloseEvent[]> {
         const closeStreams = commands.map(command => command.close);
-        return Rx.merge(...closeStreams)
+        return Rx.lastValueFrom(Rx.merge(...closeStreams)
             .pipe(
                 bufferCount(closeStreams.length),
                 switchMap(exitInfos =>
                     this.isSuccess(exitInfos)
                         ? Rx.of(exitInfos, this.scheduler)
-                        : Rx.throwError(exitInfos, this.scheduler),
-                ),
+                        : Rx.throwError(exitInfos, this.scheduler)),
                 take(1),
-            )
-            .toPromise();
+            ));
     }
 };
diff --git a/src/flow-control/log-timings.spec.ts b/src/flow-control/log-timings.spec.ts
@@ -99,7 +99,7 @@ it('does not log timings summary if there was an error', () => {
     controller.handle(commands);
 
     commands[0].close.next(command0ExitInfo);
-    commands[1].error.next();
+    commands[1].error.next(undefined);
 
     expect(logger.logTable).toHaveBeenCalledTimes(0);