Skip to content

Commit

Permalink
🏗 Replace ansi-colors with kleur/colors (#32539)
Browse files Browse the repository at this point in the history
  • Loading branch information
rsimha committed Feb 9, 2021
1 parent c8663a4 commit 6ae6dbc
Show file tree
Hide file tree
Showing 69 changed files with 74 additions and 68 deletions.
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const {
getUnminifiedConfig,
getEslintConfig,
} = require('./build-system/babel-config');
const {cyan, yellow} = require('ansi-colors');
const {cyan, yellow} = require('kleur/colors');
const {log} = require('./build-system/common/logging');

/**
Expand Down
2 changes: 1 addition & 1 deletion build-system/common/ctrlcHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

const colors = require('ansi-colors');
const colors = require('kleur/colors');
const {execScriptAsync, exec} = require('./exec');
const {logLocalDev} = require('./logging');

Expand Down
2 changes: 1 addition & 1 deletion build-system/common/exec.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
const childProcess = require('child_process');
const {log} = require('./logging');
const {spawnProcess, getOutput, getStdout, getStderr} = require('./process');
const {yellow} = require('ansi-colors');
const {yellow} = require('kleur/colors');

const shellCmd = process.platform == 'win32' ? 'cmd' : '/bin/bash';

Expand Down
2 changes: 1 addition & 1 deletion build-system/common/logging.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'use strict';

const log = require('fancy-log');
const {bold, yellow} = require('ansi-colors');
const {bold, yellow} = require('kleur/colors');
const {isCiBuild} = require('./ci');

/**
Expand Down
2 changes: 1 addition & 1 deletion build-system/common/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const {doBuild} = require('../tasks/build');
const {doDist} = require('../tasks/dist');
const {execOrDie} = require('./exec');
const {gitDiffNameOnlyMaster} = require('./git');
const {green, cyan, yellow} = require('ansi-colors');
const {green, cyan, yellow} = require('kleur/colors');
const {log, logLocalDev} = require('./logging');

const ROOT_DIR = path.resolve(__dirname, '../../');
Expand Down
2 changes: 1 addition & 1 deletion build-system/compile/bundles.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
const argv = require('minimist')(process.argv.slice(2));
const extensionBundles = require('./bundles.config.extensions.json');
const wrappers = require('./compile-wrappers');
const {cyan, red} = require('ansi-colors');
const {cyan, red} = require('kleur/colors');
const {log} = require('../common/logging');

const {VERSION: internalRuntimeVersion} = require('./internal-version');
Expand Down
2 changes: 1 addition & 1 deletion build-system/compile/check-for-unknown-deps.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

const through = require('through2');
const {log} = require('../common/logging');
const {red, cyan, yellow} = require('ansi-colors');
const {red, cyan, yellow} = require('kleur/colors');

/**
* Searches for the identifier "module$", which Closure uses to uniquely
Expand Down
2 changes: 1 addition & 1 deletion build-system/compile/closure-compile.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const closureCompiler = require('@ampproject/google-closure-compiler');
const path = require('path');
const pumpify = require('pumpify');
const sourcemaps = require('gulp-sourcemaps');
const {cyan, red, yellow} = require('ansi-colors');
const {cyan, red, yellow} = require('kleur/colors');
const {EventEmitter} = require('events');
const {highlight} = require('cli-highlight');
const {log} = require('../common/logging');
Expand Down
2 changes: 1 addition & 1 deletion build-system/compile/compile.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const {
const {checkForUnknownDeps} = require('./check-for-unknown-deps');
const {CLOSURE_SRC_GLOBS} = require('./sources');
const {cpus} = require('os');
const {green, cyan} = require('ansi-colors');
const {green, cyan} = require('kleur/colors');
const {log, logLocalDev} = require('../common/logging');
const {postClosureBabel} = require('./post-closure-babel');
const {preClosureBabel, handlePreClosureError} = require('./pre-closure-babel');
Expand Down
2 changes: 1 addition & 1 deletion build-system/compile/debug-compilation-lifecycle.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const argv = require('minimist')(process.argv.slice(2));
const fs = require('fs');
const path = require('path');
const tempy = require('tempy');
const {cyan, red} = require('ansi-colors');
const {cyan, red} = require('kleur/colors');
const {log} = require('../common/logging');

const logFile = path.resolve(process.cwd(), 'dist', 'debug-compilation.log');
Expand Down
2 changes: 1 addition & 1 deletion build-system/compile/pre-closure-babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const {BABEL_SRC_GLOBS, THIRD_PARTY_TRANSFORM_GLOBS} = require('./sources');
const {debug, CompilationLifecycles} = require('./debug-compilation-lifecycle');
const {EventEmitter} = require('events');
const {log} = require('../common/logging');
const {red, cyan} = require('ansi-colors');
const {red, cyan} = require('kleur/colors');

/**
* Files on which to run pre-closure babel transforms.
Expand Down
2 changes: 1 addition & 1 deletion build-system/compile/typescript.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const path = require('path');
const ts = require('typescript');
const tsickle = require('tsickle');
const {log} = require('../common/logging');
const {red} = require('ansi-colors');
const {red} = require('kleur/colors');

/**
* Given a file path `foo/bar.js`, transpiles the TypeScript entry point of
Expand Down
2 changes: 1 addition & 1 deletion build-system/pr-check/build-targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const config = require('../test-configs/config');
const globby = require('globby');
const minimatch = require('minimatch');
const path = require('path');
const {cyan} = require('ansi-colors');
const {cyan} = require('kleur/colors');
const {getLoggingPrefix, logWithoutTimestamp} = require('../common/logging');
const {gitDiffNameOnlyMaster} = require('../common/git');
const {isCiBuild} = require('../common/ci');
Expand Down
2 changes: 1 addition & 1 deletion build-system/pr-check/cross-browser-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
const {buildTargetsInclude, Targets} = require('./build-targets');
const {log} = require('../common/logging');
const {printSkipMessage, timedExecOrDie} = require('./utils');
const {red, cyan} = require('ansi-colors');
const {red, cyan} = require('kleur/colors');
const {reportAllExpectedTests} = require('../tasks/report-test-status');
const {runCiJob} = require('./ci-job');

Expand Down
2 changes: 1 addition & 1 deletion build-system/pr-check/nomodule-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const {
} = require('./utils');
const {buildTargetsInclude, Targets} = require('./build-targets');
const {log} = require('../common/logging');
const {red, yellow} = require('ansi-colors');
const {red, yellow} = require('kleur/colors');
const {runCiJob} = require('./ci-job');
const {signalPrDeployUpload} = require('../tasks/pr-deploy-bot-utils');

Expand Down
2 changes: 1 addition & 1 deletion build-system/pr-check/npm-checks.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/

const checkDependencies = require('check-dependencies');
const {cyan, red, yellow} = require('ansi-colors');
const {cyan, red, yellow} = require('kleur/colors');
const {getLoggingPrefix, logWithoutTimestamp} = require('../common/logging');
const {gitDiffColor, gitDiffNameOnly} = require('../common/git');

Expand Down
2 changes: 1 addition & 1 deletion build-system/pr-check/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const {
shortSha,
} = require('../common/git');
const {ciBuildSha, ciPullRequestSha, isCiBuild} = require('../common/ci');
const {cyan, green, yellow} = require('ansi-colors');
const {cyan, green, yellow} = require('kleur/colors');
const {execOrDie, execOrThrow, execWithError, exec} = require('../common/exec');
const {getLoggingPrefix, logWithoutTimestamp} = require('../common/logging');
const {replaceUrls} = require('../tasks/pr-deploy-bot-utils');
Expand Down
2 changes: 1 addition & 1 deletion build-system/server/app-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

const minimist = require('minimist');
const {cyan, green} = require('ansi-colors');
const {cyan, green} = require('kleur/colors');
const {log} = require('../common/logging');

let serveMode = 'default';
Expand Down
2 changes: 1 addition & 1 deletion build-system/server/routes/a4a-envelopes.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const fs = require('fs');
const request = require('request');
const {getServeMode, replaceUrls} = require('../app-utils');
const {log} = require('../../common/logging');
const {red} = require('ansi-colors');
const {red} = require('kleur/colors');

// In-a-box envelope.
// Examples:
Expand Down
2 changes: 1 addition & 1 deletion build-system/server/typescript-compile.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/
const pathModule = require('path');
const {cyan, green} = require('ansi-colors');
const {cyan, green} = require('kleur/colors');
const {exec} = require('../common/exec');
const {log} = require('../common/logging');

Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/bundle-size/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const {
const {
VERSION: internalRuntimeVersion,
} = require('../../compile/internal-version');
const {cyan, red, yellow} = require('ansi-colors');
const {cyan, red, yellow} = require('kleur/colors');
const {log} = require('../../common/logging');
const {report, NoTTYReport} = require('@ampproject/filesize');

Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/caches-json.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
const gulp = require('gulp');
const through2 = require('through2');
const {log} = require('../common/logging');
const {red, yellow} = require('ansi-colors');
const {red, yellow} = require('kleur/colors');

const expectedCaches = ['google'];

Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/check-exact-versions.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'use strict';

const globby = require('globby');
const {cyan, green, red} = require('ansi-colors');
const {cyan, green, red} = require('kleur/colors');
const {getStderr} = require('../common/exec');
const {gitDiffFileMaster} = require('../common/git');
const {log, logLocalDev, logWithoutTimestamp} = require('../common/logging');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/check-links.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const markdownLinkCheck = require('markdown-link-check');
const path = require('path');
const {getFilesToCheck, usesFilesOrLocalChanges} = require('../common/utils');
const {gitDiffAddedNameOnlyMaster} = require('../common/git');
const {green, cyan, red, yellow} = require('ansi-colors');
const {green, cyan, red, yellow} = require('kleur/colors');
const {linkCheckGlobs} = require('../test-configs/config');
const {log, logLocalDev} = require('../common/logging');
const {maybeUpdatePackages} = require('./update-packages');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/check-owners.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const fs = require('fs-extra');
const JSON5 = require('json5');
const request = require('request');
const util = require('util');
const {cyan, red, green} = require('ansi-colors');
const {cyan, red, green} = require('kleur/colors');
const {getFilesToCheck, usesFilesOrLocalChanges} = require('../common/utils');
const {log, logLocalDev} = require('../common/logging');

Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/check-renovate-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

'use strict';

const {cyan, red, green} = require('ansi-colors');
const {cyan, red, green} = require('kleur/colors');
const {getOutput} = require('../common/exec');
const {log} = require('../common/logging');

Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/check-sourcemaps.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

const argv = require('minimist')(process.argv.slice(2));
const fs = require('fs');
const {cyan, green, red} = require('ansi-colors');
const {cyan, green, red} = require('kleur/colors');
const {decode} = require('sourcemap-codec');
const {execOrDie} = require('../common/exec');
const {log} = require('../common/logging');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/cherry-pick.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

const argv = require('minimist')(process.argv.slice(2));
const {execOrThrow, getOutput} = require('../common/exec');
const {green, cyan, red, yellow} = require('ansi-colors');
const {green, cyan, red, yellow} = require('kleur/colors');
const {log} = require('../common/logging');

/**
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/clean.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
const argv = require('minimist')(process.argv.slice(2));
const del = require('del');
const path = require('path');
const {cyan} = require('ansi-colors');
const {cyan} = require('kleur/colors');
const {log} = require('../common/logging');

const ROOT_DIR = path.resolve(__dirname, '../../');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/codecov-upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
'use strict';

const colors = require('ansi-colors');
const colors = require('kleur/colors');
const fs = require('fs-extra');
const {ciBuildSha, isCiBuild} = require('../common/ci');
const {getStdout} = require('../common/exec');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/coverage-map/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
const argv = require('minimist')(process.argv.slice(2));
const fs = require('fs').promises;
const {buildNewServer} = require('../../server/typescript-compile');
const {cyan} = require('ansi-colors');
const {cyan} = require('kleur/colors');
const {dist} = require('../dist');
const {installPackages} = require('../../common/utils');
const {log} = require('../../common/logging');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/css/jsify-css.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const fs = require('fs-extra');
const postcss = require('postcss');
const postcssImport = require('postcss-import');
const {log} = require('../../common/logging');
const {red} = require('ansi-colors');
const {red} = require('kleur/colors');

// NOTE: see https://github.com/ai/browserslist#queries for `browsers` list
const cssprefixer = autoprefixer({
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/default-task.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

const argv = require('minimist')(process.argv.slice(2));
const {createCtrlcHandler} = require('../common/ctrlcHandler');
const {cyan, green} = require('ansi-colors');
const {cyan, green} = require('kleur/colors');
const {doServe} = require('./serve');
const {log} = require('../common/logging');
const {maybeUpdatePackages} = require('./update-packages');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/dep-check.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const {
} = require('../common/ctrlcHandler');
const {compileJison} = require('./compile-jison');
const {css} = require('./css');
const {cyan, red, yellow} = require('ansi-colors');
const {cyan, red, yellow} = require('kleur/colors');
const {log, logLocalDev} = require('../common/logging');

const root = process.cwd();
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/dist.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

const colors = require('ansi-colors');
const colors = require('kleur/colors');
const file = require('gulp-file');
const fs = require('fs-extra');
const gulp = require('gulp');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/e2e/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const {
getFilesFromArgv,
installPackages,
} = require('../../common/utils');
const {cyan} = require('ansi-colors');
const {cyan} = require('kleur/colors');
const {execOrDie} = require('../../common/exec');
const {HOST, PORT, startServer, stopServer} = require('../serve');
const {isCiBuild} = require('../../common/ci');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/e2e/mocha-dots-reporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const {
icon,
nbDotsPerLine,
} = require('../../test-configs/karma.conf').superDotsReporter;
const {green, red, yellow} = require('ansi-colors');
const {green, red, yellow} = require('kleur/colors');
const {reportTestFinished} = require('../report-test-status');

/**
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/extension-generator/bento/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
const argv = require('minimist')(process.argv.slice(2));
const fs = require('fs').promises;
const path = require('path');
const {cyan, green, red, yellow} = require('ansi-colors');
const {cyan, green, red, yellow} = require('kleur/colors');
const {log} = require('../../../common/logging');

const EXTENSIONS_DIR = path.join(__dirname, '../../../../extensions');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/extension-generator/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const path = require('path');
const {
insertExtensionBundlesConfig,
} = require('./insert-extension-bundles-config');
const {cyan, green, red} = require('ansi-colors');
const {cyan, green, red} = require('kleur/colors');
const {execOrThrow} = require('../../common/exec');
const {log} = require('../../common/logging');
const {makeBentoExtension} = require('./bento');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/extension-helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

const colors = require('ansi-colors');
const colors = require('kleur/colors');
const debounce = require('debounce');
const fs = require('fs-extra');
const wrappers = require('../compile/compile-wrappers');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/firebase.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const path = require('path');
const {clean} = require('./clean');
const {doBuild} = require('./build');
const {doDist} = require('./dist');
const {green} = require('ansi-colors');
const {green} = require('kleur/colors');
const {log} = require('../common/logging');

async function walk(dest) {
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const {
const {applyConfig, removeConfig} = require('./prepend-global/index.js');
const {closureCompile} = require('../compile/compile');
const {EventEmitter} = require('events');
const {green, red, cyan} = require('ansi-colors');
const {green, red, cyan} = require('kleur/colors');
const {isCiBuild} = require('../common/ci');
const {jsBundles} = require('../compile/bundles.config');
const {log, logLocalDev} = require('../common/logging');
Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const {
} = require('./runtime-test/runtime-test-base');
const {buildNewServer} = require('../server/typescript-compile');
const {buildRuntime} = require('../common/utils');
const {cyan, yellow} = require('ansi-colors');
const {cyan, yellow} = require('kleur/colors');
const {log} = require('../common/logging');
const {maybePrintArgvMessages} = require('./runtime-test/helpers');

Expand Down
2 changes: 1 addition & 1 deletion build-system/tasks/lint.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const {
logOnSameLine,
logOnSameLineLocalDev,
} = require('../common/logging');
const {cyan, green, red, yellow} = require('ansi-colors');
const {cyan, green, red, yellow} = require('kleur/colors');
const {getFilesChanged, getFilesFromArgv} = require('../common/utils');
const {gitDiffNameOnlyMaster} = require('../common/git');
const {maybeUpdatePackages} = require('./update-packages');
Expand Down

0 comments on commit 6ae6dbc

Please sign in to comment.