Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorder back-end plugin deployment to prevent early promise resolution #13643

Merged
merged 1 commit into from
Apr 25, 2024
Merged
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
13 changes: 6 additions & 7 deletions packages/plugin-ext/src/main/node/plugin-deployer-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,12 @@ export class PluginDeployerImpl implements PluginDeployer {
const pluginPaths = [...acceptedBackendPlugins, ...acceptedHeadlessPlugins].map(pluginEntry => pluginEntry.path());
this.logger.debug('local path to deploy on remote instance', pluginPaths);

const deployments = await Promise.all([
// headless plugins are deployed like backend plugins
this.pluginDeployerHandler.deployBackendPlugins(acceptedHeadlessPlugins),
// start the backend plugins
this.pluginDeployerHandler.deployBackendPlugins(acceptedBackendPlugins),
this.pluginDeployerHandler.deployFrontendPlugins(acceptedFrontendPlugins)
]);
const deployments = [];
// start the backend plugins
deployments.push(await this.pluginDeployerHandler.deployBackendPlugins(acceptedBackendPlugins));
// headless plugins are deployed like backend plugins
deployments.push(await this.pluginDeployerHandler.deployBackendPlugins(acceptedHeadlessPlugins));
deployments.push(await this.pluginDeployerHandler.deployFrontendPlugins(acceptedFrontendPlugins));
msujew marked this conversation as resolved.
Show resolved Hide resolved
this.onDidDeployEmitter.fire(undefined);
return deployments.reduce<number>((accumulated, current) => accumulated += current ?? 0, 0);
}
Expand Down
Loading