From b813b29edd731ad672d9edd78c49e01bed630048 Mon Sep 17 00:00:00 2001 From: idanran Date: Wed, 7 Dec 2022 21:34:24 +0800 Subject: [PATCH 1/7] Update index.js --- index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 68f2bf2..0ff0fb6 100644 --- a/index.js +++ b/index.js @@ -138,10 +138,12 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) { const version = Number.parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10); switch (env.TERM_PROGRAM) { - case 'iTerm.app': + case 'iTerm.app': { return version >= 3 ? 3 : 2; - case 'Apple_Terminal': + } + case 'Apple_Terminal': { return 2; + } // No default } } From 240528f0b76ead0508788df5ce8aa5ae0e1d047d Mon Sep 17 00:00:00 2001 From: idanran Date: Wed, 7 Dec 2022 22:00:43 +0800 Subject: [PATCH 2/7] update --- browser.js | 2 +- index.d.ts | 10 +++++----- index.js | 3 ++- index.test-d.ts | 3 ++- package.json | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/browser.js b/browser.js index 1ffde64..9fa6888 100644 --- a/browser.js +++ b/browser.js @@ -3,7 +3,7 @@ const level = (() => { if (navigator.userAgentData) { const brand = navigator.userAgentData.brands.find(({brand}) => brand === 'Chromium'); - if (brand?.version > 93) { + if (brand && brand.version > 93) { return 3; } } diff --git a/index.d.ts b/index.d.ts index 58faab6..db44a78 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,13 +1,13 @@ -import {WriteStream} from 'node:tty'; +import type {WriteStream} from 'node:tty'; -export interface Options { +export type Options = { /** Whether `process.argv` should be sniffed for `--color` and `--no-color` flags. @default true */ readonly sniffFlags?: boolean; -} +}; /** Levels: @@ -21,7 +21,7 @@ export type ColorSupportLevel = 0 | 1 | 2 | 3; /** Detect whether the terminal supports color. */ -export interface ColorSupport { +export type ColorSupport = { /** The color level. */ @@ -41,7 +41,7 @@ export interface ColorSupport { Whether Truecolor 16 million colors are supported. */ has16m: boolean; -} +}; export type ColorInfo = ColorSupport | false; diff --git a/index.js b/index.js index 0ff0fb6..a7cea61 100644 --- a/index.js +++ b/index.js @@ -3,7 +3,7 @@ import os from 'node:os'; import tty from 'node:tty'; // From: https://github.com/sindresorhus/has-flag/blob/main/index.js -function hasFlag(flag, argv = globalThis.Deno?.args ?? process.argv) { +function hasFlag(flag, argv = globalThis.Deno ? globalThis.Deno.args : process.argv) { const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--'); const position = argv.indexOf(prefix + flag); const terminatorPosition = argv.indexOf('--'); @@ -141,6 +141,7 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) { case 'iTerm.app': { return version >= 3 ? 3 : 2; } + case 'Apple_Terminal': { return 2; } diff --git a/index.test-d.ts b/index.test-d.ts index c71fa2f..5df957f 100644 --- a/index.test-d.ts +++ b/index.test-d.ts @@ -1,6 +1,7 @@ import {stdout, stderr} from 'node:process'; import {expectType} from 'tsd'; -import supportsColor, {createSupportsColor, Options, ColorInfo} from './index.js'; +import type {Options, ColorInfo} from './index.d'; +import supportsColor, {createSupportsColor} from './index.js'; const options: Options = {}; diff --git a/package.json b/package.json index 3518f3d..b0d675d 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,6 @@ "import-fresh": "^3.3.0", "tsd": "^0.18.0", "typescript": "^4.4.3", - "xo": "^0.44.0" + "xo": "^0.53.1" } } From 8f65e8f7948e3b81cdb64379b1358c65086e151f Mon Sep 17 00:00:00 2001 From: idanran Date: Wed, 7 Dec 2022 22:08:55 +0800 Subject: [PATCH 3/7] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b8aa86..5384560 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,9 +10,9 @@ jobs: fail-fast: false matrix: node-version: + - 18 - 16 - 14 - - 12 steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 From ae44676f140d416702057433c8bd928683e1f56a Mon Sep 17 00:00:00 2001 From: idanran Date: Wed, 7 Dec 2022 22:09:21 +0800 Subject: [PATCH 4/7] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5384560..a15188b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: - 14 steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - run: npm install From 832b7230112ce1c10040b6acaf6e542167d69379 Mon Sep 17 00:00:00 2001 From: idanran <96647698+idanran@users.noreply.github.com> Date: Tue, 13 Dec 2022 01:31:32 +0000 Subject: [PATCH 5/7] update --- .github/workflows/main.yml | 4 ++-- browser.js | 2 +- index.d.ts | 4 ++-- index.js | 2 +- index.test-d.ts | 3 +-- package.json | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a15188b..3b8aa86 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,12 +10,12 @@ jobs: fail-fast: false matrix: node-version: - - 18 - 16 - 14 + - 12 steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v2 with: node-version: ${{ matrix.node-version }} - run: npm install diff --git a/browser.js b/browser.js index 9fa6888..1ffde64 100644 --- a/browser.js +++ b/browser.js @@ -3,7 +3,7 @@ const level = (() => { if (navigator.userAgentData) { const brand = navigator.userAgentData.brands.find(({brand}) => brand === 'Chromium'); - if (brand && brand.version > 93) { + if (brand?.version > 93) { return 3; } } diff --git a/index.d.ts b/index.d.ts index db44a78..9c61ecb 100644 --- a/index.d.ts +++ b/index.d.ts @@ -21,7 +21,7 @@ export type ColorSupportLevel = 0 | 1 | 2 | 3; /** Detect whether the terminal supports color. */ -export type ColorSupport = { +export interface ColorSupport { /** The color level. */ @@ -41,7 +41,7 @@ export type ColorSupport = { Whether Truecolor 16 million colors are supported. */ has16m: boolean; -}; +} export type ColorInfo = ColorSupport | false; diff --git a/index.js b/index.js index a7cea61..639afe2 100644 --- a/index.js +++ b/index.js @@ -3,7 +3,7 @@ import os from 'node:os'; import tty from 'node:tty'; // From: https://github.com/sindresorhus/has-flag/blob/main/index.js -function hasFlag(flag, argv = globalThis.Deno ? globalThis.Deno.args : process.argv) { +function hasFlag(flag, argv = globalThis.Deno?.args ?? process.argv) { const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--'); const position = argv.indexOf(prefix + flag); const terminatorPosition = argv.indexOf('--'); diff --git a/index.test-d.ts b/index.test-d.ts index 5df957f..c71fa2f 100644 --- a/index.test-d.ts +++ b/index.test-d.ts @@ -1,7 +1,6 @@ import {stdout, stderr} from 'node:process'; import {expectType} from 'tsd'; -import type {Options, ColorInfo} from './index.d'; -import supportsColor, {createSupportsColor} from './index.js'; +import supportsColor, {createSupportsColor, Options, ColorInfo} from './index.js'; const options: Options = {}; diff --git a/package.json b/package.json index b0d675d..7ab2bcd 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,6 @@ "import-fresh": "^3.3.0", "tsd": "^0.18.0", "typescript": "^4.4.3", - "xo": "^0.53.1" + "xo": "0.49.0" } } From febc7e7661f3039dc8e13f18d27323113fc2fbcf Mon Sep 17 00:00:00 2001 From: idanran <96647698+idanran@users.noreply.github.com> Date: Tue, 13 Dec 2022 01:32:50 +0000 Subject: [PATCH 6/7] update --- index.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.d.ts b/index.d.ts index 9c61ecb..9cab8d1 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,13 +1,13 @@ import type {WriteStream} from 'node:tty'; -export type Options = { +export interface Options { /** Whether `process.argv` should be sniffed for `--color` and `--no-color` flags. @default true */ readonly sniffFlags?: boolean; -}; +} /** Levels: From 77104815106ce736c80fd837d69e9c32e47663fd Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Tue, 13 Dec 2022 11:04:41 +0100 Subject: [PATCH 7/7] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7ab2bcd..82c26fe 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,6 @@ "import-fresh": "^3.3.0", "tsd": "^0.18.0", "typescript": "^4.4.3", - "xo": "0.49.0" + "xo": "^0.49.0" } }