@remotion/cli 4.0.0-oops.3 → 4.0.0-prefetch.7

package/dist/progress-bar.js

@@ -1,16 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeRenderingAndStitchingProgress = exports.makeStitchingProgress = exports.makeRenderingProgress = exports.makeBundlingProgress = exports.createOverwriteableCliOutput = exports.createProgressBar = void 0;
-const chalk_1 = __importDefault(require("chalk"));
-const remotion_1 = require("remotion");
+const renderer_1 = require("@remotion/renderer");
 const ansi_diff_1 = require("./ansi/ansi-diff");
+const chalk_1 = require("./chalk");
+const config_1 = require("./config");
 const download_progress_1 = require("./download-progress");
 const make_progress_bar_1 = require("./make-progress-bar");
+const truthy_1 = require("./truthy");
 const createProgressBar = (quiet) => {
-    if (!remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'info')) {
+    if (!renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'info')) {
         return { update: () => false };
     }
     return (0, exports.createOverwriteableCliOutput)(quiet);
@@ -34,7 +33,7 @@ const makeBundlingProgress = ({ progress, steps, doneIn, }) => [
     `${doneIn ? 'Bundled' : 'Bundling'} code`,
     doneIn === null
         ? (progress * 100).toFixed(0) + '%'
-        : chalk_1.default.gray(`${doneIn}ms`),
+        : chalk_1.chalk.gray(`${doneIn}ms`),
 ].join(' ');
 exports.makeBundlingProgress = makeBundlingProgress;
 const makeRenderingProgress = ({ frames, totalFrames, steps, concurrency, doneIn, }) => {
@@ -43,21 +42,26 @@ const makeRenderingProgress = ({ frames, totalFrames, steps, concurrency, doneIn
         `(${steps.indexOf('rendering') + 1}/${steps.length})`,
         (0, make_progress_bar_1.makeProgressBar)(progress),
         [doneIn ? 'Rendered' : 'Rendering', `frames (${concurrency}x)`]
-            .filter(remotion_1.Internals.truthy)
+            .filter(truthy_1.truthy)
             .join(' '),
-        doneIn === null ? `${frames}/${totalFrames}` : chalk_1.default.gray(`${doneIn}ms`),
+        doneIn === null ? `${frames}/${totalFrames}` : chalk_1.chalk.gray(`${doneIn}ms`),
     ].join(' ');
 };
 exports.makeRenderingProgress = makeRenderingProgress;
-const makeStitchingProgress = ({ frames, totalFrames, steps, doneIn, stage, }) => {
+const makeStitchingProgress = ({ frames, totalFrames, steps, doneIn, stage, codec, }) => {
     const progress = frames / totalFrames;
+    const mediaType = codec === 'gif'
+        ? 'GIF'
+        : renderer_1.RenderInternals.isAudioCodec(codec)
+            ? 'audio'
+            : 'video';
     return [
         `(${steps.indexOf('stitching') + 1}/${steps.length})`,
         (0, make_progress_bar_1.makeProgressBar)(progress),
-        stage === 'muxing'
-            ? `${doneIn ? 'Muxed' : 'Muxing'} audio`
-            : `${doneIn ? 'Encoded' : 'Encoding'} video`,
-        doneIn === null ? `${frames}/${totalFrames}` : chalk_1.default.gray(`${doneIn}ms`),
+        stage === 'muxing' && renderer_1.RenderInternals.canUseParallelEncoding(codec)
+            ? `${doneIn ? 'Muxed' : 'Muxing'} ${mediaType}`
+            : `${doneIn ? 'Encoded' : 'Encoding'} ${mediaType}`,
+        doneIn === null ? `${frames}/${totalFrames}` : chalk_1.chalk.gray(`${doneIn}ms`),
     ].join(' ');
 };
 exports.makeStitchingProgress = makeStitchingProgress;
@@ -67,7 +71,7 @@ const makeRenderingAndStitchingProgress = ({ rendering, stitching, downloads, })
         (0, download_progress_1.makeMultiDownloadProgress)(downloads),
         stitching === null ? null : (0, exports.makeStitchingProgress)(stitching),
     ]
-        .filter(remotion_1.Internals.truthy)
+        .filter(truthy_1.truthy)
         .join('\n');
 };
 exports.makeRenderingAndStitchingProgress = makeRenderingAndStitchingProgress;

package/dist/render.d.ts

@@ -1 +1 @@
-export declare const render: () => Promise<void>;
+export declare const render: (remotionRoot: string) => Promise<void>;

package/dist/render.js

@@ -5,20 +5,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.render = void 0;
 const renderer_1 = require("@remotion/renderer");
-const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+// eslint-disable-next-line no-restricted-imports
 const remotion_1 = require("remotion");
+const chalk_1 = require("./chalk");
+const config_1 = require("./config");
 const get_cli_options_1 = require("./get-cli-options");
 const get_composition_id_1 = require("./get-composition-id");
+const get_filename_1 = require("./get-filename");
 const initialize_render_cli_1 = require("./initialize-render-cli");
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
 const progress_bar_1 = require("./progress-bar");
 const setup_cache_1 = require("./setup-cache");
 const validate_ffmpeg_version_1 = require("./validate-ffmpeg-version");
-const render = async () => {
+const render = async (remotionRoot) => {
     const startTime = Date.now();
     const file = parse_command_line_1.parsedCli._[1];
     if (!file) {
@@ -30,39 +33,71 @@ const render = async () => {
     const fullPath = renderer_1.RenderInternals.isServeUrl(file)
         ? file
         : path_1.default.join(process.cwd(), file);
-    await (0, initialize_render_cli_1.initializeRenderCli)('sequence');
-    const { codec, proResProfile, parallelism, frameRange, shouldOutputImageSequence, absoluteOutputFile, overwrite, inputProps, envVariables, quality, browser, crf, pixelFormat, imageFormat, browserExecutable, ffmpegExecutable, scale, chromiumOptions, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'series' });
-    if (!absoluteOutputFile) {
-        throw new Error('assertion error - expected absoluteOutputFile to not be null');
-    }
+    const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
+    await (0, initialize_render_cli_1.initializeRenderCli)(remotionRoot, 'sequence');
+    log_1.Log.verbose('Asset dirs', downloadMap.assetDir);
+    const { codec, proResProfile, parallelism, frameRange, shouldOutputImageSequence, overwrite, inputProps, envVariables, quality, browser, crf, pixelFormat, imageFormat, browserExecutable, ffmpegExecutable, ffprobeExecutable, scale, chromiumOptions, port, numberOfGifLoops, everyNthFrame, puppeteerTimeout, muted, enforceAudioTrack, publicDir, } = await (0, get_cli_options_1.getCliOptions)({
+        isLambda: false,
+        type: 'series',
+    });
+    const relativeOutputLocation = (0, get_filename_1.getOutputFilename)({
+        codec,
+        imageSequence: shouldOutputImageSequence,
+        compositionName: (0, get_composition_id_1.getCompositionId)(),
+        defaultExtension: renderer_1.RenderInternals.getFileExtensionFromCodec(codec, 'final'),
+    });
+    const absoluteOutputFile = (0, get_cli_options_1.getAndValidateAbsoluteOutputFile)(relativeOutputLocation, overwrite);
+    const compositionId = (0, get_composition_id_1.getCompositionId)();
+    log_1.Log.info(chalk_1.chalk.gray(`Composition = ${compositionId}, Codec = ${codec}, Output = ${relativeOutputLocation}`));
     log_1.Log.verbose('Browser executable: ', browserExecutable);
     await (0, validate_ffmpeg_version_1.checkAndValidateFfmpegVersion)({
-        ffmpegExecutable: remotion_1.Internals.getCustomFfmpegExecutable(),
+        ffmpegExecutable,
     });
     const browserInstance = (0, renderer_1.openBrowser)(browser, {
         browserExecutable,
-        shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
+        shouldDumpIo: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
         chromiumOptions,
+        forceDeviceScaleFactor: scale,
     });
     const steps = [
         renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
         'rendering',
         shouldOutputImageSequence ? null : 'stitching',
     ].filter(remotion_1.Internals.truthy);
-    const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
-        ? fullPath
-        : await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
-    const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer(urlOrBundle);
+    const { urlOrBundle, cleanup: cleanupBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({
+        fullPath,
+        remotionRoot,
+        steps,
+        publicDir,
+    });
+    const onDownload = (src) => {
+        const id = Math.random();
+        const download = {
+            id,
+            name: src,
+            progress: 0,
+            downloaded: 0,
+            totalBytes: null,
+        };
+        downloads.push(download);
+        updateRenderProgress();
+        return ({ percent, downloaded, totalSize }) => {
+            download.progress = percent;
+            download.totalBytes = totalSize;
+            download.downloaded = downloaded;
+            updateRenderProgress();
+        };
+    };
     const puppeteerInstance = await browserInstance;
-    const comps = await (0, renderer_1.getCompositions)(serveUrl, {
+    const comps = await (0, renderer_1.getCompositions)(urlOrBundle, {
         inputProps,
         puppeteerInstance,
         envVariables,
-        timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
+        timeoutInMilliseconds: config_1.ConfigInternals.getCurrentPuppeteerTimeout(),
         chromiumOptions,
         browserExecutable,
+        downloadMap,
     });
-    const compositionId = (0, get_composition_id_1.getCompositionId)(comps);
     const config = comps.find((c) => c.id === compositionId);
     if (!config) {
         throw new Error(`Cannot find composition with ID ${compositionId}`);
@@ -78,7 +113,8 @@ const render = async () => {
         : await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));
     log_1.Log.verbose('Output dir', outputDir);
     const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
-    let totalFrames = renderer_1.RenderInternals.getDurationFromFrameRange(frameRange, config.durationInFrames);
+    const realFrameRange = renderer_1.RenderInternals.getRealFrameRange(config.durationInFrames, frameRange);
+    const totalFrames = renderer_1.RenderInternals.getFramesToRender(realFrameRange, everyNthFrame);
     let encodedFrames = 0;
     let renderedFrames = 0;
     let encodedDoneIn = null;
@@ -86,13 +122,13 @@ const render = async () => {
     let stitchStage = 'encoding';
     const downloads = [];
     const updateRenderProgress = () => {
-        if (totalFrames === null) {
+        if (totalFrames.length === 0) {
             throw new Error('totalFrames should not be 0');
         }
         return renderProgress.update((0, progress_bar_1.makeRenderingAndStitchingProgress)({
             rendering: {
                 frames: renderedFrames,
-                totalFrames,
+                totalFrames: totalFrames.length,
                 concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
                 doneIn: renderedDoneIn,
                 steps,
@@ -104,7 +140,8 @@ const render = async () => {
                     frames: encodedFrames,
                     stage: stitchStage,
                     steps,
-                    totalFrames,
+                    totalFrames: totalFrames.length,
+                    codec,
                 },
             downloads,
         }));
@@ -126,10 +163,7 @@ const render = async () => {
                 renderedFrames = rendered;
                 updateRenderProgress();
             },
-            onStart: ({ frameCount }) => {
-                totalFrames = frameCount;
-                return updateRenderProgress();
-            },
+            onStart: () => undefined,
             onDownload: (src) => {
                 if (src.startsWith('data:')) {
                     log_1.Log.info('\nWriting Data URL to file: ', src.substring(0, 30) + '...');
@@ -139,22 +173,28 @@ const render = async () => {
                 }
             },
             outputDir,
-            serveUrl,
-            dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
+            serveUrl: urlOrBundle,
+            dumpBrowserLogs: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
+            everyNthFrame,
             envVariables,
             frameRange,
             parallelism,
             puppeteerInstance,
             quality,
-            timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
+            timeoutInMilliseconds: puppeteerTimeout,
             chromiumOptions,
             scale,
+            ffmpegExecutable,
+            ffprobeExecutable,
+            browserExecutable,
+            port,
+            downloadMap,
         });
         renderedDoneIn = Date.now() - startTime;
         updateRenderProgress();
         log_1.Log.info();
         log_1.Log.info();
-        log_1.Log.info(chalk_1.default.green('\nYour image sequence is ready!'));
+        log_1.Log.info(chalk_1.chalk.green('\nYour image sequence is ready!'));
         return;
     }
     await (0, renderer_1.renderMedia)({
@@ -164,6 +204,7 @@ const render = async () => {
         crf,
         envVariables,
         ffmpegExecutable,
+        ffprobeExecutable,
         frameRange,
         imageFormat,
         inputProps,
@@ -181,28 +222,19 @@ const render = async () => {
         pixelFormat,
         proResProfile,
         quality,
-        serveUrl,
-        onDownload: (src) => {
-            const id = Math.random();
-            const download = {
-                id,
-                name: src,
-                progress: 0,
-            };
-            downloads.push(download);
-            updateRenderProgress();
-            return ({ percent }) => {
-                download.progress = percent;
-                updateRenderProgress();
-            };
-        },
-        dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
-        onStart: ({ frameCount }) => {
-            totalFrames = frameCount;
-        },
+        serveUrl: urlOrBundle,
+        onDownload,
+        dumpBrowserLogs: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
         chromiumOptions,
-        timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
+        timeoutInMilliseconds: config_1.ConfigInternals.getCurrentPuppeteerTimeout(),
         scale,
+        port,
+        numberOfGifLoops,
+        everyNthFrame,
+        verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
+        downloadMap,
+        muted,
+        enforceAudioTrack,
     });
     log_1.Log.info();
     log_1.Log.info();
@@ -213,19 +245,20 @@ const render = async () => {
         seconds === 1 ? 'second' : 'seconds',
     ].join(' '));
     log_1.Log.info('-', 'Output can be found at:');
-    log_1.Log.info(chalk_1.default.cyan(`▶ ${absoluteOutputFile}`));
-    log_1.Log.verbose('Cleaning up...');
+    log_1.Log.info(chalk_1.chalk.cyan(`▶ ${absoluteOutputFile}`));
     try {
-        await renderer_1.RenderInternals.deleteDirectory(urlOrBundle);
+        await cleanupBundle();
+        await renderer_1.RenderInternals.cleanDownloadMap(downloadMap);
+        log_1.Log.verbose('Cleaned up', downloadMap.assetDir);
     }
     catch (err) {
         log_1.Log.warn('Could not clean up directory.');
         log_1.Log.warn(err);
         log_1.Log.warn('Do you have minimum required Node.js version?');
     }
-    log_1.Log.info(chalk_1.default.green('\nYour video is ready!'));
-    closeServer().catch((err) => {
-        log_1.Log.error('Could not close web server', err);
-    });
+    log_1.Log.info(chalk_1.chalk.green(`\nYour ${codec === 'gif' ? 'GIF' : 'video'} is ready!`));
+    if (renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose')) {
+        renderer_1.RenderInternals.perf.logPerf();
+    }
 };
 exports.render = render;

package/dist/setup-cache.d.ts

@@ -1,2 +1,16 @@
-import { RenderStep } from './step';
-export declare const bundleOnCli: (fullPath: string, steps: RenderStep[]) => Promise<string>;
+import type { RenderStep } from './step';
+export declare const bundleOnCliOrTakeServeUrl: ({ fullPath, remotionRoot, steps, publicDir, }: {
+    fullPath: string;
+    remotionRoot: string;
+    steps: RenderStep[];
+    publicDir: string | null;
+}) => Promise<{
+    urlOrBundle: string;
+    cleanup: () => Promise<void>;
+}>;
+export declare const bundleOnCli: ({ fullPath, steps, remotionRoot, publicDir, }: {
+    fullPath: string;
+    steps: RenderStep[];
+    remotionRoot: string;
+    publicDir: string | null;
+}) => Promise<string>;

package/dist/setup-cache.js

@@ -1,18 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bundleOnCli = void 0;
+exports.bundleOnCli = exports.bundleOnCliOrTakeServeUrl = void 0;
 const bundler_1 = require("@remotion/bundler");
-const remotion_1 = require("remotion");
+const renderer_1 = require("@remotion/renderer");
+const config_1 = require("./config");
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
 const progress_bar_1 = require("./progress-bar");
-const bundleOnCli = async (fullPath, steps) => {
+const bundleOnCliOrTakeServeUrl = async ({ fullPath, remotionRoot, steps, publicDir, }) => {
+    if (renderer_1.RenderInternals.isServeUrl(fullPath)) {
+        return {
+            urlOrBundle: fullPath,
+            cleanup: () => Promise.resolve(undefined),
+        };
+    }
+    const bundled = await (0, exports.bundleOnCli)({ fullPath, remotionRoot, steps, publicDir });
+    return {
+        urlOrBundle: bundled,
+        cleanup: () => renderer_1.RenderInternals.deleteDirectory(bundled),
+    };
+};
+exports.bundleOnCliOrTakeServeUrl = bundleOnCliOrTakeServeUrl;
+const bundleOnCli = async ({ fullPath, steps, remotionRoot, publicDir, }) => {
     var _a;
-    const shouldCache = remotion_1.Internals.getWebpackCaching();
-    const cacheExistedBefore = bundler_1.BundlerInternals.cacheExists('production', null);
-    if (cacheExistedBefore && !shouldCache) {
+    const shouldCache = config_1.ConfigInternals.getWebpackCaching();
+    const onProgress = (progress) => {
+        bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
+            progress: progress / 100,
+            steps,
+            doneIn: null,
+        }));
+    };
+    const options = {
+        enableCaching: shouldCache,
+        webpackOverride: (_a = config_1.ConfigInternals.getWebpackOverrideFn()) !== null && _a !== void 0 ? _a : ((f) => f),
+        rootDir: remotionRoot,
+        publicDir,
+    };
+    const [hash] = bundler_1.BundlerInternals.getConfig({
+        outDir: '',
+        entryPoint: fullPath,
+        onProgressUpdate: onProgress,
+        options,
+        resolvedRemotionRoot: remotionRoot,
+    });
+    const cacheExistedBefore = bundler_1.BundlerInternals.cacheExists(remotionRoot, 'production', hash);
+    if (cacheExistedBefore !== 'does-not-exist' && !shouldCache) {
         log_1.Log.info('🧹 Cache disabled but found. Deleting... ');
-        await bundler_1.BundlerInternals.clearCache('production', null);
+        await bundler_1.BundlerInternals.clearCache(remotionRoot);
+    }
+    if (cacheExistedBefore === 'other-exists' && shouldCache) {
+        log_1.Log.info('🧹 Webpack config change detected. Clearing cache... ');
+        await bundler_1.BundlerInternals.clearCache(remotionRoot);
     }
     const bundleStartTime = Date.now();
     const bundlingProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
@@ -22,19 +61,19 @@ const bundleOnCli = async (fullPath, steps) => {
             steps,
             doneIn: null,
         }));
-    }, {
-        enableCaching: shouldCache,
-        webpackOverride: (_a = remotion_1.Internals.getWebpackOverrideFn()) !== null && _a !== void 0 ? _a : remotion_1.Internals.defaultOverrideFunction,
-    });
+    }, options);
     bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
         progress: 1,
         steps,
         doneIn: Date.now() - bundleStartTime,
     }) + '\n');
     log_1.Log.verbose('Bundled under', bundled);
-    const cacheExistedAfter = bundler_1.BundlerInternals.cacheExists('production', null);
-    if (cacheExistedAfter && !cacheExistedBefore) {
-        log_1.Log.info('⚡️ Cached bundle. Subsequent renders will be faster.');
+    const cacheExistedAfter = bundler_1.BundlerInternals.cacheExists(remotionRoot, 'production', hash) === 'exists';
+    if (cacheExistedAfter) {
+        if (cacheExistedBefore === 'does-not-exist' ||
+            cacheExistedBefore === 'other-exists') {
+            log_1.Log.info('⚡️ Cached bundle. Subsequent renders will be faster.');
+        }
     }
     return bundled;
 };

package/dist/smooth-zoom.d.ts

@@ -0,0 +1,4 @@
+export declare const MIN_ZOOM = 0.05;
+export declare const MAX_ZOOM = 10;
+export declare const smoothenZoom: (input: number) => number;
+export declare const unsmoothenZoom: (input: number) => number;

package/dist/smooth-zoom.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unsmoothenZoom = exports.smoothenZoom = exports.MAX_ZOOM = exports.MIN_ZOOM = void 0;
+const BASE = Math.E / 4;
+exports.MIN_ZOOM = 0.05;
+exports.MAX_ZOOM = 10;
+function logN(val) {
+    return Math.log(val) / Math.log(BASE);
+}
+const smoothenZoom = (input) => {
+    return BASE ** (input - 1);
+};
+exports.smoothenZoom = smoothenZoom;
+const unsmoothenZoom = (input) => {
+    if (input < 0) {
+        return exports.MAX_ZOOM;
+    }
+    return Math.min(exports.MAX_ZOOM, Math.max(exports.MIN_ZOOM, logN(input) + 1));
+};
+exports.unsmoothenZoom = unsmoothenZoom;

package/dist/still.d.ts

@@ -1 +1 @@
-export declare const still: () => Promise<void>;
+export declare const still: (remotionRoot: string) => Promise<void>;