chore(root): sync mmcc/moq with upstream main (10.0.0-beta.32)
Summary
Sync mmcc/moq with upstream videojs/v10 main at d08395023 (10.0.0-beta.32, 165 commits) as a single merge commit, resolving the conflicts with our multi-switching-set track selection and porting the MoQ playback branch onto upstream's new Vite+ toolchain.
Reviewing this PR
The "Files changed" tab is the whole upstream delta and is not useful. Review the merge commit's manual work instead β everything beyond git's automatic merge:
git show --remerge-diff 30d3001b6
Changes
switchVideoTrackkeeps the all-sets candidate pool andconfineToActiveSwitchingSetas the leading constraint, now alongside upstream'sstickToSelectedCodecsconstraint andpreferCodecFamilies/playerResolutionCaprules.- Upstream replaced turbo/tsdown/biome/vitest with Vite+: the
moqpack entry moves topackages/spf/vite.config.ts;simple-moq-videostays off the CDN via an exclusion inpackages/html/vite.config.ts(CDN media entries are now auto-discovered fromdefine/media/). - MoQ tests import from
vite-plus/test;safeDefinecomes fromregistration/safe-define. - MoQ sources run through the new jsdoc formatter and the
anti-sloppadding rule (whitespace/comment reflow only). - Doc-only conflicts (
findTrack,activeVideoTrack,isLiveTrack,measure-size --moq) keep our text, reflowed to upstream's style. - The plan file moves to
.agents/plans/(.claude/plansis a generated alias now).
Testing
pnpm typecheck,pnpm lint,pnpm check:workspace,pnpm build:packages,pnpm build:sandboxβ all greenpnpm -F @videojs/spf test: 119 files / 2055 tests passed (browser projects included)pnpm -F @videojs/html test: 63 files / 480 tests passed
Note: the merge commit was made with --no-verify because lint-staged cannot run on merge commits (Needed a single revision); the full repo lint ran green beforehand.
π€ Generated with Claude Code
Summary by cubic
Syncs mmcc/moq with upstream videojs/v10 main at 10.0.0-beta.32 (165 commits) as a single merge commit, porting the MoQ playback branch onto upstream's Vite+ toolchain and resolving conflicts with our multi-switching-set track selection. The Files changed tab is the whole upstream delta and won't help review; review the merge commit's manual work instead via git show --remerge-diff.
Manual merge work
switchVideoTrackkeeps its all-sets candidate pool, now hardened with upstream'sstickToSelectedCodecs,preferCodecFamilies, andplayerResolutionCaprules.- The
moqpack entry moves topackages/spf/vite.config.ts;simple-moq-videostays off the CDN via an exclusion there. - MoQ tests import from
vite-plus/test;safeDefinecomes fromregistration/safe-define. - MoQ sources and conflicting docs are reformatted to upstream's new jsdoc and
anti-slopstyle β whitespace and comment reflow only. - The plan file moves to
.agents/plans/(.claude/plansis now a generated alias).
Testing
- typecheck, lint,
check:workspace, and package/sandbox builds pass;@videojs/spf(2055 tests) and@videojs/html(480 tests) pass. - The merge commit was made with
--no-verifybecause lint-staged cannot run on merge commits; the whole repo lint ran green beforehand.