Merge upstream element-hq/element-call tag v0.25.0 into the Lotus fork (previous base: v0.20.1; actual merge-base v0.20.1-rc.1). Every Lotus feature and all six io.lotus.* widget actions are preserved. Version bumped to 0.25.0-lotus.1. Conflict files and how each Lotus hunk was re-expressed: * src/state/CallViewModel/remoteMembers/ConnectionFactory.ts Upstream moved echoCancellation/noiseSuppression/autoGainControl from constructor params (fed by URL params) to persisted Settings (settings.ts) with a developer-settings UI. The cinny host still drives these per call via URL params (noiseSuppression=false / autoGainControl=false when the in-source ML denoiser is active, so the model gets a raw mic) - taking upstream verbatim would silently break the ML denoise tier. Re-wired as AND semantics in generateRoomOption(): a constraint is enabled only if BOTH the Setting and the URL param allow it. Params default to true, so with no params this is byte-for-byte upstream behaviour. Upstream's own echoCancellation / noiseSuppression URL params (still parsed but dead in v0.25.0) work again as a side effect. Lotus autoGainControl URL param kept in UrlParams.ts (auto-merged, unchanged). * src/state/CallViewModel/remoteMembers/ECConnectionFactory.test.ts Took upstream (tests now drive via Settings). The lost Lotus coverage is restored in a NEW colocated file src/lotus/lotusAudioConstraints.test.ts (3 tests) so the upstream test file stays pristine. Verified the new test fails against pure-upstream ConnectionFactory and passes with the re-wiring. * src/state/CallViewModel/CallViewModel.ts Three small hunks: kept both the Lotus `userMedia$` interface member and upstream's new `keyRotationSuppressed$`; dropped the three Lotus audio constructor args (mechanism removed upstream, see above); kept both in the returned object. The [lotus #4] overrideSpotlight$ routing, manualSpotlightUserId$ and setManualSpotlight auto-merged; verified against upstream's changed ringingMedia$ (now single-or-null instead of array) - the merge correctly took upstream's outer branch and the inner screenShares$/spotlightSpeaker$ logic that lotusSpotlight.ts mirrors is unchanged upstream. * src/index.css Kept both: Lotus lotus-transparent / lotus-theme blocks and upstream's new body[data-background="gradient"]::before full-viewport gradient. The naive merge swallowed the closing brace of body.lotus-theme - restored. Added a rule hiding the new gradient pseudo-element under body.lotus-transparent, since it would otherwise paint over the transparent body and hide the host wallpaper. * src/components/CallFooterViewModel.tsx, src/components/CallFooter.stories.tsx No Lotus content - pure upstream-vs-upstream conflicts caused by the merge base being v0.20.1-rc.1. Took upstream (layoutMode -> layoutSwitchVm; setLayoutMode removed). No Lotus code uses setGridMode/layoutMode. Non-conflicting but reviewed: * src/widget.ts auto-merged cleanly. Upstream's removal of .well-known transport advertisement and the new RTC-transport capability request did not touch the action registration loop the LOTUS_TO_WIDGET_ACTIONS spread and widget.lazyActions ride on - nothing to re-wire. * src/room/InCallView.tsx, src/useAudioContext.tsx, src/useTheme.ts, src/tile/MediaView.tsx(+.module.css), src/UrlParams.ts(+test), all *.module.css and .gitea/workflows/ci.yml auto-merged; each diff against v0.25.0 was checked to equal the original Lotus hunk. * src/button/Button.module.css: the merge appended an exact duplicate of upstream's `.rotate`/`@keyframes spin` block (rc.1 merge-base artefact) - reset to upstream verbatim. * src/grid/OneOnOnePortraitLayout.module.css was renamed upstream to OneOnOneMobileLayout.module.css; git followed the rename and the Lotus safe-area PiP inset fix applies there (the --content-inset-* vars it uses still exist upstream). Tooling changes inherited from upstream that affect the fork: * eslint + prettier were replaced by oxlint + oxfmt (`pnpm lint:oxlint`, `pnpm format:check`). oxlint flagged 10 issues, all in src/lotus/*: 8x no-meaningless-void-operator (dropped the `void` before void-typed widget transport.reply / callbacks - no behaviour change), 1x consistent-type-imports (lotusWidget.ts: `import type`), and 2x unicorn/no-useless-spread in lotusAudioInject.ts which are FALSE POSITIVES - `[...activeClips]` is a required defensive copy because abort() deletes from the Set during iteration; suppressed with an explanatory eslint-disable-next-line. oxfmt reformatted 7 Lotus touched files (whitespace only). * packageManager bumped by upstream to pnpm@11.21.0, which requires Node >= 22.13 (uses node:sqlite). Node 20 cannot run it; pnpm 10.33 cannot read the new lockfile either (matrix-js-sdk is now a git dependency on develop, using a version-union pnpm 10 rejects). Fork CI already uses Node 24 (.node-version), so CI is unaffected. * matrix-js-sdk is now github:matrix-org/matrix-js-sdk#develop (pinned by commit in pnpm-lock.yaml). Lotus behaviour NOT preserved: none found. Verification (Node 24.11.1, pnpm 11.21.0): pnpm install --frozen-lockfile OK (lockfile taken from upstream unchanged, no regeneration needed); tsc clean; oxlint clean; oxfmt --check clean; knip exit 0 (2 config hints in upstream knip.ts only); vitest unit 84 files / 627 passed / 9 skipped; build:embedded OK, staged to embedded/web/dist (44M), all six io.lotus.* action strings present in the bundle. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PPmy3tPq869XDW4njjVaKA
127 lines
4.8 KiB
YAML
127 lines
4.8 KiB
YAML
name: CI
|
|
|
|
# Build + publish the Lotus fork of Element Call's embedded web bundle.
|
|
# Models LotusGuild/cinny's .gitea/workflows/ci.yml. Web bundle only, so
|
|
# Linux-only (the Windows worker is for cinny-desktop / Tauri, not needed here).
|
|
#
|
|
# - PRs and pushes to `lotus` -> build + smoke-check the embedded dist
|
|
# - Pushes of a tag `v*` -> build + publish @lotusguild/element-call-embedded
|
|
# to the Gitea npm registry
|
|
#
|
|
# Versioning: the checked-in embedded/web/package.json tracks the intended next
|
|
# release (e.g. 0.20.1-lotus.2) for local/manual publishes, but the AUTHORITATIVE
|
|
# published version is still derived from the git tag at publish time (the
|
|
# `npm version "$TAG"` step below overwrites it, so a tag always wins).
|
|
|
|
on:
|
|
push:
|
|
branches: [lotus]
|
|
tags: ["v*"]
|
|
pull_request:
|
|
branches: [lotus]
|
|
|
|
env:
|
|
# element-call's build:full sets 16384 already; keep parity for safety.
|
|
NODE_OPTIONS: "--max-old-space-size=16384"
|
|
# Stamp the build so analytics/rageshakes aren't labelled "dev".
|
|
VITE_APP_VERSION: ${{ github.ref_name }}
|
|
|
|
jobs:
|
|
build:
|
|
name: Build embedded bundle
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- name: Checkout
|
|
uses: actions/checkout@v4
|
|
|
|
- name: Setup Node.js
|
|
uses: actions/setup-node@v4
|
|
with:
|
|
node-version-file: ".node-version" # Node 24
|
|
# registry-url wires up the Gitea-scoped registry + auth for publish
|
|
registry-url: "https://code.lotusguild.org/api/packages/LotusGuild/npm/"
|
|
scope: "@lotusguild"
|
|
|
|
- name: Enable corepack (pnpm from packageManager field)
|
|
run: corepack enable
|
|
|
|
- name: Install dependencies
|
|
run: pnpm install --frozen-lockfile
|
|
|
|
- name: Build embedded
|
|
# build:embedded writes to the repo-root dist/ (vite default outDir).
|
|
# Stage it into embedded/web/dist — the publish template's "files" entry
|
|
# — so the smoke-check and npm publish both see the bundle.
|
|
# (embedded/web/dist is gitignored, hence the explicit copy.)
|
|
run: |
|
|
pnpm run build:embedded
|
|
rm -rf embedded/web/dist
|
|
cp -r dist embedded/web/dist
|
|
|
|
- name: Smoke-check output
|
|
run: |
|
|
test -f embedded/web/dist/index.html
|
|
test -d embedded/web/dist/assets
|
|
echo "### Embedded bundle" >> "$GITHUB_STEP_SUMMARY"
|
|
echo "" >> "$GITHUB_STEP_SUMMARY"
|
|
echo '```' >> "$GITHUB_STEP_SUMMARY"
|
|
du -sh embedded/web/dist >> "$GITHUB_STEP_SUMMARY"
|
|
ls embedded/web/dist >> "$GITHUB_STEP_SUMMARY"
|
|
echo '```' >> "$GITHUB_STEP_SUMMARY"
|
|
|
|
# NOTE: no actions/upload-artifact step — v4 requires GitHub's artifact
|
|
# backend, which the Gitea act_runner does not implement (it fails with
|
|
# exit 1). The publish job rebuilds from source anyway, so the artifact
|
|
# was only a convenience; re-add a Gitea-compatible action here if per-run
|
|
# dist downloads are ever needed.
|
|
|
|
publish:
|
|
name: Publish to Gitea npm registry
|
|
needs: build
|
|
# Only on a version tag push, never on PRs.
|
|
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- name: Checkout
|
|
uses: actions/checkout@v4
|
|
|
|
- name: Setup Node.js
|
|
uses: actions/setup-node@v4
|
|
with:
|
|
node-version-file: ".node-version"
|
|
registry-url: "https://code.lotusguild.org/api/packages/LotusGuild/npm/"
|
|
scope: "@lotusguild"
|
|
|
|
- name: Enable corepack
|
|
run: corepack enable
|
|
|
|
- name: Install dependencies
|
|
run: pnpm install --frozen-lockfile
|
|
|
|
- name: Build embedded
|
|
# build:embedded writes to the repo-root dist/ (vite default outDir).
|
|
# Stage it into embedded/web/dist — the publish template's "files" entry
|
|
# — so the smoke-check and npm publish both see the bundle.
|
|
# (embedded/web/dist is gitignored, hence the explicit copy.)
|
|
run: |
|
|
pnpm run build:embedded
|
|
rm -rf embedded/web/dist
|
|
cp -r dist embedded/web/dist
|
|
|
|
- name: Set published version from tag
|
|
working-directory: embedded/web
|
|
# Versioning scheme: reserve bare vX.Y.Z for upstream-parity points only
|
|
# (e.g. v0.20.1 == upstream 0.20.1). For Lotus-only iterations on top of
|
|
# an upstream base, tag a semver prerelease — v0.20.1-lotus.1, -lotus.2,
|
|
# … — so we never collide with an already-published upstream-parity
|
|
# version on the registry.
|
|
run: |
|
|
TAG="${GITHUB_REF_NAME#v}" # v0.20.1-lotus.1 -> 0.20.1-lotus.1
|
|
npm version "$TAG" --no-git-tag-version --allow-same-version
|
|
|
|
- name: Publish
|
|
working-directory: embedded/web
|
|
env:
|
|
NODE_AUTH_TOKEN: ${{ secrets.GITEA_NPM_TOKEN }}
|
|
run: npm publish --access public
|