@remotion/cli 3.0.0-lambda.2 → 3.0.0-lambda.203

package/dist/progress-bar.js

@@ -3,13 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeStitchingProgress = exports.makeRenderingProgress = exports.makeBundlingProgress = exports.makeProgressBar = exports.createOverwriteableCliOutput = exports.createProgressBar = void 0;
+exports.makeRenderingAndStitchingProgress = exports.makeStitchingProgress = exports.makeDownloadProgress = exports.makeRenderingProgress = exports.makeBundlingProgress = exports.makeProgressBar = exports.createOverwriteableCliOutput = exports.createProgressBar = void 0;
 // @ts-expect-error
 const ansi_diff_1 = __importDefault(require("ansi-diff"));
 const chalk_1 = __importDefault(require("chalk"));
 const remotion_1 = require("remotion");
 const createProgressBar = () => {
-    if (!remotion_1.Internals.Logging.isEqualOrBelowLogLevel('info')) {
+    if (!remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'info')) {
         return { update: () => false };
     }
     return (0, exports.createOverwriteableCliOutput)();
@@ -29,8 +29,7 @@ const makeProgressBar = (percentage) => {
 };
 exports.makeProgressBar = makeProgressBar;
 const makeBundlingProgress = ({ progress, steps, doneIn, }) => [
-    '📦',
-    `(1/${steps})`,
+    `(${steps.indexOf('bundling') + 1}/${steps.length})`,
     (0, exports.makeProgressBar)(progress),
     `${doneIn ? 'Bundled' : 'Bundling'} code`,
     doneIn === null
@@ -41,23 +40,41 @@ exports.makeBundlingProgress = makeBundlingProgress;
 const makeRenderingProgress = ({ frames, totalFrames, steps, concurrency, doneIn, }) => {
     const progress = frames / totalFrames;
     return [
-        '🖼 ',
-        `(2/${steps})`,
+        `(${steps.indexOf('rendering') + 1}/${steps.length})`,
         (0, exports.makeProgressBar)(progress),
-        `${doneIn ? 'Rendered' : 'Rendering'} frames (${concurrency}x)`,
+        [doneIn ? 'Rendered' : 'Rendering', `frames (${concurrency}x)`]
+            .filter(remotion_1.Internals.truthy)
+            .join(' '),
         doneIn === null ? `${frames}/${totalFrames}` : chalk_1.default.gray(`${doneIn}ms`),
     ].join(' ');
 };
 exports.makeRenderingProgress = makeRenderingProgress;
-const makeStitchingProgress = ({ frames, totalFrames, steps, doneIn, }) => {
+const makeDownloadProgress = (progress) => {
+    return [
+        `(-/-)`,
+        (0, exports.makeProgressBar)(progress.progress),
+        `Downloading ${progress.name}`,
+    ].join(' ');
+};
+exports.makeDownloadProgress = makeDownloadProgress;
+const makeStitchingProgress = ({ frames, totalFrames, steps, doneIn, stage, }) => {
     const progress = frames / totalFrames;
     return [
-        '🎞 ',
-        `(3/${steps})`,
+        `(${steps.indexOf('stitching') + 1}/${steps.length})`,
         (0, exports.makeProgressBar)(progress),
-        `${doneIn ? 'Encoded' : 'Encoding'} video`,
+        stage === 'muxing'
+            ? `${doneIn ? 'Muxed' : 'Muxing'} audio`
+            : `${doneIn ? 'Encoded' : 'Encoding'} video`,
         doneIn === null ? `${frames}/${totalFrames}` : chalk_1.default.gray(`${doneIn}ms`),
     ].join(' ');
 };
 exports.makeStitchingProgress = makeStitchingProgress;
+const makeRenderingAndStitchingProgress = ({ rendering, stitching, downloads, }) => {
+    return [
+        (0, exports.makeRenderingProgress)(rendering),
+        ...downloads.map((d) => (0, exports.makeDownloadProgress)(d)),
+        stitching === null ? null : (0, exports.makeStitchingProgress)(stitching),
+    ].join('\n');
+};
+exports.makeRenderingAndStitchingProgress = makeRenderingAndStitchingProgress;
 //# sourceMappingURL=progress-bar.js.map

package/dist/progress-bar.js.map

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

package/dist/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"AA6CA,eAAO,MAAM,MAAM,qBAgPlB,CAAC"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"AA2BA,eAAO,MAAM,MAAM,qBAiPlB,CAAC"}

package/dist/render.js

@@ -10,56 +10,45 @@ const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 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 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;
     const startTime = Date.now();
     const file = parse_command_line_1.parsedCli._[1];
-    const fullPath = path_1.default.join(process.cwd(), file);
-    (0, initialize_render_cli_1.initializeRenderCli)('sequence');
-    const { codec, proResProfile, parallelism, frameRange, shouldOutputImageSequence, absoluteOutputFile, overwrite, inputProps, envVariables, quality, browser, crf, pixelFormat, imageFormat, browserExecutable, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'series' });
+    const fullPath = renderer_1.RenderInternals.isServeUrl(file)
+        ? file
+        : path_1.default.join(process.cwd(), file);
+    await (0, initialize_render_cli_1.initializeRenderCli)('sequence');
+    const { codec, proResProfile, parallelism, 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');
     }
-    await (0, validate_ffmpeg_version_1.checkAndValidateFfmpegVersion)();
-    const browserInstance = renderer_1.RenderInternals.openBrowser(browser, {
+    await (0, validate_ffmpeg_version_1.checkAndValidateFfmpegVersion)({
+        ffmpegExecutable: remotion_1.Internals.getCustomFfmpegExecutable(),
+    });
+    const browserInstance = (0, renderer_1.openBrowser)(browser, {
         browserExecutable,
-        shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
+        shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
     });
-    if (shouldOutputImageSequence) {
-        fs_1.default.mkdirSync(absoluteOutputFile, {
-            recursive: true,
-        });
-    }
-    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 steps = [
+        renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
+        'rendering',
+        shouldOutputImageSequence ? null : 'stitching',
+    ].filter(remotion_1.Internals.truthy);
+    const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
+        ? Promise.resolve(fullPath)
+        : await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
+    const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer(await urlOrBundle);
+    const puppeteerInstance = await browserInstance;
     const comps = await (0, renderer_1.getCompositions)(serveUrl, {
-        browser,
         inputProps,
-        browserInstance: openedBrowser,
+        puppeteerInstance,
         envVariables,
     });
     const compositionId = (0, get_composition_id_1.getCompositionId)(comps);
@@ -75,138 +64,122 @@ 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)();
     let totalFrames = 0;
-    const renderStart = Date.now();
-    const { assetsInfo } = await (0, renderer_1.renderFrames)({
-        config,
-        onFrameUpdate: (frame) => {
-            renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
-                frames: frame,
+    let encodedFrames = 0;
+    let renderedFrames = 0;
+    let encodedDoneIn = null;
+    let renderedDoneIn = null;
+    let stitchStage = 'encoding';
+    const downloads = [];
+    const updateRenderProgress = () => {
+        if (totalFrames === null) {
+            throw new Error('totalFrames should not be 0');
+        }
+        return renderProgress.update((0, progress_bar_1.makeRenderingAndStitchingProgress)({
+            rendering: {
+                frames: renderedFrames,
                 totalFrames,
                 concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
-                doneIn: null,
-                steps,
-            }));
-        },
-        parallelism,
-        compositionId,
-        outputDir,
-        onError,
-        onStart: ({ frameCount: fc }) => {
-            renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
-                frames: 0,
-                totalFrames: fc,
-                concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
-                doneIn: null,
+                doneIn: renderedDoneIn,
                 steps,
-            }));
-            totalFrames = fc;
-        },
-        inputProps,
-        envVariables,
-        imageFormat,
-        quality,
-        browser,
-        frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
-        puppeteerInstance: openedBrowser,
-        serveUrl,
-    });
-    const closeBrowserPromise = openedBrowser.close();
-    renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
-        frames: totalFrames,
-        totalFrames,
-        steps,
-        concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
-        doneIn: Date.now() - renderStart,
-    }) + '\n');
-    if (process.env.DEBUG) {
-        remotion_1.Internals.perf.logPerf();
-    }
+            },
+            stitching: shouldOutputImageSequence
+                ? null
+                : {
+                    doneIn: encodedDoneIn,
+                    frames: encodedFrames,
+                    stage: stitchStage,
+                    steps,
+                    totalFrames,
+                },
+            downloads,
+        }));
+    };
     if (shouldOutputImageSequence) {
-        log_1.Log.info(chalk_1.default.green('\nYour image sequence is ready!'));
-    }
-    else {
-        if (typeof crf !== 'number') {
-            throw new TypeError('CRF is unexpectedly not a number');
-        }
-        const stitchingProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
-        const dirName = path_1.default.dirname(absoluteOutputFile);
-        if (!fs_1.default.existsSync(dirName)) {
-            fs_1.default.mkdirSync(dirName, {
-                recursive: true,
-            });
+        fs_1.default.mkdirSync(absoluteOutputFile, {
+            recursive: true,
+        });
+        if (imageFormat === 'none') {
+            log_1.Log.error('Cannot render an image sequence with a codec that renders no images.');
+            log_1.Log.error(`codec = ${codec}, imageFormat = ${imageFormat}`);
+            process.exit(1);
         }
-        stitchingProgress.update((0, progress_bar_1.makeStitchingProgress)({
-            doneIn: null,
-            frames: 0,
-            steps,
-            totalFrames,
-        }));
-        const stitchStart = Date.now();
-        await (0, renderer_1.stitchFramesToVideo)({
-            dir: outputDir,
-            width: config.width,
-            height: config.height,
-            fps: config.fps,
-            outputLocation: absoluteOutputFile,
-            force: overwrite,
+        await (0, renderer_1.renderFrames)({
+            config,
             imageFormat,
-            pixelFormat,
-            codec,
-            proResProfile,
-            crf,
-            assetsInfo,
-            parallelism,
-            onProgress: (frame) => {
-                stitchingProgress.update((0, progress_bar_1.makeStitchingProgress)({
-                    doneIn: null,
-                    frames: frame,
-                    steps,
-                    totalFrames,
-                }));
+            inputProps,
+            onFrameUpdate: (rendered) => {
+                renderedFrames = rendered;
+                updateRenderProgress();
             },
-            onDownload: (src) => {
-                log_1.Log.info('Downloading asset... ', src);
+            onStart: ({ frameCount }) => {
+                totalFrames = frameCount;
+                return updateRenderProgress();
             },
-            webpackBundle: bundled,
-            verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
+            outputDir,
+            serveUrl,
+            dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
+            envVariables,
+            frameRange,
+            parallelism,
+            puppeteerInstance,
+            quality,
         });
-        stitchingProgress.update((0, progress_bar_1.makeStitchingProgress)({
-            doneIn: Date.now() - stitchStart,
-            frames: totalFrames,
-            steps,
-            totalFrames,
-        }) + '\n');
-        log_1.Log.verbose('Cleaning up...');
-        try {
-            if (process.platform === 'win32') {
-                // Properly delete directories because Windows doesn't seem to like fs.
-                await (0, delete_directory_1.deleteDirectory)(outputDir);
-                await (0, delete_directory_1.deleteDirectory)(bundled);
-            }
-            else {
-                await Promise.all([
-                    ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(outputDir, {
-                        recursive: true,
-                    }),
-                    ((_b = fs_1.default.promises.rm) !== null && _b !== void 0 ? _b : fs_1.default.promises.rmdir)(bundled, {
-                        recursive: true,
-                    }),
-                ]);
-            }
-        }
-        catch (err) {
-            log_1.Log.warn('Could not clean up directory.');
-            log_1.Log.warn(err);
-            log_1.Log.warn('Do you have minimum required Node.js version?');
-        }
-        log_1.Log.info(chalk_1.default.green('\nYour video is ready!'));
+        renderedDoneIn = Date.now() - startTime;
+        updateRenderProgress();
+        log_1.Log.info();
+        log_1.Log.info();
+        log_1.Log.info(chalk_1.default.green('\nYour image sequence is ready!'));
+        return;
     }
+    await (0, renderer_1.renderMedia)({
+        outputLocation: absoluteOutputFile,
+        codec,
+        composition: config,
+        crf,
+        envVariables,
+        ffmpegExecutable,
+        frameRange,
+        imageFormat,
+        inputProps,
+        onProgress: (update) => {
+            encodedDoneIn = update.encodedDoneIn;
+            encodedFrames = update.encodedFrames;
+            renderedDoneIn = update.renderedDoneIn;
+            stitchStage = update.stitchStage;
+            renderedFrames = update.renderedFrames;
+            updateRenderProgress();
+        },
+        puppeteerInstance,
+        overwrite,
+        parallelism,
+        pixelFormat,
+        proResProfile,
+        quality,
+        serveUrl,
+        onDownload: (src) => {
+            const id = Math.random();
+            const download = {
+                id,
+                name: src,
+                progress: 0,
+            };
+            downloads.push(download);
+            updateRenderProgress();
+            return ({ percent }) => {
+                download.progress = percent;
+                updateRenderProgress();
+            };
+        },
+        dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
+        onStart: ({ frameCount }) => {
+            totalFrames = frameCount;
+        },
+    });
+    log_1.Log.info();
+    log_1.Log.info();
     const seconds = Math.round((Date.now() - startTime) / 1000);
     log_1.Log.info([
         '- Total render time:',
@@ -215,8 +188,19 @@ const render = async () => {
     ].join(' '));
     log_1.Log.info('-', 'Output can be found at:');
     log_1.Log.info(chalk_1.default.cyan(`▶️ ${absoluteOutputFile}`));
-    await closeBrowserPromise;
-    close();
+    log_1.Log.verbose('Cleaning up...');
+    try {
+        await renderer_1.RenderInternals.deleteDirectory(await urlOrBundle);
+    }
+    catch (err) {
+        log_1.Log.warn('Could not clean up directory.');
+        log_1.Log.warn(err);
+        log_1.Log.warn('Do you have minimum required Node.js version?');
+    }
+    log_1.Log.info(chalk_1.default.green('\nYour video is ready!'));
+    closeServer().catch((err) => {
+        log_1.Log.error('Could not close web server', err);
+    });
 };
 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/setup-cache.d.ts

@@ -1,2 +1,3 @@
-export declare const bundleOnCli: (fullPath: string, steps: number) => Promise<string>;
+import { RenderStep } from './step';
+export declare const bundleOnCli: (fullPath: string, steps: RenderStep[]) => Promise<string>;
 //# sourceMappingURL=setup-cache.d.ts.map

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":"AAOA,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAC;AAElC,eAAO,MAAM,WAAW,aAAoB,MAAM,SAAS,UAAU,EAAE,oBAuCtE,CAAC"}

package/dist/setup-cache.js

@@ -15,7 +15,11 @@ const bundleOnCli = async (fullPath, steps) => {
     const bundleStartTime = Date.now();
     const bundlingProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
     const bundled = await (0, bundler_1.bundle)(fullPath, (progress) => {
-        bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({ progress: progress / 100, steps, doneIn: null }));
+        bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
+            progress: progress / 100,
+            steps,
+            doneIn: null,
+        }));
     }, {
         enableCaching: shouldCache,
     });

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,iDAGwB;AAGjB,MAAM,WAAW,GAAG,KAAK,EAAE,QAAgB,EAAE,KAAmB,EAAE,EAAE;IAC1E,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;YACpB,QAAQ,EAAE,QAAQ,GAAG,GAAG;YACxB,KAAK;YACL,MAAM,EAAE,IAAI;SACZ,CAAC,CACF,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;AAvCW,QAAA,WAAW,eAuCtB"}

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,qBA2IjB,CAAC"}
+{"version":3,"file":"still.d.ts","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"AAwBA,eAAO,MAAM,KAAK,qBAoJjB,CAAC"}