Merge pull request #2145 from thelounge/xpaw/chalk

Replace colors.js with chalk

package.json

@@ -40,8 +40,8 @@
   },
   "dependencies": {
     "bcryptjs": "2.4.3",
+    "chalk": "2.3.1",
     "cheerio": "0.22.0",
-    "colors": "1.1.2",
     "commander": "2.14.1",
     "express": "4.16.2",
     "fs-extra": "5.0.0",

scripts/changelog.js

@@ -46,7 +46,7 @@ node scripts/changelog <version>
 "use strict";
 
 const _ = require("lodash");
-const colors = require("colors/safe");
+const colors = require("chalk");
 const fs = require("fs");
 const GraphQLClient = require("graphql-request").GraphQLClient;
 const moment = require("moment");

src/client.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const _ = require("lodash");
-const colors = require("colors/safe");
+const colors = require("chalk");
 const pkg = require("../package.json");
 const Chan = require("./models/chan");
 const crypto = require("crypto");

src/clientManager.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const _ = require("lodash");
-const colors = require("colors/safe");
+const colors = require("chalk");
 const fs = require("fs");
 const path = require("path");
 const Client = require("./client");

src/command-line/config.js

@@ -2,7 +2,7 @@
 
 const program = require("commander");
 const child = require("child_process");
-const colors = require("colors/safe");
+const colors = require("chalk");
 const fs = require("fs");
 const Helper = require("../helper");
 const Utils = require("./utils");

src/command-line/index.js

@@ -6,7 +6,7 @@ const _ = require("lodash");
 const fs = require("fs");
 const path = require("path");
 const program = require("commander");
-const colors = require("colors/safe");
+const colors = require("chalk");
 const Helper = require("../helper");
 const Utils = require("./utils");
 

src/command-line/install.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const colors = require("colors/safe");
+const colors = require("chalk");
 const program = require("commander");
 const Helper = require("../helper");
 const Utils = require("./utils");

src/command-line/start.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const colors = require("colors/safe");
+const colors = require("chalk");
 const fs = require("fs");
 const fsextra = require("fs-extra");
 const path = require("path");

src/command-line/uninstall.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const colors = require("colors/safe");
+const colors = require("chalk");
 const path = require("path");
 const program = require("commander");
 const Helper = require("../helper");

src/command-line/users/add.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const colors = require("colors/safe");
+const colors = require("chalk");
 const program = require("commander");
 const fs = require("fs");
 const Helper = require("../../helper");

src/command-line/users/edit.js

@@ -2,7 +2,7 @@
 
 const program = require("commander");
 const child = require("child_process");
-const colors = require("colors/safe");
+const colors = require("chalk");
 const fs = require("fs");
 const Helper = require("../../helper");
 const Utils = require("../utils");

src/command-line/users/list.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const colors = require("colors/safe");
+const colors = require("chalk");
 const program = require("commander");
 const fs = require("fs");
 const Helper = require("../../helper");

src/command-line/users/remove.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const colors = require("colors/safe");
+const colors = require("chalk");
 const program = require("commander");
 const fs = require("fs");
 const Helper = require("../../helper");

src/command-line/users/reset.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const colors = require("colors/safe");
+const colors = require("chalk");
 const program = require("commander");
 const fs = require("fs");
 const Helper = require("../../helper");

src/command-line/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const _ = require("lodash");
-const colors = require("colors/safe");
+const colors = require("chalk");
 const fs = require("fs");
 const Helper = require("../helper");
 const path = require("path");

src/helper.js

@@ -7,7 +7,7 @@ const os = require("os");
 const fs = require("fs");
 const net = require("net");
 const bcrypt = require("bcryptjs");
-const colors = require("colors/safe");
+const colors = require("chalk");
 
 let homePath;
 let configPath;

src/identification.js

@@ -2,7 +2,7 @@
 
 const fs = require("fs");
 const net = require("net");
-const colors = require("colors/safe");
+const colors = require("chalk");
 const Helper = require("./helper");
 
 class Identification {

src/log.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const colors = require("colors/safe");
+const colors = require("chalk");
 const moment = require("moment");
 const read = require("read");
 const Helper = require("./helper");

src/plugins/auth/local.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const Helper = require("../../helper");
-const colors = require("colors/safe");
+const colors = require("chalk");
 
 function localAuth(manager, client, user, password, callback) {
 	// If no user is found, or if the client has not provided a password,

src/plugins/packages/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const colors = require("colors/safe");
+const colors = require("chalk");
 const path = require("path");
 const Helper = require("../../helper");
 const themes = require("./themes");

src/server.js

@@ -10,7 +10,7 @@ const path = require("path");
 const io = require("socket.io");
 const dns = require("dns");
 const Helper = require("./helper");
-const colors = require("colors/safe");
+const colors = require("chalk");
 const net = require("net");
 const Identification = require("./identification");
 const changelog = require("./plugins/changelog");

yarn.lock

@@ -1236,6 +1236,14 @@ chai@4.1.2:
     pathval "^1.0.0"
     type-detect "^4.0.0"
 
+chalk@2.3.1, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
+  dependencies:
+    ansi-styles "^3.2.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.2.0"
+
 chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -1246,14 +1254,6 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
-  dependencies:
-    ansi-styles "^3.2.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.2.0"
-
 character-entities-html4@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.1.tgz#359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50"
@@ -1464,7 +1464,7 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
-colors@1.1.2, colors@~1.1.2:
+colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"