@remotion/renderer 3.0.22 → 3.0.25

package/dist/extract-frame-from-video.js

@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractFrameFromVideo = exports.getLastFrameOfVideo = exports.determineVcodecFfmepgFlags = void 0;
+exports.extractFrameFromVideo = exports.getLastFrameOfVideo = exports.determineResizeParams = void 0;
 const execa_1 = __importDefault(require("execa"));
 const remotion_1 = require("remotion");
 const get_audio_channels_1 = require("./assets/get-audio-channels");
 const ensure_presentation_timestamp_1 = require("./ensure-presentation-timestamp");
 const frame_to_ffmpeg_timestamp_1 = require("./frame-to-ffmpeg-timestamp");
+const get_video_info_1 = require("./get-video-info");
 const is_beyond_last_frame_1 = require("./is-beyond-last-frame");
-const is_vp9_video_1 = require("./is-vp9-video");
 const last_frame_from_video_cache_1 = require("./last-frame-from-video-cache");
 const p_limit_1 = require("./p-limit");
 const lastFrameLimit = (0, p_limit_1.pLimit)(1);
@@ -23,16 +23,22 @@ const determineVcodecFfmepgFlags = (vcodecFlag) => {
         vcodecFlag === 'vp8' ? 'libvpx' : null,
     ].filter(remotion_1.Internals.truthy);
 };
-exports.determineVcodecFfmepgFlags = determineVcodecFfmepgFlags;
+const determineResizeParams = (needsResize) => {
+    if (needsResize === null) {
+        return [];
+    }
+    return ['-s', `${needsResize[0]}x${needsResize[1]}`];
+};
+exports.determineResizeParams = determineResizeParams;
 // Uses no seeking, therefore the whole video has to be decoded. This is a last resort and should only happen
 // if the video is corrupted
-const getFrameOfVideoSlow = async ({ src, timestamp, ffmpegExecutable, imageFormat, specialVCodecForTransparency, }) => {
+const getFrameOfVideoSlow = async ({ src, timestamp, ffmpegExecutable, imageFormat, specialVCodecForTransparency, needsResize, }) => {
     console.warn(`\nUsing a slow method to extract the frame at ${timestamp}ms of ${src}. See https://remotion.dev/docs/slow-method-to-extract-frame for advice`);
     const actualOffset = `-${timestamp * 1000}ms`;
     const command = [
         '-itsoffset',
         actualOffset,
-        ...(0, exports.determineVcodecFfmepgFlags)(specialVCodecForTransparency),
+        ...determineVcodecFfmepgFlags(specialVCodecForTransparency),
         '-i',
         src,
         '-frames:v',
@@ -41,6 +47,7 @@ const getFrameOfVideoSlow = async ({ src, timestamp, ffmpegExecutable, imageForm
         imageFormat === 'jpeg' ? 'mjpeg' : 'png',
         '-f',
         'image2pipe',
+        ...(0, exports.determineResizeParams)(needsResize),
         '-',
     ].filter(remotion_1.Internals.truthy);
     const { stdout, stderr } = (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', command);
@@ -86,6 +93,7 @@ const getLastFrameOfVideoFastUnlimited = async (options) => {
             src,
             imageFormat: options.imageFormat,
             specialVCodecForTransparency: options.specialVCodecForTransparency,
+            needsResize: options.needsResize,
         });
         return last;
     }
@@ -93,7 +101,7 @@ const getLastFrameOfVideoFastUnlimited = async (options) => {
     const { stdout, stderr } = (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', [
         '-ss',
         actualOffset,
-        ...(0, exports.determineVcodecFfmepgFlags)(options.specialVCodecForTransparency),
+        ...determineVcodecFfmepgFlags(options.specialVCodecForTransparency),
         '-i',
         src,
         '-frames:v',
@@ -102,6 +110,7 @@ const getLastFrameOfVideoFastUnlimited = async (options) => {
         options.imageFormat === 'jpeg' ? 'mjpeg' : 'png',
         '-f',
         'image2pipe',
+        ...(0, exports.determineResizeParams)(options.needsResize),
         '-',
     ].filter(remotion_1.Internals.truthy));
     if (!stderr) {
@@ -138,6 +147,7 @@ const getLastFrameOfVideoFastUnlimited = async (options) => {
             ffprobeExecutable,
             imageFormat: options.imageFormat,
             specialVCodecForTransparency: options.specialVCodecForTransparency,
+            needsResize: options.needsResize,
         });
         return unlimited;
     }
@@ -151,16 +161,15 @@ const getLastFrameOfVideo = async (options) => {
 exports.getLastFrameOfVideo = getLastFrameOfVideo;
 const extractFrameFromVideoFn = async ({ time, src, ffmpegExecutable, ffprobeExecutable, imageFormat, }) => {
     await (0, ensure_presentation_timestamp_1.ensurePresentationTimestamps)(src);
-    const specialVCodecForTransparency = imageFormat === 'jpeg'
-        ? 'none'
-        : await (0, is_vp9_video_1.getSpecialVCodecForTransparency)(src, ffprobeExecutable);
-    if (specialVCodecForTransparency === 'vp8') {
+    const { specialVcodec, needsResize } = await (0, get_video_info_1.getVideoInfo)(src, ffprobeExecutable);
+    if (specialVcodec === 'vp8') {
         return getFrameOfVideoSlow({
             ffmpegExecutable,
             imageFormat,
-            specialVCodecForTransparency,
+            specialVCodecForTransparency: specialVcodec,
             src,
             timestamp: time,
+            needsResize,
         });
     }
     if ((0, is_beyond_last_frame_1.isBeyondLastFrame)(src, time)) {
@@ -170,7 +179,8 @@ const extractFrameFromVideoFn = async ({ time, src, ffmpegExecutable, ffprobeExe
             offset: 0,
             src,
             imageFormat,
-            specialVCodecForTransparency,
+            specialVCodecForTransparency: specialVcodec,
+            needsResize,
         });
         return lastFrame;
     }
@@ -178,7 +188,7 @@ const extractFrameFromVideoFn = async ({ time, src, ffmpegExecutable, ffprobeExe
     const { stdout, stderr } = (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', [
         '-ss',
         ffmpegTimestamp,
-        ...(0, exports.determineVcodecFfmepgFlags)(specialVCodecForTransparency),
+        ...determineVcodecFfmepgFlags(specialVcodec),
         '-i',
         src,
         '-frames:v',
@@ -187,6 +197,7 @@ const extractFrameFromVideoFn = async ({ time, src, ffmpegExecutable, ffprobeExe
         'image2pipe',
         '-vcodec',
         imageFormat === 'jpeg' ? 'mjpeg' : 'png',
+        ...(0, exports.determineResizeParams)(needsResize),
         '-',
     ].filter(remotion_1.Internals.truthy), {
         buffer: false,
@@ -221,7 +232,8 @@ const extractFrameFromVideoFn = async ({ time, src, ffmpegExecutable, ffprobeExe
             offset: 0,
             src,
             imageFormat,
-            specialVCodecForTransparency,
+            specialVCodecForTransparency: specialVcodec,
+            needsResize,
         });
         return last;
     }

package/dist/get-audio-codec-name.d.ts

@@ -1,2 +1,2 @@
-import { Codec } from 'remotion';
+import type { Codec } from 'remotion';
 export declare const getAudioCodecName: (codec: Codec) => string | null;

package/dist/get-browser-instance.d.ts

@@ -1,6 +1,7 @@
-import { Browser, Page } from 'puppeteer-core';
-import { BrowserExecutable } from 'remotion';
-import { ChromiumOptions } from './open-browser';
+import type { BrowserExecutable } from 'remotion';
+import type { Browser } from './browser/Browser';
+import type { Page } from './browser/Page';
+import type { ChromiumOptions } from './open-browser';
 export declare const getPageAndCleanupFn: ({ passedInInstance, browserExecutable, chromiumOptions, }: {
     passedInInstance: Browser | undefined;
     browserExecutable: BrowserExecutable | null;

package/dist/get-codec-name.d.ts

@@ -1,2 +1,2 @@
-import { Codec } from 'remotion';
+import type { Codec } from 'remotion';
 export declare const getCodecName: (codec: Codec) => string | null;

package/dist/get-compositions.d.ts

@@ -1,7 +1,7 @@
-import { Browser } from 'puppeteer-core';
-import { BrowserExecutable, FfmpegExecutable, TCompMetadata } from 'remotion';
-import { BrowserLog } from './browser-log';
-import { ChromiumOptions } from './open-browser';
+import type { BrowserExecutable, FfmpegExecutable, TCompMetadata } from 'remotion';
+import type { BrowserLog } from './browser-log';
+import type { Browser } from './browser/Browser';
+import type { ChromiumOptions } from './open-browser';
 declare type GetCompositionsConfig = {
     inputProps?: object | null;
     envVariables?: Record<string, string>;

package/dist/get-compositions.js

@@ -14,8 +14,8 @@ const innerGetCompositions = async (serveUrl, page, config, proxyPort) => {
             var _a;
             (_a = config.onBrowserLog) === null || _a === void 0 ? void 0 : _a.call(config, {
                 stackTrace: log.stackTrace(),
-                text: log.text(),
-                type: log.type(),
+                text: log.text,
+                type: log.type,
             });
         });
     }

package/dist/get-duration-from-frame-range.d.ts

@@ -1,2 +1,2 @@
-import { FrameRange } from 'remotion';
+import type { FrameRange } from 'remotion';
 export declare const getDurationFromFrameRange: (frameRange: FrameRange | null, durationInFrames: number) => number;

package/dist/get-extension-from-codec.d.ts

@@ -1,2 +1,2 @@
-import { Codec } from 'remotion';
+import type { Codec } from 'remotion';
 export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "mp4" | "mkv" | "mov" | "webm";

package/dist/get-frame-to-render.d.ts

@@ -1,2 +1,2 @@
-import { FrameRange } from 'remotion';
+import type { FrameRange } from 'remotion';
 export declare const getRealFrameRange: (durationInFrames: number, frameRange: FrameRange | null) => [number, number];

package/dist/get-local-browser-executable.d.ts

@@ -1,3 +1,3 @@
-import { Browser, BrowserExecutable } from 'remotion';
+import type { Browser, BrowserExecutable } from 'remotion';
 export declare const ensureLocalBrowser: (browser: Browser, preferredBrowserExecutable: BrowserExecutable) => Promise<void>;
 export declare const getLocalBrowserExecutable: (browser: Browser, preferredBrowserExecutable: BrowserExecutable) => string;

package/dist/get-local-browser-executable.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalBrowserExecutable = exports.ensureLocalBrowser = void 0;
 const fs_1 = __importDefault(require("fs"));
-const puppeteer_core_1 = __importDefault(require("puppeteer-core"));
-const install_1 = require("puppeteer-core/lib/cjs/puppeteer/node/install");
-const revisions_1 = require("puppeteer-core/lib/cjs/puppeteer/revisions");
+const create_browser_fetcher_1 = require("./browser/create-browser-fetcher");
+const node_1 = require("./browser/node");
+const revisions_1 = require("./browser/revisions");
 const getSearchPathsForProduct = (product) => {
     var _a;
     if (product === 'chrome') {
@@ -44,8 +44,10 @@ const getLocalBrowser = (product) => {
     return null;
 };
 const getBrowserRevision = (product) => {
-    const browserFetcher = puppeteer_core_1.default.createBrowserFetcher({
+    const browserFetcher = node_1.puppeteer.createBrowserFetcher({
         product,
+        path: null,
+        platform: null,
     });
     const revisionInfo = browserFetcher.revisionInfo(product === 'firefox'
         ? revisions_1.PUPPETEER_REVISIONS.firefox
@@ -73,7 +75,7 @@ const ensureLocalBrowser = async (browser, preferredBrowserExecutable) => {
     const status = getBrowserStatus(mapBrowserToProduct(browser), preferredBrowserExecutable);
     if (status.type === 'no-browser') {
         console.log('No local browser could be found. Downloading one from the internet...');
-        await (0, install_1.downloadBrowser)();
+        await (0, create_browser_fetcher_1.downloadBrowser)(browser);
     }
 };
 exports.ensureLocalBrowser = ensureLocalBrowser;

package/dist/get-prores-profile-name.d.ts

@@ -1,2 +1,2 @@
-import { Codec, ProResProfile } from 'remotion';
+import type { Codec, ProResProfile } from 'remotion';
 export declare const getProResProfileName: (codec: Codec, proResProfile: ProResProfile | undefined) => string | null;

package/dist/get-video-info.d.ts

@@ -0,0 +1,8 @@
+import type { FfmpegExecutable } from 'remotion';
+declare type Result = {
+    specialVcodec: SpecialVCodecForTransparency;
+    needsResize: [number, number] | null;
+};
+export declare type SpecialVCodecForTransparency = 'vp9' | 'vp8' | 'none';
+export declare const getVideoInfo: (src: string, ffprobeExecutable: FfmpegExecutable) => Promise<Result>;
+export {};

package/dist/get-video-info.js

@@ -0,0 +1,50 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVideoInfo = void 0;
+const execa_1 = __importDefault(require("execa"));
+const calculate_sar_dar_pixels_1 = require("./calculate-sar-dar-pixels");
+const p_limit_1 = require("./p-limit");
+const isVp9VideoCache = {};
+const limit = (0, p_limit_1.pLimit)(1);
+async function getVideoInfoUnlimited(src, ffprobeExecutable) {
+    var _a;
+    if (typeof isVp9VideoCache[src] !== 'undefined') {
+        return isVp9VideoCache[src];
+    }
+    const task = await (0, execa_1.default)(ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : 'ffprobe', [src]);
+    const isVp9 = task.stderr.includes('Video: vp9');
+    const isVp8 = task.stderr.includes('Video: vp8');
+    const dimensions = (_a = task.stderr
+        .split('\n')
+        .find((n) => n.trim().startsWith('Stream #'))) === null || _a === void 0 ? void 0 : _a.match(/([0-9]{2,6})x([0-9]{2,6})/);
+    const dar = task.stderr.match(/DAR\s([0-9]+):([0-9]+)/);
+    let needsResize = null;
+    if (dimensions && dar) {
+        const width = parseInt(dimensions[1], 10);
+        const height = parseInt(dimensions[2], 10);
+        const darWidth = parseInt(dar[1], 10);
+        const darHeight = parseInt(dar[2], 10);
+        const { width: actualWidth, height: actualHeight } = (0, calculate_sar_dar_pixels_1.calculateDisplayVideoSize)({
+            darX: darWidth,
+            darY: darHeight,
+            x: width,
+            y: height,
+        });
+        if (actualWidth !== width || actualHeight !== height) {
+            needsResize = [actualWidth, actualHeight];
+        }
+    }
+    const result = {
+        specialVcodec: isVp9 ? 'vp9' : isVp8 ? 'vp8' : 'none',
+        needsResize,
+    };
+    isVp9VideoCache[src] = result;
+    return isVp9VideoCache[src];
+}
+const getVideoInfo = (src, ffprobeExecutable) => {
+    return limit(() => getVideoInfoUnlimited(src, ffprobeExecutable));
+};
+exports.getVideoInfo = getVideoInfo;

package/dist/image-format.d.ts

@@ -1,2 +1,2 @@
-import { ImageFormat } from 'remotion';
+import type { ImageFormat } from 'remotion';
 export declare const DEFAULT_IMAGE_FORMAT: ImageFormat;

package/dist/is-vp9-video.d.ts

@@ -1,3 +1,3 @@
-import { FfmpegExecutable } from 'remotion';
+import type { FfmpegExecutable } from 'remotion';
 export declare type SpecialVCodecForTransparency = 'vp9' | 'vp8' | 'none';
 export declare const getSpecialVCodecForTransparency: (src: string, ffprobeExecutable: FfmpegExecutable) => Promise<SpecialVCodecForTransparency>;

package/dist/last-frame-from-video-cache.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import { FfmpegExecutable, OffthreadVideoImageFormat } from 'remotion';
-import { SpecialVCodecForTransparency } from './is-vp9-video';
+import type { FfmpegExecutable, OffthreadVideoImageFormat } from 'remotion';
+import type { SpecialVCodecForTransparency } from './get-video-info';
 export declare type LastFrameOptions = {
     ffmpegExecutable: FfmpegExecutable;
     ffprobeExecutable: FfmpegExecutable;
@@ -8,6 +8,7 @@ export declare type LastFrameOptions = {
     src: string;
     specialVCodecForTransparency: SpecialVCodecForTransparency;
     imageFormat: OffthreadVideoImageFormat;
+    needsResize: [number, number] | null;
 };
 export declare const setLastFrameInCache: (options: LastFrameOptions, data: Buffer) => void;
 export declare const getLastFrameFromCache: (options: LastFrameOptions) => Buffer | null;

package/dist/merge-audio-track.d.ts

@@ -1,4 +1,4 @@
-import { FfmpegExecutable } from 'remotion';
+import type { FfmpegExecutable } from 'remotion';
 declare type Options = {
     ffmpegExecutable: FfmpegExecutable;
     files: string[];

package/dist/offthread-video-server.d.ts

@@ -1,6 +1,6 @@
-import { RequestListener } from 'http';
-import { FfmpegExecutable, OffthreadVideoImageFormat } from 'remotion';
-import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import type { RequestListener } from 'http';
+import type { FfmpegExecutable, OffthreadVideoImageFormat } from 'remotion';
+import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 export declare const extractUrlAndSourceFromUrl: (url: string) => {
     src: string;
     time: number;

package/dist/open-browser.d.ts

@@ -1,5 +1,6 @@
-import puppeteer from 'puppeteer-core';
-import { Browser } from 'remotion';
+import type { Browser } from 'remotion';
+import type { Browser as PuppeteerBrowser } from './browser/Browser';
+import type { Viewport } from './browser/PuppeteerViewport';
 declare const validRenderers: readonly ["swangle", "angle", "egl", "swiftshader"];
 declare type OpenGlRenderer = typeof validRenderers[number];
 export declare type ChromiumOptions = {
@@ -14,5 +15,6 @@ export declare const openBrowser: (browser: Browser, options?: {
     browserExecutable?: string | null;
     chromiumOptions?: ChromiumOptions;
     forceDeviceScaleFactor?: number;
-}) => Promise<puppeteer.Browser>;
+    viewport?: Viewport;
+}) => Promise<PuppeteerBrowser>;
 export {};

package/dist/open-browser.js

@@ -7,8 +7,8 @@ exports.openBrowser = exports.killAllBrowsers = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-const puppeteer_core_1 = __importDefault(require("puppeteer-core"));
 const remotion_1 = require("remotion");
+const node_1 = require("./browser/node");
 const get_local_browser_executable_1 = require("./get-local-browser-executable");
 const validRenderers = ['swangle', 'angle', 'egl', 'swiftshader'];
 const getOpenGlRenderer = (option) => {
@@ -33,18 +33,17 @@ const killAllBrowsers = async () => {
 };
 exports.killAllBrowsers = killAllBrowsers;
 const openBrowser = async (browser, options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     if (browser === 'firefox' && !remotion_1.Internals.FEATURE_FLAG_FIREFOX_SUPPORT) {
         throw new TypeError('Firefox supported is not yet turned on. Stay tuned for the future.');
     }
     await (0, get_local_browser_executable_1.ensureLocalBrowser)(browser, (_a = options === null || options === void 0 ? void 0 : options.browserExecutable) !== null && _a !== void 0 ? _a : null);
     const executablePath = (0, get_local_browser_executable_1.getLocalBrowserExecutable)(browser, (_b = options === null || options === void 0 ? void 0 : options.browserExecutable) !== null && _b !== void 0 ? _b : null);
     const customGlRenderer = getOpenGlRenderer((_d = (_c = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _c === void 0 ? void 0 : _c.gl) !== null && _d !== void 0 ? _d : null);
-    const browserInstance = await puppeteer_core_1.default.launch({
+    const browserInstance = await node_1.puppeteer.launch({
         executablePath,
         product: browser,
         dumpio: (_e = options === null || options === void 0 ? void 0 : options.shouldDumpIo) !== null && _e !== void 0 ? _e : false,
-        ignoreDefaultArgs: true,
         args: [
             'about:blank',
             '--allow-pre-commit-input',
@@ -61,8 +60,6 @@ const openBrowser = async (browser, options) => {
             '--no-proxy-server',
             "--proxy-server='direct://'",
             '--proxy-bypass-list=*',
-            // TODO: remove AvoidUnnecessaryBeforeUnloadCheckSync below
-            // once crbug.com/1324138 is fixed and released.
             '--disable-hang-monitor',
             '--disable-ipc-flooding-protection',
             '--disable-popup-blocking',
@@ -76,8 +73,6 @@ const openBrowser = async (browser, options) => {
             '--enable-automation',
             '--password-store=basic',
             '--use-mock-keychain',
-            // TODO(sadym): remove '--enable-blink-features=IdleDetection'
-            // once IdleDetection is turned on by default.
             '--enable-blink-features=IdleDetection',
             '--export-tagged-pdf',
             '--intensive-wake-up-throttling-policy=0',
@@ -113,6 +108,11 @@ const openBrowser = async (browser, options) => {
                 ]
                 : []),
         ].filter(Boolean),
+        defaultViewport: (_k = options === null || options === void 0 ? void 0 : options.viewport) !== null && _k !== void 0 ? _k : {
+            height: 720,
+            width: 1280,
+            deviceScaleFactor: 1,
+        },
     });
     const pages = await browserInstance.pages();
     await pages[0].close();

package/dist/prepare-server.d.ts

@@ -1,5 +1,5 @@
-import { FfmpegExecutable } from 'remotion';
-import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import type { FfmpegExecutable } from 'remotion';
+import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 export declare const prepareServer: ({ downloadDir, ffmpegExecutable, ffprobeExecutable, onDownload, onError, webpackConfigOrServeUrl, port, }: {
     webpackConfigOrServeUrl: string;
     downloadDir: string;

package/dist/preprocess-audio-track.d.ts

@@ -1,5 +1,5 @@
-import { FfmpegExecutable } from 'remotion';
-import { MediaAsset } from './assets/types';
+import type { FfmpegExecutable } from 'remotion';
+import type { MediaAsset } from './assets/types';
 declare type Options = {
     ffmpegExecutable: FfmpegExecutable;
     ffprobeExecutable: FfmpegExecutable;

package/dist/prespawn-ffmpeg.d.ts

@@ -1,6 +1,6 @@
 import execa from 'execa';
-import { Codec, FfmpegExecutable, ImageFormat, PixelFormat, ProResProfile } from 'remotion';
-import { CancelSignal } from './make-cancel-signal';
+import type { Codec, FfmpegExecutable, ImageFormat, PixelFormat, ProResProfile } from 'remotion';
+import type { CancelSignal } from './make-cancel-signal';
 declare type PreSticherOptions = {
     fps: number;
     width: number;

package/dist/provide-screenshot.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
-import puppeteer from 'puppeteer-core';
-import { ImageFormat } from 'remotion';
+import type { ImageFormat } from 'remotion';
+import type { Page } from './browser/Page';
 export declare const provideScreenshot: ({ page, imageFormat, options, quality, }: {
-    page: puppeteer.Page;
+    page: Page;
     imageFormat: ImageFormat;
     quality: number | undefined;
     options: {
         frame: number;
-        output?: string;
+        output: string | null;
     };
 }) => Promise<Buffer>;

package/dist/provide-screenshot.js

@@ -7,7 +7,6 @@ const provideScreenshot = ({ page, imageFormat, options, quality, }) => {
         page,
         opts: {
             path: options.output,
-            selector: '#remotion-canvas',
         },
         imageFormat,
         quality,

package/dist/puppeteer-evaluate.d.ts

@@ -1,4 +1,4 @@
-import { Page } from 'puppeteer-core';
+import type { Page } from './browser/Page';
 export declare function puppeteerEvaluateWithCatch<ReturnType>({ page, pageFunction, frame, args, }: {
     page: Page;
     pageFunction: Function | string;

package/dist/puppeteer-evaluate.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.puppeteerEvaluateWithCatch = void 0;
-/* eslint-disable no-new */
-const puppeteer_core_1 = require("puppeteer-core");
+const JSHandle_1 = require("./browser/JSHandle");
 const symbolicateable_error_1 = require("./error-handling/symbolicateable-error");
 const parse_browser_error_stack_1 = require("./parse-browser-error-stack");
 const EVALUATION_SCRIPT_URL = '__puppeteer_evaluation_script__';
@@ -33,7 +32,7 @@ function isString(obj) {
 async function puppeteerEvaluateWithCatch({ page, pageFunction, frame, args, }) {
     var _a, _b, _c, _d, _e, _f, _g;
     const contextId = (await page.mainFrame().executionContext())._contextId;
-    const client = page._client;
+    const client = page._client();
     const suffix = `//# sourceURL=${EVALUATION_SCRIPT_URL}`;
     if (isString(pageFunction)) {
         const expression = pageFunction;
@@ -140,7 +139,7 @@ function convertArgument(arg) {
         return { unserializableValue: '-Infinity' };
     if (Object.is(arg, NaN))
         return { unserializableValue: 'NaN' };
-    const objectHandle = arg && arg instanceof puppeteer_core_1.JSHandle ? arg : null;
+    const objectHandle = arg && arg instanceof JSHandle_1.JSHandle ? arg : null;
     if (objectHandle) {
         if (objectHandle._disposed)
             throw new Error('JSHandle is disposed!');

package/dist/puppeteer-screenshot.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="node" />
-import { Page, ScreenshotOptions } from 'puppeteer-core';
-export declare const screenshot: (page: Page, options?: ScreenshotOptions) => Promise<Buffer | string | void>;
+import type { Page } from './browser/Page';
+import type { ScreenshotOptions } from './browser/ScreenshotOptions';
+export declare const screenshot: (page: Page, options: ScreenshotOptions) => Promise<Buffer | string | void>;

package/dist/puppeteer-screenshot.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.screenshot = void 0;
 const assert = __importStar(require("assert"));
 const screenshot_task_1 = require("./screenshot-task");
-const screenshot = (page, options = {}) => {
+const screenshot = (page, options) => {
     let screenshotType = null;
     // options.type takes precedence over inferring the type from options.path
     // because it may be a 0-length file with no extension created beforehand
@@ -58,7 +58,6 @@ const screenshot = (page, options = {}) => {
         assert.ok(options.quality >= 0 && options.quality <= 100, 'Expected options.quality to be between 0 and 100 (inclusive), got ' +
             options.quality);
     }
-    assert.ok(!options.clip || !options.fullPage, 'options.clip and options.fullPage are exclusive');
     if (options.clip) {
         assert.ok(typeof options.clip.x === 'number', 'Expected options.clip.x to be a number but found ' +
             typeof options.clip.x);
@@ -71,7 +70,6 @@ const screenshot = (page, options = {}) => {
         assert.ok(options.clip.width !== 0, 'Expected options.clip.width not to be 0.');
         assert.ok(options.clip.height !== 0, 'Expected options.clip.height not to be 0.');
     }
-    // @ts-expect-error
-    return page._screenshotTaskQueue.postTask(() => (0, screenshot_task_1._screenshotTask)(page, screenshotType, options));
+    return page.screenshotTaskQueue.postTask(() => (0, screenshot_task_1._screenshotTask)(page, screenshotType, options));
 };
 exports.screenshot = screenshot;

package/dist/render-frames.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
-import { Browser as PuppeteerBrowser } from 'puppeteer-core';
-import { BrowserExecutable, FfmpegExecutable, FrameRange, ImageFormat, SmallTCompMetadata } from 'remotion';
-import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
-import { BrowserLog } from './browser-log';
-import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
-import { CancelSignal } from './make-cancel-signal';
-import { ChromiumOptions } from './open-browser';
-import { OnStartData, RenderFramesOutput } from './types';
+import type { BrowserExecutable, FfmpegExecutable, FrameRange, ImageFormat, SmallTCompMetadata } from 'remotion';
+import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import type { BrowserLog } from './browser-log';
+import type { Browser } from './browser/Browser';
+import type { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
+import type { CancelSignal } from './make-cancel-signal';
+import type { ChromiumOptions } from './open-browser';
+import type { OnStartData, RenderFramesOutput } from './types';
 declare type ConfigOrComposition = {
     /**
      * @deprecated This field has been renamed to `composition`
@@ -26,7 +26,7 @@ declare type RenderFramesOptions = {
     quality?: number;
     frameRange?: FrameRange | null;
     dumpBrowserLogs?: boolean;
-    puppeteerInstance?: PuppeteerBrowser;
+    puppeteerInstance?: Browser;
     browserExecutable?: BrowserExecutable;
     onBrowserLog?: (log: BrowserLog) => void;
     onFrameBuffer?: (buffer: Buffer, frame: number) => void;