diff --git a/package.json b/package.json index 7228ac51..c1b76e36 100644 --- a/package.json +++ b/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", diff --git a/scripts/changelog.js b/scripts/changelog.js index 9cbc3c5b..81dc6bcc 100644 --- a/scripts/changelog.js +++ b/scripts/changelog.js @@ -46,7 +46,7 @@ node scripts/changelog "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"); diff --git a/src/client.js b/src/client.js index 24a84f4b..ae5dfff8 100644 --- a/src/client.js +++ b/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"); diff --git a/src/clientManager.js b/src/clientManager.js index 5c5b96e4..9848ebbb 100644 --- a/src/clientManager.js +++ b/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"); diff --git a/src/command-line/config.js b/src/command-line/config.js index 37cebb00..d3efbdad 100644 --- a/src/command-line/config.js +++ b/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"); diff --git a/src/command-line/index.js b/src/command-line/index.js index b052a431..36f64d1c 100644 --- a/src/command-line/index.js +++ b/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"); diff --git a/src/command-line/install.js b/src/command-line/install.js index ece7ad3c..ce70bbcf 100644 --- a/src/command-line/install.js +++ b/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"); diff --git a/src/command-line/start.js b/src/command-line/start.js index 0c76dbd0..b8db9919 100644 --- a/src/command-line/start.js +++ b/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"); diff --git a/src/command-line/uninstall.js b/src/command-line/uninstall.js index 9694a20c..85d39ec5 100644 --- a/src/command-line/uninstall.js +++ b/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"); diff --git a/src/command-line/users/add.js b/src/command-line/users/add.js index c3d0eb5d..939e1051 100644 --- a/src/command-line/users/add.js +++ b/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"); diff --git a/src/command-line/users/edit.js b/src/command-line/users/edit.js index 8dabc785..38db830e 100644 --- a/src/command-line/users/edit.js +++ b/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"); diff --git a/src/command-line/users/list.js b/src/command-line/users/list.js index 64fdf063..d55f835e 100644 --- a/src/command-line/users/list.js +++ b/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"); diff --git a/src/command-line/users/remove.js b/src/command-line/users/remove.js index ae90cd7f..3c0a353d 100644 --- a/src/command-line/users/remove.js +++ b/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"); diff --git a/src/command-line/users/reset.js b/src/command-line/users/reset.js index b8d5412a..bed49233 100644 --- a/src/command-line/users/reset.js +++ b/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"); diff --git a/src/command-line/utils.js b/src/command-line/utils.js index f27c10f5..870ac154 100644 --- a/src/command-line/utils.js +++ b/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"); diff --git a/src/helper.js b/src/helper.js index 710b4b4a..73e5b2f6 100644 --- a/src/helper.js +++ b/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; diff --git a/src/identification.js b/src/identification.js index e0cee9d5..39eabb6d 100644 --- a/src/identification.js +++ b/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 { diff --git a/src/log.js b/src/log.js index 17ba0aae..17608572 100644 --- a/src/log.js +++ b/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"); diff --git a/src/plugins/auth/local.js b/src/plugins/auth/local.js index dc014520..09381dd0 100644 --- a/src/plugins/auth/local.js +++ b/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, diff --git a/src/plugins/packages/index.js b/src/plugins/packages/index.js index f27048a8..878908eb 100644 --- a/src/plugins/packages/index.js +++ b/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"); diff --git a/src/server.js b/src/server.js index c3092628..fc1ffa1b 100644 --- a/src/server.js +++ b/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"); diff --git a/yarn.lock b/yarn.lock index 878034c7..39698452 100644 --- a/yarn.lock +++ b/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"