@remotion/bundler 3.1.2 → 3.1.5

package/dist/bundle.d.ts

@@ -1,7 +1,11 @@
 import type { WebpackOverrideFn } from 'remotion';
-export declare const bundle: (entryPoint: string, onProgressUpdate?: ((progress: number) => void) | undefined, options?: {
+import webpack from 'webpack';
+declare type Options = {
     webpackOverride?: WebpackOverrideFn;
     outDir?: string;
     enableCaching?: boolean;
     publicPath?: string;
-}) => Promise<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 {};

package/dist/bundle.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bundle = void 0;
+exports.bundle = exports.getConfig = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -34,24 +34,28 @@ const trimTrailingSlash = (p) => {
     }
     return p;
 };
+const getConfig = (outDir, entryPoint, 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,
+        onProgressUpdate,
+        enableCaching: (_b = options === null || options === void 0 ? void 0 : options.enableCaching) !== null && _b !== void 0 ? _b : remotion_1.Internals.DEFAULT_WEBPACK_CACHE_ENABLED,
+        maxTimelineTracks: 15,
+        // For production, the variables are set dynamically
+        envVariables: {},
+        entryPoints: [],
+    });
+};
+exports.getConfig = getConfig;
 const bundle = async (entryPoint, onProgressUpdate, options) => {
-    var _a, _b, _c, _d;
+    var _a, _b;
     const outDir = await prepareOutDir((_a = options === null || options === void 0 ? void 0 : options.outDir) !== null && _a !== void 0 ? _a : null);
-    const output = await promisified([
-        (0, webpack_config_1.webpackConfig)({
-            entry,
-            userDefinedComponent: entryPoint,
-            outDir,
-            environment: 'production',
-            webpackOverride: (_b = options === null || options === void 0 ? void 0 : options.webpackOverride) !== null && _b !== void 0 ? _b : remotion_1.Internals.defaultOverrideFunction,
-            onProgressUpdate,
-            enableCaching: (_c = options === null || options === void 0 ? void 0 : options.enableCaching) !== null && _c !== void 0 ? _c : remotion_1.Internals.DEFAULT_WEBPACK_CACHE_ENABLED,
-            maxTimelineTracks: 15,
-            // For production, the variables are set dynamically
-            envVariables: {},
-            entryPoints: [],
-        }),
-    ]);
+    const [, config] = (0, exports.getConfig)(outDir, entryPoint, onProgressUpdate, options);
+    const output = await promisified([config]);
     if (!output) {
         throw new Error('Expected webpack output');
     }
@@ -59,7 +63,7 @@ const bundle = async (entryPoint, onProgressUpdate, options) => {
     if (errors !== undefined && errors.length > 0) {
         throw new Error(errors[0].message + '\n' + errors[0].details);
     }
-    const baseDir = (_d = options === null || options === void 0 ? void 0 : options.publicPath) !== null && _d !== void 0 ? _d : '/';
+    const baseDir = (_b = options === null || options === void 0 ? void 0 : options.publicPath) !== null && _b !== void 0 ? _b : '/';
     const publicDir = '/' +
         [trimTrailingSlash(trimLeadingSlash(baseDir)), 'public']
             .filter(Boolean)

package/dist/index.d.ts

@@ -13,10 +13,16 @@ export declare const BundlerInternals: {
         envVariables: Record<string, string>;
         maxTimelineTracks: number;
         entryPoints: string[];
-    }) => webpack.Configuration;
+    }) => [string, webpack.Configuration];
     indexHtml: (staticHash: string, baseDir: string, editorName: string | null, inputProps: object | null) => string;
-    cacheExists: (environment: "development" | "production") => boolean;
-    clearCache: (environment: "development" | "production") => Promise<void>;
+    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 { webpack };

package/dist/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpack = exports.bundle = exports.BundlerInternals = void 0;
+const bundle_1 = require("./bundle");
 const index_html_1 = require("./index-html");
 const webpack_cache_1 = require("./webpack-cache");
 const webpack_config_1 = require("./webpack-config");
@@ -13,6 +14,7 @@ exports.BundlerInternals = {
     indexHtml: index_html_1.indexHtml,
     cacheExists: webpack_cache_1.cacheExists,
     clearCache: webpack_cache_1.clearCache,
+    getConfig: bundle_1.getConfig,
 };
-var bundle_1 = require("./bundle");
-Object.defineProperty(exports, "bundle", { enumerable: true, get: function () { return bundle_1.bundle; } });
+var bundle_2 = require("./bundle");
+Object.defineProperty(exports, "bundle", { enumerable: true, get: function () { return bundle_2.bundle; } });

package/dist/webpack-cache.d.ts

@@ -1,4 +1,5 @@
 declare type Environment = 'development' | 'production';
+declare type CacheState = 'exists' | 'other-exists' | 'does-not-exist';
 declare global {
     namespace NodeJS {
         interface ProcessVersions {
@@ -6,7 +7,7 @@ declare global {
         }
     }
 }
-export declare const clearCache: (environment: Environment) => Promise<void>;
-export declare const getWebpackCacheName: (environment: Environment) => string;
-export declare const cacheExists: (environment: Environment) => boolean;
+export declare const clearCache: () => Promise<void>;
+export declare const getWebpackCacheName: (environment: Environment, hash: string) => string;
+export declare const cacheExists: (environment: Environment, hash: string) => CacheState;
 export {};

package/dist/webpack-cache.js

@@ -37,26 +37,47 @@ const getWebpackCacheDir = () => {
     }
     return path_1.default.resolve(dir, 'node_modules/.cache/webpack');
 };
-const remotionCacheLocation = (environment) => {
-    return path_1.default.join(getWebpackCacheDir(), (0, exports.getWebpackCacheName)(environment));
+const remotionCacheLocation = (environment, hash) => {
+    return path_1.default.join(getWebpackCacheDir(), (0, exports.getWebpackCacheName)(environment, hash));
 };
-const clearCache = (environment) => {
+const clearCache = () => {
     var _a;
-    return ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(remotionCacheLocation(environment), {
+    return ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(getWebpackCacheDir(), {
         recursive: true,
     });
 };
 exports.clearCache = clearCache;
-const getWebpackCacheName = (environment) => {
+const getPrefix = (environment) => {
+    return `remotion-v4-${environment}`;
+};
+const getWebpackCacheName = (environment, hash) => {
     if (environment === 'development') {
-        return `remotion-v3-${environment}`;
+        return `${getPrefix(environment)}-${hash}`;
     }
     // In production, the cache is independent from input props because
     // they are passed over URL params. Speed is mostly important in production.
-    return `remotion-v3-${environment}`;
+    return `${getPrefix(environment)}-${hash}`;
 };
 exports.getWebpackCacheName = getWebpackCacheName;
-const cacheExists = (environment) => {
-    return fs_1.default.existsSync(remotionCacheLocation(environment));
+const hasOtherCache = (environment) => {
+    const cacheDir = fs_1.default.readdirSync(getWebpackCacheDir());
+    if (cacheDir.find((c) => {
+        return c.startsWith(getPrefix(environment));
+    })) {
+        return true;
+    }
+    return false;
+};
+const cacheExists = (environment, hash) => {
+    if (fs_1.default.existsSync(remotionCacheLocation(environment, hash))) {
+        return 'exists';
+    }
+    if (!fs_1.default.existsSync(getWebpackCacheDir())) {
+        return 'does-not-exist';
+    }
+    if (hasOtherCache(environment)) {
+        return 'other-exists';
+    }
+    return 'does-not-exist';
 };
 exports.cacheExists = cacheExists;

package/dist/webpack-config.d.ts

@@ -10,4 +10,4 @@ export declare const webpackConfig: ({ entry, userDefinedComponent, outDir, envi
     envVariables: Record<string, string>;
     maxTimelineTracks: number;
     entryPoints: string[];
-}) => WebpackConfiguration;
+}) => [string, WebpackConfiguration];

package/dist/webpack-config.js

@@ -27,6 +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 react_dom_1 = __importDefault(require("react-dom"));
 const remotion_1 = require("remotion");
 const webpack_1 = __importStar(require("webpack"));
@@ -50,7 +51,7 @@ 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, }) => {
-    return webpackOverride({
+    const conf = webpackOverride({
         optimization: {
             minimize: false,
         },
@@ -65,12 +66,6 @@ const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpa
             aggregateTimeout: 0,
             ignored: ['**/.git/**', '**/node_modules/**'],
         },
-        cache: enableCaching
-            ? {
-                type: 'filesystem',
-                name: (0, webpack_cache_1.getWebpackCacheName)(environment),
-            }
-            : false,
         devtool: environment === 'development'
             ? 'cheap-module-source-map'
             : 'cheap-module-source-map',
@@ -108,7 +103,6 @@ const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpa
             hashFunction: 'xxhash64',
             globalObject: 'this',
             filename: 'bundle.js',
-            path: outDir,
             devtoolModuleFilenameTemplate: '[resource-path]',
             assetModuleFilename: environment === 'development' ? '[path][name][ext]' : '[hash][ext]',
         },
@@ -173,5 +167,23 @@ const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpa
             ],
         },
     });
+    const hash = (0, crypto_1.createHash)('md5').update(JSON.stringify(conf)).digest('hex');
+    return [
+        hash,
+        {
+            ...conf,
+            cache: enableCaching
+                ? {
+                    type: 'filesystem',
+                    name: (0, webpack_cache_1.getWebpackCacheName)(environment, hash),
+                    version: hash,
+                }
+                : false,
+            output: {
+                ...conf.output,
+                path: outDir,
+            },
+        },
+    ];
 };
 exports.webpackConfig = webpackConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/bundler",
-	"version": "3.1.2",
+	"version": "3.1.5",
 	"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.2",
+		"remotion": "3.1.5",
 		"style-loader": "2.0.0",
 		"webpack": "5.72.0"
 	},
@@ -63,5 +63,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "7ac5f5675a7390cc776265c667d382149dee9814"
+	"gitHead": "965ca68bd4efce9ca5e27fe30c4a31aec594575c"
 }