From 7ca8fff910651e00195c00d282b8c3712bbda3cd Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Thu, 1 Jul 2021 22:02:52 +0200 Subject: [PATCH] Update vtt-types and get rid of now unnecessary @ts-ignores --- src/module/macros/helpers.ts | 3 --- src/module/rolls/check-factory.ts | 4 --- yarn.lock | 42 +++++++++++++++++++++++++++---- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/src/module/macros/helpers.ts b/src/module/macros/helpers.ts index f29b14a..e18183b 100644 --- a/src/module/macros/helpers.ts +++ b/src/module/macros/helpers.ts @@ -11,9 +11,6 @@ import { getCanvas } from "../helpers"; * @returns The currently active {@link DS4Actor} if any, and `undefined` otherwise. */ export function getActiveActor(): DS4Actor | undefined { - // TODO: Improve once ChatMessage is typed in upstream - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore const speaker = ChatMessage.getSpeaker(); const speakerToken = speaker.token ? getCanvas().tokens.get(speaker.token) : undefined; diff --git a/src/module/rolls/check-factory.ts b/src/module/rolls/check-factory.ts index 0e28ac5..b85a5d0 100644 --- a/src/module/rolls/check-factory.ts +++ b/src/module/rolls/check-factory.ts @@ -43,10 +43,6 @@ class CheckFactory { ); const formula = this.options.useSlayingDice ? `{${innerFormula}}x` : innerFormula; const roll = Roll.create(formula); - - // TODO: Improve once ChatMessage is typed in upstream - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore const speaker = ChatMessage.getSpeaker(); return roll.toMessage( diff --git a/yarn.lock b/yarn.lock index 052e2fc..5446ee5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -673,7 +673,7 @@ __metadata: "@league-of-foundry-developers/foundry-vtt-types@https://github.com/League-of-Foundry-Developers/foundry-vtt-types.git#foundry-0.8.x": version: 0.7.9-6 - resolution: "@league-of-foundry-developers/foundry-vtt-types@git+ssh://git@github.com/League-of-Foundry-Developers/foundry-vtt-types.git#commit=4cf37b5f0e66648c859f7e16197dfa93686985ab" + resolution: "@league-of-foundry-developers/foundry-vtt-types@https://github.com/League-of-Foundry-Developers/foundry-vtt-types.git#commit=91fcf23da640665cf9b0a02bf83f87958b1dfef0" dependencies: "@types/jquery": ~3.5.5 "@types/simple-peer": ~9.11.0 @@ -683,7 +683,7 @@ __metadata: socket.io-client: 4.1.2 tinymce: 5.8.1 typescript: ^4.1.6 - checksum: b58c7bfc72851e3cab834b3dfd3f6cb1bc0bf267e3189150f2d10609ac8bcba4a60c981cfa616afc0666fecd0755cf2f17ea55f3539523b1c52a1d4a4073289c + checksum: 513c8c8eaeb585641e78dd72f983e07a06d0babb24a8ed4de83479afdc9f9d85d2b255bc6168ec2d17d9368bcff3429b910d310b5f63358e74c9f49a84da958e languageName: node linkType: hard @@ -2636,7 +2636,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:~4.3.1": +"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1": version: 4.3.1 resolution: "debug@npm:4.3.1" dependencies: @@ -2657,6 +2657,18 @@ __metadata: languageName: node linkType: hard +"debug@npm:~4.3.1": + version: 4.3.2 + resolution: "debug@npm:4.3.2" + dependencies: + ms: 2.1.2 + peerDependenciesMeta: + supports-color: + optional: true + checksum: 5543570879e2274f6725d4285a034d6e0822d35faefc6f55965933fb440e8c21eb3a0bef934e66f4b6b491f898ee2de37cab980e9d4fd61372136c19d3ce4527 + languageName: node + linkType: hard + "decamelize@npm:^1.1.1": version: 1.2.0 resolution: "decamelize@npm:1.2.0" @@ -8054,7 +8066,17 @@ fsevents@^1.2.7: languageName: node linkType: hard -"typescript@^4.1.6, typescript@^4.3.4": +typescript@^4.1.6: + version: 4.3.5 + resolution: "typescript@npm:4.3.5" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: d9a8e78d72dd19896e6bfa73ab2a0fcea6eca2700d1d6e7c33f67a970af54a3e0fed8f715a8c4e6a0ff7fc0995067b394b2003518ab0aa84cd396377e54b760c + languageName: node + linkType: hard + +typescript@^4.3.4: version: 4.3.4 resolution: "typescript@npm:4.3.4" bin: @@ -8064,7 +8086,17 @@ fsevents@^1.2.7: languageName: node linkType: hard -"typescript@patch:typescript@^4.1.6#builtin, typescript@patch:typescript@^4.3.4#builtin": +"typescript@patch:typescript@^4.1.6#builtin": + version: 4.3.5 + resolution: "typescript@patch:typescript@npm%3A4.3.5#builtin::version=4.3.5&hash=ddfc1b" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 7f0b8343f71ecac18095be1476b398aca420ab60dc207cc1efe078f381eef5527b80a518297720257114cdbda65612f8839e4b63e85dc95e67ac5cbbade8bdf0 + languageName: node + linkType: hard + +"typescript@patch:typescript@^4.3.4#builtin": version: 4.3.4 resolution: "typescript@patch:typescript@npm%3A4.3.4#builtin::version=4.3.4&hash=ddfc1b" bin: