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
5 changes: 5 additions & 0 deletions packages/wb/src/commands/retry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ export const retryCommand: CommandModule<
// TODO: should we add single quotes around each argument?
lastStatus = await runWithSpawn(cmdAndArgs.join(' '), project, argv, {
exitIfFailed: false,
onSignal: (signal) => {
if (signal) {
process.exit(1);
}
},
});
if (lastStatus === 0) return;
}
Expand Down
3 changes: 2 additions & 1 deletion packages/wb/src/scripts/execution/baseScripts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ export abstract class BaseScripts {
}
async testStart(project: Project, argv: ScriptArgv): Promise<string> {
await checkAndKillPortProcess(project.env.PORT, project);
return `YARN concurrently --kill-others --raw --success first "${this.startDevProtected(project, argv)}" "${this.waitApp(project)}"`;
// Use empty NODE_ENV to avoid "production" mode in some frameworks like Blitz.js.
return `NODE_ENV="" YARN concurrently --kill-others --raw --success first "${this.startDevProtected(project, argv)}" "${this.waitApp(project)}"`;
}

async testE2EProtected(
Expand Down
3 changes: 3 additions & 0 deletions packages/wb/src/scripts/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { isRunningOnBun, packageManagerWithRun } from '../utils/runtime.js';
interface Options {
ci?: boolean;
exitIfFailed?: boolean;
onSignal?: (signal: NodeJS.Signals | null) => void;
forceColor?: boolean;
timeout?: number;
}
Expand Down Expand Up @@ -43,6 +44,7 @@ export async function runWithSpawn(
killOnExit: true,
verbose: argv.verbose,
});
opts.onSignal?.(ret.signal);
printFinishedAndExitIfNeeded(normalizedScript.printable, ret.status, opts);
return ret.status ?? 1;
}
Expand Down Expand Up @@ -75,6 +77,7 @@ export function runWithSpawnInParallel(
killOnExit: true,
verbose: argv.verbose,
});
opts.onSignal?.(ret.signal);
printStart(normalizedScript.printable, project, 'Started (log)');
if (argv.verbose) {
printStart(normalizedScript.runnable, project, 'Started (raw)', true);
Expand Down