@remotion/lambda 4.0.0-imgloading.2 → 4.0.0-jshmr2.1

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

@@ -1,12 +1,7 @@
 "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 remotion_1 = require("remotion");
 const deploy_site_1 = require("../../../api/deploy-site");
 const get_or_create_bucket_1 = require("../../../api/get-or-create-bucket");
@@ -18,25 +13,18 @@ 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);
@@ -50,12 +38,12 @@ const sitesCreateSubcommand = async (args) => {
         bucketProgress: {
             bucketCreated: false,
             doneIn: null,
-            websiteEnabled: false,
         },
         deployProgress: {
             doneIn: null,
             totalSize: null,
             sizeUploaded: 0,
+            stats: null,
         },
     };
     const updateProgress = () => {
@@ -66,20 +54,20 @@ 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: {
@@ -94,11 +82,12 @@ const sitesCreateSubcommand = async (args) => {
                     sizeUploaded: p.sizeUploaded,
                     totalSize: p.totalSize,
                     doneIn: null,
+                    stats: null,
                 };
                 updateProgress();
             },
-            enableCaching: remotion_1.Internals.getWebpackCaching(),
-            webpackOverride: (_b = remotion_1.Internals.getWebpackOverrideFn()) !== null && _b !== void 0 ? _b : remotion_1.Internals.defaultOverrideFunction,
+            enableCaching: cli_1.ConfigInternals.getWebpackCaching(),
+            webpackOverride: (_c = cli_1.ConfigInternals.getWebpackOverrideFn()) !== null && _c !== void 0 ? _c : ((f) => f),
         },
         region: (0, get_aws_region_1.getAwsRegion)(),
     });
@@ -107,6 +96,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();
@@ -114,5 +108,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,20 @@ 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.'));
 };
-const sitesCommand = (args) => {
+const sitesCommand = (args, remotionRoot) => {
     if (args[0] === ls_1.SITES_LS_SUBCOMMAND) {
         return (0, ls_1.sitesLsSubcommand)();
     }
@@ -35,10 +34,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,11 +2,9 @@
 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");
-const format_bytes_1 = require("../../helpers/format-bytes");
 exports.SITES_LS_SUBCOMMAND = 'ls';
 const COLS = [20, 30, 10, 15];
 const logRow = (data) => {
@@ -21,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,
-            (0, format_bytes_1.formatBytes)(site.sizeInBytes),
+            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,15 +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 format_bytes_1 = require("../../helpers/format-bytes");
 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);
@@ -25,37 +26,25 @@ 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)({
-            delMessage: `Site ${site.id} in bucket ${site.bucketName} (${(0, format_bytes_1.formatBytes)(site.sizeInBytes)}): Delete? (Y/n)`,
+            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,
             region,
             onAfterItemDeleted: ({ itemName }) => {
                 log_1.Log.info(cli_1.CliInternals.chalk.gray(`Deleted ${itemName}`));
             },
         });
-        log_1.Log.info(`Deleted site ${siteName} and freed up ${(0, format_bytes_1.formatBytes)(totalSize)}.`);
+        log_1.Log.info(`Deleted site ${siteName} and freed up ${cli_1.CliInternals.formatBytes(totalSize)}.`);
     }
 };
 exports.sitesRmSubcommand = sitesRmSubcommand;

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

@@ -3,46 +3,34 @@ 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 format_bytes_1 = require("../../helpers/format-bytes");
-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} (${(0, format_bytes_1.formatBytes)(site.sizeInBytes)}): Delete? (Y/n)`,
+            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 }) => {
                 log_1.Log.info(cli_1.CliInternals.chalk.gray(`Deleted ${itemName}`));
             },
         });
-        log_1.Log.info(`Deleted site ${site.id} and freed up ${(0, format_bytes_1.formatBytes)(totalSize)}.`);
+        log_1.Log.info(`Deleted site ${site.id} and freed up ${cli_1.CliInternals.formatBytes(totalSize)}.`);
     }
 };
 exports.sitesRmallSubcommand = sitesRmallSubcommand;

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>;

package/dist/cli/commands/still.js

@@ -8,16 +8,15 @@ const render_still_on_lambda_1 = require("../../api/render-still-on-lambda");
 const constants_1 = require("../../shared/constants");
 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 format_bytes_1 = require("../helpers/format-bytes");
-const get_cloudwatch_stream_url_1 = require("../helpers/get-cloudwatch-stream-url");
 const quit_1 = require("../helpers/quit");
 const log_1 = require("../log");
 exports.STILL_COMMAND = 'still';
-const stillCommand = async (args) => {
-    var _a, _b, _c, _d;
+const stillCommand = async (args, remotionRoot) => {
+    var _a, _b, _c, _d, _e, _f;
     const serveUrl = args[0];
     if (!serveUrl) {
         log_1.Log.error('No serve URL passed.');
@@ -26,59 +25,67 @@ const stillCommand = async (args) => {
         log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.STILL_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.STILL_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, envVariables, imageFormat, inputProps, logLevel, puppeteerTimeout, quality, stillFrame, scale, } = await cli_1.CliInternals.getCliOptions({
+    const downloadName = (_a = args[2]) !== null && _a !== void 0 ? _a : null;
+    const outName = args_1.parsedLambdaCli['out-name'];
+    const { chromiumOptions, envVariables, inputProps, logLevel, puppeteerTimeout, quality, stillFrame, scale, height, width, } = await cli_1.CliInternals.getCliOptions({
         type: 'still',
         isLambda: true,
+        remotionRoot,
     });
     const functionName = await (0, find_function_name_1.findFunctionName)();
     const maxRetries = (_b = args_1.parsedLambdaCli['max-retries']) !== null && _b !== void 0 ? _b : 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;
     (0, validate_privacy_1.validatePrivacy)(privacy);
+    const { format: imageFormat, source: imageFormatReason } = cli_1.CliInternals.determineFinalImageFormat({
+        downloadName,
+        outName: outName !== null && outName !== void 0 ? outName : null,
+        configImageFormat: (_d = cli_1.ConfigInternals.getUserPreferredImageFormat()) !== null && _d !== void 0 ? _d : null,
+        cliFlag: (_e = cli_1.CliInternals.parsedCli['image-format']) !== null && _e !== void 0 ? _e : null,
+        isLambda: true,
+    });
     try {
+        log_1.Log.info(cli_1.CliInternals.chalk.gray(`functionName = ${functionName}, imageFormat = ${imageFormat} (${imageFormatReason})`));
         const res = await (0, render_still_on_lambda_1.renderStillOnLambda)({
             functionName,
             serveUrl,
             inputProps,
-            imageFormat: imageFormat,
+            imageFormat,
             composition,
             privacy,
-            region: (0, get_aws_region_1.getAwsRegion)(),
+            region,
             maxRetries,
             envVariables,
             frame: stillFrame,
             quality,
             logLevel,
-            outName: args_1.parsedLambdaCli['out-name'],
+            outName,
             chromiumOptions,
             timeoutInMilliseconds: puppeteerTimeout,
             scale,
+            forceHeight: height,
+            forceWidth: width,
         });
-        log_1.Log.verbose(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: (0, get_aws_region_1.getAwsRegion)(),
-            renderId: res.renderId,
-            method: constants_1.LambdaRoutines.still,
-        })}`);
-        if (outName) {
+        log_1.Log.info(cli_1.CliInternals.chalk.gray(`Bucket = ${res.bucketName}, renderId = ${res.renderId}`));
+        log_1.Log.verbose(`CloudWatch logs (if enabled): ${res.cloudWatchLogs}`);
+        if (downloadName) {
             log_1.Log.info('Finished rendering. Downloading...');
             const { outputPath, sizeInBytes } = await (0, download_media_1.downloadMedia)({
                 bucketName: res.bucketName,
-                outPath: outName,
-                region: (0, get_aws_region_1.getAwsRegion)(),
+                outPath: downloadName,
+                region,
                 renderId: res.renderId,
             });
-            log_1.Log.info('Done!', outputPath, (0, format_bytes_1.formatBytes)(sizeInBytes));
+            log_1.Log.info('Done!', outputPath, cli_1.CliInternals.formatBytes(sizeInBytes));
         }
         else {
             log_1.Log.info(`Finished still!`);
@@ -87,7 +94,7 @@ const stillCommand = async (args) => {
         }
     }
     catch (err) {
-        const frames = renderer_1.RenderInternals.parseStack(((_d = err.stack) !== null && _d !== void 0 ? _d : '').split('\n'));
+        const frames = renderer_1.RenderInternals.parseStack(((_f = err.stack) !== null && _f !== void 0 ? _f : '').split('\n'));
         const errorWithStackFrame = new renderer_1.RenderInternals.SymbolicateableError({
             message: err.message,
             frame: null,

package/dist/cli/get-aws-region.d.ts

@@ -1,2 +1,2 @@
-import { AwsRegion } from '../pricing/aws-regions';
+import type { AwsRegion } from '../pricing/aws-regions';
 export declare const getAwsRegion: () => AwsRegion;

package/dist/cli/get-aws-region.js

@@ -6,6 +6,7 @@ const is_in_lambda_1 = require("../shared/is-in-lambda");
 const validate_aws_region_1 = require("../shared/validate-aws-region");
 const args_1 = require("./args");
 const getAwsRegion = () => {
+    var _a;
     if ((0, is_in_lambda_1.isInsideLambda)()) {
         throw new Error('Should not call getAwsRegion() if in lambda');
     }
@@ -13,7 +14,7 @@ const getAwsRegion = () => {
         (0, validate_aws_region_1.validateAwsRegion)(args_1.parsedLambdaCli.region);
         return args_1.parsedLambdaCli.region;
     }
-    const envVariable = process.env.AWS_REGION;
+    const envVariable = (_a = process.env.REMOTION_AWS_REGION) !== null && _a !== void 0 ? _a : process.env.AWS_REGION;
     if (envVariable) {
         (0, validate_aws_region_1.validateAwsRegion)(envVariable);
         return envVariable;

package/dist/cli/helpers/find-function-name.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findFunctionName = void 0;
+const version_1 = require("remotion/version");
 const get_functions_1 = require("../../api/get-functions");
 const constants_1 = require("../../shared/constants");
+const args_1 = require("../args");
 const functions_1 = require("../commands/functions");
 const deploy_1 = require("../commands/functions/deploy");
 const ls_1 = require("../commands/functions/ls");
@@ -15,9 +17,9 @@ const findFunctionName = async () => {
         region: (0, get_aws_region_1.getAwsRegion)(),
         compatibleOnly: false,
     });
-    const lambdasWithMatchingVersion = remotionLambdas.filter((l) => l.version === constants_1.CURRENT_VERSION);
+    let lambdasWithMatchingVersion = remotionLambdas.filter((l) => l.version === version_1.VERSION);
     if (lambdasWithMatchingVersion.length === 0) {
-        log_1.Log.error(`No lambda functions with version ${constants_1.CURRENT_VERSION} found in your account.`);
+        log_1.Log.error(`No lambda functions with version ${version_1.VERSION} found in your account.`);
         if (remotionLambdas.length > 0) {
             log_1.Log.error('Other functions were found, but are not compatible with this version of the CLI.');
         }
@@ -27,11 +29,39 @@ const findFunctionName = async () => {
         (0, quit_1.quit)(1);
     }
     if (lambdasWithMatchingVersion.length > 1) {
-        log_1.Log.error('More than 1 lambda function found in your account. This is an error.');
-        log_1.Log.info(`Delete extraneous lambda functions in your AWS console or run`);
-        log_1.Log.info(`  npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${rm_1.FUNCTIONS_RM_SUBCOMMAND} $(npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${ls_1.FUNCTIONS_LS_SUBCOMMAND} -q) -y`);
-        log_1.Log.info('to delete all lambda functions.');
-        (0, quit_1.quit)(1);
+        if (args_1.parsedLambdaCli['function-name']) {
+            const prevFunctions = [...lambdasWithMatchingVersion];
+            lambdasWithMatchingVersion = lambdasWithMatchingVersion.filter((l) => l.functionName === args_1.parsedLambdaCli['function-name']);
+            if (lambdasWithMatchingVersion.length === 0) {
+                log_1.Log.error(`No lambda function with name "${args_1.parsedLambdaCli['function-name']}" and version ${version_1.VERSION} found in your account.`);
+                log_1.Log.info();
+                if (prevFunctions.length === 0) {
+                    log_1.Log.info(`No functions for version ${version_1.VERSION} were found, deploy one using:`);
+                    log_1.Log.info(`  npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${deploy_1.FUNCTIONS_DEPLOY_SUBCOMMAND}`);
+                    (0, quit_1.quit)(1);
+                }
+                log_1.Log.info('The following functions were found:');
+                for (const l of prevFunctions) {
+                    log_1.Log.info(`- ${l.functionName} (v${l.version})`);
+                }
+                log_1.Log.info('Remove the `--function-name` parameter use one of them.');
+                (0, quit_1.quit)(1);
+            }
+        }
+        else {
+            log_1.Log.error('More than 1 lambda function found in your account. Unsure which one to use.');
+            log_1.Log.info();
+            log_1.Log.info('Possible solutions:');
+            log_1.Log.info('- Define using `--function-name` which function you want to use.');
+            log_1.Log.info(`- Delete extraneous lambda functions in your AWS console or using:`);
+            log_1.Log.info(`    npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${rm_1.FUNCTIONS_RM_SUBCOMMAND} $(npx ${constants_1.BINARY_NAME} ${functions_1.FUNCTIONS_COMMAND} ${ls_1.FUNCTIONS_LS_SUBCOMMAND} -q) -y`);
+            log_1.Log.info();
+            log_1.Log.info(`The following functions were found (only showing v${version_1.VERSION}):`);
+            for (const l of lambdasWithMatchingVersion) {
+                log_1.Log.info(`- ${l.functionName}`);
+            }
+            (0, quit_1.quit)(1);
+        }
     }
     const { functionName } = lambdasWithMatchingVersion[0];
     return functionName;

package/dist/cli/helpers/progress-bar.d.ts

@@ -5,13 +5,19 @@ export declare type BundleProgress = {
 export declare const makeBundleProgress: ({ progress, doneIn }: BundleProgress) => string;
 export declare type BucketCreationProgress = {
     bucketCreated: boolean;
-    websiteEnabled: boolean;
     doneIn: number | null;
 };
-export declare const makeBucketProgress: ({ bucketCreated, websiteEnabled, doneIn, }: BucketCreationProgress) => string;
+export declare const makeBucketProgress: ({ bucketCreated, doneIn, }: BucketCreationProgress) => string;
+declare type UploadStats = {
+    addedFiles: number;
+    removedFiles: number;
+    untouchedFiles: number;
+};
 export declare type DeployToS3Progress = {
     sizeUploaded: number;
     totalSize: number | null;
     doneIn: number | null;
+    stats: UploadStats | null;
 };
-export declare const makeDeployProgressBar: ({ sizeUploaded, totalSize, doneIn, }: DeployToS3Progress) => string;
+export declare const makeDeployProgressBar: ({ sizeUploaded, totalSize, doneIn, stats, }: DeployToS3Progress) => string;
+export {};