Skip to content

[CLI] Use one worker for Blueprint v1 and v2 #4227

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.

Sign up for GitHub

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

Open
adamziel wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

[CLI] Use one worker for Blueprint v1 and v2 #4227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 3 additions & 14 deletions packages/playground/cli/src/blueprints-v1/blueprints-v1-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ import {
fetchSqliteIntegration,
readAsFile,
} from './download';
import type { PlaygroundCliBlueprintV1Worker } from './worker-thread-v1';
import type { PlaygroundCliWorker } from '../worker-thread';
import type { MessagePort as NodeMessagePort } from 'worker_threads';
import {
type PlaygroundCliWorker,
type RunCLIArgs,
type SpawnedWorker,
type WorkerType,
mergeDefinedConstants,
} from '../run-cli';
import type { CLIOutput } from '../cli-output';
Expand Down Expand Up @@ -57,10 +55,6 @@ export class BlueprintsV1Handler {
this.cliOutput = options.cliOutput;
}

getWorkerType(): WorkerType {
return 'v1';
}

async bootWordPress(
playground: Pooled<PlaygroundCliWorker>,
workerPostInstallMountsPort: NodeMessagePort
Expand Down Expand Up @@ -135,12 +129,9 @@ export class BlueprintsV1Handler {
this.cliOutput.updateProgress('Booting WordPress');

// TODO: Fix this type issue that requires the cast to unknown
await (
playground as unknown as PlaygroundCliBlueprintV1Worker
).bootWordPress(
await (playground as unknown as PlaygroundCliWorker).bootWordPress(
{
phpVersion: runtimeConfiguration.phpVersion,
wpVersion: runtimeConfiguration.wpVersion,
siteUrl: this.siteUrl,
wordpressInstallMode:
Comment on lines +132 to 136
this.args.wordpressInstallMode || 'download-and-install',
Expand Down Expand Up @@ -182,9 +173,7 @@ export class BlueprintsV1Handler {
fileLockManagerPort: NodeMessagePort;
nativeInternalDirPath: string;
}) {
const playground = consumeAPI<PlaygroundCliBlueprintV1Worker>(
worker.phpPort
);
const playground = consumeAPI<PlaygroundCliWorker>(worker.phpPort);

await playground.isConnected();
const runtimeConfiguration = await resolveRuntimeConfiguration(
Expand Down
324 changes: 0 additions & 324 deletions packages/playground/cli/src/blueprints-v1/worker-thread-v1.ts
View file
Open in desktop

This file was deleted.

Loading
Loading