@remotion/cli 4.0.429 → 4.0.430

package/dist/benchmark.js

@@ -22,8 +22,11 @@ const should_use_non_overlaying_logger_1 = require("./should-use-non-overlaying-
 const show_compositions_picker_1 = require("./show-compositions-picker");
 const truthy_1 = require("./truthy");
 const { audioBitrateOption, x264Option, offthreadVideoCacheSizeInBytesOption, scaleOption, crfOption, jpegQualityOption, videoBitrateOption, enforceAudioOption, mutedOption, videoCodecOption, colorSpaceOption, disallowParallelEncodingOption, enableMultiprocessOnLinuxOption, glOption, numberOfGifLoopsOption, encodingMaxRateOption, encodingBufferSizeOption, delayRenderTimeoutInMillisecondsOption, headlessOption, overwriteOption, binariesDirectoryOption, forSeamlessAacConcatenationOption, publicPathOption, publicDirOption, metadataOption, hardwareAccelerationOption, chromeModeOption, offthreadVideoThreadsOption, mediaCacheSizeInBytesOption, darkModeOption, askAIOption, experimentalClientSideRenderingOption, experimentalVisualModeOption, keyboardShortcutsOption, rspackOption, pixelFormatOption, browserExecutableOption, everyNthFrameOption, proResProfileOption, userAgentOption, disableWebSecurityOption, ignoreCertificateErrorsOption, concurrencyOption, overrideHeightOption, overrideWidthOption, overrideFpsOption, overrideDurationOption, bundleCacheOption, runsOption, } = client_1.BrowserSafeApis.options;
+const { benchmarkConcurrenciesOption } = client_1.BrowserSafeApis.options;
 const getValidConcurrency = (cliConcurrency) => {
-    const { concurrencies } = parsed_cli_1.parsedCli;
+    const concurrencies = benchmarkConcurrenciesOption.getValue({
+        commandLine: parsed_cli_1.parsedCli,
+    }).value;
     if (!concurrencies) {
         return [renderer_1.RenderInternals.resolveConcurrency(cliConcurrency)];
     }

package/dist/catalog-utils.d.ts

@@ -0,0 +1,36 @@
+export declare const isCatalogProtocol: (version: string) => boolean;
+export declare const findVersionSpecifier: (depsWithVersions: {
+    dependencies: Record<string, string>;
+    devDependencies: Record<string, string>;
+    optionalDependencies: Record<string, string>;
+    peerDependencies: Record<string, string>;
+}, pkg: string) => string | null;
+export declare const findWorkspaceRoot: (startDir: string) => string | null;
+type CatalogSource = {
+    type: 'package-json';
+    filePath: string;
+    catalogKey: 'workspaces' | 'root';
+} | {
+    type: 'pnpm-workspace';
+    filePath: string;
+};
+export declare const findCatalogSource: (workspaceRoot: string) => CatalogSource | null;
+export declare const getCatalogEntries: (workspaceRoot: string) => Record<string, string>;
+export declare const parsePnpmWorkspaceCatalog: (content: string) => Record<string, string>;
+export declare const updateCatalogEntryInPackageJson: ({ filePath, catalogKey, pkg, newVersion, }: {
+    filePath: string;
+    catalogKey: "root" | "workspaces";
+    pkg: string;
+    newVersion: string;
+}) => boolean;
+export declare const updateCatalogEntryInPnpmWorkspace: ({ filePath, pkg, newVersion, }: {
+    filePath: string;
+    pkg: string;
+    newVersion: string;
+}) => boolean;
+export declare const updateCatalogEntry: ({ workspaceRoot, pkg, newVersion, }: {
+    workspaceRoot: string;
+    pkg: string;
+    newVersion: string;
+}) => boolean;
+export {};

package/dist/catalog-utils.js

@@ -0,0 +1,191 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateCatalogEntry = exports.updateCatalogEntryInPnpmWorkspace = exports.updateCatalogEntryInPackageJson = exports.parsePnpmWorkspaceCatalog = exports.getCatalogEntries = exports.findCatalogSource = exports.findWorkspaceRoot = exports.findVersionSpecifier = exports.isCatalogProtocol = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const WORKSPACE_ROOT_SEARCH_LIMIT = 5;
+const isCatalogProtocol = (version) => {
+    return version.startsWith('catalog:');
+};
+exports.isCatalogProtocol = isCatalogProtocol;
+const findVersionSpecifier = (depsWithVersions, pkg) => {
+    var _a, _b, _c, _d;
+    return ((_d = (_c = (_b = (_a = depsWithVersions.dependencies[pkg]) !== null && _a !== void 0 ? _a : depsWithVersions.devDependencies[pkg]) !== null && _b !== void 0 ? _b : depsWithVersions.optionalDependencies[pkg]) !== null && _c !== void 0 ? _c : depsWithVersions.peerDependencies[pkg]) !== null && _d !== void 0 ? _d : null);
+};
+exports.findVersionSpecifier = findVersionSpecifier;
+const findWorkspaceRoot = (startDir) => {
+    let currentDir = node_path_1.default.resolve(startDir);
+    for (let i = 0; i < WORKSPACE_ROOT_SEARCH_LIMIT; i++) {
+        const packageJsonPath = node_path_1.default.join(currentDir, 'package.json');
+        if (node_fs_1.default.existsSync(packageJsonPath)) {
+            try {
+                const packageJson = JSON.parse(node_fs_1.default.readFileSync(packageJsonPath, 'utf-8'));
+                if (packageJson.workspaces) {
+                    return currentDir;
+                }
+            }
+            catch (_a) { }
+        }
+        const pnpmWorkspacePath = node_path_1.default.join(currentDir, 'pnpm-workspace.yaml');
+        if (node_fs_1.default.existsSync(pnpmWorkspacePath)) {
+            return currentDir;
+        }
+        const parentDir = node_path_1.default.dirname(currentDir);
+        if (parentDir === currentDir) {
+            return null;
+        }
+        currentDir = parentDir;
+    }
+    return null;
+};
+exports.findWorkspaceRoot = findWorkspaceRoot;
+const findCatalogSource = (workspaceRoot) => {
+    const packageJsonPath = node_path_1.default.join(workspaceRoot, 'package.json');
+    if (node_fs_1.default.existsSync(packageJsonPath)) {
+        try {
+            const packageJson = JSON.parse(node_fs_1.default.readFileSync(packageJsonPath, 'utf-8'));
+            if (packageJson.workspaces &&
+                typeof packageJson.workspaces === 'object' &&
+                !Array.isArray(packageJson.workspaces) &&
+                packageJson.workspaces.catalog) {
+                return {
+                    type: 'package-json',
+                    filePath: packageJsonPath,
+                    catalogKey: 'workspaces',
+                };
+            }
+            if (packageJson.catalog) {
+                return {
+                    type: 'package-json',
+                    filePath: packageJsonPath,
+                    catalogKey: 'root',
+                };
+            }
+        }
+        catch (_a) { }
+    }
+    const pnpmWorkspacePath = node_path_1.default.join(workspaceRoot, 'pnpm-workspace.yaml');
+    if (node_fs_1.default.existsSync(pnpmWorkspacePath)) {
+        const content = node_fs_1.default.readFileSync(pnpmWorkspacePath, 'utf-8');
+        if (/^catalog:/m.test(content)) {
+            return { type: 'pnpm-workspace', filePath: pnpmWorkspacePath };
+        }
+    }
+    return null;
+};
+exports.findCatalogSource = findCatalogSource;
+const getCatalogEntries = (workspaceRoot) => {
+    var _a, _b;
+    const source = (0, exports.findCatalogSource)(workspaceRoot);
+    if (!source) {
+        return {};
+    }
+    if (source.type === 'package-json') {
+        const packageJson = JSON.parse(node_fs_1.default.readFileSync(source.filePath, 'utf-8'));
+        if (source.catalogKey === 'workspaces') {
+            return ((_a = packageJson.workspaces.catalog) !== null && _a !== void 0 ? _a : {});
+        }
+        return ((_b = packageJson.catalog) !== null && _b !== void 0 ? _b : {});
+    }
+    return (0, exports.parsePnpmWorkspaceCatalog)(node_fs_1.default.readFileSync(source.filePath, 'utf-8'));
+};
+exports.getCatalogEntries = getCatalogEntries;
+const parsePnpmWorkspaceCatalog = (content) => {
+    const lines = content.split('\n');
+    const catalog = {};
+    let inCatalogSection = false;
+    for (const line of lines) {
+        if (/^catalog:\s*$/.test(line)) {
+            inCatalogSection = true;
+            continue;
+        }
+        if (inCatalogSection && /^\S/.test(line) && line.trim() !== '') {
+            inCatalogSection = false;
+            continue;
+        }
+        if (inCatalogSection && line.trim() !== '') {
+            const match = line.match(/^\s+(['"]?)([^'":\s]+)\1:\s*['"]?([^'"#\s]+)['"]?/);
+            if (match && match[2] && match[3]) {
+                catalog[match[2]] = match[3];
+            }
+        }
+    }
+    return catalog;
+};
+exports.parsePnpmWorkspaceCatalog = parsePnpmWorkspaceCatalog;
+const updateCatalogEntryInPackageJson = ({ filePath, catalogKey, pkg, newVersion, }) => {
+    var _a;
+    const content = node_fs_1.default.readFileSync(filePath, 'utf-8');
+    const packageJson = JSON.parse(content);
+    const catalog = catalogKey === 'workspaces'
+        ? (_a = packageJson.workspaces) === null || _a === void 0 ? void 0 : _a.catalog
+        : packageJson.catalog;
+    if (!catalog || !(pkg in catalog)) {
+        return false;
+    }
+    catalog[pkg] = newVersion;
+    const indentMatch = content.match(/^(\s+)"/m);
+    const indent = indentMatch ? indentMatch[1] : '\t';
+    node_fs_1.default.writeFileSync(filePath, JSON.stringify(packageJson, null, indent) + '\n');
+    return true;
+};
+exports.updateCatalogEntryInPackageJson = updateCatalogEntryInPackageJson;
+const updateCatalogEntryInPnpmWorkspace = ({ filePath, pkg, newVersion, }) => {
+    var _a, _b, _c;
+    const content = node_fs_1.default.readFileSync(filePath, 'utf-8');
+    const lines = content.split('\n');
+    let inCatalogSection = false;
+    let updated = false;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (/^catalog:\s*$/.test(line)) {
+            inCatalogSection = true;
+            continue;
+        }
+        if (inCatalogSection && /^\S/.test(line) && line.trim() !== '') {
+            inCatalogSection = false;
+            continue;
+        }
+        if (inCatalogSection) {
+            const escapedPkg = pkg.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            const lineRegex = new RegExp(`^(\\s+(?:['"]?)${escapedPkg}(?:['"]?):\\s*)(['"]?)([^'"#\\s]+)\\2(.*)$`);
+            const match = line.match(lineRegex);
+            if (match) {
+                const prefix = (_a = match[1]) !== null && _a !== void 0 ? _a : '';
+                const quote = (_b = match[2]) !== null && _b !== void 0 ? _b : '';
+                const suffix = (_c = match[4]) !== null && _c !== void 0 ? _c : '';
+                lines[i] = `${prefix}${quote}${newVersion}${quote}${suffix}`;
+                updated = true;
+                break;
+            }
+        }
+    }
+    if (updated) {
+        node_fs_1.default.writeFileSync(filePath, lines.join('\n'));
+    }
+    return updated;
+};
+exports.updateCatalogEntryInPnpmWorkspace = updateCatalogEntryInPnpmWorkspace;
+const updateCatalogEntry = ({ workspaceRoot, pkg, newVersion, }) => {
+    const source = (0, exports.findCatalogSource)(workspaceRoot);
+    if (!source) {
+        return false;
+    }
+    if (source.type === 'package-json') {
+        return (0, exports.updateCatalogEntryInPackageJson)({
+            filePath: source.filePath,
+            catalogKey: source.catalogKey,
+            pkg,
+            newVersion,
+        });
+    }
+    return (0, exports.updateCatalogEntryInPnpmWorkspace)({
+        filePath: source.filePath,
+        pkg,
+        newVersion,
+    });
+};
+exports.updateCatalogEntry = updateCatalogEntry;

package/dist/config/image-format.d.ts

@@ -0,0 +1,4 @@
+export declare const setStillImageFormat: (format: "jpeg" | "pdf" | "png" | "webp") => void;
+export declare const setVideoImageFormat: (format: "jpeg" | "none" | "png") => void;
+export declare const getUserPreferredStillImageFormat: () => "jpeg" | "pdf" | "png" | "webp" | undefined;
+export declare const getUserPreferredVideoImageFormat: () => "jpeg" | "none" | "png" | undefined;

package/dist/config/image-format.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUserPreferredVideoImageFormat = exports.getUserPreferredStillImageFormat = exports.setVideoImageFormat = exports.setStillImageFormat = void 0;
+const renderer_1 = require("@remotion/renderer");
+const truthy_1 = require("../truthy");
+let currentStillImageFormat;
+let currentVideoImageFormat;
+const setStillImageFormat = (format) => {
+    if (typeof format === 'undefined') {
+        currentStillImageFormat = undefined;
+        return;
+    }
+    if (!renderer_1.RenderInternals.validStillImageFormats.includes(format)) {
+        throw new TypeError([
+            `Value ${format} is not valid as an image format.`,
+            // @ts-expect-error
+            format === 'jpg' ? 'Did you mean "jpeg"?' : null,
+        ]
+            .filter(truthy_1.truthy)
+            .join(' '));
+    }
+    currentStillImageFormat = format;
+};
+exports.setStillImageFormat = setStillImageFormat;
+const setVideoImageFormat = (format) => {
+    if (typeof format === 'undefined') {
+        currentVideoImageFormat = undefined;
+        return;
+    }
+    if (!renderer_1.RenderInternals.validVideoImageFormats.includes(format)) {
+        throw new TypeError([
+            `Value ${format} is not valid as a video image format.`,
+            // @ts-expect-error
+            format === 'jpg' ? 'Did you mean "jpeg"?' : null,
+        ]
+            .filter(truthy_1.truthy)
+            .join(' '));
+    }
+    currentVideoImageFormat = format;
+};
+exports.setVideoImageFormat = setVideoImageFormat;
+const getUserPreferredStillImageFormat = () => {
+    return currentStillImageFormat;
+};
+exports.getUserPreferredStillImageFormat = getUserPreferredStillImageFormat;
+const getUserPreferredVideoImageFormat = () => {
+    return currentVideoImageFormat;
+};
+exports.getUserPreferredVideoImageFormat = getUserPreferredVideoImageFormat;

package/dist/config/index.d.ts

@@ -411,6 +411,12 @@ type FlatConfig = RemotionConfigObject & RemotionBundlingOptions & {
      * Default: 3
      */
     setBenchmarkRuns: (runs: number) => void;
+    /**
+     * Set which concurrency values should be used during a benchmark.
+     * Pass a comma-separated string of numbers, e.g. "1,4,8".
+     * Default: null (uses the --concurrency value)
+     */
+    setBenchmarkConcurrencies: (concurrencies: string | null) => void;
     /**
      * @deprecated 'The config format has changed. Change `Config.Bundling.*()` calls to `Config.*()` in your config file.'
      */

package/dist/config/index.js

@@ -20,7 +20,7 @@ const preview_server_2 = require("./preview-server");
 const still_frame_1 = require("./still-frame");
 const webpack_caching_1 = require("./webpack-caching");
 const webpack_poll_1 = require("./webpack-poll");
-const { concurrencyOption, offthreadVideoCacheSizeInBytesOption, x264Option, audioBitrateOption, videoBitrateOption, scaleOption, crfOption, jpegQualityOption, enforceAudioOption, overwriteOption, chromeModeOption, mutedOption, videoCodecOption, colorSpaceOption, disallowParallelEncodingOption, deleteAfterOption, folderExpiryOption, enableMultiprocessOnLinuxOption, glOption, headlessOption, numberOfGifLoopsOption, beepOnFinishOption, encodingMaxRateOption, encodingBufferSizeOption, reproOption, enableLambdaInsights, logLevelOption, delayRenderTimeoutInMillisecondsOption, publicDirOption, binariesDirectoryOption, preferLosslessOption, framesOption, forSeamlessAacConcatenationOption, audioCodecOption, publicPathOption, hardwareAccelerationOption, audioLatencyHintOption, enableCrossSiteIsolationOption, imageSequencePatternOption, darkModeOption, askAIOption, publicLicenseKeyOption, experimentalClientSideRenderingOption, experimentalVisualModeOption, keyboardShortcutsOption, forceNewStudioOption, numberOfSharedAudioTagsOption, ipv4Option, pixelFormatOption, browserExecutableOption, everyNthFrameOption, proResProfileOption, stillImageFormatOption, videoImageFormatOption, userAgentOption, disableWebSecurityOption, ignoreCertificateErrorsOption, overrideHeightOption, overrideWidthOption, overrideFpsOption, overrideDurationOption, rspackOption, outDirOption, webpackPollOption, imageSequenceOption, bundleCacheOption, envFileOption, runsOption, noOpenOption, } = client_1.BrowserSafeApis.options;
+const { benchmarkConcurrenciesOption, concurrencyOption, offthreadVideoCacheSizeInBytesOption, x264Option, audioBitrateOption, videoBitrateOption, scaleOption, crfOption, jpegQualityOption, enforceAudioOption, overwriteOption, chromeModeOption, mutedOption, videoCodecOption, colorSpaceOption, disallowParallelEncodingOption, deleteAfterOption, folderExpiryOption, enableMultiprocessOnLinuxOption, glOption, headlessOption, numberOfGifLoopsOption, beepOnFinishOption, encodingMaxRateOption, encodingBufferSizeOption, reproOption, enableLambdaInsights, logLevelOption, delayRenderTimeoutInMillisecondsOption, publicDirOption, binariesDirectoryOption, preferLosslessOption, framesOption, forSeamlessAacConcatenationOption, audioCodecOption, publicPathOption, hardwareAccelerationOption, audioLatencyHintOption, enableCrossSiteIsolationOption, imageSequencePatternOption, darkModeOption, askAIOption, publicLicenseKeyOption, experimentalClientSideRenderingOption, experimentalVisualModeOption, keyboardShortcutsOption, forceNewStudioOption, numberOfSharedAudioTagsOption, ipv4Option, pixelFormatOption, browserExecutableOption, everyNthFrameOption, proResProfileOption, stillImageFormatOption, videoImageFormatOption, userAgentOption, disableWebSecurityOption, ignoreCertificateErrorsOption, overrideHeightOption, overrideWidthOption, overrideFpsOption, overrideDurationOption, rspackOption, outDirOption, webpackPollOption, imageSequenceOption, bundleCacheOption, envFileOption, runsOption, noOpenOption, } = client_1.BrowserSafeApis.options;
 exports.Config = {
     get Bundling() {
         throw new Error('The config format has changed. Change `Config.Bundling.*()` calls to `Config.*()` in your config file.');
@@ -126,6 +126,7 @@ exports.Config = {
     setIPv4: ipv4Option.setConfig,
     setBundleOutDir: outDirOption.setConfig,
     setBenchmarkRuns: runsOption.setConfig,
+    setBenchmarkConcurrencies: benchmarkConcurrenciesOption.setConfig,
 };
 exports.ConfigInternals = {
     getBrowser: browser_1.getBrowser,

package/dist/config/number-of-shared-audio-tags.d.ts

@@ -0,0 +1,2 @@
+export declare const getNumberOfSharedAudioTags: () => number;
+export declare const setNumberOfSharedAudioTags: (audioTags: number) => void;

package/dist/config/number-of-shared-audio-tags.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setNumberOfSharedAudioTags = exports.getNumberOfSharedAudioTags = void 0;
+let numberOfSharedAudioTags = 0;
+const getNumberOfSharedAudioTags = () => {
+    return numberOfSharedAudioTags;
+};
+exports.getNumberOfSharedAudioTags = getNumberOfSharedAudioTags;
+const setNumberOfSharedAudioTags = (audioTags) => {
+    numberOfSharedAudioTags = audioTags;
+};
+exports.setNumberOfSharedAudioTags = setNumberOfSharedAudioTags;

package/dist/detect-remotion-server.d.ts

@@ -0,0 +1,9 @@
+type RemotionDetectionResult = {
+    type: 'match';
+} | {
+    type: 'mismatch';
+} | {
+    type: 'not-remotion';
+};
+export declare const detectRemotionServer: (port: number, cwd: string) => Promise<RemotionDetectionResult>;
+export {};

package/dist/detect-remotion-server.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectRemotionServer = void 0;
+const http_1 = __importDefault(require("http"));
+const detectRemotionServer = (port, cwd) => {
+    return new Promise((resolve) => {
+        const req = http_1.default.get({
+            hostname: 'localhost',
+            port,
+            path: '/__remotion_config',
+            timeout: 1000,
+        }, (res) => {
+            let data = '';
+            res.on('data', (chunk) => {
+                data += chunk;
+            });
+            res.on('end', () => {
+                try {
+                    const json = JSON.parse(data);
+                    if ((json === null || json === void 0 ? void 0 : json.isRemotion) !== true) {
+                        return resolve({ type: 'not-remotion' });
+                    }
+                    // Normalize paths for comparison to avoid issues with different separators or casing on Windows
+                    const normalize = (p) => p.replace(/\\/g, '/').toLowerCase();
+                    if (normalize(json.cwd) === normalize(cwd)) {
+                        return resolve({ type: 'match' });
+                    }
+                    return resolve({ type: 'mismatch' });
+                }
+                catch (_a) {
+                    resolve({ type: 'not-remotion' });
+                }
+            });
+        });
+        req.on('error', () => resolve({ type: 'not-remotion' }));
+        req.on('timeout', () => {
+            req.destroy();
+            resolve({ type: 'not-remotion' });
+        });
+    });
+};
+exports.detectRemotionServer = detectRemotionServer;

package/dist/extra-packages.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EXTRA_PACKAGES_DOCS = exports.EXTRA_PACKAGES = void 0;
 exports.EXTRA_PACKAGES = {
-    mediabunny: '1.34.5',
-    '@mediabunny/ac3': '1.34.5',
+    mediabunny: '1.35.1',
+    '@mediabunny/ac3': '1.35.1',
     zod: '4.3.6',
 };
 exports.EXTRA_PACKAGES_DOCS = {

package/dist/is-port-open.d.ts

@@ -0,0 +1 @@
+export declare const isPortOpen: (port: number) => Promise<boolean>;

package/dist/is-port-open.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPortOpen = void 0;
+const net_1 = require("net");
+const isPortOpen = (port) => {
+    return new Promise((resolve, reject) => {
+        const server = (0, net_1.createServer)();
+        server.once('error', (err) => {
+            if (err.code === 'EADDRINUSE') {
+                resolve(false);
+            }
+            else {
+                reject(err);
+            }
+        });
+        server.once('listening', () => {
+            server.close(() => {
+                resolve(true);
+            });
+        });
+        server.listen(port);
+    });
+};
+exports.isPortOpen = isPortOpen;

package/dist/parsed-cli.d.ts

@@ -1,6 +1,24 @@
 import type { AudioCodec, StillImageFormat, VideoImageFormat } from '@remotion/renderer';
 import type { TypeOfOption } from '@remotion/renderer/client';
-declare const beepOnFinishOption: {
+declare const benchmarkConcurrenciesOption: {
+    name: string;
+    cliFlag: "concurrencies";
+    description: () => import("react/jsx-runtime").JSX.Element;
+    ssrName: null;
+    docLink: string;
+    type: string | null;
+    getValue: ({ commandLine }: {
+        commandLine: Record<string, unknown>;
+    }) => {
+        value: string;
+        source: string;
+    } | {
+        value: null;
+        source: string;
+    };
+    setConfig: (value: string | null) => void;
+    id: "concurrencies";
+}, beepOnFinishOption: {
     name: string;
     cliFlag: "beep-on-finish";
     description: () => import("react/jsx-runtime").JSX.Element;
@@ -933,6 +951,21 @@ declare const beepOnFinishOption: {
     };
     setConfig: (value: boolean) => void;
     id: "disable-headless";
+}, delayRenderTimeoutInMillisecondsOption: {
+    name: string;
+    cliFlag: "timeout";
+    description: () => import("react/jsx-runtime").JSX.Element;
+    ssrName: "timeoutInMilliseconds";
+    docLink: string;
+    type: number;
+    getValue: ({ commandLine }: {
+        commandLine: Record<string, unknown>;
+    }) => {
+        source: string;
+        value: number;
+    };
+    setConfig: (value: number) => void;
+    id: "timeout";
 }, framesOption: {
     name: string;
     cliFlag: "frames";
@@ -1060,7 +1093,7 @@ export type CommandLineOptions = {
     [versionFlagOption.cliFlag]: TypeOfOption<typeof versionFlagOption>;
     [videoCodecOption.cliFlag]: TypeOfOption<typeof videoCodecOption>;
     [concurrencyOption.cliFlag]: TypeOfOption<typeof concurrencyOption>;
-    timeout: number;
+    [delayRenderTimeoutInMillisecondsOption.cliFlag]: TypeOfOption<typeof delayRenderTimeoutInMillisecondsOption>;
     [configOption.cliFlag]: TypeOfOption<typeof configOption>;
     ['public-dir']: string;
     [audioBitrateOption.cliFlag]: TypeOfOption<typeof audioBitrateOption>;
@@ -1070,7 +1103,6 @@ export type CommandLineOptions = {
     [audioCodecOption.cliFlag]: AudioCodec;
     [publicPathOption.cliFlag]: string;
     [crfOption.cliFlag]: TypeOfOption<typeof crfOption>;
-    force: boolean;
     output: string | undefined;
     [overwriteOption.cliFlag]: TypeOfOption<typeof overwriteOption>;
     png: boolean;
@@ -1096,7 +1128,7 @@ export type CommandLineOptions = {
     [overrideFpsOption.cliFlag]: TypeOfOption<typeof overrideFpsOption>;
     [overrideDurationOption.cliFlag]: TypeOfOption<typeof overrideDurationOption>;
     [runsOption.cliFlag]: TypeOfOption<typeof runsOption>;
-    concurrencies: string;
+    [benchmarkConcurrenciesOption.cliFlag]: TypeOfOption<typeof benchmarkConcurrenciesOption>;
     [enforceAudioOption.cliFlag]: TypeOfOption<typeof enforceAudioOption>;
     [glOption.cliFlag]: TypeOfOption<typeof glOption>;
     [packageManagerOption.cliFlag]: TypeOfOption<typeof packageManagerOption>;

package/dist/parsed-cli.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.quietFlagProvided = exports.parsedCli = exports.BooleanFlags = void 0;
 const client_1 = require("@remotion/renderer/client");
 const minimist_1 = __importDefault(require("minimist"));
-const { beepOnFinishOption, colorSpaceOption, concurrencyOption, disallowParallelEncodingOption, offthreadVideoCacheSizeInBytesOption, encodingBufferSizeOption, encodingMaxRateOption, deleteAfterOption, folderExpiryOption, enableMultiprocessOnLinuxOption, numberOfGifLoopsOption, x264Option, enforceAudioOption, jpegQualityOption, audioBitrateOption, videoBitrateOption, audioCodecOption, publicPathOption, audioLatencyHintOption, darkModeOption, publicLicenseKeyOption, forceNewStudioOption, numberOfSharedAudioTagsOption, ipv4Option, pixelFormatOption, browserExecutableOption, everyNthFrameOption, proResProfileOption, userAgentOption, disableWebSecurityOption, ignoreCertificateErrorsOption, overrideHeightOption, overrideWidthOption, overrideFpsOption, overrideDurationOption, outDirOption, packageManagerOption, webpackPollOption, keyboardShortcutsOption, experimentalClientSideRenderingOption, experimentalVisualModeOption, imageSequencePatternOption, scaleOption, overwriteOption, crfOption, logLevelOption, videoCodecOption, stillFrameOption, imageSequenceOption, versionFlagOption, bundleCacheOption, envFileOption, glOption, runsOption, reproOption, mutedOption, headlessOption, disableGitSourceOption, framesOption, forSeamlessAacConcatenationOption, isProductionOption, noOpenOption, portOption, propsOption, configOption, browserOption, } = client_1.BrowserSafeApis.options;
+const { benchmarkConcurrenciesOption, beepOnFinishOption, colorSpaceOption, concurrencyOption, disallowParallelEncodingOption, offthreadVideoCacheSizeInBytesOption, encodingBufferSizeOption, encodingMaxRateOption, deleteAfterOption, folderExpiryOption, enableMultiprocessOnLinuxOption, numberOfGifLoopsOption, x264Option, enforceAudioOption, jpegQualityOption, audioBitrateOption, videoBitrateOption, audioCodecOption, publicPathOption, audioLatencyHintOption, darkModeOption, publicLicenseKeyOption, forceNewStudioOption, numberOfSharedAudioTagsOption, ipv4Option, pixelFormatOption, browserExecutableOption, everyNthFrameOption, proResProfileOption, userAgentOption, disableWebSecurityOption, ignoreCertificateErrorsOption, overrideHeightOption, overrideWidthOption, overrideFpsOption, overrideDurationOption, outDirOption, packageManagerOption, webpackPollOption, keyboardShortcutsOption, experimentalClientSideRenderingOption, experimentalVisualModeOption, imageSequencePatternOption, scaleOption, overwriteOption, crfOption, logLevelOption, videoCodecOption, stillFrameOption, imageSequenceOption, versionFlagOption, bundleCacheOption, envFileOption, glOption, runsOption, reproOption, mutedOption, headlessOption, disableGitSourceOption, delayRenderTimeoutInMillisecondsOption, framesOption, forSeamlessAacConcatenationOption, isProductionOption, noOpenOption, portOption, propsOption, configOption, browserOption, } = client_1.BrowserSafeApis.options;
 exports.BooleanFlags = [
     overwriteOption.cliFlag,
     imageSequenceOption.cliFlag,

package/dist/upgrade.js

@@ -4,6 +4,7 @@ exports.upgradeCommand = void 0;
 const node_child_process_1 = require("node:child_process");
 const renderer_1 = require("@remotion/renderer");
 const studio_server_1 = require("@remotion/studio-server");
+const catalog_utils_1 = require("./catalog-utils");
 const chalk_1 = require("./chalk");
 const extra_packages_1 = require("./extra-packages");
 const list_of_remotion_packages_1 = require("./list-of-remotion-packages");
@@ -26,7 +27,8 @@ const getExtraPackageVersionsForRemotionVersion = (remotionVersion) => {
     }
 };
 const upgradeCommand = async ({ remotionRoot, packageManager, version, logLevel, args, }) => {
-    const { dependencies, devDependencies, optionalDependencies, peerDependencies, } = studio_server_1.StudioServerInternals.getInstalledDependencies(remotionRoot);
+    var _a;
+    const depsWithVersions = studio_server_1.StudioServerInternals.getInstalledDependenciesWithVersions(remotionRoot);
     let targetVersion;
     if (version) {
         targetVersion = version;
@@ -48,32 +50,89 @@ const upgradeCommand = async ({ remotionRoot, packageManager, version, logLevel,
             .join(', ')}). Install dependencies using your favorite manager!`);
     }
     const allDeps = [
-        ...dependencies,
-        ...devDependencies,
-        ...optionalDependencies,
-        ...peerDependencies,
+        ...Object.keys(depsWithVersions.dependencies),
+        ...Object.keys(depsWithVersions.devDependencies),
+        ...Object.keys(depsWithVersions.optionalDependencies),
+        ...Object.keys(depsWithVersions.peerDependencies),
     ];
     const remotionToUpgrade = list_of_remotion_packages_1.listOfRemotionPackages.filter((u) => allDeps.includes(u));
-    // Check if extra packages (zod, mediabunny) are installed
     const installedExtraPackages = Object.keys(extra_packages_1.EXTRA_PACKAGES).filter((pkg) => allDeps.includes(pkg));
-    // Get the correct versions for extra packages for this Remotion version
     const extraPackageVersions = getExtraPackageVersionsForRemotionVersion(targetVersion);
-    // Build the list of packages to upgrade
-    const packagesWithVersions = [
-        ...remotionToUpgrade.map((pkg) => `${pkg}@${targetVersion}`),
-        ...installedExtraPackages.map((pkg) => `${pkg}@${extraPackageVersions[pkg]}`),
-    ];
     if (installedExtraPackages.length > 0) {
         log_1.Log.info({ indent: false, logLevel }, `Also upgrading extra packages: ${installedExtraPackages.map((pkg) => `${pkg}@${extraPackageVersions[pkg]}`).join(', ')}`);
     }
-    const command = studio_server_1.StudioServerInternals.getInstallCommand({
-        manager: manager.manager,
-        packages: packagesWithVersions,
-        version: '',
-        additionalArgs: args,
-    });
-    log_1.Log.info({ indent: false, logLevel }, chalk_1.chalk.gray(`$ ${manager.manager} ${command.join(' ')}`));
-    const task = (0, node_child_process_1.spawn)(manager.manager, command, {
+    const allPackagesToUpgrade = [
+        ...remotionToUpgrade,
+        ...installedExtraPackages,
+    ];
+    const normalPackages = [];
+    const catalogPackages = [];
+    for (const pkg of allPackagesToUpgrade) {
+        const versionSpec = (0, catalog_utils_1.findVersionSpecifier)(depsWithVersions, pkg);
+        const targetVersionForPkg = (_a = extraPackageVersions[pkg]) !== null && _a !== void 0 ? _a : targetVersion;
+        if (versionSpec && (0, catalog_utils_1.isCatalogProtocol)(versionSpec)) {
+            catalogPackages.push({ pkg, version: targetVersionForPkg });
+        }
+        else {
+            normalPackages.push({ pkg, version: targetVersionForPkg });
+        }
+    }
+    if (catalogPackages.length > 0) {
+        const workspaceRoot = (0, catalog_utils_1.findWorkspaceRoot)(remotionRoot);
+        if (workspaceRoot) {
+            const updatedCatalogEntries = [];
+            for (const { pkg, version: pkgVersion } of catalogPackages) {
+                const didUpdate = (0, catalog_utils_1.updateCatalogEntry)({
+                    workspaceRoot,
+                    pkg,
+                    newVersion: pkgVersion,
+                });
+                if (didUpdate) {
+                    updatedCatalogEntries.push(`${pkg}@${pkgVersion}`);
+                }
+                else {
+                    normalPackages.push({ pkg, version: pkgVersion });
+                }
+            }
+            if (updatedCatalogEntries.length > 0) {
+                log_1.Log.info({ indent: false, logLevel }, chalk_1.chalk.green(`Updated catalog entries: ${updatedCatalogEntries.join(', ')}`));
+            }
+        }
+        else {
+            for (const catalogPkg of catalogPackages) {
+                normalPackages.push(catalogPkg);
+            }
+        }
+    }
+    const packagesWithVersions = normalPackages.map(({ pkg, version: pkgVersion }) => `${pkg}@${pkgVersion}`);
+    if (packagesWithVersions.length > 0) {
+        const command = studio_server_1.StudioServerInternals.getInstallCommand({
+            manager: manager.manager,
+            packages: packagesWithVersions,
+            version: '',
+            additionalArgs: args,
+        });
+        log_1.Log.info({ indent: false, logLevel }, chalk_1.chalk.gray(`$ ${manager.manager} ${command.join(' ')}`));
+        await runPackageManagerCommand({
+            manager: manager.manager,
+            command,
+            logLevel,
+        });
+    }
+    if (catalogPackages.length > 0 && packagesWithVersions.length === 0) {
+        log_1.Log.info({ indent: false, logLevel }, chalk_1.chalk.gray(`$ ${manager.manager} install`));
+        await runPackageManagerCommand({
+            manager: manager.manager,
+            command: ['install'],
+            logLevel,
+        });
+    }
+    log_1.Log.info({ indent: false, logLevel }, '⏫ Remotion has been upgraded!');
+    log_1.Log.info({ indent: false, logLevel }, 'https://remotion.dev/changelog');
+};
+exports.upgradeCommand = upgradeCommand;
+const runPackageManagerCommand = async ({ manager, command, logLevel, }) => {
+    const task = (0, node_child_process_1.spawn)(manager, command, {
         env: {
             ...process.env,
             ADBLOCK: '1',
@@ -96,7 +155,4 @@ const upgradeCommand = async ({ remotionRoot, packageManager, version, logLevel,
             }
         });
     });
-    log_1.Log.info({ indent: false, logLevel }, '⏫ Remotion has been upgraded!');
-    log_1.Log.info({ indent: false, logLevel }, 'https://remotion.dev/changelog');
 };
-exports.upgradeCommand = upgradeCommand;

package/package.json

@@ -3,7 +3,7 @@
 		"url": "https://github.com/remotion-dev/remotion/tree/main/packages/cli"
 	},
 	"name": "@remotion/cli",
-	"version": "4.0.429",
+	"version": "4.0.430",
 	"description": "Control Remotion features using the `npx remotion` command",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -14,6 +14,7 @@
 	},
 	"scripts": {
 		"formatting": "oxfmt src --check",
+		"format": "oxfmt src",
 		"lint": "eslint src",
 		"test": "bun test src",
 		"make": "tsgo -d"