@remotion/cli 3.2.43-retry.19 → 3.3.0

package/dist/benchmark.js

@@ -101,6 +101,7 @@ const benchmarkCommand = async (remotionRoot, args) => {
     const { inputProps, envVariables, browserExecutable, ffmpegExecutable, ffprobeExecutable, chromiumOptions, port, puppeteerTimeout, browser, scale, publicDir, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
         type: 'series',
+        remotionRoot,
     });
     log_1.Log.verbose('Entry point:', file, 'reason:', reason);
     const browserInstance = (0, renderer_1.openBrowser)(browser, {
@@ -154,6 +155,7 @@ const benchmarkCommand = async (remotionRoot, args) => {
             outputLocation: undefined,
             serveUrl: bundleLocation,
             codec,
+            remotionRoot,
         });
         const concurrency = getValidConcurrency(renderMediaOptions);
         benchmark[composition.id] = {};

package/dist/compositions.js

@@ -29,7 +29,7 @@ const listCompositionsCommand = async (remotionRoot, args) => {
     const { file, reason } = (0, entry_point_1.findEntryPoint)(args, remotionRoot);
     if (!file) {
         log_1.Log.error('The `compositions` command requires you to specify a entry point. For example');
-        log_1.Log.error('  npx remotion compositions src/index.tsx');
+        log_1.Log.error('  npx remotion compositions src/index.ts');
         log_1.Log.error('See https://www.remotion.dev/docs/register-root for more information.');
         process.exit(1);
     }
@@ -40,6 +40,7 @@ const listCompositionsCommand = async (remotionRoot, args) => {
     const { browserExecutable, ffmpegExecutable, ffprobeExecutable, chromiumOptions, envVariables, inputProps, puppeteerTimeout, port, publicDir, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
         type: 'get-compositions',
+        remotionRoot,
     });
     const { urlOrBundle: bundled, cleanup: cleanupBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({
         remotionRoot,

package/dist/deps.d.ts

@@ -0,0 +1,2 @@
+export declare const INSTALL_COMMAND: "install";
+export declare const installCommand: (remotionRoot: string, args: string[]) => Promise<void>;

package/dist/deps.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.installCommand = exports.INSTALL_COMMAND = void 0;
+const renderer_1 = require("@remotion/renderer");
+const log_1 = require("./log");
+exports.INSTALL_COMMAND = 'install';
+const installCommand = async (remotionRoot, args) => {
+    const firstArg = args[0];
+    if (firstArg === 'ffmpeg') {
+        const { wasAlreadyInstalled } = await (0, renderer_1.ensureFfmpeg)({ remotionRoot });
+        if (wasAlreadyInstalled) {
+            log_1.Log.info('FFmpeg is already installed');
+        }
+        else {
+            log_1.Log.info('Successfully installed FFmpeg');
+        }
+        return;
+    }
+    if (firstArg === 'ffprobe') {
+        const { wasAlreadyInstalled } = await (0, renderer_1.ensureFfprobe)({ remotionRoot });
+        if (wasAlreadyInstalled) {
+            log_1.Log.info('FFmpeg is already installed');
+        }
+        else {
+            log_1.Log.info('Successfully installed FFmpeg');
+        }
+        return;
+    }
+    log_1.Log.error('Please specify either "ffmpeg" or "ffprobe" as the first argument to the install command');
+    log_1.Log.error();
+    log_1.Log.info('Example Usage: ');
+    log_1.Log.info(' remotion install ffmpeg');
+    log_1.Log.info(' remotion install ffprobe');
+    process.exit(1);
+};
+exports.installCommand = installCommand;

package/dist/entry-point.js

@@ -9,12 +9,12 @@ const path_1 = __importDefault(require("path"));
 const config_1 = require("./config");
 const log_1 = require("./log");
 const candidates = [
+    path_1.default.join('src', 'index.ts'),
+    path_1.default.join('src', 'index.tsx'),
+    path_1.default.join('src', 'index.js'),
     path_1.default.join('remotion', 'index.tsx'),
     path_1.default.join('remotion', 'index.ts'),
     path_1.default.join('remotion', 'index.js'),
-    path_1.default.join('src', 'index.tsx'),
-    path_1.default.join('src', 'index.ts'),
-    path_1.default.join('src', 'index.js'),
 ];
 const findCommonPath = (remotionRoot) => {
     return candidates.find((candidate) => (0, fs_1.existsSync)(path_1.default.resolve(remotionRoot, candidate)));

package/dist/get-cli-options.d.ts

@@ -1,5 +1,5 @@
 import type { BrowserExecutable, ChromiumOptions, Codec, FrameRange } from '@remotion/renderer';
-export declare const validateFfmpegCanUseCodec: (codec: Codec) => Promise<void>;
+export declare const validateFfmepgCanUseCodec: (codec: Codec, remotionRoot: string) => Promise<void>;
 export declare const getFinalCodec: (options: {
     downloadName: string | null;
     outName: string | null;
@@ -11,6 +11,7 @@ export declare const getAndValidateAbsoluteOutputFile: (relativeOutputLocation:
 export declare const getCliOptions: (options: {
     isLambda: boolean;
     type: 'still' | 'series' | 'get-compositions';
+    remotionRoot: string;
 }) => Promise<{
     puppeteerTimeout: number;
     concurrency: number | null;

package/dist/get-cli-options.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCliOptions = exports.getAndValidateAbsoluteOutputFile = exports.getFinalCodec = exports.validateFfmpegCanUseCodec = void 0;
+exports.getCliOptions = exports.getAndValidateAbsoluteOutputFile = exports.getFinalCodec = exports.validateFfmepgCanUseCodec = void 0;
 const renderer_1 = require("@remotion/renderer");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -22,12 +22,13 @@ const getAndValidateFrameRange = () => {
     }
     return frameRange;
 };
-const validateFfmpegCanUseCodec = async (codec) => {
+const validateFfmepgCanUseCodec = async (codec, remotionRoot) => {
     const ffmpegExecutable = config_1.ConfigInternals.getCustomFfmpegExecutable();
     if (codec === 'vp8' &&
         !(await renderer_1.RenderInternals.ffmpegHasFeature({
             feature: 'enable-libvpx',
             ffmpegExecutable,
+            remotionRoot,
         }))) {
         log_1.Log.error("The Vp8 codec has been selected, but your FFMPEG binary wasn't compiled with the --enable-lipvpx flag.");
         log_1.Log.error('This does not work, please switch out your FFMPEG binary or choose a different codec.');
@@ -36,6 +37,7 @@ const validateFfmpegCanUseCodec = async (codec) => {
         !(await renderer_1.RenderInternals.ffmpegHasFeature({
             feature: 'enable-gpl',
             ffmpegExecutable,
+            remotionRoot,
         }))) {
         log_1.Log.error("The H265 codec has been selected, but your FFMPEG binary wasn't compiled with the --enable-gpl flag.");
         log_1.Log.error('This does not work, please recompile your FFMPEG binary with --enable-gpl --enable-libx265 or choose a different codec.');
@@ -44,12 +46,13 @@ const validateFfmpegCanUseCodec = async (codec) => {
         !(await renderer_1.RenderInternals.ffmpegHasFeature({
             feature: 'enable-libx265',
             ffmpegExecutable,
+            remotionRoot,
         }))) {
         log_1.Log.error("The H265 codec has been selected, but your FFMPEG binary wasn't compiled with the --enable-libx265 flag.");
         log_1.Log.error('This does not work, please recompile your FFMPEG binary with --enable-gpl --enable-libx265 or choose a different codec.');
     }
 };
-exports.validateFfmpegCanUseCodec = validateFfmpegCanUseCodec;
+exports.validateFfmepgCanUseCodec = validateFfmepgCanUseCodec;
 const getFinalCodec = (options) => {
     var _a;
     const { codec, reason } = (0, get_final_output_codec_1.getFinalOutputCodec)({
@@ -71,11 +74,11 @@ const getAndValidateAbsoluteOutputFile = (relativeOutputLocation, overwrite) =>
     return absoluteOutputFile;
 };
 exports.getAndValidateAbsoluteOutputFile = getAndValidateAbsoluteOutputFile;
-const getAndValidateShouldOutputImageSequence = async ({ frameRange, isLambda, }) => {
+const getAndValidateShouldOutputImageSequence = async ({ frameRange, isLambda, remotionRoot, }) => {
     const shouldOutputImageSequence = config_1.ConfigInternals.getShouldOutputImageSequence(frameRange);
     // When parsing options locally, we don't need FFMPEG because the render will happen on Lambda
     if (!shouldOutputImageSequence && !isLambda) {
-        await renderer_1.RenderInternals.validateFfmpeg(config_1.ConfigInternals.getCustomFfmpegExecutable());
+        await renderer_1.RenderInternals.validateFfmpeg(config_1.ConfigInternals.getCustomFfmpegExecutable(), remotionRoot, 'ffmpeg');
     }
     return shouldOutputImageSequence;
 };
@@ -109,6 +112,7 @@ const getCliOptions = async (options) => {
         : await getAndValidateShouldOutputImageSequence({
             frameRange,
             isLambda: options.isLambda,
+            remotionRoot: options.remotionRoot,
         });
     const overwrite = config_1.ConfigInternals.getShouldOverwrite({
         defaultValue: !options.isLambda,

package/dist/get-env.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEnvironmentVariables = void 0;
+const renderer_1 = require("@remotion/renderer");
 const dotenv_1 = __importDefault(require("dotenv"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const chalk_1 = require("./chalk");
 const config_1 = require("./config");
-const find_closest_package_json_1 = require("./find-closest-package-json");
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
 function getProcessEnv() {
@@ -91,7 +91,7 @@ const getEnvironmentVariables = (onUpdate) => {
         }
         return getEnvForEnvFile(processEnv, envFile, onUpdate);
     }
-    const remotionRoot = (0, find_closest_package_json_1.findRemotionRoot)();
+    const remotionRoot = renderer_1.RenderInternals.findRemotionRoot();
     const configFileSetting = config_1.ConfigInternals.getDotEnvLocation();
     if (configFileSetting) {
         const envFile = path_1.default.resolve(remotionRoot, configFileSetting);

package/dist/get-render-media-options.d.ts

@@ -1,7 +1,8 @@
 import type { Codec, RenderMediaOptions } from '@remotion/renderer';
-export declare const getRenderMediaOptions: ({ outputLocation, config, serveUrl, codec, }: {
+export declare const getRenderMediaOptions: ({ outputLocation, config, serveUrl, codec, remotionRoot, }: {
     outputLocation: RenderMediaOptions['outputLocation'];
     config: RenderMediaOptions['composition'];
     serveUrl: string;
     codec: Codec;
+    remotionRoot: string;
 }) => Promise<RenderMediaOptions>;

package/dist/get-render-media-options.js

@@ -5,10 +5,11 @@ const renderer_1 = require("@remotion/renderer");
 const config_1 = require("./config");
 const get_cli_options_1 = require("./get-cli-options");
 const image_formats_1 = require("./image-formats");
-const getRenderMediaOptions = async ({ outputLocation, config, serveUrl, codec, }) => {
+const getRenderMediaOptions = async ({ outputLocation, config, serveUrl, codec, remotionRoot, }) => {
     const { proResProfile, concurrency, frameRange, overwrite, inputProps, envVariables, quality, crf, pixelFormat, browserExecutable, ffmpegExecutable, ffprobeExecutable, scale, chromiumOptions, port, numberOfGifLoops, everyNthFrame, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, height, width, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
         type: 'series',
+        remotionRoot,
     });
     const imageFormat = (0, image_formats_1.getImageFormat)(codec);
     return {

package/dist/index.d.ts

@@ -69,6 +69,7 @@ export declare const CliInternals: {
     getCliOptions: (options: {
         isLambda: boolean;
         type: "still" | "series" | "get-compositions";
+        remotionRoot: string;
     }) => Promise<{
         puppeteerTimeout: number;
         concurrency: number | null;
@@ -114,7 +115,6 @@ export declare const CliInternals: {
         signed: boolean;
     }) => string;
     getFileSizeDownloadBar: (downloaded: number) => string;
-    findRemotionRoot: () => string;
     getFinalCodec: (options: {
         downloadName: string | null;
         outName: string | null;

package/dist/index.js

@@ -27,13 +27,13 @@ const index_1 = require("./config/index");
 const determine_image_format_1 = require("./determine-image-format");
 const download_progress_1 = require("./download-progress");
 const entry_point_1 = require("./entry-point");
-const find_closest_package_json_1 = require("./find-closest-package-json");
 const format_bytes_1 = require("./format-bytes");
 const get_cli_options_1 = require("./get-cli-options");
 const get_config_file_name_1 = require("./get-config-file-name");
 const handle_common_errors_1 = require("./handle-common-errors");
 const image_formats_1 = require("./image-formats");
 const initialize_cli_1 = require("./initialize-cli");
+const install_1 = require("./install");
 const lambda_command_1 = require("./lambda-command");
 const log_1 = require("./log");
 const make_progress_bar_1 = require("./make-progress-bar");
@@ -53,7 +53,7 @@ const cli = async () => {
         (0, print_help_1.printHelp)();
         process.exit(0);
     }
-    const remotionRoot = (0, find_closest_package_json_1.findRemotionRoot)();
+    const remotionRoot = renderer_1.RenderInternals.findRemotionRoot();
     if (command !== versions_1.VERSIONS_COMMAND) {
         await (0, versions_1.validateVersionsBeforeCommand)(remotionRoot);
     }
@@ -81,6 +81,9 @@ const cli = async () => {
         else if (command === versions_1.VERSIONS_COMMAND) {
             await (0, versions_1.versionsCommand)(remotionRoot);
         }
+        else if (command === install_1.INSTALL_COMMAND) {
+            await (0, install_1.installCommand)(remotionRoot, args);
+        }
         else if (command === 'benchmark') {
             await (0, benchmark_1.benchmarkCommand)(remotionRoot, args);
         }
@@ -124,7 +127,6 @@ exports.CliInternals = {
     handleCommonError: handle_common_errors_1.handleCommonError,
     formatBytes: format_bytes_1.formatBytes,
     getFileSizeDownloadBar: download_progress_1.getFileSizeDownloadBar,
-    findRemotionRoot: find_closest_package_json_1.findRemotionRoot,
     getFinalCodec: get_cli_options_1.getFinalCodec,
     determineFinalImageFormat: determine_image_format_1.determineFinalImageFormat,
     minimist: minimist_1.default,

package/dist/install.d.ts

@@ -0,0 +1,2 @@
+export declare const INSTALL_COMMAND: "install";
+export declare const installCommand: (remotionRoot: string, args: string[]) => Promise<void>;

package/dist/install.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.installCommand = exports.INSTALL_COMMAND = void 0;
+const renderer_1 = require("@remotion/renderer");
+const log_1 = require("./log");
+exports.INSTALL_COMMAND = 'install';
+const installCommand = async (remotionRoot, args) => {
+    const firstArg = args[0];
+    if (firstArg === 'ffmpeg') {
+        const { wasAlreadyInstalled } = await (0, renderer_1.ensureFfmpeg)({ remotionRoot });
+        if (wasAlreadyInstalled) {
+            log_1.Log.info('FFmpeg is already installed');
+        }
+        else {
+            log_1.Log.info('Successfully installed FFmpeg');
+        }
+        return;
+    }
+    if (firstArg === 'ffprobe') {
+        const { wasAlreadyInstalled } = await (0, renderer_1.ensureFfprobe)({ remotionRoot });
+        if (wasAlreadyInstalled) {
+            log_1.Log.info('FFmpeg is already installed');
+        }
+        else {
+            log_1.Log.info('Successfully installed FFmpeg');
+        }
+        return;
+    }
+    log_1.Log.error('Please specify either "ffmpeg" or "ffprobe" as the first argument to the install command');
+    log_1.Log.error();
+    log_1.Log.info('Example Usage: ');
+    log_1.Log.info(' remotion install ffmpeg');
+    log_1.Log.info(' remotion install ffprobe');
+    process.exit(1);
+};
+exports.installCommand = installCommand;

package/dist/preview-server/project-info.js

@@ -8,7 +8,15 @@ const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const getProjectInfo = (remotionRoot) => {
     var _a;
-    const pathsToLookFor = ['src/Video.tsx', 'src/Video.jsx'].map((p) => {
+    const pathsToLookFor = [
+        'src/Root.tsx',
+        'src/Root.jsx',
+        'remotion/Root.tsx',
+        'remotion/Root.jsx',
+        'app/remotion/Root.tsx',
+        'src/Video.tsx',
+        'src/Video.jsx',
+    ].map((p) => {
         return path_1.default.join(remotionRoot, p);
     });
     const videoFile = (_a = pathsToLookFor.find((p) => (0, fs_1.existsSync)(p))) !== null && _a !== void 0 ? _a : null;

package/dist/preview.js

@@ -37,7 +37,7 @@ const previewCommand = async (remotionRoot, args) => {
     log_1.Log.verbose('Entry point:', file, 'reason:', reason);
     if (!file) {
         log_1.Log.error('The preview command requires you to specify a root file. For example');
-        log_1.Log.error('  npx remotion preview src/index.tsx');
+        log_1.Log.error('  npx remotion preview src/index.ts');
         log_1.Log.error('See https://www.remotion.dev/docs/register-root for more information.');
         process.exit(1);
     }

package/dist/print-help.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printHelp = void 0;
 const chalk_1 = require("./chalk");
+const install_1 = require("./install");
 const log_1 = require("./log");
 const versions_1 = require("./versions");
 const packagejson = require('../package.json');
@@ -67,6 +68,9 @@ const printHelp = () => {
     log_1.Log.info('remotion ' + versions_1.VERSIONS_COMMAND);
     log_1.Log.info(chalk_1.chalk.gray('Prints and validates versions of all Remotion packages.'));
     log_1.Log.info();
+    log_1.Log.info(`remotion ${install_1.INSTALL_COMMAND} <ffmpeg|ffprobe>`);
+    log_1.Log.info(chalk_1.chalk.gray('Installs dependencies of Remotion'));
+    log_1.Log.info();
     log_1.Log.info('remotion upgrade');
     log_1.Log.info(chalk_1.chalk.gray('Ensure Remotion is on the newest version.'));
     printFlags([

package/dist/render.js

@@ -44,9 +44,11 @@ const render = async (remotionRoot, args) => {
     const { concurrency, frameRange, shouldOutputImageSequence, overwrite, inputProps, envVariables, quality, browser, browserExecutable, ffmpegExecutable, ffprobeExecutable, scale, chromiumOptions, port, everyNthFrame, puppeteerTimeout, publicDir, height, width, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
         type: 'series',
+        remotionRoot,
     });
     const ffmpegVersion = await renderer_1.RenderInternals.getFfmpegVersion({
         ffmpegExecutable,
+        remotionRoot,
     });
     log_1.Log.verbose('FFMPEG Version:', ffmpegVersion ? ffmpegVersion.join('.') : 'Built from source');
     log_1.Log.verbose('Browser executable: ', browserExecutable);
@@ -106,7 +108,7 @@ const render = async (remotionRoot, args) => {
         downloadName: null,
         outName: (0, user_passed_output_location_1.getUserPassedOutputLocation)(argsAfterComposition),
     });
-    (0, get_cli_options_1.validateFfmpegCanUseCodec)(codec);
+    (0, get_cli_options_1.validateFfmepgCanUseCodec)(codec, remotionRoot);
     renderer_1.RenderInternals.validateEvenDimensionsWithCodec({
         width: config.width,
         height: config.height,
@@ -218,6 +220,7 @@ const render = async (remotionRoot, args) => {
         outputLocation: absoluteOutputFile,
         serveUrl: urlOrBundle,
         codec,
+        remotionRoot,
     });
     await (0, renderer_1.renderMedia)({
         ...options,

package/dist/still.js

@@ -39,6 +39,7 @@ const still = async (remotionRoot, args) => {
     const { inputProps, envVariables, quality, browser, stillFrame, browserExecutable, chromiumOptions, scale, ffmpegExecutable, ffprobeExecutable, overwrite, puppeteerTimeout, port, publicDir, height, width, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
         type: 'still',
+        remotionRoot,
     });
     log_1.Log.verbose('Browser executable: ', browserExecutable);
     const browserInstance = (0, renderer_1.openBrowser)(browser, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.2.43-retry.19+5671d7797",
+	"version": "3.3.0",
 	"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.2.43-retry.19+5671d7797",
-		"@remotion/media-utils": "3.2.43-retry.19+5671d7797",
-		"@remotion/player": "3.2.43-retry.19+5671d7797",
-		"@remotion/renderer": "3.2.43-retry.19+5671d7797",
+		"@remotion/bundler": "3.3.0",
+		"@remotion/media-utils": "3.3.0",
+		"@remotion/player": "3.3.0",
+		"@remotion/renderer": "3.3.0",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
 		"prompts": "2.4.1",
-		"remotion": "3.2.43-retry.19+5671d7797",
+		"remotion": "3.3.0",
 		"semver": "7.3.5",
 		"source-map": "0.6.1"
 	},
@@ -72,5 +72,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "5671d779758f7837f2f50f75e2cccdd7c6b58f43"
+	"gitHead": "29322c95729df0229eecc5f674d019145a783b46"
 }