@remotion/cli 4.0.14 → 4.0.16

package/dist/cloudrun-command.d.ts

@@ -0,0 +1 @@
+export declare const cloudrunCommand: (remotionRoot: string, args: string[]) => Promise<never>;

package/dist/cloudrun-command.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cloudrunCommand = void 0;
+const log_1 = require("./log");
+const get_package_manager_1 = require("./preview-server/get-package-manager");
+const update_available_1 = require("./preview-server/update-available");
+const cloudrunCommand = async (remotionRoot, args) => {
+    try {
+        const path = require.resolve('@remotion/cloudrun', {
+            paths: [remotionRoot],
+        });
+        const { CloudrunInternals } = require(path);
+        await CloudrunInternals.executeCommand(args, remotionRoot);
+        process.exit(0);
+    }
+    catch (err) {
+        const manager = (0, get_package_manager_1.getPackageManager)(remotionRoot, undefined);
+        const installCommand = manager === 'unknown' ? 'npm i' : manager.installCommand;
+        log_1.Log.error(err);
+        log_1.Log.error('Remotion CloudRun is not installed.');
+        log_1.Log.info('');
+        log_1.Log.info('You can install it using:');
+        log_1.Log.info(`${installCommand} @remotion/cloudrun@${(0, update_available_1.getRemotionVersion)()}`);
+        process.exit(1);
+    }
+};
+exports.cloudrunCommand = cloudrunCommand;

package/dist/codemods/update-default-props.js

@@ -56,6 +56,11 @@ const findEndPosition = (input, currentPosition) => {
         const nextEnd = input.indexOf('}', asConstVersion + currentPosition + 1);
         return nextEnd - 1;
     }
+    // When updating e.g. `defaultProps={{union: {type: 'car' as const, color: ''}}}`
+    const nextTriple = input.indexOf('}}}', currentPosition + 1);
+    if (nextTriple !== -1) {
+        return nextTriple + 1;
+    }
     const next = input.indexOf('}}', currentPosition + 1);
     if (next !== -1) {
         return next;

package/dist/editor/components/RenderModal/SchemaEditor/SchemaEditor.js

@@ -59,6 +59,6 @@ const SchemaEditor = ({ schema, value, setValue, zodValidationResult, defaultPro
     if (typeName !== z.ZodFirstPartyTypeKind.ZodObject) {
         return (0, jsx_runtime_1.jsx)(SchemaErrorMessages_1.TopLevelZodValue, { typeReceived: typeName });
     }
-    return ((0, jsx_runtime_1.jsx)("div", { style: scrollable, className: is_menu_item_1.VERTICAL_SCROLLBAR_CLASSNAME, children: (0, jsx_runtime_1.jsx)(ZodObjectEditor_1.ZodObjectEditor, { value: value, setValue: setValue, jsonPath: [], schema: schema, defaultValue: defaultProps, onSave: onSave, showSaveButton: showSaveButton, onRemove: null, saving: saving, saveDisabledByParent: saveDisabledByParent, mayPad: true }) }));
+    return ((0, jsx_runtime_1.jsx)("div", { style: scrollable, className: is_menu_item_1.VERTICAL_SCROLLBAR_CLASSNAME, children: (0, jsx_runtime_1.jsx)(ZodObjectEditor_1.ZodObjectEditor, { discriminatedUnionReplacement: null, value: value, setValue: setValue, jsonPath: [], schema: schema, defaultValue: defaultProps, onSave: onSave, showSaveButton: showSaveButton, onRemove: null, saving: saving, saveDisabledByParent: saveDisabledByParent, mayPad: true }) }));
 };
 exports.SchemaEditor = SchemaEditor;

package/dist/editor/components/RenderModal/SchemaEditor/ZodDiscriminatedUnionEditor.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="react" />
+import type { z } from 'zod';
+import type { JSONPath } from './zod-types';
+import type { UpdaterFunction } from './ZodSwitch';
+export declare const ZodDiscriminatedUnionEditor: React.FC<{
+    schema: z.ZodTypeAny;
+    setValue: UpdaterFunction<Record<string, unknown>>;
+    value: Record<string, unknown>;
+    defaultValue: Record<string, unknown>;
+    mayPad: boolean;
+    jsonPath: JSONPath;
+    onRemove: null | (() => void);
+    onSave: UpdaterFunction<unknown>;
+    showSaveButton: boolean;
+    saving: boolean;
+    saveDisabledByParent: boolean;
+}>;

package/dist/editor/components/RenderModal/SchemaEditor/ZodDiscriminatedUnionEditor.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZodDiscriminatedUnionEditor = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+const Checkmark_1 = require("../../../icons/Checkmark");
+const get_zod_if_possible_1 = require("../../get-zod-if-possible");
+const ComboBox_1 = require("../../NewComposition/ComboBox");
+const create_zod_values_1 = require("./create-zod-values");
+const Fieldset_1 = require("./Fieldset");
+const local_state_1 = require("./local-state");
+const SchemaLabel_1 = require("./SchemaLabel");
+const ZodObjectEditor_1 = require("./ZodObjectEditor");
+const ZodDiscriminatedUnionEditor = ({ schema, setValue, showSaveButton, saving, value, defaultValue, saveDisabledByParent, onSave, mayPad, jsonPath, onRemove, }) => {
+    const z = (0, get_zod_if_possible_1.useZodIfPossible)();
+    if (!z) {
+        throw new Error('expected zod');
+    }
+    const zodTypes = (0, get_zod_if_possible_1.useZodTypesIfPossible)();
+    const typedSchema = schema._def;
+    const options = (0, react_1.useMemo)(() => [...typedSchema.optionsMap.keys()], [typedSchema.optionsMap]);
+    const { localValue, onChange: setLocalValue, reset, } = (0, local_state_1.useLocalState)({
+        schema,
+        setValue,
+        value,
+        defaultValue,
+    });
+    const comboBoxValues = (0, react_1.useMemo)(() => {
+        return options.map((option) => {
+            return {
+                value: option,
+                label: option,
+                id: option,
+                keyHint: null,
+                leftItem: option === value[typedSchema.discriminator] ? (0, jsx_runtime_1.jsx)(Checkmark_1.Checkmark, {}) : null,
+                onClick: () => {
+                    const val = (0, create_zod_values_1.createZodValues)(typedSchema.optionsMap.get(option), z, zodTypes);
+                    setLocalValue(() => val, false, false);
+                },
+                quickSwitcherLabel: null,
+                subMenu: null,
+                type: 'item',
+            };
+        });
+    }, [
+        options,
+        setLocalValue,
+        typedSchema.discriminator,
+        typedSchema.optionsMap,
+        value,
+        z,
+        zodTypes,
+    ]);
+    const save = (0, react_1.useCallback)(() => {
+        onSave(() => value, false, false);
+    }, [onSave, value]);
+    const discriminatedUnionReplacement = (0, react_1.useMemo)(() => {
+        return {
+            discriminator: typedSchema.discriminator,
+            markup: ((0, jsx_runtime_1.jsxs)(Fieldset_1.Fieldset, { shouldPad: mayPad, success: true, children: [(0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaLabel, { isDefaultValue: localValue.value[typedSchema.discriminator] ===
+                            defaultValue[typedSchema.discriminator], jsonPath: [...jsonPath, typedSchema.discriminator], onRemove: onRemove, onReset: reset, onSave: save, saveDisabledByParent: saveDisabledByParent, saving: saving, showSaveButton: showSaveButton, suffix: null, valid: localValue.zodValidation.success }), (0, jsx_runtime_1.jsx)(ComboBox_1.Combobox, { title: "Select type", values: comboBoxValues, selectedId: value[typedSchema.discriminator] })] })),
+        };
+    }, [
+        comboBoxValues,
+        defaultValue,
+        jsonPath,
+        localValue.value,
+        localValue.zodValidation.success,
+        mayPad,
+        onRemove,
+        reset,
+        save,
+        saveDisabledByParent,
+        saving,
+        showSaveButton,
+        typedSchema.discriminator,
+        value,
+    ]);
+    return ((0, jsx_runtime_1.jsx)(ZodObjectEditor_1.ZodObjectEditor
+    // Re-render the object editor when the discriminator changes
+    , { jsonPath: jsonPath, mayPad: mayPad, defaultValue: defaultValue, onRemove: onRemove, onSave: onSave, saveDisabledByParent: saveDisabledByParent, saving: saving, schema: typedSchema.optionsMap.get(value[typedSchema.discriminator]), setValue: setLocalValue, showSaveButton: showSaveButton, value: value, discriminatedUnionReplacement: discriminatedUnionReplacement }, value[typedSchema.discriminator]));
+};
+exports.ZodDiscriminatedUnionEditor = ZodDiscriminatedUnionEditor;

package/dist/editor/components/RenderModal/SchemaEditor/ZodObjectEditor.d.ts

@@ -2,6 +2,10 @@ import React from 'react';
 import type { z } from 'zod';
 import type { JSONPath } from './zod-types';
 import type { UpdaterFunction } from './ZodSwitch';
+export type ObjectDiscrimatedUnionReplacement = {
+    discriminator: string;
+    markup: React.ReactNode;
+};
 export declare const ZodObjectEditor: React.FC<{
     schema: z.ZodTypeAny;
     jsonPath: JSONPath;
@@ -14,4 +18,5 @@ export declare const ZodObjectEditor: React.FC<{
     saving: boolean;
     saveDisabledByParent: boolean;
     mayPad: boolean;
+    discriminatedUnionReplacement: ObjectDiscrimatedUnionReplacement | null;
 }>;

package/dist/editor/components/RenderModal/SchemaEditor/ZodObjectEditor.js

@@ -35,7 +35,7 @@ const SchemaLabel_1 = require("./SchemaLabel");
 const SchemaSeparationLine_1 = require("./SchemaSeparationLine");
 const SchemaVerticalGuide_1 = require("./SchemaVerticalGuide");
 const ZodSwitch_1 = require("./ZodSwitch");
-const ZodObjectEditor = ({ schema, jsonPath, setValue, value, defaultValue, onSave, showSaveButton, onRemove, saving, saveDisabledByParent, mayPad, }) => {
+const ZodObjectEditor = ({ schema, jsonPath, setValue, value, defaultValue, onSave, showSaveButton, onRemove, saving, saveDisabledByParent, mayPad, discriminatedUnionReplacement, }) => {
     const z = (0, get_zod_if_possible_1.useZodIfPossible)();
     if (!z) {
         throw new Error('expected zod');
@@ -62,6 +62,10 @@ const ZodObjectEditor = ({ schema, jsonPath, setValue, value, defaultValue, onSa
                         return localValue.value;
                     }, false, false);
                 }, saveDisabledByParent: saveDisabledByParent, saving: saving, showSaveButton: showSaveButton, valid: localValue.zodValidation.success })), (0, jsx_runtime_1.jsx)(RevisionContextProvider, { children: (0, jsx_runtime_1.jsx)(SchemaVerticalGuide_1.SchemaVerticalGuide, { isRoot: isRoot, children: keys.map((key, i) => {
+                        if (discriminatedUnionReplacement &&
+                            key === discriminatedUnionReplacement.discriminator) {
+                            return discriminatedUnionReplacement.markup;
+                        }
                         return ((0, jsx_runtime_1.jsxs)(react_1.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(ZodSwitch_1.ZodSwitch, { mayPad: true, jsonPath: [...jsonPath, key], schema: shape[key], value: localValue.value[key], 
                                     // In case of null | {a: string, b: string} type, we need to fallback to the default value
                                     defaultValue: (defaultValue !== null && defaultValue !== void 0 ? defaultValue : value)[key], setValue: (val, forceApply) => {

package/dist/editor/components/RenderModal/SchemaEditor/ZodOrNullishEditor.js

@@ -45,6 +45,6 @@ const ZodOrNullishEditor = ({ jsonPath, schema, setValue, onSave, defaultValue,
     const save = (0, react_1.useCallback)(() => {
         onSave(() => value, false, false);
     }, [onSave, value]);
-    return ((0, jsx_runtime_1.jsxs)(Fieldset_1.Fieldset, { shouldPad: mayPad, success: localValue.zodValidation.success, children: [localValue.value === nullishValue ? ((0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaLabel, { isDefaultValue: localValue.value === defaultValue, jsonPath: jsonPath, onReset: reset, onSave: save, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, valid: localValue.zodValidation.success, saveDisabledByParent: saveDisabledByParent, suffix: null })) : ((0, jsx_runtime_1.jsx)(ZodSwitch_1.ZodSwitch, { value: localValue.value, setValue: setLocalValue, jsonPath: jsonPath, schema: innerSchema, defaultValue: value, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent, mayPad: false })), (0, jsx_runtime_1.jsxs)("div", { style: checkBoxWrapper, children: [(0, jsx_runtime_1.jsx)(Checkbox_1.Checkbox, { checked: isChecked, onChange: onCheckBoxChange, disabled: false, name: jsonPath.join('.') }), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 1 }), (0, jsx_runtime_1.jsx)("div", { style: labelStyle, children: String(nullishValue) })] })] }));
+    return ((0, jsx_runtime_1.jsxs)(Fieldset_1.Fieldset, { shouldPad: mayPad, success: localValue.zodValidation.success, children: [localValue.value === nullishValue ? ((0, jsx_runtime_1.jsx)(SchemaLabel_1.SchemaLabel, { isDefaultValue: localValue.value === defaultValue, jsonPath: jsonPath, onReset: reset, onSave: save, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, valid: localValue.zodValidation.success, saveDisabledByParent: saveDisabledByParent, suffix: null })) : ((0, jsx_runtime_1.jsx)(ZodSwitch_1.ZodSwitch, { value: localValue.value, setValue: setLocalValue, jsonPath: jsonPath, schema: innerSchema, defaultValue: defaultValue, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent, mayPad: false })), (0, jsx_runtime_1.jsxs)("div", { style: checkBoxWrapper, children: [(0, jsx_runtime_1.jsx)(Checkbox_1.Checkbox, { checked: isChecked, onChange: onCheckBoxChange, disabled: false, name: jsonPath.join('.') }), (0, jsx_runtime_1.jsx)(layout_1.Spacing, { x: 1 }), (0, jsx_runtime_1.jsx)("div", { style: labelStyle, children: String(nullishValue) })] })] }));
 };
 exports.ZodOrNullishEditor = ZodOrNullishEditor;

package/dist/editor/components/RenderModal/SchemaEditor/ZodSwitch.js

@@ -8,6 +8,7 @@ const ZodBooleanEditor_1 = require("./ZodBooleanEditor");
 const ZodColorEditor_1 = require("./ZodColorEditor");
 const ZodDateEditor_1 = require("./ZodDateEditor");
 const ZodDefaultEditor_1 = require("./ZodDefaultEditor");
+const ZodDiscriminatedUnionEditor_1 = require("./ZodDiscriminatedUnionEditor");
 const ZodEffectEditor_1 = require("./ZodEffectEditor");
 const ZodEnumEditor_1 = require("./ZodEnumEditor");
 const ZodNonEditableValue_1 = require("./ZodNonEditableValue");
@@ -28,7 +29,7 @@ const ZodSwitch = ({ schema, jsonPath, value, setValue, defaultValue, onSave, sh
     }
     const zodTypes = (0, get_zod_if_possible_1.useZodTypesIfPossible)();
     if (typeName === z.ZodFirstPartyTypeKind.ZodObject) {
-        return ((0, jsx_runtime_1.jsx)(ZodObjectEditor_1.ZodObjectEditor, { setValue: setValue, value: value, defaultValue: defaultValue, jsonPath: jsonPath, schema: schema, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent, mayPad: mayPad }));
+        return ((0, jsx_runtime_1.jsx)(ZodObjectEditor_1.ZodObjectEditor, { setValue: setValue, value: value, defaultValue: defaultValue, jsonPath: jsonPath, schema: schema, onSave: onSave, showSaveButton: showSaveButton, onRemove: onRemove, saving: saving, saveDisabledByParent: saveDisabledByParent, mayPad: mayPad, discriminatedUnionReplacement: null }));
     }
     if (typeName === z.ZodFirstPartyTypeKind.ZodString) {
         if (value.startsWith(window.remotion_staticBase)) {
@@ -86,6 +87,9 @@ const ZodSwitch = ({ schema, jsonPath, value, setValue, defaultValue, onSave, sh
     if (typeName === z.ZodFirstPartyTypeKind.ZodDefault) {
         return ((0, jsx_runtime_1.jsx)(ZodDefaultEditor_1.ZodDefaultEditor, { jsonPath: jsonPath, showSaveButton: showSaveButton, defaultValue: defaultValue, value: value, setValue: setValue, onSave: onSave, onRemove: onRemove, schema: schema, saving: saving, saveDisabledByParent: saveDisabledByParent, mayPad: mayPad }));
     }
+    if (typeName === z.ZodFirstPartyTypeKind.ZodDiscriminatedUnion) {
+        return ((0, jsx_runtime_1.jsx)(ZodDiscriminatedUnionEditor_1.ZodDiscriminatedUnionEditor, { defaultValue: defaultValue, mayPad: mayPad, schema: schema, setValue: setValue, value: value, jsonPath: jsonPath, onRemove: onRemove, onSave: onSave, saving: saving, saveDisabledByParent: saveDisabledByParent, showSaveButton: showSaveButton }));
+    }
     return ((0, jsx_runtime_1.jsx)(ZodNonEditableValue_1.ZonNonEditableValue, { jsonPath: jsonPath, showSaveButton: showSaveButton, label: `${typeName} (not editable)`, saving: saving, mayPad: mayPad }));
 };
 exports.ZodSwitch = ZodSwitch;

package/dist/editor/helpers/render-modal-sections.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { Codec } from '@remotion/renderer';
 import type { RenderType } from '../components/RenderModal/RenderModalAdvanced';
 type Section = 'general' | 'picture' | 'advanced' | 'data' | 'gif' | 'audio';

package/dist/handle-common-errors.js

@@ -27,8 +27,8 @@ const handleCommonError = async (err, logLevel) => {
     }
     if (err.message.includes('Error creating WebGL context')) {
         log_1.Log.info();
-        log_1.Log.info('💡 You might need to set the OpenGL renderer to "angle"');
-        log_1.Log.info('💡 Get help for this issue at https://www.remotion.dev/docs/three');
+        log_1.Log.warn('💡 You might need to set the OpenGL renderer to "angle" (or "swangle" if rendering on lambda). Learn why at https://www.remotion.dev/docs/three');
+        log_1.Log.warn("💡 Check how it's done at https://www.remotion.dev/docs/chromium-flags#--gl");
     }
     if (err.message.includes('The bucket does not allow ACLs')) {
         log_1.Log.info();

package/dist/index.d.ts

@@ -136,6 +136,7 @@ export declare const CliInternals: {
         "every-nth-frame": number;
         "number-of-gif-loops": number;
         "number-of-shared-audio-tags": number;
+        version: string;
         codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
         concurrency: number;
         timeout: number;

package/dist/index.js

@@ -90,7 +90,7 @@ const cli = async () => {
             (0, ffmpeg_1.ffprobeCommand)(remotionRoot, process.argv.slice(3));
         }
         else if (command === 'upgrade') {
-            await (0, upgrade_1.upgrade)(remotionRoot, parse_command_line_1.parsedCli['package-manager']);
+            await (0, upgrade_1.upgrade)(remotionRoot, parse_command_line_1.parsedCli['package-manager'], parse_command_line_1.parsedCli.version);
         }
         else if (command === versions_1.VERSIONS_COMMAND) {
             await (0, versions_1.versionsCommand)(remotionRoot);

package/dist/make-on-download.d.ts

@@ -0,0 +1,12 @@
+import type { LogLevel, RenderMediaOnDownload } from '@remotion/renderer';
+import type { DownloadProgress } from './progress-types';
+export declare const makeOnDownload: ({ indent, logLevel, updatesDontOverwrite, downloads, updateRenderProgress, }: {
+    indent: boolean;
+    logLevel: LogLevel;
+    updatesDontOverwrite: boolean;
+    downloads: DownloadProgress[];
+    updateRenderProgress: (progress: {
+        newline: boolean;
+        printToConsole: boolean;
+    }) => void;
+}) => RenderMediaOnDownload;

package/dist/make-on-download.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeOnDownload = void 0;
+const format_bytes_1 = require("./format-bytes");
+const log_1 = require("./log");
+const makeOnDownload = ({ indent, logLevel, updatesDontOverwrite, downloads, updateRenderProgress, }) => {
+    return (src) => {
+        const id = Math.random();
+        const download = {
+            id,
+            name: src,
+            progress: 0,
+            downloaded: 0,
+            totalBytes: null,
+        };
+        const nextDownloadIndex = downloads.length;
+        downloads.push(download);
+        log_1.Log.verboseAdvanced({ indent, logLevel }, `Starting download [${nextDownloadIndex}]:`, src);
+        updateRenderProgress({
+            newline: false,
+            printToConsole: !updatesDontOverwrite,
+        });
+        let lastUpdate = Date.now();
+        return ({ percent, downloaded, totalSize }) => {
+            download.progress = percent;
+            download.totalBytes = totalSize;
+            download.downloaded = downloaded;
+            if (lastUpdate + 1000 > Date.now() && updatesDontOverwrite) {
+                return;
+            }
+            lastUpdate = Date.now();
+            log_1.Log.verboseAdvanced({ indent, logLevel }, `Download [${nextDownloadIndex}]:`, percent ? `${(percent * 100).toFixed(1)}%` : (0, format_bytes_1.formatBytes)(downloaded));
+            updateRenderProgress({
+                newline: false,
+                printToConsole: !updatesDontOverwrite,
+            });
+        };
+    };
+};
+exports.makeOnDownload = makeOnDownload;

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

@@ -11,6 +11,7 @@ type CommandLineOptions = {
     ['every-nth-frame']: number;
     ['number-of-gif-loops']: number;
     ['number-of-shared-audio-tags']: number;
+    version: string;
     codec: Codec;
     concurrency: number;
     timeout: number;

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

@@ -37,7 +37,7 @@ const processStill = async ({ job, remotionRoot, entryPoint, onProgress, addClea
         imageFormatFromUi: job.imageFormat,
         logLevel: job.verbose ? 'verbose' : 'info',
         onProgress,
-        indentOutput: true,
+        indent: true,
         addCleanupCallback,
         cancelSignal: job.cancelToken.cancelSignal,
         outputLocationFromUi: job.outName,

package/dist/preview-server/routes.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { LiveEventsServer } from './live-events';
 export declare const handleRoutes: ({ hash, hashPrefix, request, response, liveEventsServer, getCurrentInputProps, getEnvVariables, remotionRoot, entryPoint, publicDir, }: {

package/dist/progress-bar.js

@@ -5,6 +5,7 @@ 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 format_bytes_1 = require("./format-bytes");
 const make_progress_bar_1 = require("./make-progress-bar");
 const truthy_1 = require("./truthy");
 const createOverwriteableCliOutput = (options) => {
@@ -171,13 +172,7 @@ const getGuiProgressSubtitle = (progress) => {
         return `Bundling ${Math.round(progress.bundling.progress * 100)}%`;
     }
     if (progress.copyingState.doneIn === null) {
-        const bytes = new Intl.NumberFormat('en', {
-            notation: 'compact',
-            style: 'unit',
-            unit: 'byte',
-            unitDisplay: 'narrow',
-        });
-        return `Copying public dir ${bytes.format(progress.copyingState.bytes)}`;
+        return `Copying public dir ${(0, format_bytes_1.formatBytes)(progress.copyingState.bytes)}`;
     }
     if (!progress.rendering) {
         return `Getting compositions`;

package/dist/render-flows/render.js

@@ -40,6 +40,7 @@ const get_filename_1 = require("../get-filename");
 const get_final_output_codec_1 = require("../get-final-output-codec");
 const image_formats_1 = require("../image-formats");
 const log_1 = require("../log");
+const make_on_download_1 = require("../make-on-download");
 const parse_command_line_1 = require("../parse-command-line");
 const progress_bar_1 = require("../progress-bar");
 const setup_cache_1 = require("../setup-cache");
@@ -83,7 +84,7 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
         bytes: 0,
         doneIn: null,
     };
-    const updateRenderProgress = (newline) => {
+    const updateRenderProgress = ({ newline, printToConsole, }) => {
         const aggregateRenderProgress = {
             rendering: renderingProgress,
             stitching: shouldOutputImageSequence ? null : stitchingProgress,
@@ -97,7 +98,9 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
             stitchingStep: steps.indexOf('stitching'),
         });
         onProgress({ message, value: progress, ...aggregateRenderProgress });
-        return renderProgress.update(updatesDontOverwrite ? message : output, newline);
+        if (printToConsole) {
+            renderProgress.update(updatesDontOverwrite ? message : output, newline);
+        }
     };
     const { urlOrBundle, cleanup: cleanupBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({
         fullPath: fullEntryPoint,
@@ -106,7 +109,7 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
         onProgress: ({ bundling, copying }) => {
             bundlingProgress = bundling;
             copyingState = copying;
-            updateRenderProgress(false);
+            updateRenderProgress({ newline: false, printToConsole: true });
         },
         indentOutput: indent,
         logLevel,
@@ -118,24 +121,13 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
         quietProgress: updatesDontOverwrite,
     });
     addCleanupCallback(() => cleanupBundle());
-    const onDownload = (src) => {
-        const id = Math.random();
-        const download = {
-            id,
-            name: src,
-            progress: 0,
-            downloaded: 0,
-            totalBytes: null,
-        };
-        downloads.push(download);
-        updateRenderProgress(false);
-        return ({ percent, downloaded, totalSize }) => {
-            download.progress = percent;
-            download.totalBytes = totalSize;
-            download.downloaded = downloaded;
-            updateRenderProgress(false);
-        };
-    };
+    const onDownload = (0, make_on_download_1.makeOnDownload)({
+        downloads,
+        indent,
+        logLevel,
+        updateRenderProgress,
+        updatesDontOverwrite,
+    });
     const puppeteerInstance = await browserInstance;
     addCleanupCallback(() => puppeteerInstance.close(false, logLevel, indent));
     const actualConcurrency = renderer_1.RenderInternals.getActualConcurrency(concurrency);
@@ -220,7 +212,7 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
             serializedInputPropsWithCustomSchema,
             onFrameUpdate: (rendered) => {
                 renderingProgress.frames = rendered;
-                updateRenderProgress(false);
+                updateRenderProgress({ newline: false, printToConsole: true });
             },
             onStart: () => undefined,
             onDownload,
@@ -251,7 +243,7 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
                 data: config.props,
             }).serializedString,
         });
-        updateRenderProgress(true);
+        updateRenderProgress({ newline: true, printToConsole: true });
         log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.blue(`▶ ${absoluteOutputFile}`));
         return;
     }
@@ -303,7 +295,7 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
                 update.renderedDoneIn;
             renderingProgress.frames =
                 update.renderedFrames;
-            updateRenderProgress(false);
+            updateRenderProgress({ newline: false, printToConsole: true });
         },
         puppeteerInstance,
         onDownload,
@@ -323,7 +315,7 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
             staticBase: null,
         }).serializedString,
     });
-    updateRenderProgress(true);
+    updateRenderProgress({ newline: true, printToConsole: true });
     log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.blue(`${exists ? '○' : '+'} ${absoluteOutputFile}`));
     log_1.Log.verboseAdvanced({ indent, logLevel }, `Slowest frames:`);
     slowestFrames.forEach(({ frame, time }) => {

package/dist/render-flows/still.d.ts

@@ -1,6 +1,6 @@
 import type { Browser, BrowserExecutable, CancelSignal, ChromiumOptions, LogLevel, StillImageFormat } from '@remotion/renderer';
 import type { JobProgressCallback } from '../preview-server/render-queue/job';
-export declare const renderStillFlow: ({ remotionRoot, fullEntryPoint, entryPointReason, remainingArgs, browser, browserExecutable, chromiumOptions, envVariables, height, serializedInputPropsWithCustomSchema, overwrite, port, publicDir, puppeteerTimeout, jpegQuality, scale, stillFrame, width, compositionIdFromUi, imageFormatFromUi, logLevel, onProgress, indentOutput, addCleanupCallback, cancelSignal, outputLocationFromUi, }: {
+export declare const renderStillFlow: ({ remotionRoot, fullEntryPoint, entryPointReason, remainingArgs, browser, browserExecutable, chromiumOptions, envVariables, height, serializedInputPropsWithCustomSchema, overwrite, port, publicDir, puppeteerTimeout, jpegQuality, scale, stillFrame, width, compositionIdFromUi, imageFormatFromUi, logLevel, onProgress, indent, addCleanupCallback, cancelSignal, outputLocationFromUi, }: {
     remotionRoot: string;
     fullEntryPoint: string;
     entryPointReason: string;
@@ -23,7 +23,7 @@ export declare const renderStillFlow: ({ remotionRoot, fullEntryPoint, entryPoin
     imageFormatFromUi: StillImageFormat | null;
     logLevel: LogLevel;
     onProgress: JobProgressCallback;
-    indentOutput: boolean;
+    indent: boolean;
     addCleanupCallback: (cb: () => void) => void;
     cancelSignal: CancelSignal | null;
     outputLocationFromUi: string | null;

package/dist/render-flows/still.js

@@ -16,6 +16,7 @@ const determine_image_format_1 = require("../determine-image-format");
 const get_cli_options_1 = require("../get-cli-options");
 const get_composition_with_dimension_override_1 = require("../get-composition-with-dimension-override");
 const log_1 = require("../log");
+const make_on_download_1 = require("../make-on-download");
 const parse_command_line_1 = require("../parse-command-line");
 const progress_bar_1 = require("../progress-bar");
 const progress_types_1 = require("../progress-types");
@@ -23,36 +24,40 @@ 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, serializedInputPropsWithCustomSchema, overwrite, port, publicDir, puppeteerTimeout, jpegQuality, scale, stillFrame, width, compositionIdFromUi, imageFormatFromUi, logLevel, onProgress, indentOutput, addCleanupCallback, cancelSignal, outputLocationFromUi, }) => {
+const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason, remainingArgs, browser, browserExecutable, chromiumOptions, envVariables, height, serializedInputPropsWithCustomSchema, overwrite, port, publicDir, puppeteerTimeout, jpegQuality, scale, stillFrame, width, compositionIdFromUi, imageFormatFromUi, logLevel, onProgress, indent, addCleanupCallback, cancelSignal, outputLocationFromUi, }) => {
     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 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,
+    });
     const steps = [
         renderer_1.RenderInternals.isServeUrl(fullEntryPoint) ? null : 'bundling',
         'rendering',
     ].filter(truthy_1.truthy);
-    const updateProgress = (newline) => {
+    const updateRenderProgress = ({ newline, printToConsole, }) => {
         const { output, progress, message } = (0, progress_bar_1.makeRenderingAndStitchingProgress)({
             prog: aggregate,
             steps: steps.length,
             stitchingStep: steps.indexOf('stitching'),
         });
-        if (renderProgress) {
+        if (printToConsole) {
             renderProgress.update(updatesDontOverwrite ? message : output, newline);
         }
         onProgress({ message, value: progress, ...aggregate });
     };
     if (browserExecutable) {
-        log_1.Log.verboseAdvanced({ indent: indentOutput, logLevel }, 'Browser executable: ', browserExecutable);
+        log_1.Log.verboseAdvanced({ indent, logLevel }, 'Browser executable: ', browserExecutable);
     }
     const browserInstance = renderer_1.RenderInternals.internalOpenBrowser({
         browser,
         browserExecutable,
         chromiumOptions,
         forceDeviceScaleFactor: scale,
-        indent: indentOutput,
+        indent,
         viewport: null,
         logLevel,
     });
@@ -64,9 +69,9 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
         onProgress: ({ copying, bundling }) => {
             aggregate.bundling = bundling;
             aggregate.copyingState = copying;
-            updateProgress(false);
+            updateRenderProgress({ newline: false, printToConsole: true });
         },
-        indentOutput,
+        indentOutput: indent,
         logLevel,
         bundlingStep: steps.indexOf('bundling'),
         onDirectoryCreated: (dir) => {
@@ -78,7 +83,7 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
     });
     const server = await renderer_1.RenderInternals.prepareServer({
         concurrency: 1,
-        indent: indentOutput,
+        indent,
         port,
         remotionRoot,
         logLevel,
@@ -87,7 +92,7 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
     addCleanupCallback(() => server.closeServer(false));
     addCleanupCallback(() => cleanupBundle());
     const puppeteerInstance = await browserInstance;
-    addCleanupCallback(() => puppeteerInstance.close(false, logLevel, indentOutput));
+    addCleanupCallback(() => puppeteerInstance.close(false, logLevel, indent));
     const { compositionId, config, reason, argsAfterComposition } = await (0, get_composition_with_dimension_override_1.getCompositionWithDimensionOverride)({
         height,
         width,
@@ -96,7 +101,7 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
         browserExecutable,
         chromiumOptions,
         envVariables,
-        indent: indentOutput,
+        indent,
         serializedInputPropsWithCustomSchema,
         port,
         puppeteerInstance,
@@ -125,14 +130,8 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
     (0, node_fs_1.mkdirSync)(node_path_1.default.join(absoluteOutputLocation, '..'), {
         recursive: true,
     });
-    log_1.Log.verboseAdvanced({ indent: indentOutput, logLevel }, 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,
-    });
+    log_1.Log.verboseAdvanced({ indent, logLevel }, chalk_1.chalk.gray(`Entry point = ${fullEntryPoint} (${entryPointReason})`));
+    log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.gray(`Composition = ${compositionId} (${reason}), Format = ${imageFormat} (${source}), Output = ${relativeOutputLocation}`));
     const renderStart = Date.now();
     aggregate.rendering = {
         frames: 0,
@@ -141,23 +140,14 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
         steps,
         totalFrames: 1,
     };
-    updateProgress(false);
-    const onDownload = (src) => {
-        const id = Math.random();
-        const download = {
-            id,
-            name: src,
-            progress: 0,
-            downloaded: 0,
-            totalBytes: null,
-        };
-        downloads.push(download);
-        updateProgress(false);
-        return ({ percent }) => {
-            download.progress = percent;
-            updateProgress(false);
-        };
-    };
+    updateRenderProgress({ newline: false, printToConsole: true });
+    const onDownload = (0, make_on_download_1.makeOnDownload)({
+        downloads: aggregate.downloads,
+        indent,
+        logLevel,
+        updateRenderProgress,
+        updatesDontOverwrite,
+    });
     await renderer_1.RenderInternals.internalRenderStill({
         composition: config,
         frame: stillFrame,
@@ -177,7 +167,7 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
         puppeteerInstance,
         server: await server,
         cancelSignal,
-        indent: indentOutput,
+        indent,
         onBrowserLog: null,
         logLevel,
         serializedResolvedPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
@@ -193,7 +183,7 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
         steps,
         totalFrames: 1,
     };
-    updateProgress(true);
-    log_1.Log.infoAdvanced({ indent: indentOutput, logLevel }, chalk_1.chalk.blue(`${exists ? '○' : '+'} ${absoluteOutputLocation}`));
+    updateRenderProgress({ newline: true, printToConsole: true });
+    log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.blue(`${exists ? '○' : '+'} ${absoluteOutputLocation}`));
 };
 exports.renderStillFlow = renderStillFlow;

package/dist/still.js

@@ -54,7 +54,7 @@ const still = async (remotionRoot, args) => {
         imageFormatFromUi: null,
         logLevel,
         onProgress: () => undefined,
-        indentOutput: false,
+        indent: false,
         addCleanupCallback: (c) => {
             (0, cleanup_before_quit_1.registerCleanupJob)(c);
         },

package/dist/upgrade.d.ts

@@ -1 +1 @@
-export declare const upgrade: (remotionRoot: string, packageManager: string | undefined) => Promise<void>;
+export declare const upgrade: (remotionRoot: string, packageManager: string | undefined, version: string | undefined) => Promise<void>;

package/dist/upgrade.js

@@ -20,7 +20,7 @@ const getUpgradeCommand = ({ manager, packages, version, }) => {
     };
     return commands[manager];
 };
-const upgrade = async (remotionRoot, packageManager) => {
+const upgrade = async (remotionRoot, packageManager, version) => {
     var _a, _b, _c, _d;
     const packageJsonFilePath = node_path_1.default.join(remotionRoot, 'package.json');
     const packageJson = require(packageJsonFilePath);
@@ -28,8 +28,15 @@ const upgrade = async (remotionRoot, packageManager) => {
     const devDependencies = Object.keys((_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : {});
     const optionalDependencies = Object.keys((_b = packageJson.optionalDependencies) !== null && _b !== void 0 ? _b : {});
     const peerDependencies = Object.keys((_c = packageJson.peerDependencies) !== null && _c !== void 0 ? _c : {});
-    const latestRemotionVersion = await (0, get_latest_remotion_version_1.getLatestRemotionVersion)();
-    log_1.Log.info('Newest Remotion version is', latestRemotionVersion);
+    let targetVersion;
+    if (version) {
+        targetVersion = version;
+        log_1.Log.info('Upgrading to specified version: ' + version);
+    }
+    else {
+        targetVersion = await (0, get_latest_remotion_version_1.getLatestRemotionVersion)();
+        log_1.Log.info('Newest Remotion version is', targetVersion);
+    }
     const manager = (0, get_package_manager_1.getPackageManager)(remotionRoot, packageManager);
     if (manager === 'unknown') {
         throw new Error(`No lockfile was found in your project (one of ${get_package_manager_1.lockFilePaths
@@ -43,7 +50,7 @@ const upgrade = async (remotionRoot, packageManager) => {
     const prom = renderer_1.RenderInternals.execa(manager.manager, getUpgradeCommand({
         manager: manager.manager,
         packages: toUpgrade,
-        version: latestRemotionVersion,
+        version: targetVersion,
     }), {
         stdio: 'inherit',
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/cli",
-  "version": "4.0.14",
+  "version": "4.0.16",
   "description": "CLI for Remotion",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -35,11 +35,11 @@
     "prompts": "2.4.1",
     "semver": "7.5.3",
     "source-map": "0.6.1",
-    "@remotion/bundler": "4.0.14",
-    "@remotion/media-utils": "4.0.14",
-    "@remotion/player": "4.0.14",
-    "@remotion/renderer": "4.0.14",
-    "remotion": "4.0.14"
+    "remotion": "4.0.16",
+    "@remotion/media-utils": "4.0.16",
+    "@remotion/player": "4.0.16",
+    "@remotion/bundler": "4.0.16",
+    "@remotion/renderer": "4.0.16"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -65,8 +65,8 @@
     "typescript": "4.9.5",
     "vitest": "0.31.1",
     "zod": "^3.21.4",
-    "@remotion/zod-types": "4.0.14",
-    "@remotion/tailwind": "4.0.14"
+    "@remotion/tailwind": "4.0.16",
+    "@remotion/zod-types": "4.0.16"
   },
   "keywords": [
     "remotion",