From f78b8dd1531b0f3b81d58613f6de0aa69d0ac23e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 27 Mar 2025 18:22:52 +0000 Subject: [PATCH 1/2] Update dependency @vector-im/compound-design-tokens to v4 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d3b898b2e..d0a0a2024 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@typescript-eslint/eslint-plugin": "^8.0.0", "@typescript-eslint/parser": "^8.0.0", "@use-gesture/react": "^10.2.11", - "@vector-im/compound-design-tokens": "^3.0.0", + "@vector-im/compound-design-tokens": "^4.0.0", "@vector-im/compound-web": "^7.2.0", "@vitejs/plugin-basic-ssl": "^1.0.1", "@vitejs/plugin-react": "^4.0.1", diff --git a/yarn.lock b/yarn.lock index ffc3ceca0..eb8c59da3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5017,9 +5017,9 @@ __metadata: languageName: node linkType: hard -"@vector-im/compound-design-tokens@npm:^3.0.0": - version: 3.0.1 - resolution: "@vector-im/compound-design-tokens@npm:3.0.1" +"@vector-im/compound-design-tokens@npm:^4.0.0": + version: 4.0.1 + resolution: "@vector-im/compound-design-tokens@npm:4.0.1" peerDependencies: "@types/react": "*" react: ^17 || ^18 || ^19.0.0 @@ -5028,7 +5028,7 @@ __metadata: optional: true react: optional: true - checksum: 10c0/afb941fd4efc91c8ccea8751d2da401379c3ababe6326943ccef0aecfe7691ef39860bc2f877fe7fc35b7887f483d46881656da10e3deb0ee94ea32c3c3cbb31 + checksum: 10c0/4788109e22f09f80c003913a978a0efcf45a2f2820cfa21216ebb4c15ad71ddb7f976e5c65f3b627ac44f6a759dfca9b48561a005dd76cb5891272f786c30289 languageName: node linkType: hard @@ -6895,7 +6895,7 @@ __metadata: "@typescript-eslint/eslint-plugin": "npm:^8.0.0" "@typescript-eslint/parser": "npm:^8.0.0" "@use-gesture/react": "npm:^10.2.11" - "@vector-im/compound-design-tokens": "npm:^3.0.0" + "@vector-im/compound-design-tokens": "npm:^4.0.0" "@vector-im/compound-web": "npm:^7.2.0" "@vitejs/plugin-basic-ssl": "npm:^1.0.1" "@vitejs/plugin-react": "npm:^4.0.1" From 07a4244c057332c61d458a17d0ee1994fe10457c Mon Sep 17 00:00:00 2001 From: Robin Date: Wed, 28 May 2025 18:04:29 -0400 Subject: [PATCH 2/2] Upgrade Compound Web to v7.12.0 --- package.json | 2 +- src/FullScreenView.tsx | 4 +- src/__snapshots__/Modal.test.tsx.snap | 4 +- src/__snapshots__/Toast.test.tsx.snap | 2 +- .../ReactionToggleButton.test.tsx.snap | 20 +++--- src/room/GroupCallErrorBoundary.tsx | 4 +- .../GroupCallErrorBoundary.test.tsx.snap | 62 +++++++++---------- src/tile/MediaView.tsx | 4 +- yarn.lock | 12 ++-- 9 files changed, 57 insertions(+), 57 deletions(-) diff --git a/package.json b/package.json index d0a0a2024..48bc30445 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "@typescript-eslint/parser": "^8.0.0", "@use-gesture/react": "^10.2.11", "@vector-im/compound-design-tokens": "^4.0.0", - "@vector-im/compound-web": "^7.2.0", + "@vector-im/compound-web": "^7.12.0", "@vitejs/plugin-basic-ssl": "^1.0.1", "@vitejs/plugin-react": "^4.0.1", "@vitest/coverage-v8": "^3.0.0", diff --git a/src/FullScreenView.tsx b/src/FullScreenView.tsx index c8655229d..4f2f8f1ec 100644 --- a/src/FullScreenView.tsx +++ b/src/FullScreenView.tsx @@ -10,7 +10,7 @@ import classNames from "classnames"; import { useTranslation } from "react-i18next"; import * as Sentry from "@sentry/react"; import { logger } from "matrix-js-sdk/src/logger"; -import { ErrorIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; +import { ErrorSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons"; import { Header, HeaderLogo, LeftNav, RightNav } from "./Header"; import styles from "./FullScreenView.module.css"; @@ -67,7 +67,7 @@ export const ErrorPage = ({ error, widget }: ErrorPageProps): ReactElement => { ) : (

My modal diff --git a/src/__snapshots__/Toast.test.tsx.snap b/src/__snapshots__/Toast.test.tsx.snap index d1c4d0756..60e8d41bb 100644 --- a/src/__snapshots__/Toast.test.tsx.snap +++ b/src/__snapshots__/Toast.test.tsx.snap @@ -12,7 +12,7 @@ exports[`Toast > renders 1`] = ` type="button" >

Hello world! diff --git a/src/button/__snapshots__/ReactionToggleButton.test.tsx.snap b/src/button/__snapshots__/ReactionToggleButton.test.tsx.snap index ff0b182cb..556d6edb1 100644 --- a/src/button/__snapshots__/ReactionToggleButton.test.tsx.snap +++ b/src/button/__snapshots__/ReactionToggleButton.test.tsx.snap @@ -10,7 +10,7 @@ exports[`Can close reaction dialog 1`] = ` aria-expanded="true" aria-haspopup="true" aria-labelledby=":rb5:" - class="_button_i91xf_17 _has-icon_i91xf_66 _icon-only_i91xf_59" + class="_button_vczzf_8 _has-icon_vczzf_57 _icon-only_vczzf_50" data-kind="primary" data-size="lg" role="button" @@ -26,7 +26,7 @@ exports[`Can close reaction dialog 1`] = ` > @@ -44,7 +44,7 @@ exports[`Can fully expand emoji picker 1`] = ` aria-expanded="true" aria-haspopup="true" aria-labelledby=":r7m:" - class="_button_i91xf_17 _has-icon_i91xf_66 _icon-only_i91xf_59" + class="_button_vczzf_8 _has-icon_vczzf_57 _icon-only_vczzf_50" data-kind="primary" data-size="lg" role="button" @@ -60,7 +60,7 @@ exports[`Can fully expand emoji picker 1`] = ` > @@ -75,7 +75,7 @@ exports[`Can lower hand 1`] = ` aria-expanded="false" aria-haspopup="true" aria-labelledby=":r36:" - class="_button_i91xf_17 _has-icon_i91xf_66 _icon-only_i91xf_59" + class="_button_vczzf_8 _has-icon_vczzf_57 _icon-only_vczzf_50" data-kind="secondary" data-size="lg" role="button" @@ -91,7 +91,7 @@ exports[`Can lower hand 1`] = ` > @@ -109,7 +109,7 @@ exports[`Can open menu 1`] = ` aria-expanded="true" aria-haspopup="true" aria-labelledby=":r0:" - class="_button_i91xf_17 _has-icon_i91xf_66 _icon-only_i91xf_59" + class="_button_vczzf_8 _has-icon_vczzf_57 _icon-only_vczzf_50" data-kind="primary" data-size="lg" role="button" @@ -125,7 +125,7 @@ exports[`Can open menu 1`] = ` > @@ -140,7 +140,7 @@ exports[`Can raise hand 1`] = ` aria-expanded="false" aria-haspopup="true" aria-labelledby=":r1j:" - class="_button_i91xf_17 raisedButton _has-icon_i91xf_66 _icon-only_i91xf_59" + class="_button_vczzf_8 raisedButton _has-icon_vczzf_57 _icon-only_vczzf_50" data-kind="primary" data-size="lg" role="button" @@ -155,7 +155,7 @@ exports[`Can raise hand 1`] = ` xmlns="http://www.w3.org/2000/svg" > diff --git a/src/room/GroupCallErrorBoundary.tsx b/src/room/GroupCallErrorBoundary.tsx index 170718d6a..b5f195c1a 100644 --- a/src/room/GroupCallErrorBoundary.tsx +++ b/src/room/GroupCallErrorBoundary.tsx @@ -16,7 +16,7 @@ import { } from "react"; import { Trans, useTranslation } from "react-i18next"; import { - ErrorIcon, + ErrorSolidIcon, HostIcon, OfflineIcon, WebBrowserIcon, @@ -63,7 +63,7 @@ const ErrorPage: FC = ({ icon = WebBrowserIcon; break; default: - icon = ErrorIcon; + icon = ErrorSolidIcon; } const actions: { label: string; onClick: () => void }[] = []; diff --git a/src/room/__snapshots__/GroupCallErrorBoundary.test.tsx.snap b/src/room/__snapshots__/GroupCallErrorBoundary.test.tsx.snap index 5aab22a23..6fd1ab408 100644 --- a/src/room/__snapshots__/GroupCallErrorBoundary.test.tsx.snap +++ b/src/room/__snapshots__/GroupCallErrorBoundary.test.tsx.snap @@ -108,7 +108,7 @@ exports[`ConnectionLostError: Action handling should reset error state 1`] = ` class="error" >

Connection lost

@@ -135,7 +135,7 @@ exports[`ConnectionLostError: Action handling should reset error state 1`] = ` Reconnect