@remotion/bundler 4.0.0-alpha4 → 4.0.0-alpha6

package/dist/bundle.d.ts

@@ -1,5 +1,5 @@
-import type { WebpackOverrideFn } from 'remotion';
 import webpack from 'webpack';
+import type { WebpackOverrideFn } from './webpack-config';
 export declare type LegacyBundleOptions = {
     webpackOverride?: WebpackOverrideFn;
     outDir?: string;
@@ -21,6 +21,7 @@ export declare type BundleOptions = {
     entryPoint: string;
     onProgress?: (progress: number) => void;
     ignoreRegisterRootWarning?: boolean;
+    onDirectoryCreated?: (dir: string) => void;
 } & LegacyBundleOptions;
 declare type Arguments = [options: BundleOptions] | [
     entryPoint: string,

package/dist/bundle.js

@@ -27,23 +27,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bundle = exports.getConfig = void 0;
-const fs_1 = __importStar(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const util_1 = require("util");
+const node_fs_1 = __importStar(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
+const node_util_1 = require("node:util");
+const node_worker_threads_1 = require("node:worker_threads");
 const webpack_1 = __importDefault(require("webpack"));
-const worker_threads_1 = require("worker_threads");
 const copy_dir_1 = require("./copy-dir");
 const index_html_1 = require("./index-html");
 const read_recursively_1 = require("./read-recursively");
 const webpack_config_1 = require("./webpack-config");
-const promisified = (0, util_1.promisify)(webpack_1.default);
+const promisified = (0, node_util_1.promisify)(webpack_1.default);
 const prepareOutDir = async (specified) => {
     if (specified) {
-        await fs_1.default.promises.mkdir(specified, { recursive: true });
+        await node_fs_1.default.promises.mkdir(specified, { recursive: true });
         return specified;
     }
-    return fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'remotion-webpack-bundle-'));
+    return node_fs_1.default.promises.mkdtemp(node_path_1.default.join(node_os_1.default.tmpdir(), 'remotion-webpack-bundle-'));
 };
 const trimLeadingSlash = (p) => {
     if (p.startsWith('/')) {
@@ -68,7 +68,7 @@ const getConfig = ({ entryPoint, outDir, resolvedRemotionRoot, onProgress, optio
         webpackOverride: (_a = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _a !== void 0 ? _a : ((f) => f),
         onProgress,
         enableCaching: (_b = options === null || options === void 0 ? void 0 : options.enableCaching) !== null && _b !== void 0 ? _b : true,
-        maxTimelineTracks: 15,
+        maxTimelineTracks: 90,
         // For production, the variables are set dynamically
         envVariables: {},
         entryPoints: [],
@@ -100,17 +100,17 @@ const recursionLimit = 5;
 const findClosestPackageJsonFolder = (currentDir) => {
     let possiblePackageJson = '';
     for (let i = 0; i < recursionLimit; i++) {
-        possiblePackageJson = path_1.default.join(currentDir, 'package.json');
-        const exists = fs_1.default.existsSync(possiblePackageJson);
+        possiblePackageJson = node_path_1.default.join(currentDir, 'package.json');
+        const exists = node_fs_1.default.existsSync(possiblePackageJson);
         if (exists) {
-            return path_1.default.dirname(possiblePackageJson);
+            return node_path_1.default.dirname(possiblePackageJson);
         }
-        currentDir = path_1.default.dirname(currentDir);
+        currentDir = node_path_1.default.dirname(currentDir);
     }
     return null;
 };
 const validateEntryPoint = async (entryPoint) => {
-    const contents = await fs_1.promises.readFile(entryPoint, 'utf8');
+    const contents = await node_fs_1.promises.readFile(entryPoint, 'utf8');
     if (!contents.includes('registerRoot')) {
         throw new Error([
             `You passed ${entryPoint} as your entry point, but this file does not contain "registerRoot".`,
@@ -125,19 +125,20 @@ const validateEntryPoint = async (entryPoint) => {
  * @see [Documentation](https://www.remotion.dev/docs/bundle)
  */
 async function bundle(...args) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const actualArgs = convertArgumentsIntoOptions(args);
-    const entryPoint = path_1.default.resolve(process.cwd(), actualArgs.entryPoint);
+    const entryPoint = node_path_1.default.resolve(process.cwd(), actualArgs.entryPoint);
     const resolvedRemotionRoot = (_b = (_a = actualArgs === null || actualArgs === void 0 ? void 0 : actualArgs.rootDir) !== null && _a !== void 0 ? _a : findClosestPackageJsonFolder(entryPoint)) !== null && _b !== void 0 ? _b : process.cwd();
     if (!actualArgs.ignoreRegisterRootWarning) {
         await validateEntryPoint(entryPoint);
     }
     const outDir = await prepareOutDir((_c = actualArgs === null || actualArgs === void 0 ? void 0 : actualArgs.outDir) !== null && _c !== void 0 ? _c : null);
+    (_d = actualArgs.onDirectoryCreated) === null || _d === void 0 ? void 0 : _d.call(actualArgs, outDir);
     // The config might use an override which might use
     // `process.cwd()`. The context should always be the Remotion root.
     // This is not supported in worker threads (used for tests)
     const currentCwd = process.cwd();
-    if (worker_threads_1.isMainThread) {
+    if (node_worker_threads_1.isMainThread) {
         process.chdir(resolvedRemotionRoot);
     }
     const { onProgress, ...options } = actualArgs;
@@ -149,7 +150,7 @@ async function bundle(...args) {
         options,
     });
     const output = await promisified([config]);
-    if (worker_threads_1.isMainThread) {
+    if (node_worker_threads_1.isMainThread) {
         process.chdir(currentCwd);
     }
     if (!output) {
@@ -159,21 +160,21 @@ async function bundle(...args) {
     if (errors !== undefined && errors.length > 0) {
         throw new Error(errors[0].message + '\n' + errors[0].details);
     }
-    const baseDir = (_d = actualArgs === null || actualArgs === void 0 ? void 0 : actualArgs.publicPath) !== null && _d !== void 0 ? _d : '/';
+    const baseDir = (_e = actualArgs === null || actualArgs === void 0 ? void 0 : actualArgs.publicPath) !== null && _e !== void 0 ? _e : '/';
     const staticHash = '/' +
         [trimTrailingSlash(trimLeadingSlash(baseDir)), 'public']
             .filter(Boolean)
             .join('/');
     const from = (options === null || options === void 0 ? void 0 : options.publicDir)
-        ? path_1.default.resolve(resolvedRemotionRoot, options.publicDir)
-        : path_1.default.join(resolvedRemotionRoot, 'public');
-    const to = path_1.default.join(outDir, 'public');
+        ? node_path_1.default.resolve(resolvedRemotionRoot, options.publicDir)
+        : node_path_1.default.join(resolvedRemotionRoot, 'public');
+    const to = node_path_1.default.join(outDir, 'public');
     let symlinkWarningShown = false;
     const showSymlinkWarning = (ent, src) => {
         if (symlinkWarningShown) {
             return;
         }
-        const absolutePath = path_1.default.join(src, ent.name);
+        const absolutePath = node_path_1.default.join(src, ent.name);
         if (options.onSymlinkDetected) {
             options.onSymlinkDetected(absolutePath);
             return;
@@ -181,12 +182,13 @@ async function bundle(...args) {
         symlinkWarningShown = true;
         console.warn(`\nFound a symbolic link in the public folder (${absolutePath}). The symlink will be forwarded into the bundle.`);
     };
-    if (fs_1.default.existsSync(from)) {
+    if (node_fs_1.default.existsSync(from)) {
         await (0, copy_dir_1.copyDir)({
             src: from,
             dest: to,
             onSymlinkDetected: showSymlinkWarning,
             onProgress: (prog) => { var _a; return (_a = options.onPublicDirCopyProgress) === null || _a === void 0 ? void 0 : _a.call(options, prog); },
+            copied: 0,
         });
     }
     const html = (0, index_html_1.indexHtml)({
@@ -196,6 +198,7 @@ async function bundle(...args) {
         inputProps: null,
         remotionRoot: resolvedRemotionRoot,
         previewServerCommand: null,
+        renderQueue: null,
         numberOfAudioTags: 0,
         publicFiles: (0, read_recursively_1.readRecursively)({
             folder: '.',
@@ -205,8 +208,9 @@ async function bundle(...args) {
         }),
         includeFavicon: false,
         title: 'Remotion Bundle',
+        renderDefaults: undefined,
     });
-    fs_1.default.writeFileSync(path_1.default.join(outDir, 'index.html'), html);
+    node_fs_1.default.writeFileSync(node_path_1.default.join(outDir, 'index.html'), html);
     return outDir;
 }
 exports.bundle = bundle;

package/dist/copy-dir.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="node" />
-import fs from 'fs';
-export declare function copyDir({ src, dest, onSymlinkDetected, onProgress, }: {
+import fs from 'node:fs';
+export declare function copyDir({ src, dest, onSymlinkDetected, onProgress, copied, }: {
     src: string;
     dest: string;
     onSymlinkDetected: (entry: fs.Dirent, dir: string) => void;
     onProgress: (bytes: number) => void;
+    copied: number;
 }): Promise<void>;

package/dist/copy-dir.js

@@ -4,32 +4,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyDir = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-async function copyDir({ src, dest, onSymlinkDetected, onProgress, }) {
-    await fs_1.default.promises.mkdir(dest, { recursive: true });
-    const entries = await fs_1.default.promises.readdir(src, { withFileTypes: true });
-    let copied = 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+async function copyDir({ src, dest, onSymlinkDetected, onProgress, copied = 0, }) {
+    await node_fs_1.default.promises.mkdir(dest, { recursive: true });
+    const entries = await node_fs_1.default.promises.readdir(src, { withFileTypes: true });
     for (const entry of entries) {
-        const srcPath = path_1.default.join(src, entry.name);
-        const destPath = path_1.default.join(dest, entry.name);
+        const srcPath = node_path_1.default.join(src, entry.name);
+        const destPath = node_path_1.default.join(dest, entry.name);
         if (entry.isDirectory()) {
             await copyDir({
                 src: srcPath,
                 dest: destPath,
                 onSymlinkDetected,
                 onProgress,
+                copied,
             });
         }
         else if (entry.isSymbolicLink()) {
-            const realpath = await fs_1.default.promises.realpath(srcPath);
+            const realpath = await node_fs_1.default.promises.realpath(srcPath);
             onSymlinkDetected(entry, src);
-            await fs_1.default.promises.symlink(realpath, destPath);
+            await node_fs_1.default.promises.symlink(realpath, destPath);
         }
         else {
             const [, { size }] = await Promise.all([
-                fs_1.default.promises.copyFile(srcPath, destPath),
-                fs_1.default.promises.stat(srcPath),
+                node_fs_1.default.promises.copyFile(srcPath, destPath),
+                node_fs_1.default.promises.stat(srcPath),
             ]);
             copied += size;
             onProgress(copied);

package/dist/esbuild-loader/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const esbuild_1 = require("esbuild");
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const isTsExtensionPtrn = /\.ts$/i;
 const isTypescriptInstalled = () => {
     try {
@@ -21,7 +21,7 @@ async function ESBuildLoader(source) {
     this.getOptions();
     const options = this.getOptions();
     const { implementation, ...esbuildTransformOptions } = options;
-    const tsConfigPath = path_1.default.join(this.context, 'tsconfig.json');
+    const tsConfigPath = node_path_1.default.join(this.context, 'tsconfig.json');
     if (implementation && typeof implementation.transform !== 'function') {
         done(new TypeError(`esbuild-loader: options.implementation.transform must be an ESBuild transform function. Received ${typeof implementation.transform}`));
         return;

package/dist/index-html.d.ts

@@ -1,5 +1,35 @@
 import type { StaticFile } from 'remotion';
-export declare const indexHtml: ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, previewServerCommand, numberOfAudioTags, publicFiles, includeFavicon, title, }: {
+export declare type RenderDefaults = {
+    jpegQuality: number;
+    scale: number;
+    logLevel: string;
+    codec: string;
+    concurrency: number;
+    minConcurrency: number;
+    muted: boolean;
+    maxConcurrency: number;
+    stillImageFormat: 'png' | 'jpeg' | 'webp' | 'pdf';
+    videoImageFormat: 'png' | 'jpeg' | 'none';
+    audioCodec: string | null;
+    enforceAudioTrack: boolean;
+    proResProfile: string;
+    pixelFormat: string;
+    audioBitrate: string | null;
+    videoBitrate: string | null;
+    everyNthFrame: number;
+    numberOfGifLoops: number | null;
+    delayRenderTimeout: number;
+    disableWebSecurity: boolean;
+    openGlRenderer: string | null;
+    ignoreCertificateErrors: boolean;
+    headless: boolean;
+};
+declare global {
+    interface Window {
+        remotion_renderDefaults: RenderDefaults | undefined;
+    }
+}
+export declare const indexHtml: ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, previewServerCommand, renderQueue, numberOfAudioTags, publicFiles, includeFavicon, title, renderDefaults, }: {
     staticHash: string;
     baseDir: string;
     editorName: string | null;
@@ -7,8 +37,10 @@ export declare const indexHtml: ({ baseDir, editorName, inputProps, envVariables
     envVariables?: Record<string, string> | undefined;
     remotionRoot: string;
     previewServerCommand: string | null;
+    renderQueue: unknown | null;
     numberOfAudioTags: number;
     publicFiles: StaticFile[];
     includeFavicon: boolean;
     title: string;
+    renderDefaults: RenderDefaults | undefined;
 }) => string;

package/dist/index-html.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.indexHtml = void 0;
-const path_1 = __importDefault(require("path"));
-const indexHtml = ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, previewServerCommand, numberOfAudioTags, publicFiles, includeFavicon, title, }) => `
+const node_path_1 = __importDefault(require("node:path"));
+const indexHtml = ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, previewServerCommand, renderQueue, numberOfAudioTags, publicFiles, includeFavicon, title, renderDefaults, }) => `
 <!DOCTYPE html>
 <html lang="en">
 	<head>
@@ -25,12 +25,17 @@ ${includeFavicon
 		${editorName
     ? `<script>window.remotion_editorName = "${editorName}";</script>`
     : '<script>window.remotion_editorName = null;</script>'}
-		<script>window.remotion_projectName = ${JSON.stringify(path_1.default.basename(remotionRoot))};</script>
+		<script>window.remotion_projectName = ${JSON.stringify(node_path_1.default.basename(remotionRoot))};</script>
+		<script>window.remotion_renderDefaults = ${JSON.stringify(renderDefaults)};</script>
 		<script>window.remotion_cwd = ${JSON.stringify(remotionRoot)};</script>
 		<script>window.remotion_previewServerCommand = ${previewServerCommand ? JSON.stringify(previewServerCommand) : 'null'};</script>
 		${inputProps
     ? `<script>window.remotion_inputProps = ${JSON.stringify(JSON.stringify(inputProps))};</script>
 			`
+    : ''}
+		${renderQueue
+    ? `<script>window.remotion_initialRenderQueue = ${JSON.stringify(renderQueue)};</script>
+			`
     : ''}
 		${envVariables
     ? `<script> window.process = {

package/dist/index.d.ts

@@ -7,7 +7,7 @@ export declare const BundlerInternals: {
         userDefinedComponent: string;
         outDir: string | null;
         environment: "development" | "production";
-        webpackOverride: import("remotion").WebpackOverrideFn;
+        webpackOverride: import("./webpack-config").WebpackOverrideFn;
         onProgress?: ((f: number) => void) | undefined;
         enableCaching?: boolean | undefined;
         envVariables: Record<string, string>;
@@ -17,7 +17,7 @@ export declare const BundlerInternals: {
         remotionRoot: string;
         poll: number | null;
     }) => [string, webpack.Configuration];
-    indexHtml: ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, previewServerCommand, numberOfAudioTags, publicFiles, includeFavicon, title, }: {
+    indexHtml: ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, previewServerCommand, renderQueue, numberOfAudioTags, publicFiles, includeFavicon, title, renderDefaults, }: {
         staticHash: string;
         baseDir: string;
         editorName: string | null;
@@ -25,10 +25,12 @@ export declare const BundlerInternals: {
         envVariables?: Record<string, string> | undefined;
         remotionRoot: string;
         previewServerCommand: string | null;
+        renderQueue: unknown;
         numberOfAudioTags: number;
         publicFiles: import("remotion").StaticFile[];
         includeFavicon: boolean;
         title: string;
+        renderDefaults: import("./index-html").RenderDefaults | undefined;
     }) => string;
     cacheExists: (remotionRoot: string, environment: "development" | "production", hash: string) => "exists" | "other-exists" | "does-not-exist";
     clearCache: (remotionRoot: string) => Promise<void>;
@@ -47,6 +49,6 @@ export declare const BundlerInternals: {
         limit: number;
     }) => import("remotion").StaticFile[];
 };
-export { WebpackConfiguration, WebpackOverrideFn } from 'remotion';
 export { bundle, BundleOptions, LegacyBundleOptions } from './bundle';
+export { WebpackConfiguration, WebpackOverrideFn } from './webpack-config';
 export { webpack };

package/dist/optional-dependencies.d.ts

@@ -0,0 +1,6 @@
+import type { Compiler } from 'webpack';
+export declare const OPTIONAL_DEPENDENCIES: string[];
+export declare class AllowOptionalDependenciesPlugin {
+    filter(error: Error): boolean;
+    apply(compiler: Compiler): void;
+}

package/dist/optional-dependencies.js

@@ -0,0 +1,22 @@
+"use strict";
+// When Webpack cannot resolve these dependencies, it will not print an error message.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AllowOptionalDependenciesPlugin = exports.OPTIONAL_DEPENDENCIES = void 0;
+exports.OPTIONAL_DEPENDENCIES = ['zod', '@remotion/zod-types'];
+class AllowOptionalDependenciesPlugin {
+    filter(error) {
+        for (const dependency of exports.OPTIONAL_DEPENDENCIES) {
+            if (error.message.includes(`Can't resolve '${dependency}'`)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    apply(compiler) {
+        compiler.hooks.afterEmit.tap('AllowOptionalDependenciesPlugin', (compilation) => {
+            compilation.errors = compilation.errors.filter(this.filter);
+            compilation.warnings = compilation.warnings.filter(this.filter);
+        });
+    }
+}
+exports.AllowOptionalDependenciesPlugin = AllowOptionalDependenciesPlugin;

package/dist/read-recursively.js

@@ -27,14 +27,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readRecursively = void 0;
-const fs_1 = __importStar(require("fs"));
-const path_1 = __importDefault(require("path"));
+const node_fs_1 = __importStar(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const readRecursively = ({ folder, output = [], startPath, staticHash, limit, }) => {
-    const absFolder = path_1.default.join(startPath, folder);
-    if (!fs_1.default.existsSync(absFolder)) {
+    const absFolder = node_path_1.default.join(startPath, folder);
+    if (!node_fs_1.default.existsSync(absFolder)) {
         return [];
     }
-    const files = fs_1.default.readdirSync(absFolder);
+    const files = node_fs_1.default.readdirSync(absFolder);
     for (const file of files) {
         if (output.length >= limit) {
             break;
@@ -42,11 +42,11 @@ const readRecursively = ({ folder, output = [], startPath, staticHash, limit, })
         if (file.startsWith('.DS_Store')) {
             continue;
         }
-        const stat = (0, fs_1.statSync)(path_1.default.join(absFolder, file));
+        const stat = (0, node_fs_1.statSync)(node_path_1.default.join(absFolder, file));
         if (stat.isDirectory()) {
             (0, exports.readRecursively)({
                 startPath,
-                folder: path_1.default.join(folder, file),
+                folder: node_path_1.default.join(folder, file),
                 output,
                 staticHash,
                 limit,
@@ -54,15 +54,15 @@ const readRecursively = ({ folder, output = [], startPath, staticHash, limit, })
         }
         else if (stat.isFile()) {
             output.push({
-                name: path_1.default.join(folder, file),
+                name: node_path_1.default.join(folder, file),
                 lastModified: Math.floor(stat.mtimeMs),
                 sizeInBytes: stat.size,
-                src: staticHash + '/' + path_1.default.join(folder, file),
+                src: staticHash + '/' + node_path_1.default.join(folder, file),
             });
         }
         else if (stat.isSymbolicLink()) {
-            const realpath = fs_1.default.realpathSync(path_1.default.join(folder, file));
-            const realStat = fs_1.default.statSync(realpath);
+            const realpath = node_fs_1.default.realpathSync(node_path_1.default.join(folder, file));
+            const realStat = node_fs_1.default.statSync(realpath);
             if (realStat.isFile()) {
                 output.push({
                     name: realpath,

package/dist/setup-environment.js

@@ -16,4 +16,54 @@ remotion_1.Internals.CSSUtils.injectCSS(`
     font-size: 15px;
     line-height: 1.25;
   }
+
+  .__remotion-info-button-container code {
+    font-family: monospace;
+    font-size: 14px;
+    color: #0584f2
+  }
+
+  .__remotion-vertical-scrollbar::-webkit-scrollbar {
+      width: 6px;
+  }
+  .__remotion-vertical-scrollbar::-webkit-scrollbar-thumb {
+    background-color: rgba(0, 0, 0, 0.0);
+  }
+  .__remotion-vertical-scrollbar:hover::-webkit-scrollbar-thumb {
+    background-color: rgba(0, 0, 0, 0.6);
+  }
+  .__remotion-vertical-scrollbar:hover::-webkit-scrollbar-thumb:hover {
+    background-color: rgba(0, 0, 0, 1);
+  }
+
+  .__remotion-horizontal-scrollbar::-webkit-scrollbar {
+    height: 6px;
+  }
+  .__remotion-horizontal-scrollbar::-webkit-scrollbar-thumb {
+    background-color: rgba(0, 0, 0, 0.0);
+  }
+  .__remotion-horizontal-scrollbar:hover::-webkit-scrollbar-thumb {
+    background-color: rgba(0, 0, 0, 0.6);
+  }
+  .__remotion-horizontal-scrollbar:hover::-webkit-scrollbar-thumb:hover {
+    background-color: rgba(0, 0, 0, 1);
+  }
+
+  .__remotion-timeline-slider {
+    appearance: none;
+    width: 100px;
+    border-radius: 3px;
+    height: 6px;
+    background-color: rgba(255, 255, 255, 0.1);
+    accent-color: #ffffff;
+  }
+  
+  .__remotion-timeline-slider::-moz-range-thumb {
+    width: 14px;
+    height: 14px;
+    border-radius: 50%;
+    background-color: #ffffff;
+    appearance: none;
+  }
+
 `);

package/dist/test/validate-public-dir.test.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const vitest_1 = require("vitest");
 const validate_public_dir_1 = require("../validate-public-dir");
 (0, vitest_1.describe)('validatePublicDir()', () => {
     (0, vitest_1.test)('Should not allow root directory as public dir.', () => {
-        (0, vitest_1.expect)(() => (0, validate_public_dir_1.validatePublicDir)(path_1.default.parse(process.cwd()).root)).toThrow(/which is the root directory. This is not allowed./);
+        (0, vitest_1.expect)(() => (0, validate_public_dir_1.validatePublicDir)(node_path_1.default.parse(process.cwd()).root)).toThrow(/which is the root directory. This is not allowed./);
     });
     (0, vitest_1.test)('Should not allow a path where the parent directory does not exist', () => {
         const pathToPass = process.platform === 'win32' ? 'C:\\foo\\bar' : '/foo/bar';

package/dist/validate-public-dir.js

@@ -4,15 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePublicDir = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const validatePublicDir = (p) => {
-    const { root } = path_1.default.parse(process.cwd());
+    const { root } = node_path_1.default.parse(process.cwd());
     if (p === root) {
         throw new Error(`The public directory was specified as "${p}", which is the root directory. This is not allowed.`);
     }
     try {
-        const stat = fs_1.default.lstatSync(p);
+        const stat = node_fs_1.default.lstatSync(p);
         if (!stat.isDirectory()) {
             throw new Error(`The public directory was specified as "${p}", and while this path exists on the filesystem, it is not a directory.`);
         }
@@ -20,8 +20,8 @@ const validatePublicDir = (p) => {
     catch (e) {
         // Path does not exist
         // Check if the parent path exists
-        const parentPath = path_1.default.dirname(p);
-        const exists = fs_1.default.existsSync(parentPath);
+        const parentPath = node_path_1.default.dirname(p);
+        const exists = node_fs_1.default.existsSync(parentPath);
         if (!exists) {
             throw new Error(`The public directory was specified as "${p}", but this folder does not exist and the parent directory "${parentPath}" does also not exist. Create at least the parent directory.`);
         }

package/dist/webpack-cache.js

@@ -4,21 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 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"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 // 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;
     for (;;) {
         try {
-            if (fs_1.default.statSync(path_1.default.join(dir, 'package.json')).isFile()) {
+            if (node_fs_1.default.statSync(node_path_1.default.join(dir, 'package.json')).isFile()) {
                 break;
             }
             // eslint-disable-next-line no-empty
         }
         catch (e) { }
-        const parent = path_1.default.dirname(dir);
+        const parent = node_path_1.default.dirname(dir);
         if (dir === parent) {
             dir = undefined;
             break;
@@ -26,22 +26,21 @@ const getWebpackCacheDir = (remotionRoot) => {
         dir = parent;
     }
     if (!dir) {
-        return path_1.default.resolve(remotionRoot, '.cache/webpack');
+        return node_path_1.default.resolve(remotionRoot, '.cache/webpack');
     }
     if (process.versions.pnp === '1') {
-        return path_1.default.resolve(dir, '.pnp/.cache/webpack');
+        return node_path_1.default.resolve(dir, '.pnp/.cache/webpack');
     }
     if (process.versions.pnp === '3') {
-        return path_1.default.resolve(dir, '.yarn/.cache/webpack');
+        return node_path_1.default.resolve(dir, '.yarn/.cache/webpack');
     }
-    return path_1.default.resolve(dir, 'node_modules/.cache/webpack');
+    return node_path_1.default.resolve(dir, 'node_modules/.cache/webpack');
 };
 const remotionCacheLocation = (remotionRoot, environment, hash) => {
-    return path_1.default.join(getWebpackCacheDir(remotionRoot), (0, exports.getWebpackCacheName)(environment, hash));
+    return node_path_1.default.join(getWebpackCacheDir(remotionRoot), (0, exports.getWebpackCacheName)(environment, hash));
 };
 const clearCache = (remotionRoot) => {
-    var _a;
-    return ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(getWebpackCacheDir(remotionRoot), {
+    return node_fs_1.default.promises.rm(getWebpackCacheDir(remotionRoot), {
         recursive: true,
     });
 };
@@ -59,7 +58,7 @@ const getWebpackCacheName = (environment, hash) => {
 };
 exports.getWebpackCacheName = getWebpackCacheName;
 const hasOtherCache = ({ remotionRoot, environment, }) => {
-    const cacheDir = fs_1.default.readdirSync(getWebpackCacheDir(remotionRoot));
+    const cacheDir = node_fs_1.default.readdirSync(getWebpackCacheDir(remotionRoot));
     if (cacheDir.find((c) => {
         return c.startsWith(getPrefix(environment));
     })) {
@@ -68,10 +67,10 @@ const hasOtherCache = ({ remotionRoot, environment, }) => {
     return false;
 };
 const cacheExists = (remotionRoot, environment, hash) => {
-    if (fs_1.default.existsSync(remotionCacheLocation(remotionRoot, environment, hash))) {
+    if (node_fs_1.default.existsSync(remotionCacheLocation(remotionRoot, environment, hash))) {
         return 'exists';
     }
-    if (!fs_1.default.existsSync(getWebpackCacheDir(remotionRoot))) {
+    if (!node_fs_1.default.existsSync(getWebpackCacheDir(remotionRoot))) {
         return 'does-not-exist';
     }
     if (hasOtherCache({ remotionRoot, environment })) {

package/dist/webpack-config.d.ts

@@ -1,4 +1,6 @@
-import type { WebpackConfiguration, WebpackOverrideFn } from 'remotion';
+import type { Configuration } from 'webpack';
+export declare type WebpackConfiguration = Configuration;
+export declare type WebpackOverrideFn = (currentConfiguration: WebpackConfiguration) => WebpackConfiguration;
 export declare const webpackConfig: ({ entry, userDefinedComponent, outDir, environment, webpackOverride, onProgress, enableCaching, envVariables, maxTimelineTracks, entryPoints, remotionRoot, keyboardShortcutsEnabled, poll, }: {
     entry: string;
     userDefinedComponent: string;

package/dist/webpack-config.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackConfig = void 0;
-const crypto_1 = require("crypto");
+const node_crypto_1 = require("node:crypto");
 const react_dom_1 = __importDefault(require("react-dom"));
 const remotion_1 = require("remotion");
 const webpack_1 = __importStar(require("webpack"));
@@ -35,6 +35,7 @@ const fast_refresh_1 = require("./fast-refresh");
 const stringify_with_circular_references_1 = require("./stringify-with-circular-references");
 const webpack_cache_1 = require("./webpack-cache");
 const esbuild = require("esbuild");
+const optional_dependencies_1 = require("./optional-dependencies");
 if (!react_dom_1.default || !react_dom_1.default.version) {
     throw new Error('Could not find "react-dom" package. Did you install it?');
 }
@@ -92,6 +93,7 @@ const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpa
                     'process.env.KEYBOARD_SHORTCUTS_ENABLED': keyboardShortcutsEnabled,
                     [`process.env.${remotion_1.Internals.ENV_VARIABLES_ENV_NAME}`]: JSON.stringify(envVariables),
                 }),
+                new optional_dependencies_1.AllowOptionalDependenciesPlugin(),
             ]
             : [
                 new webpack_1.ProgressPlugin((p) => {
@@ -99,10 +101,10 @@ const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpa
                         onProgress(Number((p * 100).toFixed(2)));
                     }
                 }),
+                new optional_dependencies_1.AllowOptionalDependenciesPlugin(),
             ],
         output: {
             hashFunction: 'xxhash64',
-            globalObject: 'this',
             filename: 'bundle.js',
             devtoolModuleFilenameTemplate: '[resource-path]',
             assetModuleFilename: environment === 'development' ? '[path][name][ext]' : '[hash][ext]',
@@ -168,7 +170,7 @@ const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpa
             ],
         },
     });
-    const hash = (0, crypto_1.createHash)('md5')
+    const hash = (0, node_crypto_1.createHash)('md5')
         .update((0, stringify_with_circular_references_1.jsonStringifyWithCircularReferences)(conf))
         .digest('hex');
     return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/bundler",
-  "version": "4.0.0-alpha4",
+  "version": "4.0.0-alpha6",
   "description": "Bundler for Remotion",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -20,7 +20,7 @@
     "css-loader": "5.2.7",
     "esbuild": "0.16.12",
     "react-refresh": "0.9.0",
-    "remotion": "4.0.0-alpha4",
+    "remotion": "4.0.0-alpha6",
     "style-loader": "2.0.0",
     "webpack": "5.76.1"
   },