@remotion/lambda 4.0.114 → 4.0.116

package/dist/cli/commands/policies/validate.d.ts

@@ -1,2 +1,3 @@
+import type { LogLevel } from '@remotion/renderer';
 export declare const VALIDATE_SUBCOMMAND = "validate";
-export declare const validateSubcommand: () => Promise<void>;
+export declare const validateSubcommand: (logLevel: LogLevel) => Promise<void>;

package/dist/cli/commands/policies/validate.js

@@ -5,18 +5,18 @@ const simulate_1 = require("../../../api/iam-validation/simulate");
 const get_aws_region_1 = require("../../get-aws-region");
 const log_1 = require("../../log");
 exports.VALIDATE_SUBCOMMAND = 'validate';
-const validateSubcommand = async () => {
+const validateSubcommand = async (logLevel) => {
     try {
         await (0, simulate_1.simulatePermissions)({
             region: (0, get_aws_region_1.getAwsRegion)(),
             onSimulation: (res) => {
-                log_1.Log.info((0, simulate_1.logPermissionOutput)(res));
+                log_1.Log.info({ indent: false, logLevel }, (0, simulate_1.logPermissionOutput)(res));
             },
         });
     }
     catch (err) {
-        log_1.Log.error('Did not have the required permissions on AWS:');
-        log_1.Log.error(err);
+        log_1.Log.error({ indent: false, logLevel }, 'Did not have the required permissions on AWS:');
+        log_1.Log.error({ indent: false, logLevel }, err);
     }
 };
 exports.validateSubcommand = validateSubcommand;

package/dist/cli/commands/quotas/increase.js

@@ -46,14 +46,14 @@ const quotasIncreaseCommand = async (logLevel) => {
     const defaultConcurrency = (_c = defaultConcurrencyLimit.Quota) === null || _c === void 0 ? void 0 : _c.Value;
     const increaseRecommended = concurrencyCurrent <= defaultConcurrency;
     if (!increaseRecommended && !args_1.forceFlagProvided) {
-        log_1.Log.error(`Current limit of ${concurrencyCurrent} is already increased over the default (${defaultConcurrency}).`);
-        log_1.Log.info('You can force the increase with the --force flag.');
-        log_1.Log.info('You are more likely to get an increase if you attach a reason. Go so by going to the AWS console:');
-        log_1.Log.info(makeQuotaUrl({ quotaId: defaults_1.LAMBDA_CONCURRENCY_LIMIT_QUOTA, region }));
+        log_1.Log.error({ indent: false, logLevel }, `Current limit of ${concurrencyCurrent} is already increased over the default (${defaultConcurrency}).`);
+        log_1.Log.info({ indent: false, logLevel }, 'You can force the increase with the --force flag.');
+        log_1.Log.info({ indent: false, logLevel }, 'You are more likely to get an increase if you attach a reason. Go so by going to the AWS console:');
+        log_1.Log.info({ indent: false, logLevel }, makeQuotaUrl({ quotaId: defaults_1.LAMBDA_CONCURRENCY_LIMIT_QUOTA, region }));
         (0, quit_1.quit)(1);
     }
     const newLimit = Math.floor(concurrencyCurrent / 5000) * 5000 + 5000;
-    log_1.Log.info(`Sending request to AWS to increase concurrency limit from ${concurrencyCurrent} to ${newLimit}.`);
+    log_1.Log.info({ indent: false, logLevel }, `Sending request to AWS to increase concurrency limit from ${concurrencyCurrent} to ${newLimit}.`);
     if (!(await (0, confirm_1.confirmCli)({
         allowForceFlag: true,
         delMessage: 'Send? (Y/n)',
@@ -69,8 +69,8 @@ const quotasIncreaseCommand = async (logLevel) => {
     }
     catch (err) {
         if (err.name === 'DependencyAccessDeniedException') {
-            log_1.Log.error('Could not request increase because this is a sub-account of another AWS account.');
-            log_1.Log.error(`Please go to ${makeQuotaUrl({
+            log_1.Log.error({ indent: false, logLevel }, 'Could not request increase because this is a sub-account of another AWS account.');
+            log_1.Log.error({ indent: false, logLevel }, `Please go to ${makeQuotaUrl({
                 quotaId: defaults_1.LAMBDA_CONCURRENCY_LIMIT_QUOTA,
                 region,
             })} to request the increase via the AWS console.`);
@@ -78,6 +78,6 @@ const quotasIncreaseCommand = async (logLevel) => {
         }
         throw err;
     }
-    log_1.Log.info(`Requested increase successfully. Run "${defaults_1.BINARY_NAME} ${_1.QUOTAS_COMMAND}" to check whether your request was approved.`);
+    log_1.Log.info({ indent: false, logLevel }, `Requested increase successfully. Run "${defaults_1.BINARY_NAME} ${_1.QUOTAS_COMMAND}" to check whether your request was approved.`);
 };
 exports.quotasIncreaseCommand = quotasIncreaseCommand;

package/dist/cli/commands/quotas/index.js

@@ -6,14 +6,14 @@ const defaults_1 = require("../../../defaults");
 const increase_1 = require("./increase");
 const list_1 = require("./list");
 exports.QUOTAS_COMMAND = 'quotas';
-const printHelp = () => {
-    cli_1.CliInternals.Log.info('Available commands:');
-    cli_1.CliInternals.Log.info();
-    cli_1.CliInternals.Log.info(`npx ${defaults_1.BINARY_NAME} ${exports.QUOTAS_COMMAND}`);
-    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('List relevant AWS Lambda quotas.'));
-    cli_1.CliInternals.Log.info();
-    cli_1.CliInternals.Log.info(`npx ${defaults_1.BINARY_NAME} ${exports.QUOTAS_COMMAND} ${increase_1.INCREASE_SUBCOMMAND}`);
-    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('Increase Lambda quotas.'));
+const printHelp = (logLevel) => {
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, 'Available commands:');
+    cli_1.CliInternals.Log.info({ indent: false, logLevel });
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, `npx ${defaults_1.BINARY_NAME} ${exports.QUOTAS_COMMAND}`);
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('List relevant AWS Lambda quotas.'));
+    cli_1.CliInternals.Log.info({ indent: false, logLevel });
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, `npx ${defaults_1.BINARY_NAME} ${exports.QUOTAS_COMMAND} ${increase_1.INCREASE_SUBCOMMAND}`);
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Increase Lambda quotas.'));
 };
 const quotasCommand = (args, logLevel) => {
     if (args.filter(Boolean).length === 0) {
@@ -22,7 +22,7 @@ const quotasCommand = (args, logLevel) => {
     if (args[0] === increase_1.INCREASE_SUBCOMMAND) {
         return (0, increase_1.quotasIncreaseCommand)(logLevel);
     }
-    cli_1.CliInternals.Log.error('Subcommand ' + args[0] + ' not found.');
-    printHelp();
+    cli_1.CliInternals.Log.error({ indent: false, logLevel }, 'Subcommand ' + args[0] + ' not found.');
+    printHelp(logLevel);
 };
 exports.quotasCommand = quotasCommand;

package/dist/cli/commands/quotas/list.js

@@ -12,8 +12,8 @@ const increase_1 = require("./increase");
 const quotasListCommand = async (logLevel) => {
     var _a, _b, _c, _d;
     const region = (0, get_aws_region_1.getAwsRegion)();
-    log_1.Log.info(cli_1.CliInternals.chalk.gray(`Region = ${region}`));
-    log_1.Log.info();
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray(`Region = ${region}`));
+    log_1.Log.info({ indent: false, logLevel });
     const [concurrencyLimit, defaultConcurrencyLimit, burstLimit, changes] = await Promise.all([
         (0, aws_clients_1.getServiceQuotasClient)(region).send(new client_service_quotas_1.GetServiceQuotaCommand({
             QuotaCode: defaults_1.LAMBDA_CONCURRENCY_LIMIT_QUOTA,
@@ -39,26 +39,26 @@ const quotasListCommand = async (logLevel) => {
     const increaseRecommended = concurrencyCurrent <= defaultConcurrency;
     const effectiveBurstConcurrency = Math.min(burstDefault, defaultConcurrency);
     if (increaseRecommended) {
-        log_1.Log.info(`Concurrency limit: ${concurrencyCurrent} - ${increaseRecommended
+        log_1.Log.info({ indent: false, logLevel }, `Concurrency limit: ${concurrencyCurrent} - ${increaseRecommended
             ? cli_1.CliInternals.chalk.greenBright('Increase recommended!')
             : ''}`);
     }
     else {
-        log_1.Log.info(`Concurrency limit: ${concurrencyCurrent}`);
+        log_1.Log.info({ indent: false, logLevel }, `Concurrency limit: ${concurrencyCurrent}`);
     }
     if (openCase) {
         log_1.Log.warn({ indent: false, logLevel }, `A request to increase it to ${openCase.DesiredValue} is pending:`);
         log_1.Log.warn({ indent: false, logLevel }, `https://${region}.console.aws.amazon.com/support/home#/case/?displayId=${openCase.CaseId}`);
     }
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('The maximum amount of Lambda functions which can concurrently execute.'));
-    log_1.Log.info(cli_1.CliInternals.chalk.gray(`Run \`npx ${defaults_1.BINARY_NAME} ${_1.QUOTAS_COMMAND} ${increase_1.INCREASE_SUBCOMMAND}\` to ask AWS to increase your limit.`));
-    log_1.Log.info();
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('The maximum amount of Lambda functions which can concurrently execute.'));
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray(`Run \`npx ${defaults_1.BINARY_NAME} ${_1.QUOTAS_COMMAND} ${increase_1.INCREASE_SUBCOMMAND}\` to ask AWS to increase your limit.`));
+    log_1.Log.info({ indent: false, logLevel });
     if (effectiveBurstConcurrency === burstDefault) {
-        log_1.Log.info(`Burst concurrency: ${burstDefault}`);
+        log_1.Log.info({ indent: false, logLevel }, `Burst concurrency: ${burstDefault}`);
     }
     else {
-        log_1.Log.info(`Burst concurrency: ${burstDefault}, but only ${effectiveBurstConcurrency} effective because of concurrency limit`);
+        log_1.Log.info({ indent: false, logLevel }, `Burst concurrency: ${burstDefault}, but only ${effectiveBurstConcurrency} effective because of concurrency limit`);
     }
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('The maximum amount of concurrency increase in 10 seconds'));
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('The maximum amount of concurrency increase in 10 seconds'));
 };
 exports.quotasListCommand = quotasListCommand;

package/dist/cli/commands/regions.d.ts

@@ -1,2 +1,3 @@
+import type { LogLevel } from '@remotion/renderer';
 export declare const REGIONS_COMMAND = "regions";
-export declare const regionsCommand: () => void;
+export declare const regionsCommand: (logLevel: LogLevel) => void;

package/dist/cli/commands/regions.js

@@ -5,9 +5,9 @@ const cli_1 = require("@remotion/cli");
 const get_regions_1 = require("../../api/get-regions");
 const args_1 = require("../args");
 exports.REGIONS_COMMAND = 'regions';
-const regionsCommand = () => {
+const regionsCommand = (logLevel) => {
     var _a;
-    cli_1.CliInternals.Log.info((0, get_regions_1.getRegions)({
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, (0, get_regions_1.getRegions)({
         enabledByDefaultOnly: (_a = args_1.parsedLambdaCli['default-only']) !== null && _a !== void 0 ? _a : false,
     }).join(' '));
 };

package/dist/cli/commands/render/render.js

@@ -4,6 +4,7 @@ exports.renderCommand = exports.RENDER_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
 const config_1 = require("@remotion/cli/config");
 const renderer_1 = require("@remotion/renderer");
+const client_1 = require("@remotion/renderer/client");
 const no_react_1 = require("remotion/no-react");
 const download_media_1 = require("../../../api/download-media");
 const get_render_progress_1 = require("../../../api/get-render-progress");
@@ -27,26 +28,87 @@ function getTotalFrames(status) {
         ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
         : null;
 }
+const { x264Option, audioBitrateOption, offthreadVideoCacheSizeInBytesOption, scaleOption, crfOption, jpegQualityOption, videoBitrateOption, mutedOption, colorSpaceOption, deleteAfterOption, enableMultiprocessOnLinuxOption, glOption, headlessOption, numberOfGifLoopsOption, encodingMaxRateOption, encodingBufferSizeOption, delayRenderTimeoutInMillisecondsOption, overwriteOption, } = client_1.BrowserSafeApis.options;
 const renderCommand = async (args, remotionRoot, logLevel) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const serveUrl = args[0];
     if (!serveUrl) {
-        log_1.Log.error('No serve URL passed.');
-        log_1.Log.info('Pass an additional argument specifying a URL where your Remotion project is hosted.');
-        log_1.Log.info();
-        log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} <serve-url> <composition-id> [output-location]`);
+        log_1.Log.error({ indent: false, logLevel }, 'No serve URL passed.');
+        log_1.Log.info({ indent: false, logLevel }, 'Pass an additional argument specifying a URL where your Remotion project is hosted.');
+        log_1.Log.info({ indent: false, logLevel });
+        log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} <serve-url> <composition-id> [output-location]`);
         (0, quit_1.quit)(1);
     }
     const region = (0, get_aws_region_1.getAwsRegion)();
-    const { chromiumOptions, crf, envVariables, frameRange, inputProps, pixelFormat, proResProfile, puppeteerTimeout, jpegQuality, scale, everyNthFrame, numberOfGifLoops, muted, overwrite, audioBitrate, videoBitrate, encodingMaxRate, encodingBufferSize, height, width, browserExecutable, offthreadVideoCacheSizeInBytes, colorSpace, deleteAfter, x264Preset, } = cli_1.CliInternals.getCliOptions({
-        type: 'series',
-        isLambda: true,
-        remotionRoot,
+    const { envVariables, frameRange, inputProps, pixelFormat, proResProfile, everyNthFrame, height, width, browserExecutable, ignoreCertificateErrors, userAgent, disableWebSecurity, } = cli_1.CliInternals.getCliOptions({
+        isStill: false,
         logLevel,
     });
+    const x264Preset = x264Option.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const audioBitrate = audioBitrateOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const offthreadVideoCacheSizeInBytes = offthreadVideoCacheSizeInBytesOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const scale = scaleOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const crf = crfOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const jpegQuality = jpegQualityOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const videoBitrate = videoBitrateOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const muted = mutedOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const colorSpace = colorSpaceOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const deleteAfter = deleteAfterOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const enableMultiProcessOnLinux = enableMultiprocessOnLinuxOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const gl = glOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const headless = headlessOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const numberOfGifLoops = numberOfGifLoopsOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const encodingMaxRate = encodingMaxRateOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const encodingBufferSize = encodingBufferSizeOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const timeoutInMilliseconds = delayRenderTimeoutInMillisecondsOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
+    const overwrite = overwriteOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }, false).value;
+    const chromiumOptions = {
+        disableWebSecurity,
+        enableMultiProcessOnLinux,
+        gl,
+        headless,
+        ignoreCertificateErrors,
+        userAgent,
+    };
     let composition = args[1];
     if (!composition) {
-        log_1.Log.info('No compositions passed. Fetching compositions...');
+        log_1.Log.info({ indent: false, logLevel }, 'No compositions passed. Fetching compositions...');
         (0, validate_serveurl_1.validateServeUrl)(serveUrl);
         if (!serveUrl.startsWith('https://') && !serveUrl.startsWith('http://')) {
             throw Error('Passing the shorthand serve URL without composition name is currently not supported.\n Make sure to pass a composition name after the shorthand serve URL or pass the complete serveURL without composition name to get to choose between all compositions.');
@@ -76,7 +138,7 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
             port: config_1.ConfigInternals.getRendererPortFromConfigFileAndCliFlag(),
             puppeteerInstance: undefined,
             serveUrlOrWebpackUrl: serveUrl,
-            timeoutInMilliseconds: puppeteerTimeout,
+            timeoutInMilliseconds,
             logLevel,
             width,
             server,
@@ -86,8 +148,9 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
     }
     const outName = args_1.parsedLambdaCli['out-name'];
     const downloadName = (_a = args[2]) !== null && _a !== void 0 ? _a : null;
-    const { codec, reason } = cli_1.CliInternals.getFinalOutputCodec({
-        cliFlag: cli_1.CliInternals.parsedCli.codec,
+    const { value: codec, source: reason } = client_1.BrowserSafeApis.options.videoCodecOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }, {
         downloadName,
         outName: outName !== null && outName !== void 0 ? outName : null,
         configFile: (_b = config_1.ConfigInternals.getOutputCodecOrUndefined()) !== null && _b !== void 0 ? _b : null,
@@ -125,7 +188,7 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
         logLevel,
         frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
         outName: (_f = args_1.parsedLambdaCli['out-name']) !== null && _f !== void 0 ? _f : null,
-        timeoutInMilliseconds: puppeteerTimeout,
+        timeoutInMilliseconds,
         chromiumOptions,
         scale,
         numberOfGifLoops,
@@ -163,8 +226,8 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
         updatesDontOverwrite: false,
         indent: false,
     });
-    log_1.Log.info(cli_1.CliInternals.chalk.gray(`bucket = ${res.bucketName}, function = ${functionName}`));
-    log_1.Log.info(cli_1.CliInternals.chalk.gray(`renderId = ${res.renderId}, codec = ${codec} (${reason})`));
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray(`bucket = ${res.bucketName}, function = ${functionName}`));
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray(`renderId = ${res.renderId}, codec = ${codec} (${reason})`));
     log_1.Log.verbose({ indent: false, logLevel }, `CloudWatch logs (if enabled): ${res.cloudWatchLogs}`);
     log_1.Log.verbose({ indent: false, logLevel }, `Lambda insights (if enabled): ${res.lambdaInsightsLogs}`);
     log_1.Log.verbose({ indent: false, logLevel }, `Render folder: ${res.folderInS3Console}`);
@@ -173,6 +236,7 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
         bucketName: res.bucketName,
         renderId: res.renderId,
         region: (0, get_aws_region_1.getAwsRegion)(),
+        logLevel,
     });
     const multiProgress = (0, progress_1.makeMultiProgressFromStatus)(status);
     progressBar.update((0, progress_1.makeProgressString)({
@@ -192,6 +256,7 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
             bucketName: res.bucketName,
             renderId: res.renderId,
             region: (0, get_aws_region_1.getAwsRegion)(),
+            logLevel,
         });
         const newProgress = (0, progress_1.makeMultiProgressFromStatus)(newStatus);
         progressBar.update((0, progress_1.makeProgressString)({
@@ -250,16 +315,16 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
                     timeToEncode: newStatus.timeToEncode,
                     totalFrames: getTotalFrames(newStatus),
                 }), false);
-                log_1.Log.info();
-                log_1.Log.info();
-                log_1.Log.info('Done!', outputPath, cli_1.CliInternals.formatBytes(sizeInBytes));
+                log_1.Log.info({ indent: false, logLevel });
+                log_1.Log.info({ indent: false, logLevel });
+                log_1.Log.info({ indent: false, logLevel }, 'Done!', outputPath, cli_1.CliInternals.formatBytes(sizeInBytes));
             }
             else {
-                log_1.Log.info();
-                log_1.Log.info();
-                log_1.Log.info('Done! ' + newStatus.outputFile);
+                log_1.Log.info({ indent: false, logLevel });
+                log_1.Log.info({ indent: false, logLevel });
+                log_1.Log.info({ indent: false, logLevel }, 'Done! ' + newStatus.outputFile);
             }
-            log_1.Log.info([
+            log_1.Log.info({ indent: false, logLevel }, [
                 newStatus.renderMetadata
                     ? `${newStatus.renderMetadata.estimatedTotalLambdaInvokations} λ's used`
                     : null,
@@ -281,7 +346,7 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
             (0, quit_1.quit)(0);
         }
         if (newStatus.fatalErrorEncountered) {
-            log_1.Log.error('\n');
+            log_1.Log.error({ indent: false, logLevel }, '\n');
             const uniqueErrors = [];
             for (const err of newStatus.errors) {
                 if (uniqueErrors.find((e) => e.stack === err.stack)) {
@@ -289,7 +354,7 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
                 }
                 uniqueErrors.push(err);
                 if (err.explanation) {
-                    log_1.Log.error(err.explanation);
+                    log_1.Log.error({ indent: false, logLevel }, err.explanation);
                 }
                 const frames = renderer_1.RenderInternals.parseStack(err.stack.split('\n'));
                 const errorWithStackFrame = new renderer_1.RenderInternals.SymbolicateableError({
@@ -301,9 +366,9 @@ const renderCommand = async (args, remotionRoot, logLevel) => {
                 });
                 await cli_1.CliInternals.printError(errorWithStackFrame, logLevel);
             }
-            log_1.Log.info();
-            log_1.Log.info(`Accrued costs until error was thrown: ${newStatus.costs.displayCost}.`);
-            log_1.Log.info('This is an estimate and continuing Lambda functions may incur additional costs.');
+            log_1.Log.info({ indent: false, logLevel });
+            log_1.Log.info({ indent: false, logLevel }, `Accrued costs until error was thrown: ${newStatus.costs.displayCost}.`);
+            log_1.Log.info({ indent: false, logLevel }, 'This is an estimate and continuing Lambda functions may incur additional costs.');
             (0, quit_1.quit)(1);
         }
     }

package/dist/cli/commands/sites/create.js

@@ -19,10 +19,10 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
     var _a, _b, _c;
     const { file, reason } = cli_1.CliInternals.findEntryPoint(args, remotionRoot, logLevel);
     if (!file) {
-        log_1.Log.error('No entry file passed.');
-        log_1.Log.info('Pass an additional argument specifying the entry file of your Remotion project:');
-        log_1.Log.info();
-        log_1.Log.info(`${constants_1.BINARY_NAME} deploy <entry-file.ts>`);
+        log_1.Log.error({ indent: false, logLevel }, 'No entry file passed.');
+        log_1.Log.info({ indent: false, logLevel }, 'Pass an additional argument specifying the entry file of your Remotion project:');
+        log_1.Log.info({ indent: false, logLevel });
+        log_1.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} deploy <entry-file.ts>`);
         (0, quit_1.quit)(1);
         return;
     }
@@ -61,11 +61,13 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
         ].join('\n'), false);
     };
     const bucketStart = Date.now();
-    const enableFolderExpiry = args_1.parsedLambdaCli[client_1.BrowserSafeApis.options.folderExpiryOption.cliFlag];
+    const enableFolderExpiry = client_1.BrowserSafeApis.options.folderExpiryOption.getValue({
+        commandLine: cli_1.CliInternals.parsedCli,
+    }).value;
     const cliBucketName = (_b = args_1.parsedLambdaCli['force-bucket-name']) !== null && _b !== void 0 ? _b : null;
     const bucketName = cliBucketName !== null && cliBucketName !== void 0 ? cliBucketName : (await (0, get_or_create_bucket_1.internalGetOrCreateBucket)({
         region: (0, get_aws_region_1.getAwsRegion)(),
-        enableFolderExpiry: enableFolderExpiry !== null && enableFolderExpiry !== void 0 ? enableFolderExpiry : null,
+        enableFolderExpiry,
         customCredentials: null,
     })).bucketName;
     multiProgress.bucketProgress.doneIn = Date.now() - bucketStart;
@@ -116,14 +118,14 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel) => {
         },
     };
     updateProgress();
-    log_1.Log.info();
-    log_1.Log.info();
-    log_1.Log.info('Deployed to S3!');
-    log_1.Log.info(`Serve URL: ${serveUrl}`);
-    log_1.Log.info(`Site Name: ${siteName}`);
-    log_1.Log.info();
-    log_1.Log.info(cli_1.CliInternals.chalk.blueBright('ℹ️ If you make changes to your code, you need to redeploy the site. You can overwrite the existing site by running:'));
-    log_1.Log.info(cli_1.CliInternals.chalk.blueBright(['npx remotion lambda sites create', args[0], `--site-name=${siteName}`]
+    log_1.Log.info({ indent: false, logLevel });
+    log_1.Log.info({ indent: false, logLevel });
+    log_1.Log.info({ indent: false, logLevel }, 'Deployed to S3!');
+    log_1.Log.info({ indent: false, logLevel }, `Serve URL: ${serveUrl}`);
+    log_1.Log.info({ indent: false, logLevel }, `Site Name: ${siteName}`);
+    log_1.Log.info({ indent: false, logLevel });
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.blueBright('ℹ️ If you make changes to your code, you need to redeploy the site. You can overwrite the existing site by running:'));
+    log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.blueBright(['npx remotion lambda sites create', args[0], `--site-name=${siteName}`]
         .filter(no_react_1.NoReactInternals.truthy)
         .join(' ')));
 };

package/dist/cli/commands/sites/index.js

@@ -9,41 +9,41 @@ const ls_1 = require("./ls");
 const rm_1 = require("./rm");
 const rmall_1 = require("./rmall");
 exports.SITES_COMMAND = 'sites';
-const printSitesHelp = () => {
-    cli_1.CliInternals.Log.info(`${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} <subcommand>`);
-    cli_1.CliInternals.Log.info();
-    cli_1.CliInternals.Log.info('Available subcommands:');
-    cli_1.CliInternals.Log.info();
-    cli_1.CliInternals.Log.info(`${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} ${create_1.SITES_CREATE_SUBCOMMAND} <entry-point>`);
-    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('Creates a new site based on a Remotion project'));
-    cli_1.CliInternals.Log.info();
-    cli_1.CliInternals.Log.info(`${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} ${ls_1.SITES_LS_SUBCOMMAND}`);
-    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('Lists the sites currently deployed'));
-    cli_1.CliInternals.Log.info();
-    cli_1.CliInternals.Log.info(`${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} ${rm_1.SITES_RM_COMMAND} <site-id>`);
-    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('Remove a site from the S3 bucket.'));
-    cli_1.CliInternals.Log.info();
-    cli_1.CliInternals.Log.info(`${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} ${rmall_1.SITES_RMALL_COMMAND}`);
-    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray('Remove all sites from the S3 bucket.'));
+const printSitesHelp = (logLevel) => {
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} <subcommand>`);
+    cli_1.CliInternals.Log.info({ indent: false, logLevel });
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, 'Available subcommands:');
+    cli_1.CliInternals.Log.info({ indent: false, logLevel });
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} ${create_1.SITES_CREATE_SUBCOMMAND} <entry-point>`);
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Creates a new site based on a Remotion project'));
+    cli_1.CliInternals.Log.info({ indent: false, logLevel });
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} ${ls_1.SITES_LS_SUBCOMMAND}`);
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Lists the sites currently deployed'));
+    cli_1.CliInternals.Log.info({ indent: false, logLevel });
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} ${rm_1.SITES_RM_COMMAND} <site-id>`);
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Remove a site from the S3 bucket.'));
+    cli_1.CliInternals.Log.info({ indent: false, logLevel });
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, `${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} ${rmall_1.SITES_RMALL_COMMAND}`);
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray('Remove all sites from the S3 bucket.'));
 };
 const sitesCommand = (args, remotionRoot, logLevel) => {
     if (args[0] === ls_1.SITES_LS_SUBCOMMAND) {
         return (0, ls_1.sitesLsSubcommand)(logLevel);
     }
     if (args[0] === rm_1.SITES_RM_COMMAND) {
-        return (0, rm_1.sitesRmSubcommand)(args.slice(1));
+        return (0, rm_1.sitesRmSubcommand)(args.slice(1), logLevel);
     }
     if (args[0] === rmall_1.SITES_RMALL_COMMAND) {
-        return (0, rmall_1.sitesRmallSubcommand)();
+        return (0, rmall_1.sitesRmallSubcommand)(logLevel);
     }
     if (args[0] === create_1.SITES_CREATE_SUBCOMMAND) {
         return (0, create_1.sitesCreateSubcommand)(args.slice(1), remotionRoot, logLevel);
     }
     if (args[0]) {
-        cli_1.CliInternals.Log.error(`Subcommand ${args[0]} not found.`);
-        printSitesHelp();
+        cli_1.CliInternals.Log.error({ indent: false, logLevel }, `Subcommand ${args[0]} not found.`);
+        printSitesHelp(logLevel);
         (0, quit_1.quit)(1);
     }
-    printSitesHelp();
+    printSitesHelp(logLevel);
 };
 exports.sitesCommand = sitesCommand;

package/dist/cli/commands/sites/ls.js

@@ -23,26 +23,26 @@ const sitesLsSubcommand = async (logLevel) => {
     }
     const sitesPluralized = sites.length === 1 ? 'site' : 'sites';
     if (!cli_1.CliInternals.quietFlagProvided()) {
-        cli_1.CliInternals.Log.info(`${sites.length} ${sitesPluralized} in the ${region} region.`);
+        cli_1.CliInternals.Log.info({ indent: false, logLevel }, `${sites.length} ${sitesPluralized} in the ${region} region.`);
     }
     if (cli_1.CliInternals.quietFlagProvided()) {
         if (sites.length === 0) {
-            cli_1.CliInternals.Log.info('()');
+            cli_1.CliInternals.Log.info({ indent: false, logLevel }, '()');
             return;
         }
-        return cli_1.CliInternals.Log.info(sites.map((s) => s.id).join(' '));
+        return cli_1.CliInternals.Log.info({ indent: false, logLevel }, sites.map((s) => s.id).join(' '));
     }
-    cli_1.CliInternals.Log.info();
-    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray(logRow(['Site Name', 'Bucket', 'Size', 'Last updated'])));
+    cli_1.CliInternals.Log.info({ indent: false, logLevel });
+    cli_1.CliInternals.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray(logRow(['Site Name', 'Bucket', 'Size', 'Last updated'])));
     for (const site of sites) {
-        cli_1.CliInternals.Log.info(logRow([
+        cli_1.CliInternals.Log.info({ indent: false, logLevel }, logRow([
             site.id,
             site.bucketName,
             cli_1.CliInternals.formatBytes(site.sizeInBytes),
             site.lastModified ? (0, date_string_1.dateString)(new Date(site.lastModified)) : 'n/a',
         ]));
-        cli_1.CliInternals.Log.info(site.serveUrl);
-        cli_1.CliInternals.Log.info();
+        cli_1.CliInternals.Log.info({ indent: false, logLevel }, site.serveUrl);
+        cli_1.CliInternals.Log.info({ indent: false, logLevel });
     }
 };
 exports.sitesLsSubcommand = sitesLsSubcommand;

package/dist/cli/commands/sites/rm.d.ts

@@ -1,2 +1,3 @@
+import type { LogLevel } from '@remotion/renderer';
 export declare const SITES_RM_COMMAND = "rm";
-export declare const sitesRmSubcommand: (args: string[]) => Promise<undefined>;
+export declare const sitesRmSubcommand: (args: string[], logLevel: LogLevel) => Promise<undefined>;

package/dist/cli/commands/sites/rm.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sitesRmSubcommand = exports.SITES_RM_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
-const client_1 = require("@remotion/renderer/client");
 const delete_site_1 = require("../../../api/delete-site");
 const get_or_create_bucket_1 = require("../../../api/get-or-create-bucket");
 const get_sites_1 = require("../../../api/get-sites");
@@ -12,14 +11,14 @@ const confirm_1 = require("../../helpers/confirm");
 const quit_1 = require("../../helpers/quit");
 const log_1 = require("../../log");
 exports.SITES_RM_COMMAND = 'rm';
-const sitesRmSubcommand = async (args) => {
-    var _a, _b;
+const sitesRmSubcommand = async (args, logLevel) => {
+    var _a;
     if (args.length === 0) {
-        log_1.Log.error('No site name was passed. Run the command again and pass another argument <site-name>.');
+        log_1.Log.error({ indent: false, logLevel }, 'No site name was passed. Run the command again and pass another argument <site-name>.');
         (0, quit_1.quit)(1);
     }
     if (args[0] === '()') {
-        log_1.Log.info('No sites to remove.');
+        log_1.Log.info({ indent: false, logLevel }, 'No sites to remove.');
         return;
     }
     const region = (0, get_aws_region_1.getAwsRegion)();
@@ -29,13 +28,13 @@ const sitesRmSubcommand = async (args) => {
     });
     const bucketName = (_a = args_1.parsedLambdaCli['force-bucket-name']) !== null && _a !== void 0 ? _a : (await (0, get_or_create_bucket_1.internalGetOrCreateBucket)({
         region,
-        enableFolderExpiry: (_b = args_1.parsedLambdaCli[client_1.BrowserSafeApis.options.folderExpiryOption.cliFlag]) !== null && _b !== void 0 ? _b : null,
+        enableFolderExpiry: false,
         customCredentials: null,
     })).bucketName;
     for (const siteName of args) {
         const site = deployedSites.sites.find((s) => s.id === siteName.trim());
         if (!site) {
-            log_1.Log.error(`No site ${siteName.trim()} was found in your bucket ${bucketName}.`);
+            log_1.Log.error({ indent: false, logLevel }, `No site ${siteName.trim()} was found in your bucket ${bucketName}.`);
             return (0, quit_1.quit)(1);
         }
         if (!(await (0, confirm_1.confirmCli)({
@@ -49,10 +48,10 @@ const sitesRmSubcommand = async (args) => {
             siteName,
             region,
             onAfterItemDeleted: ({ itemName }) => {
-                log_1.Log.info(cli_1.CliInternals.chalk.gray(`Deleted ${itemName}`));
+                log_1.Log.info({ indent: false, logLevel }, cli_1.CliInternals.chalk.gray(`Deleted ${itemName}`));
             },
         });
-        log_1.Log.info(`Deleted site ${siteName} and freed up ${cli_1.CliInternals.formatBytes(totalSize)}.`);
+        log_1.Log.info({ indent: false, logLevel }, `Deleted site ${siteName} and freed up ${cli_1.CliInternals.formatBytes(totalSize)}.`);
     }
 };
 exports.sitesRmSubcommand = sitesRmSubcommand;

package/dist/cli/commands/sites/rmall.d.ts

@@ -1,2 +1,3 @@
+import type { LogLevel } from '@remotion/renderer';
 export declare const SITES_RMALL_COMMAND = "rmall";
-export declare const sitesRmallSubcommand: () => Promise<void>;
+export declare const sitesRmallSubcommand: (logLevel: LogLevel) => Promise<void>;