@remotion/lambda 4.0.0-defer.6 → 4.0.0-esm.17

package/dist/cli/commands/functions/deploy.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionsDeploySubcommand = exports.FUNCTIONS_DEPLOY_SUBCOMMAND = void 0;
 const cli_1 = require("@remotion/cli");
 const log_1 = require("@remotion/cli/dist/log");
+const version_1 = require("remotion/version");
 const deploy_function_1 = require("../../../api/deploy-function");
 const constants_1 = require("../../../shared/constants");
 const validate_architecture_1 = require("../../../shared/validate-architecture");
@@ -34,7 +35,7 @@ Region = ${region}
 Memory = ${memorySizeInMb}MB
 Disk size = ${diskSizeInMb}MB
 Timeout = ${timeoutInSeconds}sec
-Version = ${constants_1.CURRENT_VERSION}
+Version = ${version_1.VERSION}
 Architecture = ${architecture}
 CloudWatch Logging Enabled = ${createCloudWatchLogGroup}
 CloudWatch Retention Period = ${cloudWatchLogRetentionPeriodInDays} days

package/dist/cli/commands/regions.js

@@ -3,8 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.regionsCommand = exports.REGIONS_COMMAND = void 0;
 const log_1 = require("@remotion/cli/dist/log");
 const get_regions_1 = require("../../api/get-regions");
+const args_1 = require("../args");
 exports.REGIONS_COMMAND = 'regions';
 const regionsCommand = () => {
-    log_1.Log.info((0, get_regions_1.getRegions)().join(' '));
+    var _a;
+    log_1.Log.info((0, get_regions_1.getRegions)({
+        enabledByDefaultOnly: (_a = args_1.parsedLambdaCli['default-only']) !== null && _a !== void 0 ? _a : false,
+    }).join(' '));
 };
 exports.regionsCommand = regionsCommand;

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

@@ -1,16 +1,17 @@
-import { CleanupInfo, EncodingProgress, RenderProgress } from '../../../defaults';
-import { ChunkRetry } from '../../../functions/helpers/get-retry-stats';
+import type { CleanupInfo, EncodingProgress, RenderProgress } from '../../../defaults';
+import type { ChunkRetry } from '../../../functions/helpers/get-retry-stats';
 declare type LambdaInvokeProgress = {
     totalLambdas: number | null;
     lambdasInvoked: number;
-    doneIn: number | null;
 };
 declare type ChunkProgress = {
+    doneIn: number | null;
+    framesRendered: number;
+    totalFrames: number | null;
     totalChunks: number | null;
     chunksInvoked: number;
-    doneIn: number | null;
 };
-export declare type MultiRenderProgress = {
+declare type MultiRenderProgress = {
     lambdaInvokeProgress: LambdaInvokeProgress;
     chunkProgress: ChunkProgress;
     encodingProgress: EncodingProgress;
@@ -18,14 +19,17 @@ export declare type MultiRenderProgress = {
 };
 export declare const makeMultiProgressFromStatus: (status: RenderProgress) => MultiRenderProgress;
 declare type DownloadedInfo = {
-    totalSize: number;
+    totalSize: number | null;
     downloaded: number;
     doneIn: number | null;
 };
-export declare const makeProgressString: ({ progress, steps, downloadInfo, retriesInfo, }: {
+export declare const makeProgressString: ({ progress, steps, downloadInfo, retriesInfo, verbose, timeToEncode, totalFrames, }: {
     progress: MultiRenderProgress;
     steps: number;
     downloadInfo: DownloadedInfo | null;
     retriesInfo: ChunkRetry[];
+    verbose: boolean;
+    timeToEncode: number | null;
+    totalFrames: number | null;
 }) => string;
 export {};

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

@@ -2,46 +2,54 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeProgressString = exports.makeMultiProgressFromStatus = void 0;
 const cli_1 = require("@remotion/cli");
+const renderer_1 = require("@remotion/renderer");
 const remotion_1 = require("remotion");
-const format_bytes_1 = require("../../helpers/format-bytes");
+const truthy_1 = require("../../../shared/truthy");
 const makeInvokeProgress = (invokeProgress, totalSteps, retriesInfo) => {
-    const { lambdasInvoked, totalLambdas, doneIn } = invokeProgress;
-    const progress = doneIn
-        ? 1
-        : totalLambdas === null
-            ? 0
-            : lambdasInvoked / totalLambdas;
+    const { lambdasInvoked, totalLambdas } = invokeProgress;
+    const progress = totalLambdas === null ? 0 : lambdasInvoked / totalLambdas;
     return [
         '⚡️',
         `(1/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Invoking' : 'Invoked'} lambdas`,
-        doneIn === null
-            ? `${Math.round(progress * 100)}%`
-            : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+        `${progress === 0 ? 'Invoked' : 'Invoking'} lambdas`,
+        progress === 1
+            ? cli_1.CliInternals.chalk.gray('100%')
+            : `${Math.round(progress * 100)}%`,
         retriesInfo.length > 0 ? `(+${retriesInfo.length} retries)` : [],
     ].join(' ');
 };
-const makeChunkProgress = ({ chunkProgress, invokeProgress, totalSteps, }) => {
-    const lambdaIsDone = invokeProgress.doneIn !== null;
+const makeRenderProgress = ({ chunkProgress, totalSteps, }) => {
     const { chunksInvoked, totalChunks, doneIn } = chunkProgress;
-    const progress = totalChunks === null ? 0 : chunksInvoked / totalChunks;
-    const shouldShow = lambdaIsDone || progress > 0;
-    if (!shouldShow) {
-        return '';
-    }
-    return [
+    const renderProgress = chunkProgress.totalFrames === null
+        ? 0
+        : chunkProgress.framesRendered / chunkProgress.totalFrames;
+    const encodingProgress = totalChunks === null ? 0 : chunksInvoked / totalChunks;
+    const frames = chunkProgress.totalFrames === null
+        ? null
+        : `(${chunkProgress.framesRendered}/${chunkProgress.totalFrames})`;
+    const first = [
         '🧩',
         `(2/${totalSteps})`,
-        cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Rendering' : 'Rendered'} chunks`,
+        cli_1.CliInternals.makeProgressBar(renderProgress),
+        doneIn === null ? 'Rendering frames' : 'Rendered frames',
+        doneIn === null ? frames : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+    ]
+        .filter(truthy_1.truthy)
+        .join(' ');
+    const second = [
+        '🏗️ ',
+        `(3/${totalSteps})`,
+        cli_1.CliInternals.makeProgressBar(encodingProgress),
+        `${doneIn === null ? 'Encoding' : 'Encoded'} chunks`,
         doneIn === null
-            ? `${Math.round(progress * 100)}%`
+            ? `${Math.round(encodingProgress * 100)}%`
             : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
     ].join(' ');
+    return [first, second];
 };
-const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, }) => {
-    const { framesEncoded, totalFrames, doneIn } = encodingProgress;
+const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, totalFrames, timeToEncode, }) => {
+    const { framesEncoded } = encodingProgress;
     const progress = totalFrames === null ? 0 : framesEncoded / totalFrames;
     const chunksDone = chunkProgress.doneIn !== null;
     const shouldShow = progress > 0 || chunksDone;
@@ -50,23 +58,30 @@ const makeEncodingProgress = ({ encodingProgress, chunkProgress, totalSteps, })
     }
     return [
         '📽 ',
-        `(3/${totalSteps})`,
+        `(4/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
-        `${doneIn === null ? 'Combining' : 'Combined'} videos`,
-        doneIn === null
+        `${timeToEncode === null ? 'Combining' : 'Combined'} videos`,
+        timeToEncode === null
             ? `${Math.round(progress * 100)}%`
-            : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
+            : cli_1.CliInternals.chalk.gray(`${timeToEncode}ms`),
     ].join(' ');
 };
-const makeCleanupProgress = (cleanupInfo, totalSteps) => {
+const makeCleanupProgress = (cleanupInfo, totalSteps, skipped) => {
     if (!cleanupInfo) {
         return '';
     }
+    if (skipped) {
+        return [
+            '🪣 ',
+            `(5/${totalSteps})`,
+            cli_1.CliInternals.chalk.blueBright(`Not cleaning up because --log=verbose was set`),
+        ].join(' ');
+    }
     const { doneIn, filesDeleted, minFilesToDelete } = cleanupInfo;
     const progress = filesDeleted / minFilesToDelete;
     return [
         '🪣 ',
-        `(4/${totalSteps})`,
+        `(5/${totalSteps})`,
         cli_1.CliInternals.makeProgressBar(progress),
         `${doneIn === null ? 'Cleaning up' : 'Cleaned up'} artifacts`,
         doneIn === null
@@ -77,51 +92,61 @@ const makeCleanupProgress = (cleanupInfo, totalSteps) => {
 const makeDownloadProgress = (downloadInfo, totalSteps) => {
     return [
         '💾',
-        `(5/${totalSteps})`,
-        cli_1.CliInternals.makeProgressBar(downloadInfo.downloaded / downloadInfo.totalSize),
+        `(6/${totalSteps})`,
+        downloadInfo.totalSize === null
+            ? cli_1.CliInternals.getFileSizeDownloadBar(downloadInfo.downloaded)
+            : cli_1.CliInternals.makeProgressBar(downloadInfo.downloaded / downloadInfo.totalSize),
         `${downloadInfo.doneIn === null ? 'Downloading' : 'Downloaded'} video`,
         downloadInfo.doneIn === null
-            ? `${(0, format_bytes_1.formatBytes)(downloadInfo.downloaded)}/${(0, format_bytes_1.formatBytes)(downloadInfo.totalSize)}`
+            ? [
+                `${cli_1.CliInternals.formatBytes(downloadInfo.downloaded)}`,
+                downloadInfo.totalSize === null
+                    ? null
+                    : `${cli_1.CliInternals.formatBytes(downloadInfo.totalSize)}`,
+            ]
+                .filter(remotion_1.Internals.truthy)
+                .join('/')
             : cli_1.CliInternals.chalk.gray(`${downloadInfo.doneIn}ms`),
     ].join(' ');
 };
 const makeMultiProgressFromStatus = (status) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f;
     return {
         chunkProgress: {
             chunksInvoked: status.chunks,
             totalChunks: (_b = (_a = status.renderMetadata) === null || _a === void 0 ? void 0 : _a.totalChunks) !== null && _b !== void 0 ? _b : null,
             doneIn: status.timeToFinishChunks,
+            framesRendered: status.framesRendered,
+            totalFrames: status.renderMetadata
+                ? renderer_1.RenderInternals.getFramesToRender(status.renderMetadata.frameRange, status.renderMetadata.everyNthFrame).length
+                : null,
         },
         encodingProgress: {
             framesEncoded: (_d = (_c = status.encodingStatus) === null || _c === void 0 ? void 0 : _c.framesEncoded) !== null && _d !== void 0 ? _d : 0,
-            totalFrames: (_f = (_e = status.renderMetadata) === null || _e === void 0 ? void 0 : _e.videoConfig.durationInFrames) !== null && _f !== void 0 ? _f : 1,
-            doneIn: (_h = (_g = status.encodingStatus) === null || _g === void 0 ? void 0 : _g.doneIn) !== null && _h !== void 0 ? _h : null,
-            timeToInvoke: (_k = (_j = status.encodingStatus) === null || _j === void 0 ? void 0 : _j.timeToInvoke) !== null && _k !== void 0 ? _k : null,
         },
         lambdaInvokeProgress: {
-            doneIn: status.timeToInvokeLambdas,
             lambdasInvoked: status.lambdasInvoked,
-            totalLambdas: (_m = (_l = status.renderMetadata) === null || _l === void 0 ? void 0 : _l.estimatedRenderLambdaInvokations) !== null && _m !== void 0 ? _m : null,
+            totalLambdas: (_f = (_e = status.renderMetadata) === null || _e === void 0 ? void 0 : _e.estimatedRenderLambdaInvokations) !== null && _f !== void 0 ? _f : null,
         },
         cleanupInfo: status.cleanup,
     };
 };
 exports.makeMultiProgressFromStatus = makeMultiProgressFromStatus;
-const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, }) => {
+const makeProgressString = ({ progress, steps, downloadInfo, retriesInfo, verbose, timeToEncode, totalFrames, }) => {
     return [
         makeInvokeProgress(progress.lambdaInvokeProgress, steps, retriesInfo),
-        makeChunkProgress({
+        ...makeRenderProgress({
             chunkProgress: progress.chunkProgress,
-            invokeProgress: progress.lambdaInvokeProgress,
             totalSteps: steps,
         }),
         makeEncodingProgress({
             encodingProgress: progress.encodingProgress,
             chunkProgress: progress.chunkProgress,
             totalSteps: steps,
+            timeToEncode,
+            totalFrames,
         }),
-        makeCleanupProgress(progress.cleanupInfo, steps),
+        makeCleanupProgress(progress.cleanupInfo, steps, verbose),
         downloadInfo ? makeDownloadProgress(downloadInfo, steps) : null,
     ]
         .filter(remotion_1.Internals.truthy)

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

@@ -11,17 +11,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 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");
 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;
     const serveUrl = args[0];
     if (!serveUrl) {
         log_1.Log.error('No serve URL passed.');
@@ -30,27 +29,34 @@ 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, } = 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.getFinalCodec({
+        downloadName,
+        outName: outName !== null && outName !== void 0 ? outName : null,
+    });
+    const { chromiumOptions, crf, envVariables, frameRange, inputProps, logLevel, pixelFormat, proResProfile, puppeteerTimeout, quality, scale, everyNthFrame, numberOfGifLoops, muted, overwrite, audioBitrate, videoBitrate, height, width, } = await cli_1.CliInternals.getCliOptions({
         type: 'series',
         isLambda: true,
+        remotionRoot,
     });
+    const imageFormat = cli_1.CliInternals.getImageFormat(codec);
     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;
     (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 framesPerLambda = (_d = args_1.parsedLambdaCli['frames-per-lambda']) !== null && _d !== void 0 ? _d : undefined;
-    (0, validate_frames_per_lambda_1.validateFramesPerLambda)(framesPerLambda);
+    (0, validate_frames_per_lambda_1.validateFramesPerLambda)({ framesPerLambda, durationInFrames: 1 });
     const res = await (0, render_media_on_lambda_1.renderMediaOnLambda)({
         functionName,
         serveUrl,
@@ -73,16 +79,29 @@ const renderCommand = async (args) => {
         timeoutInMilliseconds: puppeteerTimeout,
         chromiumOptions,
         scale,
+        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: (_e = args_1.parsedLambdaCli['webhook-secret']) !== null && _e !== void 0 ? _e : null,
+            }
+            : undefined,
     });
-    const totalSteps = outName ? 5 : 4;
+    const totalSteps = downloadName ? 6 : 5;
     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,
-    })}`);
+    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(cli_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,
@@ -95,6 +114,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) {
@@ -111,6 +133,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)({
@@ -118,12 +143,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 }) => {
@@ -136,6 +164,9 @@ const renderCommand = async (args) => {
                                 downloaded,
                                 totalSize,
                             },
+                            verbose,
+                            timeToEncode: newStatus.timeToEncode,
+                            totalFrames: getTotalFrames(newStatus),
                         }));
                     },
                 });
@@ -148,10 +179,13 @@ const renderCommand = async (args) => {
                         downloaded: sizeInBytes,
                         totalSize: sizeInBytes,
                     },
+                    verbose,
+                    timeToEncode: newStatus.timeToEncode,
+                    totalFrames: getTotalFrames(newStatus),
                 }));
                 log_1.Log.info();
                 log_1.Log.info();
-                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();
@@ -169,6 +203,14 @@ const renderCommand = async (args) => {
             ]
                 .filter(Boolean)
                 .join(', '));
+            if (newStatus.mostExpensiveFrameRanges) {
+                log_1.Log.verbose('Most expensive frame ranges:');
+                log_1.Log.verbose(newStatus.mostExpensiveFrameRanges
+                    .map((f) => {
+                    return `${f.frameRange[0]}-${f.frameRange[1]} (${f.timeInMilliseconds}ms)`;
+                })
+                    .join(', '));
+            }
             (0, quit_1.quit)(0);
         }
         if (newStatus.fatalErrorEncountered) {
@@ -192,3 +234,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

@@ -18,17 +18,19 @@ 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) => {
+const sitesCreateSubcommand = async (args, remotionRoot) => {
     var _a, _b;
-    const fileName = args[0];
-    if (!fileName) {
+    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);
+    log_1.Log.verbose('Entry point:', file, 'Reason:', reason);
+    const absoluteFile = path_1.default.join(process.cwd(), file);
     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);
@@ -50,12 +52,12 @@ const sitesCreateSubcommand = async (args) => {
         bucketProgress: {
             bucketCreated: false,
             doneIn: null,
-            websiteEnabled: false,
         },
         deployProgress: {
             doneIn: null,
             totalSize: null,
             sizeUploaded: 0,
+            stats: null,
         },
     };
     const updateProgress = () => {
@@ -73,12 +75,11 @@ const sitesCreateSubcommand = async (args) => {
             updateProgress();
         },
     });
-    multiProgress.bucketProgress.websiteEnabled = true;
     multiProgress.bucketProgress.doneIn = Date.now() - bucketStart;
     updateProgress();
     const bundleStart = Date.now();
     const uploadStart = Date.now();
-    const { serveUrl, siteName } = await (0, deploy_site_1.deploySite)({
+    const { serveUrl, siteName, stats } = await (0, deploy_site_1.deploySite)({
         entryPoint: absoluteFile,
         siteName: desiredSiteName,
         bucketName,
@@ -94,11 +95,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: (_b = cli_1.ConfigInternals.getWebpackOverrideFn()) !== null && _b !== void 0 ? _b : ((f) => f),
         },
         region: (0, get_aws_region_1.getAwsRegion)(),
     });
@@ -107,6 +109,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 +121,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

@@ -24,7 +24,7 @@ const printSitesHelp = () => {
     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.'));
 };
-const sitesCommand = (args) => {
+const sitesCommand = (args, remotionRoot) => {
     if (args[0] === ls_1.SITES_LS_SUBCOMMAND) {
         return (0, ls_1.sitesLsSubcommand)();
     }
@@ -35,7 +35,7 @@ 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.`);