mirror of
https://github.com/heygen-com/hyperframes.git
synced 2026-11-14 13:27:13 +00:00
Resolves 7 conflicts:
- .gitignore — kept main's examples/* + AWS Lambda negations, kept branch's repo-root project-dir ignores (huly-*/, raycast-*/, *-demo-*/, test-runs/, test-outputs/), kept main's .claude/worktrees/ etc.
- bun.lock + packages/cli/package.json — took main's esbuild ^0.25.12, kept branch's fontkit ^2.0.4
- packages/cli/src/cli.ts — kept both: main's lambda command + branch's verify-beats command
- packages/cli/src/commands/snapshot.ts — kept branch's version (has sub-composition seek fix from 4ae59e5a)
- packages/producer/src/services/renderOrchestrator.ts — took main's version (main refactored the area my TS fix targeted)
- packages/shader-transitions/src/hyper-shader.ts — took main's version (explicit undefined check + cleaner prog var)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>