@remotion/cli 4.0.0-alpha6 → 4.0.0-alpha7

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,
             }),

package/dist/render-flows/render.js

@@ -1,11 +1,34 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderVideoFlow = void 0;
 const renderer_1 = require("@remotion/renderer");
-const node_fs_1 = __importDefault(require("node:fs"));
+const node_fs_1 = __importStar(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 const chalk_1 = require("../chalk");
@@ -19,6 +42,7 @@ 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 should_use_non_overlaying_logger_1 = require("../should-use-non-overlaying-logger");
 const truthy_1 = require("../truthy");
 const user_passed_output_location_1 = require("../user-passed-output-location");
 const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel, browserExecutable, browser, chromiumOptions, scale, shouldOutputImageSequence, publicDir, inputProps, envVariables, puppeteerTimeout, port, height, width, remainingArgs, compositionIdFromUi, entryPointReason, overwrite, quiet, concurrency, frameRange, everyNthFrame, outputLocationFromUI, jpegQuality, onProgress, addCleanupCallback, cancelSignal, crf, uiCodec, uiImageFormat, ffmpegOverride, audioBitrate, muted, enforceAudioTrack, proResProfile, pixelFormat, videoBitrate, numberOfGifLoops, audioCodec, disallowParallelEncoding, }) => {
@@ -33,11 +57,14 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
         shouldDumpIo: renderer_1.RenderInternals.isEqualOrBelowLogLevel(logLevel, 'verbose'),
         chromiumOptions,
         forceDeviceScaleFactor: scale,
-        indentationString: indent ? log_1.INDENT_TOKEN + ' ' : '',
+        indent,
     });
+    const updatesDontOverwrite = (0, should_use_non_overlaying_logger_1.shouldUseNonOverlayingLogger)({ logLevel });
     const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)({
         quiet,
         cancelSignal,
+        updatesDontOverwrite,
+        indent,
     });
     const steps = [
         renderer_1.RenderInternals.isServeUrl(fullEntryPoint) ? null : 'bundling',
@@ -54,7 +81,7 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
         bytes: 0,
         doneIn: null,
     };
-    const updateRenderProgress = () => {
+    const updateRenderProgress = (newline) => {
         const aggregateRenderProgress = {
             rendering: renderingProgress,
             stitching: shouldOutputImageSequence ? null : stitchingProgress,
@@ -64,12 +91,11 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
         };
         const { output, message, progress } = (0, progress_bar_1.makeRenderingAndStitchingProgress)({
             prog: aggregateRenderProgress,
-            indent,
             steps: steps.length,
-            stitchingStep: steps.indexOf('bundling'),
+            stitchingStep: steps.indexOf('stitching'),
         });
         onProgress({ message, value: progress, ...aggregateRenderProgress });
-        return renderProgress.update(output);
+        return renderProgress.update(updatesDontOverwrite ? message : output, newline);
     };
     const { urlOrBundle, cleanup: cleanupBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({
         fullPath: fullEntryPoint,
@@ -78,7 +104,7 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
         onProgress: ({ bundling, copying }) => {
             bundlingProgress = bundling;
             copyingState = copying;
-            updateRenderProgress();
+            updateRenderProgress(false);
         },
         indentOutput: indent,
         logLevel,
@@ -87,6 +113,7 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
         onDirectoryCreated: (dir) => {
             addCleanupCallback(() => renderer_1.RenderInternals.deleteDirectory(dir));
         },
+        quietProgress: updatesDontOverwrite,
     });
     addCleanupCallback(() => cleanupBundle());
     const onDownload = (src) => {
@@ -99,12 +126,12 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
             totalBytes: null,
         };
         downloads.push(download);
-        updateRenderProgress();
+        updateRenderProgress(false);
         return ({ percent, downloaded, totalSize }) => {
             download.progress = percent;
             download.totalBytes = totalSize;
             download.downloaded = downloaded;
-            updateRenderProgress();
+            updateRenderProgress(false);
         };
     };
     const puppeteerInstance = await browserInstance;
@@ -148,8 +175,10 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
         fromUi: outputLocationFromUI,
         logLevel,
     });
-    log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.gray(`Entry point = ${fullEntryPoint} (${entryPointReason}), Composition = ${compositionId} (${reason}), Codec = ${codec} (${codecReason}), Output = ${relativeOutputLocation}`));
+    log_1.Log.verboseAdvanced({ indent, logLevel, tag: 'config' }, chalk_1.chalk.gray(`Entry point = ${fullEntryPoint} (${entryPointReason})`));
+    log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.gray(`Composition = ${compositionId} (${reason}), Codec = ${codec} (${codecReason}), Output = ${relativeOutputLocation}`));
     const absoluteOutputFile = (0, get_cli_options_1.getAndValidateAbsoluteOutputFile)(relativeOutputLocation, overwrite);
+    const exists = (0, node_fs_1.existsSync)(absoluteOutputFile);
     const realFrameRange = renderer_1.RenderInternals.getRealFrameRange(config.durationInFrames, frameRange);
     const totalFrames = renderer_1.RenderInternals.getFramesToRender(realFrameRange, everyNthFrame);
     const actualConcurrency = renderer_1.RenderInternals.getActualConcurrency(concurrency);
@@ -180,7 +209,7 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
             inputProps,
             onFrameUpdate: (rendered) => {
                 renderingProgress.frames = rendered;
-                updateRenderProgress();
+                updateRenderProgress(false);
             },
             onStart: () => undefined,
             onDownload: (src) => {
@@ -209,9 +238,8 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
             downloadMap,
             composition: config,
         });
-        updateRenderProgress();
-        process.stdout.write('\n');
-        log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.cyan(`▶ ${absoluteOutputFile}`));
+        updateRenderProgress(true);
+        log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.blue(`▶ ${absoluteOutputFile}`));
         return;
     }
     stitchingProgress = {
@@ -263,16 +291,16 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
                 update.renderedDoneIn;
             renderingProgress.frames =
                 update.renderedFrames;
-            updateRenderProgress();
+            updateRenderProgress(false);
         },
         puppeteerInstance,
         onDownload,
         internal: {
             onCtrlCExit: addCleanupCallback,
             downloadMap,
+            indent,
         },
         cancelSignal: cancelSignal !== null && cancelSignal !== void 0 ? cancelSignal : undefined,
-        printLog: (...str) => log_1.Log.verboseAdvanced({ indent, logLevel }, ...str),
         audioCodec,
         preferLossless: false,
         imageFormat,
@@ -283,9 +311,8 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
     slowestFrames.forEach(({ frame, time }) => {
         log_1.Log.verboseAdvanced({ indent, logLevel }, `Frame ${frame} (${time.toFixed(3)}ms)`);
     });
-    updateRenderProgress();
-    process.stdout.write('\n');
-    log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.cyan(`▶ ${absoluteOutputFile}`));
+    updateRenderProgress(true);
+    log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.blue(`${exists ? '○' : '+'} ${absoluteOutputFile}`));
     for (const line of renderer_1.RenderInternals.perf.getPerf()) {
         log_1.Log.verboseAdvanced({ indent, logLevel }, line);
     }

package/dist/render-flows/still.js

@@ -19,26 +19,27 @@ const parse_command_line_1 = require("../parse-command-line");
 const progress_bar_1 = require("../progress-bar");
 const progress_types_1 = require("../progress-types");
 const setup_cache_1 = require("../setup-cache");
+const should_use_non_overlaying_logger_1 = require("../should-use-non-overlaying-logger");
 const truthy_1 = require("../truthy");
 const user_passed_output_location_1 = require("../user-passed-output-location");
 const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason, remainingArgs, browser, browserExecutable, chromiumOptions, envVariables, height, inputProps, overwrite, port, publicDir, puppeteerTimeout, jpegQuality, scale, stillFrame, width, compositionIdFromUi, imageFormatFromUi, logLevel, onProgress, indentOutput, addCleanupCallback, cancelSignal, }) => {
     var _a, _b;
     const downloads = [];
     const aggregate = (0, progress_types_1.initialAggregateRenderProgress)();
+    const updatesDontOverwrite = (0, should_use_non_overlaying_logger_1.shouldUseNonOverlayingLogger)({ logLevel });
     let renderProgress = null;
     const steps = [
         renderer_1.RenderInternals.isServeUrl(fullEntryPoint) ? null : 'bundling',
         'rendering',
     ].filter(truthy_1.truthy);
-    const updateProgress = () => {
+    const updateProgress = (newline) => {
         const { output, progress, message } = (0, progress_bar_1.makeRenderingAndStitchingProgress)({
             prog: aggregate,
-            indent: indentOutput,
             steps: steps.length,
             stitchingStep: steps.indexOf('stitching'),
         });
         if (renderProgress) {
-            renderProgress.update(output);
+            renderProgress.update(updatesDontOverwrite ? message : output, newline);
         }
         onProgress({ message, value: progress, ...aggregate });
     };
@@ -49,7 +50,7 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
         chromiumOptions,
         shouldDumpIo,
         forceDeviceScaleFactor: scale,
-        indentationString: indentOutput ? log_1.INDENT_TOKEN + ' ' : '',
+        indent: indentOutput,
     });
     const { cleanup: cleanupBundle, urlOrBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({
         fullPath: fullEntryPoint,
@@ -59,7 +60,7 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
         onProgress: ({ copying, bundling }) => {
             aggregate.bundling = bundling;
             aggregate.copyingState = copying;
-            updateProgress();
+            updateProgress(false);
         },
         indentOutput,
         logLevel,
@@ -69,6 +70,7 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
                 renderer_1.RenderInternals.deleteDirectory(dir);
             });
         },
+        quietProgress: updatesDontOverwrite,
     });
     addCleanupCallback(() => cleanupBundle());
     const puppeteerInstance = await browserInstance;
@@ -107,13 +109,17 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
         type: 'asset',
     });
     const absoluteOutputLocation = (0, get_cli_options_1.getAndValidateAbsoluteOutputFile)(relativeOutputLocation, overwrite);
+    const exists = (0, node_fs_1.existsSync)(absoluteOutputLocation);
     (0, node_fs_1.mkdirSync)(node_path_1.default.join(absoluteOutputLocation, '..'), {
         recursive: true,
     });
-    log_1.Log.infoAdvanced({ indent: indentOutput, logLevel }, chalk_1.chalk.gray(`Entry point = ${fullEntryPoint} (${entryPointReason}), Output = ${relativeOutputLocation}, Format = ${imageFormat} (${source}), Composition = ${compositionId} (${reason})`));
+    log_1.Log.verboseAdvanced({ indent: indentOutput, logLevel, tag: 'config' }, chalk_1.chalk.gray(`Entry point = ${fullEntryPoint} (${entryPointReason})`));
+    log_1.Log.infoAdvanced({ indent: indentOutput, logLevel }, chalk_1.chalk.gray(`Composition = ${compositionId} (${reason}), Format = ${imageFormat} (${source}), Output = ${relativeOutputLocation}`));
     renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)({
         quiet: (0, parse_command_line_1.quietFlagProvided)(),
         cancelSignal,
+        updatesDontOverwrite: (0, should_use_non_overlaying_logger_1.shouldUseNonOverlayingLogger)({ logLevel }),
+        indent: indentOutput,
     });
     const renderStart = Date.now();
     aggregate.rendering = {
@@ -123,7 +129,7 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
         steps,
         totalFrames: 1,
     };
-    updateProgress();
+    updateProgress(false);
     const onDownload = (src) => {
         const id = Math.random();
         const download = {
@@ -134,10 +140,10 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
             totalBytes: null,
         };
         downloads.push(download);
-        updateProgress();
+        updateProgress(false);
         return ({ percent }) => {
             download.progress = percent;
-            updateProgress();
+            updateProgress(false);
         };
     };
     await (0, renderer_1.renderStill)({
@@ -167,8 +173,7 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
         steps,
         totalFrames: 1,
     };
-    updateProgress();
-    log_1.Log.infoAdvanced({ indent: indentOutput, logLevel });
-    log_1.Log.infoAdvanced({ indent: indentOutput, logLevel }, chalk_1.chalk.cyan(`▶️ ${absoluteOutputLocation}`));
+    updateProgress(true);
+    log_1.Log.infoAdvanced({ indent: indentOutput, logLevel }, chalk_1.chalk.blue(`${exists ? '○' : '+'} ${absoluteOutputLocation}`));
 };
 exports.renderStillFlow = renderStillFlow;

package/dist/setup-cache.d.ts

@@ -1,6 +1,6 @@
 import type { LogLevel } from '@remotion/renderer';
 import type { BundlingState, CopyingState } from './progress-bar';
-export declare const bundleOnCliOrTakeServeUrl: ({ fullPath, remotionRoot, publicDir, onProgress, indentOutput, logLevel, bundlingStep, steps, onDirectoryCreated, }: {
+export declare const bundleOnCliOrTakeServeUrl: ({ fullPath, remotionRoot, publicDir, onProgress, indentOutput, logLevel, bundlingStep, steps, onDirectoryCreated, quietProgress, }: {
     fullPath: string;
     remotionRoot: string;
     publicDir: string | null;
@@ -13,6 +13,7 @@ export declare const bundleOnCliOrTakeServeUrl: ({ fullPath, remotionRoot, publi
     bundlingStep: number;
     steps: number;
     onDirectoryCreated: (path: string) => void;
+    quietProgress: boolean;
 }) => Promise<{
     urlOrBundle: string;
     cleanup: () => void;

package/dist/setup-cache.js

@@ -7,7 +7,8 @@ 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 bundleOnCliOrTakeServeUrl = async ({ fullPath, remotionRoot, publicDir, onProgress, indentOutput, logLevel, bundlingStep, steps, onDirectoryCreated, }) => {
+const should_use_non_overlaying_logger_1 = require("./should-use-non-overlaying-logger");
+const bundleOnCliOrTakeServeUrl = async ({ fullPath, remotionRoot, publicDir, onProgress, indentOutput, logLevel, bundlingStep, steps, onDirectoryCreated, quietProgress, }) => {
     if (renderer_1.RenderInternals.isServeUrl(fullPath)) {
         return {
             urlOrBundle: fullPath,
@@ -24,6 +25,7 @@ const bundleOnCliOrTakeServeUrl = async ({ fullPath, remotionRoot, publicDir, on
         bundlingStep,
         steps,
         onDirectoryCreated,
+        quietProgress,
     });
     return {
         urlOrBundle: bundled,
@@ -31,7 +33,7 @@ const bundleOnCliOrTakeServeUrl = async ({ fullPath, remotionRoot, publicDir, on
     };
 };
 exports.bundleOnCliOrTakeServeUrl = bundleOnCliOrTakeServeUrl;
-const bundleOnCli = async ({ fullPath, remotionRoot, publicDir, onProgressCallback, indent, logLevel, bundlingStep, steps, onDirectoryCreated, }) => {
+const bundleOnCli = async ({ fullPath, remotionRoot, publicDir, onProgressCallback, indent, logLevel, bundlingStep, steps, onDirectoryCreated, quietProgress, }) => {
     var _a;
     const shouldCache = config_1.ConfigInternals.getWebpackCaching();
     const symlinkState = {
@@ -54,7 +56,7 @@ const bundleOnCli = async ({ fullPath, remotionRoot, publicDir, onProgressCallba
             bundling: bundlingState,
             copying: copyingState,
             symLinks: symlinkState,
-        }, indent, bundlingStep, steps) + (newline ? '\n' : ''));
+        }, bundlingStep, steps), newline);
         onProgressCallback({
             bundling: bundlingState,
             copying: copyingState,
@@ -100,8 +102,10 @@ const bundleOnCli = async ({ fullPath, remotionRoot, publicDir, onProgressCallba
     }
     const bundleStartTime = Date.now();
     const bundlingProgress = (0, progress_bar_1.createOverwriteableCliOutput)({
-        quiet: (0, parse_command_line_1.quietFlagProvided)(),
+        quiet: quietProgress || (0, parse_command_line_1.quietFlagProvided)(),
         cancelSignal: null,
+        updatesDontOverwrite: (0, should_use_non_overlaying_logger_1.shouldUseNonOverlayingLogger)({ logLevel }),
+        indent,
     });
     let bundlingState = {
         progress: 0,

package/dist/should-use-non-overlaying-logger.d.ts

@@ -0,0 +1,4 @@
+import type { LogLevel } from '@remotion/renderer';
+export declare const shouldUseNonOverlayingLogger: ({ logLevel, }: {
+    logLevel: LogLevel;
+}) => boolean;

package/dist/should-use-non-overlaying-logger.js

@@ -0,0 +1,12 @@
+"use strict";
+// Should not use a logger that uses ANSI Diffing if
+// - using verbose logging (intersection of Chrome + Remotion + compositor logs)
+// - using a non-interactive terminal such as CI
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldUseNonOverlayingLogger = void 0;
+const renderer_1 = require("@remotion/renderer");
+const shouldUseNonOverlayingLogger = ({ logLevel, }) => {
+    return (renderer_1.RenderInternals.isEqualOrBelowLogLevel(logLevel, 'verbose') ||
+        !process.stdout.isTTY);
+};
+exports.shouldUseNonOverlayingLogger = shouldUseNonOverlayingLogger;

package/dist/user-passed-output-location.js

@@ -3,14 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutputLocation = exports.getUserPassedOutputLocation = void 0;
 const config_1 = require("./config");
 const get_default_out_name_1 = require("./get-default-out-name");
+const parse_command_line_1 = require("./parse-command-line");
 const getUserPassedOutputLocation = (args) => {
-    var _a;
-    const filename = (_a = args[0]) !== null && _a !== void 0 ? _a : config_1.ConfigInternals.getOutputLocation();
+    var _a, _b;
+    const filename = (_b = (_a = args[0]) !== null && _a !== void 0 ? _a : parse_command_line_1.parsedCli.output) !== null && _b !== void 0 ? _b : config_1.ConfigInternals.getOutputLocation();
     return filename;
 };
 exports.getUserPassedOutputLocation = getUserPassedOutputLocation;
 const getOutputLocation = ({ compositionId, defaultExtension, args, type, }) => {
     var _a;
+    if (typeof args[0] !== 'undefined' &&
+        typeof parse_command_line_1.parsedCli.output !== 'undefined') {
+        throw new Error('Both an output flag (--output) and an output location as a positional argument were passed. Please choose only one of the ways.');
+    }
     return ((_a = (0, exports.getUserPassedOutputLocation)(args)) !== null && _a !== void 0 ? _a : (0, get_default_out_name_1.getDefaultOutLocation)({
         compositionName: compositionId,
         defaultExtension,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/cli",
-  "version": "4.0.0-alpha6",
+  "version": "4.0.0-alpha7",
   "description": "CLI for Remotion",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -28,16 +28,16 @@
   "author": "Jonny Burger <jonny@remotion.dev>",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@remotion/bundler": "4.0.0-alpha6",
-    "@remotion/media-utils": "4.0.0-alpha6",
-    "@remotion/player": "4.0.0-alpha6",
-    "@remotion/renderer": "4.0.0-alpha6",
+    "@remotion/bundler": "4.0.0-alpha7",
+    "@remotion/media-utils": "4.0.0-alpha7",
+    "@remotion/player": "4.0.0-alpha7",
+    "@remotion/renderer": "4.0.0-alpha7",
     "dotenv": "9.0.2",
     "memfs": "3.4.3",
     "minimist": "1.2.6",
     "open": "^8.4.2",
     "prompts": "2.4.1",
-    "remotion": "4.0.0-alpha6",
+    "remotion": "4.0.0-alpha7",
     "semver": "7.3.5",
     "source-map": "0.6.1"
   },
@@ -56,7 +56,7 @@
     "@types/semver": "^7.3.4",
     "@typescript-eslint/eslint-plugin": "5.18.0",
     "@typescript-eslint/parser": "5.18.0",
-    "@remotion/zod-types": "4.0.0-alpha6",
+    "@remotion/zod-types": "4.0.0-alpha7",
     "eslint": "8.25.0",
     "eslint-plugin-10x": "1.5.2",
     "eslint-plugin-react": "7.29.4",

package/dist/ansi/ansi-regex.d.ts

@@ -1,2 +0,0 @@
-export declare const ansiRegex: () => RegExp;
-export declare const stripAnsi: (str: string) => string;