@remotion/lambda 4.0.0-alpha.4 → 4.0.0-alpha5

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

@@ -1,2 +1,2 @@
 export declare const RENDER_COMMAND = "render";
-export declare const renderCommand: (args: string[]) => Promise<never>;
+export declare const renderCommand: (args: string[], remotionRoot: string) => Promise<never>;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 download_media_1 = require("../../../api/download-media");
 const get_render_progress_1 = require("../../../api/get-render-progress");
@@ -11,16 +12,16 @@ const sleep_1 = require("../../../shared/sleep");
 const validate_frames_per_lambda_1 = require("../../../shared/validate-frames-per-lambda");
 const validate_privacy_1 = require("../../../shared/validate-privacy");
 const validate_retries_1 = require("../../../shared/validate-retries");
+const validate_serveurl_1 = require("../../../shared/validate-serveurl");
 const args_1 = require("../../args");
 const get_aws_region_1 = require("../../get-aws-region");
 const find_function_name_1 = require("../../helpers/find-function-name");
-const get_cloudwatch_stream_url_1 = require("../../helpers/get-cloudwatch-stream-url");
 const quit_1 = require("../../helpers/quit");
 const log_1 = require("../../log");
 const progress_1 = require("./progress");
 exports.RENDER_COMMAND = 'render';
-const renderCommand = async (args) => {
-    var _a, _b, _c, _d;
+const renderCommand = async (args, remotionRoot) => {
+    var _a, _b, _c, _d, _e, _f, _g;
     const serveUrl = args[0];
     if (!serveUrl) {
         log_1.Log.error('No serve URL passed.');
@@ -29,27 +30,40 @@ const renderCommand = async (args) => {
         log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} <serve-url> <composition-id> [output-location]`);
         (0, quit_1.quit)(1);
     }
-    const composition = args[1];
+    const region = (0, get_aws_region_1.getAwsRegion)();
+    let composition = args[1];
     if (!composition) {
-        log_1.Log.error('No composition ID passed.');
-        log_1.Log.info('Pass an additional argument specifying the composition ID.');
-        log_1.Log.info();
-        log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} <serve-url> <composition-id> [output-location]`);
-        (0, quit_1.quit)(1);
+        log_1.Log.info('No compositions passed. Fetching compositions...');
+        (0, validate_serveurl_1.validateServeUrl)(serveUrl);
+        const comps = await (0, renderer_1.getCompositions)(serveUrl);
+        const { compositionId } = await cli_1.CliInternals.selectComposition(comps);
+        composition = compositionId;
     }
-    const outName = (_a = args[2]) !== null && _a !== void 0 ? _a : null;
-    const { chromiumOptions, codec, crf, envVariables, frameRange, imageFormat, inputProps, logLevel, pixelFormat, proResProfile, puppeteerTimeout, quality, scale, everyNthFrame, numberOfGifLoops, } = await cli_1.CliInternals.getCliOptions({
+    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,
+        downloadName,
+        outName: outName !== null && outName !== void 0 ? outName : null,
+        configFile: (_b = config_1.ConfigInternals.getOutputCodecOrUndefined()) !== null && _b !== void 0 ? _b : null,
+        uiCodec: null,
+    });
+    const { chromiumOptions, crf, envVariables, frameRange, inputProps, logLevel, pixelFormat, proResProfile, puppeteerTimeout, jpegQuality, scale, everyNthFrame, numberOfGifLoops, muted, overwrite, audioBitrate, videoBitrate, height, width, } = await cli_1.CliInternals.getCliOptions({
         type: 'series',
         isLambda: true,
+        remotionRoot,
+    });
+    const imageFormat = cli_1.CliInternals.getVideoImageFormat({
+        codec,
+        uiImageFormat: null,
     });
     const functionName = await (0, find_function_name_1.findFunctionName)();
-    const region = (0, get_aws_region_1.getAwsRegion)();
-    const maxRetries = (_b = args_1.parsedLambdaCli['max-retries']) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_MAX_RETRIES;
+    const maxRetries = (_c = args_1.parsedLambdaCli['max-retries']) !== null && _c !== void 0 ? _c : constants_1.DEFAULT_MAX_RETRIES;
     (0, validate_retries_1.validateMaxRetries)(maxRetries);
-    const privacy = (_c = args_1.parsedLambdaCli.privacy) !== null && _c !== void 0 ? _c : constants_1.DEFAULT_OUTPUT_PRIVACY;
+    const privacy = (_d = args_1.parsedLambdaCli.privacy) !== null && _d !== void 0 ? _d : constants_1.DEFAULT_OUTPUT_PRIVACY;
     (0, validate_privacy_1.validatePrivacy)(privacy);
-    const framesPerLambda = (_d = args_1.parsedLambdaCli['frames-per-lambda']) !== null && _d !== void 0 ? _d : undefined;
-    (0, validate_frames_per_lambda_1.validateFramesPerLambda)(framesPerLambda);
+    const framesPerLambda = (_e = args_1.parsedLambdaCli['frames-per-lambda']) !== null && _e !== void 0 ? _e : undefined;
+    (0, validate_frames_per_lambda_1.validateFramesPerLambda)({ framesPerLambda, durationInFrames: 1 });
     const res = await (0, render_media_on_lambda_1.renderMediaOnLambda)({
         functionName,
         serveUrl,
@@ -60,7 +74,7 @@ const renderCommand = async (args) => {
         envVariables,
         pixelFormat,
         proResProfile,
-        quality,
+        jpegQuality,
         region,
         maxRetries,
         composition,
@@ -75,16 +89,32 @@ const renderCommand = async (args) => {
         numberOfGifLoops,
         everyNthFrame,
         concurrencyPerLambda: args_1.parsedLambdaCli['concurrency-per-lambda'],
+        muted,
+        overwrite,
+        audioBitrate,
+        videoBitrate,
+        forceHeight: height,
+        forceWidth: width,
+        webhook: args_1.parsedLambdaCli.webhook
+            ? {
+                url: args_1.parsedLambdaCli.webhook,
+                secret: (_f = args_1.parsedLambdaCli['webhook-secret']) !== null && _f !== void 0 ? _f : null,
+            }
+            : undefined,
+        rendererFunctionName: (_g = args_1.parsedLambdaCli['renderer-function-name']) !== null && _g !== void 0 ? _g : null,
+        forceBucketName: args_1.parsedLambdaCli['force-bucket-name'],
+        audioCodec: cli_1.CliInternals.parsedCli['audio-codec'],
     });
-    const totalSteps = outName ? 5 : 4;
-    const progressBar = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
-    log_1.Log.info(cli_1.CliInternals.chalk.gray(`Bucket = ${res.bucketName}, renderId = ${res.renderId}, functionName = ${functionName}`));
-    log_1.Log.verbose(`CloudWatch logs (if enabled): ${(0, get_cloudwatch_stream_url_1.getCloudwatchStreamUrl)({
-        functionName,
-        region,
-        renderId: res.renderId,
-        method: constants_1.LambdaRoutines.renderer,
-    })}`);
+    const totalSteps = downloadName ? 6 : 5;
+    const progressBar = cli_1.CliInternals.createOverwriteableCliOutput({
+        quiet: cli_1.CliInternals.quietFlagProvided(),
+        cancelSignal: null,
+    });
+    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})`));
+    const verbose = renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose');
+    log_1.Log.verbose(`CloudWatch logs (if enabled): ${res.cloudWatchLogs}`);
+    log_1.Log.verbose(`Render folder: ${res.folderInS3Console}`);
     const status = await (0, get_render_progress_1.getRenderProgress)({
         functionName,
         bucketName: res.bucketName,
@@ -97,6 +127,9 @@ const renderCommand = async (args) => {
         steps: totalSteps,
         downloadInfo: null,
         retriesInfo: status.retriesInfo,
+        verbose,
+        totalFrames: getTotalFrames(status),
+        timeToEncode: status.timeToEncode,
     }));
     // eslint-disable-next-line no-constant-condition
     while (true) {
@@ -113,6 +146,9 @@ const renderCommand = async (args) => {
             steps: totalSteps,
             retriesInfo: newStatus.retriesInfo,
             downloadInfo: null,
+            verbose,
+            timeToEncode: newStatus.timeToEncode,
+            totalFrames: getTotalFrames(newStatus),
         }));
         if (newStatus.done) {
             progressBar.update((0, progress_1.makeProgressString)({
@@ -120,12 +156,15 @@ const renderCommand = async (args) => {
                 steps: totalSteps,
                 downloadInfo: null,
                 retriesInfo: newStatus.retriesInfo,
+                verbose,
+                timeToEncode: newStatus.timeToEncode,
+                totalFrames: getTotalFrames(newStatus),
             }));
-            if (outName) {
+            if (downloadName) {
                 const downloadStart = Date.now();
                 const { outputPath, sizeInBytes } = await (0, download_media_1.downloadMedia)({
                     bucketName: res.bucketName,
-                    outPath: outName,
+                    outPath: downloadName,
                     region: (0, get_aws_region_1.getAwsRegion)(),
                     renderId: res.renderId,
                     onProgress: ({ downloaded, totalSize }) => {
@@ -138,6 +177,9 @@ const renderCommand = async (args) => {
                                 downloaded,
                                 totalSize,
                             },
+                            verbose,
+                            timeToEncode: newStatus.timeToEncode,
+                            totalFrames: getTotalFrames(newStatus),
                         }));
                     },
                 });
@@ -150,6 +192,9 @@ const renderCommand = async (args) => {
                         downloaded: sizeInBytes,
                         totalSize: sizeInBytes,
                     },
+                    verbose,
+                    timeToEncode: newStatus.timeToEncode,
+                    totalFrames: getTotalFrames(newStatus),
                 }));
                 log_1.Log.info();
                 log_1.Log.info();
@@ -183,7 +228,12 @@ const renderCommand = async (args) => {
         }
         if (newStatus.fatalErrorEncountered) {
             log_1.Log.error('\n');
+            const uniqueErrors = [];
             for (const err of newStatus.errors) {
+                if (uniqueErrors.find((e) => e.stack === err.stack)) {
+                    continue;
+                }
+                uniqueErrors.push(err);
                 if (err.explanation) {
                     log_1.Log.error(err.explanation);
                 }
@@ -202,3 +252,8 @@ const renderCommand = async (args) => {
     }
 };
 exports.renderCommand = renderCommand;
+function getTotalFrames(status) {
+    return status.renderMetadata
+        ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
+        : null;
+}

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

@@ -1,2 +1,2 @@
 export declare const SITES_CREATE_SUBCOMMAND = "create";
-export declare const sitesCreateSubcommand: (args: string[]) => Promise<void>;
+export declare const sitesCreateSubcommand: (args: string[], remotionRoot: string) => Promise<void>;

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

@@ -1,12 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sitesCreateSubcommand = exports.SITES_CREATE_SUBCOMMAND = void 0;
 const cli_1 = require("@remotion/cli");
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
+const config_1 = require("@remotion/cli/config");
+const remotion_1 = require("remotion");
 const deploy_site_1 = require("../../../api/deploy-site");
 const get_or_create_bucket_1 = require("../../../api/get-or-create-bucket");
 const constants_1 = require("../../../shared/constants");
@@ -17,44 +14,39 @@ const progress_bar_1 = require("../../helpers/progress-bar");
 const quit_1 = require("../../helpers/quit");
 const log_1 = require("../../log");
 exports.SITES_CREATE_SUBCOMMAND = 'create';
-const sitesCreateSubcommand = async (args) => {
-    var _a, _b;
-    const fileName = args[0];
-    if (!fileName) {
+const sitesCreateSubcommand = async (args, remotionRoot) => {
+    var _a, _b, _c;
+    const { file, reason } = cli_1.CliInternals.findEntryPoint(args, remotionRoot);
+    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>`);
         (0, quit_1.quit)(1);
+        return;
     }
-    const absoluteFile = path_1.default.join(process.cwd(), fileName);
-    if (!(0, fs_1.existsSync)(absoluteFile)) {
-        log_1.Log.error(`No file exists at ${absoluteFile}. Make sure the path exists and try again.`);
-        (0, quit_1.quit)(1);
-    }
-    if ((0, fs_1.lstatSync)(absoluteFile).isDirectory()) {
-        log_1.Log.error(`You passed a path ${absoluteFile} but it is a directory. Pass a file instead.`);
-        (0, quit_1.quit)(1);
-    }
+    log_1.Log.verbose('Entry point:', file, 'Reason:', reason);
     const desiredSiteName = (_a = args_1.parsedLambdaCli['site-name']) !== null && _a !== void 0 ? _a : undefined;
     if (desiredSiteName !== undefined) {
         (0, validate_site_name_1.validateSiteName)(desiredSiteName);
     }
-    const progressBar = cli_1.CliInternals.createOverwriteableCliOutput(cli_1.CliInternals.quietFlagProvided());
+    const progressBar = cli_1.CliInternals.createOverwriteableCliOutput({
+        quiet: cli_1.CliInternals.quietFlagProvided(),
+        cancelSignal: null,
+    });
     const multiProgress = {
         bundleProgress: {
             doneIn: null,
             progress: 0,
         },
         bucketProgress: {
-            bucketCreated: false,
             doneIn: null,
-            websiteEnabled: false,
         },
         deployProgress: {
             doneIn: null,
             totalSize: null,
             sizeUploaded: 0,
+            stats: null,
         },
     };
     const updateProgress = () => {
@@ -65,20 +57,16 @@ const sitesCreateSubcommand = async (args) => {
         ].join('\n'));
     };
     const bucketStart = Date.now();
-    const { bucketName } = await (0, get_or_create_bucket_1.getOrCreateBucket)({
+    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.getOrCreateBucket)({
         region: (0, get_aws_region_1.getAwsRegion)(),
-        onBucketEnsured: () => {
-            multiProgress.bucketProgress.bucketCreated = true;
-            updateProgress();
-        },
-    });
-    multiProgress.bucketProgress.websiteEnabled = true;
+    })).bucketName;
     multiProgress.bucketProgress.doneIn = Date.now() - bucketStart;
     updateProgress();
     const bundleStart = Date.now();
     const uploadStart = Date.now();
-    const { serveUrl, siteName } = await (0, deploy_site_1.deploySite)({
-        entryPoint: absoluteFile,
+    const { serveUrl, siteName, stats } = await (0, deploy_site_1.deploySite)({
+        entryPoint: file,
         siteName: desiredSiteName,
         bucketName,
         options: {
@@ -93,11 +81,12 @@ const sitesCreateSubcommand = async (args) => {
                     sizeUploaded: p.sizeUploaded,
                     totalSize: p.totalSize,
                     doneIn: null,
+                    stats: null,
                 };
                 updateProgress();
             },
-            enableCaching: cli_1.ConfigInternals.getWebpackCaching(),
-            webpackOverride: (_b = cli_1.ConfigInternals.getWebpackOverrideFn()) !== null && _b !== void 0 ? _b : ((f) => f),
+            enableCaching: config_1.ConfigInternals.getWebpackCaching(),
+            webpackOverride: (_c = config_1.ConfigInternals.getWebpackOverrideFn()) !== null && _c !== void 0 ? _c : ((f) => f),
         },
         region: (0, get_aws_region_1.getAwsRegion)(),
     });
@@ -106,6 +95,11 @@ const sitesCreateSubcommand = async (args) => {
         sizeUploaded: 1,
         totalSize: 1,
         doneIn: uploadDuration,
+        stats: {
+            addedFiles: stats.uploadedFiles,
+            removedFiles: stats.deletedFiles,
+            untouchedFiles: stats.untouchedFiles,
+        },
     };
     updateProgress();
     log_1.Log.info();
@@ -113,5 +107,10 @@ const sitesCreateSubcommand = async (args) => {
     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}`]
+        .filter(remotion_1.Internals.truthy)
+        .join(' ')));
 };
 exports.sitesCreateSubcommand = sitesCreateSubcommand;

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

@@ -1,2 +1,2 @@
 export declare const SITES_COMMAND = "sites";
-export declare const sitesCommand: (args: string[]) => Promise<void> | undefined;
+export declare const sitesCommand: (args: string[], remotionRoot: string) => Promise<void> | undefined;

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sitesCommand = exports.SITES_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
-const log_1 = require("@remotion/cli/dist/log");
 const constants_1 = require("../../../shared/constants");
 const quit_1 = require("../../helpers/quit");
 const create_1 = require("./create");
@@ -11,20 +10,23 @@ const rm_1 = require("./rm");
 const rmall_1 = require("./rmall");
 exports.SITES_COMMAND = 'sites';
 const printSitesHelp = () => {
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} <subcommand>`);
-    log_1.Log.info();
-    log_1.Log.info('Available subcommands:');
-    log_1.Log.info();
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} ${create_1.SITES_CREATE_SUBCOMMAND} <entry-point>`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Creates a new site based on a Remotion project'));
-    log_1.Log.info();
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} ${ls_1.SITES_LS_SUBCOMMAND}`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Lists the sites currently deployed'));
-    log_1.Log.info();
-    log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.SITES_COMMAND} ${rm_1.SITES_RM_COMMAND} <site-id>`);
-    log_1.Log.info(cli_1.CliInternals.chalk.gray('Remove a site from the S3 bucket.'));
+    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 sitesCommand = (args) => {
+const sitesCommand = (args, remotionRoot) => {
     if (args[0] === ls_1.SITES_LS_SUBCOMMAND) {
         return (0, ls_1.sitesLsSubcommand)();
     }
@@ -35,10 +37,10 @@ const sitesCommand = (args) => {
         return (0, rmall_1.sitesRmallSubcommand)();
     }
     if (args[0] === create_1.SITES_CREATE_SUBCOMMAND) {
-        return (0, create_1.sitesCreateSubcommand)(args.slice(1));
+        return (0, create_1.sitesCreateSubcommand)(args.slice(1), remotionRoot);
     }
     if (args[0]) {
-        log_1.Log.error(`Subcommand ${args[0]} not found.`);
+        cli_1.CliInternals.Log.error(`Subcommand ${args[0]} not found.`);
         printSitesHelp();
         (0, quit_1.quit)(1);
     }

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sitesLsSubcommand = exports.SITES_LS_SUBCOMMAND = void 0;
 const cli_1 = require("@remotion/cli");
-const log_1 = require("@remotion/cli/dist/log");
 const get_sites_1 = require("../../../api/get-sites");
 const get_aws_region_1 = require("../../get-aws-region");
 const date_string_1 = require("../../helpers/date-string");
@@ -20,30 +19,30 @@ const sitesLsSubcommand = async () => {
     const region = (0, get_aws_region_1.getAwsRegion)();
     const { sites, buckets } = await (0, get_sites_1.getSites)({ region });
     if (buckets.length > 1 && !cli_1.CliInternals.quietFlagProvided()) {
-        log_1.Log.warn('Warning: You have more than one Remotion S3 bucket, but only one is needed. This can lead to conflicts. Remove all but one of them.');
+        cli_1.CliInternals.Log.warn('Warning: You have more than one Remotion S3 bucket, but only one is needed. This can lead to conflicts. Remove all but one of them.');
     }
     const sitesPluralized = sites.length === 1 ? 'site' : 'sites';
     if (!cli_1.CliInternals.quietFlagProvided()) {
-        log_1.Log.info(`${sites.length} ${sitesPluralized} in the ${region} region.`);
+        cli_1.CliInternals.Log.info(`${sites.length} ${sitesPluralized} in the ${region} region.`);
     }
     if (cli_1.CliInternals.quietFlagProvided()) {
         if (sites.length === 0) {
-            log_1.Log.info('()');
+            cli_1.CliInternals.Log.info('()');
             return;
         }
-        return log_1.Log.info(sites.map((s) => s.id).join(' '));
+        return cli_1.CliInternals.Log.info(sites.map((s) => s.id).join(' '));
     }
-    log_1.Log.info();
-    log_1.Log.info(cli_1.CliInternals.chalk.gray(logRow(['Site Name', 'Bucket', 'Size', 'Last updated'])));
+    cli_1.CliInternals.Log.info();
+    cli_1.CliInternals.Log.info(cli_1.CliInternals.chalk.gray(logRow(['Site Name', 'Bucket', 'Size', 'Last updated'])));
     for (const site of sites) {
-        log_1.Log.info(logRow([
+        cli_1.CliInternals.Log.info(logRow([
             site.id,
             site.bucketName,
             cli_1.CliInternals.formatBytes(site.sizeInBytes),
             site.lastModified ? (0, date_string_1.dateString)(new Date(site.lastModified)) : 'n/a',
         ]));
-        log_1.Log.info(site.serveUrl);
-        log_1.Log.info();
+        cli_1.CliInternals.Log.info(site.serveUrl);
+        cli_1.CliInternals.Log.info();
     }
 };
 exports.sitesLsSubcommand = sitesLsSubcommand;

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

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sitesRmSubcommand = exports.SITES_RM_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
 const delete_site_1 = require("../../../api/delete-site");
-const get_buckets_1 = require("../../../api/get-buckets");
+const get_or_create_bucket_1 = require("../../../api/get-or-create-bucket");
 const get_sites_1 = require("../../../api/get-sites");
+const args_1 = require("../../args");
 const get_aws_region_1 = require("../../get-aws-region");
 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;
     if (args.length === 0) {
         log_1.Log.error('No site name was passed. Run the command again and pass another argument <site-name>.');
         (0, quit_1.quit)(1);
@@ -24,22 +26,10 @@ const sitesRmSubcommand = async (args) => {
         region,
     });
     for (const siteName of args) {
-        const { remotionBuckets } = await (0, get_buckets_1.getRemotionS3Buckets)(region);
-        if (remotionBuckets.length > 1) {
-            log_1.Log.error('You have more than one Remotion Lambda bucket:');
-            for (const bucket of remotionBuckets) {
-                log_1.Log.error(`- ${bucket.name}`);
-            }
-            log_1.Log.error('You should only have one - delete all but one before continuing.');
-            (0, quit_1.quit)(1);
-        }
-        if (remotionBuckets.length === 0) {
-            log_1.Log.error(`You don't have a Remotion Lambda bucket in the ${region} region. Therefore nothing was deleted.`);
-            (0, quit_1.quit)(1);
-        }
+        const bucketName = (_a = args_1.parsedLambdaCli['force-bucket-name']) !== null && _a !== void 0 ? _a : (await (0, get_or_create_bucket_1.getOrCreateBucket)({ region })).bucketName;
         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 ${remotionBuckets[0].name}.`);
+            log_1.Log.error(`No site ${siteName.trim()} was found in your bucket ${bucketName}.`);
             return (0, quit_1.quit)(1);
         }
         await (0, confirm_1.confirmCli)({
@@ -47,7 +37,7 @@ const sitesRmSubcommand = async (args) => {
             allowForceFlag: true,
         });
         const { totalSizeInBytes: totalSize } = await (0, delete_site_1.deleteSite)({
-            bucketName: remotionBuckets[0].name,
+            bucketName,
             siteName,
             region,
             onAfterItemDeleted: ({ itemName }) => {

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

@@ -3,38 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sitesRmallSubcommand = exports.SITES_RMALL_COMMAND = void 0;
 const cli_1 = require("@remotion/cli");
 const delete_site_1 = require("../../../api/delete-site");
-const get_buckets_1 = require("../../../api/get-buckets");
+const get_or_create_bucket_1 = require("../../../api/get-or-create-bucket");
 const get_sites_1 = require("../../../api/get-sites");
+const args_1 = require("../../args");
 const get_aws_region_1 = require("../../get-aws-region");
 const confirm_1 = require("../../helpers/confirm");
-const quit_1 = require("../../helpers/quit");
 const log_1 = require("../../log");
 exports.SITES_RMALL_COMMAND = 'rmall';
 const sitesRmallSubcommand = async () => {
+    var _a;
     const region = (0, get_aws_region_1.getAwsRegion)();
     const deployedSites = await (0, get_sites_1.getSites)({
         region,
     });
-    const { remotionBuckets } = await (0, get_buckets_1.getRemotionS3Buckets)(region);
-    if (remotionBuckets.length > 1) {
-        log_1.Log.error('You have more than one Remotion Lambda bucket:');
-        for (const bucket of remotionBuckets) {
-            log_1.Log.error(`- ${bucket.name}`);
-        }
-        log_1.Log.error('You should only have one - delete all but one before continuing.');
-        (0, quit_1.quit)(1);
-    }
-    if (remotionBuckets.length === 0) {
-        log_1.Log.error(`You don't have a Remotion Lambda bucket in the ${region} region. Therefore nothing was deleted.`);
-        (0, quit_1.quit)(1);
-    }
+    const bucketName = (_a = args_1.parsedLambdaCli['force-bucket-name']) !== null && _a !== void 0 ? _a : (await (0, get_or_create_bucket_1.getOrCreateBucket)({ region })).bucketName;
     for (const site of deployedSites.sites) {
         await (0, confirm_1.confirmCli)({
             delMessage: `Site ${site.id} in bucket ${site.bucketName} (${cli_1.CliInternals.formatBytes(site.sizeInBytes)}): Delete? (Y/n)`,
             allowForceFlag: true,
         });
         const { totalSizeInBytes: totalSize } = await (0, delete_site_1.deleteSite)({
-            bucketName: remotionBuckets[0].name,
+            bucketName,
             siteName: site.id,
             region,
             onAfterItemDeleted: ({ itemName }) => {

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

@@ -1,2 +1,2 @@
 export declare const STILL_COMMAND = "still";
-export declare const stillCommand: (args: string[]) => Promise<void>;
+export declare const stillCommand: (args: string[], remotionRoot: string) => Promise<void>;