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: 0 additions & 1 deletion packages/cli-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
"ignore": "6.0.2",
"ink": "6.8.0",
"is-executable": "2.0.1",
"is-interactive": "2.0.0",
"is-wsl": "3.1.0",
"jose": "5.9.6",
"latest-version": "7.0.0",
Expand Down
53 changes: 52 additions & 1 deletion packages/cli-kit/src/public/node/context/local.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
isDevelopment,
isHostedAppsMode,
isShopify,
isTerminalInteractive,
isUnitTest,
analyticsDisabled,
cloudEnvironment,
Expand All @@ -14,12 +15,62 @@ import {
import {fileExists} from '../fs.js'
import {exec} from '../system.js'

import {expect, describe, vi, test} from 'vitest'
import {afterEach, expect, describe, vi, test} from 'vitest'

vi.mock('../fs.js')
vi.mock('../system.js')
vi.mock('../environment.js')

describe('isTerminalInteractive', () => {
const originalIsTTY = process.stdout.isTTY
const originalEnv = {...process.env}

afterEach(() => {
process.stdout.isTTY = originalIsTTY
process.env.TERM = originalEnv.TERM
if (originalEnv.CI === undefined) {
delete process.env.CI
} else {
process.env.CI = originalEnv.CI
}
})

test('returns true when stdout is a TTY, TERM is not dumb, and not in CI', () => {
process.stdout.isTTY = true
delete process.env.CI
process.env.TERM = 'xterm-256color'
expect(isTerminalInteractive()).toBe(true)
})

test('returns false when stdout is not a TTY', () => {
process.stdout.isTTY = false
delete process.env.CI
process.env.TERM = 'xterm-256color'
expect(isTerminalInteractive()).toBe(false)
})

test('returns false when TERM is dumb', () => {
process.stdout.isTTY = true
delete process.env.CI
process.env.TERM = 'dumb'
expect(isTerminalInteractive()).toBe(false)
})

test('returns false when CI env var is set', () => {
process.stdout.isTTY = true
process.env.CI = 'true'
process.env.TERM = 'xterm-256color'
expect(isTerminalInteractive()).toBe(false)
})

test('returns false when CI env var is empty string (still set)', () => {
process.stdout.isTTY = true
process.env.CI = ''
process.env.TERM = 'xterm-256color'
expect(isTerminalInteractive()).toBe(false)
})
})

describe('isUnitTest', () => {
test('returns true when SHOPIFY_UNIT_TEST is truthy', () => {
// Given
Expand Down
3 changes: 1 addition & 2 deletions packages/cli-kit/src/public/node/context/local.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {defaultThemeKitAccessDomain, environmentVariables, pathConstants} from '
import {fileExists} from '../fs.js'
import {exec} from '../system.js'

import isInteractive from 'is-interactive'
import macaddress from 'macaddress'

import {homedir} from 'os'
Expand All @@ -15,7 +14,7 @@ import {homedir} from 'os'
* @returns True if the terminal is interactive.
*/
export function isTerminalInteractive(): boolean {
return isInteractive()
return Boolean(process.stdout.isTTY && process.env.TERM !== 'dumb' && !('CI' in process.env))
}

/**
Expand Down
9 changes: 0 additions & 9 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading