@remotion/lambda 4.0.496 → 4.0.498

package/dist/api/deploy-site-from-bundle.d.ts

@@ -0,0 +1,28 @@
+import type { AwsRegion, RequestHandler } from '@remotion/lambda-client';
+import { type AwsProvider } from '@remotion/lambda-client';
+import type { ToOptions } from '@remotion/renderer';
+import type { BrowserSafeApis } from '@remotion/renderer/client';
+import type { FullClientSpecifics, ProviderSpecifics } from '@remotion/serverless';
+import { type DeploySiteOutput, type DeploySiteWithBundleOptions } from '../shared/deploy-site-with-bundle';
+export type DeploySiteFromBundleOutput = DeploySiteOutput;
+type MandatoryParameters = {
+    bucketName: string;
+    region: AwsRegion;
+    bundleDir: string;
+};
+type OptionalParameters = {
+    siteName: string;
+    options: DeploySiteWithBundleOptions;
+    privacy: 'public' | 'no-acl';
+    forcePathStyle: boolean;
+    requestHandler: RequestHandler | null;
+} & ToOptions<typeof BrowserSafeApis.optionsMap.deploySiteLambda>;
+export type DeploySiteFromBundleInput = MandatoryParameters & Partial<OptionalParameters>;
+export type InternalDeploySiteFromBundleInput = MandatoryParameters & OptionalParameters & {
+    indent: boolean;
+    providerSpecifics: ProviderSpecifics<AwsProvider>;
+    fullClientSpecifics: FullClientSpecifics<AwsProvider>;
+};
+export declare const internalDeploySiteFromBundle: (input: InternalDeploySiteFromBundleInput) => DeploySiteFromBundleOutput;
+export declare const deploySiteFromBundle: (args: DeploySiteFromBundleInput) => DeploySiteOutput;
+export {};

package/dist/api/deploy-site-from-bundle.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deploySiteFromBundle = exports.internalDeploySiteFromBundle = void 0;
+const lambda_client_1 = require("@remotion/lambda-client");
+const error_handling_1 = require("@remotion/renderer/error-handling");
+const full_client_implementation_1 = require("../functions/full-client-implementation");
+const deploy_site_with_bundle_1 = require("../shared/deploy-site-with-bundle");
+const validate_bundle_dir_1 = require("../shared/validate-bundle-dir");
+const mandatoryDeploySiteFromBundle = ({ bucketName, bundleDir, region, siteName, options, privacy, throwIfSiteExists, providerSpecifics, forcePathStyle, fullClientSpecifics, requestHandler, }) => {
+    const resolvedBundleDir = (0, validate_bundle_dir_1.validateBundleDir)(bundleDir);
+    return (0, deploy_site_with_bundle_1.deploySiteWithBundle)({
+        bucketName,
+        region,
+        siteName,
+        options,
+        privacy,
+        throwIfSiteExists,
+        providerSpecifics,
+        forcePathStyle,
+        fullClientSpecifics,
+        requestHandler,
+        getBundle: () => Promise.resolve(resolvedBundleDir),
+    });
+};
+exports.internalDeploySiteFromBundle = (0, error_handling_1.wrapWithErrorHandling)(mandatoryDeploySiteFromBundle);
+/*
+ * @description Deploys an existing Remotion bundle to an S3 bucket without bundling it again.
+ * @see [Documentation](https://remotion.dev/docs/lambda/deploysitefrombundle)
+ */
+const deploySiteFromBundle = (args) => {
+    var _a, _b, _c, _d, _e, _f, _g;
+    return (0, exports.internalDeploySiteFromBundle)({
+        bucketName: args.bucketName,
+        bundleDir: args.bundleDir,
+        region: args.region,
+        options: (_a = args.options) !== null && _a !== void 0 ? _a : {},
+        privacy: (_b = args.privacy) !== null && _b !== void 0 ? _b : 'public',
+        siteName: (_c = args.siteName) !== null && _c !== void 0 ? _c : lambda_client_1.LambdaClientInternals.awsImplementation.randomHash(),
+        indent: false,
+        logLevel: (_d = args.logLevel) !== null && _d !== void 0 ? _d : 'info',
+        throwIfSiteExists: (_e = args.throwIfSiteExists) !== null && _e !== void 0 ? _e : false,
+        providerSpecifics: lambda_client_1.LambdaClientInternals.awsImplementation,
+        forcePathStyle: (_f = args.forcePathStyle) !== null && _f !== void 0 ? _f : false,
+        fullClientSpecifics: full_client_implementation_1.awsFullClientSpecifics,
+        requestHandler: (_g = args.requestHandler) !== null && _g !== void 0 ? _g : null,
+    });
+};
+exports.deploySiteFromBundle = deploySiteFromBundle;

package/dist/api/deploy-site.d.ts

@@ -1,9 +1,11 @@
-import { type GitSource, type WebpackOverrideFn } from '@remotion/bundler';
+import { type BundlerOverrideFn, type GitSource, type RspackOverrideFn, type WebpackOverrideFn } from '@remotion/bundler';
 import type { AwsRegion, RequestHandler } from '@remotion/lambda-client';
 import { type AwsProvider } from '@remotion/lambda-client';
 import type { ToOptions } from '@remotion/renderer';
 import type { BrowserSafeApis } from '@remotion/renderer/client';
 import type { FullClientSpecifics, ProviderSpecifics, UploadDirProgress } from '@remotion/serverless';
+import { type DeploySiteOutput } from '../shared/deploy-site-with-bundle';
+export type { DeploySiteOutput };
 type MandatoryParameters = {
     entryPoint: string;
     bucketName: string;
@@ -15,6 +17,8 @@ type OptionalParameters = {
         onBundleProgress?: (progress: number) => void;
         onUploadProgress?: (upload: UploadDirProgress) => void;
         onDiffingProgress?: (bytes: number, done: boolean) => void;
+        bundlerOverride?: BundlerOverrideFn;
+        rspackOverride?: RspackOverrideFn;
         webpackOverride?: WebpackOverrideFn;
         ignoreRegisterRootWarning?: boolean;
         enableCaching?: boolean;
@@ -33,19 +37,9 @@ type OptionalParameters = {
     requestHandler: RequestHandler | null;
 } & ToOptions<typeof BrowserSafeApis.optionsMap.deploySiteLambda>;
 export type DeploySiteInput = MandatoryParameters & Partial<OptionalParameters>;
-export type DeploySiteOutput = Promise<{
-    serveUrl: string;
-    siteName: string;
-    stats: {
-        uploadedFiles: number;
-        deletedFiles: number;
-        untouchedFiles: number;
-    };
-}>;
 export type InternalDeploySiteInput = MandatoryParameters & OptionalParameters & {
     providerSpecifics: ProviderSpecifics<AwsProvider>;
     fullClientSpecifics: FullClientSpecifics<AwsProvider>;
 };
 export declare const internalDeploySite: (input: InternalDeploySiteInput) => DeploySiteOutput;
 export declare const deploySite: (args: DeploySiteInput) => DeploySiteOutput;
-export {};

package/dist/api/deploy-site.js

@@ -8,137 +8,63 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const lambda_client_1 = require("@remotion/lambda-client");
 const constants_1 = require("@remotion/lambda-client/constants");
 const error_handling_1 = require("@remotion/renderer/error-handling");
-const serverless_1 = require("@remotion/serverless");
 const full_client_implementation_1 = require("../functions/full-client-implementation");
-const get_s3_operations_1 = require("../shared/get-s3-operations");
-const validate_site_name_1 = require("../shared/validate-site-name");
+const deploy_site_with_bundle_1 = require("../shared/deploy-site-with-bundle");
 const mandatoryDeploySite = async ({ bucketName, entryPoint, siteName, options, region, privacy, gitSource, throwIfSiteExists, providerSpecifics, forcePathStyle, fullClientSpecifics, requestHandler, }) => {
-    var _a, _b;
-    var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    lambda_client_1.LambdaClientInternals.validateAwsRegion(region);
-    (0, serverless_1.validateBucketName)({
-        bucketName,
-        bucketNamePrefix: constants_1.REMOTION_BUCKET_PREFIX,
-        options: {
-            mustStartWithRemotion: !(options === null || options === void 0 ? void 0 : options.bypassBucketNameValidation),
-        },
-    });
-    (0, validate_site_name_1.validateSiteName)(siteName);
-    (0, serverless_1.validatePrivacy)(privacy, false);
-    const accountId = await providerSpecifics.getAccountId({ region });
-    const bucketExists = await providerSpecifics.bucketExists({
+    let generatedBundleDir = null;
+    const result = await (0, deploy_site_with_bundle_1.deploySiteWithBundle)({
         bucketName,
         region,
-        expectedBucketOwner: accountId,
+        siteName,
+        options,
+        privacy,
+        throwIfSiteExists,
+        providerSpecifics,
         forcePathStyle,
+        fullClientSpecifics,
         requestHandler,
-    });
-    if (!bucketExists) {
-        throw new Error(`No bucket with the name ${bucketName} exists`);
-    }
-    const subFolder = (0, constants_1.getSitesKey)(siteName);
-    const [files, bundled] = await Promise.all([
-        providerSpecifics.listObjects({
-            bucketName,
-            expectedBucketOwner: accountId,
-            region,
-            // The `/` is important to not accidentially delete sites with the same name but containing a suffix.
-            prefix: `${subFolder}/`,
-            forcePathStyle,
-            requestHandler,
-        }),
-        fullClientSpecifics.bundleSite({
-            publicPath: `/${subFolder}/`,
-            webpackOverride: (_c = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _c !== void 0 ? _c : ((f) => f),
-            enableCaching: (_d = options === null || options === void 0 ? void 0 : options.enableCaching) !== null && _d !== void 0 ? _d : true,
-            publicDir: (_e = options === null || options === void 0 ? void 0 : options.publicDir) !== null && _e !== void 0 ? _e : null,
-            rootDir: (_f = options === null || options === void 0 ? void 0 : options.rootDir) !== null && _f !== void 0 ? _f : null,
-            ignoreRegisterRootWarning: (_g = options === null || options === void 0 ? void 0 : options.ignoreRegisterRootWarning) !== null && _g !== void 0 ? _g : false,
-            onProgress: (_h = options === null || options === void 0 ? void 0 : options.onBundleProgress) !== null && _h !== void 0 ? _h : (() => undefined),
-            entryPoint,
-            gitSource,
-            bufferStateDelayInMilliseconds: null,
-            maxTimelineTracks: null,
-            onDirectoryCreated: () => undefined,
-            onPublicDirCopyProgress: () => undefined,
-            onSymlinkDetected: () => undefined,
-            outDir: null,
-            askAIEnabled: (_j = options === null || options === void 0 ? void 0 : options.askAIEnabled) !== null && _j !== void 0 ? _j : true,
-            interactivityEnabled: (_k = options === null || options === void 0 ? void 0 : options.interactivityEnabled) !== null && _k !== void 0 ? _k : true,
-            audioLatencyHint: null,
-            keyboardShortcutsEnabled: (_l = options === null || options === void 0 ? void 0 : options.keyboardShortcutsEnabled) !== null && _l !== void 0 ? _l : true,
-            renderDefaults: null,
-            rspack: (_m = options === null || options === void 0 ? void 0 : options.rspack) !== null && _m !== void 0 ? _m : false,
-            symlinkPublicDir: false,
-        }),
-    ]);
-    if (throwIfSiteExists && files.length > 0) {
-        throw new Error('`throwIfSiteExists` was passed as true, but there are already files in this folder: ' +
-            files
-                .slice(0, 5)
-                .map((f) => f.Key)
-                .join(', '));
-    }
-    (_a = options.onDiffingProgress) === null || _a === void 0 ? void 0 : _a.call(options, 0, false);
-    let totalBytes = 0;
-    const { toDelete, toUpload, existingCount } = await (0, get_s3_operations_1.getS3DiffOperations)({
-        objects: files,
-        bundle: bundled,
-        prefix: subFolder,
-        onProgress: (bytes) => {
-            var _a;
-            totalBytes = bytes;
-            (_a = options.onDiffingProgress) === null || _a === void 0 ? void 0 : _a.call(options, bytes, false);
+        getBundle: async () => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            generatedBundleDir = await fullClientSpecifics.bundleSite({
+                publicPath: `/${(0, constants_1.getSitesKey)(siteName)}/`,
+                bundlerOverride: (_a = options.bundlerOverride) !== null && _a !== void 0 ? _a : ((f) => f),
+                rspackOverride: (_b = options.rspackOverride) !== null && _b !== void 0 ? _b : ((f) => f),
+                webpackOverride: (_c = options.webpackOverride) !== null && _c !== void 0 ? _c : ((f) => f),
+                enableCaching: (_d = options.enableCaching) !== null && _d !== void 0 ? _d : true,
+                publicDir: (_e = options.publicDir) !== null && _e !== void 0 ? _e : null,
+                rootDir: (_f = options.rootDir) !== null && _f !== void 0 ? _f : null,
+                ignoreRegisterRootWarning: (_g = options.ignoreRegisterRootWarning) !== null && _g !== void 0 ? _g : false,
+                onProgress: (_h = options.onBundleProgress) !== null && _h !== void 0 ? _h : (() => undefined),
+                entryPoint,
+                gitSource,
+                bufferStateDelayInMilliseconds: null,
+                maxTimelineTracks: null,
+                onDirectoryCreated: () => undefined,
+                onPublicDirCopyProgress: () => undefined,
+                onSymlinkDetected: () => undefined,
+                outDir: null,
+                askAIEnabled: (_j = options.askAIEnabled) !== null && _j !== void 0 ? _j : true,
+                interactivityEnabled: (_k = options.interactivityEnabled) !== null && _k !== void 0 ? _k : true,
+                audioLatencyHint: null,
+                keyboardShortcutsEnabled: (_l = options.keyboardShortcutsEnabled) !== null && _l !== void 0 ? _l : true,
+                renderDefaults: null,
+                rspack: (_m = options.rspack) !== null && _m !== void 0 ? _m : false,
+                symlinkPublicDir: false,
+            });
+            return generatedBundleDir;
         },
-        fullClientSpecifics,
     });
-    (_b = options.onDiffingProgress) === null || _b === void 0 ? void 0 : _b.call(options, totalBytes, true);
-    await Promise.all([
-        fullClientSpecifics.uploadDir({
-            bucket: bucketName,
-            region,
-            localDir: bundled,
-            onProgress: (_o = options === null || options === void 0 ? void 0 : options.onUploadProgress) !== null && _o !== void 0 ? _o : (() => undefined),
-            keyPrefix: subFolder,
-            privacy: privacy !== null && privacy !== void 0 ? privacy : 'public',
-            toUpload,
-            forcePathStyle,
-            requestHandler,
-        }),
-        Promise.all(toDelete.map((d) => {
-            return providerSpecifics.deleteFile({
-                bucketName,
-                customCredentials: null,
-                key: d.Key,
-                region,
-                forcePathStyle,
-                requestHandler,
-            });
-        })),
-    ]);
-    if (node_fs_1.default.existsSync(bundled)) {
-        node_fs_1.default.rmSync(bundled, {
+    if (generatedBundleDir && node_fs_1.default.existsSync(generatedBundleDir)) {
+        node_fs_1.default.rmSync(generatedBundleDir, {
             recursive: true,
         });
     }
-    return {
-        serveUrl: lambda_client_1.LambdaClientInternals.makeS3ServeUrl({
-            bucketName,
-            subFolder,
-            region,
-        }),
-        siteName,
-        stats: {
-            uploadedFiles: toUpload.length,
-            deletedFiles: toDelete.length,
-            untouchedFiles: existingCount,
-        },
-    };
+    return result;
 };
 exports.internalDeploySite = (0, error_handling_1.wrapWithErrorHandling)(mandatoryDeploySite);
 /*
- * @description Deploys a Remotion project to a GCP storage bucket to prepare it for rendering on Cloud Run.
- * @see [Documentation](https://remotion.dev/docs/cloudrun/deploysite)
+ * @description Bundles a Remotion project and deploys it to an S3 bucket for rendering on AWS Lambda.
+ * @see [Documentation](https://remotion.dev/docs/lambda/deploysite)
  */
 const deploySite = (args) => {
     var _a, _b, _c, _d, _e, _f, _g;

package/dist/api/upload-dir.js

@@ -10,6 +10,7 @@ const lib_storage_1 = require("@aws-sdk/lib-storage");
 const lambda_client_1 = require("@remotion/lambda-client");
 const mime_types_1 = __importDefault(require("mime-types"));
 const make_s3_key_1 = require("../shared/make-s3-key");
+const multipart_upload_part_size_1 = require("../shared/multipart-upload-part-size");
 async function getFiles(directory, originalDirectory, toUpload) {
     const dirents = await node_fs_1.promises.readdir(directory, { withFileTypes: true });
     const _files = await Promise.all(dirents
@@ -65,7 +66,7 @@ const uploadDir = async ({ bucket, region, localDir, onProgress, keyPrefix, priv
         const parallelUploadsS3 = new lib_storage_1.Upload({
             client,
             queueSize: 2,
-            partSize: 40 * 1024 * 1024,
+            partSize: multipart_upload_part_size_1.multipartUploadPartSize,
             params: {
                 Key,
                 Bucket: bucket,

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

@@ -154,6 +154,8 @@ const sitesCreateSubcommand = async (args, remotionRoot, logLevel, implementatio
             enableCaching: client_1.BrowserSafeApis.options.bundleCacheOption.getValue({
                 commandLine: cli_1.CliInternals.parsedCli,
             }).value,
+            bundlerOverride: config_1.ConfigInternals.getBundlerOverrideFn(),
+            rspackOverride: config_1.ConfigInternals.getRspackOverrideFn(),
             webpackOverride: (_c = config_1.ConfigInternals.getWebpackOverrideFn()) !== null && _c !== void 0 ? _c : ((f) => f),
             bypassBucketNameValidation: Boolean(args_1.parsedLambdaCli['force-bucket-name']),
             askAIEnabled,