Skip to content
Open
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
1 change: 1 addition & 0 deletions src/lib/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export function initClient(options) {
baseURL: options.server,
jar: cookieJar,
withCredentials: true,
validateStatus: null
})
);
}
Expand Down
16 changes: 9 additions & 7 deletions src/lib/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export async function update(config, options, client, resolve = []) {
await loginUser(client, options);
} catch (error) {
console.error(error.message);
return;
process.exit(1);
}

let spinner = ora('Starting generator ...').start();
Expand All @@ -67,7 +67,7 @@ export async function update(config, options, client, resolve = []) {
if (generatorResponse.status !== 200) {
spinner.fail('Generator failed with error: ' + generatorResponse.status);
console.error(generatorResponse.data);
return;
process.exit(1);
}
spinner.stop();

Expand All @@ -79,15 +79,15 @@ export async function update(config, options, client, resolve = []) {
chalk.red('Update was blocked due to breaking changes, even with --confirm-breaking. Check server logs or response:'),
);
console.error(output);
return;
process.exit(1);
}
if (options.quiet) {
console.error(
chalk.red(
'Breaking profile changes were detected. Re-run with --confirm-breaking to proceed non-interactively, or omit --quiet to confirm interactively.',
),
);
return;
process.exit(1);
}
printBreakingChangeDetails(output);
const proceed = await confirm({
Expand All @@ -104,13 +104,15 @@ export async function update(config, options, client, resolve = []) {
if (generatorResponse.status !== 200) {
console.error(chalk.red('Generator failed with error: ' + generatorResponse.status));
console.error(generatorResponse.data);
return;
process.exit(1);

}
output = generatorResponse.data;
if (isGeneratorBlockedByBreakingChanges(output)) {
console.error(chalk.red('Update is still blocked after confirmation. Server response:'));
console.error(output);
return;
process.exit(1);

}
}

Expand Down Expand Up @@ -187,7 +189,7 @@ export async function update(config, options, client, resolve = []) {
if (deployResponse.status !== 200) {
spinner.fail('Deploy failed with code ' + deployResponse.status + ': ' + deployResponse.data);
console.error('Deploy failed:', deployResponse.status, deployResponse.data);
return;
process.exit(1);
}
spinner.stop();
console.log(chalk.green('Done!'));
Expand Down