diff --git a/.vscode/settings.json b/.vscode/settings.json index 1b3f69961..79b4ed08d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,5 +17,6 @@ "url": "https://docs.renovatebot.com/renovate-schema.json" } ], - "scss.validate": false + "scss.validate": false, + "typescript.tsdk": "node_modules/typescript/lib" } diff --git a/package.json b/package.json index 8065d9050..4f35e8eeb 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,7 @@ "tslib": "^2.3.1", "twemoji": "https://github.com/twitter/twemoji#v14.0.2", "type-fest": "^4.0.0", - "typescript": "^5.4.5", + "typescript": "^5.6.2", "util": "^0.12.4", "uuid": "^9.0.0", "vite": "^5.0.10", diff --git a/src/features/emoji/search.ts b/src/features/emoji/search.ts index 6b0f46a1d..21e376f70 100644 --- a/src/features/emoji/search.ts +++ b/src/features/emoji/search.ts @@ -1,3 +1,4 @@ +// @ts-ignore import Index from '@akryum/flexsearch-es'; import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; @@ -43,7 +44,7 @@ const search = ( custom_emojis?: ImmutableList>, ): Emoji[] => { return index.search(str, maxResults) - .flatMap((id) => { + .flatMap((id: any) => { if (typeof id !== 'string') return; if (id[0] === 'c' && custom_emojis) { diff --git a/src/features/nostr/NKeyStorage.ts b/src/features/nostr/NKeyStorage.ts index 07382a0e3..a17435e6a 100644 --- a/src/features/nostr/NKeyStorage.ts +++ b/src/features/nostr/NKeyStorage.ts @@ -85,25 +85,25 @@ export class NKeyStorage implements ReadonlyMap { return this.get(pubkey)!; } - *entries(): IterableIterator<[string, NostrSigner]> { + *entries(): MapIterator<[string, NostrSigner]> { for (const [pubkey] of this.#keypairs) { yield [pubkey, this.get(pubkey)!]; } } - *keys(): IterableIterator { + *keys(): MapIterator { for (const pubkey of this.#keypairs.keys()) { yield pubkey; } } - *values(): IterableIterator { + *values(): MapIterator { for (const pubkey of this.#keypairs.keys()) { yield this.get(pubkey)!; } } - [Symbol.iterator](): IterableIterator<[string, NostrSigner]> { + [Symbol.iterator](): MapIterator<[string, NostrSigner]> { return this.entries(); } diff --git a/src/normalizers/chat.ts b/src/normalizers/chat.ts index 4c6c9c70f..d3c906a62 100644 --- a/src/normalizers/chat.ts +++ b/src/normalizers/chat.ts @@ -6,7 +6,7 @@ export const ChatRecord = ImmutableRecord({ account: null as EmbeddedEntity, id: '', unread: 0, - last_message: '' as string || null, + last_message: '' as string | null, updated_at: '', }); diff --git a/yarn.lock b/yarn.lock index 5db1f7a37..5af691ad0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9013,10 +9013,10 @@ typescript@5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== -typescript@^5.4.5: - version "5.4.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" - integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== +typescript@^5.6.2: + version "5.6.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0" + integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw== ufo@^1.3.0: version "1.3.0"