@remotion/cli 3.3.38 → 3.3.40

package/dist/render-flows/render.js

@@ -14,7 +14,6 @@ const get_cli_options_1 = require("../get-cli-options");
 const get_composition_with_dimension_override_1 = require("../get-composition-with-dimension-override");
 const get_filename_1 = require("../get-filename");
 const get_final_output_codec_1 = require("../get-final-output-codec");
-const get_render_media_options_1 = require("../get-render-media-options");
 const image_formats_1 = require("../image-formats");
 const log_1 = require("../log");
 const parse_command_line_1 = require("../parse-command-line");
@@ -22,7 +21,7 @@ const progress_bar_1 = require("../progress-bar");
 const setup_cache_1 = require("../setup-cache");
 const truthy_1 = require("../truthy");
 const user_passed_output_location_1 = require("../user-passed-output-location");
-const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable, ffprobeExecutable, indent, logLevel, browserExecutable, browser, chromiumOptions, scale, shouldOutputImageSequence, publicDir, inputProps, envVariables, puppeteerTimeout, port, height, width, remainingArgs, compositionIdFromUi, entryPointReason, overwrite, quiet, concurrency, frameRange, everyNthFrame, configFileImageFormat, outputLocationFromUI, quality, onProgress, addCleanupCallback, uiCodec, uiImageFormat, cancelSignal, }) => {
+const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable, ffprobeExecutable, indent, logLevel, browserExecutable, browser, chromiumOptions, scale, shouldOutputImageSequence, publicDir, inputProps, envVariables, puppeteerTimeout, port, height, width, remainingArgs, compositionIdFromUi, entryPointReason, overwrite, quiet, concurrency, frameRange, everyNthFrame, configFileImageFormat, outputLocationFromUI, quality, onProgress, addCleanupCallback, cancelSignal, crf, uiCodec, uiImageFormat, ffmpegOverride, audioBitrate, muted, enforceAudioTrack, proResProfile, pixelFormat, videoBitrate, numberOfGifLoops, }) => {
     var _a;
     const downloads = [];
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
@@ -101,7 +100,7 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
         outName: (0, user_passed_output_location_1.getUserPassedOutputLocation)(argsAfterComposition),
         uiCodec,
     });
-    (0, get_cli_options_1.validateFfmpegCanUseCodec)(codec, remotionRoot);
+    await (0, get_cli_options_1.validateFfmpegCanUseCodec)(codec, remotionRoot);
     renderer_1.RenderInternals.validateEvenDimensionsWithCodec({
         width: config.width,
         height: config.height,
@@ -112,7 +111,7 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
         codec,
         imageSequence: shouldOutputImageSequence,
         compositionName: compositionId,
-        defaultExtension: renderer_1.RenderInternals.getFileExtensionFromCodec(codec, 'final'),
+        defaultExtension: renderer_1.RenderInternals.getFileExtensionFromCodec(codec),
         args: argsAfterComposition,
         indent,
         fromUi: outputLocationFromUI,
@@ -135,6 +134,7 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
     let encodedDoneIn = null;
     let renderedDoneIn = null;
     let stitchStage = 'encoding';
+    const actualConcurrency = renderer_1.RenderInternals.getActualConcurrency(concurrency);
     const updateRenderProgress = () => {
         if (totalFrames.length === 0) {
             throw new Error('totalFrames should not be 0');
@@ -143,7 +143,7 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
             rendering: {
                 frames: renderedFrames,
                 totalFrames: totalFrames.length,
-                concurrency: renderer_1.RenderInternals.getActualConcurrency(concurrency),
+                concurrency: actualConcurrency,
                 doneIn: renderedDoneIn,
                 steps,
             },
@@ -202,7 +202,7 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
             everyNthFrame,
             envVariables,
             frameRange,
-            concurrency,
+            concurrency: actualConcurrency,
             puppeteerInstance,
             quality,
             timeoutInMilliseconds: puppeteerTimeout,
@@ -215,17 +215,43 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
             downloadMap,
         });
         updateRenderProgress();
+        process.stdout.write('\n');
         log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.cyan(`▶ ${absoluteOutputFile}`));
     }
-    const options = await (0, get_render_media_options_1.getRenderMediaOptions)({
-        config,
+    await (0, renderer_1.renderMedia)({
         outputLocation: absoluteOutputFile,
+        composition: {
+            ...config,
+            width: width !== null && width !== void 0 ? width : config.width,
+            height: height !== null && height !== void 0 ? height : config.height,
+        },
+        crf,
+        envVariables,
+        ffmpegExecutable,
+        ffprobeExecutable,
+        frameRange,
+        inputProps,
+        overwrite,
+        pixelFormat,
+        proResProfile,
+        quality,
+        dumpBrowserLogs: renderer_1.RenderInternals.isEqualOrBelowLogLevel(logLevel, 'verbose'),
+        chromiumOptions,
+        timeoutInMilliseconds: config_1.ConfigInternals.getCurrentPuppeteerTimeout(),
+        scale,
+        port,
+        numberOfGifLoops,
+        everyNthFrame,
+        verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(logLevel, 'verbose'),
+        muted,
+        enforceAudioTrack,
+        browserExecutable,
+        ffmpegOverride,
+        concurrency,
         serveUrl: urlOrBundle,
         codec,
-        remotionRoot,
-    });
-    await (0, renderer_1.renderMedia)({
-        ...options,
+        audioBitrate,
+        videoBitrate,
         onProgress: (update) => {
             encodedDoneIn = update.encodedDoneIn;
             encodedFrames = update.encodedFrames;
@@ -247,7 +273,8 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
         },
         printLog: (...str) => log_1.Log.verboseAdvanced({ indent, logLevel }, ...str),
     });
-    log_1.Log.infoAdvanced({ indent, logLevel });
+    updateRenderProgress();
+    process.stdout.write('\n');
     log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.cyan(`▶ ${absoluteOutputFile}`));
     for (const line of renderer_1.RenderInternals.perf.getPerf()) {
         log_1.Log.verboseAdvanced({ indent, logLevel }, line);

package/dist/render.js

@@ -32,9 +32,6 @@ const render = async (remotionRoot, args) => {
         log_1.Log.error('Documentation: https://www.remotion.dev/docs/render');
         process.exit(1);
     }
-    const fullPath = renderer_1.RenderInternals.isServeUrl(file)
-        ? file
-        : path_1.default.join(process.cwd(), file);
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
     if (parse_command_line_1.parsedCli.frame) {
         log_1.Log.error('--frame flag was passed to the `render` command. This flag only works with the `still` command. Did you mean `--frames`? See reference: https://www.remotion.dev/docs/cli/');
@@ -59,12 +56,12 @@ const render = async (remotionRoot, args) => {
         forceDeviceScaleFactor: scale,
     });
     const steps = [
-        renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
+        renderer_1.RenderInternals.isServeUrl(file) ? null : 'bundling',
         'rendering',
         shouldOutputImageSequence ? null : 'stitching',
     ].filter(remotion_1.Internals.truthy);
     const { urlOrBundle, cleanup: cleanupBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({
-        fullPath,
+        fullPath: file,
         remotionRoot,
         steps,
         publicDir,
@@ -122,7 +119,7 @@ const render = async (remotionRoot, args) => {
         defaultExtension: renderer_1.RenderInternals.getFileExtensionFromCodec(codec),
         args: argsAfterComposition,
     });
-    log_1.Log.info(chalk_1.chalk.gray(`Entry point = ${file} (${entryPointReason}), Composition = ${compositionId} (${reason}), Codec = ${codec} (${codecReason}), Output = ${relativeOutputLocation}`));
+    log_1.Log.info(chalk_1.chalk.gray(`Entry point = ${path_1.default.relative(process.cwd(), file)} (${entryPointReason}), Composition = ${compositionId} (${reason}), Codec = ${codec} (${codecReason}), Output = ${relativeOutputLocation}`));
     const absoluteOutputFile = (0, get_cli_options_1.getAndValidateAbsoluteOutputFile)(relativeOutputLocation, overwrite);
     const outputDir = shouldOutputImageSequence
         ? absoluteOutputFile

package/dist/still.js

@@ -29,9 +29,6 @@ const still = async (remotionRoot, args) => {
         log_1.Log.error('Documentation: https://www.remotion.dev/docs/render');
         process.exit(1);
     }
-    const fullPath = renderer_1.RenderInternals.isServeUrl(file)
-        ? file
-        : path_1.default.join(process.cwd(), file);
     if (parse_command_line_1.parsedCli.frames) {
         log_1.Log.error('--frames flag was passed to the `still` command. This flag only works with the `render` command. Did you mean `--frame`? See reference: https://www.remotion.dev/docs/cli/');
         process.exit(1);
@@ -49,10 +46,10 @@ const still = async (remotionRoot, args) => {
         forceDeviceScaleFactor: scale,
     });
     const steps = [
-        renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
+        renderer_1.RenderInternals.isServeUrl(file) ? null : 'bundling',
         'rendering',
     ].filter(truthy_1.truthy);
-    const { cleanup: cleanupBundle, urlOrBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({ fullPath, remotionRoot, steps, publicDir });
+    const { cleanup: cleanupBundle, urlOrBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({ fullPath: file, remotionRoot, steps, publicDir });
     const puppeteerInstance = await browserInstance;
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
     const comps = await (0, renderer_1.getCompositions)(urlOrBundle, {

package/dist/upgrade.js

@@ -21,10 +21,13 @@ const getUpgradeCommand = ({ manager, packages, version, }) => {
     return commands[manager];
 };
 const upgrade = async (remotionRoot, packageManager) => {
-    var _a;
+    var _a, _b, _c, _d;
     const packageJsonFilePath = path_1.default.join(remotionRoot, 'package.json');
     const packageJson = require(packageJsonFilePath);
     const dependencies = Object.keys(packageJson.dependencies);
+    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);
     const manager = (0, get_package_manager_1.getPackageManager)(remotionRoot, packageManager);
@@ -33,7 +36,10 @@ const upgrade = async (remotionRoot, packageManager) => {
             .map((p) => p.path)
             .join(', ')}). Install dependencies using your favorite manager!`);
     }
-    const toUpgrade = list_of_remotion_packages_1.listOfRemotionPackages.filter((u) => dependencies.includes(u));
+    const toUpgrade = list_of_remotion_packages_1.listOfRemotionPackages.filter((u) => dependencies.includes(u) ||
+        devDependencies.includes(u) ||
+        optionalDependencies.includes(u) ||
+        peerDependencies.includes(u));
     const prom = renderer_1.RenderInternals.execa(manager.manager, getUpgradeCommand({
         manager: manager.manager,
         packages: toUpgrade,
@@ -42,7 +48,7 @@ const upgrade = async (remotionRoot, packageManager) => {
         stdio: 'inherit',
     });
     if (renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'info')) {
-        (_a = prom.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
+        (_d = prom.stdout) === null || _d === void 0 ? void 0 : _d.pipe(process.stdout);
     }
     await prom;
     log_1.Log.info('⏫ Remotion has been upgraded!');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.3.38",
+	"version": "3.3.40",
 	"description": "CLI for Remotion",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -22,16 +22,16 @@
 	"author": "Jonny Burger <jonny@remotion.dev>",
 	"license": "SEE LICENSE IN LICENSE.md",
 	"dependencies": {
-		"@remotion/bundler": "3.3.38",
-		"@remotion/media-utils": "3.3.38",
-		"@remotion/player": "3.3.38",
-		"@remotion/renderer": "3.3.38",
+		"@remotion/bundler": "3.3.40",
+		"@remotion/media-utils": "3.3.40",
+		"@remotion/player": "3.3.40",
+		"@remotion/renderer": "3.3.40",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
 		"prompts": "2.4.1",
-		"remotion": "3.3.38",
+		"remotion": "3.3.40",
 		"semver": "7.3.5",
 		"source-map": "0.6.1"
 	},
@@ -71,5 +71,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "ac58695e452e58deb5c010f09bcc94d036930e6c"
+	"gitHead": "be5f606a81761f7f8e1e191ebabd5f8d225d8c09"
 }