@remotion/bundler 3.1.6 → 3.1.7

package/dist/bundle.d.ts

@@ -1,11 +1,17 @@
 import type { WebpackOverrideFn } from 'remotion';
 import webpack from 'webpack';
-declare type Options = {
+export declare type BundleOptions = {
     webpackOverride?: WebpackOverrideFn;
     outDir?: string;
     enableCaching?: boolean;
     publicPath?: string;
+    rootDir?: string;
 };
-export declare const getConfig: (outDir: string, entryPoint: string, onProgressUpdate?: ((progress: number) => void) | undefined, options?: Options) => [string, webpack.Configuration];
-export declare const bundle: (entryPoint: string, onProgressUpdate?: ((progress: number) => void) | undefined, options?: Options) => Promise<string>;
-export {};
+export declare const getConfig: ({ entryPoint, outDir, resolvedRemotionRoot, onProgressUpdate, options, }: {
+    outDir: string;
+    entryPoint: string;
+    resolvedRemotionRoot: string;
+    onProgressUpdate?: ((progress: number) => void) | undefined;
+    options?: BundleOptions | undefined;
+}) => [string, webpack.Configuration];
+export declare const bundle: (entryPoint: string, onProgressUpdate?: ((progress: number) => void) | undefined, options?: BundleOptions) => Promise<string>;

package/dist/bundle.js

@@ -7,9 +7,9 @@ exports.bundle = exports.getConfig = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-const remotion_1 = require("remotion");
 const util_1 = require("util");
 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 webpack_config_1 = require("./webpack-config");
@@ -34,28 +34,46 @@ const trimTrailingSlash = (p) => {
     }
     return p;
 };
-const getConfig = (outDir, entryPoint, onProgressUpdate, options) => {
+const getConfig = ({ entryPoint, outDir, resolvedRemotionRoot, onProgressUpdate, options, }) => {
     var _a, _b;
     return (0, webpack_config_1.webpackConfig)({
         entry,
         userDefinedComponent: entryPoint,
         outDir,
         environment: 'production',
-        webpackOverride: (_a = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _a !== void 0 ? _a : remotion_1.Internals.defaultOverrideFunction,
+        webpackOverride: (_a = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _a !== void 0 ? _a : ((f) => f),
         onProgressUpdate,
-        enableCaching: (_b = options === null || options === void 0 ? void 0 : options.enableCaching) !== null && _b !== void 0 ? _b : remotion_1.Internals.DEFAULT_WEBPACK_CACHE_ENABLED,
+        enableCaching: (_b = options === null || options === void 0 ? void 0 : options.enableCaching) !== null && _b !== void 0 ? _b : true,
         maxTimelineTracks: 15,
         // For production, the variables are set dynamically
         envVariables: {},
         entryPoints: [],
+        remotionRoot: resolvedRemotionRoot,
     });
 };
 exports.getConfig = getConfig;
 const bundle = async (entryPoint, onProgressUpdate, options) => {
-    var _a, _b;
-    const outDir = await prepareOutDir((_a = options === null || options === void 0 ? void 0 : options.outDir) !== null && _a !== void 0 ? _a : null);
-    const [, config] = (0, exports.getConfig)(outDir, entryPoint, onProgressUpdate, options);
+    var _a, _b, _c;
+    const resolvedRemotionRoot = (_a = options === null || options === void 0 ? void 0 : options.rootDir) !== null && _a !== void 0 ? _a : process.cwd();
+    const outDir = await prepareOutDir((_b = options === null || options === void 0 ? void 0 : options.outDir) !== null && _b !== void 0 ? _b : null);
+    // 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) {
+        process.chdir(resolvedRemotionRoot);
+    }
+    const [, config] = (0, exports.getConfig)({
+        outDir,
+        entryPoint,
+        resolvedRemotionRoot,
+        onProgressUpdate,
+        options,
+    });
     const output = await promisified([config]);
+    if (worker_threads_1.isMainThread) {
+        process.chdir(currentCwd);
+    }
     if (!output) {
         throw new Error('Expected webpack output');
     }
@@ -63,17 +81,24 @@ const bundle = async (entryPoint, onProgressUpdate, options) => {
     if (errors !== undefined && errors.length > 0) {
         throw new Error(errors[0].message + '\n' + errors[0].details);
     }
-    const baseDir = (_b = options === null || options === void 0 ? void 0 : options.publicPath) !== null && _b !== void 0 ? _b : '/';
-    const publicDir = '/' +
+    const baseDir = (_c = options === null || options === void 0 ? void 0 : options.publicPath) !== null && _c !== void 0 ? _c : '/';
+    const staticHash = '/' +
         [trimTrailingSlash(trimLeadingSlash(baseDir)), 'public']
             .filter(Boolean)
             .join('/');
-    const from = path_1.default.join(process.cwd(), 'public');
+    // TODO: Unhardcode public directory
+    const from = path_1.default.join(resolvedRemotionRoot, 'public');
     const to = path_1.default.join(outDir, 'public');
     if (fs_1.default.existsSync(from)) {
         await (0, copy_dir_1.copyDir)(from, to);
     }
-    const html = (0, index_html_1.indexHtml)(publicDir, baseDir, null, null);
+    const html = (0, index_html_1.indexHtml)({
+        staticHash,
+        baseDir,
+        editorName: null,
+        inputProps: null,
+        remotionRoot: resolvedRemotionRoot,
+    });
     fs_1.default.writeFileSync(path_1.default.join(outDir, 'index.html'), html);
     return outDir;
 };

package/dist/esbuild-loader/index.js

@@ -5,7 +5,6 @@ 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 tsConfigPath = path_1.default.join(process.cwd(), 'tsconfig.json');
 const isTsExtensionPtrn = /\.ts$/i;
 const isTypescriptInstalled = () => {
     try {
@@ -22,6 +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');
     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 +1,7 @@
-export declare const indexHtml: (staticHash: string, baseDir: string, editorName: string | null, inputProps: object | null) => string;
+export declare const indexHtml: ({ baseDir, editorName, inputProps, staticHash, remotionRoot, }: {
+    staticHash: string;
+    baseDir: string;
+    editorName: string | null;
+    inputProps: object | null;
+    remotionRoot: string;
+}) => string;

package/dist/index-html.js

@@ -5,7 +5,7 @@ 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 = (staticHash, baseDir, editorName, inputProps) => `
+const indexHtml = ({ baseDir, editorName, inputProps, staticHash, remotionRoot, }) => `
 <!DOCTYPE html>
 <html lang="en">
 	<head>
@@ -22,8 +22,8 @@ const indexHtml = (staticHash, baseDir, editorName, inputProps) => `
 		${editorName
     ? `<script>window.remotion_editorName = "${editorName}";</script>`
     : '<script>window.remotion_editorName = null;</script>'}
-		<script>window.remotion_projectName = ${JSON.stringify(path_1.default.basename(process.cwd()))};</script>
-		<script>window.remotion_cwd = ${JSON.stringify(process.cwd())};</script>
+		<script>window.remotion_projectName = ${JSON.stringify(path_1.default.basename(remotionRoot))};</script>
+		<script>window.remotion_cwd = ${JSON.stringify(remotionRoot)};</script>
 		${inputProps
     ? `		<script>window.remotion_inputProps = ${JSON.stringify(JSON.stringify(inputProps))};</script>
 			`

package/dist/index.d.ts

@@ -2,27 +2,36 @@ import esbuild = require('esbuild');
 import webpack = require('webpack');
 export declare const BundlerInternals: {
     esbuild: typeof esbuild;
-    webpackConfig: ({ entry, userDefinedComponent, outDir, environment, webpackOverride, onProgressUpdate, enableCaching, envVariables, maxTimelineTracks, entryPoints, }: {
+    webpackConfig: ({ entry, userDefinedComponent, outDir, environment, webpackOverride, onProgressUpdate, enableCaching, envVariables, maxTimelineTracks, entryPoints, remotionRoot, }: {
         entry: string;
         userDefinedComponent: string;
         outDir: string;
         environment: "development" | "production";
-        webpackOverride: import("remotion").WebpackOverrideFn;
+        webpackOverride: import("remotion/dist/internals").WebpackOverrideFn;
         onProgressUpdate?: ((f: number) => void) | undefined;
         enableCaching?: boolean | undefined;
         envVariables: Record<string, string>;
         maxTimelineTracks: number;
         entryPoints: string[];
+        remotionRoot: string;
+    }) => [string, webpack.Configuration];
+    indexHtml: ({ baseDir, editorName, inputProps, staticHash, remotionRoot, }: {
+        staticHash: string;
+        baseDir: string;
+        editorName: string | null;
+        inputProps: object | null;
+        remotionRoot: string;
+    }) => string;
+    cacheExists: (remotionRoot: string, environment: "development" | "production", hash: string) => "exists" | "other-exists" | "does-not-exist";
+    clearCache: (remotionRoot: string) => Promise<void>;
+    getConfig: ({ entryPoint, outDir, resolvedRemotionRoot, onProgressUpdate, options, }: {
+        outDir: string;
+        entryPoint: string;
+        resolvedRemotionRoot: string;
+        onProgressUpdate?: ((progress: number) => void) | undefined;
+        options?: import("./bundle").BundleOptions | undefined;
     }) => [string, webpack.Configuration];
-    indexHtml: (staticHash: string, baseDir: string, editorName: string | null, inputProps: object | null) => string;
-    cacheExists: (environment: "development" | "production", hash: string) => "exists" | "other-exists" | "does-not-exist";
-    clearCache: () => Promise<void>;
-    getConfig: (outDir: string, entryPoint: string, onProgressUpdate?: ((progress: number) => void) | undefined, options?: {
-        webpackOverride?: import("remotion").WebpackOverrideFn | undefined;
-        outDir?: string | undefined;
-        enableCaching?: boolean | undefined;
-        publicPath?: string | undefined;
-    } | undefined) => [string, webpack.Configuration];
 };
-export { bundle } from './bundle';
+export { bundle, BundleOptions } from './bundle';
 export { webpack };
+export declare type WebpackConfiguration = webpack.Configuration;

package/dist/setup-environment.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const remotion_1 = require("remotion");
 remotion_1.Internals.setupEnvVariables();
-remotion_1.Internals.setupPuppeteerTimeout();
 remotion_1.Internals.CSSUtils.injectCSS(`
   .css-reset * {
     font-size: 16px;

package/dist/webpack-cache.d.ts

@@ -7,7 +7,7 @@ declare global {
         }
     }
 }
-export declare const clearCache: () => Promise<void>;
+export declare const clearCache: (remotionRoot: string) => Promise<void>;
 export declare const getWebpackCacheName: (environment: Environment, hash: string) => string;
-export declare const cacheExists: (environment: Environment, hash: string) => CacheState;
+export declare const cacheExists: (remotionRoot: string, environment: Environment, hash: string) => CacheState;
 export {};

package/dist/webpack-cache.js

@@ -8,9 +8,8 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("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 = () => {
-    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()) {
@@ -27,7 +26,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');
@@ -37,12 +36,12 @@ const getWebpackCacheDir = () => {
     }
     return path_1.default.resolve(dir, 'node_modules/.cache/webpack');
 };
-const remotionCacheLocation = (environment, hash) => {
-    return path_1.default.join(getWebpackCacheDir(), (0, exports.getWebpackCacheName)(environment, hash));
+const remotionCacheLocation = (remotionRoot, environment, hash) => {
+    return path_1.default.join(getWebpackCacheDir(remotionRoot), (0, exports.getWebpackCacheName)(environment, hash));
 };
-const clearCache = () => {
+const clearCache = (remotionRoot) => {
     var _a;
-    return ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(getWebpackCacheDir(), {
+    return ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(getWebpackCacheDir(remotionRoot), {
         recursive: true,
     });
 };
@@ -59,8 +58,8 @@ const getWebpackCacheName = (environment, hash) => {
     return `${getPrefix(environment)}-${hash}`;
 };
 exports.getWebpackCacheName = getWebpackCacheName;
-const hasOtherCache = (environment) => {
-    const cacheDir = fs_1.default.readdirSync(getWebpackCacheDir());
+const hasOtherCache = ({ remotionRoot, environment, }) => {
+    const cacheDir = fs_1.default.readdirSync(getWebpackCacheDir(remotionRoot));
     if (cacheDir.find((c) => {
         return c.startsWith(getPrefix(environment));
     })) {
@@ -68,14 +67,14 @@ const hasOtherCache = (environment) => {
     }
     return false;
 };
-const cacheExists = (environment, hash) => {
-    if (fs_1.default.existsSync(remotionCacheLocation(environment, hash))) {
+const cacheExists = (remotionRoot, environment, hash) => {
+    if (fs_1.default.existsSync(remotionCacheLocation(remotionRoot, environment, hash))) {
         return 'exists';
     }
-    if (!fs_1.default.existsSync(getWebpackCacheDir())) {
+    if (!fs_1.default.existsSync(getWebpackCacheDir(remotionRoot))) {
         return 'does-not-exist';
     }
-    if (hasOtherCache(environment)) {
+    if (hasOtherCache({ remotionRoot, environment })) {
         return 'other-exists';
     }
     return 'does-not-exist';

package/dist/webpack-config.d.ts

@@ -1,5 +1,5 @@
 import type { WebpackConfiguration, WebpackOverrideFn } from 'remotion';
-export declare const webpackConfig: ({ entry, userDefinedComponent, outDir, environment, webpackOverride, onProgressUpdate, enableCaching, envVariables, maxTimelineTracks, entryPoints, }: {
+export declare const webpackConfig: ({ entry, userDefinedComponent, outDir, environment, webpackOverride, onProgressUpdate, enableCaching, envVariables, maxTimelineTracks, entryPoints, remotionRoot, }: {
     entry: string;
     userDefinedComponent: string;
     outDir: string;
@@ -10,4 +10,5 @@ export declare const webpackConfig: ({ entry, userDefinedComponent, outDir, envi
     envVariables: Record<string, string>;
     maxTimelineTracks: number;
     entryPoints: string[];
+    remotionRoot: string;
 }) => [string, WebpackConfiguration];

package/dist/webpack-config.js

@@ -50,7 +50,7 @@ const esbuildLoaderOptions = {
 function truthy(value) {
     return Boolean(value);
 }
-const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpackOverride = (f) => f, onProgressUpdate, enableCaching = remotion_1.Internals.DEFAULT_WEBPACK_CACHE_ENABLED, envVariables, maxTimelineTracks, entryPoints, }) => {
+const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpackOverride = (f) => f, onProgressUpdate, enableCaching = true, envVariables, maxTimelineTracks, entryPoints, remotionRoot, }) => {
     const conf = webpackOverride({
         optimization: {
             minimize: false,
@@ -183,6 +183,7 @@ const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpa
                 ...conf.output,
                 path: outDir,
             },
+            context: remotionRoot,
         },
     ];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/bundler",
-	"version": "3.1.6",
+	"version": "3.1.7",
 	"description": "Bundler for Remotion",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -26,7 +26,7 @@
 		"css-loader": "5.2.7",
 		"esbuild": "0.14.19",
 		"react-refresh": "0.9.0",
-		"remotion": "3.1.6",
+		"remotion": "3.1.7",
 		"style-loader": "2.0.0",
 		"webpack": "5.72.0"
 	},
@@ -63,5 +63,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "188460243a533e1511b3f83fa8c77cd4c445553d"
+	"gitHead": "599379fef6043a7125d1979766f915580ec1cf77"
 }