Thore Cimbal
88c4e155ce
The repo had no upstream ancestry: a whole tree arrived in one commit in May, so
every update meant re-applying our patches by hand onto a fresh checkout, and a file
Element moved would take our lines with it silently.
The real base was found by measuring tree distance across develop rather than trusting
the changelog: deadd548, not the v1.12.17 tag. With that set as a temporary graft, this
merge computed as a proper three-way merge - 32 conflicts instead of 1757.
Resolutions, each decided rather than defaulted:
- 24 GitHub workflows stay deleted; we build on GitLab CI.
- MImageBody.tsx is gone upstream, migrated to MVVM. Our ClamAV error label moved into
ImageBodyViewModel.computeErrorLabel, ahead of the DecryptError branch, matching what
VideoBodyViewModel and FileBodyViewModel already do.
- Upstream extracted the room list item body into RoomListItemContent. Our call
participants list and its getInitials helper moved there; both sides' CSS classes and
both sides' props are kept.
- matrix-js-sdk follows upstream at 42.2.0 - our git ref pin was a workaround for a
stale ref, and following upstream is the point of this merge.
- Element Call stays ours. Checked before deciding: @element-hq/element-call-embedded
is referenced nowhere in the tree, while webpack.config.ts needs
@sorb/threadnet-call-embedded, so taking upstream's line would have deleted the noise
suppression from #0054 without a word.
The lockfile was regenerated with pnpm 11.20.0, which upstream now requires through
devEngines. CI already runs corepack enable, and onFail: download makes it fetch that
version by itself.
Not yet accepted: this needs a build and the ClamAV functional test - send an encrypted
file, receive a rejected one - before it goes near main.
51 lines
962 B
Plaintext
51 lines
962 B
Plaintext
/build
|
|
/cert.pem
|
|
/dist
|
|
/key.pem
|
|
/lib
|
|
node_modules
|
|
/.npmrc
|
|
# ThreadNet-Fork: unsere .npmrc IST versioniert. Sie bindet nur den Scope @sorb an
|
|
# die Registry auf rohana und enthaelt kein Geheimnis (Lesezugriff ist anonym).
|
|
# Ohne diese Ausnahme bliebe die Datei lokal, und CI wie frischer Klon loesten
|
|
# @sorb weiter gegen npmjs auf - siehe management#0055.
|
|
!/.npmrc
|
|
/*.log
|
|
package-lock.json
|
|
.DS_Store
|
|
**/.idea
|
|
/webpack-stats.json
|
|
/.tmp
|
|
.vscode
|
|
.vscode/
|
|
.zed/
|
|
.env
|
|
.env.*
|
|
coverage
|
|
/index.html
|
|
# version file and tarball created by `npm pack` / `yarn pack`
|
|
/git-revision.txt
|
|
jest-sonar.xml
|
|
|
|
*storybook.log
|
|
storybook-static
|
|
|
|
/packages/shared-components/node_modules
|
|
/packages/shared-components/dist
|
|
/packages/shared-components/src/i18nKeys.d.ts
|
|
/packages/shared-components/.vitest-attachments
|
|
|
|
# TSC incremental compilation information
|
|
*.tsbuildinfo
|
|
|
|
/.link-config
|
|
|
|
.nx/cache
|
|
.nx/workspace-data
|
|
|
|
.pnpm-store
|
|
|
|
# vitepress
|
|
/docs/.vitepress/dist
|
|
/docs/.vitepress/cache
|