diff --git a/.pnp.cjs b/.pnp.cjs index de9373a8d7f9..709c94dbfe56 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -278,7 +278,7 @@ const RAW_RUNTIME_STATE = ["@yarnpkg/monorepo", "workspace:."],\ ["@yarnpkg/sdks", "workspace:packages/yarnpkg-sdks"],\ ["@yarnpkg/types", "workspace:packages/yarnpkg-types"],\ - ["chalk", "npm:3.0.0"],\ + ["chalk", "npm:4.1.2"],\ ["clipanion", "virtual:576bf3e379b293160348e4cadfbd6541796e6f78477b0875c4437065090cec6f78b6ec2281b8e15d1c870d61578dc7dee16a5ae49a65701fec83e592ce2ebdeb#npm:4.0.0-rc.2"],\ ["esbuild", [\ "esbuild-wasm",\ @@ -8490,7 +8490,7 @@ const RAW_RUNTIME_STATE = ["@yarnpkg/core", "workspace:packages/yarnpkg-core"],\ ["@yarnpkg/fslib", "workspace:packages/yarnpkg-fslib"],\ ["@yarnpkg/monorepo", "workspace:."],\ - ["chalk", "npm:3.0.0"],\ + ["chalk", "npm:4.1.2"],\ ["clipanion", "virtual:576bf3e379b293160348e4cadfbd6541796e6f78477b0875c4437065090cec6f78b6ec2281b8e15d1c870d61578dc7dee16a5ae49a65701fec83e592ce2ebdeb#npm:4.0.0-rc.2"],\ ["esbuild", [\ "esbuild-wasm",\ @@ -9479,7 +9479,7 @@ const RAW_RUNTIME_STATE = ["@yarnpkg/plugin-pnp", "virtual:712d04b0098634bdb13868ff8f85b327022bd7d3880873ada8c0ae56847ed36cf9da1fd74a88519380129cec528fe2bd2201426bc28ac9d4a8cc6734ff25c538#workspace:packages/plugin-pnp"],\ ["@yarnpkg/shell", "workspace:packages/yarnpkg-shell"],\ ["camelcase", "npm:5.3.1"],\ - ["chalk", "npm:3.0.0"],\ + ["chalk", "npm:4.1.2"],\ ["ci-info", "npm:4.0.0"],\ ["clipanion", "virtual:576bf3e379b293160348e4cadfbd6541796e6f78477b0875c4437065090cec6f78b6ec2281b8e15d1c870d61578dc7dee16a5ae49a65701fec83e592ce2ebdeb#npm:4.0.0-rc.2"],\ ["comment-json", "npm:2.2.0"],\ @@ -9787,7 +9787,7 @@ const RAW_RUNTIME_STATE = ["@yarnpkg/monorepo", "workspace:."],\ ["@yarnpkg/sdks", "workspace:packages/yarnpkg-sdks"],\ ["@yarnpkg/types", "workspace:packages/yarnpkg-types"],\ - ["chalk", "npm:3.0.0"],\ + ["chalk", "npm:4.1.2"],\ ["clipanion", "virtual:576bf3e379b293160348e4cadfbd6541796e6f78477b0875c4437065090cec6f78b6ec2281b8e15d1c870d61578dc7dee16a5ae49a65701fec83e592ce2ebdeb#npm:4.0.0-rc.2"],\ ["esbuild", [\ "esbuild-wasm",\ @@ -19222,7 +19222,7 @@ const RAW_RUNTIME_STATE = ["@yarnpkg/parsers", "workspace:packages/yarnpkg-parsers"],\ ["@yarnpkg/pnp", "workspace:packages/yarnpkg-pnp"],\ ["@yarnpkg/sdks", "workspace:packages/yarnpkg-sdks"],\ - ["chalk", "npm:3.0.0"],\ + ["chalk", "npm:4.1.2"],\ ["clipanion", "virtual:576bf3e379b293160348e4cadfbd6541796e6f78477b0875c4437065090cec6f78b6ec2281b8e15d1c870d61578dc7dee16a5ae49a65701fec83e592ce2ebdeb#npm:4.0.0-rc.2"],\ ["comment-json", "npm:2.2.0"],\ ["lodash", "npm:4.17.21"],\ @@ -19241,7 +19241,7 @@ const RAW_RUNTIME_STATE = ["@yarnpkg/monorepo", "workspace:."],\ ["@yarnpkg/parsers", "workspace:packages/yarnpkg-parsers"],\ ["@yarnpkg/shell", "workspace:packages/yarnpkg-shell"],\ - ["chalk", "npm:3.0.0"],\ + ["chalk", "npm:4.1.2"],\ ["clipanion", "virtual:576bf3e379b293160348e4cadfbd6541796e6f78477b0875c4437065090cec6f78b6ec2281b8e15d1c870d61578dc7dee16a5ae49a65701fec83e592ce2ebdeb#npm:4.0.0-rc.2"],\ ["cross-spawn", "npm:7.0.6"],\ ["fast-glob", "npm:3.3.2"],\ @@ -20929,15 +20929,6 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "HARD"\ }],\ - ["npm:3.0.0", {\ - "packageLocation": "./.yarn/cache/chalk-npm-3.0.0-e813208025-37f90b31fd.zip/node_modules/chalk/",\ - "packageDependencies": [\ - ["ansi-styles", "npm:4.2.0"],\ - ["chalk", "npm:3.0.0"],\ - ["supports-color", "npm:7.1.0"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:4.1.2", {\ "packageLocation": "./.yarn/cache/chalk-npm-4.1.2-ba8b67ab80-cb3f3e5949.zip/node_modules/chalk/",\ "packageDependencies": [\ diff --git a/.yarn/cache/chalk-npm-3.0.0-e813208025-37f90b31fd.zip b/.yarn/cache/chalk-npm-3.0.0-e813208025-37f90b31fd.zip deleted file mode 100644 index 2854d556d8e8..000000000000 Binary files a/.yarn/cache/chalk-npm-3.0.0-e813208025-37f90b31fd.zip and /dev/null differ diff --git a/.yarn/versions/6a20bebf.yml b/.yarn/versions/6a20bebf.yml new file mode 100644 index 000000000000..921f05a4fac7 --- /dev/null +++ b/.yarn/versions/6a20bebf.yml @@ -0,0 +1,34 @@ +releases: + "@yarnpkg/builder": patch + "@yarnpkg/cli": patch + "@yarnpkg/core": patch + "@yarnpkg/doctor": patch + "@yarnpkg/extensions": patch + "@yarnpkg/nm": patch + "@yarnpkg/plugin-compat": patch + "@yarnpkg/plugin-constraints": patch + "@yarnpkg/plugin-dlx": patch + "@yarnpkg/plugin-essentials": patch + "@yarnpkg/plugin-exec": patch + "@yarnpkg/plugin-file": patch + "@yarnpkg/plugin-git": patch + "@yarnpkg/plugin-github": patch + "@yarnpkg/plugin-http": patch + "@yarnpkg/plugin-init": patch + "@yarnpkg/plugin-interactive-tools": patch + "@yarnpkg/plugin-jsr": patch + "@yarnpkg/plugin-link": patch + "@yarnpkg/plugin-nm": patch + "@yarnpkg/plugin-npm": patch + "@yarnpkg/plugin-npm-cli": patch + "@yarnpkg/plugin-pack": patch + "@yarnpkg/plugin-patch": patch + "@yarnpkg/plugin-pnp": patch + "@yarnpkg/plugin-pnpm": patch + "@yarnpkg/plugin-stage": patch + "@yarnpkg/plugin-typescript": patch + "@yarnpkg/plugin-version": patch + "@yarnpkg/plugin-workspace-tools": patch + "@yarnpkg/pnpify": patch + "@yarnpkg/sdks": patch + "@yarnpkg/shell": patch diff --git a/package.json b/package.json index 5562e394f28f..83f8f7e419a7 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "dependencies": { "@iarna/toml": "^2.2.5", "@yarnpkg/types": "workspace:^", - "chalk": "^3.0.0", + "chalk": "^4.1.2", "micromatch": "^4.0.2", "semver": "^7.1.2" }, diff --git a/packages/yarnpkg-builder/package.json b/packages/yarnpkg-builder/package.json index f7f5e07dd8e7..ca9c5e5d0bfc 100644 --- a/packages/yarnpkg-builder/package.json +++ b/packages/yarnpkg-builder/package.json @@ -12,7 +12,7 @@ "@yarnpkg/cli": "workspace:^", "@yarnpkg/core": "workspace:^", "@yarnpkg/fslib": "workspace:^", - "chalk": "^3.0.0", + "chalk": "^4.1.2", "clipanion": "^4.0.0-rc.2", "esbuild": "npm:esbuild-wasm@^0.23.0", "semver": "^7.1.2", diff --git a/packages/yarnpkg-core/package.json b/packages/yarnpkg-core/package.json index 45cc9204a441..dbc6b88181e8 100644 --- a/packages/yarnpkg-core/package.json +++ b/packages/yarnpkg-core/package.json @@ -19,7 +19,7 @@ "@yarnpkg/parsers": "workspace:^", "@yarnpkg/shell": "workspace:^", "camelcase": "^5.3.1", - "chalk": "^3.0.0", + "chalk": "^4.1.2", "ci-info": "^4.0.0", "clipanion": "^4.0.0-rc.2", "cross-spawn": "^7.0.3", diff --git a/packages/yarnpkg-core/sources/formatUtils.ts b/packages/yarnpkg-core/sources/formatUtils.ts index f5132c6c37d2..3f08d6626c98 100644 --- a/packages/yarnpkg-core/sources/formatUtils.ts +++ b/packages/yarnpkg-core/sources/formatUtils.ts @@ -1,5 +1,5 @@ import {npath} from '@yarnpkg/fslib'; -import chalk from 'chalk'; +import chalk, {type Level} from 'chalk'; import CI from 'ci-info'; import {ColorFormat, formatMarkdownish} from 'clipanion'; import micromatch from 'micromatch'; @@ -63,7 +63,7 @@ export enum Style { BOLD = 1 << 1, } -const chalkOptions = CI.GITHUB_ACTIONS +const chalkOptions: {level: Level} = CI.GITHUB_ACTIONS ? {level: 2} : chalk.supportsColor ? {level: chalk.supportsColor.level} diff --git a/packages/yarnpkg-sdks/package.json b/packages/yarnpkg-sdks/package.json index 11de73396a9b..1e58ce3876e3 100644 --- a/packages/yarnpkg-sdks/package.json +++ b/packages/yarnpkg-sdks/package.json @@ -14,7 +14,7 @@ "@yarnpkg/core": "workspace:^", "@yarnpkg/fslib": "workspace:^", "@yarnpkg/parsers": "workspace:^", - "chalk": "^3.0.0", + "chalk": "^4.1.2", "clipanion": "^4.0.0-rc.2", "comment-json": "^2.2.0", "lodash": "^4.17.15", diff --git a/packages/yarnpkg-shell/package.json b/packages/yarnpkg-shell/package.json index f776278445a5..fb1eb2c89842 100644 --- a/packages/yarnpkg-shell/package.json +++ b/packages/yarnpkg-shell/package.json @@ -12,7 +12,7 @@ "dependencies": { "@yarnpkg/fslib": "workspace:^", "@yarnpkg/parsers": "workspace:^", - "chalk": "^3.0.0", + "chalk": "^4.1.2", "clipanion": "^4.0.0-rc.2", "cross-spawn": "^7.0.3", "fast-glob": "^3.2.2", diff --git a/yarn.lock b/yarn.lock index 459ace878a39..aa6b8b2075f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5570,7 +5570,7 @@ __metadata: "@yarnpkg/core": "workspace:^" "@yarnpkg/fslib": "workspace:^" "@yarnpkg/monorepo": "workspace:^" - chalk: "npm:^3.0.0" + chalk: "npm:^4.1.2" clipanion: "npm:^4.0.0-rc.2" esbuild: "npm:esbuild-wasm@^0.23.0" semver: "npm:^7.1.2" @@ -5656,7 +5656,7 @@ __metadata: "@yarnpkg/plugin-pnp": "workspace:^" "@yarnpkg/shell": "workspace:^" camelcase: "npm:^5.3.1" - chalk: "npm:^3.0.0" + chalk: "npm:^4.1.2" ci-info: "npm:^4.0.0" clipanion: "npm:^4.0.0-rc.2" comment-json: "npm:^2.2.0" @@ -5886,7 +5886,7 @@ __metadata: "@yarnpkg/libzip": "workspace:^" "@yarnpkg/sdks": "workspace:^" "@yarnpkg/types": "workspace:^" - chalk: "npm:^3.0.0" + chalk: "npm:^4.1.2" clipanion: "npm:^4.0.0-rc.2" esbuild: "npm:esbuild-wasm@^0.23.0" eslint: "npm:^9.20.1" @@ -6424,7 +6424,7 @@ __metadata: "@yarnpkg/monorepo": "workspace:^" "@yarnpkg/parsers": "workspace:^" "@yarnpkg/pnp": "workspace:^" - chalk: "npm:^3.0.0" + chalk: "npm:^4.1.2" clipanion: "npm:^4.0.0-rc.2" comment-json: "npm:^2.2.0" lodash: "npm:^4.17.15" @@ -6443,7 +6443,7 @@ __metadata: "@yarnpkg/fslib": "workspace:^" "@yarnpkg/monorepo": "workspace:^" "@yarnpkg/parsers": "workspace:^" - chalk: "npm:^3.0.0" + chalk: "npm:^4.1.2" clipanion: "npm:^4.0.0-rc.2" cross-spawn: "npm:^7.0.3" fast-glob: "npm:^3.2.2" @@ -7783,16 +7783,6 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^3.0.0": - version: 3.0.0 - resolution: "chalk@npm:3.0.0" - dependencies: - ansi-styles: "npm:^4.1.0" - supports-color: "npm:^7.1.0" - checksum: 10/37f90b31fd655fb49c2bd8e2a68aebefddd64522655d001ef417e6f955def0ed9110a867ffc878a533f2dafea5f2032433a37c8a7614969baa7f8a1cd424ddfc - languageName: node - linkType: hard - "chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.2": version: 4.1.2 resolution: "chalk@npm:4.1.2"