🏗 Restore direct requires of kleur/colors (#35905)

Author: danielrozenberg

babel.config.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const {cyan, yellow} = require('./build-system/common/colors');
+const {cyan, yellow} = require('kleur/colors');
 const {log} = require('./build-system/common/logging');
 
 /**

build-system/common/colors.js

@@ -1,4 +1,4 @@
-const colors = require('./colors');
+const colors = require('kleur/colors');
 const {exec, execScriptAsync} = require('./exec');
 const {logLocalDev} = require('./logging');
 

build-system/common/ctrlcHandler.js

@@ -1,6 +1,6 @@
 const argv = require('minimist')(process.argv.slice(2));
 const tempy = require('tempy');
-const {blue, bold, cyan, red} = require('./colors');
+const {blue, bold, cyan, red} = require('kleur/colors');
 const {getStdout} = require('./process');
 const {log, logWithoutTimestamp} = require('./logging');
 const {writeFile} = require('fs-extra');

build-system/common/diff.js

@@ -6,7 +6,7 @@
 
 const childProcess = require('child_process');
 const {log} = require('./logging');
-const {red} = require('./colors');
+const {red} = require('kleur/colors');
 const {spawnProcess} = require('./process');
 
 const shellCmd = process.platform == 'win32' ? 'cmd' : '/bin/bash';

build-system/common/exec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {bold, gray, yellow} = require('./colors');
+const {bold, gray, yellow} = require('kleur/colors');
 const {isCiBuild} = require('./ci');
 
 /**
@@ -16,7 +16,7 @@ let loggingPrefix = '';
 
 /**
  * Logs messages with a timestamp. The timezone suffix is dropped.
- * @param  {...string} messages
+ * @param  {...any} messages
  */
 function log(...messages) {
   const timestamp = new Date().toTimeString().split(' ')[0];

build-system/common/logging.js

@@ -8,7 +8,7 @@
 
 const fs = require('fs-extra');
 const path = require('path');
-const {cyan, red} = require('./colors');
+const {cyan, red} = require('kleur/colors');
 const {exec} = require('./exec');
 const {gitDiffColor, gitDiffNameOnly} = require('./git');
 const {log, logWithoutTimestamp} = require('./logging');

build-system/common/npm-checks.js

@@ -4,7 +4,7 @@ const checkDependencies = require('check-dependencies');
 const del = require('del');
 const fs = require('fs-extra');
 const path = require('path');
-const {cyan, red} = require('./colors');
+const {cyan, red} = require('kleur/colors');
 const {execOrDie} = require('./exec');
 const {getOutput} = require('./process');
 const {isCiBuild} = require('./ci');

build-system/common/update-packages.js

@@ -3,7 +3,7 @@ const experimentsConfig = require('../global-configs/experiments-config.json');
 const fastGlob = require('fast-glob');
 const fs = require('fs-extra');
 const {clean} = require('../tasks/clean');
-const {cyan, green, red, yellow} = require('./colors');
+const {cyan, green, red, yellow} = require('kleur/colors');
 const {default: ignore} = require('ignore');
 const {execOrDie} = require('./exec');
 const {gitDiffNameOnlyMain} = require('./git');

build-system/common/utils.js

@@ -1,7 +1,7 @@
 'use strict';
 const extensionBundles = require('./bundles.config.extensions.json');
 const wrappers = require('./compile-wrappers');
-const {cyan, red} = require('../common/colors');
+const {cyan, red} = require('kleur/colors');
 const {log} = require('../common/logging');
 
 const {VERSION: internalRuntimeVersion} = require('./internal-version');