@remotion/cli 4.0.0-oops.3 → 4.0.0-prefetch.7

package/dist/preview-server/routes.js

@@ -0,0 +1,161 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleRoutes = void 0;
+const bundler_1 = require("@remotion/bundler");
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+const url_1 = require("url");
+const get_file_source_1 = require("./error-overlay/react-overlay/utils/get-file-source");
+const open_in_editor_1 = require("./error-overlay/react-overlay/utils/open-in-editor");
+const get_package_manager_1 = require("./get-package-manager");
+const project_info_1 = require("./project-info");
+const serve_static_1 = require("./serve-static");
+const update_available_1 = require("./update-available");
+const handleUpdate = async (remotionRoot, _, response) => {
+    const data = await (0, update_available_1.isUpdateAvailableWithTimeout)(remotionRoot);
+    response.setHeader('content-type', 'application/json');
+    response.writeHead(200);
+    response.end(JSON.stringify(data));
+};
+const editorGuess = (0, open_in_editor_1.guessEditor)();
+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 [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);
+    response.end(bundler_1.BundlerInternals.indexHtml({
+        staticHash: hash,
+        baseDir: '/',
+        editorName: displayName,
+        inputProps: getCurrentInputProps(),
+        remotionRoot,
+        previewServerCommand: packageManager === 'unknown' ? null : packageManager.startCommand,
+    }));
+};
+const handleProjectInfo = async (remotionRoot, _, response) => {
+    const data = await (0, project_info_1.getProjectInfo)(remotionRoot);
+    response.setHeader('content-type', 'application/json');
+    response.writeHead(200);
+    response.end(JSON.stringify(data));
+};
+const handleFileSource = async ({ method, remotionRoot, search, response, }) => {
+    if (method === 'OPTIONS') {
+        response.writeHead(200);
+        response.end();
+        return;
+    }
+    if (!search.startsWith('?')) {
+        throw new Error('query must start with ?');
+    }
+    const query = new url_1.URLSearchParams(search);
+    const f = query.get('f');
+    if (typeof f !== 'string') {
+        throw new Error('must pass `f` parameter');
+    }
+    const data = await (0, get_file_source_1.getFileSource)(remotionRoot, decodeURIComponent(f));
+    response.writeHead(200);
+    response.write(data);
+    return response.end();
+};
+const handleOpenInEditor = async (remotionRoot, req, res) => {
+    if (req.method === 'OPTIONS') {
+        res.statusCode = 200;
+        res.end();
+    }
+    try {
+        const b = await new Promise((_resolve) => {
+            let data = '';
+            req.on('data', (chunk) => {
+                data += chunk;
+            });
+            req.on('end', () => {
+                _resolve(data.toString());
+            });
+        });
+        const body = JSON.parse(b);
+        if (!('stack' in body)) {
+            throw new TypeError('Need to pass stack');
+        }
+        const stack = body.stack;
+        const guess = await editorGuess;
+        const didOpen = await (0, open_in_editor_1.launchEditor)({
+            colNumber: stack.originalColumnNumber,
+            editor: guess[0],
+            fileName: path_1.default.resolve(remotionRoot, stack.originalFileName),
+            lineNumber: stack.originalLineNumber,
+            vsCodeNewWindow: false,
+        });
+        res.setHeader('content-type', 'application/json');
+        res.writeHead(200);
+        res.end(JSON.stringify({
+            success: didOpen,
+        }));
+    }
+    catch (err) {
+        res.setHeader('content-type', 'application/json');
+        res.writeHead(200);
+        res.end(JSON.stringify({
+            success: false,
+        }));
+    }
+};
+const handleFavicon = (_, response) => {
+    const filePath = path_1.default.join(__dirname, '..', '..', 'web', 'favicon.png');
+    const stat = (0, fs_1.statSync)(filePath);
+    response.writeHead(200, {
+        'Content-Type': 'image/png',
+        'Content-Length': stat.size,
+    });
+    const readStream = (0, fs_1.createReadStream)(filePath);
+    readStream.pipe(response);
+};
+const handleRoutes = ({ hash, hashPrefix, request, response, liveEventsServer, getCurrentInputProps, remotionRoot, userPassedPublicDir, }) => {
+    const url = new URL(request.url, 'http://localhost');
+    if (url.pathname === '/api/update') {
+        return handleUpdate(remotionRoot, request, response);
+    }
+    if (url.pathname === '/api/project-info') {
+        return handleProjectInfo(remotionRoot, request, response);
+    }
+    if (url.pathname === '/api/file-source') {
+        return handleFileSource({
+            remotionRoot,
+            search: url.search,
+            method: request.method,
+            response,
+        });
+    }
+    if (url.pathname === '/api/open-in-editor') {
+        return handleOpenInEditor(remotionRoot, request, response);
+    }
+    if (url.pathname === '/remotion.png') {
+        return handleFavicon(request, response);
+    }
+    if (url.pathname === '/events') {
+        return liveEventsServer.router(request, response);
+    }
+    if (url.pathname.startsWith(hash)) {
+        const publicDir = userPassedPublicDir
+            ? path_1.default.resolve(remotionRoot, userPassedPublicDir)
+            : path_1.default.join(remotionRoot, 'public');
+        return (0, serve_static_1.serveStatic)(publicDir, hash, request, response);
+    }
+    if (url.pathname.startsWith(hashPrefix)) {
+        return static404(response);
+    }
+    return handleFallback({
+        remotionRoot,
+        hash,
+        response,
+        getCurrentInputProps,
+    });
+};
+exports.handleRoutes = handleRoutes;

package/dist/preview-server/serve-static.d.ts

@@ -0,0 +1,9 @@
+/*!
+ * serve-static
+ * Copyright(c) 2010 Sencha Inc.
+ * Copyright(c) 2011 TJ Holowaychuk
+ * Copyright(c) 2014-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+import type { IncomingMessage, ServerResponse } from 'http';
+export declare const serveStatic: (root: string, hash: string, req: IncomingMessage, res: ServerResponse) => Promise<void>;

package/dist/preview-server/serve-static.js

@@ -0,0 +1,77 @@
+"use strict";
+/*!
+ * serve-static
+ * Copyright(c) 2010 Sencha Inc.
+ * Copyright(c) 2011 TJ Holowaychuk
+ * Copyright(c) 2014-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serveStatic = void 0;
+const renderer_1 = require("@remotion/renderer");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const middleware_1 = require("./dev-middleware/middleware");
+const range_parser_1 = require("./dev-middleware/range-parser");
+const serveStatic = async function (root, hash, req, res) {
+    if (req.method !== 'GET' && req.method !== 'HEAD') {
+        // method not allowed
+        res.statusCode = 405;
+        res.setHeader('Allow', 'GET, HEAD');
+        res.setHeader('Content-Length', '0');
+        res.end();
+        return;
+    }
+    const path = (0, path_1.join)(root, new URL(req.url, 'http://localhost').pathname.replace(new RegExp(`^${hash}`), ''));
+    if (!renderer_1.RenderInternals.isPathInside(path, root)) {
+        res.writeHead(500);
+        res.write('Not allowed to read');
+        res.end();
+        return;
+    }
+    const exists = (0, fs_1.existsSync)(path);
+    if (!exists) {
+        res.writeHead(404);
+        res.write(`${path} does not exist`);
+        res.end();
+        return;
+    }
+    const lstat = await fs_1.promises.lstat(path);
+    const isDirectory = lstat.isDirectory();
+    if (isDirectory) {
+        res.writeHead(500);
+        res.write('Is a directory');
+        res.end();
+        return;
+    }
+    const hasRange = req.headers.range && lstat.size;
+    if (!hasRange) {
+        const readStream = (0, fs_1.createReadStream)(path);
+        res.setHeader('content-type', renderer_1.RenderInternals.mimeLookup(path) || 'application/octet-stream');
+        res.setHeader('content-length', lstat.size);
+        res.writeHead(200);
+        readStream.pipe(res);
+        return;
+    }
+    const range = (0, range_parser_1.parseRange)(lstat.size, req.headers.range);
+    if (typeof range === 'object' && range.type === 'bytes') {
+        const { start, end } = range[0];
+        res.setHeader('content-type', renderer_1.RenderInternals.mimeLookup(path) || 'application/octet-stream');
+        res.setHeader('content-range', (0, middleware_1.getValueContentRangeHeader)('bytes', lstat.size, {
+            end,
+            start,
+        }));
+        res.setHeader('content-length', end - start + 1);
+        res.writeHead(206);
+        const readStream = (0, fs_1.createReadStream)(path, {
+            start,
+            end,
+        });
+        readStream.pipe(res);
+        return;
+    }
+    res.statusCode = 416;
+    res.setHeader('Content-Range', `bytes */${lstat.size}`);
+    res.end();
+};
+exports.serveStatic = serveStatic;

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

@@ -0,0 +1,15 @@
+import type { WebpackOverrideFn } from 'remotion';
+import type { LiveEventsServer } from './live-events';
+export declare const startServer: (entry: string, userDefinedComponent: string, options: {
+    webpackOverride: WebpackOverrideFn;
+    getCurrentInputProps: () => object;
+    envVariables?: Record<string, string>;
+    port: number | null;
+    maxTimelineTracks?: number;
+    remotionRoot: string;
+    keyboardShortcutsEnabled: boolean;
+    userPassedPublicDir: string | null;
+}) => Promise<{
+    port: number;
+    liveEventsServer: LiveEventsServer;
+}>;

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

@@ -0,0 +1,81 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startServer = void 0;
+const bundler_1 = require("@remotion/bundler");
+const renderer_1 = require("@remotion/renderer");
+const crypto_1 = __importDefault(require("crypto"));
+const fs_1 = __importDefault(require("fs"));
+const http_1 = __importDefault(require("http"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+const config_1 = require("../config");
+const dev_middleware_1 = require("./dev-middleware");
+const hot_middleware_1 = require("./hot-middleware");
+const live_events_1 = require("./live-events");
+const routes_1 = require("./routes");
+const startServer = async (entry, userDefinedComponent, options) => {
+    var _a, _b, _c, _d;
+    const tmpDir = await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-graphics'));
+    const [, config] = bundler_1.BundlerInternals.webpackConfig({
+        entry,
+        userDefinedComponent,
+        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 : {},
+        maxTimelineTracks: (_c = options === null || options === void 0 ? void 0 : options.maxTimelineTracks) !== null && _c !== void 0 ? _c : 15,
+        entryPoints: [
+            require.resolve('./hot-middleware/client'),
+            require.resolve('./error-overlay/entry-basic.js'),
+        ],
+        remotionRoot: options.remotionRoot,
+        keyboardShortcutsEnabled: options.keyboardShortcutsEnabled,
+    });
+    const compiler = (0, bundler_1.webpack)(config);
+    const hashPrefix = '/static-';
+    const hash = `${hashPrefix}${crypto_1.default.randomBytes(6).toString('hex')}`;
+    const wdmMiddleware = (0, dev_middleware_1.wdm)(compiler);
+    const whm = (0, hot_middleware_1.webpackHotMiddleware)(compiler);
+    const liveEventsServer = (0, live_events_1.makeLiveEventsRouter)();
+    const server = http_1.default.createServer((request, response) => {
+        new Promise((resolve) => {
+            wdmMiddleware(request, response, () => {
+                resolve();
+            });
+        })
+            .then(() => {
+            return new Promise((resolve) => {
+                whm(request, response, () => {
+                    resolve();
+                });
+            });
+        })
+            .then(() => {
+            return (0, routes_1.handleRoutes)({
+                hash,
+                hashPrefix,
+                request,
+                response,
+                liveEventsServer,
+                getCurrentInputProps: options.getCurrentInputProps,
+                remotionRoot: options.remotionRoot,
+                userPassedPublicDir: options.userPassedPublicDir,
+            });
+        })
+            .catch((err) => {
+            response.setHeader('content-type', 'application/json');
+            response.writeHead(500);
+            response.end(JSON.stringify({
+                err: err.message,
+            }));
+        });
+    });
+    const desiredPort = (_d = options === null || options === void 0 ? void 0 : options.port) !== null && _d !== void 0 ? _d : undefined;
+    const port = await renderer_1.RenderInternals.getDesiredPort(desiredPort, 3000, 3100);
+    server.listen(port);
+    return { port, liveEventsServer };
+};
+exports.startServer = startServer;

package/dist/preview-server/update-available.d.ts

@@ -0,0 +1,11 @@
+import type { PackageManager } from './get-package-manager';
+declare type Info = {
+    currentVersion: string;
+    latestVersion: string;
+    updateAvailable: boolean;
+    timedOut: boolean;
+    packageManager: PackageManager | 'unknown';
+};
+export declare const getRemotionVersion: () => any;
+export declare const isUpdateAvailableWithTimeout: (remotionRoot: string) => Promise<Info>;
+export {};

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

@@ -0,0 +1,47 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isUpdateAvailableWithTimeout = exports.getRemotionVersion = void 0;
+const semver_1 = __importDefault(require("semver"));
+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);
+    return {
+        updateAvailable: semver_1.default.lt(currentVersion, latest),
+        currentVersion,
+        latestVersion: latest,
+        timedOut: false,
+        packageManager: pkgManager === 'unknown' ? 'unknown' : pkgManager.manager,
+    };
+};
+const getRemotionVersion = () => {
+    // careful when refactoring this file, path must be adjusted
+    const packageJson = require('../../package.json');
+    const { version } = packageJson;
+    return version;
+};
+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);
+        setTimeout(() => {
+            resolve({
+                currentVersion: version,
+                latestVersion: version,
+                updateAvailable: false,
+                timedOut: true,
+                packageManager: pkgManager === 'unknown' ? 'unknown' : pkgManager.manager,
+            });
+        }, 3000);
+    });
+    return Promise.race([
+        threeSecTimeout,
+        isUpdateAvailable({ remotionRoot, currentVersion: version }),
+    ]);
+};
+exports.isUpdateAvailableWithTimeout = isUpdateAvailableWithTimeout;

package/dist/preview.d.ts

@@ -1 +1 @@
-export declare const previewCommand: () => Promise<void>;
+export declare const previewCommand: (remotionRoot: string) => Promise<void>;

package/dist/preview.js

@@ -4,17 +4,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.previewCommand = void 0;
-const bundler_1 = require("@remotion/bundler");
 const better_opn_1 = __importDefault(require("better-opn"));
 const path_1 = __importDefault(require("path"));
-const remotion_1 = require("remotion");
+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 log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
+const start_server_1 = require("./preview-server/start-server");
 const noop = () => undefined;
-const previewCommand = async () => {
+let liveEventsListener = null;
+const waiters = [];
+const setLiveEventsListener = (listener) => {
+    liveEventsListener = listener;
+    waiters.forEach((w) => w(listener));
+};
+const waitForLiveEventsListener = () => {
+    if (liveEventsListener) {
+        return Promise.resolve(liveEventsListener);
+    }
+    return new Promise((resolve) => {
+        waiters.push((list) => {
+            resolve(list);
+        });
+    });
+};
+const previewCommand = async (remotionRoot) => {
     const file = parse_command_line_1.parsedCli._[1];
     if (!file) {
         log_1.Log.error('The preview command requires you to specify a root file. For example');
@@ -24,15 +40,29 @@ const previewCommand = async () => {
     }
     const { port: desiredPort } = parse_command_line_1.parsedCli;
     const fullPath = path_1.default.join(process.cwd(), file);
-    await (0, initialize_render_cli_1.initializeRenderCli)('preview');
-    const inputProps = (0, get_input_props_1.getInputProps)();
+    await (0, initialize_render_cli_1.initializeRenderCli)(remotionRoot, 'preview');
+    let inputProps = (0, get_input_props_1.getInputProps)((newProps) => {
+        waitForLiveEventsListener().then((listener) => {
+            inputProps = newProps;
+            listener.sendEventToClient({
+                type: 'new-input-props',
+                newProps,
+            });
+        });
+    });
     const envVariables = await (0, get_env_1.getEnvironmentVariables)();
-    const port = await bundler_1.BundlerInternals.startServer(path_1.default.resolve(__dirname, 'previewEntry.js'), fullPath, {
-        inputProps,
+    const { port, liveEventsServer } = await (0, start_server_1.startServer)(path_1.default.resolve(__dirname, 'previewEntry.js'), fullPath, {
+        getCurrentInputProps: () => inputProps,
         envVariables,
         port: desiredPort,
-        maxTimelineTracks: remotion_1.Internals.getMaxTimelineTracks(),
+        maxTimelineTracks: config_1.ConfigInternals.getMaxTimelineTracks(),
+        remotionRoot,
+        keyboardShortcutsEnabled: config_1.ConfigInternals.getKeyboardShortcutsEnabled(),
+        userPassedPublicDir: config_1.ConfigInternals.getPublicDir(),
+        webpackOverride: config_1.ConfigInternals.getWebpackOverrideFn(),
     });
+    setLiveEventsListener(liveEventsServer);
+    log_1.Log.info(`Server running on http://localhost:${port}`);
     (0, better_opn_1.default)(`http://localhost:${port}`);
     await new Promise(noop);
 };

package/dist/previewEntry.js

@@ -5,14 +5,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const client_1 = __importDefault(require("react-dom/client"));
+// eslint-disable-next-line no-restricted-imports
 const remotion_1 = require("remotion");
 require("../styles/styles.css");
 const Editor_1 = require("./editor/components/Editor");
+const EditorContexts_1 = require("./editor/components/EditorContexts");
+const ServerDisconnected_1 = require("./editor/components/Notifications/ServerDisconnected");
+const event_source_1 = require("./event-source");
 remotion_1.Internals.CSSUtils.injectCSS(remotion_1.Internals.CSSUtils.makeDefaultCSS(null, '#1f2428'));
-const content = ((0, jsx_runtime_1.jsx)(remotion_1.Internals.RemotionRoot, { children: (0, jsx_runtime_1.jsx)(Editor_1.Editor, {}, void 0) }, void 0));
+const getServerDisconnectedDomElement = () => {
+    return document.getElementById('server-disconnected-overlay');
+};
+const content = ((0, jsx_runtime_1.jsx)(remotion_1.Internals.RemotionRoot, { children: (0, jsx_runtime_1.jsx)(EditorContexts_1.EditorContexts, { children: (0, jsx_runtime_1.jsx)(Editor_1.Editor, {}) }) }));
 if (client_1.default.createRoot) {
     client_1.default.createRoot(remotion_1.Internals.getPreviewDomElement()).render(content);
+    client_1.default.createRoot(getServerDisconnectedDomElement()).render((0, jsx_runtime_1.jsx)(ServerDisconnected_1.ServerDisconnected, {}));
 }
 else {
-    client_1.default.render((0, jsx_runtime_1.jsx)(remotion_1.Internals.RemotionRoot, { children: (0, jsx_runtime_1.jsx)(Editor_1.Editor, {}, void 0) }, void 0), remotion_1.Internals.getPreviewDomElement());
+    client_1.default.render(content, remotion_1.Internals.getPreviewDomElement());
+    client_1.default.render((0, jsx_runtime_1.jsx)(ServerDisconnected_1.ServerDisconnected, {}), getServerDisconnectedDomElement());
 }
+(0, event_source_1.openEventSource)();

package/dist/print-error.js

@@ -1,30 +1,28 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printError = void 0;
 const renderer_1 = require("@remotion/renderer");
-const chalk_1 = __importDefault(require("chalk"));
+const chalk_1 = require("./chalk");
 const code_frame_1 = require("./code-frame");
 const log_1 = require("./log");
 const progress_bar_1 = require("./progress-bar");
 const printError = async (err) => {
     if (err instanceof renderer_1.RenderInternals.SymbolicateableError) {
         const output = (0, progress_bar_1.createOverwriteableCliOutput)(false);
-        output.update(chalk_1.default.red('Symbolicating minified error message...\n' + err.message));
+        output.update(chalk_1.chalk.red('Symbolicating minified error message...\n' + err.message));
         try {
             const symbolicated = await renderer_1.RenderInternals.symbolicateError(err);
             if (symbolicated.frame === null) {
-                output.update(chalk_1.default.red('An error occurred:\n'));
+                output.update(chalk_1.chalk.red('An error occurred:\n'));
             }
             else {
-                output.update(chalk_1.default.red(`An error occurred while rendering frame ${err.frame}:\n`));
+                output.update(chalk_1.chalk.red(`An error occurred while rendering frame ${err.frame}:\n`));
             }
             (0, code_frame_1.printCodeFrameAndStack)(symbolicated);
         }
         catch (e) {
-            output.update(chalk_1.default.red('(Error occurred symbolicating stack trace - printing minified stack trace)\n'));
+            output.update(chalk_1.chalk.red('(Error occurred symbolicating stack trace - printing minified stack trace)\n'));
+            log_1.Log.error();
             log_1.Log.error(err.stack || err);
         }
         return;

package/dist/print-help.js

@@ -1,16 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printHelp = void 0;
-const chalk_1 = __importDefault(require("chalk"));
+const chalk_1 = require("./chalk");
 const log_1 = require("./log");
 const versions_1 = require("./versions");
 const packagejson = require('../package.json');
 const printFlags = (flags) => {
     flags.forEach(([flag, description]) => {
-        log_1.Log.info(chalk_1.default.blue(`${flag.padEnd(22, ' ')} ${description}`));
+        log_1.Log.info(chalk_1.chalk.blue(`${flag.padEnd(22, ' ')} ${description}`));
     });
 };
 const printHelp = () => {
@@ -18,12 +15,12 @@ const printHelp = () => {
     log_1.Log.info();
     log_1.Log.info('Available commands:');
     log_1.Log.info('');
-    log_1.Log.info('remotion preview <index-file.ts>');
-    log_1.Log.info(chalk_1.default.gray('Start the preview server.'));
+    log_1.Log.info('remotion preview <entry-point.ts>');
+    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 <index-file.ts> <comp-name> <output-file.mp4>');
-    log_1.Log.info(chalk_1.default.gray('Render video, audio or an image sequence.'));
+    log_1.Log.info('remotion render <entry-point.ts> <comp-name> <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'],
         ['--concurrency', 'How many frames to render in parallel'],
@@ -43,8 +40,8 @@ const printHelp = () => {
         ['--env-file', 'Specify a location for a dotenv file'],
     ]);
     log_1.Log.info();
-    log_1.Log.info('remotion still <index-file.ts> <comp-name> <still.png>');
-    log_1.Log.info(chalk_1.default.gray('Render a still frame and save it as an image.'));
+    log_1.Log.info('remotion still <entry-point.ts> <comp-name> <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)'],
         ['--image-format', 'Format to render the frames in, "jpeg" or "png"'],
@@ -60,13 +57,13 @@ const printHelp = () => {
     ]);
     log_1.Log.info();
     log_1.Log.info('remotion compositions <index-file.ts>');
-    log_1.Log.info(chalk_1.default.gray('Prints the available compositions.'));
+    log_1.Log.info(chalk_1.chalk.gray('Prints the available compositions.'));
     log_1.Log.info();
     log_1.Log.info('remotion ' + versions_1.VERSIONS_COMMAND);
-    log_1.Log.info(chalk_1.default.gray('Prints and validates versions of all Remotion packages.'));
+    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.default.gray('Ensure Remotion is on the newest version.'));
+    log_1.Log.info(chalk_1.chalk.gray('Ensure Remotion is on the newest version.'));
     log_1.Log.info();
     log_1.Log.info('Visit https://www.remotion.dev/docs/cli for browsable CLI documentation.');
 };

package/dist/progress-bar.d.ts

@@ -1,5 +1,5 @@
-import { StitchingState } from '@remotion/renderer';
-import { RenderStep } from './step';
+import type { Codec, StitchingState } from '@remotion/renderer';
+import type { RenderStep } from './step';
 export declare const createProgressBar: (quiet: boolean) => {
     update: (str: string) => boolean;
 };
@@ -25,12 +25,15 @@ declare type StitchingProgressInput = {
     steps: RenderStep[];
     doneIn: number | null;
     stage: StitchingState;
+    codec: Codec;
 };
-export declare const makeStitchingProgress: ({ frames, totalFrames, steps, doneIn, stage, }: StitchingProgressInput) => string;
+export declare const makeStitchingProgress: ({ frames, totalFrames, steps, doneIn, stage, codec, }: StitchingProgressInput) => string;
 export declare type DownloadProgress = {
     name: string;
     id: number;
-    progress: number;
+    progress: number | null;
+    totalBytes: number | null;
+    downloaded: number;
 };
 export declare const makeRenderingAndStitchingProgress: ({ rendering, stitching, downloads, }: {
     rendering: RenderingProgressInput;