@remotion/cli 3.3.39 → 3.3.40

package/dist/benchmark.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.benchmarkCommand = void 0;
 const renderer_1 = require("@remotion/renderer");
-const path_1 = __importDefault(require("path"));
 const chalk_1 = require("./chalk");
 const config_1 = require("./config");
 const entry_point_1 = require("./entry-point");
@@ -97,7 +93,6 @@ const benchmarkCommand = async (remotionRoot, args) => {
         log_1.Log.info(`$ remotion benchmark <entry file>`);
         process.exit(1);
     }
-    const fullPath = path_1.default.join(process.cwd(), file);
     const { inputProps, envVariables, browserExecutable, ffmpegExecutable, ffprobeExecutable, chromiumOptions, port, puppeteerTimeout, browser, scale, publicDir, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
         type: 'series',
@@ -111,7 +106,7 @@ const benchmarkCommand = async (remotionRoot, args) => {
         forceDeviceScaleFactor: scale,
     });
     const { urlOrBundle: bundleLocation, cleanup: cleanupBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({
-        fullPath,
+        fullPath: file,
         publicDir,
         remotionRoot,
         steps: ['bundling'],

package/dist/compositions.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listCompositionsCommand = void 0;
 const renderer_1 = require("@remotion/renderer");
-const path_1 = __importDefault(require("path"));
 const entry_point_1 = require("./entry-point");
 const get_cli_options_1 = require("./get-cli-options");
 const get_config_file_name_1 = require("./get-config-file-name");
@@ -22,7 +18,6 @@ const listCompositionsCommand = async (remotionRoot, args) => {
     }
     log_1.Log.verbose('Entry point:', file, 'reason:', reason);
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
-    const fullPath = path_1.default.join(process.cwd(), file);
     await (0, get_config_file_name_1.loadConfig)(remotionRoot);
     const { browserExecutable, ffmpegExecutable, ffprobeExecutable, chromiumOptions, envVariables, inputProps, puppeteerTimeout, port, publicDir, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
@@ -31,7 +26,7 @@ const listCompositionsCommand = async (remotionRoot, args) => {
     });
     const { urlOrBundle: bundled, cleanup: cleanupBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({
         remotionRoot,
-        fullPath,
+        fullPath: file,
         steps: ['bundling'],
         publicDir,
     });

package/dist/entry-point.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findEntryPoint = void 0;
+const renderer_1 = require("@remotion/renderer");
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const config_1 = require("./config");
@@ -20,12 +21,46 @@ const findCommonPath = (remotionRoot) => {
     return candidates.find((candidate) => (0, fs_1.existsSync)(path_1.default.resolve(remotionRoot, candidate)));
 };
 const findEntryPoint = (args, remotionRoot) => {
+    const result = findEntryPointInner(args, remotionRoot);
+    if (result.file === null) {
+        return result;
+    }
+    if (renderer_1.RenderInternals.isServeUrl(result.file)) {
+        return result;
+    }
+    if (!(0, fs_1.existsSync)(result.file)) {
+        throw new Error(`${result.file} was chosen as the entry point (reason = ${result.reason}) but it does not exist.`);
+    }
+    if ((0, fs_1.lstatSync)(result.file).isDirectory()) {
+        throw new Error(`${result.file} was chosen as the entry point (reason = ${result.reason}) but it is a directory - it needs to be a file.`);
+    }
+    return result;
+};
+exports.findEntryPoint = findEntryPoint;
+const findEntryPointInner = (args, remotionRoot) => {
     // 1st priority: Explicitly passed entry point
     let file = args[0];
     if (file) {
         log_1.Log.verbose('Checking if', file, 'is the entry file');
-        // Intentionally resolving CLI files to CWD, while resolving config file to remotionRoot
-        if ((0, fs_1.existsSync)(path_1.default.resolve(process.cwd(), file))) {
+        const cwdResolution = path_1.default.resolve(process.cwd(), file);
+        const remotionRootResolution = path_1.default.resolve(remotionRoot, file);
+        // Checking if file was found in CWD
+        if ((0, fs_1.existsSync)(cwdResolution)) {
+            return {
+                file: cwdResolution,
+                remainingArgs: args.slice(1),
+                reason: 'argument passed - found in cwd',
+            };
+        }
+        // Checking if file was found in remotion root
+        if ((0, fs_1.existsSync)(remotionRootResolution)) {
+            return {
+                file: remotionRootResolution,
+                remainingArgs: args.slice(1),
+                reason: 'argument passed - found in root',
+            };
+        }
+        if (renderer_1.RenderInternals.isServeUrl(file)) {
             return { file, remainingArgs: args.slice(1), reason: 'argument passed' };
         }
     }
@@ -33,14 +68,22 @@ const findEntryPoint = (args, remotionRoot) => {
     file = config_1.ConfigInternals.getEntryPoint();
     if (file) {
         log_1.Log.verbose('Entry point from config file is', file);
-        return { file, remainingArgs: args, reason: 'config file' };
+        return {
+            file: path_1.default.resolve(remotionRoot, file),
+            remainingArgs: args,
+            reason: 'config file',
+        };
     }
     // 3rd priority: Common paths
     const found = findCommonPath(remotionRoot);
     if (found) {
-        log_1.Log.verbose('Selected', found, 'as the entry point because file exists and is a common entry point and no entry point was explicitly selected');
-        return { file: found, remainingArgs: args, reason: 'common paths' };
+        const absolutePath = path_1.default.resolve(remotionRoot, found);
+        log_1.Log.verbose('Selected', absolutePath, 'as the entry point because file exists and is a common entry point and no entry point was explicitly selected');
+        return {
+            file: absolutePath,
+            remainingArgs: args,
+            reason: 'common paths',
+        };
     }
     return { file: null, remainingArgs: args, reason: 'none found' };
 };
-exports.findEntryPoint = findEntryPoint;

package/dist/handle-common-errors.js

@@ -10,7 +10,8 @@ const handleCommonError = async (err) => {
         log_1.Log.info();
         log_1.Log.info('💡 Get help for this issue at https://remotion.dev/docs/media-playback-error');
     }
-    if (err.message.includes('A delayRender was called')) {
+    if (err.message.includes('A delayRender()') &&
+        err.message.includes('was called but not cleared after')) {
         log_1.Log.info();
         log_1.Log.info('💡 Get help for this issue at https://remotion.dev/docs/timeout');
     }

package/dist/index.d.ts

@@ -146,4 +146,5 @@ export declare const CliInternals: {
     };
     getImageFormat: (codec: import("@remotion/renderer").CodecOrUndefined) => "png" | "jpeg" | "none";
     printCompositions: (compositions: import("remotion").TCompMetadata[]) => void;
+    listOfRemotionPackages: string[];
 };

package/dist/index.js

@@ -35,6 +35,7 @@ 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 list_of_remotion_packages_1 = require("./list-of-remotion-packages");
 const log_1 = require("./log");
 const make_progress_bar_1 = require("./make-progress-bar");
 const parse_command_line_1 = require("./parse-command-line");
@@ -135,4 +136,5 @@ exports.CliInternals = {
     findEntryPoint: entry_point_1.findEntryPoint,
     getImageFormat: image_formats_1.getImageFormat,
     printCompositions: print_compositions_1.printCompositions,
+    listOfRemotionPackages: list_of_remotion_packages_1.listOfRemotionPackages,
 };

package/dist/list-of-remotion-packages.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listOfRemotionPackages = void 0;
+// Keep in sync with create-video
 exports.listOfRemotionPackages = [
     '@remotion/bundler',
     '@remotion/cli',

package/dist/preview.js

@@ -73,7 +73,6 @@ const previewCommand = async (remotionRoot, args) => {
         process.exit(1);
     }
     const desiredPort = getPort();
-    const fullPath = path_1.default.join(process.cwd(), file);
     let inputProps = (0, get_input_props_1.getInputProps)((newProps) => {
         waitForLiveEventsListener().then((listener) => {
             inputProps = newProps;
@@ -113,7 +112,7 @@ const previewCommand = async (remotionRoot, args) => {
     });
     const { port, liveEventsServer } = await (0, start_server_1.startServer)({
         entry: path_1.default.resolve(__dirname, 'previewEntry.js'),
-        userDefinedComponent: fullPath,
+        userDefinedComponent: file,
         getCurrentInputProps: () => inputProps,
         getEnvVariables: () => envVariables,
         port: desiredPort,

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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.3.39",
+	"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.39",
-		"@remotion/media-utils": "3.3.39",
-		"@remotion/player": "3.3.39",
-		"@remotion/renderer": "3.3.39",
+		"@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.39",
+		"remotion": "3.3.40",
 		"semver": "7.3.5",
 		"source-map": "0.6.1"
 	},
@@ -71,5 +71,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "5a07260074fe3a6db2cdba0001503c665951414d"
+	"gitHead": "be5f606a81761f7f8e1e191ebabd5f8d225d8c09"
 }