From 58d850da0f72426aab50317749bc404a0d1b7887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20My=C5=9Bliwiec?= Date: Thu, 25 Feb 2021 13:57:43 +0100 Subject: [PATCH] chore(): upgrade ts and eslint prettier plugin --- .eslintrc.js | 1 - package-lock.json | 19 +++++++++++++------ package.json | 4 ++-- packages/common/services/logger.service.ts | 5 ++++- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index c6bdb5ceece..280fe9a3716 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -9,7 +9,6 @@ module.exports = { 'plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended', 'prettier', - 'prettier/@typescript-eslint', ], root: true, env: { diff --git a/package-lock.json b/package-lock.json index 3672b244334..d08c17d69e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4869,6 +4869,13 @@ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, "optional": true + }, + "typescript": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz", + "integrity": "sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==", + "dev": true, + "optional": true } } }, @@ -12683,9 +12690,9 @@ } }, "eslint-config-prettier": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz", - "integrity": "sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz", + "integrity": "sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==", "dev": true }, "eslint-import-resolver-node": { @@ -26425,9 +26432,9 @@ } }, "typescript": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz", - "integrity": "sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.2.tgz", + "integrity": "sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ==", "dev": true }, "ua-parser-js": { diff --git a/package.json b/package.json index 0a2e457b4d3..39d3e16088c 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "delete-empty": "3.0.0", "engine.io-client": "4.1.1", "eslint": "7.20.0", - "eslint-config-prettier": "7.2.0", + "eslint-config-prettier": "8.1.0", "eslint-plugin-import": "2.22.1", "eventsource": "1.0.7", "fancy-log": "1.3.3", @@ -163,7 +163,7 @@ "ts-morph": "10.0.1", "ts-node": "9.1.1", "typeorm": "0.2.31", - "typescript": "4.1.5", + "typescript": "4.2.2", "wrk": "1.2.1", "ws": "7.4.3" }, diff --git a/packages/common/services/logger.service.ts b/packages/common/services/logger.service.ts index a2a5b176c53..be82ea1179e 100644 --- a/packages/common/services/logger.service.ts +++ b/packages/common/services/logger.service.ts @@ -108,7 +108,10 @@ export class Logger implements LoggerService { day: '2-digit', month: '2-digit', }; - return new Date(Date.now()).toLocaleString(undefined, localeStringOptions); + return new Date(Date.now()).toLocaleString( + undefined, + localeStringOptions as Intl.DateTimeFormatOptions, + ); } private callFunction(