Skip to content

Commit

Permalink
feat: cleanup spinner logic (#4)
Browse files Browse the repository at this point in the history
Moves various spinners/tasks around to ensure we show an error status
when we detect replacements.
  • Loading branch information
43081j authored Aug 7, 2024
1 parent dbe6057 commit 97ce1ab
Showing 1 changed file with 45 additions and 16 deletions.
61 changes: 45 additions & 16 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,10 @@ const packageScanSpinner = cl.spinner();

packageScanSpinner.start('Scanning `package.json` dependencies');

const dependenciesToRemove: string[] = [];
const devDependenciesToRemove: string[] = [];
let packageJsonFailed = false;

if (isDependenciesLike(packageDependencies)) {
const traverseResults = traverseDependencies(
packageDependencies,
Expand All @@ -433,14 +437,12 @@ if (isDependenciesLike(packageDependencies)) {
);

if (options.autoUninstall) {
const args = [
'rm',
'-S',
...traverseResults.map((result) => result.match.moduleName)
];

await x('npm', args);
for (const result of traverseResults) {
dependenciesToRemove.push(result.match.moduleName);
}
}

packageJsonFailed = true;
}

if (
Expand All @@ -454,17 +456,40 @@ if (
);

if (options.autoUninstall) {
const args = [
'rm',
'-D',
...traverseResults.map((result) => result.match.moduleName)
];

await x('npm', args);
for (const result of traverseResults) {
devDependenciesToRemove.push(result.match.moduleName);
}
}

packageJsonFailed = true;
}

packageScanSpinner.stop('`package.json` dependencies scanned successfully.');
if (packageJsonFailed) {
packageScanSpinner.stop('`package.json` dependencies scanned successfully.');
} else {
packageScanSpinner.stop(
'`package.json` contained replaceable dependencies.',
2
);
}

if (
options.autoUninstall &&
(dependenciesToRemove.length > 0 || devDependenciesToRemove.length > 0)
) {
const npmSpinner = cl.spinner();

npmSpinner.start('Removing npm dependencies');

if (dependenciesToRemove.length > 0) {
await x('npm', ['rm', '-S', ...dependenciesToRemove]);
}
if (devDependenciesToRemove.length > 0) {
await x('npm', ['rm', '-D', ...devDependenciesToRemove]);
}

npmSpinner.stop('npm dependencies removed');
}

const fileScanSpinner = cl.spinner();

Expand All @@ -478,7 +503,11 @@ const scanFilesResult = await scanFiles(
fileScanSpinner
);

fileScanSpinner.stop('Scanned files successfully.');
if (scanFilesResult.length > 0) {
fileScanSpinner.stop('Detected files with replaceable modules!', 2);
} else {
fileScanSpinner.stop('All files scanned');
}

if (options.fix) {
await fixFiles(scanFilesResult);
Expand Down

0 comments on commit 97ce1ab

Please sign in to comment.