@remotion/cli 3.3.56 → 3.3.59

package/dist/benchmark.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.benchmarkCommand = void 0;
 const renderer_1 = require("@remotion/renderer");
 const chalk_1 = require("./chalk");
+const cleanup_before_quit_1 = require("./cleanup-before-quit");
 const config_1 = require("./config");
 const entry_point_1 = require("./entry-point");
 const get_cli_options_1 = require("./get-cli-options");
@@ -111,6 +112,7 @@ const benchmarkCommand = async (remotionRoot, args) => {
         remotionRoot,
         steps: ['bundling'],
     });
+    (0, cleanup_before_quit_1.registerCleanupJob)(() => cleanupBundle());
     const puppeteerInstance = await browserInstance;
     const comps = await (0, renderer_1.getCompositions)(bundleLocation, {
         inputProps,
@@ -176,6 +178,5 @@ const benchmarkCommand = async (remotionRoot, args) => {
         }
     }
     log_1.Log.info();
-    await cleanupBundle();
 };
 exports.benchmarkCommand = benchmarkCommand;

package/dist/cleanup-before-quit.d.ts

@@ -0,0 +1,3 @@
+export declare const cleanupBeforeQuit: () => void;
+export declare const registerCleanupJob: (job: () => void) => void;
+export declare const handleCtrlC: () => void;

package/dist/cleanup-before-quit.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleCtrlC = exports.registerCleanupJob = exports.cleanupBeforeQuit = void 0;
+const log_1 = require("./log");
+const cleanupJobs = [];
+const cleanupBeforeQuit = () => {
+    for (const job of cleanupJobs) {
+        job();
+    }
+};
+exports.cleanupBeforeQuit = cleanupBeforeQuit;
+const registerCleanupJob = (job) => {
+    cleanupJobs.push(job);
+};
+exports.registerCleanupJob = registerCleanupJob;
+const handleCtrlC = () => {
+    process.on('SIGINT', () => {
+        log_1.Log.info();
+        (0, exports.cleanupBeforeQuit)();
+        process.exit(1);
+    });
+};
+exports.handleCtrlC = handleCtrlC;

package/dist/compositions.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listCompositionsCommand = void 0;
 const renderer_1 = require("@remotion/renderer");
+const cleanup_before_quit_1 = require("./cleanup-before-quit");
 const entry_point_1 = require("./entry-point");
 const get_cli_options_1 = require("./get-cli-options");
 const get_config_file_name_1 = require("./get-config-file-name");
@@ -18,6 +19,7 @@ const listCompositionsCommand = async (remotionRoot, args) => {
     }
     log_1.Log.verbose('Entry point:', file, 'reason:', reason);
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
+    (0, cleanup_before_quit_1.registerCleanupJob)(() => renderer_1.RenderInternals.cleanDownloadMap(downloadMap));
     await (0, get_config_file_name_1.loadConfig)(remotionRoot);
     const { browserExecutable, ffmpegExecutable, ffprobeExecutable, chromiumOptions, envVariables, inputProps, puppeteerTimeout, port, publicDir, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
@@ -30,6 +32,7 @@ const listCompositionsCommand = async (remotionRoot, args) => {
         steps: ['bundling'],
         publicDir,
     });
+    (0, cleanup_before_quit_1.registerCleanupJob)(() => cleanupBundle());
     const compositions = await (0, renderer_1.getCompositions)(bundled, {
         browserExecutable,
         ffmpegExecutable,
@@ -42,8 +45,6 @@ const listCompositionsCommand = async (remotionRoot, args) => {
         downloadMap,
     });
     (0, print_compositions_1.printCompositions)(compositions);
-    await renderer_1.RenderInternals.cleanDownloadMap(downloadMap);
-    await cleanupBundle();
     log_1.Log.verbose('Cleaned up', downloadMap.assetDir);
 };
 exports.listCompositionsCommand = listCompositionsCommand;

package/dist/config/log.d.ts

@@ -1,3 +1,3 @@
 import type { LogLevel } from '@remotion/renderer';
-export declare const getLogLevel: () => "error" | "verbose" | "info" | "warn";
+export declare const getLogLevel: () => "verbose" | "info" | "warn" | "error";
 export declare const setLogLevel: (newLogLevel: LogLevel) => void;

package/dist/editor/components/CurrentComposition.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const CurrentComposition: () => JSX.Element;

package/dist/editor/components/NewComposition/NewCompCode.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const getNewCompositionCode: ({ type, height, width, fps, durationInFrames, name, raw, }: {
     type: 'still' | 'composition';
     height: number;

package/dist/editor/components/UpdateCheck.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { PackageManager } from '../../preview-server/get-package-manager';
 export declare type UpdateInfo = {
     currentVersion: string;

package/dist/editor/icons/Checkmark.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const Checkmark: () => JSX.Element;

package/dist/editor/icons/caret.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 export declare const CaretRight: () => JSX.Element;
 export declare const CaretDown: () => JSX.Element;

package/dist/get-cli-options.d.ts

@@ -30,7 +30,7 @@ export declare const getCliOptions: (options: {
     browserExecutable: BrowserExecutable;
     ffmpegExecutable: import("@remotion/renderer").FfmpegExecutable;
     ffprobeExecutable: import("@remotion/renderer").FfmpegExecutable;
-    logLevel: "error" | "verbose" | "info" | "warn";
+    logLevel: "verbose" | "info" | "warn" | "error";
     scale: number;
     chromiumOptions: ChromiumOptions;
     overwrite: boolean;

package/dist/index.d.ts

@@ -88,7 +88,7 @@ export declare const CliInternals: {
         browserExecutable: import("@remotion/renderer").BrowserExecutable;
         ffmpegExecutable: import("@remotion/renderer").FfmpegExecutable;
         ffprobeExecutable: import("@remotion/renderer").FfmpegExecutable;
-        logLevel: "error" | "verbose" | "info" | "warn";
+        logLevel: "verbose" | "info" | "warn" | "error";
         scale: number;
         chromiumOptions: import("@remotion/renderer").ChromiumOptions;
         overwrite: boolean;

package/dist/index.js

@@ -22,6 +22,7 @@ const renderer_1 = require("@remotion/renderer");
 const minimist_1 = __importDefault(require("minimist"));
 const benchmark_1 = require("./benchmark");
 const chalk_1 = require("./chalk");
+const cleanup_before_quit_1 = require("./cleanup-before-quit");
 const compositions_1 = require("./compositions");
 const index_1 = require("./config/index");
 const determine_image_format_1 = require("./determine-image-format");
@@ -60,6 +61,7 @@ const cli = async () => {
         await (0, versions_1.validateVersionsBeforeCommand)(remotionRoot);
     }
     const errorSymbolicationLock = renderer_1.RenderInternals.registerErrorSymbolicationLock();
+    (0, cleanup_before_quit_1.handleCtrlC)();
     await (0, initialize_cli_1.initializeCli)(remotionRoot);
     try {
         if (command === 'compositions') {
@@ -104,10 +106,12 @@ const cli = async () => {
     catch (err) {
         log_1.Log.info();
         await (0, handle_common_errors_1.handleCommonError)(err);
+        (0, cleanup_before_quit_1.cleanupBeforeQuit)();
         process.exit(1);
     }
     finally {
         renderer_1.RenderInternals.unlockErrorSymbolicationLock(errorSymbolicationLock);
+        (0, cleanup_before_quit_1.cleanupBeforeQuit)();
     }
 };
 exports.cli = cli;

package/dist/load-config.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadConfigFile = void 0;
 const bundler_1 = require("@remotion/bundler");
 const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const worker_threads_1 = require("worker_threads");
 const log_1 = require("./log");
@@ -18,7 +17,7 @@ const loadConfigFile = async (remotionRoot, configFileName, isJavascript) => {
         log_1.Log.error('The root directory is:', remotionRoot);
         process.exit(1);
     }
-    const out = path_1.default.join(await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'remotion-')), 'bundle.js');
+    const virtualOutfile = 'bundle.js';
     const result = await bundler_1.BundlerInternals.esbuild.build({
         platform: 'node',
         target: 'node14',
@@ -26,7 +25,8 @@ const loadConfigFile = async (remotionRoot, configFileName, isJavascript) => {
         entryPoints: [resolved],
         tsconfig: isJavascript ? undefined : tsconfigJson,
         absWorkingDir: remotionRoot,
-        outfile: out,
+        outfile: virtualOutfile,
+        write: false,
         packages: 'external',
     });
     if (result.errors.length > 0) {
@@ -36,7 +36,7 @@ const loadConfigFile = async (remotionRoot, configFileName, isJavascript) => {
         }
         process.exit(1);
     }
-    const file = await fs_1.default.promises.readFile(out, 'utf8');
+    const str = new TextDecoder().decode(result.outputFiles[0].contents);
     const currentCwd = process.cwd();
     // The config file is always executed from the Remotion root, if `process.cwd()` is being used. We cannot enforce this in worker threads used for testing
     if (worker_threads_1.isMainThread) {
@@ -44,11 +44,10 @@ const loadConfigFile = async (remotionRoot, configFileName, isJavascript) => {
     }
     // Exectute the contents of the config file
     // eslint-disable-next-line no-eval
-    eval(file);
+    eval(str);
     if (worker_threads_1.isMainThread) {
         process.chdir(currentCwd);
     }
-    await fs_1.default.promises.unlink(out);
     return resolved;
 };
 exports.loadConfigFile = loadConfigFile;

package/dist/preview-server/start-server.js

@@ -6,10 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.startServer = void 0;
 const bundler_1 = require("@remotion/bundler");
 const renderer_1 = require("@remotion/renderer");
-const fs_1 = __importDefault(require("fs"));
 const http_1 = __importDefault(require("http"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
 const config_1 = require("../config");
 const log_1 = require("../log");
 const dev_middleware_1 = require("./dev-middleware");
@@ -18,11 +15,10 @@ const live_events_1 = require("./live-events");
 const routes_1 = require("./routes");
 const startServer = async (options) => {
     var _a, _b, _c, _d;
-    const tmpDir = await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-graphics'));
     const [, config] = bundler_1.BundlerInternals.webpackConfig({
         entry: options.entry,
         userDefinedComponent: options.userDefinedComponent,
-        outDir: tmpDir,
+        outDir: null,
         environment: 'development',
         webpackOverride: (_a = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _a !== void 0 ? _a : config_1.ConfigInternals.getWebpackOverrideFn(),
         envVariables: (_b = options === null || options === void 0 ? void 0 : options.getEnvVariables()) !== null && _b !== void 0 ? _b : {},

package/dist/render.js

@@ -10,6 +10,7 @@ const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const remotion_1 = require("remotion");
 const chalk_1 = require("./chalk");
+const cleanup_before_quit_1 = require("./cleanup-before-quit");
 const config_1 = require("./config");
 const entry_point_1 = require("./entry-point");
 const get_audio_codec_1 = require("./get-audio-codec");
@@ -33,6 +34,7 @@ const render = async (remotionRoot, args) => {
         process.exit(1);
     }
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
+    (0, cleanup_before_quit_1.registerCleanupJob)(() => renderer_1.RenderInternals.cleanDownloadMap(downloadMap));
     if (parse_command_line_1.parsedCli.frame) {
         log_1.Log.error('--frame flag was passed to the `render` command. This flag only works with the `still` command. Did you mean `--frames`? See reference: https://www.remotion.dev/docs/cli/');
         process.exit(1);
@@ -66,6 +68,7 @@ const render = async (remotionRoot, args) => {
         steps,
         publicDir,
     });
+    (0, cleanup_before_quit_1.registerCleanupJob)(() => cleanupBundle());
     const onDownload = (src) => {
         const id = Math.random();
         const download = {
@@ -122,8 +125,14 @@ const render = async (remotionRoot, args) => {
     log_1.Log.info(chalk_1.chalk.gray(`Entry point = ${path_1.default.relative(process.cwd(), file)} (${entryPointReason}), Composition = ${compositionId} (${reason}), Codec = ${codec} (${codecReason}), Output = ${relativeOutputLocation}`));
     const absoluteOutputFile = (0, get_cli_options_1.getAndValidateAbsoluteOutputFile)(relativeOutputLocation, overwrite);
     const outputDir = shouldOutputImageSequence
-        ? absoluteOutputFile
-        : await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));
+        ? { dir: absoluteOutputFile, cleanup: false }
+        : {
+            dir: await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render')),
+            cleanup: true,
+        };
+    if (outputDir.cleanup) {
+        (0, cleanup_before_quit_1.registerCleanupJob)(() => renderer_1.RenderInternals.deleteDirectory(outputDir.dir));
+    }
     log_1.Log.verbose('Output dir', outputDir);
     const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
     const realFrameRange = renderer_1.RenderInternals.getRealFrameRange(config.durationInFrames, frameRange);
@@ -186,7 +195,7 @@ const render = async (remotionRoot, args) => {
                     log_1.Log.info('\nDownloading asset... ', src);
                 }
             },
-            outputDir,
+            outputDir: outputDir.dir,
             serveUrl: urlOrBundle,
             dumpBrowserLogs: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
             everyNthFrame,
@@ -231,7 +240,10 @@ const render = async (remotionRoot, args) => {
         },
         puppeteerInstance,
         onDownload,
-        downloadMap,
+        internal: {
+            downloadMap,
+            onCtrlCExit: cleanup_before_quit_1.registerCleanupJob,
+        },
         onSlowestFrames: (slowestFrames) => {
             log_1.Log.verbose();
             log_1.Log.verbose(`Slowest frames:`);
@@ -250,16 +262,6 @@ const render = async (remotionRoot, args) => {
     ].join(' '));
     log_1.Log.info('-', 'Output can be found at:');
     log_1.Log.info(chalk_1.chalk.cyan(`▶ ${absoluteOutputFile}`));
-    try {
-        await cleanupBundle();
-        await renderer_1.RenderInternals.cleanDownloadMap(downloadMap);
-        log_1.Log.verbose('Cleaned up', downloadMap.assetDir);
-    }
-    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.chalk.green(`\nYour ${codec === 'gif' ? 'GIF' : 'video'} is ready!`));
     if (renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose')) {
         renderer_1.RenderInternals.perf.logPerf();

package/dist/setup-cache.d.ts

@@ -6,7 +6,7 @@ export declare const bundleOnCliOrTakeServeUrl: ({ fullPath, remotionRoot, steps
     publicDir: string | null;
 }) => Promise<{
     urlOrBundle: string;
-    cleanup: () => Promise<void>;
+    cleanup: () => void;
 }>;
 export declare const bundleOnCli: ({ fullPath, steps, remotionRoot, publicDir, }: {
     fullPath: string;

package/dist/still.js

@@ -8,6 +8,7 @@ const renderer_1 = require("@remotion/renderer");
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const chalk_1 = require("./chalk");
+const cleanup_before_quit_1 = require("./cleanup-before-quit");
 const config_1 = require("./config");
 const determine_image_format_1 = require("./determine-image-format");
 const entry_point_1 = require("./entry-point");
@@ -50,8 +51,10 @@ const still = async (remotionRoot, args) => {
         'rendering',
     ].filter(truthy_1.truthy);
     const { cleanup: cleanupBundle, urlOrBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({ fullPath: file, remotionRoot, steps, publicDir });
+    (0, cleanup_before_quit_1.registerCleanupJob)(() => cleanupBundle());
     const puppeteerInstance = await browserInstance;
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
+    (0, cleanup_before_quit_1.registerCleanupJob)(() => renderer_1.RenderInternals.cleanDownloadMap(downloadMap));
     const comps = await (0, renderer_1.getCompositions)(urlOrBundle, {
         inputProps,
         puppeteerInstance,
@@ -157,8 +160,5 @@ const still = async (remotionRoot, args) => {
     log_1.Log.info('-', 'Output can be found at:');
     log_1.Log.info(chalk_1.chalk.cyan(`▶️ ${absoluteOutputLocation}`));
     await closeBrowserPromise;
-    await renderer_1.RenderInternals.cleanDownloadMap(downloadMap);
-    await cleanupBundle();
-    log_1.Log.verbose('Cleaned up', downloadMap.assetDir);
 };
 exports.still = still;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.3.56",
+	"version": "3.3.59",
 	"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.56",
-		"@remotion/media-utils": "3.3.56",
-		"@remotion/player": "3.3.56",
-		"@remotion/renderer": "3.3.56",
+		"@remotion/bundler": "3.3.59",
+		"@remotion/media-utils": "3.3.59",
+		"@remotion/player": "3.3.59",
+		"@remotion/renderer": "3.3.59",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
 		"prompts": "2.4.1",
-		"remotion": "3.3.56",
+		"remotion": "3.3.59",
 		"semver": "7.3.5",
 		"source-map": "0.6.1"
 	},
@@ -71,5 +71,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "40e96323b08717213c20fffcce8a985f0310f6e5"
+	"gitHead": "4ee88b056704d7224838a8fbc32d2d3522c5afbe"
 }