Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

perf(embed): code-split the players and upload tracker and drop the duplicate framer-motion runtime

07rjain0feae42ee8db
diff --git a/apps/web/__tests__/unit/embed-video-playback-chrome.test.ts b/apps/web/__tests__/unit/embed-video-playback-chrome.test.ts
index fac9bc0aa..8fc144009 100644
--- a/apps/web/__tests__/unit/embed-video-playback-chrome.test.ts
+++ b/apps/web/__tests__/unit/embed-video-playback-chrome.test.ts
@@ -3,6 +3,7 @@
import {
act,
type ComponentProps,
+ type ComponentType,
createElement,
type MouseEventHandler,
type ReactNode,
@@ -24,6 +25,27 @@ import {
type SharePageBrandingInput,
} from "@/lib/share-branding";
+const dynamicImports = vi.hoisted(() => [] as Promise<unknown>[]);
+
+vi.mock("next/dynamic", async () => {
+ const { createElement } = await import("react");
+ return {
+ default: (
+ loader: () => Promise<
+ ComponentType<object> | { default: ComponentType<object> }
+ >,
+ ) => {
+ let Loaded: ComponentType<object> | null = null;
+ dynamicImports.push(
+ loader().then((module) => {
+ Loaded = "default" in module ? module.default : module;
+ }),
+ );
+ return (props: object) => (Loaded ? createElement(Loaded, props) : null);
+ },
+ };
+});
+
vi.mock("@cap/env", () => ({ NODE_ENV: "test" }));
vi.mock("@cap/ui", async () => {
@@ -34,7 +56,7 @@ vi.mock("@cap/ui", async () => {
};
});
-vi.mock("framer-motion", async () => {
+vi.mock("motion/react", async () => {
const { createElement } = await import("react");
type MotionProps = {
children?: ReactNode;
@@ -176,6 +198,10 @@ const expectChromeHidden = (container: HTMLElement) => {
expect(container.querySelector('[aria-label="Powered by Cap"]')).toBeNull();
};
+beforeAll(async () => {
+ await Promise.all(dynamicImports);
+});
+
describe("EmbedVideo playback chrome", () => {
beforeAll(() => {
actEnvironment.IS_REACT_ACT_ENVIRONMENT = true;
diff --git a/apps/web/app/embed/[videoId]/_components/EmbedVideo.tsx b/apps/web/app/embed/[videoId]/_components/EmbedVideo.tsx
index 07e8784b8..8bef36ed0 100644
--- a/apps/web/app/embed/[videoId]/_components/EmbedVideo.tsx
+++ b/apps/web/app/embed/[videoId]/_components/EmbedVideo.tsx
@@ -5,8 +5,9 @@ import type { comments as commentsSchema, videos } from "@cap/database/schema";
import { NODE_ENV } from "@cap/env";
import { Avatar, Logo } from "@cap/ui";
import type { ViewerSettings } from "@cap/web-backend";
-import { AnimatePresence, motion } from "framer-motion";
import { useTranscript } from "hooks/use-transcript";
+import { AnimatePresence, motion } from "motion/react";
+import dynamic from "next/dynamic";
import Image from "next/image";
import {
forwardRef,
@@ -15,13 +16,11 @@ import {
useRef,
useState,
} from "react";
-import { CapVideoPlayer } from "@/app/s/[videoId]/_components/CapVideoPlayer";
-import { HLSVideoPlayer } from "@/app/s/[videoId]/_components/HLSVideoPlayer";
-import { useUploadProgress } from "@/app/s/[videoId]/_components/ProgressCircle";
import {
PreparingVideoOverlay,
RecordingInProgressOverlay,
} from "@/app/s/[videoId]/_components/RecordingInProgress";
+import type { UploadProgress } from "@/app/s/[videoId]/_components/upload-progress";
import {
formatChaptersAsVTT,
formatTranscriptAsVTT,
@@ -33,6 +32,21 @@ import type { SharePageBranding } from "@/lib/share-branding";
import type { ShareCallToAction } from "@/lib/share-call-to-action";
import { usePlayerJsReceiver } from "./use-player-js-receiver";
+const CapVideoPlayer = dynamic(() =>
+ import("@/app/s/[videoId]/_components/CapVideoPlayer").then(
+ (m) => m.CapVideoPlayer,
+ ),
+);
+const UploadProgressTracker = dynamic(
+ () => import("@/app/s/[videoId]/_components/UploadProgressTracker"),
+ { ssr: false },
+);
+const HLSVideoPlayer = dynamic(() =>
+ import("@/app/s/[videoId]/_components/HLSVideoPlayer").then(
+ (m) => m.HLSVideoPlayer,
+ ),
+);
+
declare global {
interface Window {
MSStream: unknown;
@@ -96,10 +110,17 @@ export const EmbedVideo = forwardRef<
);
const [isPlaying, setIsPlaying] = useState(false);
const [userConfirmedStopped, setUserConfirmedStopped] = useState(false);
- const segmentUploadProgress = useUploadProgress(
- data.id,
- data.source.type === "desktopSegments" && (data.hasActiveUpload ?? false),
- );
+ const trackUploadProgress =
+ data.source.type === "desktopSegments" && (data.hasActiveUpload ?? false);
+ const [segmentUploadProgress, setSegmentUploadProgress] =
+ useState<UploadProgress | null>(
+ trackUploadProgress ? { status: "fetching" } : null,
+ );
+ useEffect(() => {
+ setSegmentUploadProgress(
+ trackUploadProgress ? { status: "fetching" } : null,
+ );
+ }, [trackUploadProgress]);
const [subtitleUrl, setSubtitleUrl] = useState<string | null>(null);
const [chaptersUrl, setChaptersUrl] = useState<string | null>(null);
const captionsDisabled = viewerSettings?.disableCaptions ?? false;
@@ -388,6 +409,12 @@ export const EmbedVideo = forwardRef<
)}
</AnimatePresence>
)}
+ {trackUploadProgress && (
+ <UploadProgressTracker
+ videoId={data.id}
+ onChange={setSegmentUploadProgress}
+ />
+ )}
</>
);
},