chore: migrate to colorette

webpack · Jul 31, 2020 · 58b4712 · 58b4712
1 parent cf82bc6
commit 58b4712
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/packages/serve/src/index.ts b/packages/serve/src/index.ts
@@ -15,7 +15,7 @@ export default function serve(...args: string[]): void {
     const core = cli.getCoreFlags();
 
     const parsedDevServerArgs = cli.argParser(devServer, args, true);
-    if (parsedDevServerArgs.unknownArgs.some((arg) => ['help', 'version', 'color'].includes(arg))) return;
+    if (parsedDevServerArgs.unknownArgs.some((arg) => ['help', 'version'].includes(arg))) return;
 
     const devServerArgs = parsedDevServerArgs.opts;
     const parsedWebpackArgs = cli.argParser(core, parsedDevServerArgs.unknownArgs, true, process.title);

diff --git a/test/serve/basic/serve-basic.test.js b/test/serve/basic/serve-basic.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
+const { yellow, options } = require('colorette');
 const path = require('path');
 const getPort = require('get-port');
 const { runServe } = require('../../utils/test-utils');
@@ -27,12 +27,10 @@ describe('basic serve usage', () => {
             console.warn('TODO: fix `serve` test on windows');
         });
     } else {
-        it('should respect the --color=false flag', async () => {
-            const { stdout, stderr } = await runServe(['help', '--color=false'], __dirname);
-            chalk.enabled = true;
-            chalk.level = 3;
-            const orange = chalk.keyword('orange');
-            expect(stdout).not.toContain(orange(usageText));
+        it('should respect the --no-color flag', async () => {
+            const { stdout, stderr } = await runServe(['--help', '--no-color'], __dirname);
+            options.enabled = true;
+            expect(stdout).not.toContain(yellow(usageText));
             expect(stdout).toContain(descriptionText);
             expect(stderr).toHaveLength(0);
         });