From e710c441b1e306530c1388c90cf994764f461846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Sat, 7 May 2022 22:43:48 +0200 Subject: [PATCH] Improving typings This PR solves a number of issues (but not all) found when enabling the rule ESLint rule "@typescript-eslint/no-unsafe-call" in the front. --- front/package.json | 8 ++-- front/src/Administration/AnalyticsClient.ts | 3 +- front/src/WebRtc/JitsiFactory.ts | 11 ++--- front/yarn.lock | 50 ++++++++++++--------- 4 files changed, 41 insertions(+), 31 deletions(-) diff --git a/front/package.json b/front/package.json index bb1a2ce3..93ad066c 100644 --- a/front/package.json +++ b/front/package.json @@ -16,16 +16,16 @@ "@typescript-eslint/eslint-plugin": "^5.6.0", "@typescript-eslint/parser": "^5.6.0", "eslint": "^8.4.1", - "eslint-plugin-svelte3": "^3.2.1", + "eslint-plugin-svelte3": "^3.4.1", "jasmine": "^3.5.0", "lint-staged": "^12.3.7", "npm-run-all": "^4.1.5", "prettier": "^2.3.1", "prettier-plugin-svelte": "^2.7.0", "sass": "^1.49.7", - "svelte": "^3.46.3", - "svelte-check": "^2.1.0", - "svelte-preprocess": "^4.10.2", + "svelte": "^3.48.0", + "svelte-check": "^2.7.0", + "svelte-preprocess": "^4.10.6", "ts-node": "^10.4.0", "tsconfig-paths": "^3.9.0", "typescript": "^4.5.3", diff --git a/front/src/Administration/AnalyticsClient.ts b/front/src/Administration/AnalyticsClient.ts index 3c6bcb44..15417d8a 100644 --- a/front/src/Administration/AnalyticsClient.ts +++ b/front/src/Administration/AnalyticsClient.ts @@ -3,8 +3,7 @@ import { POSTHOG_API_KEY, POSTHOG_URL } from "../Enum/EnvironmentVariable"; declare let window: any; class AnalyticsClient { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - private posthogPromise: Promise | undefined; + private posthogPromise: Promise | undefined; constructor() { if (POSTHOG_API_KEY && POSTHOG_URL) { diff --git a/front/src/WebRtc/JitsiFactory.ts b/front/src/WebRtc/JitsiFactory.ts index 62800888..280e8108 100644 --- a/front/src/WebRtc/JitsiFactory.ts +++ b/front/src/WebRtc/JitsiFactory.ts @@ -30,7 +30,7 @@ interface JitsiApi { addListener: (type: string, callback: Function) => void; removeListener: (type: string, callback: Function) => void; - + getParticipantsInfo(): { displayName: string; participantId: string }[]; dispose: () => void; } @@ -275,10 +275,11 @@ class JitsiFactory { } private onDominantSpeakerChanged(data: { id: string }): void { - userIsJitsiDominantSpeakerStore.set( - //@ts-ignore - data.id === this.getCurrentParticipantId(this.jitsiApi?.getParticipantsInfo()) - ); + if (this.jitsiApi) { + userIsJitsiDominantSpeakerStore.set( + data.id === this.getCurrentParticipantId(this.jitsiApi.getParticipantsInfo()) + ); + } } private onParticipantsCountChange(): void { diff --git a/front/yarn.lock b/front/yarn.lock index 7f49a4ed..8605806b 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -1095,10 +1095,10 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -eslint-plugin-svelte3@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-svelte3/-/eslint-plugin-svelte3-3.2.1.tgz#f0f24150ecea3061c38c69e282bea26dc3e660c6" - integrity sha512-YoBR9mLoKCjGghJ/gvpnFZKaMEu/VRcuxpSRS8KuozuEo7CdBH7bmBHa6FmMm0i4kJnOyx+PVsaptz96K6H/4Q== +eslint-plugin-svelte3@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-svelte3/-/eslint-plugin-svelte3-3.4.1.tgz#3618700333c8f8f12e28aec93bf18440d44a61fd" + integrity sha512-7p59WG8qV8L6wLdl4d/c3mdjkgVglQCdv5XOTk/iNPBKXuuV+Q0eFP5Wa6iJd/G2M1qR3BkLPEzaANOqKAZczw== eslint-scope@^5.1.1: version "5.1.1" @@ -1277,6 +1277,17 @@ fast-glob@^3.1.1: micromatch "^4.0.2" picomatch "^2.2.1" +fast-glob@^3.2.7: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" @@ -1392,7 +1403,7 @@ get-stream@^6.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== -glob-parent@^5.1.0, glob-parent@~5.1.0, glob-parent@~5.1.2: +glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -2811,16 +2822,15 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -svelte-check@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/svelte-check/-/svelte-check-2.1.0.tgz#3ee8ad86068256346ebca862bbee8417a757fc53" - integrity sha512-kKLXkFt0XZTn+O1fnilGTQ1SFLsOFF+lXp1YjPfeN9nX+Y3ZpELtZSQCkbuK6HMkWugFvsOM17FCOSa1mfrEFA== +svelte-check@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/svelte-check/-/svelte-check-2.7.0.tgz#10d579dc89bf2e145a04786cc9fa8dabfb018a2a" + integrity sha512-GrvG24j0+i8AOm0k0KyJ6Dqc+TAR2yzB7rtS4nljHStunVxCTr/1KYlv4EsOeoqtHLzeWMOd5D2O6nDdP/yw4A== dependencies: - chalk "^4.0.0" chokidar "^3.4.1" - glob "^7.1.6" + fast-glob "^3.2.7" import-fresh "^3.2.1" - minimist "^1.2.5" + picocolors "^1.0.0" sade "^1.7.4" source-map "^0.7.3" svelte-preprocess "^4.0.0" @@ -2841,10 +2851,10 @@ svelte-preprocess@^4.0.0: detect-indent "^6.0.0" strip-indent "^3.0.0" -svelte-preprocess@^4.10.2: - version "4.10.2" - resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-4.10.2.tgz#2405689e57161916947b8360679051a56eddd5c6" - integrity sha512-aPpkCreSo8EL/y8kJSa1trhiX0oyAtTjlNNM7BNjRAsMJ8Yy2LtqHt0zyd4pQPXt+D4PzbO3qTjjio3kwOxDlA== +svelte-preprocess@^4.10.6: + version "4.10.6" + resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-4.10.6.tgz#5f9a53e7ed3b85fc7e0841120c725b76ac5a1ba8" + integrity sha512-I2SV1w/AveMvgIQlUF/ZOO3PYVnhxfcpNyGt8pxpUVhPfyfL/CZBkkw/KPfuFix5FJ9TnnNYMhACK3DtSaYVVQ== dependencies: "@types/pug" "^2.0.4" "@types/sass" "^1.16.0" @@ -2853,10 +2863,10 @@ svelte-preprocess@^4.10.2: sorcery "^0.10.0" strip-indent "^3.0.0" -svelte@^3.46.3: - version "3.46.3" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.46.3.tgz#31202b0c795f276726d95b648b6dd413116257ac" - integrity sha512-mTOXvv74CVQqJHqoIZDprVfRKVVmYNadXP0VKnOEA54223kLGCr1nMrifS4Zx29qMt/xRB38Eq1D7dDH/fM8fQ== +svelte@^3.48.0: + version "3.48.0" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.48.0.tgz#f98c866d45e155bad8e1e88f15f9c03cd28753d3" + integrity sha512-fN2YRm/bGumvjUpu6yI3BpvZnpIm9I6A7HR4oUNYd7ggYyIwSA/BX7DJ+UXXffLp6XNcUijyLvttbPVCYa/3xQ== tabbable@^4.0.0: version "4.0.0"