@remotion/cli 4.0.0-preload.13 → 4.0.0-preload.17

package/dist/compositions.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.listCompositionsCommand = void 0;
 const renderer_1 = require("@remotion/renderer");
 const path_1 = __importDefault(require("path"));
+const get_cli_options_1 = require("./get-cli-options");
 const get_config_file_name_1 = require("./get-config-file-name");
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
@@ -33,8 +34,17 @@ const listCompositionsCommand = async () => {
     }
     const fullPath = path_1.default.join(process.cwd(), file);
     (0, get_config_file_name_1.loadConfig)();
+    const { browserExecutable, ffmpegExecutable, chromiumOptions, envVariables, inputProps, puppeteerTimeout, port, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'get-compositions' });
     const bundled = await (0, setup_cache_1.bundleOnCli)(fullPath, ['bundling']);
-    const compositions = await (0, renderer_1.getCompositions)(bundled);
+    const compositions = await (0, renderer_1.getCompositions)(bundled, {
+        browserExecutable,
+        ffmpegExecutable,
+        chromiumOptions,
+        envVariables,
+        inputProps,
+        timeoutInMilliseconds: puppeteerTimeout,
+        port,
+    });
     log_1.Log.info();
     log_1.Log.info('The following compositions are available:');
     log_1.Log.info();

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

@@ -2,7 +2,7 @@ import { ChromiumOptions } from '@remotion/renderer';
 import { BrowserExecutable, FrameRange } from 'remotion';
 export declare const getCliOptions: (options: {
     isLambda: boolean;
-    type: 'still' | 'series';
+    type: 'still' | 'series' | 'get-compositions';
 }) => Promise<{
     puppeteerTimeout: number;
     parallelism: number | null;
@@ -25,4 +25,5 @@ export declare const getCliOptions: (options: {
     logLevel: "verbose" | "info" | "warn" | "error";
     scale: number;
     chromiumOptions: ChromiumOptions;
+    port: number | null;
 }>;

package/dist/get-cli-options.js

@@ -124,7 +124,7 @@ const getCliOptions = async (options) => {
             frameRange,
             isLambda: options.isLambda,
         });
-    const outputFile = options.isLambda
+    const outputFile = options.isLambda || options.type === 'get-compositions'
         ? null
         : (0, get_filename_1.getOutputFilename)({
             codec,
@@ -143,6 +143,7 @@ const getCliOptions = async (options) => {
     const browserExecutable = remotion_1.Internals.getBrowserExecutable();
     const ffmpegExecutable = remotion_1.Internals.getCustomFfmpegExecutable();
     const scale = remotion_1.Internals.getScale();
+    const port = remotion_1.Internals.getServerPort();
     const chromiumOptions = {
         disableWebSecurity: remotion_1.Internals.getChromiumDisableWebSecurity(),
         ignoreCertificateErrors: remotion_1.Internals.getIgnoreCertificateErrors(),
@@ -173,6 +174,7 @@ const getCliOptions = async (options) => {
         logLevel: remotion_1.Internals.Logging.getLogLevel(),
         scale,
         chromiumOptions,
+        port: port !== null && port !== void 0 ? port : null,
     };
 };
 exports.getCliOptions = getCliOptions;

package/dist/index.d.ts

@@ -27,7 +27,7 @@ export declare const CliInternals: {
     loadConfigFile: (configFileName: string, isJavascript: boolean) => Promise<string | null>;
     getCliOptions: (options: {
         isLambda: boolean;
-        type: "still" | "series";
+        type: "still" | "series" | "get-compositions";
     }) => Promise<{
         puppeteerTimeout: number;
         parallelism: number | null;
@@ -50,6 +50,7 @@ export declare const CliInternals: {
         logLevel: "verbose" | "info" | "warn" | "error";
         scale: number;
         chromiumOptions: import("@remotion/renderer").ChromiumOptions;
+        port: number | null;
     }>;
     parseCommandLine: (type: "sequence" | "still" | "lambda" | "preview" | "versions") => void;
     loadConfig: () => Promise<string | null>;

package/dist/parse-command-line.js

@@ -113,6 +113,9 @@ const parseCommandLine = (type) => {
     if (typeof exports.parsedCli.scale !== 'undefined') {
         remotion_1.Config.Rendering.setScale(exports.parsedCli.scale);
     }
+    if (typeof exports.parsedCli.port !== 'undefined') {
+        remotion_1.Config.Bundling.setPort(exports.parsedCli.port);
+    }
 };
 exports.parseCommandLine = parseCommandLine;
 const quietFlagProvided = () => exports.parsedCli.quiet || exports.parsedCli.q;

package/dist/render.js

@@ -31,13 +31,13 @@ const render = async () => {
         ? file
         : path_1.default.join(process.cwd(), file);
     await (0, initialize_render_cli_1.initializeRenderCli)('sequence');
-    const { codec, proResProfile, parallelism, frameRange, shouldOutputImageSequence, absoluteOutputFile, overwrite, inputProps, envVariables, quality, browser, crf, pixelFormat, imageFormat, browserExecutable, ffmpegExecutable, scale, chromiumOptions, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'series' });
+    const { codec, proResProfile, parallelism, frameRange, shouldOutputImageSequence, absoluteOutputFile, overwrite, inputProps, envVariables, quality, browser, crf, pixelFormat, imageFormat, browserExecutable, ffmpegExecutable, scale, chromiumOptions, port, puppeteerTimeout, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'series' });
     if (!absoluteOutputFile) {
         throw new Error('assertion error - expected absoluteOutputFile to not be null');
     }
     log_1.Log.verbose('Browser executable: ', browserExecutable);
     await (0, validate_ffmpeg_version_1.checkAndValidateFfmpegVersion)({
-        ffmpegExecutable: remotion_1.Internals.getCustomFfmpegExecutable(),
+        ffmpegExecutable,
     });
     const browserInstance = (0, renderer_1.openBrowser)(browser, {
         browserExecutable,
@@ -53,9 +53,22 @@ const render = async () => {
     const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
         ? fullPath
         : await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
-    const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer(urlOrBundle);
+    const onDownload = (src) => {
+        const id = Math.random();
+        const download = {
+            id,
+            name: src,
+            progress: 0,
+        };
+        downloads.push(download);
+        updateRenderProgress();
+        return ({ percent }) => {
+            download.progress = percent;
+            updateRenderProgress();
+        };
+    };
     const puppeteerInstance = await browserInstance;
-    const comps = await (0, renderer_1.getCompositions)(serveUrl, {
+    const comps = await (0, renderer_1.getCompositions)(urlOrBundle, {
         inputProps,
         puppeteerInstance,
         envVariables,
@@ -140,16 +153,19 @@ const render = async () => {
                 }
             },
             outputDir,
-            serveUrl,
+            serveUrl: urlOrBundle,
             dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
             envVariables,
             frameRange,
             parallelism,
             puppeteerInstance,
             quality,
-            timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
+            timeoutInMilliseconds: puppeteerTimeout,
             chromiumOptions,
             scale,
+            ffmpegExecutable,
+            browserExecutable,
+            port,
         });
         renderedDoneIn = Date.now() - startTime;
         updateRenderProgress();
@@ -182,21 +198,8 @@ const render = async () => {
         pixelFormat,
         proResProfile,
         quality,
-        serveUrl,
-        onDownload: (src) => {
-            const id = Math.random();
-            const download = {
-                id,
-                name: src,
-                progress: 0,
-            };
-            downloads.push(download);
-            updateRenderProgress();
-            return ({ percent }) => {
-                download.progress = percent;
-                updateRenderProgress();
-            };
-        },
+        serveUrl: urlOrBundle,
+        onDownload,
         dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
         onStart: ({ frameCount }) => {
             totalFrames = frameCount;
@@ -204,6 +207,7 @@ const render = async () => {
         chromiumOptions,
         timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
         scale,
+        port,
     });
     log_1.Log.info();
     log_1.Log.info();
@@ -225,8 +229,5 @@ const render = async () => {
         log_1.Log.warn('Do you have minimum required Node.js version?');
     }
     log_1.Log.info(chalk_1.default.green('\nYour video is ready!'));
-    closeServer().catch((err) => {
-        log_1.Log.error('Could not close web server', err);
-    });
 };
 exports.render = render;

package/dist/still.js

@@ -33,7 +33,7 @@ const still = async () => {
         log_1.Log.verbose('Output file has a PNG extension, therefore setting the image format to PNG.');
         remotion_1.Config.Rendering.setImageFormat('png');
     }
-    const { inputProps, envVariables, quality, browser, imageFormat, stillFrame, browserExecutable, chromiumOptions, scale, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'still' });
+    const { inputProps, envVariables, quality, browser, imageFormat, stillFrame, browserExecutable, chromiumOptions, scale, ffmpegExecutable, overwrite, puppeteerTimeout, port, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'still' });
     log_1.Log.verbose('Browser executable: ', browserExecutable);
     if (imageFormat === 'none') {
         log_1.Log.error('No image format was selected - this is probably an error in Remotion - please post your command on Github Issues for help.');
@@ -63,14 +63,16 @@ const still = async () => {
     const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
         ? Promise.resolve(fullPath)
         : await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
-    const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer(await urlOrBundle);
     const puppeteerInstance = await browserInstance;
-    const comps = await (0, renderer_1.getCompositions)(serveUrl, {
+    const comps = await (0, renderer_1.getCompositions)(await urlOrBundle, {
         inputProps,
         puppeteerInstance,
         envVariables,
-        timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
+        timeoutInMilliseconds: puppeteerTimeout,
         chromiumOptions,
+        port,
+        browserExecutable,
+        ffmpegExecutable,
     });
     const compositionId = (0, get_composition_id_1.getCompositionId)(comps);
     const composition = comps.find((c) => c.id === compositionId);
@@ -79,11 +81,42 @@ const still = async () => {
     }
     const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
     const renderStart = Date.now();
+    const downloads = [];
+    let frames = 0;
+    const totalFrames = 1;
+    const updateProgress = () => {
+        renderProgress.update((0, progress_bar_1.makeRenderingAndStitchingProgress)({
+            rendering: {
+                frames,
+                concurrency: 1,
+                doneIn: frames === totalFrames ? Date.now() - renderStart : null,
+                steps,
+                totalFrames,
+            },
+            downloads,
+            stitching: null,
+        }));
+    };
+    updateProgress();
+    const onDownload = (src) => {
+        const id = Math.random();
+        const download = {
+            id,
+            name: src,
+            progress: 0,
+        };
+        downloads.push(download);
+        updateProgress();
+        return ({ percent }) => {
+            download.progress = percent;
+            updateProgress();
+        };
+    };
     await (0, renderer_1.renderStill)({
         composition,
         frame: stillFrame,
         output: userOutput,
-        serveUrl,
+        serveUrl: await urlOrBundle,
         quality,
         dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
         envVariables,
@@ -92,18 +125,15 @@ const still = async () => {
         chromiumOptions,
         timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
         scale,
+        ffmpegExecutable,
+        browserExecutable,
+        overwrite,
+        onDownload,
     });
+    frames = 1;
+    updateProgress();
+    log_1.Log.info();
     const closeBrowserPromise = puppeteerInstance.close();
-    closeServer().catch((err) => {
-        log_1.Log.error('Could not close web server', err);
-    });
-    renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
-        frames: 1,
-        concurrency: 1,
-        doneIn: Date.now() - renderStart,
-        steps,
-        totalFrames: 1,
-    }));
     log_1.Log.info(chalk_1.default.green('\nYour still frame is ready!'));
     const seconds = Math.round((Date.now() - startTime) / 1000);
     log_1.Log.info([

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "4.0.0-preload.13+f7b159495",
+	"version": "4.0.0-preload.17+14cd6033f",
 	"description": "CLI for Remotion",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -23,16 +23,16 @@
 	"author": "Jonny Burger <jonny@remotion.dev>",
 	"license": "SEE LICENSE IN LICENSE.md",
 	"dependencies": {
-		"@remotion/bundler": "4.0.0-preload.13+f7b159495",
-		"@remotion/media-utils": "4.0.0-preload.13+f7b159495",
-		"@remotion/player": "4.0.0-preload.13+f7b159495",
-		"@remotion/renderer": "4.0.0-preload.13+f7b159495",
+		"@remotion/bundler": "4.0.0-preload.17+14cd6033f",
+		"@remotion/media-utils": "4.0.0-preload.17+14cd6033f",
+		"@remotion/player": "4.0.0-preload.17+14cd6033f",
+		"@remotion/renderer": "4.0.0-preload.17+14cd6033f",
 		"better-opn": "2.1.1",
 		"chalk": "4.1.2",
 		"dotenv": "9.0.2",
 		"execa": "5.1.1",
 		"minimist": "1.2.6",
-		"remotion": "4.0.0-preload.13+f7b159495",
+		"remotion": "4.0.0-preload.17+14cd6033f",
 		"semver": "7.3.5",
 		"webpack": "5.72.0"
 	},
@@ -72,5 +72,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "f7b1594951e881444050f2f9d4af8d442bbec942"
+	"gitHead": "14cd6033f4ad0fa75af142d54a4cd1a23aff3f21"
 }