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.
109 lines
4.5 KiB
JSON
109 lines
4.5 KiB
JSON
{
|
|
"name": "element-desktop",
|
|
"productName": "ThreadNet",
|
|
"main": "lib/electron-main.js",
|
|
"exports": "./lib/electron-main.js",
|
|
"version": "1.12.26",
|
|
"description": "Element: the future of secure communication",
|
|
"author": {
|
|
"name": "Element",
|
|
"email": "support@element.io"
|
|
},
|
|
"homepage": "https://element.io",
|
|
"repository": {
|
|
"type": "git",
|
|
"url": "https://github.com/vector-im/element-web"
|
|
},
|
|
"license": "SEE LICENSE IN README.md",
|
|
"type": "module",
|
|
"files": [],
|
|
"engines": {
|
|
"node": ">=22.18"
|
|
},
|
|
"scripts": {
|
|
"i18n": "matrix-gen-i18n && pnpm i18n:sort && pnpm i18n:lint",
|
|
"i18n:sort": "matrix-sort-i18n src/i18n/strings/en_EN.json",
|
|
"i18n:lint": "oxfmt src/i18n/strings/",
|
|
"i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && pnpm i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
|
|
"mkdirs": "mkdirp packages deploys",
|
|
"fetch": "pnpm run mkdirs && node scripts/fetch-package.ts",
|
|
"asar-webapp": "asar p webapp webapp.asar",
|
|
"start": "nx start",
|
|
"lint": "pnpm lint:types",
|
|
"lint:types": "pnpm lint:types:src && pnpm lint:types:node && pnpm lint:types:test && pnpm lint:types:scripts && pnpm lint:types:hak",
|
|
"lint:types:src": "tsc --noEmit",
|
|
"lint:types:node": "tsc --noEmit -p tsconfig.node.json",
|
|
"lint:types:test": "tsc --noEmit -p playwright/tsconfig.json",
|
|
"lint:types:scripts": "tsc --noEmit -p scripts/tsconfig.json",
|
|
"lint:types:hak": "tsc --noEmit -p hak/tsconfig.json",
|
|
"build:native": "pnpm run hak",
|
|
"build:native:universal": "pnpm run hak --target x86_64-apple-darwin fetchandbuild && pnpm run hak --target aarch64-apple-darwin fetchandbuild && pnpm run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
|
|
"build:32": "nx build --ia32",
|
|
"build:64": "nx build --x64",
|
|
"build:universal": "nx build --universal",
|
|
"build": "nx build --",
|
|
"docker:setup": "docker build --platform linux/amd64 -t element-desktop-dockerbuild -f dockerbuild/Dockerfile .",
|
|
"docker:build:native": "scripts/in-docker.sh pnpm run hak",
|
|
"docker:build": "scripts/in-docker.sh pnpm run build",
|
|
"docker:install": "scripts/in-docker.sh pnpm install --filter=element-desktop --frozen-lockfile",
|
|
"clean": "rimraf webapp.asar dist packages deploys lib",
|
|
"hak": "node scripts/hak/index.ts",
|
|
"test:unit": "vitest",
|
|
"test:playwright": "nx test:playwright --",
|
|
"test:playwright:open": "nx test:playwright -- --ui",
|
|
"test:playwright:screenshots": "nx test:playwright:screenshots --",
|
|
"coverage": "pnpm test:unit --coverage",
|
|
"coverage:diff": "diff-cover --config-file ../../diff-cover.toml coverage/lcov.info",
|
|
"sane-postinstall": "electron-builder install-app-deps"
|
|
},
|
|
"dependencies": {
|
|
"@sentry/electron": "^7.0.0",
|
|
"auto-launch": "^5.0.5",
|
|
"counterpart": "^0.18.6",
|
|
"electron-store": "^11.0.0",
|
|
"electron-window-state": "^5.0.3",
|
|
"minimist": "^1.2.6",
|
|
"png-to-ico": "^3.0.0",
|
|
"uuid": "^14.0.0"
|
|
},
|
|
"devDependencies": {
|
|
"@babel/core": "^7.18.10",
|
|
"@babel/preset-env": "^7.18.10",
|
|
"@babel/preset-typescript": "^7.18.6",
|
|
"@electron/asar": "4.2.1",
|
|
"@electron/fuses": "^2.1.1",
|
|
"@playwright/test": "catalog:",
|
|
"@types/auto-launch": "^5.0.1",
|
|
"@types/counterpart": "^0.18.1",
|
|
"@types/minimist": "^1.2.1",
|
|
"@types/node": "catalog:",
|
|
"@types/pacote": "^11.1.1",
|
|
"@typescript/native": "catalog:",
|
|
"app-builder-lib": "26.15.3",
|
|
"chokidar": "^5.0.0",
|
|
"detect-libc": "^2.0.0",
|
|
"electron": "43.2.0",
|
|
"electron-builder": "26.15.3",
|
|
"electron-builder-squirrel-windows": "26.15.3",
|
|
"electron-devtools-installer": "^4.0.0",
|
|
"glob": "^13.0.0",
|
|
"matrix-web-i18n": "catalog:",
|
|
"memfs": "^4.57.2",
|
|
"mkdirp": "^3.0.0",
|
|
"pacote": "^22.0.0",
|
|
"rimraf": "^6.0.0",
|
|
"shared-types": "workspace:*",
|
|
"tar": "^7.5.8",
|
|
"typescript": "catalog:ts6",
|
|
"vitest": "catalog:"
|
|
},
|
|
"hakDependencies": {
|
|
"matrix-seshat": "5.0.0"
|
|
},
|
|
"nx": {
|
|
"includedScripts": [
|
|
"lint:types"
|
|
]
|
|
}
|
|
}
|