@remotion/cli 4.0.102 → 4.0.104

package/LICENSE.md

@@ -7,7 +7,7 @@ Depending on the type of your legal entity, you are granted permission to use Re
 
 ## Free license
 
-Copyright © 2023 [Remotion](https://www.remotion.dev)
+Copyright © 2024 [Remotion](https://www.remotion.dev)
 
 ### Eligibility
 

package/dist/benchmark.js

@@ -127,6 +127,8 @@ const benchmarkCommand = async (remotionRoot, args, logLevel) => {
         quietProgress: false,
         quietFlag: (0, parse_command_line_1.quietFlagProvided)(),
         outDir: null,
+        // Not needed for benchmark
+        gitSource: null,
     });
     (0, cleanup_before_quit_1.registerCleanupJob)(() => cleanupBundle());
     const puppeteerInstance = await browserInstance;

package/dist/bundle.js

@@ -11,6 +11,7 @@ const path_1 = __importDefault(require("path"));
 const chalk_1 = require("./chalk");
 const entry_point_1 = require("./entry-point");
 const get_cli_options_1 = require("./get-cli-options");
+const get_github_repository_1 = require("./get-github-repository");
 const log_1 = require("./log");
 const parse_command_line_1 = require("./parse-command-line");
 const setup_cache_1 = require("./setup-cache");
@@ -42,7 +43,7 @@ const bundleCommand = async (remotionRoot, args, logLevel) => {
     const outputPath = parse_command_line_1.parsedCli['out-dir']
         ? path_1.default.resolve(process.cwd(), parse_command_line_1.parsedCli['out-dir'])
         : path_1.default.join(remotionRoot, 'build');
-    const gitignoreFolder = bundler_1.BundlerInternals.findClosestFolderWithFile(outputPath, '.gitignore');
+    const gitignoreFolder = bundler_1.BundlerInternals.findClosestFolderWithItem(outputPath, '.gitignore');
     const existed = (0, fs_1.existsSync)(outputPath);
     if (existed) {
         const existsIndexHtml = (0, fs_1.existsSync)(path_1.default.join(outputPath, 'index.html'));
@@ -55,6 +56,7 @@ const bundleCommand = async (remotionRoot, args, logLevel) => {
         }
         (0, fs_1.rmSync)(outputPath, { recursive: true });
     }
+    const gitSource = (0, get_github_repository_1.getGitSource)(remotionRoot);
     const output = await (0, setup_cache_1.bundleOnCli)({
         fullPath: file,
         logLevel,
@@ -80,6 +82,7 @@ const bundleCommand = async (remotionRoot, args, logLevel) => {
         },
         quietFlag: (0, parse_command_line_1.quietFlagProvided)(),
         outDir: outputPath,
+        gitSource,
     });
     log_1.Log.infoAdvanced({ indent: false, logLevel }, chalk_1.chalk.blue(`${existed ? '○' : '+'} ${output}`));
     if (!gitignoreFolder) {

package/dist/compositions.js

@@ -41,6 +41,8 @@ const listCompositionsCommand = async (remotionRoot, args, logLevel) => {
         quietProgress: false,
         quietFlag: (0, parse_command_line_1.quietFlagProvided)(),
         outDir: null,
+        // Not needed for compositions
+        gitSource: null,
     });
     (0, cleanup_before_quit_1.registerCleanupJob)(() => cleanupBundle());
     const compositions = await renderer_1.RenderInternals.internalGetCompositions({

package/dist/ffmpeg.d.ts

@@ -1,2 +1,13 @@
+import type { LogLevel } from '@remotion/renderer';
+export declare const dynamicLibEnv: (indent: boolean, logLevel: LogLevel) => {
+    DYLD_LIBRARY_PATH: string;
+    RUST_BACKTRACE: string;
+} | {
+    PATH: string;
+    RUST_BACKTRACE: string;
+} | {
+    LD_LIBRARY_PATH: string;
+    RUST_BACKTRACE: string;
+};
 export declare const ffmpegCommand: (_root: string, args: string[]) => never;
 export declare const ffprobeCommand: (_root: string, args: string[]) => never;

package/dist/ffmpeg.js

@@ -1,10 +1,32 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ffprobeCommand = exports.ffmpegCommand = void 0;
+exports.ffprobeCommand = exports.ffmpegCommand = exports.dynamicLibEnv = void 0;
 const renderer_1 = require("@remotion/renderer");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
+const node_path_1 = __importDefault(require("node:path"));
 const config_1 = require("./config");
+const dynamicLibEnv = (indent, logLevel) => {
+    const lib = node_path_1.default.dirname(renderer_1.RenderInternals.getExecutablePath('compositor', indent, logLevel));
+    return {
+        RUST_BACKTRACE: 'full',
+        ...(process.platform === 'darwin'
+            ? {
+                DYLD_LIBRARY_PATH: lib,
+            }
+            : process.platform === 'win32'
+                ? {
+                    PATH: `${lib};${process.env.PATH}`,
+                }
+                : {
+                    LD_LIBRARY_PATH: lib,
+                }),
+    };
+};
+exports.dynamicLibEnv = dynamicLibEnv;
 const ffmpegCommand = (_root, args) => {
     const logLevel = config_1.ConfigInternals.Logging.getLogLevel();
     const binary = renderer_1.RenderInternals.getExecutablePath('ffmpeg', false, logLevel);
@@ -12,8 +34,8 @@ const ffmpegCommand = (_root, args) => {
         (0, node_fs_1.chmodSync)(binary, 0o755);
     }
     const done = (0, node_child_process_1.spawnSync)(binary, args, {
-        ...renderer_1.RenderInternals.dynamicLibraryPathOptions(false, logLevel),
         stdio: 'inherit',
+        env: (0, exports.dynamicLibEnv)(false, logLevel),
     });
     process.exit(done.status);
 };
@@ -25,8 +47,9 @@ const ffprobeCommand = (_root, args) => {
         (0, node_fs_1.chmodSync)(binary, 0o755);
     }
     const done = (0, node_child_process_1.spawnSync)(binary, args, {
-        ...renderer_1.RenderInternals.dynamicLibraryPathOptions(false, logLevel),
+        cwd: node_path_1.default.dirname(binary),
         stdio: 'inherit',
+        env: (0, exports.dynamicLibEnv)(false, logLevel),
     });
     process.exit(done.status);
 };

package/dist/get-github-repository.d.ts

@@ -0,0 +1,14 @@
+import type { GitSource } from '@remotion/studio';
+export type ParsedGitRemote = {
+    type: 'github';
+    org: string;
+    name: string;
+};
+export declare const getGitConfig: (remotionRoot: string) => string | null;
+export declare const getGitRemoteOrigin: (gitConfig: string) => {
+    remote: string;
+    url: string | null;
+} | null;
+export declare const normalizeGitRemoteUrl: (url: string) => ParsedGitRemote | null;
+export declare const getGifRef: () => string | null;
+export declare const getGitSource: (remotionRoot: string | null) => GitSource | null;

package/dist/get-github-repository.js

@@ -0,0 +1,141 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGitSource = exports.getGifRef = exports.normalizeGitRemoteUrl = exports.getGitRemoteOrigin = exports.getGitConfig = void 0;
+const bundler_1 = require("@remotion/bundler");
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+const getGitRemotes = (lines) => {
+    const sections = [];
+    let open = false;
+    for (const line of lines) {
+        if (line.startsWith('[')) {
+            if (line.startsWith('[remote')) {
+                open = true;
+                sections.push([line]);
+            }
+            else {
+                open = false;
+            }
+        }
+        else if (open) {
+            sections[sections.length - 1].push(line);
+        }
+    }
+    return sections.map((s) => {
+        const url = s.find((l) => l.trimStart().startsWith('url = '));
+        return {
+            remote: s[0].replace('[remote "', '').replace('"]', ''),
+            url: url ? url.replace('url = ', '').trim() : null,
+        };
+    });
+};
+const getGitConfig = (remotionRoot) => {
+    const gitFolder = bundler_1.BundlerInternals.findClosestFolderWithItem(remotionRoot, '.git');
+    if (!gitFolder) {
+        return null;
+    }
+    const gitConfig = path_1.default.join(gitFolder, '.git', 'config');
+    if (!(0, fs_1.existsSync)(gitConfig)) {
+        return null;
+    }
+    return gitConfig;
+};
+exports.getGitConfig = getGitConfig;
+const getGitRemoteOrigin = (gitConfig) => {
+    const contents = (0, fs_1.readFileSync)(gitConfig, 'utf-8');
+    const lines = contents.split('\n');
+    const remotes = getGitRemotes(lines);
+    const origin = remotes.find((r) => r.remote === 'origin');
+    return origin !== null && origin !== void 0 ? origin : null;
+};
+exports.getGitRemoteOrigin = getGitRemoteOrigin;
+const normalizeGitRemoteUrl = (url) => {
+    if (url.startsWith('git@github.com')) {
+        const matched = url.match(/git@github.com:(.*)\/(.*)\.git/);
+        if (matched) {
+            return {
+                type: 'github',
+                name: matched[2],
+                org: matched[1],
+            };
+        }
+    }
+    const gitHubMatch = url.match(/https:\/\/github.com\/(.*)\/(.*)\.git/);
+    if (gitHubMatch) {
+        return {
+            type: 'github',
+            name: gitHubMatch[2],
+            org: gitHubMatch[1],
+        };
+    }
+    const gitHubMatchWithoutGit = url.match(/https:\/\/github.com\/(.*)\/(.*)/);
+    if (gitHubMatchWithoutGit) {
+        return {
+            type: 'github',
+            name: gitHubMatchWithoutGit[2],
+            org: gitHubMatchWithoutGit[1],
+        };
+    }
+    return null;
+};
+exports.normalizeGitRemoteUrl = normalizeGitRemoteUrl;
+const getGifRef = () => {
+    try {
+        return (0, child_process_1.execSync)('git rev-parse --abbrev-ref HEAD').toString('utf-8').trim();
+    }
+    catch (err) {
+        return null;
+    }
+};
+exports.getGifRef = getGifRef;
+const getFromEnvVariables = () => {
+    const { VERCEL_GIT_PROVIDER, VERCEL_GIT_COMMIT_SHA, VERCEL_GIT_REPO_OWNER, VERCEL_GIT_REPO_SLUG, } = process.env;
+    if (VERCEL_GIT_COMMIT_SHA &&
+        VERCEL_GIT_REPO_OWNER &&
+        VERCEL_GIT_REPO_SLUG &&
+        VERCEL_GIT_PROVIDER === 'github') {
+        return {
+            name: VERCEL_GIT_REPO_SLUG,
+            org: VERCEL_GIT_REPO_OWNER,
+            ref: VERCEL_GIT_COMMIT_SHA,
+            type: 'github',
+            relativeFromGitRoot: '',
+        };
+    }
+    return null;
+};
+const getGitSource = (remotionRoot) => {
+    if (remotionRoot === null) {
+        return getFromEnvVariables();
+    }
+    const ref = (0, exports.getGifRef)();
+    if (!ref) {
+        return null;
+    }
+    const gitConfig = (0, exports.getGitConfig)(remotionRoot);
+    if (!gitConfig) {
+        return null;
+    }
+    const origin = (0, exports.getGitRemoteOrigin)(gitConfig);
+    if (!origin || !origin.url) {
+        return null;
+    }
+    const parsed = (0, exports.normalizeGitRemoteUrl)(origin.url);
+    if (!parsed) {
+        return null;
+    }
+    const gitRoot = path_1.default.dirname(path_1.default.dirname(gitConfig));
+    const relativeFromGitRoot = path_1.default.relative(gitRoot, remotionRoot);
+    return {
+        name: parsed.name,
+        org: parsed.org,
+        ref,
+        type: 'github',
+        relativeFromGitRoot,
+    };
+};
+exports.getGitSource = getGitSource;

package/dist/render-flows/render.js

@@ -120,6 +120,8 @@ const renderVideoFlow = async ({ remotionRoot, fullEntryPoint, indent, logLevel,
         quietProgress: updatesDontOverwrite,
         quietFlag: (0, parse_command_line_1.quietFlagProvided)(),
         outDir: null,
+        // Not needed for render
+        gitSource: null,
     });
     addCleanupCallback(() => cleanupBundle());
     const onDownload = (0, make_on_download_1.makeOnDownload)({

package/dist/render-flows/still.js

@@ -84,6 +84,8 @@ const renderStillFlow = async ({ remotionRoot, fullEntryPoint, entryPointReason,
         quietProgress: updatesDontOverwrite,
         quietFlag: (0, parse_command_line_1.quietFlagProvided)(),
         outDir: null,
+        // Not needed for still
+        gitSource: null,
     });
     const server = await renderer_1.RenderInternals.prepareServer({
         concurrency: 1,

package/dist/setup-cache.d.ts

@@ -1,6 +1,7 @@
 import type { LogLevel } from '@remotion/renderer';
+import type { GitSource } from '@remotion/studio';
 import type { BundlingState, CopyingState } from '@remotion/studio-server';
-export declare const bundleOnCliOrTakeServeUrl: ({ fullPath, remotionRoot, publicDir, onProgress, indentOutput, logLevel, bundlingStep, steps, onDirectoryCreated, quietProgress, quietFlag, outDir, }: {
+export declare const bundleOnCliOrTakeServeUrl: ({ fullPath, remotionRoot, publicDir, onProgress, indentOutput, logLevel, bundlingStep, steps, onDirectoryCreated, quietProgress, quietFlag, outDir, gitSource, }: {
     fullPath: string;
     remotionRoot: string;
     publicDir: string | null;
@@ -16,11 +17,12 @@ export declare const bundleOnCliOrTakeServeUrl: ({ fullPath, remotionRoot, publi
     quietProgress: boolean;
     quietFlag: boolean;
     outDir: string | null;
+    gitSource: GitSource | null;
 }) => Promise<{
     urlOrBundle: string;
     cleanup: () => void;
 }>;
-export declare const bundleOnCli: ({ fullPath, remotionRoot, publicDir, onProgressCallback, indent, logLevel, bundlingStep, steps, onDirectoryCreated, quietProgress, quietFlag, outDir, }: {
+export declare const bundleOnCli: ({ fullPath, remotionRoot, publicDir, onProgressCallback, indent, logLevel, bundlingStep, steps, onDirectoryCreated, quietProgress, quietFlag, outDir, gitSource, }: {
     fullPath: string;
     remotionRoot: string;
     publicDir: string | null;
@@ -36,4 +38,5 @@ export declare const bundleOnCli: ({ fullPath, remotionRoot, publicDir, onProgre
     quietProgress: boolean;
     quietFlag: boolean;
     outDir: string | null;
+    gitSource: GitSource | null;
 }) => Promise<string>;

package/dist/setup-cache.js

@@ -7,7 +7,7 @@ const config_1 = require("./config");
 const log_1 = require("./log");
 const progress_bar_1 = require("./progress-bar");
 const should_use_non_overlaying_logger_1 = require("./should-use-non-overlaying-logger");
-const bundleOnCliOrTakeServeUrl = async ({ fullPath, remotionRoot, publicDir, onProgress, indentOutput, logLevel, bundlingStep, steps, onDirectoryCreated, quietProgress, quietFlag, outDir, }) => {
+const bundleOnCliOrTakeServeUrl = async ({ fullPath, remotionRoot, publicDir, onProgress, indentOutput, logLevel, bundlingStep, steps, onDirectoryCreated, quietProgress, quietFlag, outDir, gitSource, }) => {
     if (renderer_1.RenderInternals.isServeUrl(fullPath)) {
         onProgress({
             bundling: {
@@ -37,6 +37,7 @@ const bundleOnCliOrTakeServeUrl = async ({ fullPath, remotionRoot, publicDir, on
         quietProgress,
         quietFlag,
         outDir,
+        gitSource,
     });
     return {
         urlOrBundle: bundled,
@@ -44,7 +45,7 @@ const bundleOnCliOrTakeServeUrl = async ({ fullPath, remotionRoot, publicDir, on
     };
 };
 exports.bundleOnCliOrTakeServeUrl = bundleOnCliOrTakeServeUrl;
-const bundleOnCli = async ({ fullPath, remotionRoot, publicDir, onProgressCallback, indent, logLevel, bundlingStep, steps, onDirectoryCreated, quietProgress, quietFlag, outDir, }) => {
+const bundleOnCli = async ({ fullPath, remotionRoot, publicDir, onProgressCallback, indent, logLevel, bundlingStep, steps, onDirectoryCreated, quietProgress, quietFlag, outDir, gitSource, }) => {
     var _a;
     const shouldCache = config_1.ConfigInternals.getWebpackCaching();
     const symlinkState = {
@@ -133,6 +134,7 @@ const bundleOnCli = async ({ fullPath, remotionRoot, publicDir, onProgressCallba
         },
         onDirectoryCreated,
         outDir: outDir !== null && outDir !== void 0 ? outDir : undefined,
+        gitSource,
         ...options,
     });
     bundlingState = {

package/dist/studio.js

@@ -7,6 +7,7 @@ const number_of_shared_audio_tags_1 = require("./config/number-of-shared-audio-t
 const convert_entry_point_to_serve_url_1 = require("./convert-entry-point-to-serve-url");
 const entry_point_1 = require("./entry-point");
 const get_env_1 = require("./get-env");
+const get_github_repository_1 = require("./get-github-repository");
 const get_input_props_1 = require("./get-input-props");
 const get_render_defaults_1 = require("./get-render-defaults");
 const log_1 = require("./log");
@@ -54,6 +55,7 @@ const studioCommand = async (remotionRoot, args, logLevel) => {
     }, logLevel);
     const maxTimelineTracks = config_1.ConfigInternals.getMaxTimelineTracks();
     const keyboardShortcutsEnabled = config_1.ConfigInternals.getKeyboardShortcutsEnabled();
+    const gitSource = (0, get_github_repository_1.getGitSource)(remotionRoot);
     await studio_server_1.StudioServerInternals.startStudio({
         previewEntry: require.resolve('@remotion/studio/entry'),
         browserArgs: parse_command_line_1.parsedCli['browser-args'],
@@ -81,6 +83,7 @@ const studioCommand = async (remotionRoot, args, logLevel) => {
         // Minimist quirk: Adding `--no-open` flag will result in {['no-open']: false, open: true}
         // @ts-expect-error
         parsedCliOpen: parse_command_line_1.parsedCli.open,
+        gitSource,
     });
 };
 exports.studioCommand = studioCommand;

package/dist/upgrade.js

@@ -13,7 +13,7 @@ const log_1 = require("./log");
 const getUpgradeCommand = ({ manager, packages, version, }) => {
     const pkgList = packages.map((p) => `${p}@${version}`);
     const commands = {
-        npm: ['i', '--save-exact', ...pkgList],
+        npm: ['i', '--save-exact', '--no-fund', '--no-audit', ...pkgList],
         pnpm: ['i', '--save-exact', ...pkgList],
         yarn: ['add', '--exact', ...pkgList],
         bun: ['i', ...pkgList],
@@ -52,6 +52,7 @@ const upgrade = async (remotionRoot, packageManager, version) => {
         packages: toUpgrade,
         version: targetVersion,
     }), {
+        env: { ...process.env, ADBLOCK: '1', DISABLE_OPENCOLLECTIVE: '1' },
         stdio: 'inherit',
     });
     if (renderer_1.RenderInternals.isEqualOrBelowLogLevel(config_1.ConfigInternals.Logging.getLogLevel(), 'info')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/cli",
-  "version": "4.0.102",
+  "version": "4.0.104",
   "description": "CLI for Remotion",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -31,13 +31,13 @@
     "dotenv": "9.0.2",
     "minimist": "1.2.6",
     "prompts": "2.4.2",
-    "@remotion/bundler": "4.0.102",
-    "@remotion/media-utils": "4.0.102",
-    "@remotion/renderer": "4.0.102",
-    "@remotion/player": "4.0.102",
-    "@remotion/studio-server": "4.0.102",
-    "@remotion/studio": "4.0.102",
-    "remotion": "4.0.102"
+    "@remotion/bundler": "4.0.104",
+    "@remotion/media-utils": "4.0.104",
+    "@remotion/player": "4.0.104",
+    "@remotion/renderer": "4.0.104",
+    "@remotion/studio-server": "4.0.104",
+    "@remotion/studio": "4.0.104",
+    "remotion": "4.0.104"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -62,8 +62,8 @@
     "react-dom": "18.2.0",
     "vitest": "0.31.1",
     "zod": "^3.22.3",
-    "@remotion/zod-types": "4.0.102",
-    "@remotion/tailwind": "4.0.102"
+    "@remotion/zod-types": "4.0.104",
+    "@remotion/tailwind": "4.0.104"
   },
   "keywords": [
     "remotion",