Thore Cimbal
88c4e155ce
Merge upstream v1.12.26 - reconnect the fork to Element Web (management #0099 )
...
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.
2026-08-19 12:00:00 +00:00
Michael Telatynski and GitHub
4aa1a3549e
Enable oxlint restriction ruleset ( #34307 )
...
* Remove stale max-len disablements
* Remove stale camelCase & naming-convention disablements
* Remove stale ban-ts-comment disablements
* Remove stale no-var disablements
* Remove stale no-empty-property disablements
* Remove stale react rule disablements
* Remove stale no-constant-condition disablements
* Remove stale no-unused-vars disablements
* Remove stale disablements for disabled rules
* fixup camelcase
* Remove dead code
* Tidy code
* Tweak oxlint config
* Use oxlint to apply jsx/tsx extension consistently
* Fix import
* Fix imports
* Rename affected snapshots
* Update more imports
* Enable restriction ruleset
* Make code comply with new rules
* Make code comply with react/button-has-type
* Make code comply with typescript/non-nullable-type-assertion-style
* Comply with node/no-process-env
* Comply with unicorn/prefer-node-protocol
* Comply with unicorn/import-style
* Comply with unicorn/no-process-exit
* Comply with no-proto
* Comply with node/handle-callback-err
* Comply with import/no-commonjs
* Comply with node/no-path-concat
* Comply with unicorn/no-length-as-slice-end
* Comply with unicorn/no-document-cookie
* Comply with unicorn/prefer-module
* Comply with typescript/prefer-literal-enum-member
* Comply with jsx-a11y/anchor-ambiguous-text
* Tweak oxlint config
* Fix resolves
* Iterate
* Iterate
* Iterate
* Iterate
* Iterate
* Iterate
* Iterate
2026-08-04 09:15:07 +00:00
Thore Cimbal
44305556c3
fix: restore executable bit on remaining desktop/CI scripts
...
The earlier script-permission fix (5e3254d ) only covered scripts
invoked by apps/web's own Dockerfile/CI at the time. Found 9 more
non-executable scripts (644 instead of 755) while building the
Electron desktop app via apps/desktop/dockerbuild - same root cause,
different invocation paths.
2026-07-29 12:00:00 +00:00
Michael Telatynski and GitHub
bbec915fb0
Enable more oxlint rules ( #34189 )
...
* Fix type imports
* Fix jsdoc
* Fixup types
* Fix stray awaits on non-thenables
* Fixup imports
* Fix splats
* Fix this-context on callbacks
* Memoise react contexts
* Prefer find/flatMap
* Make oxlint happier about our React keys
* Avoid unsafe default function params
* Fixup jsdoc
* Fixup contexts
* Switch from eslint to oxlint
* Some oxlint-related tweaks
* Iterate
* Partial revert to defer some changes and shrink diff
* Iterate
* Add eslint-plugin-element-call and enable the copyright rule
* Set strictStorePkgContentCheck
* Iterate
* Enable forwardRef oxlint rule
* Enable no-unused-vars oxlint rule
* Enable no-implied-eval oxlint rule
* Enable no-duplicate-type-constituents oxlint rule
* Enable explicit-length-check oxlint rule
* Enable prefer-number-properties oxlint rule
* Enable no-callback-in-promise oxlint rule
* Enable no-require-imports oxlint rule
* Remove disablement of most unicorn oxlint rules
* Enable no-conditional-tests oxlint rule
* Enable promise-valid-params oxlint rule
* Enable require-unicode-regexp oxlint rule
* Remove max-len comments as we use oxfmt for formatting
* Enable majority of oxlint `suspicious` rules
* Iterate
* Fix oxlint type-aware lint running without dependencies built
2026-07-29 08:26:07 +00:00
Richard van der Hoff and GitHub
8dc1965d15
Fix docs and build script for desktop build ( #34395 )
...
* Fix some documentation for element-desktop
Some of these links got broken, or outdated, during the monorepo switch.
* Fix desktop docker build script
It will fail with 'workspace_node_modules: no such file or directory' if the
directory does not exist.
This got broken by https://github.com/element-hq/element-web/pull/33641 .
* Clarify native modules doc
Most of this stuff does not apply when using the docker build.
* update snapshot
2026-07-23 11:11:59 +00:00
Michael Telatynski and GitHub
b51c5ed8a7
Tweak oxlint config & delint our code ( #34301 )
...
* Remove stale max-len disablements
* Remove stale camelCase & naming-convention disablements
* Remove stale ban-ts-comment disablements
* Remove stale no-var disablements
* Remove stale no-empty-property disablements
* Remove stale react rule disablements
* Remove stale no-constant-condition disablements
* Remove stale no-unused-vars disablements
* Remove stale disablements for disabled rules
* fixup camelcase
* Remove dead code
* Tidy code
* Tweak oxlint config
2026-07-17 07:55:31 +00:00
Michael Telatynski and GitHub
15c85ec50f
Switch from eslint to oxlint ( #34166 )
...
* Fix type imports
* Fix jsdoc
* Fixup types
* Fix stray awaits on non-thenables
* Fixup imports
* Fix splats
* Fix this-context on callbacks
* Memoise react contexts
* Prefer find/flatMap
* Make oxlint happier about our React keys
* Avoid unsafe default function params
* Fixup jsdoc
* Fixup contexts
* Switch from eslint to oxlint
* Some oxlint-related tweaks
* Iterate
* Partial revert to defer some changes and shrink diff
* Iterate
* Add eslint-plugin-element-call and enable the copyright rule
* Set strictStorePkgContentCheck
* Iterate
* Make sonar happy
* Fix new lints
2026-07-10 09:47:41 +00:00
1fb6b778e7
Update pnpm to v11 ( #33573 )
...
* Update pnpm to v11
* Handle breaking changes
* Attach pnpm hash
* Remove redundant packageManager fields
* Make lint-staged happy
* Lockfile pnpm itself too
* Update pnpm/action-setup for better v11 compatibility
* Specify types to make tsc happier
* Fix permissions
* Check ulimit
* Specify minimumReleaseAgeExclude
* Run desktop tests
* Revert "Run desktop tests"
This reverts commit 911eb0ba2e9237d4b28e3bdaaf8f10ba6f22e827.
* Revert "Check ulimit"
This reverts commit f09eb59d715ba30a2e7fc5dba17dde092bd9bf17.
* Reapply "Check ulimit"
This reverts commit 83227c19ff5d07db91b6586f407f56870b00c041.
* Run desktop tests
* Switch nodeLinker & remove app-builder-lib patch
* Fix webpack.config.ts
* Fix .stylelintrc.cjs
* Fix `events` package
* Makes types happier
* Make knip happy
* Fix hak build
* Make jest happy
* Make pnpm-link happy
* Remove dead file
* Run playwright tests
* Fix linux hak permissions in ci
* Test
* Remove ulimit checks
* Disable skip
* Update nx
* Tweak line endings
* Update screenshot
* Iterate
* Webpack fallback `events`
---------
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2026-05-29 08:26:59 +00:00
Michael Telatynski and GitHub
7408796362
Fix element desktop dockerbuild utilities ( #33641 )
...
Got broken by monorepo merge
2026-05-28 09:53:29 +00:00
sorB
3da363517f
feat: show call participants in room list (Discord-style)
Docker / Docker Buildx (push) Has been cancelled
Build Debian package / Build package (release) Has been cancelled
Build and Deploy / prepare (release) Has been cancelled
Deploy release / Deploy to Cloudflare Pages (release) Has been cancelled
Build and Deploy / Trigger Pro pipeline (release) Has been cancelled
Build and Deploy / Windows arm64 (release) Has been cancelled
Build and Deploy / Windows x64 (release) Has been cancelled
Build and Deploy / macOS (release) Has been cancelled
Build and Deploy / Linux amd64 (sqlcipher static) (release) Has been cancelled
Build and Deploy / Linux arm64 (sqlcipher static) (release) Has been cancelled
Build and Deploy / ${{ needs.prepare.outputs.deploy == 'true' && 'Deploy' || 'Deploy (dry-run)' }} (release) Has been cancelled
Build and Deploy / Deploy builds to ESS (release) Has been cancelled
2026-05-10 14:25:35 +02:00
Michael Telatynski and GitHub
0a8ef85f2f
Fix hak check for matrix-seshat ( #33030 )
2026-04-02 09:43:12 +00:00
Michael Telatynski and GitHub
2b3720b4a2
Consolidate Build & Test CI ( #32929 )
...
* Consolidate Build & Test CI
* Add missing workflow dependency
* Fix artifact name clash
* Fix playwright config
* Fix playwright_ew job
* Fix ed tests
* Fix playwright tags
* Iterate
* Fix file reads
* Fix sample-files paths
* Fix PW_TAG
* Fix blob report paths
* Delint
* Fix build-and-test.yaml
* Iterate
* Fix consentHomeserver.ts
* Simplify
* Iterate
* Delint
* Iterate
* Iterate
* Iterate
* Specify shell
* Simplify
* Delete apps/web/playwright/sample-files/index.ts
* Discard changes to apps/web/playwright/sample-files/index.ts
* Exclude playwright-common from coverage gate
* Attempt to speed up arm64 desktop test
* Revert "Attempt to speed up arm64 desktop test"
This reverts commit 8fa8ff0c785da6dad05bda938c8af24fa6af0451.
* Iterate
* Fix cache key
* Accept python or python3 as per node-gyp
* Accept python or python3 as per node-gypd
* Exclude apps/desktop/hak from coverage gate
2026-03-31 12:52:50 +00:00
Michael Telatynski and GitHub
0d1d889c28
Remove tsx dependency ( #32967 )
...
* Remove tsx dependency
* Iterate
* Iterate
* Iterate
2026-03-30 15:17:36 +00:00
Michael Telatynski
8305c52251
Iterate
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2026-03-24 15:12:05 +00:00
Michael Telatynski
afa23c23a8
Make desktop linters happy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2026-03-24 13:02:58 +00:00
Michael Telatynski
30a8afab6f
Move everything to apps/desktop subdirectory
...
Some bits will need to be moved back out after the merge
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2026-03-24 12:17:18 +00:00