@remotion/cli 4.0.0-alpha6 → 4.0.0-alpha8

package/dist/editor/state/modals.d.ts

@@ -36,6 +36,8 @@ export declare type RenderModalState = {
     minConcurrency: number;
     maxConcurrency: number;
     defaultProps: unknown;
+    inFrameMark: number | null;
+    outFrameMark: number | null;
 };
 export declare type ModalState = {
     type: 'new-comp';

package/dist/ffmpeg.js

@@ -6,7 +6,9 @@ const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const ffmpegCommand = (_root, args) => {
     const binary = renderer_1.RenderInternals.getExecutablePath('ffmpeg');
-    (0, node_fs_1.chmodSync)(binary, 0o755);
+    if (!process.env.READ_ONLY_FS) {
+        (0, node_fs_1.chmodSync)(binary, 0o755);
+    }
     const done = (0, node_child_process_1.spawnSync)(binary, args, {
         ...renderer_1.RenderInternals.dynamicLibraryPathOptions(),
         stdio: 'inherit',
@@ -16,7 +18,9 @@ const ffmpegCommand = (_root, args) => {
 exports.ffmpegCommand = ffmpegCommand;
 const ffprobeCommand = (_root, args) => {
     const binary = renderer_1.RenderInternals.getExecutablePath('ffprobe');
-    (0, node_fs_1.chmodSync)(binary, 0o755);
+    if (!process.env.READ_ONLY_FS) {
+        (0, node_fs_1.chmodSync)(binary, 0o755);
+    }
     const done = (0, node_child_process_1.spawnSync)(binary, args, {
         ...renderer_1.RenderInternals.dynamicLibraryPathOptions(),
         stdio: 'inherit',

package/dist/handle-common-errors.d.ts

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

package/dist/handle-common-errors.js

@@ -5,9 +5,9 @@ const chalk_1 = require("./chalk");
 const log_1 = require("./log");
 const print_error_1 = require("./print-error");
 const truthy_1 = require("./truthy");
-const handleCommonError = async (err) => {
+const handleCommonError = async (err, logLevel) => {
     var _a;
-    await (0, print_error_1.printError)(err);
+    await (0, print_error_1.printError)(err, logLevel);
     if (err.message.includes('Could not play video with')) {
         log_1.Log.info();
         log_1.Log.info('💡 Get help for this issue at https://remotion.dev/docs/media-playback-error');

package/dist/index.d.ts

@@ -5,6 +5,8 @@ export declare const CliInternals: {
     createOverwriteableCliOutput: (options: {
         quiet: boolean;
         cancelSignal: import("@remotion/renderer").CancelSignal | null;
+        updatesDontOverwrite: boolean;
+        indent: boolean;
     }) => import("./progress-bar").OverwriteableCliOutput;
     chalk: {
         enabled: boolean;
@@ -31,7 +33,6 @@ export declare const CliInternals: {
         yellow: (str: string) => string;
         blue: (str: string) => string;
         magenta: (str: string) => string;
-        cyan: (str: string) => string;
         white: (str: string) => string;
         gray: (str: string) => string;
         bgBlack: (str: string) => string;
@@ -40,7 +41,6 @@ export declare const CliInternals: {
         bgYellow: (str: string) => string;
         bgBlue: (str: string) => string;
         bgMagenta: (str: string) => string;
-        bgCyan: (str: string) => string;
         bgWhite: (str: string) => string;
         blackBright: (str: string) => string;
         redBright: (str: string) => string;
@@ -48,7 +48,6 @@ export declare const CliInternals: {
         yellowBright: (str: string) => string;
         blueBright: (str: string) => string;
         magentaBright: (str: string) => string;
-        cyanBright: (str: string) => string;
         whiteBright: (str: string) => string;
         bgBlackBright: (str: string) => string;
         bgRedBright: (str: string) => string;
@@ -56,7 +55,6 @@ export declare const CliInternals: {
         bgYellowBright: (str: string) => string;
         bgBlueBright: (str: string) => string;
         bgMagentaBright: (str: string) => string;
-        bgCyanBright: (str: string) => string;
         bgWhiteBright: (str: string) => string;
     };
     makeProgressBar: (percentage: number) => string;
@@ -65,6 +63,8 @@ export declare const CliInternals: {
         verboseAdvanced: (options: {
             indent: boolean;
             logLevel: "verbose" | "info" | "warn" | "error";
+        } & {
+            tag?: string | undefined;
         }, message?: any, ...optionalParams: any[]) => void;
         info: (message?: any, ...optionalParams: any[]) => void;
         infoAdvanced: (options: {
@@ -139,6 +139,7 @@ export declare const CliInternals: {
         "audio-codec": "mp3" | "aac" | "pcm-16" | "opus";
         crf: number;
         force: boolean;
+        output: string;
         overwrite: boolean;
         png: boolean;
         props: string;
@@ -171,7 +172,7 @@ export declare const CliInternals: {
     } & {
         _: string[];
     };
-    handleCommonError: (err: Error) => Promise<void>;
+    handleCommonError: (err: Error, logLevel: "verbose" | "info" | "warn" | "error") => Promise<void>;
     formatBytes: (number: number, options?: Intl.NumberFormatOptions & {
         locale: string;
         bits?: boolean | undefined;
@@ -216,4 +217,7 @@ export declare const CliInternals: {
         reason: string;
     };
     listOfRemotionPackages: string[];
+    shouldUseNonOverlayingLogger: ({ logLevel, }: {
+        logLevel: "verbose" | "info" | "warn" | "error";
+    }) => boolean;
 };

package/dist/index.js

@@ -23,8 +23,8 @@ const minimist_1 = __importDefault(require("minimist"));
 const benchmark_1 = require("./benchmark");
 const chalk_1 = require("./chalk");
 const cleanup_before_quit_1 = require("./cleanup-before-quit");
-const cloudrun_command_1 = require("./cloudrun-command");
 const compositions_1 = require("./compositions");
+const config_1 = require("./config");
 const determine_image_format_1 = require("./determine-image-format");
 const download_progress_1 = require("./download-progress");
 const entry_point_1 = require("./entry-point");
@@ -47,6 +47,7 @@ const print_help_1 = require("./print-help");
 const progress_bar_1 = require("./progress-bar");
 const render_1 = require("./render");
 const select_composition_1 = require("./select-composition");
+const should_use_non_overlaying_logger_1 = require("./should-use-non-overlaying-logger");
 const still_1 = require("./still");
 const upgrade_1 = require("./upgrade");
 const versions_1 = require("./versions");
@@ -73,9 +74,6 @@ const cli = async () => {
         else if (command === 'lambda') {
             await (0, lambda_command_1.lambdaCommand)(remotionRoot, args);
         }
-        else if (command === 'cloudrun') {
-            await (0, cloudrun_command_1.cloudrunCommand)(remotionRoot, args);
-        }
         else if (command === 'render') {
             await (0, render_1.render)(remotionRoot, args);
         }
@@ -111,7 +109,7 @@ const cli = async () => {
     }
     catch (err) {
         log_1.Log.info();
-        await (0, handle_common_errors_1.handleCommonError)(err);
+        await (0, handle_common_errors_1.handleCommonError)(err, config_1.ConfigInternals.Logging.getLogLevel());
         (0, cleanup_before_quit_1.cleanupBeforeQuit)();
         process.exit(1);
     }
@@ -144,4 +142,5 @@ exports.CliInternals = {
     printCompositions: print_compositions_1.printCompositions,
     getFinalOutputCodec: get_final_output_codec_1.getFinalOutputCodec,
     listOfRemotionPackages: list_of_remotion_packages_1.listOfRemotionPackages,
+    shouldUseNonOverlayingLogger: should_use_non_overlaying_logger_1.shouldUseNonOverlayingLogger,
 };

package/dist/log.d.ts

@@ -1,20 +1,20 @@
-import type { LogLevel } from '@remotion/renderer';
-export declare const INDENT_TOKEN: string;
 export declare const Log: {
     verbose: (message?: any, ...optionalParams: any[]) => void;
     verboseAdvanced: (options: {
         indent: boolean;
-        logLevel: LogLevel;
+        logLevel: "verbose" | "info" | "warn" | "error";
+    } & {
+        tag?: string | undefined;
     }, message?: any, ...optionalParams: any[]) => void;
     info: (message?: any, ...optionalParams: any[]) => void;
     infoAdvanced: (options: {
         indent: boolean;
-        logLevel: LogLevel;
+        logLevel: "verbose" | "info" | "warn" | "error";
     }, message?: any, ...optionalParams: any[]) => void;
     warn: (message?: any, ...optionalParams: any[]) => void;
     warnAdvanced: (options: {
         indent: boolean;
-        logLevel: LogLevel;
+        logLevel: "verbose" | "info" | "warn" | "error";
     }, message?: any, ...optionalParams: any[]) => void;
     error: (message?: any, ...optionalParams: any[]) => void;
 };

package/dist/log.js

@@ -1,45 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Log = exports.INDENT_TOKEN = void 0;
+exports.Log = void 0;
+/* eslint-disable no-console */
 const renderer_1 = require("@remotion/renderer");
-const chalk_1 = require("./chalk");
-const config_1 = require("./config");
-const truthy_1 = require("./truthy");
-exports.INDENT_TOKEN = chalk_1.chalk.gray('│');
-exports.Log = {
-    verbose: (...args) => {
-        exports.Log.verboseAdvanced({ indent: false, logLevel: config_1.ConfigInternals.Logging.getLogLevel() }, ...args);
-    },
-    verboseAdvanced: (options, ...args) => {
-        if (renderer_1.RenderInternals.isEqualOrBelowLogLevel(options.logLevel, 'verbose')) {
-            return console.log(...[
-                options.indent ? exports.INDENT_TOKEN : null,
-                ...args.map((a) => chalk_1.chalk.blueBright(a)),
-            ].filter(truthy_1.truthy));
-        }
-    },
-    info: (...args) => {
-        exports.Log.infoAdvanced({ indent: false, logLevel: config_1.ConfigInternals.Logging.getLogLevel() }, ...args);
-    },
-    infoAdvanced: (options, ...args) => {
-        if (renderer_1.RenderInternals.isEqualOrBelowLogLevel(options.logLevel, 'info')) {
-            return console.log(...[options.indent ? exports.INDENT_TOKEN : null, ...args].filter(truthy_1.truthy));
-        }
-    },
-    warn: (...args) => {
-        exports.Log.warnAdvanced({ indent: false, logLevel: config_1.ConfigInternals.Logging.getLogLevel() }, ...args);
-    },
-    warnAdvanced: (options, ...args) => {
-        if (renderer_1.RenderInternals.isEqualOrBelowLogLevel(options.logLevel, 'warn')) {
-            return console.warn(...[
-                options.indent ? chalk_1.chalk.yellow(exports.INDENT_TOKEN) : null,
-                ...args.map((a) => chalk_1.chalk.yellow(a)),
-            ].filter(truthy_1.truthy));
-        }
-    },
-    error: (...args) => {
-        if (renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'error')) {
-            return console.error(...args.map((a) => chalk_1.chalk.red(a)));
-        }
-    },
-};
+exports.Log = renderer_1.RenderInternals.Log;

package/dist/parse-command-line.d.ts

@@ -21,6 +21,7 @@ declare type CommandLineOptions = {
     ['audio-codec']: AudioCodec;
     crf: number;
     force: boolean;
+    output: string;
     overwrite: boolean;
     png: boolean;
     props: string;

package/dist/preview-server/dev-middleware/setup-hooks.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupHooks = void 0;
+const renderer_1 = require("@remotion/renderer");
 const log_1 = require("../../log");
 const truthy_1 = require("../../truthy");
-const is_color_supported_1 = require("./is-color-supported");
 function setupHooks(context) {
     function invalid() {
         // We are now in invalid state
@@ -23,7 +23,7 @@ function setupHooks(context) {
             logger.log('Compilation finished');
             const statsOptions = {
                 preset: 'errors-warnings',
-                colors: is_color_supported_1.isColorSupported,
+                colors: renderer_1.RenderInternals.isColorSupported,
             };
             const printedStats = stats.toString(statsOptions);
             const lines = printedStats

package/dist/preview-server/render-queue/job.d.ts

@@ -1,4 +1,5 @@
 import type { AudioCodec, Codec, makeCancelSignal, PixelFormat, ProResProfile, StillImageFormat, VideoImageFormat } from '@remotion/renderer';
+import type { EnumPath } from '../../editor/components/RenderModal/SchemaEditor/extract-enum-json-paths';
 import type { AggregateRenderProgress } from '../../progress-types';
 import type { RequiredChromiumOptions } from '../../required-chromium-options';
 declare type BaseRenderProgress = {
@@ -125,6 +126,7 @@ export declare type UnsubscribeFromFileExistenceRequest = {
 export declare type UpdateDefaultPropsRequest = {
     compositionId: string;
     defaultProps: string;
+    enumPaths: EnumPath[];
 };
 export declare type CanUpdateDefaultPropsRequest = {
     compositionId: string;

package/dist/preview-server/render-queue/make-retry-payload.js

@@ -45,6 +45,8 @@ const makeRetryPayload = (job) => {
             initialHeadless: job.chromiumOptions.headless,
             initialIgnoreCertificateErrors: job.chromiumOptions.ignoreCertificateErrors,
             defaultProps: job.inputProps,
+            inFrameMark: null,
+            outFrameMark: null,
         };
     }
     if (job.type === 'video') {
@@ -84,6 +86,8 @@ const makeRetryPayload = (job) => {
             initialHeadless: job.chromiumOptions.headless,
             initialIgnoreCertificateErrors: job.chromiumOptions.ignoreCertificateErrors,
             defaultProps: job.inputProps,
+            inFrameMark: job.startFrame,
+            outFrameMark: job.endFrame,
         };
     }
     throw new Error(`Job ${JSON.stringify(job)} Not implemented`);

package/dist/preview-server/render-queue/queue.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cancelJob = exports.removeJob = exports.addJob = exports.getRenderQueue = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const chalk_1 = require("../../chalk");
+const config_1 = require("../../config");
 const file_watcher_1 = require("../../file-watcher");
 const handle_common_errors_1 = require("../../handle-common-errors");
 const log_1 = require("../../log");
@@ -196,7 +197,7 @@ const processJobIfPossible = async ({ remotionRoot, entryPoint, }) => {
                 },
             };
         });
-        await (0, handle_common_errors_1.handleCommonError)(err);
+        await (0, handle_common_errors_1.handleCommonError)(err, config_1.ConfigInternals.Logging.getLogLevel());
         (0, live_events_1.waitForLiveEventsListener)().then((listener) => {
             listener.sendEventToClient({
                 type: 'render-job-failed',

package/dist/preview-server/routes/can-update-default-props.js

@@ -24,6 +24,7 @@ const canUpdateDefaultPropsHandler = async ({ input: { compositionId }, remotion
             compositionId,
             input: (0, node_fs_1.readFileSync)(projectInfo.videoFile, 'utf-8'),
             newDefaultProps: {},
+            enumPaths: [],
         });
         return {
             canUpdate: true,

package/dist/preview-server/routes/update-default-props.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDefaultPropsHandler = void 0;
 const node_fs_1 = require("node:fs");
 const update_default_props_1 = require("../../codemods/update-default-props");
-const date_serialization_1 = require("../../editor/components/RenderModal/SchemaEditor/date-serialization");
+const input_props_serialization_1 = require("../../editor/components/RenderModal/SchemaEditor/input-props-serialization");
 const project_info_1 = require("../project-info");
 const can_update_default_props_1 = require("./can-update-default-props");
-const updateDefaultPropsHandler = async ({ input: { compositionId, defaultProps }, remotionRoot }) => {
+const updateDefaultPropsHandler = async ({ input: { compositionId, defaultProps, enumPaths }, remotionRoot }) => {
     const projectInfo = await (0, project_info_1.getProjectInfo)(remotionRoot);
     // TODO: What happens if this error is thrown? Handle in frontend
     if (!projectInfo.videoFile) {
@@ -17,7 +17,8 @@ const updateDefaultPropsHandler = async ({ input: { compositionId, defaultProps
     const updated = await (0, update_default_props_1.updateDefaultProps)({
         compositionId,
         input: (0, node_fs_1.readFileSync)(projectInfo.videoFile, 'utf-8'),
-        newDefaultProps: (0, date_serialization_1.deserializeJSONWithDate)(defaultProps),
+        newDefaultProps: (0, input_props_serialization_1.deserializeJSONWithCustomFields)(defaultProps),
+        enumPaths,
     });
     (0, node_fs_1.writeFileSync)(projectInfo.videoFile, updated);
 };

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,25 +6,28 @@ 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)({
             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));
+        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);
         }

package/dist/progress-bar.d.ts

@@ -1,11 +1,13 @@
 import type { CancelSignal } from '@remotion/renderer';
 import type { AggregateRenderProgress } from './progress-types';
 export declare type OverwriteableCliOutput = {
-    update: (up: string) => boolean;
+    update: (up: string, newline: boolean) => boolean;
 };
 export declare const createOverwriteableCliOutput: (options: {
     quiet: boolean;
     cancelSignal: CancelSignal | null;
+    updatesDontOverwrite: boolean;
+    indent: boolean;
 }) => OverwriteableCliOutput;
 export declare type CopyingState = {
     bytes: number;
@@ -22,10 +24,9 @@ export declare const makeBundlingAndCopyProgress: ({ bundling, copying, symLinks
     bundling: BundlingState;
     copying: CopyingState;
     symLinks: SymbolicLinksState;
-}, indent: boolean, bundlingStep: number, steps: number) => string;
-export declare const makeRenderingAndStitchingProgress: ({ prog, indent, steps, stitchingStep, }: {
+}, bundlingStep: number, steps: number) => string;
+export declare const makeRenderingAndStitchingProgress: ({ prog, steps, stitchingStep, }: {
     prog: AggregateRenderProgress;
-    indent: boolean;
     steps: number;
     stitchingStep: number;
 }) => {

package/dist/progress-bar.js

@@ -5,7 +5,6 @@ const renderer_1 = require("@remotion/renderer");
 const ansi_diff_1 = require("./ansi/ansi-diff");
 const chalk_1 = require("./chalk");
 const download_progress_1 = require("./download-progress");
-const log_1 = require("./log");
 const make_progress_bar_1 = require("./make-progress-bar");
 const truthy_1 = require("./truthy");
 const createOverwriteableCliOutput = (options) => {
@@ -15,19 +14,46 @@ const createOverwriteableCliOutput = (options) => {
             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 = ({ bundlingState, indent, bundlingStep, steps, }) => {
+const makeBundlingProgress = ({ bundlingState, 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`,
@@ -38,13 +64,12 @@ const makeBundlingProgress = ({ bundlingState, indent, bundlingStep, steps, }) =
         .filter(truthy_1.truthy)
         .join(' ');
 };
-const makeCopyingProgress = (options, indent) => {
+const makeCopyingProgress = (options) => {
     // 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',
@@ -53,7 +78,7 @@ const makeCopyingProgress = (options, indent) => {
         .filter(truthy_1.truthy)
         .join(' ');
 };
-const makeSymlinkProgress = (options, indent) => {
+const makeSymlinkProgress = (options) => {
     if (options.symlinks.length === 0) {
         return null;
     }
@@ -62,40 +87,30 @@ const makeSymlinkProgress = (options, indent) => {
             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');
+        ].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');
+    ].join('\n');
 };
-const makeBundlingAndCopyProgress = ({ bundling, copying, symLinks, }, indent, bundlingStep, steps) => {
+const makeBundlingAndCopyProgress = ({ bundling, copying, symLinks, }, bundlingStep, steps) => {
     return [
         makeBundlingProgress({
             bundlingState: bundling,
-            indent,
             bundlingStep,
             steps,
         }),
-        makeCopyingProgress(copying, indent),
-        makeSymlinkProgress(symLinks, indent),
+        makeCopyingProgress(copying),
+        makeSymlinkProgress(symLinks),
     ]
         .filter(truthy_1.truthy)
         .join('\n');
 };
 exports.makeBundlingAndCopyProgress = makeBundlingAndCopyProgress;
-const makeRenderingProgress = ({ frames, totalFrames, steps, concurrency, doneIn }, indent) => {
+const makeRenderingProgress = ({ frames, totalFrames, steps, concurrency, doneIn, }) => {
     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)`]
@@ -106,7 +121,7 @@ const makeRenderingProgress = ({ frames, totalFrames, steps, concurrency, doneIn
         .filter(truthy_1.truthy)
         .join(' ');
 };
-const makeStitchingProgress = ({ stitchingProgress, indent, steps, stitchingStep, }) => {
+const makeStitchingProgress = ({ stitchingProgress, steps, stitchingStep, }) => {
     const { frames, totalFrames, doneIn, stage, codec } = stitchingProgress;
     const progress = frames / totalFrames;
     const mediaType = codec === 'gif'
@@ -115,7 +130,6 @@ const makeStitchingProgress = ({ stitchingProgress, indent, steps, stitchingStep
             ? 'audio'
             : 'video';
     return [
-        indent ? log_1.INDENT_TOKEN : null,
         `(${stitchingStep + 1}/${steps})`,
         (0, make_progress_bar_1.makeProgressBar)(progress),
         stage === 'muxing' && renderer_1.RenderInternals.canUseParallelEncoding(codec)
@@ -126,16 +140,15 @@ const makeStitchingProgress = ({ stitchingProgress, indent, steps, stitchingStep
         .filter(truthy_1.truthy)
         .join(' ');
 };
-const makeRenderingAndStitchingProgress = ({ prog, indent, steps, stitchingStep, }) => {
+const makeRenderingAndStitchingProgress = ({ prog, steps, stitchingStep, }) => {
     const { rendering, stitching, downloads, bundling } = prog;
     const output = [
-        rendering ? makeRenderingProgress(rendering, indent) : null,
-        (0, download_progress_1.makeMultiDownloadProgress)(downloads, indent),
+        rendering ? makeRenderingProgress(rendering) : null,
+        (0, download_progress_1.makeMultiDownloadProgress)(downloads),
         stitching === null
             ? null
             : makeStitchingProgress({
                 stitchingProgress: stitching,
-                indent,
                 steps,
                 stitchingStep,
             }),