Remove chalk

CHANGELOG

@@ -35,7 +35,6 @@ devel
 
   - accepts: 1.3.5 -> 1.3.7
   - ansi_up: 4.0.3 -> 5.0.1
-  - chalk: 1.1.3 -> 4.1.1
   - content-type: (added) -> 1.0.4
   - error-stack-parser: 2.0.2 -> 2.0.6
   - highlight.js: 9.15.6 -> 10.7.3
@@ -395,32 +394,6 @@ devel
 * Fixed ES-881: ensure that LDAP options for async, referrals and restart set
   the off value correctly. Otherwise, this can result in an "operations error".
 
-* Updated JavaScript dependencies, including breaking changes to non-public
-  modules. Note that this removes underscore, which was previously listed as a
-  public module in ArangoDB 2. We recommend always bundling your own copy of
-  third-party modules, even ones listed as public.
-
-  - accepts: 1.3.5 -> 1.3.7
-  - ansi_up: 4.0.3 -> 5.0.1
-  - chalk: 1.1.3 -> 4.1.1
-  - content-type: (added) -> 1.0.4
-  - error-stack-parser: 2.0.2 -> 2.0.6
-  - highlight.js: 9.15.6 -> 10.7.2
-  - http-errors: 1.7.2 -> 1.8.0
-  - iconv-lite: 0.4.24 -> 0.6.2
-  - js-yaml: 3.13.1 -> 3.14.1
-  - lodash: 4.17.13 -> 4.17.21
-  - marked: 0.6.2 -> removed
-  - media-typer: 0.3.0 -> removed
-  - mime-types: 2.1.22 -> 2.1.30
-  - netmask: 1.0.6 -> 2.0.2
-  - qs: 6.7.0 -> 6.10.1
-  - range-parser: 1.2.0 -> 1.2.1
-  - semver: 6.0.0 -> 7.3.5
-  - timezone: 1.0.22 -> 1.0.23
-  - type-is: 1.6.16 -> 1.6.18
-  - underscore: 1.9.1 -> removed
-
 * Fixed DEVSUP-764 (SEARCH-7): inconsistent BM25 scoring for LEVENSHTEIN_MATCH
   function.
 

js/common/modules/@arangodb/mocha-runner.js

@@ -29,9 +29,9 @@
 // //////////////////////////////////////////////////////////////////////////////
 
 const Module = require('module');
-const chalk = require('chalk');
 const runTests = require('@arangodb/mocha').run;
 const indent = require('@arangodb/util').indentation;
+const COLORS = require('internal').COLORS;
 
 const $_MODULE_CONTEXT = Symbol.for('@arangodb/module.context');
 
@@ -50,18 +50,14 @@ module.exports = function (files, returnJson, grep) {
 function logStats (stats) {
   print(`${
     stats.failures
-    ? chalk.red('[FAIL]')
-    : chalk.green('[PASS]')
+    ? `${COLORS.COLOR_RED}[FAIL]${COLORS.COLOR_RESET}`
+    : `${COLORS.COLOR_GREEN}[PASS]${COLORS.COLOR_RESET}`
   } Completed ${
-    chalk.bold(stats.tests)
-  } tests in ${
-    chalk.bold(stats.duration + 'ms')
-  } (${
-    chalk.green(stats.passes)
-  }|${
-    chalk.red(stats.failures)
-  }|${
-    chalk.cyan(stats.pending)
+    COLORS.COLOR_BOLD_WHITE}${stats.tests}${COLORS.COLOR_RESET} tests in ${
+    COLORS.COLOR_BOLD_WHITE}${stats.duration + 'ms'}${COLORS.COLOR_RESET} (${
+    COLORS.COLOR_GREEN}${stats.passes}${COLORS.COLOR_RESET}|${
+    COLORS.COLOR_RED}${stats.failures}${COLORS.COLOR_RESET}|${
+    COLORS.COLOR_CYAN}${stats.pending}${COLORS.COLOR_RESET
   })`);
 }
 
@@ -70,32 +66,27 @@ function logSuite (suite, indentLevel) {
     indentLevel = 0;
   }
   if (suite.title) {
-    print(
-      indent(indentLevel - 1) +
-      chalk.bold(suite.title)
-    );
+    print(`${indent(indentLevel - 1)}${
+      COLORS.COLOR_BOLD_WHITE}${suite.title}${COLORS.COLOR_RESET
+    }`);
   }
   for (let test of suite.tests) {
     if (test.result === 'pass') {
-      print(
-        indent(indentLevel) +
-        chalk.green('[PASS] ' + test.title)
-      );
+      print(`${indent(indentLevel)}${
+        COLORS.COLOR_GREEN}[PASS] ${test.title}${COLORS.COLOR_RESET
+      }`);
     } else if (test.result === 'pending') {
-      print(
-        indent(indentLevel) +
-        chalk.cyan('[SKIP] ' + test.title)
-      );
+      print(`${indent(indentLevel)}${
+        COLORS.COLOR_CYAN}[SKIP] ${test.title}${COLORS.COLOR_RESET
+      }`);
     } else {
-      print(
-        indent(indentLevel) +
-        chalk.red('[' + test.result.toUpperCase() + '] ' + test.title)
-      );
+      print(`${indent(indentLevel)}${
+        COLORS.COLOR_RED}[${test.result.toUpperCase()}] ${test.title}${COLORS.COLOR_RESET
+      }`);
       for (let line of test.err.stack.split(/\n/)) {
-        print(
-          indent(indentLevel + 1) +
-          chalk.red(line)
-        );
+        print(`${indent(indentLevel + 1)}${
+          COLORS.COLOR_RED}${line}${COLORS.COLOR_RESET
+        }`);
       }
     }
   }

js/common/modules/@arangodb/util.js

@@ -28,8 +28,6 @@
 
 const _ = require('lodash');
 const fs = require('fs');
-const Chalk = require('chalk').Instance;
-const chalk = new Chalk({level: 2});
 const dedent = require('dedent');
 const internal = require('internal');
 const codeFrame = require('babel-code-frame');
@@ -111,7 +109,11 @@ exports.codeFrame = function (e, basePath, withColor = internal.COLOR_OUTPUT) {
       const location = `@ ${
         basePath ? ctx.fileName.slice(basePath.length + 1) : ctx.fileName
       }:${ctx.lineNumber}:${ctx.columnNumber}\n`;
-      return (withColor ? chalk.grey(location) : location) + frame;
+      return (
+        withColor
+        ? `${internal.COLORS.COLOR_BRIGHT}${location}${internal.COLORS.COLOR_RESET}`
+        : location
+      ) + frame;
     }
   } catch (e) {}
   return null;