From 9099338af8f6228c666fb21945e96a0c9493af42 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 00:09:12 +0000 Subject: [PATCH] Update dependency typescript to v5.7.2 (#28565) * Update dependency typescript to v5.7.2 * Fix types Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix types Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 2 +- playwright/e2e/crypto/dehydration.spec.ts | 4 ++-- playwright/e2e/crypto/migration.spec.ts | 4 ++-- playwright/element-web-test.ts | 6 ++++-- src/components/views/settings/EventIndexPanel.tsx | 4 ++-- .../views/settings/SetIntegrationManager-test.tsx | 7 +------ yarn.lock | 8 ++++---- 7 files changed, 16 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 910754b5a0..999d1237f9 100644 --- a/package.json +++ b/package.json @@ -282,7 +282,7 @@ "terser-webpack-plugin": "^5.3.9", "ts-node": "^10.9.1", "ts-prune": "^0.10.3", - "typescript": "5.6.3", + "typescript": "5.7.2", "util": "^0.12.5", "web-streams-polyfill": "^4.0.0", "webpack": "^5.89.0", diff --git a/playwright/e2e/crypto/dehydration.spec.ts b/playwright/e2e/crypto/dehydration.spec.ts index 590ab774b5..a247bed180 100644 --- a/playwright/e2e/crypto/dehydration.spec.ts +++ b/playwright/e2e/crypto/dehydration.spec.ts @@ -8,11 +8,11 @@ Please see LICENSE files in the repository root for full details. import { Locator, type Page } from "@playwright/test"; -import { test as base, expect } from "../../element-web-test"; +import { test as base, expect, Fixtures } from "../../element-web-test"; import { viewRoomSummaryByName } from "../right-panel/utils"; import { isDendrite } from "../../plugins/homeserver/dendrite"; -const test = base.extend({ +const test = base.extend({ // eslint-disable-next-line no-empty-pattern startHomeserverOpts: async ({}, use) => { await use("dehydration"); diff --git a/playwright/e2e/crypto/migration.spec.ts b/playwright/e2e/crypto/migration.spec.ts index 048b39f06a..03464d12c4 100644 --- a/playwright/e2e/crypto/migration.spec.ts +++ b/playwright/e2e/crypto/migration.spec.ts @@ -9,9 +9,9 @@ Please see LICENSE files in the repository root for full details. import path from "path"; import { readFile } from "node:fs/promises"; -import { expect, test as base } from "../../element-web-test"; +import { expect, Fixtures, test as base } from "../../element-web-test"; -const test = base.extend({ +const test = base.extend({ // Replace the `user` fixture with one which populates the indexeddb data before starting the app. user: async ({ context, pageWithCredentials: page, credentials }, use) => { await page.route(`/test_indexeddb_cryptostore_dump/*`, async (route, request) => { diff --git a/playwright/element-web-test.ts b/playwright/element-web-test.ts index 76e57e33f7..6ac0b7226a 100644 --- a/playwright/element-web-test.ts +++ b/playwright/element-web-test.ts @@ -60,7 +60,7 @@ interface CredentialsWithDisplayName extends Credentials { displayName: string; } -export const test = base.extend<{ +export interface Fixtures { axe: AxeBuilder; checkA11y: () => Promise; @@ -124,7 +124,9 @@ export const test = base.extend<{ slidingSyncProxy: ProxyInstance; labsFlags: string[]; webserver: Webserver; -}>({ +} + +export const test = base.extend({ config: CONFIG_JSON, page: async ({ context, page, config, labsFlags }, use) => { await context.route(`http://localhost:8080/config.json*`, async (route) => { diff --git a/src/components/views/settings/EventIndexPanel.tsx b/src/components/views/settings/EventIndexPanel.tsx index 0051c4dc3a..8cd67c7ccf 100644 --- a/src/components/views/settings/EventIndexPanel.tsx +++ b/src/components/views/settings/EventIndexPanel.tsx @@ -214,7 +214,7 @@ export default class EventIndexPanel extends React.Component<{}, IState> { {this.state.enabling ? : _t("settings|security|message_search_failed")} - {EventIndexPeg.error && ( + {EventIndexPeg.error ? (
{_t("common|advanced")} @@ -230,7 +230,7 @@ export default class EventIndexPanel extends React.Component<{}, IState> {

- )} + ) : undefined} ); } diff --git a/test/unit-tests/components/views/settings/SetIntegrationManager-test.tsx b/test/unit-tests/components/views/settings/SetIntegrationManager-test.tsx index 5c77e88d93..54c2aff979 100644 --- a/test/unit-tests/components/views/settings/SetIntegrationManager-test.tsx +++ b/test/unit-tests/components/views/settings/SetIntegrationManager-test.tsx @@ -11,7 +11,6 @@ import { fireEvent, render, screen, waitFor, within } from "jest-matrix-react"; import { logger } from "matrix-js-sdk/src/logger"; import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext"; -import { SDKContext, SdkContextClass } from "../../../../../src/contexts/SDKContext"; import SettingsStore from "../../../../../src/settings/SettingsStore"; import { UIFeature } from "../../../../../src/settings/UIFeature"; import { @@ -35,13 +34,9 @@ describe("SetIntegrationManager", () => { deleteThreePid: jest.fn(), }); - let stores!: SdkContextClass; - const getComponent = () => ( - - - + ); diff --git a/yarn.lock b/yarn.lock index 55995a7878..35e7ac04b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11539,10 +11539,10 @@ typed-array-length@^1.0.6: possible-typed-array-names "^1.0.0" reflect.getprototypeof "^1.0.6" -typescript@5.6.3: - version "5.6.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b" - integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw== +typescript@5.7.2: + version "5.7.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6" + integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg== ua-parser-js@^1.0.2: version "1.0.39"