Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Absorb the matrix-react-sdk repository #28192

Merged
merged 10,000 commits into from
Oct 16, 2024
Merged

Absorb the matrix-react-sdk repository #28192

merged 10,000 commits into from
Oct 16, 2024

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Oct 15, 2024 •
edited
Loading

Based on https://gfscott.com/blog/merge-git-repos-and-keep-commit-history/

TODO:

  • Merge i18n files
  • Update branch protections
  • Add missing Netlify secrets

RiotRobot and others added 30 commits August 10, 2024 06:20
@RiotRobot @github-merge-queue
[create-pull-request] automated change (#12881)
239330b 
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
@t3chguy
Show spinner whilst initial search request is in progress (#12883)
0e37c09 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Add chat button on new room header for maximised widgets (#12882)
eacb22e 
* Add chat button to new room header for video room & maximised widgets

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Delint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update screenshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@RiotRobot @github-merge-queue
[create-pull-request] automated change (#12885)
bdc4ca0 
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
@RiotRobot
Upgrade dependency to matrix-js-sdk@34.3.0
269a9df
@RiotRobot
v3.106.0
6df8423
@RiotRobot
Merge branch 'master' into develop
95b2f3e
@RiotRobot
Resetting package fields for development
349c4a1
@RiotRobot
Reset matrix-js-sdk back to develop branch
ad8da83
@RiotRobot
[create-pull-request] automated change (#12886)
62e1641 
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
@RiotRobot @github-merge-queue
[create-pull-request] automated change (#12887)
de898d1 
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
@dbkr
Refactor the various email/phone management UI into a single component (
4751c52 
#12884)

* Refactor the various email/phone management UI into a single component

These were basically the same component copied & pasted 3 times and
tweaked to match the behaviour of each case. This de-dupes them into
one component.

This all could really benefit from playwright tests, but would require
setting up a dummy ID server in the playwright tests. This is all legacy
pre-MAS stuff so its questionable whether its worth the effort.

* Basic test, remove old tests

* Use different text to confirm remove & put headers back

although the two texts are both 'Remove' in practice

* Remove string

This was never triggered anyway with sydent & synapse because they
don't seem to agree on what error to return. In any case, I think it
makes more sense for it to be consistent with the email path, ie. using
a dialog.

* Avoid nested forms

* Snapshots

* More snapshots

* Test the hs side

* Snapshots

* Test IS bind/revoke

* Test remove can be cancelled

* Test unvalidated cases & fix phone error

* Reset state between tests

* Import useState directly

* One more direct React import
@florianduros
Hide pinned messages when grouped in timeline when feature pinning is…
d9846dc 
… disabled (#12888)
@RiotRobot @github-merge-queue
[create-pull-request] automated change (#12891)
6361567 
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
@RiotRobot
[create-pull-request] automated change (#12894)
7a91e3e 
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
@t3chguy
Tweak UIA postMessage check to work cross-origin (#12878)
88cf643 
* Soften UIA fallback postMessage check to work cross-origin

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Do the same for the SSO UIA flow

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Check against MessageEvent::source instead

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@florianduros
Message Pinning: rework the message pinning list in the right panel (#…
6f3dc30 
…12825)

* Fix pinning event loading after restart

* Update deps

* Replace pinned event list

* Add a dialog to confirm to unpin all messages

* Use `EmptyState` when there is no pinned messages

* Rework `PinnedEventTile` tests

* Add comments and refactor `PinnedMessageCard`

* Rework `PinnedMessageCard` tests

* Add tests for `UnpinAllDialog`

* Add e2e tests for pinned messages

* Replace 3px custom gap by 4px gap

* Use string interpolation for `Pin` action.

* Update playright sceenshot for empty state
@RiotRobot @github-merge-queue
[create-pull-request] automated change (#12898)
3f386a6 
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
@t3chguy
Ensure elements on Login page are disabled when in-flight (#12895)
9f5b39b 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@RiotRobot
[create-pull-request] automated change (#12899)
c37cb9f 
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
@RiotRobot @github-merge-queue
[create-pull-request] automated change (#12901)
fe8c073 
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
@RiotRobot
Upgrade dependency to matrix-js-sdk@34.3.1
64d6174
@RiotRobot
v3.107.0
20df553
@RiotRobot
Merge branch 'master' into develop
f0e90ad
@RiotRobot
Reset matrix-js-sdk back to develop branch
4961e23
@RiotRobot
Upgrade dependency to matrix-js-sdk@34.4.0-rc.0
2a11fd5
@dbkr
Rename prettier config file to .cjs (#12903)
933a9c1 
For the same reason as matrix-org/matrix-js-sdk#4353
@dbkr
Rename prettier config file to .cjs
c01ad91 
For the same reason as matrix-org/matrix-js-sdk#4353
@RiotRobot @github-merge-queue
[create-pull-request] automated change (#12907)
4064db1 
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
@florianduros
Add Pin/Unpin action in quick access of the message action bar (#12897)
3d80eff 
* Add Pin/Unpin action in quick access of the message action bar

* Add tests for `MessageActionBar`

* Add tests for `PinningUtils`

* Fix `MessageContextMenu-test`

* Add e2e test to pin/unpin from message action bar
t3chguy and others added 11 commits October 15, 2024 15:45
@t3chguy
Iterate
d928a7b 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Iterate
67659ab 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Iterate
68c0c4c 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Iterate
0f31b15 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Iterate
0007d3d 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Iterate
f78f6b3 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Fix i18n
4094d24 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@RiotRobot @t3chguy
[create-pull-request] automated change (#52)
a22e9e8 
Co-authored-by: dbkr <986903+dbkr@users.noreply.github.com>
(cherry picked from commit 3256499d4bacbf8cb527c1261c65f805de346c53)
@t3chguy
Deduplicate more icons using Compound Design Tokens (#132)
146968d 
* Deduplicate more icons using Compound Design Tokens

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 7448bd52e2ff354917d6e5f769ca052961c13aa0)
@florianduros @t3chguy
Replace MatrixClient.isCryptoEnabled by MatrixClient.getCrypto (#140
571ada3 
)

* Replace `MatrixClient.isCryptoEnabled` by `MatrixClient.getCrypto`

* Cast `cryptoEnabled` as `boolean`

* Fix `MatrixChat-test`

(cherry picked from commit 950ab1940bfcea9443f03284f9175d319c13a44c)
@t3chguy
Iterate
1407e2f 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This was referenced Oct 16, 2024
Merged
Merged
@t3chguy t3chguy self-assigned this Oct 16, 2024
@t3chguy
i18n
f44174b 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy marked this pull request as ready for review October 16, 2024 09:54
@t3chguy t3chguy requested review from a team as code owners October 16, 2024 09:54
t3chguy and others added 2 commits October 16, 2024 11:24
@t3chguy
Move NETLIFY_SITE_ID to vars
8ae64fe 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@florianduros @t3chguy
Use new CryptoEvent import (#128)
b483fdd 
* Use new `CryptoEvent` import

* Remove remaining old `CryptoEvent` import

* Replace `import` by `import type`
@t3chguy t3chguy merged commit c05c429 into develop Oct 16, 2024
29 of 31 checks passed
@t3chguy t3chguy deleted the t3chguy/repo-merge branch October 16, 2024 12:31
@t3chguy t3chguy restored the t3chguy/repo-merge branch October 17, 2024 07:48
github-merge-queue bot added a commit that referenced this pull request Oct 18, 2024
@langleyd @t3chguy
@github-merge-queue @renovate @florianduros @MidhunSureshR @dbkr @RiotRobot @richvdh @weeman1337 @Timshel @sahil9001 @Half-Shot @uhoreg @AndrewFerr @robintown @tulir
Add reactions to html export (#28210)
59cd518 
* Absorb the matrix-react-sdk repository (#28192)

Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Duros <florian.duros@ormaz.fr>
Co-authored-by: Kim Brose <kim.brose@nordeck.net>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: R Midhun Suresh <hi@midhun.dev>
Co-authored-by: dbkr <986903+dbkr@users.noreply.github.com>
Co-authored-by: ElementRobot <releases@riot.im>
Co-authored-by: dbkr <dbkr@users.noreply.github.com>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: David Langley <davidl@element.io>
Co-authored-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Timshel <Timshel@users.noreply.github.com>
Co-authored-by: Sahil Silare <32628578+sahil9001@users.noreply.github.com>
Co-authored-by: Will Hunt <will@half-shot.uk>
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
Co-authored-by: Andrew Ferrazzutti <andrewf@element.io>
Co-authored-by: Robin <robin@robin.town>
Co-authored-by: Tulir Asokan <tulir@maunium.net>

* Update dependency @sentry/browser to v8.33.0 [SECURITY] (#28194)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update babel monorepo (#28196)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @types/react to v17.0.83 (#28138)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @matrix-org/spec to v1.12.0 (#28200)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @formatjs/intl-segmenter to v11.5.9 (#28197)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove references to `MatrixClient.crypto` (#28204)

* Remove `VerificationExplorer`

* Remove `remakeolm` slash command

* Remove call to `crypto.cancelAndResendAllOutgoingKeyRequests`

* Remove crypto mock in `LoginWithQR-test.tsx`

* Remove `StopGadWidgetDriver.sendToDevice`

* Remove remaining mock

* Update dependency typescript to v5.6.3 (#28198)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency eslint-plugin-unicorn to v56 (#28202)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency stylelint to v16.10.0 (#28201)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update browserslist (#28199)

* Update browserslist

* Update tests

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>

* Add reactions to html export and add test

* Add reaction to snapshot test

* Update snapshot output

* Remove logging

* Add reaction to html export screenshot test.

* lint

* Update reference screenshot.

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Duros <florian.duros@ormaz.fr>
Co-authored-by: Kim Brose <kim.brose@nordeck.net>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: R Midhun Suresh <hi@midhun.dev>
Co-authored-by: dbkr <986903+dbkr@users.noreply.github.com>
Co-authored-by: ElementRobot <releases@riot.im>
Co-authored-by: dbkr <dbkr@users.noreply.github.com>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Timshel <Timshel@users.noreply.github.com>
Co-authored-by: Sahil Silare <32628578+sahil9001@users.noreply.github.com>
Co-authored-by: Will Hunt <will@half-shot.uk>
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
Co-authored-by: Andrew Ferrazzutti <andrewf@element.io>
Co-authored-by: Robin <robin@robin.town>
Co-authored-by: Tulir Asokan <tulir@maunium.net>
github-merge-queue bot added a commit that referenced this pull request Oct 18, 2024
@renovate @t3chguy
@github-merge-queue @florianduros @MidhunSureshR @dbkr @RiotRobot @richvdh @langleyd @weeman1337 @Timshel @sahil9001 @Half-Shot @uhoreg @AndrewFerr @robintown @tulir
Update all non-major dependencies (#28136)
8c305f8 
* Absorb the matrix-react-sdk repository (#28192)

Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Duros <florian.duros@ormaz.fr>
Co-authored-by: Kim Brose <kim.brose@nordeck.net>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: R Midhun Suresh <hi@midhun.dev>
Co-authored-by: dbkr <986903+dbkr@users.noreply.github.com>
Co-authored-by: ElementRobot <releases@riot.im>
Co-authored-by: dbkr <dbkr@users.noreply.github.com>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: David Langley <davidl@element.io>
Co-authored-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Timshel <Timshel@users.noreply.github.com>
Co-authored-by: Sahil Silare <32628578+sahil9001@users.noreply.github.com>
Co-authored-by: Will Hunt <will@half-shot.uk>
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
Co-authored-by: Andrew Ferrazzutti <andrewf@element.io>
Co-authored-by: Robin <robin@robin.town>
Co-authored-by: Tulir Asokan <tulir@maunium.net>

* Update dependency @sentry/browser to v8.33.0 [SECURITY] (#28194)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update babel monorepo (#28196)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @types/react to v17.0.83 (#28138)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @matrix-org/spec to v1.12.0 (#28200)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @formatjs/intl-segmenter to v11.5.9 (#28197)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove references to `MatrixClient.crypto` (#28204)

* Remove `VerificationExplorer`

* Remove `remakeolm` slash command

* Remove call to `crypto.cancelAndResendAllOutgoingKeyRequests`

* Remove crypto mock in `LoginWithQR-test.tsx`

* Remove `StopGadWidgetDriver.sendToDevice`

* Remove remaining mock

* Update dependency typescript to v5.6.3 (#28198)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency eslint-plugin-unicorn to v56 (#28202)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency stylelint to v16.10.0 (#28201)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update browserslist (#28199)

* Update browserslist

* Update tests

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>

* Update all non-major dependencies

* Pin posthog-js

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshots for re-resizable

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Pin re-resizable

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshot and improve playwright workflow to account for symlinked matrix-js-sdk

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Revert snapshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update package.json

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix screenshot flakiness

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Duros <florian.duros@ormaz.fr>
Co-authored-by: Kim Brose <kim.brose@nordeck.net>
Co-authored-by: Florian Duros <florianduros@element.io>
Co-authored-by: R Midhun Suresh <hi@midhun.dev>
Co-authored-by: dbkr <986903+dbkr@users.noreply.github.com>
Co-authored-by: ElementRobot <releases@riot.im>
Co-authored-by: dbkr <dbkr@users.noreply.github.com>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: David Langley <davidl@element.io>
Co-authored-by: Michael Weimann <michaelw@matrix.org>
Co-authored-by: Timshel <Timshel@users.noreply.github.com>
Co-authored-by: Sahil Silare <32628578+sahil9001@users.noreply.github.com>
Co-authored-by: Will Hunt <will@half-shot.uk>
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
Co-authored-by: Andrew Ferrazzutti <andrewf@element.io>
Co-authored-by: Robin <robin@robin.town>
Co-authored-by: Tulir Asokan <tulir@maunium.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbkr dbkr dbkr approved these changes

@florianduros florianduros florianduros approved these changes

Assignees

@t3chguy t3chguy

Labels
T-Task Tasks for the team like planning
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.