@remotion/cli 3.1.6 → 3.1.7

package/dist/setup-cache.d.ts

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

package/dist/setup-cache.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bundleOnCli = void 0;
 const bundler_1 = require("@remotion/bundler");
-const remotion_1 = require("remotion");
+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 bundleOnCli = async ({ fullPath, steps, }) => {
+const bundleOnCli = async ({ fullPath, steps, remotionRoot, }) => {
     var _a;
-    const shouldCache = remotion_1.Internals.getWebpackCaching();
+    const shouldCache = config_1.ConfigInternals.getWebpackCaching();
     const onProgress = (progress) => {
         bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
             progress: progress / 100,
@@ -18,17 +18,24 @@ const bundleOnCli = async ({ fullPath, steps, }) => {
     };
     const options = {
         enableCaching: shouldCache,
-        webpackOverride: (_a = remotion_1.Internals.getWebpackOverrideFn()) !== null && _a !== void 0 ? _a : remotion_1.Internals.defaultOverrideFunction,
+        webpackOverride: (_a = config_1.ConfigInternals.getWebpackOverrideFn()) !== null && _a !== void 0 ? _a : ((f) => f),
+        rootDir: remotionRoot,
     };
-    const [hash] = bundler_1.BundlerInternals.getConfig('', fullPath, onProgress, options);
-    const cacheExistedBefore = bundler_1.BundlerInternals.cacheExists('production', hash);
+    const [hash] = bundler_1.BundlerInternals.getConfig({
+        outDir: '',
+        entryPoint: fullPath,
+        onProgressUpdate: onProgress,
+        options,
+        resolvedRemotionRoot: remotionRoot,
+    });
+    const cacheExistedBefore = bundler_1.BundlerInternals.cacheExists(remotionRoot, 'production', hash);
     if (cacheExistedBefore !== 'does-not-exist' && !shouldCache) {
         log_1.Log.info('🧹 Cache disabled but found. Deleting... ');
-        await bundler_1.BundlerInternals.clearCache();
+        await bundler_1.BundlerInternals.clearCache(remotionRoot);
     }
     if (cacheExistedBefore === 'other-exists' && shouldCache) {
         log_1.Log.info('🧹 Webpack config change detected. Clearing cache... ');
-        await bundler_1.BundlerInternals.clearCache();
+        await bundler_1.BundlerInternals.clearCache(remotionRoot);
     }
     const bundleStartTime = Date.now();
     const bundlingProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
@@ -45,7 +52,7 @@ const bundleOnCli = async ({ fullPath, steps, }) => {
         doneIn: Date.now() - bundleStartTime,
     }) + '\n');
     log_1.Log.verbose('Bundled under', bundled);
-    const cacheExistedAfter = bundler_1.BundlerInternals.cacheExists('production', hash) === 'exists';
+    const cacheExistedAfter = bundler_1.BundlerInternals.cacheExists(remotionRoot, 'production', hash) === 'exists';
     if (cacheExistedAfter) {
         if (cacheExistedBefore === 'does-not-exist' ||
             cacheExistedBefore === 'other-exists') {

package/dist/still.d.ts

@@ -1 +1 @@
-export declare const still: () => Promise<void>;
+export declare const still: (remotionRoot: string) => Promise<void>;

package/dist/still.js

@@ -7,8 +7,8 @@ exports.still = void 0;
 const renderer_1 = require("@remotion/renderer");
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
-const remotion_1 = require("remotion");
 const chalk_1 = require("./chalk");
+const config_1 = require("./config");
 const get_cli_options_1 = require("./get-cli-options");
 const get_composition_id_1 = require("./get-composition-id");
 const initialize_render_cli_1 = require("./initialize-render-cli");
@@ -16,23 +16,24 @@ 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 truthy_1 = require("./truthy");
 const user_passed_output_location_1 = require("./user-passed-output-location");
-const still = async () => {
+const still = async (remotionRoot) => {
     const startTime = Date.now();
     const file = parse_command_line_1.parsedCli._[1];
     const fullPath = renderer_1.RenderInternals.isServeUrl(file)
         ? file
         : path_1.default.join(process.cwd(), file);
-    await (0, initialize_render_cli_1.initializeRenderCli)('still');
+    await (0, initialize_render_cli_1.initializeRenderCli)(remotionRoot, 'still');
     const userPassedOutput = (0, user_passed_output_location_1.getUserPassedOutputLocation)();
     if ((userPassedOutput === null || userPassedOutput === void 0 ? void 0 : userPassedOutput.endsWith('.jpeg')) ||
         (userPassedOutput === null || userPassedOutput === void 0 ? void 0 : userPassedOutput.endsWith('.jpg'))) {
         log_1.Log.verbose('Output file has a JPEG extension, setting the image format to JPEG.');
-        remotion_1.Config.Rendering.setImageFormat('jpeg');
+        config_1.Config.Rendering.setImageFormat('jpeg');
     }
     if (userPassedOutput === null || userPassedOutput === void 0 ? void 0 : userPassedOutput.endsWith('.png')) {
         log_1.Log.verbose('Output file has a PNG extension, setting the image format to PNG.');
-        remotion_1.Config.Rendering.setImageFormat('png');
+        config_1.Config.Rendering.setImageFormat('png');
     }
     const { inputProps, envVariables, quality, browser, imageFormat, stillFrame, browserExecutable, chromiumOptions, scale, ffmpegExecutable, ffprobeExecutable, overwrite, puppeteerTimeout, port, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
@@ -61,7 +62,7 @@ const still = async () => {
     const browserInstance = (0, renderer_1.openBrowser)(browser, {
         browserExecutable,
         chromiumOptions,
-        shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
+        shouldDumpIo: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
         forceDeviceScaleFactor: scale,
     });
     (0, fs_1.mkdirSync)(path_1.default.join(absoluteOutputLocation, '..'), {
@@ -70,11 +71,12 @@ const still = async () => {
     const steps = [
         renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
         'rendering',
-    ].filter(remotion_1.Internals.truthy);
+    ].filter(truthy_1.truthy);
     const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
         ? Promise.resolve(fullPath)
-        : await (0, setup_cache_1.bundleOnCli)({ fullPath, steps });
+        : await (0, setup_cache_1.bundleOnCli)({ fullPath, remotionRoot, steps });
     const puppeteerInstance = await browserInstance;
+    const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
     const comps = await (0, renderer_1.getCompositions)(await urlOrBundle, {
         inputProps,
         puppeteerInstance,
@@ -85,6 +87,7 @@ const still = async () => {
         browserExecutable,
         ffmpegExecutable,
         ffprobeExecutable,
+        downloadMap,
     });
     const composition = comps.find((c) => c.id === compositionId);
     if (!composition) {
@@ -131,17 +134,19 @@ const still = async () => {
         output: absoluteOutputLocation,
         serveUrl: await urlOrBundle,
         quality,
-        dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
+        dumpBrowserLogs: renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose'),
         envVariables,
         imageFormat,
         inputProps,
         chromiumOptions,
-        timeoutInMilliseconds: remotion_1.Internals.getCurrentPuppeteerTimeout(),
+        timeoutInMilliseconds: config_1.ConfigInternals.getCurrentPuppeteerTimeout(),
         scale,
         ffmpegExecutable,
         browserExecutable,
         overwrite,
         onDownload,
+        port,
+        downloadMap,
     });
     frames = 1;
     updateProgress();

package/dist/truthy.d.ts

@@ -0,0 +1,3 @@
+declare type Truthy<T> = T extends false | '' | 0 | null | undefined ? never : T;
+export declare function truthy<T>(value: T): value is Truthy<T>;
+export {};

package/dist/truthy.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.truthy = void 0;
+function truthy(value) {
+    return Boolean(value);
+}
+exports.truthy = truthy;

package/dist/upgrade.d.ts

@@ -1 +1 @@
-export declare const upgrade: () => Promise<void>;
+export declare const upgrade: (remotionRoot: string) => Promise<void>;

package/dist/upgrade.js

@@ -5,9 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.upgrade = void 0;
 const renderer_1 = require("@remotion/renderer");
-const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const remotion_1 = require("remotion");
+const config_1 = require("./config");
 const get_latest_remotion_version_1 = require("./get-latest-remotion-version");
 const log_1 = require("./log");
 const get_package_manager_1 = require("./preview-server/get-package-manager");
@@ -20,17 +19,13 @@ const getUpgradeCommand = ({ manager, packages, version, }) => {
     };
     return commands[manager];
 };
-const upgrade = async () => {
+const upgrade = async (remotionRoot) => {
     var _a;
-    const packageJsonFilePath = path_1.default.join(process.cwd(), 'package.json');
-    if (!fs_1.default.existsSync(packageJsonFilePath)) {
-        log_1.Log.error('Could not upgrade because no package.json could be found in your project.');
-        process.exit(1);
-    }
+    const packageJsonFilePath = path_1.default.join(remotionRoot, 'package.json');
     const packageJson = require(packageJsonFilePath);
     const dependencies = Object.keys(packageJson.dependencies);
     const latestRemotionVersion = await (0, get_latest_remotion_version_1.getLatestRemotionVersion)();
-    const manager = (0, get_package_manager_1.getPackageManager)();
+    const manager = (0, get_package_manager_1.getPackageManager)(remotionRoot);
     if (manager === 'unknown') {
         throw new Error(`No lockfile was found in your project (one of ${get_package_manager_1.lockFilePaths
             .map((p) => p.path)
@@ -57,7 +52,7 @@ const upgrade = async () => {
     }), {
         stdio: 'inherit',
     });
-    if (remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'info')) {
+    if (renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'info')) {
         (_a = prom.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
     }
     await prom;

package/dist/user-passed-output-location.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOutputLocation = exports.getUserPassedOutputLocation = void 0;
-const remotion_1 = require("remotion");
+const config_1 = require("./config");
 const parse_command_line_1 = require("./parse-command-line");
 const getUserPassedOutputLocation = () => {
     const filename = parse_command_line_1.parsedCli._[3]
         ? parse_command_line_1.parsedCli._[3]
-        : remotion_1.Internals.getOutputLocation();
+        : config_1.ConfigInternals.getOutputLocation();
     return filename;
 };
 exports.getUserPassedOutputLocation = getUserPassedOutputLocation;

package/dist/versions.d.ts

@@ -1,3 +1,3 @@
 export declare const VERSIONS_COMMAND = "versions";
-export declare const validateVersionsBeforeCommand: () => Promise<void>;
-export declare const versionsCommand: () => Promise<void>;
+export declare const validateVersionsBeforeCommand: (remotionRoot: string) => Promise<void>;
+export declare const versionsCommand: (remotionRoot: string) => Promise<void>;

package/dist/versions.js

@@ -4,8 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.versionsCommand = exports.validateVersionsBeforeCommand = exports.VERSIONS_COMMAND = void 0;
+const renderer_1 = require("@remotion/renderer");
 const fs_1 = __importDefault(require("fs"));
-const remotion_1 = require("remotion");
+const config_1 = require("./config");
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
 const resolve_from_1 = require("./resolve-from");
@@ -23,9 +24,9 @@ const packages = [
     '@remotion/gif',
     'remotion',
 ];
-const getVersion = async (p) => {
+const getVersion = async (remotionRoot, p) => {
     try {
-        const remotionPkgJson = (0, resolve_from_1.resolveFrom)(process.cwd(), `${p}/package.json`);
+        const remotionPkgJson = (0, resolve_from_1.resolveFrom)(remotionRoot, `${p}/package.json`);
         const file = await fs_1.default.promises.readFile(remotionPkgJson, 'utf-8');
         const packageJson = JSON.parse(file);
         return packageJson.version;
@@ -44,12 +45,12 @@ const groupBy = (vals) => {
     }
     return groups;
 };
-const getAllVersions = async () => {
-    return (await Promise.all(packages.map(async (p) => [p, await getVersion(p)]))).filter(([, version]) => version);
+const getAllVersions = async (remotionRoot) => {
+    return (await Promise.all(packages.map(async (p) => [p, await getVersion(remotionRoot, p)]))).filter(([, version]) => version);
 };
 exports.VERSIONS_COMMAND = 'versions';
-const validateVersionsBeforeCommand = async () => {
-    const versions = await getAllVersions();
+const validateVersionsBeforeCommand = async (remotionRoot) => {
+    const versions = await getAllVersions(remotionRoot);
     const grouped = groupBy(versions);
     const installedVersions = Object.keys(grouped);
     if (installedVersions.length === 1) {
@@ -72,16 +73,16 @@ const validateVersionsBeforeCommand = async () => {
     log_1.Log.warn('To resolve:');
     log_1.Log.warn('- Make sure your package.json has all Remotion packages pointing to the same version.');
     log_1.Log.warn('- Remove the `^` character in front of a version to pin a package.');
-    if (!remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose')) {
+    if (!renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose')) {
         log_1.Log.warn('- Run `npx remotion versions --log=verbose` to see the path of the modules resolved.');
     }
     log_1.Log.warn('-------------');
     log_1.Log.info();
 };
 exports.validateVersionsBeforeCommand = validateVersionsBeforeCommand;
-const versionsCommand = async () => {
+const versionsCommand = async (remotionRoot) => {
     (0, parse_command_line_1.parseCommandLine)('versions');
-    const versions = await getAllVersions();
+    const versions = await getAllVersions(remotionRoot);
     const grouped = groupBy(versions);
     const installedVersions = Object.keys(grouped);
     log_1.Log.info(`Node.JS = ${process.version}, OS = ${process.platform}`);
@@ -90,7 +91,7 @@ const versionsCommand = async () => {
         log_1.Log.info(`On version: ${version}`);
         for (const pkg of grouped[version]) {
             log_1.Log.info(`- ${pkg}`);
-            log_1.Log.verbose(`  ${(0, resolve_from_1.resolveFrom)(process.cwd(), `${pkg}/package.json`)}`);
+            log_1.Log.verbose(`  ${(0, resolve_from_1.resolveFrom)(remotionRoot, `${pkg}/package.json`)}`);
         }
         log_1.Log.info();
     }
@@ -101,7 +102,7 @@ const versionsCommand = async () => {
         log_1.Log.error('Version mismatch: Not all Remotion packages have the same version.');
         log_1.Log.info('- Make sure your package.json has all Remotion packages pointing to the same version.');
         log_1.Log.info('- Remove the `^` character in front of a version to pin a package.');
-        if (!remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose')) {
+        if (!renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'verbose')) {
             log_1.Log.info('- Rerun this command with --log=verbose to see the path of the modules resolved.');
         }
         process.exit(1);

package/dist/webpack-cache.d.ts

@@ -6,7 +6,7 @@ declare global {
         }
     }
 }
-export declare const clearCache: (environment: Environment, inputProps: object | null) => Promise<void>;
+export declare const clearCache: (remotionRoot: string, environment: Environment, inputProps: object | null) => Promise<void>;
 export declare const getWebpackCacheName: (environment: Environment, inputProps: object | null) => string;
-export declare const cacheExists: (environment: Environment, inputProps: object | null) => boolean;
+export declare const cacheExists: (remotionRoot: string, 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 = () => {
-    const cwd = process.cwd();
-    let dir = cwd;
+const getWebpackCacheDir = (remotionRoot) => {
+    let dir = remotionRoot;
     for (;;) {
         try {
             if (fs_1.default.statSync(path_1.default.join(dir, 'package.json')).isFile()) {
@@ -28,7 +28,7 @@ const getWebpackCacheDir = () => {
         dir = parent;
     }
     if (!dir) {
-        return path_1.default.resolve(cwd, '.cache/webpack');
+        return path_1.default.resolve(remotionRoot, '.cache/webpack');
     }
     if (process.versions.pnp === '1') {
         return path_1.default.resolve(dir, '.pnp/.cache/webpack');
@@ -38,12 +38,12 @@ const getWebpackCacheDir = () => {
     }
     return path_1.default.resolve(dir, 'node_modules/.cache/webpack');
 };
-const remotionCacheLocation = (environment, inputProps) => {
-    return path_1.default.join(getWebpackCacheDir(), (0, exports.getWebpackCacheName)(environment, inputProps));
+const remotionCacheLocation = (remotionRoot, environment, inputProps) => {
+    return path_1.default.join(getWebpackCacheDir(remotionRoot), (0, exports.getWebpackCacheName)(environment, inputProps));
 };
-const clearCache = (environment, inputProps) => {
+const clearCache = (remotionRoot, environment, inputProps) => {
     var _a;
-    return ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(remotionCacheLocation(environment, inputProps), {
+    return ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(remotionCacheLocation(remotionRoot, environment, inputProps), {
         recursive: true,
     });
 };
@@ -60,7 +60,7 @@ const getWebpackCacheName = (environment, inputProps) => {
     return `remotion-v3-${environment}`;
 };
 exports.getWebpackCacheName = getWebpackCacheName;
-const cacheExists = (environment, inputProps) => {
-    return fs_1.default.existsSync(remotionCacheLocation(environment, inputProps));
+const cacheExists = (remotionRoot, environment, inputProps) => {
+    return fs_1.default.existsSync(remotionCacheLocation(remotionRoot, environment, inputProps));
 };
 exports.cacheExists = cacheExists;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.1.6",
+	"version": "3.1.7",
 	"description": "CLI for Remotion",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -23,15 +23,15 @@
 	"author": "Jonny Burger <jonny@remotion.dev>",
 	"license": "SEE LICENSE IN LICENSE.md",
 	"dependencies": {
-		"@remotion/bundler": "3.1.6",
-		"@remotion/media-utils": "3.1.6",
-		"@remotion/player": "3.1.6",
-		"@remotion/renderer": "3.1.6",
+		"@remotion/bundler": "3.1.7",
+		"@remotion/media-utils": "3.1.7",
+		"@remotion/player": "3.1.7",
+		"@remotion/renderer": "3.1.7",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
-		"remotion": "3.1.6",
+		"remotion": "3.1.7",
 		"semver": "7.3.5",
 		"source-map": "0.6.1",
 		"vitest": "^0.18.0"
@@ -71,5 +71,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "188460243a533e1511b3f83fa8c77cd4c445553d"
+	"gitHead": "599379fef6043a7125d1979766f915580ec1cf77"
 }