@remotion/cli 4.0.0-webhook.27 → 4.1.0-alpha2

package/dist/preview-server/start-server.js

@@ -6,42 +6,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.startServer = void 0;
 const bundler_1 = require("@remotion/bundler");
 const renderer_1 = require("@remotion/renderer");
-const crypto_1 = __importDefault(require("crypto"));
-const fs_1 = __importDefault(require("fs"));
-const http_1 = __importDefault(require("http"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
+const node_http_1 = __importDefault(require("node:http"));
 const config_1 = require("../config");
+const MaxTimelineTracks_1 = require("../editor/components/Timeline/MaxTimelineTracks");
 const log_1 = require("../log");
 const dev_middleware_1 = require("./dev-middleware");
 const hot_middleware_1 = require("./hot-middleware");
 const live_events_1 = require("./live-events");
 const routes_1 = require("./routes");
-const startServer = async (entry, userDefinedComponent, options) => {
-    var _a, _b, _c, _d;
-    const tmpDir = await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-graphics'));
+const startServer = async (options) => {
+    var _a, _b, _c;
     const [, config] = bundler_1.BundlerInternals.webpackConfig({
-        entry,
-        userDefinedComponent,
-        outDir: tmpDir,
+        entry: options.entry,
+        userDefinedComponent: options.userDefinedComponent,
+        outDir: null,
         environment: 'development',
         webpackOverride: (_a = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _a !== void 0 ? _a : config_1.ConfigInternals.getWebpackOverrideFn(),
-        envVariables: (_b = options === null || options === void 0 ? void 0 : options.getEnvVariables()) !== null && _b !== void 0 ? _b : {},
-        maxTimelineTracks: (_c = options === null || options === void 0 ? void 0 : options.maxTimelineTracks) !== null && _c !== void 0 ? _c : 15,
+        maxTimelineTracks: (_b = options === null || options === void 0 ? void 0 : options.maxTimelineTracks) !== null && _b !== void 0 ? _b : MaxTimelineTracks_1.DEFAULT_TIMELINE_TRACKS,
         entryPoints: [
             require.resolve('./hot-middleware/client'),
             require.resolve('./error-overlay/entry-basic.js'),
         ],
         remotionRoot: options.remotionRoot,
         keyboardShortcutsEnabled: options.keyboardShortcutsEnabled,
+        poll: options.poll,
     });
     const compiler = (0, bundler_1.webpack)(config);
-    const hashPrefix = '/static-';
-    const hash = `${hashPrefix}${crypto_1.default.randomBytes(6).toString('hex')}`;
     const wdmMiddleware = (0, dev_middleware_1.wdm)(compiler);
     const whm = (0, hot_middleware_1.webpackHotMiddleware)(compiler);
     const liveEventsServer = (0, live_events_1.makeLiveEventsRouter)();
-    const server = http_1.default.createServer((request, response) => {
+    const server = node_http_1.default.createServer((request, response) => {
         new Promise((resolve) => {
             wdmMiddleware(request, response, () => {
                 resolve();
@@ -55,30 +49,65 @@ const startServer = async (entry, userDefinedComponent, options) => {
             });
         })
             .then(() => {
-            return (0, routes_1.handleRoutes)({
-                hash,
-                hashPrefix,
+            (0, routes_1.handleRoutes)({
+                hash: options.hash,
+                hashPrefix: options.hashPrefix,
                 request,
                 response,
                 liveEventsServer,
                 getCurrentInputProps: options.getCurrentInputProps,
                 getEnvVariables: options.getEnvVariables,
                 remotionRoot: options.remotionRoot,
-                userPassedPublicDir: options.userPassedPublicDir,
+                entryPoint: options.userDefinedComponent,
+                publicDir: options.publicDir,
             });
         })
             .catch((err) => {
-            response.setHeader('content-type', 'application/json');
-            response.writeHead(500);
             log_1.Log.error(`Error while calling ${request.url}`, err);
-            response.end(JSON.stringify({
-                err: err.message,
-            }));
+            if (!response.headersSent) {
+                response.setHeader('content-type', 'application/json');
+                response.writeHead(500);
+            }
+            if (!response.writableEnded) {
+                response.end(JSON.stringify({
+                    err: err.message,
+                }));
+            }
         });
     });
-    const desiredPort = (_d = options === null || options === void 0 ? void 0 : options.port) !== null && _d !== void 0 ? _d : undefined;
-    const port = await renderer_1.RenderInternals.getDesiredPort(desiredPort, 3000, 3100);
-    server.listen(port);
-    return { port, liveEventsServer };
+    const desiredPort = (_c = options === null || options === void 0 ? void 0 : options.port) !== null && _c !== void 0 ? _c : undefined;
+    const maxTries = 5;
+    for (let i = 0; i < maxTries; i++) {
+        try {
+            const selectedPort = await new Promise((resolve, reject) => {
+                renderer_1.RenderInternals.getDesiredPort(desiredPort, 3000, 3100)
+                    .then(({ port, didUsePort }) => {
+                    server.listen(port);
+                    server.on('listening', () => {
+                        resolve(port);
+                        return didUsePort();
+                    });
+                    server.on('error', (err) => {
+                        reject(err);
+                    });
+                })
+                    .catch((err) => reject(err));
+            });
+            return { port: selectedPort, liveEventsServer };
+        }
+        catch (err) {
+            if (!(err instanceof Error)) {
+                throw err;
+            }
+            const codedError = err;
+            if (codedError.code === 'EADDRINUSE') {
+                log_1.Log.error(`Port ${codedError.port} is already in use. Trying another port...`);
+            }
+            else {
+                throw err;
+            }
+        }
+    }
+    throw new Error(`Tried ${maxTries} times to find a free port. Giving up.`);
 };
 exports.startServer = startServer;

package/dist/preview-server/update-available.d.ts

@@ -1,11 +1,3 @@
-import type { PackageManager } from './get-package-manager';
-declare type Info = {
-    currentVersion: string;
-    latestVersion: string;
-    updateAvailable: boolean;
-    timedOut: boolean;
-    packageManager: PackageManager | 'unknown';
-};
+import type { UpdateAvailableResponse } from './render-queue/job';
 export declare const getRemotionVersion: () => any;
-export declare const isUpdateAvailableWithTimeout: (remotionRoot: string) => Promise<Info>;
-export {};
+export declare const isUpdateAvailableWithTimeout: (remotionRoot: string) => Promise<UpdateAvailableResponse>;

package/dist/preview-server/update-available.js

@@ -9,7 +9,7 @@ const get_latest_remotion_version_1 = require("../get-latest-remotion-version");
 const get_package_manager_1 = require("./get-package-manager");
 const isUpdateAvailable = async ({ remotionRoot, currentVersion, }) => {
     const latest = await (0, get_latest_remotion_version_1.getLatestRemotionVersion)();
-    const pkgManager = (0, get_package_manager_1.getPackageManager)(remotionRoot);
+    const pkgManager = (0, get_package_manager_1.getPackageManager)(remotionRoot, undefined);
     return {
         updateAvailable: semver_1.default.lt(currentVersion, latest),
         currentVersion,
@@ -28,7 +28,7 @@ exports.getRemotionVersion = getRemotionVersion;
 const isUpdateAvailableWithTimeout = (remotionRoot) => {
     const version = (0, exports.getRemotionVersion)();
     const threeSecTimeout = new Promise((resolve) => {
-        const pkgManager = (0, get_package_manager_1.getPackageManager)(remotionRoot);
+        const pkgManager = (0, get_package_manager_1.getPackageManager)(remotionRoot, undefined);
         setTimeout(() => {
             resolve({
                 currentVersion: version,

package/dist/previewEntry.js

@@ -4,8 +4,8 @@ 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"));
-// eslint-disable-next-line no-restricted-imports
 const remotion_1 = require("remotion");
 require("../styles/styles.css");
 const Editor_1 = require("./editor/components/Editor");
@@ -16,13 +16,11 @@ remotion_1.Internals.CSSUtils.injectCSS(remotion_1.Internals.CSSUtils.makeDefaul
 const getServerDisconnectedDomElement = () => {
     return document.getElementById('server-disconnected-overlay');
 };
-const content = ((0, jsx_runtime_1.jsx)(remotion_1.Internals.RemotionRoot, { children: (0, jsx_runtime_1.jsx)(EditorContexts_1.EditorContexts, { children: (0, jsx_runtime_1.jsx)(Editor_1.Editor, {}) }) }));
+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);
-    client_1.default.createRoot(getServerDisconnectedDomElement()).render((0, jsx_runtime_1.jsx)(ServerDisconnected_1.ServerDisconnected, {}));
 }
 else {
     client_1.default.render(content, remotion_1.Internals.getPreviewDomElement());
-    client_1.default.render((0, jsx_runtime_1.jsx)(ServerDisconnected_1.ServerDisconnected, {}), getServerDisconnectedDomElement());
 }
 (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.d.ts

@@ -1 +1,2 @@
-export declare const printError: (err: Error) => Promise<void>;
+import type { LogLevel } from '@remotion/renderer';
+export declare const printError: (err: Error, logLevel: LogLevel) => Promise<void>;

package/dist/print-error.js

@@ -6,28 +6,33 @@ const chalk_1 = require("./chalk");
 const code_frame_1 = require("./code-frame");
 const log_1 = require("./log");
 const progress_bar_1 = require("./progress-bar");
-const printError = async (err) => {
+const should_use_non_overlaying_logger_1 = require("./should-use-non-overlaying-logger");
+const printError = async (err, logLevel) => {
     if (err instanceof renderer_1.RenderInternals.SymbolicateableError) {
-        const output = (0, progress_bar_1.createOverwriteableCliOutput)(false);
-        output.update(chalk_1.chalk.red('Symbolicating minified error message...\n' + err.message));
+        const output = (0, progress_bar_1.createOverwriteableCliOutput)({
+            quiet: false,
+            cancelSignal: null,
+            updatesDontOverwrite: (0, should_use_non_overlaying_logger_1.shouldUseNonOverlayingLogger)({ logLevel }),
+            indent: false,
+        });
+        output.update(chalk_1.chalk.red('Symbolicating minified error message...\n' + err.message), false);
         try {
             const symbolicated = await renderer_1.RenderInternals.symbolicateError(err);
             if (symbolicated.frame === null) {
-                output.update(chalk_1.chalk.red('An error occurred:\n'));
+                output.update(chalk_1.chalk.red('An error occurred:'), true);
             }
             else {
-                output.update(chalk_1.chalk.red(`An error occurred while rendering frame ${err.frame}:\n`));
+                output.update(chalk_1.chalk.red(`An error occurred while rendering frame ${err.frame}:`), true);
             }
             (0, code_frame_1.printCodeFrameAndStack)(symbolicated);
         }
         catch (e) {
-            output.update(chalk_1.chalk.red('(Error occurred symbolicating stack trace - printing minified stack trace)\n'));
+            output.update(chalk_1.chalk.red('(Error occurred symbolicating stack trace - printing minified stack trace)'), true);
             log_1.Log.error();
             log_1.Log.error(err.stack || err);
         }
         return;
     }
-    log_1.Log.error('An error occurred:');
     log_1.Log.error(err.stack || err);
 };
 exports.printError = printError;

package/dist/print-help.js

@@ -15,8 +15,8 @@ const printHelp = () => {
     log_1.Log.info();
     log_1.Log.info('Available commands:');
     log_1.Log.info('');
-    log_1.Log.info('remotion preview <entry-point.ts>');
-    log_1.Log.info(chalk_1.chalk.gray('Start the preview server.'));
+    log_1.Log.info('remotion studio <entry-point.ts>');
+    log_1.Log.info(chalk_1.chalk.gray('Start the Remotion studio.'));
     printFlags([['--props', 'Pass input props as filename or as JSON']]);
     log_1.Log.info();
     log_1.Log.info('remotion render <entry-point.ts> <comp-id> <output-file.mp4>');
@@ -24,13 +24,15 @@ const printHelp = () => {
     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'],
+        ['--jpeg-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'],
@@ -44,10 +46,10 @@ const printHelp = () => {
     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'],
+        ['--jpeg-quality', 'Quality for rendered frames, JPEG only, 0-100'],
         ['--overwrite', 'Overwrite if file exists, default true'],
         ['--browser-executable', 'Custom path for browser executable'],
         ['--bundle-cache', 'Cache webpack bundle, boolean, default true'],
@@ -67,6 +69,12 @@ const printHelp = () => {
     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,43 +1,36 @@
-import type { Codec, StitchingState } from '@remotion/renderer';
-import type { RenderStep } from './step';
-export declare const createProgressBar: (quiet: boolean) => {
-    update: (str: string) => boolean;
+import type { CancelSignal } from '@remotion/renderer';
+import type { AggregateRenderProgress } from './progress-types';
+export type OverwriteableCliOutput = {
+    update: (up: string, newline: boolean) => boolean;
 };
-export declare const createOverwriteableCliOutput: (quiet: boolean) => {
-    update: (up: string) => boolean;
+export declare const createOverwriteableCliOutput: (options: {
+    quiet: boolean;
+    cancelSignal: CancelSignal | null;
+    updatesDontOverwrite: boolean;
+    indent: boolean;
+}) => OverwriteableCliOutput;
+export type CopyingState = {
+    bytes: number;
+    doneIn: number | null;
 };
-export declare const makeBundlingProgress: ({ progress, steps, doneIn, }: {
+export type BundlingState = {
     progress: number;
-    steps: RenderStep[];
-    doneIn: number | null;
-}) => string;
-declare type RenderingProgressInput = {
-    frames: number;
-    totalFrames: number;
-    steps: RenderStep[];
-    concurrency: number;
     doneIn: number | null;
 };
-export declare const makeRenderingProgress: ({ frames, totalFrames, steps, concurrency, doneIn, }: RenderingProgressInput) => string;
-declare type StitchingProgressInput = {
-    frames: number;
-    totalFrames: number;
-    steps: RenderStep[];
-    doneIn: number | null;
-    stage: StitchingState;
-    codec: Codec;
+export type SymbolicLinksState = {
+    symlinks: string[];
 };
-export declare const makeStitchingProgress: ({ frames, totalFrames, steps, doneIn, stage, codec, }: StitchingProgressInput) => string;
-export declare type DownloadProgress = {
-    name: string;
-    id: number;
-    progress: number | null;
-    totalBytes: number | null;
-    downloaded: number;
+export declare const makeBundlingAndCopyProgress: ({ bundling, copying, symLinks, }: {
+    bundling: BundlingState;
+    copying: CopyingState;
+    symLinks: SymbolicLinksState;
+}, bundlingStep: number, steps: number) => string;
+export declare const makeRenderingAndStitchingProgress: ({ prog, steps, stitchingStep, }: {
+    prog: AggregateRenderProgress;
+    steps: number;
+    stitchingStep: number;
+}) => {
+    output: string;
+    progress: number;
+    message: string;
 };
-export declare const makeRenderingAndStitchingProgress: ({ rendering, stitching, downloads, }: {
-    rendering: RenderingProgressInput;
-    stitching: StitchingProgressInput | null;
-    downloads: DownloadProgress[];
-}) => string;
-export {};

package/dist/progress-bar.js

@@ -1,43 +1,113 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeRenderingAndStitchingProgress = exports.makeStitchingProgress = exports.makeRenderingProgress = exports.makeBundlingProgress = exports.createOverwriteableCliOutput = exports.createProgressBar = void 0;
+exports.makeRenderingAndStitchingProgress = exports.makeBundlingAndCopyProgress = exports.createOverwriteableCliOutput = 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 make_progress_bar_1 = require("./make-progress-bar");
 const truthy_1 = require("./truthy");
-const createProgressBar = (quiet) => {
-    if (!renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'info')) {
-        return { update: () => false };
-    }
-    return (0, exports.createOverwriteableCliOutput)(quiet);
-};
-exports.createProgressBar = createProgressBar;
-const createOverwriteableCliOutput = (quiet) => {
-    if (quiet) {
+const createOverwriteableCliOutput = (options) => {
+    var _a;
+    if (options.quiet) {
         return {
             update: () => false,
         };
     }
+    if (options.updatesDontOverwrite) {
+        return {
+            update: (up) => {
+                if (options.indent) {
+                    process.stdout.write(up
+                        .split('\n')
+                        .filter((a) => a.trim())
+                        .map((l) => {
+                        return `${renderer_1.RenderInternals.INDENT_TOKEN} ${l}`;
+                    })
+                        .join('\n'));
+                }
+                else {
+                    process.stdout.write(up + '\n');
+                }
+                return true;
+            },
+        };
+    }
     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)),
+        update: (up, newline) => {
+            if (options.indent) {
+                return process.stdout.write(diff.update(up
+                    .split('\n')
+                    .filter((a) => a.trim())
+                    .map((l) => `${renderer_1.RenderInternals.INDENT_TOKEN} ${l}`)
+                    .join('\n') + (newline ? '\n' : '')));
+            }
+            return process.stdout.write(diff.update(up + (newline ? '\n' : '')));
+        },
     };
 };
 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`),
-]
-    .filter(truthy_1.truthy)
-    .join(' ');
-exports.makeBundlingProgress = makeBundlingProgress;
+const makeBundlingProgress = ({ bundlingState, bundlingStep, steps, }) => {
+    const { doneIn, progress } = bundlingState;
+    return [
+        `(${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) => {
+    // Don't show copy progress lower than 200MB
+    if (options.bytes < 1000 * 1000 * 200) {
+        return null;
+    }
+    return [
+        '    +',
+        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) => {
+    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.'),
+        ].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.'),
+    ].join('\n');
+};
+const makeBundlingAndCopyProgress = ({ bundling, copying, symLinks, }, bundlingStep, steps) => {
+    return [
+        makeBundlingProgress({
+            bundlingState: bundling,
+            bundlingStep,
+            steps,
+        }),
+        makeCopyingProgress(copying),
+        makeSymlinkProgress(symLinks),
+    ]
+        .filter(truthy_1.truthy)
+        .join('\n');
+};
+exports.makeBundlingAndCopyProgress = makeBundlingAndCopyProgress;
 const makeRenderingProgress = ({ frames, totalFrames, steps, concurrency, doneIn, }) => {
     const progress = frames / totalFrames;
     return [
@@ -47,10 +117,12 @@ const makeRenderingProgress = ({ frames, totalFrames, steps, concurrency, doneIn
             .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, codec, }) => {
+const makeStitchingProgress = ({ stitchingProgress, steps, stitchingStep, }) => {
+    const { frames, totalFrames, doneIn, stage, codec } = stitchingProgress;
     const progress = frames / totalFrames;
     const mediaType = codec === 'gif'
         ? 'GIF'
@@ -58,22 +130,64 @@ const makeStitchingProgress = ({ frames, totalFrames, steps, doneIn, stage, code
             ? 'audio'
             : 'video';
     return [
-        `(${steps.indexOf('stitching') + 1}/${steps.length})`,
+        `(${stitchingStep + 1}/${steps})`,
         (0, make_progress_bar_1.makeProgressBar)(progress),
         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),
+const makeRenderingAndStitchingProgress = ({ prog, steps, stitchingStep, }) => {
+    const { rendering, stitching, downloads, bundling } = prog;
+    const output = [
+        rendering ? makeRenderingProgress(rendering) : null,
         (0, download_progress_1.makeMultiDownloadProgress)(downloads),
-        stitching === null ? null : (0, exports.makeStitchingProgress)(stitching),
+        stitching === null
+            ? null
+            : makeStitchingProgress({
+                stitchingProgress: stitching,
+                steps,
+                stitchingStep,
+            }),
     ]
         .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: getGuiProgressSubtitle(prog) };
 };
 exports.makeRenderingAndStitchingProgress = makeRenderingAndStitchingProgress;
+const getGuiProgressSubtitle = (progress) => {
+    // Handle floating point inaccuracies
+    if (progress.bundling.progress < 0.99999) {
+        return `Bundling ${Math.round(progress.bundling.progress * 100)}%`;
+    }
+    if (progress.copyingState.doneIn === null) {
+        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}`;
+};