Skip to content

Commit c5975d0

Browse files
committed
fix: improve logging, remove flaky spinner
1 parent d26bf64 commit c5975d0

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

packages/init/src/Init/Confirm/mergeDirectory.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import * as Placeholders from '../../Placeholders.js';
66
import { withDiff } from './withDiff.js';
77
import { copyFile } from './copyFile.js';
88
import { FileHandlers } from '../index.js';
9+
import { Log } from '@qui-cli/log';
910

1011
type Options = {
1112
srcPath: PathString;
@@ -71,6 +72,9 @@ export async function mergeDirectory({
7172
}
7273
if (!fs.existsSync(destFilePath)) {
7374
fs.mkdirSync(destFilePath, { recursive: true });
75+
Log.info(
76+
`Directory ${Colors.path(destFilePath, Colors.keyword)} created`
77+
);
7478
}
7579
await mergeDirectory({
7680
srcPath: srcFilePath,

packages/init/src/Init/Confirm/withDiff.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import ora from 'ora';
21
import * as JSON from '../JSON/index.js';
32
import confirm from '@inquirer/confirm';
43
import { Log } from '@qui-cli/log';
@@ -19,16 +18,14 @@ export async function withDiff({
1918
action,
2019
force = false
2120
}: Options) {
22-
const spinner = ora(identifier).start();
2321
if (src !== undefined) {
2422
if (dest !== undefined) {
2523
if (JSON.isEqual(src, dest)) {
26-
spinner.succeed(`${identifier} up-to-date`);
24+
Log.info(`${identifier} up-to-date`);
2725
return;
2826
}
2927
let update = force;
3028
if (!update) {
31-
spinner.stop();
3229
update = await confirm({
3330
message: `In ${identifier}, replace:\n\n${
3431
typeof dest === 'string'
@@ -50,17 +47,17 @@ export async function withDiff({
5047
if (update) {
5148
await action();
5249
if (force) {
53-
spinner.succeed(`${identifier} updated`);
50+
Log.info(`${identifier} updated`);
5451
}
5552
return;
5653
}
5754
} else {
5855
await action();
59-
spinner.succeed(`${identifier} created`);
56+
Log.info(`${identifier} created`);
6057
return;
6158
}
6259
} else {
63-
spinner.fail(Colors.error(`${identifier} source missing`));
60+
Log.error(Colors.error(`${identifier} source missing`));
6461
return;
6562
}
6663
}

0 commit comments

Comments
 (0)