Skip to content

Commit f720179

Browse files
committed
Fix spinner in socket optimize
1 parent 9b299f5 commit f720179

File tree

1 file changed

+34
-30
lines changed

1 file changed

+34
-30
lines changed

β€Žsrc/commands/optimize.ts

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,10 @@ export const optimize: CliSubcommand = {
597597
console.log(`✘ ${COMMAND_TITLE}: No ${lockName} found`)
598598
return
599599
}
600+
if (lockSrc.trim() === '') {
601+
console.log(`✘ ${COMMAND_TITLE}: ${lockName} is empty`)
602+
return
603+
}
600604
if (pkgPath === undefined) {
601605
console.log(`✘ ${COMMAND_TITLE}: No package.json found`)
602606
return
@@ -619,43 +623,43 @@ export const optimize: CliSubcommand = {
619623
updated: new Set()
620624
}
621625
spinner.start()
622-
if (lockSrc) {
623-
const nodeRange = `>=${minimumNodeVersion}`
624-
const manifestEntries = manifestNpmOverrides.filter(({ 1: data }) =>
625-
semver.satisfies(semver.coerce(data.engines.node)!, nodeRange)
626-
)
627-
await addOverrides(
628-
{
629-
agent,
630-
agentExecPath,
631-
lockSrc,
632-
manifestEntries,
633-
pin,
634-
pkgJson,
635-
pkgPath,
636-
prod,
637-
rootPath: pkgPath
638-
},
639-
state
640-
)
641-
}
626+
const nodeRange = `>=${minimumNodeVersion}`
627+
const manifestEntries = manifestNpmOverrides.filter(({ 1: data }) =>
628+
semver.satisfies(semver.coerce(data.engines.node)!, nodeRange)
629+
)
630+
await addOverrides(
631+
{
632+
agent,
633+
agentExecPath,
634+
lockSrc,
635+
manifestEntries,
636+
pin,
637+
pkgJson,
638+
pkgPath,
639+
prod,
640+
rootPath: pkgPath
641+
},
642+
state
643+
)
644+
spinner.stop()
642645
const pkgJsonChanged = state.added.size > 0 || state.updated.size > 0
643-
if (state.updated.size > 0) {
644-
console.log(
645-
`Updated ${state.updated.size} Socket.dev optimized overrides ${state.added.size ? '.' : 'πŸš€'}`
646-
)
647-
}
648-
if (state.added.size > 0) {
649-
console.log(`Added ${state.added.size} Socket.dev optimized overrides πŸš€`)
650-
}
651-
if (!pkgJsonChanged) {
646+
if (pkgJsonChanged) {
647+
if (state.updated.size > 0) {
648+
console.log(
649+
`Updated ${state.updated.size} Socket.dev optimized overrides ${state.added.size ? '.' : 'πŸš€'}`
650+
)
651+
}
652+
if (state.added.size > 0) {
653+
console.log(`Added ${state.added.size} Socket.dev optimized overrides πŸš€`)
654+
}
655+
} else {
652656
console.log('Congratulations! Already Socket.dev optimized πŸŽ‰')
653657
}
654658
const isNpm = agent === 'npm'
655659
if (isNpm || pkgJsonChanged) {
656660
// Always update package-lock.json until the npm overrides PR lands:
657661
// https://github.com/npm/cli/pull/7025
658-
spinner.text = `Updating ${lockName}...`
662+
spinner.start(`Updating ${lockName}...`)
659663
try {
660664
if (isNpm) {
661665
const wrapperPath = path.join(distPath, 'npm-cli.js')

0 commit comments

Comments
Β (0)