@remotion/cli 3.0.0-lambda.99 → 3.0.0-pnpm.18

package/dist/render.js

@@ -13,46 +13,55 @@ const remotion_1 = require("remotion");
 const delete_directory_1 = require("./delete-directory");
 const get_cli_options_1 = require("./get-cli-options");
 const get_composition_id_1 = require("./get-composition-id");
+const handle_common_errors_1 = require("./handle-common-errors");
 const initialize_render_cli_1 = require("./initialize-render-cli");
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
 const progress_bar_1 = require("./progress-bar");
 const setup_cache_1 = require("./setup-cache");
-const user_passed_output_location_1 = require("./user-passed-output-location");
 const validate_ffmpeg_version_1 = require("./validate-ffmpeg-version");
+const onError = async (info) => {
+    log_1.Log.error();
+    if (info.frame === null) {
+        log_1.Log.error('The following error occured when trying to initialize the video rendering:');
+    }
+    else {
+        log_1.Log.error(`The following error occurred when trying to render frame ${info.frame}:`);
+    }
+    (0, handle_common_errors_1.handleCommonError)(info.error);
+    process.exit(1);
+};
 const render = async () => {
-    var _a, _b, _c, _d;
+    var _a, _b;
     const startTime = Date.now();
     const file = parse_command_line_1.parsedCli._[1];
     const fullPath = path_1.default.join(process.cwd(), file);
-    await (0, initialize_render_cli_1.initializeRenderCli)('sequence');
-    const { codec, proResProfile, parallelism, parallelEncoding, frameRange, shouldOutputImageSequence, absoluteOutputFile, overwrite, inputProps, envVariables, quality, browser, crf, pixelFormat, imageFormat, browserExecutable, ffmpegExecutable, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'series' });
-    if (!absoluteOutputFile) {
-        throw new Error('assertion error - expected absoluteOutputFile to not be null');
-    }
+    (0, initialize_render_cli_1.initializeRenderCli)('sequence');
+    const { codec, proResProfile, parallelism, frameRange, shouldOutputImageSequence, absoluteOutputFile, overwrite, inputProps, envVariables, quality, browser, crf, pixelFormat, imageFormat, browserExecutable, ffmpegExecutable, chromiumOptions, } = await (0, get_cli_options_1.getCliOptions)('series');
     await (0, validate_ffmpeg_version_1.checkAndValidateFfmpegVersion)({
         ffmpegExecutable: remotion_1.Internals.getCustomFfmpegExecutable(),
     });
     const browserInstance = renderer_1.RenderInternals.openBrowser(browser, {
         browserExecutable,
         shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
+        chromiumOptions,
     });
     if (shouldOutputImageSequence) {
         fs_1.default.mkdirSync(absoluteOutputFile, {
             recursive: true,
         });
     }
-    const hasStitching = !shouldOutputImageSequence;
-    const steps = hasStitching ? 3 : 2;
+    const steps = shouldOutputImageSequence ? 2 : 3;
     const bundled = await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
-    const { port, close } = await renderer_1.RenderInternals.serveStatic(bundled);
-    const serveUrl = `http://localhost:${port}`;
     const openedBrowser = await browserInstance;
-    const comps = await (0, renderer_1.getCompositions)(serveUrl, {
+    const comps = await (0, renderer_1.getCompositions)(bundled, {
         browser,
         inputProps,
         browserInstance: openedBrowser,
         envVariables,
+        timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
+        chromiumOptions,
+        browserExecutable,
     });
     const compositionId = (0, get_composition_id_1.getCompositionId)(comps);
     const config = comps.find((c) => c.id === compositionId);
@@ -67,116 +76,53 @@ const render = async () => {
     const outputDir = shouldOutputImageSequence
         ? absoluteOutputFile
         : await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));
-    if (!outputDir) {
-        throw new Error('Assertion error: Expected outputDir to not be null');
-    }
     log_1.Log.verbose('Output dir', outputDir);
-    const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
+    const renderProgress = (0, progress_bar_1.createProgressBar)();
     let totalFrames = 0;
     const renderStart = Date.now();
-    let stitcherFfmpeg;
-    let preStitcher;
-    let encodedFrames = null;
-    let renderedFrames = 0;
-    let preEncodedFileLocation;
-    const updateRenderProgress = () => renderProgress.update((0, progress_bar_1.makeRenderingAndStitchingProgress)({
-        rendering: {
-            frames: renderedFrames,
-            totalFrames,
-            concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
-            doneIn: null,
-            steps,
-        },
-        stitching: {
-            doneIn: null,
-            frames: encodedFrames !== null && encodedFrames !== void 0 ? encodedFrames : 0,
-            stage: 'encoding',
-            steps,
-            totalFrames,
-        },
-    }));
-    if (parallelEncoding) {
-        if (typeof crf !== 'number') {
-            throw new TypeError('CRF is unexpectedly not a number');
-        }
-        preEncodedFileLocation = path_1.default.join(outputDir, 'pre-encode.' + (0, user_passed_output_location_1.getUserPassedFileExtension)());
-        preStitcher = await renderer_1.RenderInternals.spawnFfmpeg({
-            dir: outputDir,
-            width: config.width,
-            height: config.height,
-            fps: config.fps,
-            outputLocation: preEncodedFileLocation,
-            force: true,
-            imageFormat,
-            pixelFormat,
-            codec,
-            proResProfile,
-            crf,
-            parallelism,
-            onProgress: (frame) => {
-                encodedFrames = frame;
-                updateRenderProgress();
-            },
-            verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
-            parallelEncoding,
-            webpackBundle: bundled,
-            ffmpegExecutable,
-            assetsInfo: { assets: [] },
-        });
-        stitcherFfmpeg = preStitcher.task;
-    }
-    const renderer = (0, renderer_1.renderFrames)({
+    const { assetsInfo } = await (0, renderer_1.renderFrames)({
         config,
         onFrameUpdate: (frame) => {
-            renderedFrames = frame;
-            updateRenderProgress();
+            renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
+                frames: frame,
+                totalFrames,
+                concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
+                doneIn: null,
+                steps,
+            }));
         },
         parallelism,
-        parallelEncoding,
+        compositionId,
         outputDir,
+        onError,
         onStart: ({ frameCount: fc }) => {
-            renderedFrames = 0;
-            if (parallelEncoding)
-                encodedFrames = 0;
+            renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
+                frames: 0,
+                totalFrames: fc,
+                concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
+                doneIn: null,
+                steps,
+            }));
             totalFrames = fc;
-            updateRenderProgress();
         },
         inputProps,
         envVariables,
+        webpackBundle: bundled,
         imageFormat,
         quality,
         browser,
         frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
+        dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
         puppeteerInstance: openedBrowser,
-        writeFrame: async (buffer) => {
-            var _a;
-            (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
-        },
-        serveUrl,
+        timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
     });
-    const { assetsInfo } = await renderer;
-    if (stitcherFfmpeg) {
-        (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
-        await stitcherFfmpeg;
-        (_b = preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.cleanup) === null || _b === void 0 ? void 0 : _b.call(preStitcher);
-    }
     const closeBrowserPromise = openedBrowser.close();
-    const finalizedRenderProgress = {
+    renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
         frames: totalFrames,
         totalFrames,
         steps,
         concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
         doneIn: Date.now() - renderStart,
-    };
-    renderProgress.update((0, progress_bar_1.makeRenderingAndStitchingProgress)({
-        rendering: finalizedRenderProgress,
-        stitching: {
-            doneIn: null,
-            frames: encodedFrames !== null && encodedFrames !== void 0 ? encodedFrames : 0,
-            steps: 0,
-            stage: 'encoding',
-            totalFrames,
-        },
     }) + '\n');
     if (process.env.DEBUG) {
         remotion_1.Internals.perf.logPerf();
@@ -194,6 +140,13 @@ const render = async () => {
                 recursive: true,
             });
         }
+        const stitchingProgress = (0, progress_bar_1.createProgressBar)();
+        stitchingProgress.update((0, progress_bar_1.makeStitchingProgress)({
+            doneIn: null,
+            frames: 0,
+            steps,
+            totalFrames,
+        }));
         const stitchStart = Date.now();
         await (0, renderer_1.stitchFramesToVideo)({
             dir: outputDir,
@@ -201,7 +154,6 @@ const render = async () => {
             height: config.height,
             fps: config.fps,
             outputLocation: absoluteOutputFile,
-            preEncodedFileLocation,
             force: overwrite,
             imageFormat,
             pixelFormat,
@@ -212,32 +164,28 @@ const render = async () => {
             parallelism,
             ffmpegExecutable,
             onProgress: (frame) => {
-                (0, progress_bar_1.makeRenderingAndStitchingProgress)({
-                    rendering: finalizedRenderProgress,
-                    stitching: {
-                        doneIn: null,
-                        frames: frame,
-                        steps,
-                        totalFrames,
-                        stage: 'encoding',
-                    },
-                });
+                stitchingProgress.update((0, progress_bar_1.makeStitchingProgress)({
+                    doneIn: null,
+                    frames: frame,
+                    steps,
+                    totalFrames,
+                }));
             },
             onDownload: (src) => {
-                log_1.Log.info('Downloading asset... ', src);
+                if (src.startsWith('data:')) {
+                    log_1.Log.info('\nWriting Data URL to file: ', src.substring(0, 30) + '...');
+                }
+                else {
+                    log_1.Log.info('\nDownloading asset... ', src);
+                }
             },
-            webpackBundle: bundled,
             verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
         });
-        renderProgress.update((0, progress_bar_1.makeRenderingAndStitchingProgress)({
-            rendering: finalizedRenderProgress,
-            stitching: {
-                doneIn: Date.now() - stitchStart,
-                frames: totalFrames,
-                steps,
-                totalFrames,
-                stage: 'muxing',
-            },
+        stitchingProgress.update((0, progress_bar_1.makeStitchingProgress)({
+            doneIn: Date.now() - stitchStart,
+            frames: totalFrames,
+            steps,
+            totalFrames,
         }) + '\n');
         log_1.Log.verbose('Cleaning up...');
         try {
@@ -248,10 +196,10 @@ const render = async () => {
             }
             else {
                 await Promise.all([
-                    ((_c = fs_1.default.promises.rm) !== null && _c !== void 0 ? _c : fs_1.default.promises.rmdir)(outputDir, {
+                    ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(outputDir, {
                         recursive: true,
                     }),
-                    ((_d = fs_1.default.promises.rm) !== null && _d !== void 0 ? _d : fs_1.default.promises.rmdir)(bundled, {
+                    ((_b = fs_1.default.promises.rm) !== null && _b !== void 0 ? _b : fs_1.default.promises.rmdir)(bundled, {
                         recursive: true,
                     }),
                 ]);
@@ -273,7 +221,6 @@ const render = async () => {
     log_1.Log.info('-', 'Output can be found at:');
     log_1.Log.info(chalk_1.default.cyan(`▶️ ${absoluteOutputFile}`));
     await closeBrowserPromise;
-    close();
 };
 exports.render = render;
 //# sourceMappingURL=render.js.map

package/dist/render.js.map

@@ -1 +1 @@
-{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"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"}

package/dist/resolve-from.d.ts

@@ -0,0 +1,2 @@
+export declare const resolveFrom: (fromDirectory: string, moduleId: string) => string;
+//# sourceMappingURL=resolve-from.d.ts.map

package/dist/resolve-from.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-from.d.ts","sourceRoot":"","sources":["../src/resolve-from.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,kBACR,MAAM,YACX,MAAM,KACd,MAuBF,CAAC"}

package/dist/resolve-from.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveFrom = void 0;
+const path_1 = __importDefault(require("path"));
+const Module = require("module");
+const fs_1 = __importDefault(require("fs"));
+const resolveFrom = (fromDirectory, moduleId) => {
+    try {
+        fromDirectory = fs_1.default.realpathSync(fromDirectory);
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            fromDirectory = path_1.default.resolve(fromDirectory);
+        }
+        else {
+            throw error;
+        }
+    }
+    const fromFile = path_1.default.join(fromDirectory, 'noop.js');
+    const resolveFileName = () => 
+    // @ts-expect-error
+    Module._resolveFilename(moduleId, {
+        id: fromFile,
+        filename: fromFile,
+        // @ts-expect-error
+        paths: Module._nodeModulePaths(fromDirectory),
+    });
+    return resolveFileName();
+};
+exports.resolveFrom = resolveFrom;
+//# sourceMappingURL=resolve-from.js.map

package/dist/resolve-from.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-from.js","sourceRoot":"","sources":["../src/resolve-from.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,iCAAkC;AAClC,4CAAoB;AAEb,MAAM,WAAW,GAAG,CAC1B,aAAqB,EACrB,QAAgB,EACP,EAAE;IACX,IAAI;QACH,aAAa,GAAG,YAAE,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;KAC/C;IAAC,OAAO,KAAK,EAAE;QACf,IAAK,KAAwB,CAAC,IAAI,KAAK,QAAQ,EAAE;YAChD,aAAa,GAAG,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;SAC5C;aAAM;YACN,MAAM,KAAK,CAAC;SACZ;KACD;IAED,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAErD,MAAM,eAAe,GAAG,GAAG,EAAE;IAC5B,mBAAmB;IACnB,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE;QACjC,EAAE,EAAE,QAAQ;QACZ,QAAQ,EAAE,QAAQ;QAClB,mBAAmB;QACnB,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;KAC7C,CAAC,CAAC;IAEJ,OAAO,eAAe,EAAE,CAAC;AAC1B,CAAC,CAAC;AA1BW,QAAA,WAAW,eA0BtB"}

package/dist/setup-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-cache.d.ts","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,WAAW,aAAoB,MAAM,SAAS,MAAM,oBAmChE,CAAC"}
+{"version":3,"file":"setup-cache.d.ts","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,WAAW,aAAoB,MAAM,SAAS,MAAM,oBAmChE,CAAC"}

package/dist/setup-cache.js

@@ -13,7 +13,7 @@ const bundleOnCli = async (fullPath, steps) => {
         await bundler_1.BundlerInternals.clearCache('production', null);
     }
     const bundleStartTime = Date.now();
-    const bundlingProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
+    const bundlingProgress = (0, progress_bar_1.createProgressBar)();
     const bundled = await (0, bundler_1.bundle)(fullPath, (progress) => {
         bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({ progress: progress / 100, steps, doneIn: null }));
     }, {

package/dist/setup-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-cache.js","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":";;;AAAA,+CAA2D;AAC3D,uCAAmC;AACnC,+BAA0B;AAC1B,iDAGwB;AAEjB,MAAM,WAAW,GAAG,KAAK,EAAE,QAAgB,EAAE,KAAa,EAAE,EAAE;IACpE,MAAM,WAAW,GAAG,oBAAS,CAAC,iBAAiB,EAAE,CAAC;IAClD,MAAM,kBAAkB,GAAG,0BAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC5E,IAAI,kBAAkB,IAAI,CAAC,WAAW,EAAE;QACvC,SAAG,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QACtD,MAAM,0BAAgB,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;KACtD;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACnC,MAAM,gBAAgB,GAAG,IAAA,2CAA4B,GAAE,CAAC;IACxD,MAAM,OAAO,GAAG,MAAM,IAAA,gBAAM,EAC3B,QAAQ,EACR,CAAC,QAAQ,EAAE,EAAE;QACZ,gBAAgB,CAAC,MAAM,CACtB,IAAA,mCAAoB,EAAC,EAAC,QAAQ,EAAE,QAAQ,GAAG,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAC,CAAC,CACrE,CAAC;IACH,CAAC,EACD;QACC,aAAa,EAAE,WAAW;KAC1B,CACD,CAAC;IACF,gBAAgB,CAAC,MAAM,CACtB,IAAA,mCAAoB,EAAC;QACpB,QAAQ,EAAE,CAAC;QACX,KAAK;QACL,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe;KACpC,CAAC,GAAG,IAAI,CACT,CAAC;IACF,SAAG,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACtC,MAAM,iBAAiB,GAAG,0BAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC3E,IAAI,iBAAiB,IAAI,CAAC,kBAAkB,EAAE;QAC7C,SAAG,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;KAChE;IAED,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAnCW,QAAA,WAAW,eAmCtB"}
+{"version":3,"file":"setup-cache.js","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":";;;AAAA,+CAA2D;AAC3D,uCAAmC;AACnC,+BAA0B;AAC1B,iDAAuE;AAEhE,MAAM,WAAW,GAAG,KAAK,EAAE,QAAgB,EAAE,KAAa,EAAE,EAAE;IACpE,MAAM,WAAW,GAAG,oBAAS,CAAC,iBAAiB,EAAE,CAAC;IAClD,MAAM,kBAAkB,GAAG,0BAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC5E,IAAI,kBAAkB,IAAI,CAAC,WAAW,EAAE;QACvC,SAAG,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QACtD,MAAM,0BAAgB,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;KACtD;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACnC,MAAM,gBAAgB,GAAG,IAAA,gCAAiB,GAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,MAAM,IAAA,gBAAM,EAC3B,QAAQ,EACR,CAAC,QAAQ,EAAE,EAAE;QACZ,gBAAgB,CAAC,MAAM,CACtB,IAAA,mCAAoB,EAAC,EAAC,QAAQ,EAAE,QAAQ,GAAG,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAC,CAAC,CACrE,CAAC;IACH,CAAC,EACD;QACC,aAAa,EAAE,WAAW;KAC1B,CACD,CAAC;IACF,gBAAgB,CAAC,MAAM,CACtB,IAAA,mCAAoB,EAAC;QACpB,QAAQ,EAAE,CAAC;QACX,KAAK;QACL,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe;KACpC,CAAC,GAAG,IAAI,CACT,CAAC;IACF,SAAG,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACtC,MAAM,iBAAiB,GAAG,0BAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC3E,IAAI,iBAAiB,IAAI,CAAC,kBAAkB,EAAE;QAC7C,SAAG,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;KAChE;IAED,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAnCW,QAAA,WAAW,eAmCtB"}

package/dist/step.d.ts

@@ -0,0 +1,2 @@
+export declare type RenderStep = 'bundling' | 'rendering' | 'stitching';
+//# sourceMappingURL=step.d.ts.map

package/dist/step.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../src/step.ts"],"names":[],"mappings":"AAAA,oBAAY,UAAU,GAAG,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC"}

package/dist/step.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=step.js.map

package/dist/step.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"step.js","sourceRoot":"","sources":["../src/step.ts"],"names":[],"mappings":""}

package/dist/still.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"still.d.ts","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,KAAK,qBAyIjB,CAAC"}
+{"version":3,"file":"still.d.ts","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,KAAK,qBA4IjB,CAAC"}

package/dist/still.js

@@ -22,7 +22,7 @@ const still = async () => {
     const startTime = Date.now();
     const file = parse_command_line_1.parsedCli._[1];
     const fullPath = path_1.default.join(process.cwd(), file);
-    await (0, initialize_render_cli_1.initializeRenderCli)('still');
+    (0, initialize_render_cli_1.initializeRenderCli)('still');
     const userOutput = path_1.default.resolve(process.cwd(), (0, user_passed_output_location_1.getUserPassedOutputLocation)());
     if (userOutput.endsWith('.jpeg') || userOutput.endsWith('.jpg')) {
         log_1.Log.verbose('Output file has a JPEG extension, therefore setting the image format to JPEG.');
@@ -32,7 +32,7 @@ const still = async () => {
         log_1.Log.verbose('Output file has a PNG extension, therefore setting the image format to PNG.');
         remotion_1.Config.Rendering.setImageFormat('png');
     }
-    const { inputProps, envVariables, quality, browser, imageFormat, stillFrame, browserExecutable, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'still' });
+    const { inputProps, envVariables, quality, browser, imageFormat, stillFrame, browserExecutable, chromiumOptions, } = await (0, get_cli_options_1.getCliOptions)('still');
     if (imageFormat === 'none') {
         log_1.Log.error('No image format was selected - this is probably an error in Remotion - please post your command on Github Issues for help.');
         process.exit(1);
@@ -48,6 +48,7 @@ const still = async () => {
     const browserInstance = renderer_1.RenderInternals.openBrowser(browser, {
         browserExecutable,
         shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
+        chromiumOptions,
     });
     (0, fs_1.mkdirSync)(path_1.default.join(userOutput, '..'), {
         recursive: true,
@@ -60,40 +61,40 @@ const still = async () => {
         inputProps,
         browserInstance: openedBrowser,
         envVariables,
+        timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
+        chromiumOptions,
     });
     const compositionId = (0, get_composition_id_1.getCompositionId)(comps);
     const composition = comps.find((c) => c.id === compositionId);
     if (!composition) {
         throw new Error(`Cannot find composition with ID ${compositionId}`);
     }
-    const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
+    const renderProgress = (0, progress_bar_1.createProgressBar)();
     const renderStart = Date.now();
-    const { port, close } = await renderer_1.RenderInternals.serveStatic(bundled);
-    const serveUrl = `http://localhost:${port}`;
-    try {
-        await (0, renderer_1.renderStill)({
-            composition,
-            frame: stillFrame,
-            output: userOutput,
-            serveUrl,
-            quality,
-            browser,
-            dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
-            envVariables,
-            imageFormat,
-            inputProps,
-        });
-    }
-    catch (err) {
-        log_1.Log.error();
-        log_1.Log.error('The following error occured when rendering the still:');
-        (0, handle_common_errors_1.handleCommonError)(err);
-        process.exit(1);
-    }
-    const closeBrowserPromise = openedBrowser.close();
-    close().catch((err) => {
-        log_1.Log.error('Could not close web server', err);
+    await (0, renderer_1.renderStill)({
+        composition,
+        frame: stillFrame,
+        output: userOutput,
+        webpackBundle: bundled,
+        quality,
+        browser,
+        dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
+        envVariables,
+        imageFormat,
+        inputProps,
+        onError: (err) => {
+            log_1.Log.error();
+            log_1.Log.error('The following error occured when rendering the still:');
+            (0, handle_common_errors_1.handleCommonError)(err);
+            process.exit(1);
+        },
+        puppeteerInstance: openedBrowser,
+        overwrite: remotion_1.Internals.getShouldOverwrite(),
+        timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
+        chromiumOptions,
+        browserExecutable,
     });
+    const closeBrowserPromise = openedBrowser.close();
     renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
         frames: 1,
         concurrency: 1,

package/dist/still.js.map

@@ -1 +1 @@
-{"version":3,"file":"still.js","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"still.js","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"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"}

package/dist/upgrade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":"AAuCA,eAAO,MAAM,OAAO,qBAkCnB,CAAC"}
+{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":"AA2BA,eAAO,MAAM,OAAO,qBA8CnB,CAAC"}

package/dist/upgrade.js

@@ -4,33 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.upgrade = void 0;
+const bundler_1 = require("@remotion/bundler");
 const execa_1 = __importDefault(require("execa"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const remotion_1 = require("remotion");
 const log_1 = require("./log");
-const npmOrYarn = () => {
-    const packageLockJsonFilePath = path_1.default.join(process.cwd(), 'package-lock.json');
-    const yarnLockFilePath = path_1.default.join(process.cwd(), 'yarn.lock');
-    const npmExists = fs_1.default.existsSync(packageLockJsonFilePath);
-    const yarnExists = fs_1.default.existsSync(yarnLockFilePath);
-    if (npmExists && !yarnExists) {
-        return 'npm';
-    }
-    if (!npmExists && yarnExists) {
-        return 'yarn';
-    }
-    if (npmExists && yarnExists) {
-        log_1.Log.error('Found both a package-lock.json and a yarn.lock file in your project.');
-        log_1.Log.error('This can lead to bugs, delete one of the two files and settle on 1 package manager.');
-        log_1.Log.error('Afterwards, run this command again.');
-        process.exit(1);
-    }
-    log_1.Log.error('Did not find a package-lock.json or yarn.lock file.');
-    log_1.Log.error('Cannot determine how to update dependencies.');
-    log_1.Log.error('Did you run `npm install` yet?');
-    log_1.Log.error('Make sure either file exists and run this command again.');
-    process.exit(1);
+const getUpgradeCommand = ({ manager, packages, version, }) => {
+    const pkgList = packages.map((p) => `${p}@^${version}`);
+    const commands = {
+        npm: ['i', ...pkgList],
+        pnpm: ['i', ...pkgList],
+        yarn: ['add', ...pkgList],
+    };
+    return commands[manager];
 };
 const upgrade = async () => {
     var _a;
@@ -41,7 +28,8 @@ const upgrade = async () => {
     }
     const packageJson = require(packageJsonFilePath);
     const dependencies = Object.keys(packageJson.dependencies);
-    const tool = npmOrYarn();
+    const latestRemotionVersion = await bundler_1.BundlerInternals.getLatestRemotionVersion();
+    const manager = bundler_1.BundlerInternals.getPackageManager();
     const toUpgrade = [
         '@remotion/bundler',
         '@remotion/cli',
@@ -54,7 +42,13 @@ const upgrade = async () => {
         '@remotion/gif',
         'remotion',
     ].filter((u) => dependencies.includes(u));
-    const prom = (0, execa_1.default)(tool, ['upgrade', ...toUpgrade]);
+    const prom = (0, execa_1.default)(manager, getUpgradeCommand({
+        manager,
+        packages: toUpgrade,
+        version: latestRemotionVersion,
+    }), {
+        stdio: 'inherit',
+    });
     if (remotion_1.Internals.Logging.isEqualOrBelowLogLevel('info')) {
         (_a = prom.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
     }

package/dist/upgrade.js.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,gDAAwB;AACxB,uCAAmC;AACnC,+BAA0B;AAE1B,MAAM,SAAS,GAAG,GAAmB,EAAE;IACtC,MAAM,uBAAuB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,WAAW,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG,YAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,YAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAEnD,IAAI,SAAS,IAAI,CAAC,UAAU,EAAE;QAC7B,OAAO,KAAK,CAAC;KACb;IAED,IAAI,CAAC,SAAS,IAAI,UAAU,EAAE;QAC7B,OAAO,MAAM,CAAC;KACd;IAED,IAAI,SAAS,IAAI,UAAU,EAAE;QAC5B,SAAG,CAAC,KAAK,CACR,sEAAsE,CACtE,CAAC;QACF,SAAG,CAAC,KAAK,CACR,qFAAqF,CACrF,CAAC;QACF,SAAG,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,SAAG,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACjE,SAAG,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAC1D,SAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAC5C,SAAG,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;IACtE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC;AAEK,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;;IACjC,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;QACxC,SAAG,CAAC,KAAK,CACR,2EAA2E,CAC3E,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IAE3D,MAAM,IAAI,GAAG,SAAS,EAAE,CAAC;IAEzB,MAAM,SAAS,GAAG;QACjB,mBAAmB;QACnB,eAAe;QACf,yBAAyB;QACzB,oBAAoB;QACpB,uBAAuB;QACvB,wBAAwB;QACxB,kBAAkB;QAClB,iBAAiB;QACjB,eAAe;QACf,UAAU;KACV,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1C,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,IAAI,EAAE,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC;IACpD,IAAI,oBAAS,CAAC,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE;QACrD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;KAClC;IAED,MAAM,IAAI,CAAC;IACX,SAAG,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;AAC3C,CAAC,CAAC;AAlCW,QAAA,OAAO,WAkClB"}
+{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAmE;AACnE,kDAA0B;AAC1B,4CAAoB;AACpB,gDAAwB;AACxB,uCAAmC;AACnC,+BAA0B;AAE1B,MAAM,iBAAiB,GAAG,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,OAAO,GAKP,EAAY,EAAE;IACd,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAwC;QACrD,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;QACtB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;QACvB,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC;KACzB,CAAC;IAEF,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC1B,CAAC,CAAC;AAEK,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;;IACjC,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;QACxC,SAAG,CAAC,KAAK,CACR,2EAA2E,CAC3E,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IAC3D,MAAM,qBAAqB,GAC1B,MAAM,0BAAgB,CAAC,wBAAwB,EAAE,CAAC;IAEnD,MAAM,OAAO,GAAG,0BAAgB,CAAC,iBAAiB,EAAE,CAAC;IAErD,MAAM,SAAS,GAAG;QACjB,mBAAmB;QACnB,eAAe;QACf,yBAAyB;QACzB,oBAAoB;QACpB,uBAAuB;QACvB,wBAAwB;QACxB,kBAAkB;QAClB,iBAAiB;QACjB,eAAe;QACf,UAAU;KACV,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1C,MAAM,IAAI,GAAG,IAAA,eAAK,EACjB,OAAO,EACP,iBAAiB,CAAC;QACjB,OAAO;QACP,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,qBAAqB;KAC9B,CAAC,EACF;QACC,KAAK,EAAE,SAAS;KAChB,CACD,CAAC;IACF,IAAI,oBAAS,CAAC,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE;QACrD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;KAClC;IAED,MAAM,IAAI,CAAC;IACX,SAAG,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;AAC3C,CAAC,CAAC;AA9CW,QAAA,OAAO,WA8ClB"}