Skip to content

feat: suppress spinner in watch command with --silent flag #7770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −4
Open

feat: suppress spinner in watch command with --silent flag #7770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions src/commands/watch/watch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import prettyjson from 'prettyjson'
import { type Spinner, startSpinner, stopSpinner } from '../../lib/spinner.js'
import { chalk, logAndThrowError, log } from '../../utils/command-helpers.js'
import type BaseCommand from '../base-command.js'
import type { BaseOptionValues } from '../base-command.js'
import { init } from '../init/init.js'

// 1 second
Expand All @@ -15,7 +16,7 @@ const BUILD_FINISH_INTERVAL = 1e3
// 20 minutes
const BUILD_FINISH_TIMEOUT = 12e5

const waitForBuildFinish = async function (api: NetlifyAPI, siteId: string, spinner: Spinner) {
const waitForBuildFinish = async function (api: NetlifyAPI, siteId: string, spinner?: Spinner) {
let firstPass = true

const waitForBuildToFinish = async function () {
Expand All @@ -27,7 +28,9 @@ const waitForBuildFinish = async function (api: NetlifyAPI, siteId: string, spin
// @TODO implement build error messages into this

if (!currentBuilds || currentBuilds.length === 0) {
stopSpinner({ spinner })
if (spinner) {
stopSpinner({ spinner })
}
return true
}
firstPass = false
Expand All @@ -46,7 +49,7 @@ const waitForBuildFinish = async function (api: NetlifyAPI, siteId: string, spin
return firstPass
}

export const watch = async (_options: unknown, command: BaseCommand) => {
export const watch = async (options: BaseOptionValues, command: BaseCommand) => {
await command.authenticate()
const client = command.netlify.api
let siteId = command.netlify.site.id
Expand All @@ -57,6 +60,8 @@ export const watch = async (_options: unknown, command: BaseCommand) => {
siteId = siteData.id
}

const isSilent = options.silent

// wait for 1 sec for everything to kickoff
console.time('Deploy time')
await new Promise((resolve) => {
Expand All @@ -80,7 +85,12 @@ export const watch = async (_options: unknown, command: BaseCommand) => {
// "created_at": "2018-07-17T17:14:03.423Z"
// }
//
const spinner = startSpinner({ text: 'Waiting for active project deploys to complete' })

let spinner
if (!isSilent) {
spinner = startSpinner({ text: 'Waiting for active project deploys to complete' })
}

try {
// Fetch all builds!
// const builds = await client.listSiteBuilds({siteId})
Expand Down