Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/redux-devtools-cli/src/bin/injectServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export function inject(
startFlag,
' require("' + name + '")(' + JSON.stringify(options) + ')',
' .then(_remotedev =>',
' _remotedev.on("ready", () => {',
' _remotedev.ready.then(() => {',
' if (!_remotedev.portAlreadyUsed) console.log("-".repeat(80));',
' ' + serverFlag,
' })',
Expand Down
12 changes: 5 additions & 7 deletions packages/redux-devtools-cli/src/bin/redux-devtools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,8 @@ if (argv.injectserver) {
);
}

// eslint-disable-next-line @typescript-eslint/no-floating-promises
server(argv).then(async function (r) {
if (argv.open && argv.open !== 'false') {
await r.listener('ready').once();
await openApp(argv.open as string, options);
}
});
const response = await server(argv);
if (argv.open && argv.open !== 'false') {
await response.ready;
await openApp(argv.open as string, options);
}
17 changes: 7 additions & 10 deletions packages/redux-devtools-cli/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const LOG_LEVEL_INFO = 3;

export default async function (argv: { [arg: string]: any }): Promise<{
portAlreadyUsed?: boolean;
listener: (eventName: 'ready') => { once(): Promise<void> };
ready: Promise<void>;
}> {
const options = Object.assign(getOptions(argv), {
allowClientPublish: false,
Expand All @@ -29,13 +29,7 @@ export default async function (argv: { [arg: string]: any }): Promise<{
}
return {
portAlreadyUsed: true,
listener: function () {
return {
once() {
return Promise.resolve();
},
};
},
ready: Promise.resolve(),
};
}

Expand Down Expand Up @@ -135,6 +129,9 @@ export default async function (argv: { [arg: string]: any }): Promise<{
})();

httpServer.listen(options.port);
// @ts-expect-error Shouldn't there be a 'ready' event?
return agServer;
return {
ready: (async () => {
await agServer.listener('ready' as 'error').once();
})(),
};
}