From 437d6c8b9ae557b0c04c8aa8ae0db1047898e892 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 29 Aug 2021 14:48:21 -0400 Subject: [PATCH] Changes --- packages/redux-devtools-cli/src/bin/openApp.ts | 8 ++++---- packages/redux-devtools-cli/src/bin/redux-devtools.ts | 4 ++-- packages/redux-devtools-cli/src/index.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/redux-devtools-cli/src/bin/openApp.ts b/packages/redux-devtools-cli/src/bin/openApp.ts index 5be253f9..f0b31f51 100644 --- a/packages/redux-devtools-cli/src/bin/openApp.ts +++ b/packages/redux-devtools-cli/src/bin/openApp.ts @@ -3,7 +3,7 @@ import path from 'path'; import spawn from 'cross-spawn'; import { Options } from '../options'; -export default function openApp(app: boolean | string, options: Options) { +export default async function openApp(app: true | string, options: Options) { if (app === true || app === 'electron') { try { const port = options.port ? `--port=${options.port}` : ''; @@ -31,9 +31,9 @@ export default function openApp(app: boolean | string, options: Options) { } return; } - // eslint-disable-next-line @typescript-eslint/no-floating-promises - open( + + await open( `http://localhost:${options.port}/`, - app !== 'browser' ? { app: app as string } : undefined + app !== 'browser' ? { app: { name: app } } : undefined ); } diff --git a/packages/redux-devtools-cli/src/bin/redux-devtools.ts b/packages/redux-devtools-cli/src/bin/redux-devtools.ts index dd8570eb..d63802e9 100644 --- a/packages/redux-devtools-cli/src/bin/redux-devtools.ts +++ b/packages/redux-devtools-cli/src/bin/redux-devtools.ts @@ -90,8 +90,8 @@ if (argv.injectserver) { // eslint-disable-next-line @typescript-eslint/no-floating-promises server(argv).then(function (r) { if (argv.open && argv.open !== 'false') { - r.on('ready', function () { - openApp(argv.open, options); + r.on('ready', async function () { + await openApp(argv.open, options); }); } }); diff --git a/packages/redux-devtools-cli/src/index.ts b/packages/redux-devtools-cli/src/index.ts index 2421ec6e..0ec675ce 100644 --- a/packages/redux-devtools-cli/src/index.ts +++ b/packages/redux-devtools-cli/src/index.ts @@ -14,7 +14,7 @@ export interface ExtendedOptions extends Options { export default function (argv: { [arg: string]: any }): Promise<{ portAlreadyUsed?: boolean; - on: (status: 'ready', cb: () => void) => void; + on: (status: 'ready', cb: (() => void) | (() => Promise)) => void; }> { const options = Object.assign(getOptions(argv), { workerController: __dirname + '/worker.js',