Upgrades Chalk (#659)

* Upgrades Chalk

* Adds better support for ansi256

.github/workflows/integration-workflow.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - run: |
-        git fetch --depth=1 origin master
+        git fetch --no-tags --unshallow origin HEAD master
 
     - name: 'Use Node.js 10.x'
       uses: actions/setup-node@master
@@ -29,7 +29,7 @@ jobs:
 
     - name: 'Check that the cache files are consistent with their remote sources'
       run: |
-        if [[ $(git diff --name-only "$(git merge-base origin/"$TARGET_BRANCH" HEAD)" HEAD -- .yarn/{cache,virtual} | wc -l) -gt 0 ]]; then
+        if [[ $(git diff --name-only "$(git merge-base origin/"$TARGET_BRANCH" HEAD)" HEAD -- .yarn/cache | wc -l) -gt 0 ]]; then
           node ./scripts/run-yarn.js --immutable --immutable-cache --check-cache
         fi
       shell: bash

packages/plugin-constraints/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/plugin-constraints",
   "version": "2.0.0-rc.8",
   "nextVersion": {
-    "nonce": "4504081233976721"
+    "nonce": "6891129022827449"
   },
   "repository": {
     "type": "git",

packages/plugin-dlx/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/plugin-dlx",
   "version": "2.0.0-rc.9",
   "nextVersion": {
-    "nonce": "5496545511674191"
+    "nonce": "4211435857203791"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/plugin-essentials/package.json

@@ -2,7 +2,8 @@
   "name": "@yarnpkg/plugin-essentials",
   "version": "2.0.0-rc.16",
   "nextVersion": {
-    "nonce": "5481798449360365"
+    "semver": "2.0.0-rc.17",
+    "nonce": "3107421490620431"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/plugin-essentials/sources/commands/remove.ts

@@ -87,10 +87,16 @@ export default class RemoveCommand extends BaseCommand {
       }
     }
 
-    if (unreferencedPackages.length > 1)
-      throw new UsageError(`Packages ${unreferencedPackages.join(`, `)} aren't referenced by any workspace`);
+    const arent = unreferencedPackages.length > 1
+      ? `aren't`
+      : `isn't`;
+
+    const which = this.all
+      ? `any`
+      : `this`;
+
     if (unreferencedPackages.length > 0)
-      throw new UsageError(`Package ${unreferencedPackages[0]} isn't referenced by any workspace`);
+      throw new UsageError(`Package ${unreferencedPackages.join(`, `)} ${arent} referenced by ${which} workspace`);
 
     if (hasChanged) {
       await configuration.triggerMultipleHooks(

packages/plugin-exec/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@yarnpkg/plugin-exec",
   "version": "2.0.0-rc.12",
+  "nextVersion": {
+    "nonce": "6863143062236867"
+  },
   "main": "./sources/index.ts",
   "dependencies": {
     "@yarnpkg/builder": "workspace:^2.0.0-rc.13",

packages/plugin-init/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/plugin-init",
   "version": "2.0.0-rc.9",
   "nextVersion": {
-    "nonce": "8344405561343829"
+    "nonce": "6467013922696359"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/plugin-interactive-tools/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/plugin-interactive-tools",
   "version": "2.0.0-rc.10",
   "nextVersion": {
-    "nonce": "7452966136840619"
+    "nonce": "4424897610664733"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/plugin-npm-cli/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/plugin-npm-cli",
   "version": "2.0.0-rc.9",
   "nextVersion": {
-    "nonce": "4349026436917297"
+    "nonce": "3779313344822199"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/plugin-pack/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/plugin-pack",
   "version": "2.0.0-rc.12",
   "nextVersion": {
-    "nonce": "1837285398600697"
+    "nonce": "2187988580810535"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/plugin-patch/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/plugin-patch",
   "version": "2.0.0-rc.1",
   "nextVersion": {
-    "nonce": "1695990524453109"
+    "nonce": "3120509621193809"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/plugin-pnp/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/plugin-pnp",
   "version": "2.0.0-rc.12",
   "nextVersion": {
-    "nonce": "3172183830835679"
+    "nonce": "2880810891864029"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/plugin-stage/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/plugin-stage",
   "version": "2.0.0-rc.12",
   "nextVersion": {
-    "nonce": "1446116570980833"
+    "nonce": "7878425841680983"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/plugin-typescript/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/plugin-typescript",
   "version": "2.0.0-rc.10",
   "nextVersion": {
-    "nonce": "938098439424615"
+    "nonce": "6234909799596577"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/plugin-version/package.json

@@ -3,7 +3,7 @@
   "version": "2.0.0-rc.15",
   "nextVersion": {
     "semver": "2.0.0-rc.16",
-    "nonce": "2067310077837823"
+    "nonce": "6797547766767345"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/plugin-workspace-tools/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/plugin-workspace-tools",
   "version": "2.0.0-rc.11",
   "nextVersion": {
-    "nonce": "1746282461491163"
+    "nonce": "6471245243267237"
   },
   "main": "./sources/index.ts",
   "dependencies": {

packages/yarnpkg-builder/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@yarnpkg/builder",
   "version": "2.0.0-rc.14",
+  "nextVersion": {
+    "semver": "2.0.0-rc.15",
+    "nonce": "6618178249483219"
+  },
   "bin": "./sources/boot-dev.js",
   "dependencies": {
     "@babel/core": "^7.7.4",
@@ -11,7 +15,7 @@
     "@yarnpkg/pnpify": "workspace:^2.0.0-rc.12",
     "babel-loader": "^8.0.6",
     "babel-plugin-lazy-import": "arcanis/babel-plugin-lazy-import",
-    "chalk": "^2.4.1",
+    "chalk": "^3.0.0",
     "clipanion": "^2.1.5",
     "filesize": "^4.1.2",
     "pnp-webpack-plugin": "^1.4.3",

packages/yarnpkg-check/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/check",
   "version": "2.0.0-rc.8",
   "nextVersion": {
-    "nonce": "3798325493381339"
+    "nonce": "2884532412443509"
   },
   "bin": "./sources/boot-cli-dev.js",
   "dependencies": {

packages/yarnpkg-cli/package.json

@@ -3,7 +3,7 @@
   "version": "2.0.0-rc.20",
   "nextVersion": {
     "semver": "2.0.0-rc.21",
-    "nonce": "1744453385370855"
+    "nonce": "7754415512164123"
   },
   "main": "./sources/index.ts",
   "dependencies": {
@@ -26,7 +26,7 @@
     "@yarnpkg/plugin-pnp": "workspace:^2.0.0-rc.11",
     "@yarnpkg/plugin-version": "workspace:^2.0.0-rc.13",
     "@yarnpkg/shell": "workspace:^2.0.0-rc.4",
-    "chalk": "^2.4.1",
+    "chalk": "^3.0.0",
     "clipanion": "^2.1.5",
     "promise.prototype.finally": "^3.1.1",
     "semver": "^5.6.0",

packages/yarnpkg-core/package.json

@@ -2,7 +2,7 @@
   "name": "@yarnpkg/core",
   "version": "2.0.0-rc.16",
   "nextVersion": {
-    "nonce": "1036848147942221"
+    "nonce": "3582703902113017"
   },
   "main": "./sources/index.ts",
   "sideEffects": false,
@@ -13,7 +13,7 @@
     "@yarnpkg/pnp": "workspace:^2.0.0-rc.12",
     "@yarnpkg/shell": "workspace:^2.0.0-rc.4",
     "camelcase": "^5.3.1",
-    "chalk": "^2.4.1",
+    "chalk": "^3.0.0",
     "clipanion": "^2.1.5",
     "cross-spawn": "^6.0.5",
     "globby": "^10.0.1",
@@ -28,7 +28,6 @@
     "pretty-bytes": "^5.1.0",
     "semver": "^5.6.0",
     "stream-to-promise": "^2.2.0",
-    "supports-color": "^7.1.0",
     "tar": "^4.4.6",
     "tmp": "^0.1.0",
     "tunnel": "^0.0.6"
@@ -39,7 +38,6 @@
     "@types/is-ci": "^2.0.0",
     "@types/micromatch": "^3.1.0",
     "@types/semver": "^6.0.2",
-    "@types/supports-color": "^5.3.0",
     "@types/tar": "^4.0.0",
     "@types/tmp": "^0.0.33",
     "@types/tunnel": "^0.0.0",

packages/yarnpkg-core/sources/Configuration.ts

@@ -6,7 +6,6 @@ import {UsageError}                                            from 'clipanion';
 import isCI                                                    from 'is-ci';
 import semver                                                  from 'semver';
 import {PassThrough, Writable}                                 from 'stream';
-import supportsColor                                           from 'supports-color';
 import {tmpNameSync}                                           from 'tmp';
 
 import {Manifest}                                              from './Manifest';
@@ -25,8 +24,14 @@ import * as nodeUtils                                          from './nodeUtils
 import * as structUtils                                        from './structUtils';
 import {IdentHash, Package}                                    from './types';
 
-// @ts-ignore
-const ctx: any = new chalk.constructor({enabled: true});
+const chalkOptions = process.env.GITHUB_ACTIONS
+  ? {level: 2}
+  : chalk.supportsColor
+    ? {level: chalk.supportsColor.level}
+    : {level: 0};
+
+const supportsColor = chalkOptions.level !== 0;
+const chalkInstance = new chalk.Instance(chalkOptions);
 
 const IGNORED_ENV_VARIABLES = new Set([
   // "binFolder" is the magic location where the parent process stored the
@@ -67,13 +72,20 @@ export enum FormatType {
   SCOPE = 'SCOPE',
 };
 
-export const formatColors = new Map([
+export const formatColors = chalkOptions.level >= 3 ? new Map([
   [FormatType.NAME, `#d7875f`],
   [FormatType.RANGE, `#00afaf`],
   [FormatType.REFERENCE, `#87afff`],
-  [FormatType.NUMBER, `yellow`],
-  [FormatType.PATH, `cyan`],
+  [FormatType.NUMBER, `#ffd700`],
+  [FormatType.PATH, `#d75fd7`],
   [FormatType.SCOPE, `#d75f00`],
+]) : new Map([
+  [FormatType.NAME, 173],
+  [FormatType.RANGE, 37],
+  [FormatType.REFERENCE, 111],
+  [FormatType.NUMBER, 220],
+  [FormatType.PATH, 170],
+  [FormatType.SCOPE, 166],
 ]);
 
 export type BaseSettingsDefinition<T extends SettingsType = SettingsType> = {
@@ -194,7 +206,7 @@ export const coreDefinitions: {[coreSettingName: string]: SettingsDefinition} =
   enableColors: {
     description: `If true, the CLI is allowed to use colors in its output`,
     type: SettingsType.BOOLEAN,
-    default: !!supportsColor.stdout,
+    default: supportsColor,
     defaultText: `<dynamic>`,
   },
   enableInlineBuilds: {
@@ -1027,9 +1039,11 @@ export class Configuration {
     if (typeof color === `undefined`)
       color = colorRequest;
 
-    const fn = color.startsWith(`#`)
-      ? ctx.hex(color)
-      : ctx[color];
+    const fn = typeof color === `number`
+      ? chalkInstance.ansi256(color)
+      : color.startsWith(`#`)
+        ? chalkInstance.hex(color)
+        : (chalkInstance as any)[color];
 
     return fn(text);
   }

packages/yarnpkg-pnp/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@yarnpkg/pnp",
   "version": "2.0.0-rc.13",
+  "nextVersion": {
+    "nonce": "1334567419921365"
+  },
   "main": "./sources/index.ts",
   "dependencies": {
     "@types/node": "^13.1.1",