chore(root): sync mmcc/moq with upstream main (10.0.0-beta.32)

Merged
MM
3mo ago
+127458-62202

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

  • switchVideoTrack keeps the all-sets candidate pool and confineToActiveSwitchingSet as the leading constraint, now alongside upstream's stickToSelectedCodecs constraint and preferCodecFamilies / playerResolutionCap rules.
  • Upstream replaced turbo/tsdown/biome/vitest with Vite+: the moq pack entry moves to packages/spf/vite.config.ts; simple-moq-video stays off the CDN via an exclusion in packages/html/vite.config.ts (CDN media entries are now auto-discovered from define/media/).
  • MoQ tests import from vite-plus/test; safeDefine comes from registration/safe-define.
  • MoQ sources run through the new jsdoc formatter and the anti-slop padding 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/plans is a generated alias now).

Testing

  • pnpm typecheck, pnpm lint, pnpm check:workspace, pnpm build:packages, pnpm build:sandbox β€” all green
  • pnpm -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

  • switchVideoTrack keeps its all-sets candidate pool, now hardened with upstream's stickToSelectedCodecs, preferCodecFamilies, and playerResolutionCap rules.
  • The moq pack entry moves to packages/spf/vite.config.ts; simple-moq-video stays off the CDN via an exclusion there.
  • MoQ tests import from vite-plus/test; safeDefine comes from registration/safe-define.
  • MoQ sources and conflicting docs are reformatted to upstream's new jsdoc and anti-slop style β€” whitespace and comment reflow only.
  • The plan file moves to .agents/plans/ (.claude/plans is 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-verify because lint-staged cannot run on merge commits; the whole repo lint ran green beforehand.