moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ts-5.6' into 'main' 

Upgrade TypeScript to v5.6

See merge request soapbox-pub/soapbox!3117
This commit is contained in:
Alex Gleason 2024-09-22 23:17:15 +00:00
parent 0004c9fd84 4bce8ab52f
commit 4bfeaa29cd
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -17,5 +17,6 @@
"url": "https://docs.renovatebot.com/renovate-schema.json" "url": "https://docs.renovatebot.com/renovate-schema.json"
} }
], ],
"scss.validate": false "scss.validate": false,
"typescript.tsdk": "node_modules/typescript/lib"
} }

2
package.json
View File

@ -178,7 +178,7 @@
"tslib": "^2.3.1", "tslib": "^2.3.1",
"twemoji": "https://github.com/twitter/twemoji#v14.0.2", "twemoji": "https://github.com/twitter/twemoji#v14.0.2",
"type-fest": "^4.0.0", "type-fest": "^4.0.0",
"typescript": "^5.4.5", "typescript": "^5.6.2",
"util": "^0.12.4", "util": "^0.12.4",
"uuid": "^9.0.0", "uuid": "^9.0.0",
"vite": "^5.0.10", "vite": "^5.0.10",

3
src/features/emoji/search.ts
View File

@ -1,3 +1,4 @@
// @ts-ignore
import Index from '@akryum/flexsearch-es'; import Index from '@akryum/flexsearch-es';
import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
@ -43,7 +44,7 @@ const search = (
custom_emojis?: ImmutableList<ImmutableMap<string, string>>, custom_emojis?: ImmutableList<ImmutableMap<string, string>>,
): Emoji[] => { ): Emoji[] => {
return index.search(str, maxResults) return index.search(str, maxResults)
.flatMap((id) => { .flatMap((id: any) => {
if (typeof id !== 'string') return; if (typeof id !== 'string') return;
if (id[0] === 'c' && custom_emojis) { if (id[0] === 'c' && custom_emojis) {

8
src/features/nostr/NKeyStorage.ts
View File

@ -85,25 +85,25 @@ export class NKeyStorage implements ReadonlyMap<string, NostrSigner> {
return this.get(pubkey)!; return this.get(pubkey)!;
} }
*entries(): IterableIterator<[string, NostrSigner]> { *entries(): MapIterator<[string, NostrSigner]> {
for (const [pubkey] of this.#keypairs) { for (const [pubkey] of this.#keypairs) {
yield [pubkey, this.get(pubkey)!]; yield [pubkey, this.get(pubkey)!];
} }
} }
*keys(): IterableIterator<string> { *keys(): MapIterator<string> {
for (const pubkey of this.#keypairs.keys()) { for (const pubkey of this.#keypairs.keys()) {
yield pubkey; yield pubkey;
} }
} }
*values(): IterableIterator<NostrSigner> { *values(): MapIterator<NostrSigner> {
for (const pubkey of this.#keypairs.keys()) { for (const pubkey of this.#keypairs.keys()) {
yield this.get(pubkey)!; yield this.get(pubkey)!;
} }
} }
[Symbol.iterator](): IterableIterator<[string, NostrSigner]> { [Symbol.iterator](): MapIterator<[string, NostrSigner]> {
return this.entries(); return this.entries();
} }

2
src/normalizers/chat.ts
View File

@ -6,7 +6,7 @@ export const ChatRecord = ImmutableRecord({
account: null as EmbeddedEntity<Account>, account: null as EmbeddedEntity<Account>,
id: '', id: '',
unread: 0, unread: 0,
last_message: '' as string || null, last_message: '' as string | null,
updated_at: '', updated_at: '',
}); });

8
yarn.lock
View File

@ -9013,10 +9013,10 @@ typescript@5:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
typescript@^5.4.5: typescript@^5.6.2:
version "5.4.5" version "5.6.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0"
integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==
ufo@^1.3.0: ufo@^1.3.0:
version "1.3.0" version "1.3.0"