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.
76 lines
2.5 KiB
JavaScript
76 lines
2.5 KiB
JavaScript
#!/usr/bin/env node
|
|
/*
|
|
Copyright 2026 Element Creations Ltd.
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
|
Please see LICENSE in the repository root for full details.
|
|
*/
|
|
|
|
import * as fs from "node:fs";
|
|
import { exec } from "node:child_process";
|
|
import { fileURLToPath } from "node:url";
|
|
|
|
const includeJSSDK = process.argv.includes("--include-js-sdk");
|
|
const ignore: string[] = [];
|
|
|
|
ignore.push(
|
|
...Object.values<string>(
|
|
JSON.parse(fs.readFileSync(fileURLToPath(import.meta.resolve("../components.json")), "utf-8")),
|
|
),
|
|
);
|
|
ignore.push("/index.ts");
|
|
ignore.push("/jest-matrix-react.tsx");
|
|
ignore.push("/customisations/");
|
|
ignore.push("/test-utils/");
|
|
|
|
// The following ignores are temporary and false-positives which need to be fixed
|
|
ignore.push("/useLocalStorageState.ts");
|
|
ignore.push("/blurhash.worker.ts");
|
|
ignore.push("/OpenSpotlightPayload.ts");
|
|
ignore.push("/PinnedMessageBadge.tsx");
|
|
ignore.push("/editor/mock.ts");
|
|
ignore.push("DeviceIsolationModeController.ts");
|
|
ignore.push("urls.ts");
|
|
ignore.push("/json.ts");
|
|
ignore.push("/ReleaseAnnouncementStore.ts");
|
|
ignore.push("/WidgetLayoutStore.ts");
|
|
ignore.push("/common.ts");
|
|
|
|
// We ignore js-sdk by default as it may export for other non element-web projects
|
|
if (!includeJSSDK) ignore.push("matrix-js-sdk");
|
|
|
|
const command = `pnpm ts-prune --ignore "${ignore.join("|")}" | grep -v "(used in module)"`;
|
|
|
|
exec(command, (error, stdout, stderr) => {
|
|
if (error) throw error;
|
|
// We have to do this as piping the output of ts-prune causes the return
|
|
// code to be 0
|
|
if (stderr) throw Error(stderr);
|
|
|
|
let lines = stdout.split("\n");
|
|
// Remove the first line as that is the command that was being run and we
|
|
// log that only in case of an error
|
|
lines.splice(0, 1);
|
|
// Remove the last line as it is empty
|
|
lines.pop();
|
|
|
|
// ts-prune has bug where if the unused export is in a dependency, the path
|
|
// won't have an "/" character at the start, so we try to fix that for
|
|
// better UX
|
|
// TODO: This might break on Windows
|
|
lines = lines.reduce<string[]>((newLines, line) => {
|
|
if (!line.startsWith("/")) newLines.push("/" + line);
|
|
else newLines.push(line);
|
|
return newLines;
|
|
}, []);
|
|
|
|
// If an unused export has been found, we error
|
|
if (lines.length > 0) {
|
|
console.log(`Command that was run: ${command}`);
|
|
console.log(lines.join("\n"));
|
|
throw Error("Unused exports found!");
|
|
}
|
|
|
|
console.log("Success - no unused exports found!");
|
|
});
|