diff --git a/package-lock.json b/package-lock.json index f73796088..5f8f7c30d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,8 +13,7 @@ "@sentry/integrations": "^7.8.0", "@sentry/node": "^7.8.0", "@thesharks/jagtag-js": "^2.0.0", - "chalk": "^5.0.1", - "chalk-template": "^0.4.0", + "chalk": "^4.1.2", "date-fns": "^2.29.1", "deepmerge": "^4.2.2", "detritus-client": "^0.17.0-beta.1", @@ -897,34 +896,10 @@ } }, "node_modules/chalk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chalk-template": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/chalk-template/-/chalk-template-0.4.0.tgz", - "integrity": "sha512-/ghrgmhfY8RaSdeo43hNXxpoHAtxdbskUHjPpfqUWGttFgycUhYPGx3YZBCnUCvOa7Doivn1IZec3DEGFoMgLg==", - "dependencies": { - "chalk": "^4.1.2" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/chalk-template?sponsor=1" - } - }, - "node_modules/chalk-template/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1696,22 +1671,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/eslint/node_modules/chalk": { - "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" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/eslint/node_modules/eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", @@ -3961,27 +3920,12 @@ "dev": true }, "chalk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==" - }, - "chalk-template": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/chalk-template/-/chalk-template-0.4.0.tgz", - "integrity": "sha512-/ghrgmhfY8RaSdeo43hNXxpoHAtxdbskUHjPpfqUWGttFgycUhYPGx3YZBCnUCvOa7Doivn1IZec3DEGFoMgLg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "requires": { - "chalk": "^4.1.2" - }, - "dependencies": { - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - } + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, "color-convert": { @@ -4254,16 +4198,6 @@ "v8-compile-cache": "^2.0.3" }, "dependencies": { - "chalk": { - "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" - } - }, "eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", diff --git a/src/entry.ts b/src/entry.ts index f33d948ba..c442738b9 100644 --- a/src/entry.ts +++ b/src/entry.ts @@ -14,7 +14,7 @@ info('Starting up...', 'Preflight'); (await promisify(exec)('git rev-parse HEAD').catch(() => ({ stdout: undefined }))).stdout?.toString().trim() ?? process.env.npm_package_version ?? 'unknown' - info(`Initialzing Sentry, using revision ${revision}`, 'Preflight') + info(`Initializing Sentry, using revision ${revision}`, 'Preflight') Sentry.init({ dsn: process.env.SENTRY_DSN, integrations: function (integrations) { diff --git a/src/utils/logger.ts b/src/utils/logger.ts index d0784b0e8..9c755d13f 100644 --- a/src/utils/logger.ts +++ b/src/utils/logger.ts @@ -23,7 +23,7 @@ export function debug (message: any, component: string = 'generic'): void { message, level: 'debug' }) - if (process.env.NODE_ENV === 'debug') log(chalk`{blue dbug}`, chalk`{blue ${component}}`, message) + if (process.env.NODE_ENV === 'debug') log(chalk`{blue debug}`, chalk`{blue ${component}}`, message) } /** @@ -62,7 +62,7 @@ export function error (_err: any, component: string = 'generic', captureContext? ...captureContext }) } - log(chalk`{red erro}`, chalk`{red ${component}}`, _err instanceof Error ? _err.stack : _err) + log(chalk`{red error}`, chalk`{red ${component}}`, _err instanceof Error ? _err.stack : _err) return uuid } @@ -87,7 +87,7 @@ export function fatal (_err: any, component: string = 'generic', captureContext? ...captureContext }) } - log(chalk`{bgRed fatl}`, chalk`{bgRed ${component}}`, _err instanceof Error ? _err.stack : _err) + log(chalk`{bgRed fail}`, chalk`{bgRed ${component}}`, _err instanceof Error ? _err.stack : _err) Sentry.close(10000).then(() => process.exit(1)).catch(() => process.exit(1)) }