@remotion/cli 4.0.0-4x.2 → 4.0.0-alpha.111

package/dist/preview.js

@@ -4,36 +4,135 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.previewCommand = void 0;
-const better_opn_1 = __importDefault(require("better-opn"));
+const crypto_1 = __importDefault(require("crypto"));
 const path_1 = __importDefault(require("path"));
-const remotion_1 = require("remotion");
+const better_opn_1 = require("./better-opn");
+const chalk_1 = require("./chalk");
+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_env_1 = require("./get-env");
 const get_input_props_1 = require("./get-input-props");
-const initialize_render_cli_1 = require("./initialize-render-cli");
+const get_network_address_1 = require("./get-network-address");
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
+const get_absolute_public_dir_1 = require("./preview-server/get-absolute-public-dir");
+const live_events_1 = require("./preview-server/live-events");
+const public_folder_1 = require("./preview-server/public-folder");
 const start_server_1 = require("./preview-server/start-server");
 const noop = () => undefined;
-const previewCommand = async () => {
-    const file = parse_command_line_1.parsedCli._[1];
+const getShouldOpenBrowser = () => {
+    var _a;
+    if (parse_command_line_1.parsedCli['no-open']) {
+        return {
+            shouldOpenBrowser: false,
+            reasonForBrowserDecision: '--no-open specified',
+        };
+    }
+    if (((_a = process.env.BROWSER) !== null && _a !== void 0 ? _a : '').toLowerCase() === 'none') {
+        return {
+            shouldOpenBrowser: false,
+            reasonForBrowserDecision: 'env BROWSER=none was set',
+        };
+    }
+    if (config_1.ConfigInternals.getShouldOpenBrowser() === false) {
+        return { shouldOpenBrowser: false, reasonForBrowserDecision: 'Config file' };
+    }
+    return { shouldOpenBrowser: true, reasonForBrowserDecision: 'default' };
+};
+const getPort = () => {
+    if (parse_command_line_1.parsedCli.port) {
+        return parse_command_line_1.parsedCli.port;
+    }
+    const serverPort = config_1.ConfigInternals.getServerPort();
+    if (serverPort) {
+        return serverPort;
+    }
+    return null;
+};
+const previewCommand = async (remotionRoot, args) => {
+    const { file, reason } = (0, entry_point_1.findEntryPoint)(args, remotionRoot);
+    log_1.Log.verbose('Entry point:', file, 'reason:', reason);
     if (!file) {
         log_1.Log.error('The preview command requires you to specify a root file. For example');
-        log_1.Log.error('  npx remotion preview src/index.tsx');
+        log_1.Log.error('  npx remotion preview src/index.ts');
         log_1.Log.error('See https://www.remotion.dev/docs/register-root for more information.');
         process.exit(1);
     }
-    const { port: desiredPort } = parse_command_line_1.parsedCli;
-    const fullPath = path_1.default.join(process.cwd(), file);
-    await (0, initialize_render_cli_1.initializeRenderCli)('preview');
-    const inputProps = (0, get_input_props_1.getInputProps)();
-    const envVariables = await (0, get_env_1.getEnvironmentVariables)();
-    const port = await (0, start_server_1.startServer)(path_1.default.resolve(__dirname, 'previewEntry.js'), fullPath, {
-        inputProps,
-        envVariables,
+    const desiredPort = getPort();
+    const fullEntryPath = (0, convert_entry_point_to_serve_url_1.convertEntryPointToServeUrl)(file);
+    let inputProps = (0, get_input_props_1.getInputProps)((newProps) => {
+        (0, live_events_1.waitForLiveEventsListener)().then((listener) => {
+            inputProps = newProps;
+            listener.sendEventToClient({
+                type: 'new-input-props',
+                newProps,
+            });
+        });
+    });
+    let envVariables = await (0, get_env_1.getEnvironmentVariables)((newEnvVariables) => {
+        (0, live_events_1.waitForLiveEventsListener)().then((listener) => {
+            envVariables = newEnvVariables;
+            listener.sendEventToClient({
+                type: 'new-env-variables',
+                newEnvVariables,
+            });
+        });
+    });
+    const publicDir = (0, get_absolute_public_dir_1.getAbsolutePublicDir)({
+        userPassedPublicDir: config_1.ConfigInternals.getPublicDir(),
+        remotionRoot,
+    });
+    const hashPrefix = '/static-';
+    const staticHash = `${hashPrefix}${crypto_1.default.randomBytes(6).toString('hex')}`;
+    (0, public_folder_1.initPublicFolderWatch)({
+        publicDir,
+        remotionRoot,
+        onUpdate: () => {
+            (0, live_events_1.waitForLiveEventsListener)().then((listener) => {
+                listener.sendEventToClient({
+                    type: 'new-public-folder',
+                    files: (0, public_folder_1.getFiles)(),
+                });
+            });
+        },
+        staticHash,
+    });
+    const { port, liveEventsServer } = await (0, start_server_1.startServer)({
+        entry: path_1.default.resolve(__dirname, 'previewEntry.js'),
+        userDefinedComponent: fullEntryPath,
+        getCurrentInputProps: () => inputProps,
+        getEnvVariables: () => envVariables,
         port: desiredPort,
-        maxTimelineTracks: remotion_1.Internals.getMaxTimelineTracks(),
+        maxTimelineTracks: config_1.ConfigInternals.getMaxTimelineTracks(),
+        remotionRoot,
+        keyboardShortcutsEnabled: config_1.ConfigInternals.getKeyboardShortcutsEnabled(),
+        publicDir,
+        webpackOverride: config_1.ConfigInternals.getWebpackOverrideFn(),
+        poll: config_1.ConfigInternals.getWebpackPolling(),
+        userPassedPublicDir: config_1.ConfigInternals.getPublicDir(),
+        hash: staticHash,
+        hashPrefix,
     });
-    (0, better_opn_1.default)(`http://localhost:${port}`);
+    (0, live_events_1.setLiveEventsListener)(liveEventsServer);
+    const networkAddress = (0, get_network_address_1.getNetworkAddress)();
+    if (networkAddress) {
+        log_1.Log.info(`Server ready - Local: ${chalk_1.chalk.underline(`http://localhost:${port}`)}, Network: ${chalk_1.chalk.underline(`http://${networkAddress}:${port}`)}`);
+    }
+    else {
+        log_1.Log.info(`Running on http://localhost:${port}`);
+    }
+    const { reasonForBrowserDecision, shouldOpenBrowser } = getShouldOpenBrowser();
+    if (shouldOpenBrowser) {
+        await (0, better_opn_1.openBrowser)({
+            url: `http://localhost:${port}`,
+            browserArgs: parse_command_line_1.parsedCli['browser-args'],
+            browserFlag: parse_command_line_1.parsedCli.browser,
+        });
+    }
+    else {
+        log_1.Log.verbose(`Not opening browser, reason: ${reasonForBrowserDecision}`);
+    }
     await new Promise(noop);
 };
 exports.previewCommand = previewCommand;

package/dist/previewEntry.js

@@ -4,15 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
+const react_dom_1 = require("react-dom");
 const client_1 = __importDefault(require("react-dom/client"));
 const remotion_1 = require("remotion");
 require("../styles/styles.css");
 const Editor_1 = require("./editor/components/Editor");
+const EditorContexts_1 = require("./editor/components/EditorContexts");
+const ServerDisconnected_1 = require("./editor/components/Notifications/ServerDisconnected");
+const event_source_1 = require("./event-source");
 remotion_1.Internals.CSSUtils.injectCSS(remotion_1.Internals.CSSUtils.makeDefaultCSS(null, '#1f2428'));
-const content = ((0, jsx_runtime_1.jsx)(remotion_1.Internals.RemotionRoot, { children: (0, jsx_runtime_1.jsx)(Editor_1.Editor, {}) }));
+const getServerDisconnectedDomElement = () => {
+    return document.getElementById('server-disconnected-overlay');
+};
+const content = ((0, jsx_runtime_1.jsx)(remotion_1.Internals.RemotionRoot, { numberOfAudioTags: window.remotion_numberOfAudioTags, children: (0, jsx_runtime_1.jsxs)(EditorContexts_1.EditorContexts, { children: [(0, jsx_runtime_1.jsx)(Editor_1.Editor, {}), (0, react_dom_1.createPortal)((0, jsx_runtime_1.jsx)(ServerDisconnected_1.ServerDisconnected, {}), getServerDisconnectedDomElement())] }) }));
 if (client_1.default.createRoot) {
     client_1.default.createRoot(remotion_1.Internals.getPreviewDomElement()).render(content);
 }
 else {
-    client_1.default.render((0, jsx_runtime_1.jsx)(remotion_1.Internals.RemotionRoot, { children: (0, jsx_runtime_1.jsx)(Editor_1.Editor, {}) }), remotion_1.Internals.getPreviewDomElement());
+    client_1.default.render(content, remotion_1.Internals.getPreviewDomElement());
 }
+(0, event_source_1.openEventSource)();

package/dist/print-compositions.d.ts

@@ -0,0 +1,2 @@
+import type { AnyCompMetadata } from 'remotion';
+export declare const printCompositions: (compositions: AnyCompMetadata[]) => void;

package/dist/print-compositions.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.printCompositions = void 0;
+const log_1 = require("./log");
+const parse_command_line_1 = require("./parse-command-line");
+const max = (arr) => {
+    if (arr.length === 0) {
+        throw new Error('Array of 0 length');
+    }
+    let biggest = arr[0];
+    for (let i = 0; i < arr.length; i++) {
+        const elem = arr[i];
+        if (elem > biggest) {
+            biggest = elem;
+        }
+    }
+    return biggest;
+};
+const printCompositions = (compositions) => {
+    if (!(0, parse_command_line_1.quietFlagProvided)()) {
+        log_1.Log.info();
+        log_1.Log.info('The following compositions are available:');
+        log_1.Log.info();
+    }
+    if ((0, parse_command_line_1.quietFlagProvided)()) {
+        log_1.Log.info(compositions.map((c) => c.id).join(' '));
+        return;
+    }
+    const firstColumnLength = max(compositions.map(({ id }) => id.length)) + 4;
+    const secondColumnLength = 8;
+    const thirdColumnLength = 15;
+    log_1.Log.info(compositions
+        .map((comp) => {
+        const isStill = comp.durationInFrames === 1;
+        const dimensions = `${comp.width}x${comp.height}`;
+        const fps = isStill ? '' : comp.fps.toString();
+        const durationInSeconds = (comp.durationInFrames / comp.fps).toFixed(2);
+        const formattedDuration = isStill
+            ? 'Still'
+            : `${comp.durationInFrames} (${durationInSeconds} sec)`;
+        return [
+            comp.id.padEnd(firstColumnLength, ' '),
+            fps.padEnd(secondColumnLength, ' '),
+            dimensions.padEnd(thirdColumnLength, ' '),
+            formattedDuration,
+        ].join('');
+    })
+        .join('\n'));
+};
+exports.printCompositions = printCompositions;

package/dist/print-error.js

@@ -8,7 +8,10 @@ const log_1 = require("./log");
 const progress_bar_1 = require("./progress-bar");
 const printError = async (err) => {
     if (err instanceof renderer_1.RenderInternals.SymbolicateableError) {
-        const output = (0, progress_bar_1.createOverwriteableCliOutput)(false);
+        const output = (0, progress_bar_1.createOverwriteableCliOutput)({
+            quiet: false,
+            cancelSignal: null,
+        });
         output.update(chalk_1.chalk.red('Symbolicating minified error message...\n' + err.message));
         try {
             const symbolicated = await renderer_1.RenderInternals.symbolicateError(err);
@@ -27,7 +30,6 @@ const printError = async (err) => {
         }
         return;
     }
-    log_1.Log.error('An error occurred:');
     log_1.Log.error(err.stack || err);
 };
 exports.printError = printError;

package/dist/print-help.js

@@ -11,7 +11,7 @@ const printFlags = (flags) => {
     });
 };
 const printHelp = () => {
-    log_1.Log.info(`@remotion/cli ${packagejson.version} © ${new Date().getFullYear()} Jonny Burger`);
+    log_1.Log.info(`@remotion/cli ${packagejson.version} © ${new Date().getFullYear()} The Remotion developers`);
     log_1.Log.info();
     log_1.Log.info('Available commands:');
     log_1.Log.info('');
@@ -19,18 +19,20 @@ const printHelp = () => {
     log_1.Log.info(chalk_1.chalk.gray('Start the preview server.'));
     printFlags([['--props', 'Pass input props as filename or as JSON']]);
     log_1.Log.info();
-    log_1.Log.info('remotion render <entry-point.ts> <comp-name> <output-file.mp4>');
+    log_1.Log.info('remotion render <entry-point.ts> <comp-id> <output-file.mp4>');
     log_1.Log.info(chalk_1.chalk.gray('Render video, audio or an image sequence.'));
     printFlags([
         ['--props', 'Pass input props as filename or as JSON'],
         ['--concurrency', 'How many frames to render in parallel'],
-        ['--image-format', 'Format to render the frames in, "jpeg" or "png"'],
+        ['--image-format', 'Format to render the video/still in'],
         ['--pixel-format', 'Custom pixel format, see docs for available values'],
         ['--config', 'Custom location for a Remotion config file'],
         ['--quality', 'Quality for rendered frames, JPEG only, 0-100'],
         ['--overwrite', 'Overwrite if file exists, default true'],
         ['--sequence', 'Output as an image sequence'],
         ['--codec', 'Video of audio codec'],
+        ['--audio-bitrate', 'Customize the output audio bitrate'],
+        ['--video-bitrate', 'Customize the output video bitrate'],
         ['--crf', 'FFMPEG CRF value, controls quality, see docs for info'],
         ['--browser-executable', 'Custom path for browser executable'],
         ['--frames', 'Render a portion or a still of a video'],
@@ -40,11 +42,11 @@ const printHelp = () => {
         ['--env-file', 'Specify a location for a dotenv file'],
     ]);
     log_1.Log.info();
-    log_1.Log.info('remotion still <entry-point.ts> <comp-name> <still.png>');
+    log_1.Log.info('remotion still <entry-point.ts> <comp-id> <still.png>');
     log_1.Log.info(chalk_1.chalk.gray('Render a still frame and save it as an image.'));
     printFlags([
         ['--frame', 'Which frame to render (default 0)'],
-        ['--image-format', 'Format to render the frames in, "jpeg" or "png"'],
+        ['--image-format', 'Format to render the video/still in'],
         ['--props', 'Pass input props as filename or as JSON'],
         ['--config', 'Custom location for a Remotion config file'],
         ['--quality', 'Quality for rendered frames, JPEG only, 0-100'],
@@ -59,11 +61,20 @@ const printHelp = () => {
     log_1.Log.info('remotion compositions <index-file.ts>');
     log_1.Log.info(chalk_1.chalk.gray('Prints the available compositions.'));
     log_1.Log.info();
+    log_1.Log.info('remotion benchmark <index-file.ts> <list-of-compositions>');
+    log_1.Log.info(chalk_1.chalk.gray('Benchmarks rendering a composition. Same options as for render.'));
+    log_1.Log.info();
     log_1.Log.info('remotion ' + versions_1.VERSIONS_COMMAND);
     log_1.Log.info(chalk_1.chalk.gray('Prints and validates versions of all Remotion packages.'));
     log_1.Log.info();
     log_1.Log.info('remotion upgrade');
     log_1.Log.info(chalk_1.chalk.gray('Ensure Remotion is on the newest version.'));
+    printFlags([
+        [
+            '--package-manager',
+            'Force a specific package manager, defaults to use from lockfile',
+        ],
+    ]);
     log_1.Log.info();
     log_1.Log.info('Visit https://www.remotion.dev/docs/cli for browsable CLI documentation.');
 };

package/dist/progress-bar.d.ts

@@ -1,40 +1,46 @@
-import type { StitchingState } from '@remotion/renderer';
-import type { RenderStep } from './step';
-export declare const createProgressBar: (quiet: boolean) => {
+import type { CancelSignal } from '@remotion/renderer';
+import type { AggregateRenderProgress, RenderingProgressInput, StitchingProgressInput } from './progress-types';
+export declare const createProgressBar: (quiet: boolean, cancelSignal: CancelSignal | null) => {
     update: (str: string) => boolean;
 };
-export declare const createOverwriteableCliOutput: (quiet: boolean) => {
+export declare type OverwriteableCliOutput = {
     update: (up: string) => boolean;
 };
-export declare const makeBundlingProgress: ({ progress, steps, doneIn, }: {
-    progress: number;
-    steps: RenderStep[];
-    doneIn: number | null;
-}) => string;
-declare type RenderingProgressInput = {
-    frames: number;
-    totalFrames: number;
-    steps: RenderStep[];
-    concurrency: number;
+export declare const createOverwriteableCliOutput: (options: {
+    quiet: boolean;
+    cancelSignal: CancelSignal | null;
+}) => OverwriteableCliOutput;
+export declare type CopyingState = {
+    bytes: number;
     doneIn: number | null;
 };
-export declare const makeRenderingProgress: ({ frames, totalFrames, steps, concurrency, doneIn, }: RenderingProgressInput) => string;
-declare type StitchingProgressInput = {
-    frames: number;
-    totalFrames: number;
-    steps: RenderStep[];
+export declare type BundlingState = {
+    progress: number;
     doneIn: number | null;
-    stage: StitchingState;
 };
-export declare const makeStitchingProgress: ({ frames, totalFrames, steps, doneIn, stage, }: StitchingProgressInput) => string;
-export declare type DownloadProgress = {
-    name: string;
-    id: number;
-    progress: number;
+export declare type SymbolicLinksState = {
+    symlinks: string[];
 };
-export declare const makeRenderingAndStitchingProgress: ({ rendering, stitching, downloads, }: {
-    rendering: RenderingProgressInput;
-    stitching: StitchingProgressInput | null;
-    downloads: DownloadProgress[];
+export declare const makeBundlingAndCopyProgress: ({ bundling, copying, symLinks, }: {
+    bundling: BundlingState;
+    copying: CopyingState;
+    symLinks: SymbolicLinksState;
+}, indent: boolean, bundlingStep: number, steps: number) => string;
+export declare const makeRenderingProgress: ({ frames, totalFrames, steps, concurrency, doneIn }: RenderingProgressInput, indent: boolean) => string;
+export declare const makeStitchingProgress: ({ stitchingProgress, indent, steps, stitchingStep, }: {
+    stitchingProgress: StitchingProgressInput;
+    indent: boolean;
+    steps: number;
+    stitchingStep: number;
 }) => string;
-export {};
+export declare const makeRenderingAndStitchingProgress: ({ prog, indent, steps, stitchingStep, }: {
+    prog: AggregateRenderProgress;
+    indent: boolean;
+    steps: number;
+    stitchingStep: number;
+}) => {
+    output: string;
+    progress: number;
+    message: string;
+};
+export declare const getGuiProgressSubtitle: (progress: AggregateRenderProgress) => string;

package/dist/progress-bar.js

@@ -1,70 +1,190 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeRenderingAndStitchingProgress = exports.makeStitchingProgress = exports.makeRenderingProgress = exports.makeBundlingProgress = exports.createOverwriteableCliOutput = exports.createProgressBar = void 0;
-const remotion_1 = require("remotion");
+exports.getGuiProgressSubtitle = exports.makeRenderingAndStitchingProgress = exports.makeStitchingProgress = exports.makeRenderingProgress = exports.makeBundlingAndCopyProgress = exports.createOverwriteableCliOutput = exports.createProgressBar = void 0;
+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 log_1 = require("./log");
 const make_progress_bar_1 = require("./make-progress-bar");
-const createProgressBar = (quiet) => {
-    if (!remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'info')) {
+const truthy_1 = require("./truthy");
+const createProgressBar = (quiet, cancelSignal) => {
+    if (!renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'info')) {
         return { update: () => false };
     }
-    return (0, exports.createOverwriteableCliOutput)(quiet);
+    return (0, exports.createOverwriteableCliOutput)({ quiet, cancelSignal });
 };
 exports.createProgressBar = createProgressBar;
-const createOverwriteableCliOutput = (quiet) => {
-    if (quiet) {
+const createOverwriteableCliOutput = (options) => {
+    var _a;
+    if (options.quiet) {
         return {
             update: () => false,
         };
     }
     const diff = new ansi_diff_1.AnsiDiff();
+    (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
+        process.stdout.write(diff.finish());
+    });
     return {
         update: (up) => process.stdout.write(diff.update(up)),
     };
 };
 exports.createOverwriteableCliOutput = createOverwriteableCliOutput;
-const makeBundlingProgress = ({ progress, steps, doneIn, }) => [
-    `(${steps.indexOf('bundling') + 1}/${steps.length})`,
-    (0, make_progress_bar_1.makeProgressBar)(progress),
-    `${doneIn ? 'Bundled' : 'Bundling'} code`,
-    doneIn === null
-        ? (progress * 100).toFixed(0) + '%'
-        : chalk_1.chalk.gray(`${doneIn}ms`),
-].join(' ');
-exports.makeBundlingProgress = makeBundlingProgress;
-const makeRenderingProgress = ({ frames, totalFrames, steps, concurrency, doneIn, }) => {
+const makeBundlingProgress = ({ bundlingState, indent, bundlingStep, steps, }) => {
+    const { doneIn, progress } = bundlingState;
+    return [
+        indent ? log_1.INDENT_TOKEN : null,
+        `(${bundlingStep + 1}/${steps})`,
+        (0, make_progress_bar_1.makeProgressBar)(progress),
+        `${doneIn ? 'Bundled' : 'Bundling'} code`,
+        doneIn === null
+            ? (progress * 100).toFixed(0) + '%'
+            : chalk_1.chalk.gray(`${doneIn}ms`),
+    ]
+        .filter(truthy_1.truthy)
+        .join(' ');
+};
+const makeCopyingProgress = (options, indent) => {
+    // Don't show copy progress lower than 200MB
+    if (options.bytes < 1000 * 1000 * 200) {
+        return null;
+    }
+    return [
+        indent ? log_1.INDENT_TOKEN : null,
+        '    +',
+        options.doneIn ? (0, make_progress_bar_1.makeProgressBar)(1) : (0, download_progress_1.getFileSizeDownloadBar)(options.bytes),
+        'Copying public dir',
+        options.doneIn === null ? null : chalk_1.chalk.gray(`${options.doneIn}ms`),
+    ]
+        .filter(truthy_1.truthy)
+        .join(' ');
+};
+const makeSymlinkProgress = (options, indent) => {
+    if (options.symlinks.length === 0) {
+        return null;
+    }
+    if (options.symlinks.length === 1) {
+        return [
+            chalk_1.chalk.gray(`      Found a symbolic link in the public folder:`),
+            chalk_1.chalk.gray('      ' + options.symlinks[0]),
+            chalk_1.chalk.gray('      The symlink will be forwarded in to the bundle.'),
+        ]
+            .map((l) => {
+            return indent ? `${log_1.INDENT_TOKEN} ${l}` : null;
+        })
+            .join('\n');
+    }
+    return [
+        chalk_1.chalk.gray(`      Found ${options.symlinks.length} symbolic links in the public folder.`),
+        chalk_1.chalk.gray('      The symlinks will be forwarded in to the bundle.'),
+    ]
+        .map((l) => {
+        return indent ? `${log_1.INDENT_TOKEN} ${l}` : null;
+    })
+        .join('\n');
+};
+const makeBundlingAndCopyProgress = ({ bundling, copying, symLinks, }, indent, bundlingStep, steps) => {
+    return [
+        makeBundlingProgress({
+            bundlingState: bundling,
+            indent,
+            bundlingStep,
+            steps,
+        }),
+        makeCopyingProgress(copying, indent),
+        makeSymlinkProgress(symLinks, indent),
+    ]
+        .filter(truthy_1.truthy)
+        .join('\n');
+};
+exports.makeBundlingAndCopyProgress = makeBundlingAndCopyProgress;
+const makeRenderingProgress = ({ frames, totalFrames, steps, concurrency, doneIn }, indent) => {
     const progress = frames / totalFrames;
     return [
+        indent ? log_1.INDENT_TOKEN : null,
         `(${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.chalk.gray(`${doneIn}ms`),
-    ].join(' ');
+    ]
+        .filter(truthy_1.truthy)
+        .join(' ');
 };
 exports.makeRenderingProgress = makeRenderingProgress;
-const makeStitchingProgress = ({ frames, totalFrames, steps, doneIn, stage, }) => {
+const makeStitchingProgress = ({ stitchingProgress, indent, steps, stitchingStep, }) => {
+    const { frames, totalFrames, doneIn, stage, codec } = stitchingProgress;
     const progress = frames / totalFrames;
+    const mediaType = codec === 'gif'
+        ? 'GIF'
+        : renderer_1.RenderInternals.isAudioCodec(codec)
+            ? 'audio'
+            : 'video';
     return [
-        `(${steps.indexOf('stitching') + 1}/${steps.length})`,
+        indent ? log_1.INDENT_TOKEN : null,
+        `(${stitchingStep + 1}/${steps})`,
         (0, make_progress_bar_1.makeProgressBar)(progress),
-        stage === 'muxing'
-            ? `${doneIn ? 'Muxed' : 'Muxing'} audio`
-            : `${doneIn ? 'Encoded' : 'Encoding'} video`,
+        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(' ');
+    ]
+        .filter(truthy_1.truthy)
+        .join(' ');
 };
 exports.makeStitchingProgress = makeStitchingProgress;
-const makeRenderingAndStitchingProgress = ({ rendering, stitching, downloads, }) => {
-    return [
-        (0, exports.makeRenderingProgress)(rendering),
-        (0, download_progress_1.makeMultiDownloadProgress)(downloads),
-        stitching === null ? null : (0, exports.makeStitchingProgress)(stitching),
+const makeRenderingAndStitchingProgress = ({ prog, indent, steps, stitchingStep, }) => {
+    const { rendering, stitching, downloads, bundling } = prog;
+    const output = [
+        rendering ? (0, exports.makeRenderingProgress)(rendering, indent) : null,
+        (0, download_progress_1.makeMultiDownloadProgress)(downloads, indent),
+        stitching === null
+            ? null
+            : (0, exports.makeStitchingProgress)({
+                stitchingProgress: stitching,
+                indent,
+                steps,
+                stitchingStep,
+            }),
     ]
-        .filter(remotion_1.Internals.truthy)
+        .filter(truthy_1.truthy)
         .join('\n');
+    const renderProgress = rendering
+        ? rendering.frames / rendering.totalFrames
+        : 0;
+    const stitchingProgress = stitching
+        ? stitching.frames / stitching.totalFrames
+        : 0;
+    const progress = bundling.progress * 0.3 + renderProgress * 0.6 + stitchingProgress * 0.1;
+    return { output, progress, message: (0, exports.getGuiProgressSubtitle)(prog) };
 };
 exports.makeRenderingAndStitchingProgress = makeRenderingAndStitchingProgress;
+const getGuiProgressSubtitle = (progress) => {
+    if (progress.bundling.progress < 1) {
+        return `Bundling ${Math.round(progress.bundling.progress * 100)}%`;
+    }
+    if (!progress.copyingState.doneIn) {
+        if (progress.copyingState.bytes < 100000000) {
+            return 'Bundling 100%';
+        }
+        const bytes = new Intl.NumberFormat('en', {
+            notation: 'compact',
+            style: 'unit',
+            unit: 'byte',
+            unitDisplay: 'narrow',
+        });
+        return `Copying ${bytes.format(progress.copyingState.bytes)}`;
+    }
+    if (!progress.rendering) {
+        return `Getting compositions`;
+    }
+    const allRendered = progress.rendering.frames === progress.rendering.totalFrames;
+    if (!allRendered || !progress.stitching || progress.stitching.frames === 0) {
+        return `Rendering ${progress.rendering.frames}/${progress.rendering.totalFrames}`;
+    }
+    return `Stitching ${progress.stitching.frames}/${progress.stitching.totalFrames}`;
+};
+exports.getGuiProgressSubtitle = getGuiProgressSubtitle;