Skip to content

Don't force-enable color if env.CI is set #96

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
valadaptive wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

Don't force-enable color if env.CI is set #96

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions .github/workflows/testing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: node tests/test.js
- run: FORCE_COLOR=1 node tests/test.js
legacy:
name: Node v${{ matrix.node-version }} (Legacy)
runs-on: ubuntu-latest
Expand All @@ -40,4 +40,4 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: node tests/test.js
- run: FORCE_COLOR=1 node tests/test.js
2 changes: 1 addition & 1 deletion picocolors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let p = process || {}, argv = p.argv || [], env = p.env || {}
let isColorSupported =
!(!!env.NO_COLOR || argv.includes("--no-color")) &&
(!!env.FORCE_COLOR || argv.includes("--color") || p.platform === "win32" || ((p.stdout || {}).isTTY && env.TERM !== "dumb") || !!env.CI)
(!!env.FORCE_COLOR || argv.includes("--color") || p.platform === "win32" || !!((p.stdout || {}).isTTY && env.TERM !== "dumb"))

let formatter = (open, close, replace = open) =>
input => {
Expand Down
6 changes: 3 additions & 3 deletions tests/environments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ let CI = process.env.CI

test("ci server", () => {
let pc = initModuleEnv({ env: { TERM: "dumb", CI: "1" } })
assert.equal(pc.isColorSupported, true)
assert.equal(pc.red("text"), pc.createColors(true).red("text"))
assert.equal(pc.isColorSupported, false)
assert.equal(pc.red("text"), pc.createColors(false).red("text"))
})

test("arg --color", () => {
Expand All @@ -25,7 +25,7 @@ test("env NO_COLOR", () => {
})

test("env NO_COLOR empty", () => {
let pc = initModuleEnv({ env: { NO_COLOR: "", CI } })
let pc = initModuleEnv({ env: { FORCE_COLOR: "1", NO_COLOR: "" } })
assert.equal(pc.isColorSupported, true)
assert.equal(pc.red("text"), pc.createColors(true).red("text"))
})
Expand Down