@remotion/cli 4.0.0-alpha.217 → 4.0.0-alpha4

package/dist/ansi/ansi-diff.d.ts

@@ -11,10 +11,9 @@ export declare class AnsiDiff {
     _buffer: string | null;
     _out: Buffer[];
     _lines: Line[];
-    finished: boolean;
     constructor(opts?: Options);
+    resize: (opts: Options) => void;
     toString(): string | null;
-    finish(): Buffer;
     update(buffer: string | Buffer, opts?: {
         moveTo?: [number, number];
     }): Buffer;

package/dist/ansi/ansi-diff.js

@@ -6,6 +6,26 @@ const CLEAR_LINE = Buffer.from([0x1b, 0x5b, 0x30, 0x4b]);
 const NEWLINE = Buffer.from('\n');
 class AnsiDiff {
     constructor(opts) {
+        this.resize = (opts) => {
+            if (!opts)
+                opts = {};
+            if (opts.width)
+                this.width = opts.width;
+            if (opts.height)
+                this.height = opts.height;
+            if (this._buffer)
+                this.update(this._buffer);
+            const last = top(this._lines);
+            // eslint-disable-next-line no-negated-condition
+            if (!last) {
+                this.x = 0;
+                this.y = 0;
+            }
+            else {
+                this.x = last.remainder;
+                this.y = last.y + last.height;
+            }
+        };
         this._push = (buf) => {
             this._out.push(buf);
         };
@@ -16,25 +36,11 @@ class AnsiDiff {
         this._buffer = null;
         this._out = [];
         this._lines = [];
-        this.finished = false;
     }
     toString() {
         return this._buffer;
     }
-    finish() {
-        this.finished = true;
-        if (this._out.length === 0) {
-            return Buffer.from('');
-        }
-        if (!this._out[this._out.length - 1].toString().endsWith('\n')) {
-            return NEWLINE;
-        }
-        return Buffer.from('');
-    }
     update(buffer, opts) {
-        if (this.finished) {
-            return Buffer.from('');
-        }
         this._buffer = Buffer.isBuffer(buffer) ? buffer.toString() : buffer;
         const other = this._buffer;
         const oldLines = this._lines;

package/dist/ansi/ansi-split.d.ts

@@ -1,2 +1 @@
 export declare function splitAnsi(str: string): string[];
-export declare const stripAnsi: (str: string) => string;

package/dist/ansi/ansi-split.js

@@ -1,15 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stripAnsi = exports.splitAnsi = void 0;
-const ansiRegex = () => {
-    const pattern = [
-        '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
-        '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))',
-    ].join('|');
-    return new RegExp(pattern, 'g');
-};
+exports.splitAnsi = void 0;
+const ansi_regex_1 = require("./ansi-regex");
 function splitAnsi(str) {
-    const parts = str.match(ansiRegex());
+    const parts = str.match((0, ansi_regex_1.ansiRegex)());
     if (!parts)
         return [str];
     const result = [];
@@ -35,10 +29,3 @@ function splitAnsi(str) {
     return result;
 }
 exports.splitAnsi = splitAnsi;
-const stripAnsi = (str) => {
-    if (typeof str !== 'string') {
-        throw new TypeError(`Expected a \`string\`, got \`${typeof str}\``);
-    }
-    return str.replace(ansiRegex(), '');
-};
-exports.stripAnsi = stripAnsi;

package/dist/benchmark.js

@@ -5,11 +5,9 @@ const renderer_1 = require("@remotion/renderer");
 const chalk_1 = require("./chalk");
 const cleanup_before_quit_1 = require("./cleanup-before-quit");
 const config_1 = require("./config");
-const convert_entry_point_to_serve_url_1 = require("./convert-entry-point-to-serve-url");
 const entry_point_1 = require("./entry-point");
 const get_cli_options_1 = require("./get-cli-options");
-const get_final_output_codec_1 = require("./get-final-output-codec");
-const image_formats_1 = require("./image-formats");
+const get_render_media_options_1 = require("./get-render-media-options");
 const log_1 = require("./log");
 const make_progress_bar_1 = require("./make-progress-bar");
 const parse_command_line_1 = require("./parse-command-line");
@@ -18,10 +16,14 @@ const select_composition_1 = require("./select-composition");
 const setup_cache_1 = require("./setup-cache");
 const truthy_1 = require("./truthy");
 const DEFAULT_RUNS = 3;
-const getValidConcurrency = (cliConcurrency) => {
+const getValidConcurrency = (renderMediaOptions) => {
+    var _a;
+    const concurrency = 'concurrency' in renderMediaOptions
+        ? (_a = renderMediaOptions.concurrency) !== null && _a !== void 0 ? _a : null
+        : null;
     const { concurrencies } = parse_command_line_1.parsedCli;
     if (!concurrencies) {
-        return [renderer_1.RenderInternals.getActualConcurrency(cliConcurrency)];
+        return [renderer_1.RenderInternals.getActualConcurrency(concurrency)];
     }
     return concurrencies
         .split(',')
@@ -82,7 +84,7 @@ const makeBenchmarkProgressBar = ({ totalRuns, run, progress, doneIn, }) => {
     ].join(' ');
 };
 const benchmarkCommand = async (remotionRoot, args) => {
-    var _a, _b;
+    var _a;
     const runs = (_a = parse_command_line_1.parsedCli.runs) !== null && _a !== void 0 ? _a : DEFAULT_RUNS;
     const { file, reason, remainingArgs } = (0, entry_point_1.findEntryPoint)(args, remotionRoot);
     if (!file) {
@@ -92,13 +94,12 @@ const benchmarkCommand = async (remotionRoot, args) => {
         log_1.Log.info(`$ remotion benchmark <entry file>`);
         process.exit(1);
     }
-    const fullEntryPoint = (0, convert_entry_point_to_serve_url_1.convertEntryPointToServeUrl)(file);
-    const { inputProps, envVariables, browserExecutable, chromiumOptions, port, puppeteerTimeout, browser, scale, publicDir, } = await (0, get_cli_options_1.getCliOptions)({
+    const { inputProps, envVariables, browserExecutable, ffmpegExecutable, ffprobeExecutable, chromiumOptions, port, puppeteerTimeout, browser, scale, publicDir, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
         type: 'series',
         remotionRoot,
     });
-    log_1.Log.verbose('Entry point:', fullEntryPoint, 'reason:', reason);
+    log_1.Log.verbose('Entry point:', file, 'reason:', reason);
     const browserInstance = (0, renderer_1.openBrowser)(browser, {
         browserExecutable,
         shouldDumpIo: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
@@ -106,17 +107,10 @@ const benchmarkCommand = async (remotionRoot, args) => {
         forceDeviceScaleFactor: scale,
     });
     const { urlOrBundle: bundleLocation, cleanup: cleanupBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({
-        fullPath: fullEntryPoint,
+        fullPath: file,
         publicDir,
         remotionRoot,
-        onProgress: () => undefined,
-        indentOutput: false,
-        logLevel: config_1.ConfigInternals.Logging.getLogLevel(),
-        bundlingStep: 0,
-        steps: 1,
-        onDirectoryCreated: (dir) => {
-            (0, cleanup_before_quit_1.registerCleanupJob)(() => renderer_1.RenderInternals.deleteDirectory(dir));
-        },
+        steps: ['bundling'],
     });
     (0, cleanup_before_quit_1.registerCleanupJob)(() => cleanupBundle());
     const puppeteerInstance = await browserInstance;
@@ -125,6 +119,8 @@ const benchmarkCommand = async (remotionRoot, args) => {
         envVariables,
         chromiumOptions,
         timeoutInMilliseconds: puppeteerTimeout,
+        ffmpegExecutable,
+        ffprobeExecutable,
         port,
         puppeteerInstance,
     });
@@ -146,63 +142,26 @@ const benchmarkCommand = async (remotionRoot, args) => {
     }
     const benchmark = {};
     let count = 1;
-    const { codec, reason: codecReason } = (0, get_final_output_codec_1.getFinalOutputCodec)({
-        cliFlag: parse_command_line_1.parsedCli.codec,
+    const { codec, reason: codecReason } = (0, get_cli_options_1.getFinalCodec)({
         downloadName: null,
         outName: null,
-        configFile: (_b = config_1.ConfigInternals.getOutputCodecOrUndefined()) !== null && _b !== void 0 ? _b : null,
-        uiCodec: null,
     });
     for (const composition of compositions) {
-        const { proResProfile, frameRange: defaultFrameRange, overwrite, jpegQuality, crf: configFileCrf, pixelFormat, scale: configFileScale, numberOfGifLoops, everyNthFrame, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, height, width, concurrency: unparsedConcurrency, } = await (0, get_cli_options_1.getCliOptions)({
-            isLambda: false,
-            type: 'series',
+        const renderMediaOptions = await (0, get_render_media_options_1.getRenderMediaOptions)({
+            config: composition,
+            outputLocation: undefined,
+            serveUrl: bundleLocation,
+            codec,
             remotionRoot,
         });
-        const concurrency = getValidConcurrency(unparsedConcurrency);
+        const concurrency = getValidConcurrency(renderMediaOptions);
         benchmark[composition.id] = {};
         for (const con of concurrency) {
-            const benchmarkProgress = (0, progress_bar_1.createOverwriteableCliOutput)({
-                quiet: (0, parse_command_line_1.quietFlagProvided)(),
-                cancelSignal: null,
-            });
+            const benchmarkProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
             log_1.Log.info();
             log_1.Log.info(`${chalk_1.chalk.bold(`Benchmark #${count++}:`)} ${chalk_1.chalk.gray(`composition=${composition.id} concurrency=${con} codec=${codec} (${codecReason})`)}`);
             const timeTaken = await runBenchmark(runs, {
-                outputLocation: undefined,
-                composition: {
-                    ...composition,
-                    width: width !== null && width !== void 0 ? width : composition.width,
-                    height: height !== null && height !== void 0 ? height : composition.height,
-                },
-                crf: configFileCrf,
-                envVariables,
-                frameRange: defaultFrameRange,
-                imageFormat: (0, image_formats_1.getVideoImageFormat)({
-                    codec,
-                    uiImageFormat: null,
-                }),
-                inputProps,
-                overwrite,
-                pixelFormat,
-                proResProfile,
-                jpegQuality,
-                dumpBrowserLogs: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
-                chromiumOptions,
-                timeoutInMilliseconds: config_1.ConfigInternals.getCurrentPuppeteerTimeout(),
-                scale: configFileScale,
-                port,
-                numberOfGifLoops,
-                everyNthFrame,
-                verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
-                muted,
-                enforceAudioTrack,
-                browserExecutable,
-                ffmpegOverride,
-                serveUrl: bundleLocation,
-                codec,
-                audioBitrate,
-                videoBitrate,
+                ...renderMediaOptions,
                 puppeteerInstance,
                 concurrency: con,
             }, (run, progress) => {

package/dist/composition-prompts.d.ts

@@ -1,7 +1,8 @@
 import type { PromptObject } from 'prompts';
-declare type Question<V extends string = string> = PromptObject<V> & {
+import prompts from 'prompts';
+export declare type Question<V extends string = string> = PromptObject<V> & {
     optionsPerPage?: number;
 };
-declare type NamelessQuestion = Omit<Question<'value'>, 'name'>;
+export declare type NamelessQuestion = Omit<Question<'value'>, 'name'>;
+export default function prompt(questions: Question): Promise<prompts.Answers<string>>;
 export declare function selectAsync(question: NamelessQuestion): Promise<string | string[]>;
-export {};

package/dist/composition-prompts.js

@@ -14,6 +14,7 @@ function prompt(questions) {
         },
     });
 }
+exports.default = prompt;
 async function selectAsync(question) {
     const { value } = await prompt({
         ...question,

package/dist/compositions.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.listCompositionsCommand = void 0;
 const renderer_1 = require("@remotion/renderer");
 const cleanup_before_quit_1 = require("./cleanup-before-quit");
-const config_1 = require("./config");
 const entry_point_1 = require("./entry-point");
 const get_cli_options_1 = require("./get-cli-options");
 const get_config_file_name_1 = require("./get-config-file-name");
@@ -22,7 +21,7 @@ const listCompositionsCommand = async (remotionRoot, args) => {
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
     (0, cleanup_before_quit_1.registerCleanupJob)(() => renderer_1.RenderInternals.cleanDownloadMap(downloadMap));
     await (0, get_config_file_name_1.loadConfig)(remotionRoot);
-    const { browserExecutable, chromiumOptions, envVariables, inputProps, puppeteerTimeout, port, publicDir, } = await (0, get_cli_options_1.getCliOptions)({
+    const { browserExecutable, ffmpegExecutable, ffprobeExecutable, chromiumOptions, envVariables, inputProps, puppeteerTimeout, port, publicDir, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
         type: 'get-compositions',
         remotionRoot,
@@ -30,19 +29,14 @@ const listCompositionsCommand = async (remotionRoot, args) => {
     const { urlOrBundle: bundled, cleanup: cleanupBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({
         remotionRoot,
         fullPath: file,
+        steps: ['bundling'],
         publicDir,
-        onProgress: () => undefined,
-        indentOutput: false,
-        logLevel: config_1.ConfigInternals.Logging.getLogLevel(),
-        bundlingStep: 0,
-        steps: 1,
-        onDirectoryCreated: (dir) => {
-            (0, cleanup_before_quit_1.registerCleanupJob)(() => renderer_1.RenderInternals.deleteDirectory(dir));
-        },
     });
     (0, cleanup_before_quit_1.registerCleanupJob)(() => cleanupBundle());
     const compositions = await (0, renderer_1.getCompositions)(bundled, {
         browserExecutable,
+        ffmpegExecutable,
+        ffprobeExecutable,
         chromiumOptions,
         envVariables,
         inputProps,

package/dist/config/bitrate.d.ts

@@ -1,4 +1,4 @@
-export declare const setAudioBitrate: (bitrate: string | null) => void;
+export declare const setAudioBitrate: (bitrate: string) => void;
 export declare const getAudioBitrate: () => string | null;
-export declare const setVideoBitrate: (bitrate: string | null) => void;
+export declare const setVideoBitrate: (bitrate: string) => void;
 export declare const getVideoBitrate: () => string | null;

package/dist/config/bitrate.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVideoBitrate = exports.setVideoBitrate = exports.getAudioBitrate = exports.setAudioBitrate = void 0;
-let audioBitrate = null;
+let audioBitrate;
 const setAudioBitrate = (bitrate) => {
     audioBitrate = bitrate;
 };
@@ -10,7 +10,7 @@ const getAudioBitrate = () => {
     return audioBitrate;
 };
 exports.getAudioBitrate = getAudioBitrate;
-let videoBitrate = null;
+let videoBitrate;
 const setVideoBitrate = (bitrate) => {
     videoBitrate = bitrate;
 };

package/dist/config/browser.d.ts

@@ -1 +1,3 @@
-export declare const getBrowser: () => null;
+import type { Browser } from '@remotion/renderer';
+export declare const setBrowser: (browser: Browser) => void;
+export declare const getBrowser: () => Browser | null;

package/dist/config/browser.js

@@ -1,7 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBrowser = void 0;
-const currentBrowser = null;
+exports.getBrowser = exports.setBrowser = void 0;
+let currentBrowser = null;
+const setBrowser = (browser) => {
+    if (browser === 'chrome') {
+        process.env.PUPPETEER_PRODUCT = 'chrome';
+    }
+    if (browser === 'firefox') {
+        process.env.PUPPETEER_PRODUCT = 'firefox';
+    }
+    currentBrowser = browser;
+};
+exports.setBrowser = setBrowser;
 const getBrowser = () => {
     return currentBrowser;
 };

package/dist/config/codec.d.ts

@@ -1,3 +1,7 @@
 import type { CodecOrUndefined } from '@remotion/renderer';
+declare const validLegacyFormats: readonly ["mp4", "png-sequence"];
+declare type LegacyFormat = typeof validLegacyFormats[number];
 export declare const setCodec: (newCodec: CodecOrUndefined) => void;
 export declare const getOutputCodecOrUndefined: () => CodecOrUndefined;
+export declare const setOutputFormat: (newLegacyFormat: LegacyFormat) => void;
+export {};

package/dist/config/codec.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOutputCodecOrUndefined = exports.setCodec = void 0;
+exports.setOutputFormat = exports.getOutputCodecOrUndefined = exports.setCodec = void 0;
 const renderer_1 = require("@remotion/renderer");
+const log_1 = require("../log");
+const validLegacyFormats = ['mp4', 'png-sequence'];
 let codec;
 const setCodec = (newCodec) => {
     if (newCodec === undefined) {
@@ -18,3 +20,21 @@ const getOutputCodecOrUndefined = () => {
     return codec;
 };
 exports.getOutputCodecOrUndefined = getOutputCodecOrUndefined;
+const setOutputFormat = (newLegacyFormat) => {
+    if (newLegacyFormat === undefined) {
+        codec = undefined;
+        return;
+    }
+    if (!validLegacyFormats.includes(newLegacyFormat)) {
+        throw new Error(`Output format must be one of the following: ${validLegacyFormats.join(', ')}, but got ${newLegacyFormat}`);
+    }
+    log_1.Log.warn('setOutputFormat() is deprecated. Use the setCodec() and setImageSequence() instead.');
+    if (newLegacyFormat === 'mp4') {
+        codec = 'h264';
+        return;
+    }
+    if (newLegacyFormat === 'png-sequence') {
+        codec = undefined;
+    }
+};
+exports.setOutputFormat = setOutputFormat;

package/dist/config/image-format.d.ts

@@ -1,5 +1,3 @@
-import type { StillImageFormat, VideoImageFormat } from '@remotion/renderer';
-export declare const setStillImageFormat: (format: StillImageFormat) => void;
-export declare const setVideoImageFormat: (format: VideoImageFormat) => void;
-export declare const getUserPreferredStillImageFormat: () => "png" | "jpeg" | "pdf" | "webp" | undefined;
-export declare const getUserPreferredVideoImageFormat: () => "png" | "jpeg" | "none" | undefined;
+import type { ImageFormat } from '@remotion/renderer';
+export declare const setImageFormat: (format: ImageFormat) => void;
+export declare const getUserPreferredImageFormat: () => "png" | "jpeg" | "none" | undefined;

package/dist/config/image-format.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserPreferredVideoImageFormat = exports.getUserPreferredStillImageFormat = exports.setVideoImageFormat = exports.setStillImageFormat = void 0;
+exports.getUserPreferredImageFormat = exports.setImageFormat = void 0;
 const renderer_1 = require("@remotion/renderer");
 const truthy_1 = require("../truthy");
-let currentStillImageFormat;
-let currentVideoImageFormat;
-const setStillImageFormat = (format) => {
+let currentImageFormat;
+const setImageFormat = (format) => {
     if (typeof format === 'undefined') {
-        currentStillImageFormat = undefined;
+        currentImageFormat = undefined;
         return;
     }
-    if (!renderer_1.RenderInternals.validStillImageFormats.includes(format)) {
+    if (!renderer_1.RenderInternals.validImageFormats.includes(format)) {
         throw new TypeError([
             `Value ${format} is not valid as an image format.`,
             // @ts-expect-error
@@ -19,31 +18,10 @@ const setStillImageFormat = (format) => {
             .filter(truthy_1.truthy)
             .join(' '));
     }
-    currentStillImageFormat = format;
+    currentImageFormat = format;
 };
-exports.setStillImageFormat = setStillImageFormat;
-const setVideoImageFormat = (format) => {
-    if (typeof format === 'undefined') {
-        currentVideoImageFormat = undefined;
-        return;
-    }
-    if (!renderer_1.RenderInternals.validVideoImageFormats.includes(format)) {
-        throw new TypeError([
-            `Value ${format} is not valid as a video image format.`,
-            // @ts-expect-error
-            format === 'jpg' ? 'Did you mean "jpeg"?' : null,
-        ]
-            .filter(truthy_1.truthy)
-            .join(' '));
-    }
-    currentVideoImageFormat = format;
-};
-exports.setVideoImageFormat = setVideoImageFormat;
-const getUserPreferredStillImageFormat = () => {
-    return currentStillImageFormat;
-};
-exports.getUserPreferredStillImageFormat = getUserPreferredStillImageFormat;
-const getUserPreferredVideoImageFormat = () => {
-    return currentVideoImageFormat;
+exports.setImageFormat = setImageFormat;
+const getUserPreferredImageFormat = () => {
+    return currentImageFormat;
 };
-exports.getUserPreferredVideoImageFormat = getUserPreferredVideoImageFormat;
+exports.getUserPreferredImageFormat = getUserPreferredImageFormat;