@remotion/cli 4.0.0-prefetch.10 → 4.0.0-prefetch.12

package/dist/preview-server/dev-middleware/range-parser.d.ts

@@ -11,5 +11,5 @@ declare type Range = {
 declare type Ranges = Range[] & {
     type?: string;
 };
-export declare function parseRange(size: number, str: string | string[]): -1 | Ranges | -2;
+export declare function parseRange(size: number, str: string | string[]): -2 | -1 | Ranges;
 export {};

package/dist/preview-server/dev-middleware/setup-hooks.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupHooks = void 0;
 const log_1 = require("../../log");
+const truthy_1 = require("../../truthy");
 const is_color_supported_1 = require("./is-color-supported");
 function setupHooks(context) {
     function invalid() {
@@ -21,13 +22,23 @@ function setupHooks(context) {
             }
             logger.log('Compilation finished');
             const statsOptions = {
-                preset: 'normal',
+                preset: 'errors-warnings',
                 colors: is_color_supported_1.isColorSupported,
             };
             const printedStats = stats.toString(statsOptions);
-            // Avoid extra empty line when `stats: 'none'`
-            if (printedStats) {
-                log_1.Log.info(printedStats);
+            const lines = printedStats
+                .split('\n')
+                .map((a) => a.trimEnd())
+                .filter(truthy_1.truthy)
+                .map((a) => {
+                if (a.startsWith('webpack compiled')) {
+                    return `Built in ${stats.endTime - stats.startTime}ms`;
+                }
+                return a;
+            })
+                .join('\n');
+            if (lines) {
+                log_1.Log.info(lines);
             }
             context.callbacks = [];
             callbacks.forEach((callback) => {

package/dist/preview-server/get-package-manager.d.ts

@@ -6,5 +6,5 @@ declare type LockfilePath = {
     startCommand: string;
 };
 export declare const lockFilePaths: LockfilePath[];
-export declare const getPackageManager: (remotionRoot: string) => LockfilePath | 'unknown';
+export declare const getPackageManager: (remotionRoot: string, packageManager: string | undefined) => LockfilePath | 'unknown';
 export {};

package/dist/preview-server/get-package-manager.js

@@ -26,7 +26,16 @@ exports.lockFilePaths = [
         startCommand: 'pnpm start',
     },
 ];
-const getPackageManager = (remotionRoot) => {
+const getPackageManager = (remotionRoot, packageManager) => {
+    if (packageManager) {
+        const manager = exports.lockFilePaths.find((p) => p.manager === packageManager);
+        if (!manager) {
+            throw new Error(`The package manager ${packageManager} is not supported. Supported package managers are ${exports.lockFilePaths
+                .map((p) => p.manager)
+                .join(', ')}`);
+        }
+        return manager;
+    }
     const existingPkgManagers = exports.lockFilePaths.filter((p) => fs_1.default.existsSync(path_1.default.join(remotionRoot, p.path)));
     if (existingPkgManagers.length === 0) {
         return 'unknown';

package/dist/preview-server/hot-middleware/index.js

@@ -24,7 +24,7 @@ const webpackHotMiddleware = (compiler) => {
     compiler.hooks.done.tap('remotion', onDone);
     function onInvalid() {
         latestStats = null;
-        log_1.Log.info('webpack building...');
+        log_1.Log.info('Building...');
         eventStream === null || eventStream === void 0 ? void 0 : eventStream.publish({
             action: 'building',
         });
@@ -114,7 +114,6 @@ function publishStats(action, statsResult, eventStream) {
         if (bundles.length === 1 && !name && statsResult.compilation) {
             name = statsResult.compilation.name || '';
         }
-        log_1.Log.info(`webpack built in ${_stats.time}ms`);
         eventStream === null || eventStream === void 0 ? void 0 : eventStream.publish({
             name,
             action,

package/dist/preview-server/routes.d.ts

@@ -1,12 +1,13 @@
 import type { IncomingMessage, ServerResponse } from 'http';
 import type { LiveEventsServer } from './live-events';
-export declare const handleRoutes: ({ hash, hashPrefix, request, response, liveEventsServer, getCurrentInputProps, remotionRoot, userPassedPublicDir, }: {
+export declare const handleRoutes: ({ hash, hashPrefix, request, response, liveEventsServer, getCurrentInputProps, getEnvVariables, remotionRoot, userPassedPublicDir, }: {
     hash: string;
     hashPrefix: string;
     request: IncomingMessage;
     response: ServerResponse;
     liveEventsServer: LiveEventsServer;
     getCurrentInputProps: () => object;
+    getEnvVariables: () => Record<string, string>;
     remotionRoot: string;
     userPassedPublicDir: string | null;
 }) => void | Promise<void>;

package/dist/preview-server/routes.js

@@ -25,16 +25,17 @@ const static404 = (response) => {
     response.writeHead(404);
     response.end('The static/ prefix has been changed, this URL is no longer valid.');
 };
-const handleFallback = async ({ remotionRoot, hash, response, getCurrentInputProps, }) => {
+const handleFallback = async ({ remotionRoot, hash, response, getCurrentInputProps, getEnvVariables, }) => {
     const [edit] = await editorGuess;
     const displayName = (0, open_in_editor_1.getDisplayNameForEditor)(edit ? edit.command : null);
     response.setHeader('content-type', 'text/html');
     response.writeHead(200);
-    const packageManager = (0, get_package_manager_1.getPackageManager)(remotionRoot);
+    const packageManager = (0, get_package_manager_1.getPackageManager)(remotionRoot, undefined);
     response.end(bundler_1.BundlerInternals.indexHtml({
         staticHash: hash,
         baseDir: '/',
         editorName: displayName,
+        envVariables: getEnvVariables(),
         inputProps: getCurrentInputProps(),
         remotionRoot,
         previewServerCommand: packageManager === 'unknown' ? null : packageManager.startCommand,
@@ -117,7 +118,7 @@ const handleFavicon = (_, response) => {
     const readStream = (0, fs_1.createReadStream)(filePath);
     readStream.pipe(response);
 };
-const handleRoutes = ({ hash, hashPrefix, request, response, liveEventsServer, getCurrentInputProps, remotionRoot, userPassedPublicDir, }) => {
+const handleRoutes = ({ hash, hashPrefix, request, response, liveEventsServer, getCurrentInputProps, getEnvVariables, remotionRoot, userPassedPublicDir, }) => {
     const url = new URL(request.url, 'http://localhost');
     if (url.pathname === '/api/update') {
         return handleUpdate(remotionRoot, request, response);
@@ -156,6 +157,7 @@ const handleRoutes = ({ hash, hashPrefix, request, response, liveEventsServer, g
         hash,
         response,
         getCurrentInputProps,
+        getEnvVariables,
     });
 };
 exports.handleRoutes = handleRoutes;

package/dist/preview-server/start-server.d.ts

@@ -3,7 +3,7 @@ import type { LiveEventsServer } from './live-events';
 export declare const startServer: (entry: string, userDefinedComponent: string, options: {
     webpackOverride: WebpackOverrideFn;
     getCurrentInputProps: () => object;
-    envVariables?: Record<string, string>;
+    getEnvVariables: () => Record<string, string>;
     port: number | null;
     maxTimelineTracks?: number;
     remotionRoot: string;

package/dist/preview-server/start-server.js

@@ -12,6 +12,7 @@ const http_1 = __importDefault(require("http"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const config_1 = require("../config");
+const log_1 = require("../log");
 const dev_middleware_1 = require("./dev-middleware");
 const hot_middleware_1 = require("./hot-middleware");
 const live_events_1 = require("./live-events");
@@ -25,7 +26,7 @@ const startServer = async (entry, userDefinedComponent, options) => {
         outDir: tmpDir,
         environment: 'development',
         webpackOverride: (_a = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _a !== void 0 ? _a : config_1.ConfigInternals.getWebpackOverrideFn(),
-        envVariables: (_b = options === null || options === void 0 ? void 0 : options.envVariables) !== null && _b !== void 0 ? _b : {},
+        envVariables: (_b = options === null || options === void 0 ? void 0 : options.getEnvVariables()) !== null && _b !== void 0 ? _b : {},
         maxTimelineTracks: (_c = options === null || options === void 0 ? void 0 : options.maxTimelineTracks) !== null && _c !== void 0 ? _c : 15,
         entryPoints: [
             require.resolve('./hot-middleware/client'),
@@ -61,6 +62,7 @@ const startServer = async (entry, userDefinedComponent, options) => {
                 response,
                 liveEventsServer,
                 getCurrentInputProps: options.getCurrentInputProps,
+                getEnvVariables: options.getEnvVariables,
                 remotionRoot: options.remotionRoot,
                 userPassedPublicDir: options.userPassedPublicDir,
             });
@@ -68,6 +70,7 @@ const startServer = async (entry, userDefinedComponent, options) => {
             .catch((err) => {
             response.setHeader('content-type', 'application/json');
             response.writeHead(500);
+            log_1.Log.error(`Error while calling ${request.url}`, err);
             response.end(JSON.stringify({
                 err: err.message,
             }));

package/dist/preview-server/update-available.js

@@ -9,7 +9,7 @@ const get_latest_remotion_version_1 = require("../get-latest-remotion-version");
 const get_package_manager_1 = require("./get-package-manager");
 const isUpdateAvailable = async ({ remotionRoot, currentVersion, }) => {
     const latest = await (0, get_latest_remotion_version_1.getLatestRemotionVersion)();
-    const pkgManager = (0, get_package_manager_1.getPackageManager)(remotionRoot);
+    const pkgManager = (0, get_package_manager_1.getPackageManager)(remotionRoot, undefined);
     return {
         updateAvailable: semver_1.default.lt(currentVersion, latest),
         currentVersion,
@@ -28,7 +28,7 @@ exports.getRemotionVersion = getRemotionVersion;
 const isUpdateAvailableWithTimeout = (remotionRoot) => {
     const version = (0, exports.getRemotionVersion)();
     const threeSecTimeout = new Promise((resolve) => {
-        const pkgManager = (0, get_package_manager_1.getPackageManager)(remotionRoot);
+        const pkgManager = (0, get_package_manager_1.getPackageManager)(remotionRoot, undefined);
         setTimeout(() => {
             resolve({
                 currentVersion: version,

package/dist/preview.js

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previewCommand = void 0;
 const better_opn_1 = __importDefault(require("better-opn"));
 const path_1 = __importDefault(require("path"));
+const chalk_1 = require("./chalk");
 const config_1 = require("./config");
 const get_env_1 = require("./get-env");
 const get_input_props_1 = require("./get-input-props");
-const initialize_render_cli_1 = require("./initialize-render-cli");
+const get_network_address_1 = require("./get-network-address");
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
 const start_server_1 = require("./preview-server/start-server");
@@ -40,7 +41,6 @@ const previewCommand = async (remotionRoot) => {
     }
     const { port: desiredPort } = parse_command_line_1.parsedCli;
     const fullPath = path_1.default.join(process.cwd(), file);
-    await (0, initialize_render_cli_1.initializeRenderCli)(remotionRoot, 'preview');
     let inputProps = (0, get_input_props_1.getInputProps)((newProps) => {
         waitForLiveEventsListener().then((listener) => {
             inputProps = newProps;
@@ -50,10 +50,18 @@ const previewCommand = async (remotionRoot) => {
             });
         });
     });
-    const envVariables = await (0, get_env_1.getEnvironmentVariables)();
+    let envVariables = await (0, get_env_1.getEnvironmentVariables)((newEnvVariables) => {
+        waitForLiveEventsListener().then((listener) => {
+            envVariables = newEnvVariables;
+            listener.sendEventToClient({
+                type: 'new-env-variables',
+                newEnvVariables,
+            });
+        });
+    });
     const { port, liveEventsServer } = await (0, start_server_1.startServer)(path_1.default.resolve(__dirname, 'previewEntry.js'), fullPath, {
         getCurrentInputProps: () => inputProps,
-        envVariables,
+        getEnvVariables: () => envVariables,
         port: desiredPort,
         maxTimelineTracks: config_1.ConfigInternals.getMaxTimelineTracks(),
         remotionRoot,
@@ -62,7 +70,13 @@ const previewCommand = async (remotionRoot) => {
         webpackOverride: config_1.ConfigInternals.getWebpackOverrideFn(),
     });
     setLiveEventsListener(liveEventsServer);
-    log_1.Log.info(`Server running on http://localhost:${port}`);
+    const networkAddress = (0, get_network_address_1.getNetworkAddress)();
+    if (networkAddress) {
+        log_1.Log.info(`Server ready - Local: ${chalk_1.chalk.underline(`http://localhost:${port}`)}, Network: ${chalk_1.chalk.underline(`http://${networkAddress}:${port}`)}`);
+    }
+    else {
+        log_1.Log.info(`Running on http://localhost:${port}`);
+    }
     (0, better_opn_1.default)(`http://localhost:${port}`);
     await new Promise(noop);
 };

package/dist/print-help.js

@@ -11,7 +11,7 @@ const printFlags = (flags) => {
     });
 };
 const printHelp = () => {
-    log_1.Log.info(`@remotion/cli ${packagejson.version} © ${new Date().getFullYear()} Jonny Burger`);
+    log_1.Log.info(`@remotion/cli ${packagejson.version} © ${new Date().getFullYear()} The Remotion developers`);
     log_1.Log.info();
     log_1.Log.info('Available commands:');
     log_1.Log.info('');
@@ -19,7 +19,7 @@ const printHelp = () => {
     log_1.Log.info(chalk_1.chalk.gray('Start the preview server.'));
     printFlags([['--props', 'Pass input props as filename or as JSON']]);
     log_1.Log.info();
-    log_1.Log.info('remotion render <entry-point.ts> <comp-name> <output-file.mp4>');
+    log_1.Log.info('remotion render <entry-point.ts> <comp-id> <output-file.mp4>');
     log_1.Log.info(chalk_1.chalk.gray('Render video, audio or an image sequence.'));
     printFlags([
         ['--props', 'Pass input props as filename or as JSON'],
@@ -31,6 +31,8 @@ const printHelp = () => {
         ['--overwrite', 'Overwrite if file exists, default true'],
         ['--sequence', 'Output as an image sequence'],
         ['--codec', 'Video of audio codec'],
+        ['--audio-bitrate', 'Customize the output audio bitrate'],
+        ['--video-bitrate', 'Customize the output video bitrate'],
         ['--crf', 'FFMPEG CRF value, controls quality, see docs for info'],
         ['--browser-executable', 'Custom path for browser executable'],
         ['--frames', 'Render a portion or a still of a video'],
@@ -40,7 +42,7 @@ const printHelp = () => {
         ['--env-file', 'Specify a location for a dotenv file'],
     ]);
     log_1.Log.info();
-    log_1.Log.info('remotion still <entry-point.ts> <comp-name> <still.png>');
+    log_1.Log.info('remotion still <entry-point.ts> <comp-id> <still.png>');
     log_1.Log.info(chalk_1.chalk.gray('Render a still frame and save it as an image.'));
     printFlags([
         ['--frame', 'Which frame to render (default 0)'],
@@ -59,11 +61,20 @@ const printHelp = () => {
     log_1.Log.info('remotion compositions <index-file.ts>');
     log_1.Log.info(chalk_1.chalk.gray('Prints the available compositions.'));
     log_1.Log.info();
+    log_1.Log.info('remotion benchmark <index-file.ts> <list-of-compositions>');
+    log_1.Log.info(chalk_1.chalk.gray('Benchmarks rendering a composition. Same options as for render.'));
+    log_1.Log.info();
     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 upgrade');
     log_1.Log.info(chalk_1.chalk.gray('Ensure Remotion is on the newest version.'));
+    printFlags([
+        [
+            '--package-manager',
+            'Force a specific package manager, defaults to use from lockfile',
+        ],
+    ]);
     log_1.Log.info();
     log_1.Log.info('Visit https://www.remotion.dev/docs/cli for browsable CLI documentation.');
 };