The open-source CapCut alternative
Merge branch 'main' into feat/timeline-return-to-start
ryue71788014d13
diff --cc apps/web/package.jsonindex 54f0c31f,d9947643..df7ca525--- a/apps/web/package.json+++ b/apps/web/package.json@@@ -72,22 -70,17 +72,23 @@@"zustand": "^5.0.2"},"devDependencies": {+ "@tailwindcss/postcss": "^4.1.11","@tailwindcss/typography": "^0.5.16",+ "@testing-library/jest-dom": "^6.4.0",+ "@testing-library/react": "^15.0.7",+ "@testing-library/user-event": "^14.5.2","@types/bun": "latest",+ "@types/node": "^24.1.0","@types/pg": "^8.15.4","@types/react": "^18.2.48","@types/react-dom": "^18.2.18","cross-env": "^7.0.3","drizzle-kit": "^0.31.4",+ "jsdom": "^26.0.0","postcss": "^8",- "tailwindcss": "^3.4.1",+ "tailwindcss": "^4.1.11","tsx": "^4.7.1",- "typescript": "^5.8.3"+ "typescript": "^5.8.3",+ "vitest": "^2.1.8"}}diff --cc apps/web/src/components/editor/timeline/index.tsxindex 0d9660bb,7a2cc7f2..bff0a90a--- a/apps/web/src/components/editor/timeline/index.tsx+++ b/apps/web/src/components/editor/timeline/index.tsx@@@ -1,7 -1,6 +1,7 @@@"use client";+import React from "react";- import { ScrollArea } from "../../ui/scroll-area";+ import { ScrollArea } from "@/components/ui/scroll-area";import { Button } from "../../ui/button";import {Scissors,diff --cc bun.lockindex f9176d12,83da5eff..27cff420--- a/bun.lock+++ b/bun.lock@@@ -73,9 -73,9 +73,10 @@@"zustand": "^5.0.2",},"devDependencies": {+ "@tailwindcss/postcss": "^4.1.11","@tailwindcss/typography": "^0.5.16","@types/bun": "latest",+ "@types/node": "^24.1.0","@types/pg": "^8.15.4","@types/react": "^18.2.48","@types/react-dom": "^18.2.18",