@remotion/cli 3.3.2 → 3.3.3

package/dist/progress-bar.d.ts

@@ -6,10 +6,22 @@ export declare const createProgressBar: (quiet: boolean) => {
 export declare const createOverwriteableCliOutput: (quiet: boolean) => {
     update: (up: string) => boolean;
 };
-export declare const makeBundlingProgress: ({ progress, steps, doneIn, }: {
+export declare type CopyingState = {
+    bytes: number;
+    doneIn: number | null;
+};
+export declare type BundlingState = {
     progress: number;
     steps: RenderStep[];
     doneIn: number | null;
+};
+export declare type SymbolicLinksState = {
+    symlinks: string[];
+};
+export declare const makeBundlingAndCopyProgress: ({ bundling, copying, symLinks, }: {
+    bundling: BundlingState;
+    copying: CopyingState;
+    symLinks: SymbolicLinksState;
 }) => string;
 declare type RenderingProgressInput = {
     frames: number;

package/dist/progress-bar.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeRenderingAndStitchingProgress = exports.makeStitchingProgress = exports.makeRenderingProgress = exports.makeBundlingProgress = exports.createOverwriteableCliOutput = exports.createProgressBar = void 0;
+exports.makeRenderingAndStitchingProgress = exports.makeStitchingProgress = exports.makeRenderingProgress = exports.makeBundlingAndCopyProgress = exports.createOverwriteableCliOutput = exports.createProgressBar = void 0;
 const renderer_1 = require("@remotion/renderer");
 const ansi_diff_1 = require("./ansi/ansi-diff");
 const chalk_1 = require("./chalk");
@@ -37,7 +37,46 @@ const makeBundlingProgress = ({ progress, steps, doneIn, }) => [
 ]
     .filter(truthy_1.truthy)
     .join(' ');
-exports.makeBundlingProgress = makeBundlingProgress;
+const makeCopyingProgress = (options) => {
+    // Don't show copy progress lower than 200MB
+    if (options.bytes < 1000 * 1000 * 200) {
+        return null;
+    }
+    return [
+        '    +',
+        options.doneIn ? (0, make_progress_bar_1.makeProgressBar)(1) : (0, download_progress_1.getFileSizeDownloadBar)(options.bytes),
+        'Copying public dir',
+        options.doneIn === null ? null : chalk_1.chalk.gray(`${options.doneIn}ms`),
+    ]
+        .filter(truthy_1.truthy)
+        .join(' ');
+};
+const makeSymlinkProgress = (options) => {
+    if (options.symlinks.length === 0) {
+        return null;
+    }
+    if (options.symlinks.length === 1) {
+        return [
+            chalk_1.chalk.gray(`      Found a symbolic link in the public folder:`),
+            chalk_1.chalk.gray('      ' + options.symlinks[0]),
+            chalk_1.chalk.gray('      The symlink will be forwarded in to the bundle.'),
+        ].join('\n');
+    }
+    return [
+        chalk_1.chalk.gray(`      Found ${options.symlinks.length} symbolic links in the public folder.`),
+        chalk_1.chalk.gray('      The symlinks will be forwarded in to the bundle.'),
+    ].join('\n');
+};
+const makeBundlingAndCopyProgress = ({ bundling, copying, symLinks, }) => {
+    return [
+        makeBundlingProgress(bundling),
+        makeCopyingProgress(copying),
+        makeSymlinkProgress(symLinks),
+    ]
+        .filter(truthy_1.truthy)
+        .join('\n');
+};
+exports.makeBundlingAndCopyProgress = makeBundlingAndCopyProgress;
 const makeRenderingProgress = ({ frames, totalFrames, steps, concurrency, doneIn, }) => {
     const progress = frames / totalFrames;
     return [

package/dist/setup-cache.js

@@ -24,18 +24,54 @@ exports.bundleOnCliOrTakeServeUrl = bundleOnCliOrTakeServeUrl;
 const bundleOnCli = async ({ fullPath, steps, remotionRoot, publicDir, }) => {
     var _a;
     const shouldCache = config_1.ConfigInternals.getWebpackCaching();
+    const symlinkState = {
+        symlinks: [],
+    };
     const onProgress = (progress) => {
-        bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
+        bundlingState = {
             progress: progress / 100,
             steps,
             doneIn: null,
+        };
+        bundlingProgress.update((0, progress_bar_1.makeBundlingAndCopyProgress)({
+            bundling: bundlingState,
+            copying: copyingState,
+            symLinks: symlinkState,
         }));
     };
+    let copyingState = {
+        bytes: 0,
+        doneIn: null,
+    };
+    let copyStart = null;
+    const updateProgress = (newline) => {
+        bundlingProgress.update((0, progress_bar_1.makeBundlingAndCopyProgress)({
+            bundling: bundlingState,
+            copying: copyingState,
+            symLinks: symlinkState,
+        }) + (newline ? '\n' : ''));
+    };
+    const onPublicDirCopyProgress = (bytes) => {
+        if (copyStart === null) {
+            copyStart = Date.now();
+        }
+        copyingState = {
+            bytes,
+            doneIn: null,
+        };
+        updateProgress(false);
+    };
+    const onSymlinkDetected = (absPath) => {
+        symlinkState.symlinks.push(absPath);
+        updateProgress(false);
+    };
     const options = {
         enableCaching: shouldCache,
         webpackOverride: (_a = config_1.ConfigInternals.getWebpackOverrideFn()) !== null && _a !== void 0 ? _a : ((f) => f),
         rootDir: remotionRoot,
         publicDir,
+        onPublicDirCopyProgress,
+        onSymlinkDetected,
     };
     const [hash] = bundler_1.BundlerInternals.getConfig({
         outDir: '',
@@ -55,22 +91,33 @@ const bundleOnCli = async ({ fullPath, steps, remotionRoot, publicDir, }) => {
     }
     const bundleStartTime = Date.now();
     const bundlingProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
+    let bundlingState = {
+        progress: 0,
+        steps,
+        doneIn: null,
+    };
     const bundled = await (0, bundler_1.bundle)({
         entryPoint: fullPath,
         onProgress: (progress) => {
-            bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
+            bundlingState = {
                 progress: progress / 100,
                 steps,
                 doneIn: null,
-            }));
+            };
+            updateProgress(false);
         },
         ...options,
     });
-    bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
+    bundlingState = {
         progress: 1,
         steps,
         doneIn: Date.now() - bundleStartTime,
-    }) + '\n');
+    };
+    copyingState = {
+        ...copyingState,
+        doneIn: copyStart ? Date.now() - copyStart : null,
+    };
+    updateProgress(true);
     log_1.Log.verbose('Bundled under', bundled);
     const cacheExistedAfter = bundler_1.BundlerInternals.cacheExists(remotionRoot, 'production', hash) === 'exists';
     if (cacheExistedAfter) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.3.2",
+	"version": "3.3.3",
 	"description": "CLI for Remotion",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -22,16 +22,16 @@
 	"author": "Jonny Burger <jonny@remotion.dev>",
 	"license": "SEE LICENSE IN LICENSE.md",
 	"dependencies": {
-		"@remotion/bundler": "3.3.2",
-		"@remotion/media-utils": "3.3.2",
-		"@remotion/player": "3.3.2",
-		"@remotion/renderer": "3.3.2",
+		"@remotion/bundler": "3.3.3",
+		"@remotion/media-utils": "3.3.3",
+		"@remotion/player": "3.3.3",
+		"@remotion/renderer": "3.3.3",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
 		"prompts": "2.4.1",
-		"remotion": "3.3.2",
+		"remotion": "3.3.3",
 		"semver": "7.3.5",
 		"source-map": "0.6.1"
 	},
@@ -72,5 +72,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "d7422b5d86e4766a4cdb0bc4e291e462a6bf8bb6"
+	"gitHead": "27db3bbb7b8bd67aa3767e55c5c8f21a8d9fa16b"
 }