diff --git a/.storybook/storybook.d.ts b/.storybook/storybook.d.ts index e9c02f7a1bd..0662935aa48 100644 --- a/.storybook/storybook.d.ts +++ b/.storybook/storybook.d.ts @@ -11,7 +11,9 @@ declare module '@storybook/addon-vitest/vitest-plugin' { } type TypedRootState = { - [Key in keyof RootState]?: RootState[Key] extends Immutable.OrderedCollection + [ + Key in keyof RootState + ]?: RootState[Key] extends Immutable.OrderedCollection ? unknown : PartialDeep; }; diff --git a/app/javascript/mastodon/components/callout/redesign.tsx b/app/javascript/mastodon/components/callout/redesign.tsx index 982e50a1420..bcf975c4b06 100644 --- a/app/javascript/mastodon/components/callout/redesign.tsx +++ b/app/javascript/mastodon/components/callout/redesign.tsx @@ -13,9 +13,11 @@ type RenameKeysStartingWith< TPrefix extends string, TReplacement extends string, > = { - [TKey in keyof TObject as TKey extends `${TPrefix}${infer TSuffix}` - ? `${TReplacement}${TSuffix}` - : TKey]: TObject[TKey]; + [ + TKey in keyof TObject as TKey extends `${TPrefix}${infer TSuffix}` + ? `${TReplacement}${TSuffix}` + : TKey + ]: TObject[TKey]; }; type ActionProps = diff --git a/app/javascript/mastodon/features/collections/detail/accounts_list.tsx b/app/javascript/mastodon/features/collections/detail/accounts_list.tsx index 38465c364e7..b3acd60f493 100644 --- a/app/javascript/mastodon/features/collections/detail/accounts_list.tsx +++ b/app/javascript/mastodon/features/collections/detail/accounts_list.tsx @@ -47,12 +47,10 @@ const getCollectionItems = createAppSelector( state.collections.collections[collectionId ?? '']?.items, ], (accounts, collectionAccountItems) => - (collectionAccountItems ?? []).map( - (item): CollectionItemWithAccount => ({ - ...item, - account: item.account_id ? accounts.get(item.account_id) : null, - }), - ), + (collectionAccountItems ?? []).map((item): CollectionItemWithAccount => ({ + ...item, + account: item.account_id ? accounts.get(item.account_id) : null, + })), ); function sortAccounts( diff --git a/app/javascript/mastodon/reducers/slices/profile_edit.ts b/app/javascript/mastodon/reducers/slices/profile_edit.ts index 83963fe49a3..d39419ac385 100644 --- a/app/javascript/mastodon/reducers/slices/profile_edit.ts +++ b/app/javascript/mastodon/reducers/slices/profile_edit.ts @@ -30,10 +30,12 @@ import { import { hashObjectArray } from '@/mastodon/utils/hash'; type ProfileData = { - [Key in keyof Omit< - ApiProfileJSON, - 'note' | 'fields' | 'featured_tags' - > as CamelCase]: ApiProfileJSON[Key]; + [ + Key in keyof Omit< + ApiProfileJSON, + 'note' | 'fields' | 'featured_tags' + > as CamelCase + ]: ApiProfileJSON[Key]; } & { bio: ApiProfileJSON['note']; fields: FieldData[]; @@ -43,10 +45,9 @@ type ProfileData = { export type FieldData = ApiAccountFieldJSON & { id: string }; export type TagData = { - [Key in keyof Omit< - ApiFeaturedTagJSON, - 'statuses_count' - > as CamelCase]: ApiFeaturedTagJSON[Key]; + [ + Key in keyof Omit as CamelCase + ]: ApiFeaturedTagJSON[Key]; } & { statusesCount: number; }; diff --git a/package.json b/package.json index 0a0359376ba..7e0983abc50 100644 --- a/package.json +++ b/package.json @@ -176,7 +176,7 @@ "lint-staged": "17.0.5", "msw": "2.12.14", "msw-storybook-addon": "2.0.6", - "oxfmt": "0.47.0", + "oxfmt": "0.70.0", "playwright": "1.63.0", "storybook": "10.3.3", "stylelint": "17.10.0", diff --git a/yarn.lock b/yarn.lock index 0ee5df28434..6dc499a4687 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2953,7 +2953,7 @@ __metadata: marky: "npm:1.3.0" msw: "npm:2.12.14" msw-storybook-addon: "npm:2.0.6" - oxfmt: "npm:0.47.0" + oxfmt: "npm:0.70.0" path-complete-extname: "npm:1.0.0" playwright: "npm:1.63.0" postcss-preset-env: "npm:11.5.3" @@ -3295,135 +3295,135 @@ __metadata: languageName: node linkType: hard -"@oxfmt/binding-android-arm-eabi@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-android-arm-eabi@npm:0.47.0" +"@oxfmt/binding-android-arm-eabi@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-android-arm-eabi@npm:0.70.0" conditions: os=android & cpu=arm languageName: node linkType: hard -"@oxfmt/binding-android-arm64@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-android-arm64@npm:0.47.0" +"@oxfmt/binding-android-arm64@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-android-arm64@npm:0.70.0" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@oxfmt/binding-darwin-arm64@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-darwin-arm64@npm:0.47.0" +"@oxfmt/binding-darwin-arm64@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-darwin-arm64@npm:0.70.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@oxfmt/binding-darwin-x64@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-darwin-x64@npm:0.47.0" +"@oxfmt/binding-darwin-x64@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-darwin-x64@npm:0.70.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@oxfmt/binding-freebsd-x64@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-freebsd-x64@npm:0.47.0" +"@oxfmt/binding-freebsd-x64@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-freebsd-x64@npm:0.70.0" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@oxfmt/binding-linux-arm-gnueabihf@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-linux-arm-gnueabihf@npm:0.47.0" +"@oxfmt/binding-linux-arm-gnueabihf@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-linux-arm-gnueabihf@npm:0.70.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@oxfmt/binding-linux-arm-musleabihf@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-linux-arm-musleabihf@npm:0.47.0" +"@oxfmt/binding-linux-arm-musleabihf@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-linux-arm-musleabihf@npm:0.70.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@oxfmt/binding-linux-arm64-gnu@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-linux-arm64-gnu@npm:0.47.0" +"@oxfmt/binding-linux-arm64-gnu@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-linux-arm64-gnu@npm:0.70.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@oxfmt/binding-linux-arm64-musl@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-linux-arm64-musl@npm:0.47.0" +"@oxfmt/binding-linux-arm64-musl@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-linux-arm64-musl@npm:0.70.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@oxfmt/binding-linux-ppc64-gnu@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-linux-ppc64-gnu@npm:0.47.0" +"@oxfmt/binding-linux-ppc64-gnu@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-linux-ppc64-gnu@npm:0.70.0" conditions: os=linux & cpu=ppc64 & libc=glibc languageName: node linkType: hard -"@oxfmt/binding-linux-riscv64-gnu@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-linux-riscv64-gnu@npm:0.47.0" +"@oxfmt/binding-linux-riscv64-gnu@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-linux-riscv64-gnu@npm:0.70.0" conditions: os=linux & cpu=riscv64 & libc=glibc languageName: node linkType: hard -"@oxfmt/binding-linux-riscv64-musl@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-linux-riscv64-musl@npm:0.47.0" +"@oxfmt/binding-linux-riscv64-musl@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-linux-riscv64-musl@npm:0.70.0" conditions: os=linux & cpu=riscv64 & libc=musl languageName: node linkType: hard -"@oxfmt/binding-linux-s390x-gnu@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-linux-s390x-gnu@npm:0.47.0" +"@oxfmt/binding-linux-s390x-gnu@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-linux-s390x-gnu@npm:0.70.0" conditions: os=linux & cpu=s390x & libc=glibc languageName: node linkType: hard -"@oxfmt/binding-linux-x64-gnu@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-linux-x64-gnu@npm:0.47.0" +"@oxfmt/binding-linux-x64-gnu@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-linux-x64-gnu@npm:0.70.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@oxfmt/binding-linux-x64-musl@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-linux-x64-musl@npm:0.47.0" +"@oxfmt/binding-linux-x64-musl@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-linux-x64-musl@npm:0.70.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@oxfmt/binding-openharmony-arm64@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-openharmony-arm64@npm:0.47.0" +"@oxfmt/binding-openharmony-arm64@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-openharmony-arm64@npm:0.70.0" conditions: os=openharmony & cpu=arm64 languageName: node linkType: hard -"@oxfmt/binding-win32-arm64-msvc@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-win32-arm64-msvc@npm:0.47.0" +"@oxfmt/binding-win32-arm64-msvc@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-win32-arm64-msvc@npm:0.70.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@oxfmt/binding-win32-ia32-msvc@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-win32-ia32-msvc@npm:0.47.0" +"@oxfmt/binding-win32-ia32-msvc@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-win32-ia32-msvc@npm:0.70.0" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@oxfmt/binding-win32-x64-msvc@npm:0.47.0": - version: 0.47.0 - resolution: "@oxfmt/binding-win32-x64-msvc@npm:0.47.0" +"@oxfmt/binding-win32-x64-msvc@npm:0.70.0": + version: 0.70.0 + resolution: "@oxfmt/binding-win32-x64-msvc@npm:0.70.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -10542,30 +10542,33 @@ __metadata: languageName: node linkType: hard -"oxfmt@npm:0.47.0": - version: 0.47.0 - resolution: "oxfmt@npm:0.47.0" +"oxfmt@npm:0.70.0": + version: 0.70.0 + resolution: "oxfmt@npm:0.70.0" dependencies: - "@oxfmt/binding-android-arm-eabi": "npm:0.47.0" - "@oxfmt/binding-android-arm64": "npm:0.47.0" - "@oxfmt/binding-darwin-arm64": "npm:0.47.0" - "@oxfmt/binding-darwin-x64": "npm:0.47.0" - "@oxfmt/binding-freebsd-x64": "npm:0.47.0" - "@oxfmt/binding-linux-arm-gnueabihf": "npm:0.47.0" - "@oxfmt/binding-linux-arm-musleabihf": "npm:0.47.0" - "@oxfmt/binding-linux-arm64-gnu": "npm:0.47.0" - "@oxfmt/binding-linux-arm64-musl": "npm:0.47.0" - "@oxfmt/binding-linux-ppc64-gnu": "npm:0.47.0" - "@oxfmt/binding-linux-riscv64-gnu": "npm:0.47.0" - "@oxfmt/binding-linux-riscv64-musl": "npm:0.47.0" - "@oxfmt/binding-linux-s390x-gnu": "npm:0.47.0" - "@oxfmt/binding-linux-x64-gnu": "npm:0.47.0" - "@oxfmt/binding-linux-x64-musl": "npm:0.47.0" - "@oxfmt/binding-openharmony-arm64": "npm:0.47.0" - "@oxfmt/binding-win32-arm64-msvc": "npm:0.47.0" - "@oxfmt/binding-win32-ia32-msvc": "npm:0.47.0" - "@oxfmt/binding-win32-x64-msvc": "npm:0.47.0" - tinypool: "npm:2.1.0" + "@oxfmt/binding-android-arm-eabi": "npm:0.70.0" + "@oxfmt/binding-android-arm64": "npm:0.70.0" + "@oxfmt/binding-darwin-arm64": "npm:0.70.0" + "@oxfmt/binding-darwin-x64": "npm:0.70.0" + "@oxfmt/binding-freebsd-x64": "npm:0.70.0" + "@oxfmt/binding-linux-arm-gnueabihf": "npm:0.70.0" + "@oxfmt/binding-linux-arm-musleabihf": "npm:0.70.0" + "@oxfmt/binding-linux-arm64-gnu": "npm:0.70.0" + "@oxfmt/binding-linux-arm64-musl": "npm:0.70.0" + "@oxfmt/binding-linux-ppc64-gnu": "npm:0.70.0" + "@oxfmt/binding-linux-riscv64-gnu": "npm:0.70.0" + "@oxfmt/binding-linux-riscv64-musl": "npm:0.70.0" + "@oxfmt/binding-linux-s390x-gnu": "npm:0.70.0" + "@oxfmt/binding-linux-x64-gnu": "npm:0.70.0" + "@oxfmt/binding-linux-x64-musl": "npm:0.70.0" + "@oxfmt/binding-openharmony-arm64": "npm:0.70.0" + "@oxfmt/binding-win32-arm64-msvc": "npm:0.70.0" + "@oxfmt/binding-win32-ia32-msvc": "npm:0.70.0" + "@oxfmt/binding-win32-x64-msvc": "npm:0.70.0" + tinypool: "npm:2.1.2" + peerDependencies: + svelte: ^5.0.0 + vite-plus: "*" dependenciesMeta: "@oxfmt/binding-android-arm-eabi": optional: true @@ -10605,9 +10608,14 @@ __metadata: optional: true "@oxfmt/binding-win32-x64-msvc": optional: true + peerDependenciesMeta: + svelte: + optional: true + vite-plus: + optional: true bin: oxfmt: bin/oxfmt - checksum: 10c0/2651c383e1a35d88e573a74e714e618cb0dcc0ec9c522dcbd822baa75aa2d793bd657d8abdfbb3e27f0a9886be174ebe620f842a7c0e86a18c7b591d59f649c1 + checksum: 10c0/9641cb661ed50183daacd90ecae767972f6c1cc8725b44d4f093014a9104cdc05659575ba94178b830fbe1ea53238bc0f81e70e132b4bcaaca2cbd4bb8ebbd42 languageName: node linkType: hard @@ -13328,10 +13336,10 @@ __metadata: languageName: node linkType: hard -"tinypool@npm:2.1.0": - version: 2.1.0 - resolution: "tinypool@npm:2.1.0" - checksum: 10c0/9fb1c760558c6264e0f4cfde96a63b12450b43f1730fbe6274aa24ddbdf488745c08924d0dea7a1303b47d555416a6415f2113898c69b6ecf731e75ac95238a5 +"tinypool@npm:2.1.2": + version: 2.1.2 + resolution: "tinypool@npm:2.1.2" + checksum: 10c0/4d8c0cf2d9710eff4aa9cb4318fecaac09d847f1d7dce3eb314d36bea35ed23f754315592a3c00c1d0aa21d9eb4a1f69e84c69feb8517b4cd769e1e0a7ee308e languageName: node linkType: hard