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
3 changes: 0 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ export class Logger {
console[logMap[type]](this[type]);
}

emitLogOnce(type: 'stdout' | 'stderr', log: string) {
console[logMap[type]](log);
}

reset(type: 'stdout' | 'stderr') {
this[type] = '';
}
Expand Down
12 changes: 9 additions & 3 deletions src/workspace-dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export class WorkspaceDevRunner {
private graph: Graph;
private visited: Record<string, boolean>;
private visiting: Record<string, boolean>;
private matched: Record<string, boolean>;
private metaData!: Package['packageJson'];

constructor(options: WorkspaceDevRunnerOptions) {
Expand All @@ -46,6 +47,7 @@ export class WorkspaceDevRunner {
this.packages = [];
this.visited = {};
this.visiting = {};
this.matched = {};
this.graph = new Graph({ directed: true });
}

Expand Down Expand Up @@ -80,6 +82,7 @@ export class WorkspaceDevRunner {
this.graph.setNode(name, node);
this.visited[name] = false;
this.visiting[name] = false;
this.matched[name] = false;

const packageName = name;
const deps = {
Expand Down Expand Up @@ -185,6 +188,10 @@ export class WorkspaceDevRunner {
});
child.stdout.on('data', async (data) => {
const stdout = data.toString();
if (this.matched[node]) {
logger.emitLogOnce('stdout', stdout);
return;
}
logger.appendLog('stdout', stdout);
const match = config?.match;
const matchResult = match
Expand All @@ -193,6 +200,7 @@ export class WorkspaceDevRunner {

if (matchResult) {
logger.flushStdout();
this.matched[node] = true;
this.visited[node] = true;
this.visiting[node] = false;
await this.start();
Expand All @@ -202,9 +210,7 @@ export class WorkspaceDevRunner {

child.stderr.on('data', (data) => {
const stderr = data.toString();
logger.appendLog('stderr', stderr);
logger.emitLog('stderr');
logger.reset('stderr');
logger.emitLogOnce('stderr', stderr);
});

child.on('close', () => {});
Expand Down
3 changes: 1 addition & 2 deletions test/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"dev": "rsbuild dev"
},
"dependencies": {
"@e2e/workspace-dev-components": "workspace:*",
"@e2e/workspace-dev-utils2": "workspace:*"
"@e2e/workspace-dev-components": "workspace:*"
},
"devDependencies": {
"rsbuild-plugin-workspace-dev": "workspace:*"
Expand Down