diff --git a/bundle/package-lock.json b/bundle/package-lock.json index 220c9177..c06ab5ee 100644 --- a/bundle/package-lock.json +++ b/bundle/package-lock.json @@ -15,9 +15,9 @@ "@fosscord/gateway": "file:../gateway", "@fosscord/util": "file:../util", "async-exit-hook": "^2.0.1", - "chalk": "^4.1.2", "express": "^4.17.1", "missing-native-js-functions": "^1.2.15", + "nanocolors": "^0.2.12", "node-os-utils": "^1.3.5", "tsconfig-paths": "^3.11.0" }, @@ -216,6 +216,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -597,6 +598,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -736,6 +738,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -751,6 +754,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -761,7 +765,8 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "node_modules/combined-stream": { "version": "1.0.8", @@ -1033,6 +1038,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "engines": { "node": ">=8" } @@ -1252,6 +1258,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "node_modules/nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "node_modules/negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -1492,6 +1503,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -1845,6 +1857,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -2146,6 +2159,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -2239,6 +2253,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -2248,6 +2263,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "requires": { "color-name": "~1.1.4" } @@ -2255,7 +2271,8 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "combined-stream": { "version": "1.0.8", @@ -2472,7 +2489,8 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true }, "http-errors": { "version": "1.7.2", @@ -2633,6 +2651,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -2824,6 +2847,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "requires": { "has-flag": "^4.0.0" } diff --git a/bundle/package.json b/bundle/package.json index bd6080c9..0be37a8e 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -54,9 +54,9 @@ "@fosscord/gateway": "file:../gateway", "@fosscord/util": "file:../util", "async-exit-hook": "^2.0.1", - "chalk": "^4.1.2", "express": "^4.17.1", "missing-native-js-functions": "^1.2.15", + "nanocolors": "^0.2.12", "node-os-utils": "^1.3.5", "tsconfig-paths": "^3.11.0" } diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts index a5405fa7..1596d54f 100644 --- a/bundle/src/Server.ts +++ b/bundle/src/Server.ts @@ -6,7 +6,7 @@ import { FosscordServer as APIServer } from "@fosscord/api"; import { Server as GatewayServer } from "@fosscord/gateway"; import { CDNServer } from "@fosscord/cdn/"; import express from "express"; -import { red, green, bold } from "chalk"; +import { red, green, bold } from "nanocolors"; import { Config, initDatabase } from "@fosscord/util"; const app = express(); diff --git a/bundle/src/start.ts b/bundle/src/start.ts index 85e15346..d0686c13 100644 --- a/bundle/src/start.ts +++ b/bundle/src/start.ts @@ -1,7 +1,7 @@ // process.env.MONGOMS_DEBUG = "true"; import cluster from "cluster"; import os from "os"; -import { red, bold, yellow, cyan } from "chalk"; +import { red, bold, yellow, cyan } from "nanocolors"; import { initStats } from "./stats"; import { execSync } from "child_process"; diff --git a/cdn/package-lock.json b/cdn/package-lock.json index d0b2c50e..b8d4f924 100644 --- a/cdn/package-lock.json +++ b/cdn/package-lock.json @@ -26,6 +26,7 @@ "lambert-server": "^1.2.8", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.2", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "supertest": "^6.1.6", "typescript": "^4.1.2", @@ -65,6 +66,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -4329,6 +4331,11 @@ "node": ">= 0.10.0" } }, + "node_modules/nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -6212,6 +6219,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -9006,6 +9014,11 @@ "xtend": "^4.0.0" } }, + "nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", diff --git a/cdn/package.json b/cdn/package.json index bb4603be..62c21c9a 100644 --- a/cdn/package.json +++ b/cdn/package.json @@ -56,6 +56,7 @@ "lambert-server": "^1.2.8", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.2", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "supertest": "^6.1.6", "typescript": "^4.1.2", diff --git a/cdn/src/util/Storage.ts b/cdn/src/util/Storage.ts index 8ae44bbb..91f841a6 100644 --- a/cdn/src/util/Storage.ts +++ b/cdn/src/util/Storage.ts @@ -1,7 +1,7 @@ import { FileStorage } from "./FileStorage"; import path from "path"; import fse from "fs-extra"; -import { bgCyan, black } from "chalk"; +import { bgCyan, black } from "nanocolors"; process.cwd(); export interface Storage { diff --git a/util/package-lock.json b/util/package-lock.json index 26321ee9..d48403dd 100644 --- a/util/package-lock.json +++ b/util/package-lock.json @@ -12,7 +12,6 @@ "dependencies": { "ajv": "^8.6.2", "amqplib": "^0.8.0", - "chalk": "^4.1.2", "class-validator": "^0.13.1", "dot-prop": "^6.0.1", "env-paths": "^2.2.1", @@ -20,6 +19,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", @@ -4804,6 +4804,11 @@ "thenify-all": "^1.0.0" } }, + "node_modules/nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -11189,6 +11194,11 @@ "thenify-all": "^1.0.0" } }, + "nanocolors": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.12.tgz", + "integrity": "sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==" + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", diff --git a/util/package.json b/util/package.json index 426b4e43..3bdc04be 100644 --- a/util/package.json +++ b/util/package.json @@ -39,7 +39,6 @@ "dependencies": { "ajv": "^8.6.2", "amqplib": "^0.8.0", - "chalk": "^4.1.2", "class-validator": "^0.13.1", "dot-prop": "^6.0.1", "env-paths": "^2.2.1", @@ -47,6 +46,7 @@ "lambert-server": "^1.2.10", "missing-native-js-functions": "^1.2.15", "multer": "^1.4.3", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "patch-package": "^6.4.7", "pg": "^8.7.1", diff --git a/util/src/util/Database.ts b/util/src/util/Database.ts index bf8c6fce..caf0880c 100644 --- a/util/src/util/Database.ts +++ b/util/src/util/Database.ts @@ -2,7 +2,7 @@ import path from "path"; import "reflect-metadata"; import { Connection, createConnection, ValueTransformer } from "typeorm"; import * as Models from "../entities"; -import { yellow, green} from "chalk"; +import { yellow, green} from "nanocolors"; // UUID extension option is only supported with postgres // We want to generate all id's with Snowflakes that's why we have our own BaseEntity class