Update dependencies and enhance UI components: Add 'bun' and 'dev' pa…#22
Update dependencies and enhance UI components: Add 'bun' and 'dev' pa…#22Jackson57279 merged 2 commits intomasterfrom
Conversation
…ckages to package.json and bun.lock, and introduce new components (PublicPlayground, ExampleGallery, CompetitiveEdge) to the main page. Revise Hero component text for clarity and improve button actions for better user engagement.
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
❌ Deploy Preview for zapdev failed. Why did it fail? →
|
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
There was a problem hiding this comment.
Bug: Git Merge Conflict Causes Build Failures
Unresolved Git merge conflict markers are present in the bun.lock file and components/hero.tsx. This will cause package installation and build failures due to corrupted dependency resolution in bun.lock, and compilation errors and malformed JSX in components/hero.tsx due to conflicting button implementations.
bun.lock#L323-L408
https://github.com/otdoges/zapdev/blob/c09fe578982d8ff23943738719b4b6c77ace17f4/bun.lock#L323-L408
components/hero.tsx#L144-L182
Bug: Git Conflict Causes JSX Compilation Errors
Unresolved Git merge conflict markers (<<<<<<< HEAD, =======, >>>>>>> f975414d0fc27fc5df0c6bfdee5d45995fa23c95) are present in components/hero.tsx. This results in invalid JSX, mixing Button and CrossBrowserButton implementations, which will cause React compilation errors.
components/hero.tsx#L144-L181
Was this report helpful? Give feedback by reacting with 👍 or 👎
1 participant
…ckages to package.json and bun.lock, and introduce new components (PublicPlayground, ExampleGallery, CompetitiveEdge) to the main page. Revise Hero component text for clarity and improve button actions for better user engagement.