@remotion/cli 3.1.7 → 3.1.8

package/dist/render.js

@@ -35,6 +35,7 @@ const render = async (remotionRoot) => {
         : path_1.default.join(process.cwd(), file);
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
     await (0, initialize_render_cli_1.initializeRenderCli)(remotionRoot, 'sequence');
+    log_1.Log.verbose('Asset dirs', downloadMap.assetDir);
     const { codec, proResProfile, parallelism, frameRange, shouldOutputImageSequence, overwrite, inputProps, envVariables, quality, browser, crf, pixelFormat, imageFormat, browserExecutable, ffmpegExecutable, ffprobeExecutable, scale, chromiumOptions, port, numberOfGifLoops, everyNthFrame, puppeteerTimeout, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
         type: 'series',
@@ -63,9 +64,11 @@ const render = async (remotionRoot) => {
         'rendering',
         shouldOutputImageSequence ? null : 'stitching',
     ].filter(remotion_1.Internals.truthy);
-    const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
-        ? fullPath
-        : await (0, setup_cache_1.bundleOnCli)({ fullPath, remotionRoot, steps });
+    const { urlOrBundle, cleanup: cleanupBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({
+        fullPath,
+        remotionRoot,
+        steps,
+    });
     const onDownload = (src) => {
         const id = Math.random();
         const download = {
@@ -240,9 +243,10 @@ const render = async (remotionRoot) => {
     ].join(' '));
     log_1.Log.info('-', 'Output can be found at:');
     log_1.Log.info(chalk_1.chalk.cyan(`▶ ${absoluteOutputFile}`));
-    log_1.Log.verbose('Cleaning up...');
     try {
-        await renderer_1.RenderInternals.deleteDirectory(urlOrBundle);
+        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.');

package/dist/setup-cache.d.ts

@@ -1,4 +1,12 @@
 import type { RenderStep } from './step';
+export declare const bundleOnCliOrTakeServeUrl: ({ fullPath, remotionRoot, steps, }: {
+    fullPath: string;
+    remotionRoot: string;
+    steps: RenderStep[];
+}) => Promise<{
+    urlOrBundle: string;
+    cleanup: () => Promise<void>;
+}>;
 export declare const bundleOnCli: ({ fullPath, steps, remotionRoot, }: {
     fullPath: string;
     steps: RenderStep[];

package/dist/setup-cache.js

@@ -1,11 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bundleOnCli = void 0;
+exports.bundleOnCli = exports.bundleOnCliOrTakeServeUrl = void 0;
 const bundler_1 = require("@remotion/bundler");
+const renderer_1 = require("@remotion/renderer");
 const config_1 = require("./config");
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
 const progress_bar_1 = require("./progress-bar");
+const bundleOnCliOrTakeServeUrl = async ({ fullPath, remotionRoot, steps, }) => {
+    if (renderer_1.RenderInternals.isServeUrl(fullPath)) {
+        return {
+            urlOrBundle: fullPath,
+            cleanup: () => Promise.resolve(undefined),
+        };
+    }
+    const bundled = await (0, exports.bundleOnCli)({ fullPath, remotionRoot, steps });
+    return {
+        urlOrBundle: bundled,
+        cleanup: () => renderer_1.RenderInternals.deleteDirectory(bundled),
+    };
+};
+exports.bundleOnCliOrTakeServeUrl = bundleOnCliOrTakeServeUrl;
 const bundleOnCli = async ({ fullPath, steps, remotionRoot, }) => {
     var _a;
     const shouldCache = config_1.ConfigInternals.getWebpackCaching();

package/dist/still.js

@@ -72,12 +72,10 @@ const still = async (remotionRoot) => {
         renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
         'rendering',
     ].filter(truthy_1.truthy);
-    const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
-        ? Promise.resolve(fullPath)
-        : await (0, setup_cache_1.bundleOnCli)({ fullPath, remotionRoot, steps });
+    const { cleanup: cleanupBundle, urlOrBundle } = await (0, setup_cache_1.bundleOnCliOrTakeServeUrl)({ fullPath, remotionRoot, steps });
     const puppeteerInstance = await browserInstance;
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
-    const comps = await (0, renderer_1.getCompositions)(await urlOrBundle, {
+    const comps = await (0, renderer_1.getCompositions)(urlOrBundle, {
         inputProps,
         puppeteerInstance,
         envVariables,
@@ -132,7 +130,7 @@ const still = async (remotionRoot) => {
         composition,
         frame: stillFrame,
         output: absoluteOutputLocation,
-        serveUrl: await urlOrBundle,
+        serveUrl: urlOrBundle,
         quality,
         dumpBrowserLogs: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
         envVariables,
@@ -162,5 +160,8 @@ const still = async (remotionRoot) => {
     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/dist/webpack-cache.d.ts

@@ -6,7 +6,7 @@ declare global {
         }
     }
 }
-export declare const clearCache: (remotionRoot: string, environment: Environment, inputProps: object | null) => Promise<void>;
+export declare const clearCache: (environment: Environment, inputProps: object | null) => Promise<void>;
 export declare const getWebpackCacheName: (environment: Environment, inputProps: object | null) => string;
-export declare const cacheExists: (remotionRoot: string, environment: Environment, inputProps: object | null) => boolean;
+export declare const cacheExists: (environment: Environment, inputProps: object | null) => boolean;
 export {};

package/dist/webpack-cache.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cacheExists = exports.getWebpackCacheName = exports.clearCache = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-// eslint-disable-next-line no-restricted-imports
 const remotion_1 = require("remotion");
 // Inlined from https://github.com/webpack/webpack/blob/4c2ee7a4ddb8db2362ca83b6c4190523387ba7ee/lib/config/defaults.js#L265
 // An algorithm to determine where Webpack will cache the depencies
-const getWebpackCacheDir = (remotionRoot) => {
-    let dir = remotionRoot;
+const getWebpackCacheDir = () => {
+    const cwd = process.cwd();
+    let dir = cwd;
     for (;;) {
         try {
             if (fs_1.default.statSync(path_1.default.join(dir, 'package.json')).isFile()) {
@@ -28,7 +28,7 @@ const getWebpackCacheDir = (remotionRoot) => {
         dir = parent;
     }
     if (!dir) {
-        return path_1.default.resolve(remotionRoot, '.cache/webpack');
+        return path_1.default.resolve(cwd, '.cache/webpack');
     }
     if (process.versions.pnp === '1') {
         return path_1.default.resolve(dir, '.pnp/.cache/webpack');
@@ -38,12 +38,12 @@ const getWebpackCacheDir = (remotionRoot) => {
     }
     return path_1.default.resolve(dir, 'node_modules/.cache/webpack');
 };
-const remotionCacheLocation = (remotionRoot, environment, inputProps) => {
-    return path_1.default.join(getWebpackCacheDir(remotionRoot), (0, exports.getWebpackCacheName)(environment, inputProps));
+const remotionCacheLocation = (environment, inputProps) => {
+    return path_1.default.join(getWebpackCacheDir(), (0, exports.getWebpackCacheName)(environment, inputProps));
 };
-const clearCache = (remotionRoot, environment, inputProps) => {
+const clearCache = (environment, inputProps) => {
     var _a;
-    return ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(remotionCacheLocation(remotionRoot, environment, inputProps), {
+    return ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(remotionCacheLocation(environment, inputProps), {
         recursive: true,
     });
 };
@@ -60,7 +60,7 @@ const getWebpackCacheName = (environment, inputProps) => {
     return `remotion-v3-${environment}`;
 };
 exports.getWebpackCacheName = getWebpackCacheName;
-const cacheExists = (remotionRoot, environment, inputProps) => {
-    return fs_1.default.existsSync(remotionCacheLocation(remotionRoot, environment, inputProps));
+const cacheExists = (environment, inputProps) => {
+    return fs_1.default.existsSync(remotionCacheLocation(environment, inputProps));
 };
 exports.cacheExists = cacheExists;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.1.7",
+	"version": "3.1.8",
 	"description": "CLI for Remotion",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -23,18 +23,17 @@
 	"author": "Jonny Burger <jonny@remotion.dev>",
 	"license": "SEE LICENSE IN LICENSE.md",
 	"dependencies": {
-		"@remotion/bundler": "3.1.7",
-		"@remotion/media-utils": "3.1.7",
-		"@remotion/player": "3.1.7",
-		"@remotion/renderer": "3.1.7",
+		"@remotion/bundler": "3.1.8",
+		"@remotion/media-utils": "3.1.8",
+		"@remotion/player": "3.1.8",
+		"@remotion/renderer": "3.1.8",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
-		"remotion": "3.1.7",
+		"remotion": "3.1.8",
 		"semver": "7.3.5",
-		"source-map": "0.6.1",
-		"vitest": "^0.18.0"
+		"source-map": "0.6.1"
 	},
 	"peerDependencies": {
 		"react": ">=16.8.0",
@@ -58,7 +57,8 @@
 		"prettier-plugin-organize-imports": "^2.3.4",
 		"react": "^18.0.0",
 		"react-dom": "^18.0.0",
-		"typescript": "^4.7.0"
+		"typescript": "^4.7.0",
+		"vitest": "^0.18.0"
 	},
 	"keywords": [
 		"remotion",
@@ -71,5 +71,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "599379fef6043a7125d1979766f915580ec1cf77"
+	"gitHead": "57f34a02b0f830053f92af426a6b70b6824f887e"
 }