@remotion/cli 4.0.0-fastlambda.8 → 4.0.0-forcepublish.7

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,18 +33,29 @@ 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, } = 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,
     });
@@ -50,20 +64,39 @@ const render = async () => {
         '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,
+    });
+    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}`);
@@ -79,7 +112,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;
@@ -87,13 +121,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,
@@ -105,7 +139,8 @@ const render = async () => {
                     frames: encodedFrames,
                     stage: stitchStage,
                     steps,
-                    totalFrames,
+                    totalFrames: totalFrames.length,
+                    codec,
                 },
             downloads,
         }));
@@ -127,10 +162,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) + '...');
@@ -140,22 +172,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)({
@@ -165,6 +203,7 @@ const render = async () => {
         crf,
         envVariables,
         ffmpegExecutable,
+        ffprobeExecutable,
         frameRange,
         imageFormat,
         inputProps,
@@ -182,28 +221,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();
@@ -214,19 +244,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,14 @@
-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, }: {
+    fullPath: string;
+    remotionRoot: string;
+    steps: RenderStep[];
+}) => Promise<{
+    urlOrBundle: string;
+    cleanup: () => Promise<void>;
+}>;
+export declare const bundleOnCli: ({ fullPath, steps, remotionRoot, }: {
+    fullPath: string;
+    steps: RenderStep[];
+    remotionRoot: string;
+}) => Promise<string>;

package/dist/setup-cache.js

@@ -1,18 +1,56 @@
 "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, }) => {
+    if (renderer_1.RenderInternals.isServeUrl(fullPath)) {
+        return {
+            urlOrBundle: fullPath,
+            cleanup: () => Promise.resolve(undefined),
+        };
+    }
+    const bundled = await (0, exports.bundleOnCli)({ fullPath, remotionRoot, steps });
+    return {
+        urlOrBundle: bundled,
+        cleanup: () => renderer_1.RenderInternals.deleteDirectory(bundled),
+    };
+};
+exports.bundleOnCliOrTakeServeUrl = bundleOnCliOrTakeServeUrl;
+const bundleOnCli = async ({ fullPath, steps, remotionRoot, }) => {
     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,
+    };
+    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 +60,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/still.d.ts

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

package/dist/still.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.still = void 0;
 const renderer_1 = require("@remotion/renderer");
-const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
-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 initialize_render_cli_1 = require("./initialize-render-cli");
@@ -16,95 +16,141 @@ 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 truthy_1 = require("./truthy");
 const user_passed_output_location_1 = require("./user-passed-output-location");
-const still = async () => {
+const still = async (remotionRoot) => {
     const startTime = Date.now();
     const file = parse_command_line_1.parsedCli._[1];
     const fullPath = renderer_1.RenderInternals.isServeUrl(file)
         ? file
         : path_1.default.join(process.cwd(), file);
-    await (0, initialize_render_cli_1.initializeRenderCli)('still');
-    const userOutput = path_1.default.resolve(process.cwd(), (0, user_passed_output_location_1.getUserPassedOutputLocation)());
-    if (userOutput.endsWith('.jpeg') || userOutput.endsWith('.jpg')) {
-        log_1.Log.verbose('Output file has a JPEG extension, therefore setting the image format to JPEG.');
-        remotion_1.Config.Rendering.setImageFormat('jpeg');
+    await (0, initialize_render_cli_1.initializeRenderCli)(remotionRoot, 'still');
+    const userPassedOutput = (0, user_passed_output_location_1.getUserPassedOutputLocation)();
+    if ((userPassedOutput === null || userPassedOutput === void 0 ? void 0 : userPassedOutput.endsWith('.jpeg')) ||
+        (userPassedOutput === null || userPassedOutput === void 0 ? void 0 : userPassedOutput.endsWith('.jpg'))) {
+        log_1.Log.verbose('Output file has a JPEG extension, setting the image format to JPEG.');
+        config_1.Config.Rendering.setImageFormat('jpeg');
     }
-    if (userOutput.endsWith('.png')) {
-        log_1.Log.verbose('Output file has a PNG extension, therefore setting the image format to PNG.');
-        remotion_1.Config.Rendering.setImageFormat('png');
+    if (userPassedOutput === null || userPassedOutput === void 0 ? void 0 : userPassedOutput.endsWith('.png')) {
+        log_1.Log.verbose('Output file has a PNG extension, setting the image format to PNG.');
+        config_1.Config.Rendering.setImageFormat('png');
     }
-    const { inputProps, envVariables, quality, browser, imageFormat, stillFrame, browserExecutable, chromiumOptions, scale, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'still' });
+    const { inputProps, envVariables, quality, browser, imageFormat, stillFrame, browserExecutable, chromiumOptions, scale, ffmpegExecutable, ffprobeExecutable, overwrite, puppeteerTimeout, port, } = await (0, get_cli_options_1.getCliOptions)({
+        isLambda: false,
+        type: 'still',
+    });
     log_1.Log.verbose('Browser executable: ', browserExecutable);
+    const compositionId = (0, get_composition_id_1.getCompositionId)();
+    const relativeOutputLocation = (0, user_passed_output_location_1.getOutputLocation)({
+        compositionId,
+        defaultExtension: imageFormat,
+    });
+    const absoluteOutputLocation = (0, get_cli_options_1.getAndValidateAbsoluteOutputFile)(relativeOutputLocation, overwrite);
+    log_1.Log.info(chalk_1.chalk.gray(`Output = ${relativeOutputLocation}, Format = ${imageFormat}, Composition = ${compositionId}`));
     if (imageFormat === 'none') {
         log_1.Log.error('No image format was selected - this is probably an error in Remotion - please post your command on Github Issues for help.');
         process.exit(1);
     }
-    if (imageFormat === 'png' && !userOutput.endsWith('.png')) {
-        log_1.Log.warn(`Rendering a PNG, expected a .png extension but got ${userOutput}`);
+    if (imageFormat === 'png' && !absoluteOutputLocation.endsWith('.png')) {
+        log_1.Log.warn(`Rendering a PNG, expected a .png extension but got ${absoluteOutputLocation}`);
     }
     if (imageFormat === 'jpeg' &&
-        !userOutput.endsWith('.jpg') &&
-        !userOutput.endsWith('.jpeg')) {
-        log_1.Log.warn(`Rendering a JPEG, expected a .jpg or .jpeg extension but got ${userOutput}`);
+        !absoluteOutputLocation.endsWith('.jpg') &&
+        !absoluteOutputLocation.endsWith('.jpeg')) {
+        log_1.Log.warn(`Rendering a JPEG, expected a .jpg or .jpeg extension but got ${absoluteOutputLocation}`);
     }
     const browserInstance = (0, renderer_1.openBrowser)(browser, {
         browserExecutable,
         chromiumOptions,
-        shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
+        shouldDumpIo: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
         forceDeviceScaleFactor: scale,
     });
-    (0, fs_1.mkdirSync)(path_1.default.join(userOutput, '..'), {
+    (0, fs_1.mkdirSync)(path_1.default.join(absoluteOutputLocation, '..'), {
         recursive: true,
     });
     const steps = [
         renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
         'rendering',
-    ].filter(remotion_1.Internals.truthy);
-    const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
-        ? Promise.resolve(fullPath)
-        : await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
-    const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer(await urlOrBundle);
+    ].filter(truthy_1.truthy);
+    const { cleanup: cleanupBundle, urlOrBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({ fullPath, remotionRoot, steps });
     const puppeteerInstance = await browserInstance;
-    const comps = await (0, renderer_1.getCompositions)(serveUrl, {
+    const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
+    const comps = await (0, renderer_1.getCompositions)(urlOrBundle, {
         inputProps,
         puppeteerInstance,
         envVariables,
-        timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
+        timeoutInMilliseconds: puppeteerTimeout,
         chromiumOptions,
+        port,
+        browserExecutable,
+        ffmpegExecutable,
+        ffprobeExecutable,
+        downloadMap,
     });
-    const compositionId = (0, get_composition_id_1.getCompositionId)(comps);
     const composition = comps.find((c) => c.id === compositionId);
     if (!composition) {
         throw new Error(`Cannot find composition with ID ${compositionId}`);
     }
     const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
     const renderStart = Date.now();
+    const downloads = [];
+    let frames = 0;
+    const totalFrames = 1;
+    const updateProgress = () => {
+        renderProgress.update((0, progress_bar_1.makeRenderingAndStitchingProgress)({
+            rendering: {
+                frames,
+                concurrency: 1,
+                doneIn: frames === totalFrames ? Date.now() - renderStart : null,
+                steps,
+                totalFrames,
+            },
+            downloads,
+            stitching: null,
+        }));
+    };
+    updateProgress();
+    const onDownload = (src) => {
+        const id = Math.random();
+        const download = {
+            id,
+            name: src,
+            progress: 0,
+            downloaded: 0,
+            totalBytes: null,
+        };
+        downloads.push(download);
+        updateProgress();
+        return ({ percent }) => {
+            download.progress = percent;
+            updateProgress();
+        };
+    };
     await (0, renderer_1.renderStill)({
         composition,
         frame: stillFrame,
-        output: userOutput,
-        serveUrl,
+        output: absoluteOutputLocation,
+        serveUrl: urlOrBundle,
         quality,
-        dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
+        dumpBrowserLogs: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
         envVariables,
         imageFormat,
         inputProps,
         chromiumOptions,
-        timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
+        timeoutInMilliseconds: config_1.ConfigInternals.getCurrentPuppeteerTimeout(),
         scale,
+        ffmpegExecutable,
+        browserExecutable,
+        overwrite,
+        onDownload,
+        port,
+        downloadMap,
     });
+    frames = 1;
+    updateProgress();
+    log_1.Log.info();
     const closeBrowserPromise = puppeteerInstance.close();
-    closeServer().catch((err) => {
-        log_1.Log.error('Could not close web server', err);
-    });
-    renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
-        frames: 1,
-        concurrency: 1,
-        doneIn: Date.now() - renderStart,
-        steps,
-        totalFrames: 1,
-    }));
-    log_1.Log.info(chalk_1.default.green('\nYour still frame is ready!'));
+    log_1.Log.info(chalk_1.chalk.green('\nYour still frame is ready!'));
     const seconds = Math.round((Date.now() - startTime) / 1000);
     log_1.Log.info([
         '- Total render time:',
@@ -112,7 +158,10 @@ const still = async () => {
         seconds === 1 ? 'second' : 'seconds',
     ].join(' '));
     log_1.Log.info('-', 'Output can be found at:');
-    log_1.Log.info(chalk_1.default.cyan(`▶️ ${userOutput}`));
+    log_1.Log.info(chalk_1.chalk.cyan(`▶️ ${absoluteOutputLocation}`));
     await closeBrowserPromise;
+    await renderer_1.RenderInternals.cleanDownloadMap(downloadMap);
+    await cleanupBundle();
+    log_1.Log.verbose('Cleaned up', downloadMap.assetDir);
 };
 exports.still = still;

package/dist/truthy.d.ts

@@ -0,0 +1,3 @@
+declare type Truthy<T> = T extends false | '' | 0 | null | undefined ? never : T;
+export declare function truthy<T>(value: T): value is Truthy<T>;
+export {};

package/dist/truthy.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.truthy = void 0;
+function truthy(value) {
+    return Boolean(value);
+}
+exports.truthy = truthy;

package/dist/upgrade.d.ts

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