diff --git a/package-lock.json b/package-lock.json index 5328db0c8081..fd0f461fc1aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "MIT", "dependencies": { "arg": "^5.0.1", - "chalk": "^4.1.2", "chokidar": "^3.5.3", "color-name": "^1.1.4", "cosmiconfig": "^7.0.1", @@ -22,6 +21,7 @@ "is-glob": "^4.0.3", "normalize-path": "^3.0.0", "object-hash": "^2.2.0", + "picocolors": "^1.0.0", "postcss": "^8.4.6", "postcss-js": "^4.0.0", "postcss-load-config": "^3.1.3", @@ -1614,6 +1614,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -1900,6 +1901,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -2041,6 +2043,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -3531,6 +3534,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "engines": { "node": ">=8" } @@ -6140,6 +6144,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -7741,6 +7746,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -7958,6 +7964,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -8062,6 +8069,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "requires": { "color-name": "~1.1.4" } @@ -9074,7 +9082,8 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true }, "html-encoding-sniffer": { "version": "2.0.1", @@ -10944,6 +10953,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "requires": { "has-flag": "^4.0.0" } diff --git a/package.json b/package.json index 669d8e282678..206de70393b7 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ }, "dependencies": { "arg": "^5.0.1", - "chalk": "^4.1.2", "chokidar": "^3.5.3", "color-name": "^1.1.4", "cosmiconfig": "^7.0.1", @@ -73,6 +72,7 @@ "is-glob": "^4.0.3", "normalize-path": "^3.0.0", "object-hash": "^2.2.0", + "picocolors": "^1.0.0", "postcss": "^8.4.6", "postcss-js": "^4.0.0", "postcss-load-config": "^3.1.3", diff --git a/src/featureFlags.js b/src/featureFlags.js index 109186b9065b..45c4a9f51879 100644 --- a/src/featureFlags.js +++ b/src/featureFlags.js @@ -1,4 +1,4 @@ -import chalk from 'chalk' +import colors from 'picocolors' import log from './util/log' let defaults = { @@ -41,7 +41,7 @@ export function issueFlagNotices(config) { if (experimentalFlagsEnabled(config).length > 0) { let changes = experimentalFlagsEnabled(config) - .map((s) => chalk.yellow(s)) + .map((s) => colors.yellow(s)) .join(', ') log.warn('experimental-flags-enabled', [ diff --git a/src/util/log.js b/src/util/log.js index 8ff3778527a0..5890c60f2f99 100644 --- a/src/util/log.js +++ b/src/util/log.js @@ -1,29 +1,29 @@ -import chalk from 'chalk' +import colors from 'picocolors' let alreadyShown = new Set() -function log(chalk, messages, key) { +function log(type, messages, key) { if (process.env.JEST_WORKER_ID !== undefined) return if (key && alreadyShown.has(key)) return if (key) alreadyShown.add(key) console.warn('') - messages.forEach((message) => console.warn(chalk, '-', message)) + messages.forEach((message) => console.warn(type, '-', message)) } export function dim(input) { - return chalk.dim(input) + return colors.dim(input) } export default { info(key, messages) { - log(chalk.bold.cyan('info'), ...(Array.isArray(key) ? [key] : [messages, key])) + log(colors.bold(colors.cyan('info')), ...(Array.isArray(key) ? [key] : [messages, key])) }, warn(key, messages) { - log(chalk.bold.yellow('warn'), ...(Array.isArray(key) ? [key] : [messages, key])) + log(colors.bold(colors.yellow('warn')), ...(Array.isArray(key) ? [key] : [messages, key])) }, risk(key, messages) { - log(chalk.bold.magenta('risk'), ...(Array.isArray(key) ? [key] : [messages, key])) + log(colors.bold(colors.magenta('risk')), ...(Array.isArray(key) ? [key] : [messages, key])) }, }