@remotion/bundler 4.1.0-alpha10 → 4.1.0-alpha12

package/dist/bundle.js

@@ -186,7 +186,7 @@ async function bundle(...args) {
             dest: to,
             onSymlinkDetected: showSymlinkWarning,
             onProgress: (prog) => { var _a; return (_a = options.onPublicDirCopyProgress) === null || _a === void 0 ? void 0 : _a.call(options, prog); },
-            copied: 0,
+            copiedBytes: 0,
             lastReportedProgress: 0,
         });
     }
@@ -208,6 +208,7 @@ async function bundle(...args) {
         includeFavicon: false,
         title: 'Remotion Bundle',
         renderDefaults: undefined,
+        publicFolderExists: baseDir + '/public',
     });
     node_fs_1.default.writeFileSync(node_path_1.default.join(outDir, 'index.html'), html);
     return outDir;

package/dist/copy-dir.d.ts

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

package/dist/copy-dir.js

@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyDir = void 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, lastReportedProgress = 0, }) {
+async function copyDir({ src, dest, onSymlinkDetected, onProgress, copiedBytes = 0, lastReportedProgress = 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 = node_path_1.default.join(src, entry.name);
         const destPath = node_path_1.default.join(dest, entry.name);
         if (entry.isDirectory()) {
-            await copyDir({
+            copiedBytes = await copyDir({
                 src: srcPath,
                 dest: destPath,
                 onSymlinkDetected,
                 onProgress,
-                copied,
+                copiedBytes,
                 lastReportedProgress,
             });
         }
@@ -32,12 +32,13 @@ async function copyDir({ src, dest, onSymlinkDetected, onProgress, copied = 0, l
                 node_fs_1.default.promises.copyFile(srcPath, destPath),
                 node_fs_1.default.promises.stat(srcPath),
             ]);
-            copied += size;
-            if (copied - lastReportedProgress > 1024 * 1024 * 10) {
-                onProgress(copied);
-                lastReportedProgress = copied;
+            copiedBytes += size;
+            if (copiedBytes - lastReportedProgress > 1024 * 1024 * 10) {
+                onProgress(copiedBytes);
+                lastReportedProgress = copiedBytes;
             }
         }
     }
+    return copiedBytes;
 }
 exports.copyDir = copyDir;

package/dist/index-html.d.ts

@@ -29,7 +29,7 @@ declare global {
         remotion_renderDefaults: RenderDefaults | undefined;
     }
 }
-export declare const indexHtml: ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, studioServerCommand, renderQueue, numberOfAudioTags, publicFiles, includeFavicon, title, renderDefaults, }: {
+export declare const indexHtml: ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, studioServerCommand, renderQueue, numberOfAudioTags, publicFiles, includeFavicon, title, renderDefaults, publicFolderExists, }: {
     staticHash: string;
     baseDir: string;
     editorName: string | null;
@@ -40,6 +40,7 @@ export declare const indexHtml: ({ baseDir, editorName, inputProps, envVariables
     renderQueue: unknown | null;
     numberOfAudioTags: number;
     publicFiles: StaticFile[];
+    publicFolderExists: string | null;
     includeFavicon: boolean;
     title: string;
     renderDefaults: RenderDefaults | undefined;

package/dist/index-html.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.indexHtml = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const remotion_1 = require("remotion");
-const indexHtml = ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, studioServerCommand, renderQueue, numberOfAudioTags, publicFiles, includeFavicon, title, renderDefaults, }) => `
+const indexHtml = ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, studioServerCommand, renderQueue, numberOfAudioTags, publicFiles, includeFavicon, title, renderDefaults, publicFolderExists, }) => `
 <!DOCTYPE html>
 <html lang="en">
 	<head>
@@ -45,6 +45,7 @@ ${includeFavicon
 			`
     : ''}
 		<script>window.remotion_staticFiles = ${JSON.stringify(publicFiles)}</script>
+		<script>window.remotion_publicFolderExists = ${publicFolderExists ? `"${publicFolderExists}"` : 'null'};</script>
 		
 		<div id="${remotion_1.Internals.REMOTION_STUDIO_CONTAINER_ELEMENT}"></div>
 		<div id="menuportal-0"></div>

package/dist/index.d.ts

@@ -16,7 +16,7 @@ export declare const BundlerInternals: {
         remotionRoot: string;
         poll: number | null;
     }) => [string, webpack.Configuration];
-    indexHtml: ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, studioServerCommand, renderQueue, numberOfAudioTags, publicFiles, includeFavicon, title, renderDefaults, }: {
+    indexHtml: ({ baseDir, editorName, inputProps, envVariables, staticHash, remotionRoot, studioServerCommand, renderQueue, numberOfAudioTags, publicFiles, includeFavicon, title, renderDefaults, publicFolderExists, }: {
         staticHash: string;
         baseDir: string;
         editorName: string | null;
@@ -27,6 +27,7 @@ export declare const BundlerInternals: {
         renderQueue: unknown;
         numberOfAudioTags: number;
         publicFiles: import("remotion").StaticFile[];
+        publicFolderExists: string | null;
         includeFavicon: boolean;
         title: string;
         renderDefaults: import("./index-html").RenderDefaults | undefined;

package/dist/read-recursively.js

@@ -29,6 +29,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readRecursively = void 0;
 const node_fs_1 = __importStar(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+// There can be symbolic links that point to files that don't exist.
+// https://github.com/remotion-dev/remotion/issues/2587
+const statOrNull = (p) => {
+    try {
+        return (0, node_fs_1.statSync)(p);
+    }
+    catch (err) {
+        return null;
+    }
+};
+const encodeBySplitting = (p) => {
+    // Intentional: split by path.sep, then join by /
+    const splitBySlash = p.split(node_path_1.default.sep);
+    const encodedArray = splitBySlash.map((element) => {
+        return encodeURIComponent(element);
+    });
+    const merged = encodedArray.join('/');
+    return merged;
+};
 const readRecursively = ({ folder, output = [], startPath, staticHash, limit, }) => {
     const absFolder = node_path_1.default.join(startPath, folder);
     if (!node_fs_1.default.existsSync(absFolder)) {
@@ -42,7 +61,10 @@ const readRecursively = ({ folder, output = [], startPath, staticHash, limit, })
         if (file.startsWith('.DS_Store')) {
             continue;
         }
-        const stat = (0, node_fs_1.statSync)(node_path_1.default.join(absFolder, file));
+        const stat = statOrNull(node_path_1.default.join(absFolder, file));
+        if (!stat) {
+            continue;
+        }
         if (stat.isDirectory()) {
             (0, exports.readRecursively)({
                 startPath,
@@ -57,18 +79,21 @@ const readRecursively = ({ folder, output = [], startPath, staticHash, limit, })
                 name: node_path_1.default.join(folder, file),
                 lastModified: Math.floor(stat.mtimeMs),
                 sizeInBytes: stat.size,
-                src: staticHash + '/' + encodeURIComponent(node_path_1.default.join(folder, file)),
+                src: staticHash + '/' + encodeBySplitting(node_path_1.default.join(folder, file)),
             });
         }
         else if (stat.isSymbolicLink()) {
             const realpath = node_fs_1.default.realpathSync(node_path_1.default.join(folder, file));
-            const realStat = node_fs_1.default.statSync(realpath);
+            const realStat = statOrNull(realpath);
+            if (!realStat) {
+                continue;
+            }
             if (realStat.isFile()) {
                 output.push({
                     name: realpath,
                     lastModified: Math.floor(realStat.mtimeMs),
                     sizeInBytes: realStat.size,
-                    src: staticHash + '/' + encodeURIComponent(realpath),
+                    src: staticHash + '/' + encodeBySplitting(realpath),
                 });
             }
         }

package/dist/webpack-config.js

@@ -117,6 +117,7 @@ const webpackConfig = ({ entry, userDefinedComponent, outDir, environment, webpa
             alias: {
                 // Only one version of react
                 'react/jsx-runtime': require.resolve('react/jsx-runtime'),
+                'react/jsx-dev-runtime': require.resolve('react/jsx-dev-runtime'),
                 react: require.resolve('react'),
                 'react-dom/client': shouldUseReactDomClient
                     ? require.resolve('react-dom/client')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/bundler",
-  "version": "4.1.0-alpha10",
+  "version": "4.1.0-alpha12",
   "description": "Bundler for Remotion",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -22,7 +22,7 @@
     "react-refresh": "0.9.0",
     "style-loader": "2.0.0",
     "webpack": "5.83.1",
-    "remotion": "4.1.0-alpha10"
+    "remotion": "4.1.0-alpha12"
   },
   "peerDependencies": {
     "react": ">=16.8.0",

package/dist/json-serialization.d.ts

@@ -1,6 +0,0 @@
-import type { SerializedJSONWithCustomFields } from 'remotion';
-export declare const serializeJSONWithDate: ({ data, indent, staticBase, }: {
-    data: Record<string, unknown>;
-    indent: number | undefined;
-    staticBase: string | null;
-}) => SerializedJSONWithCustomFields;

package/dist/json-serialization.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.serializeJSONWithDate = void 0;
-// Keep in sync with /packages/core/src/input-props-serialization.ts
-const DATE_TOKEN = 'remotion-date:';
-const FILE_TOKEN = 'remotion-file:';
-const serializeJSONWithDate = ({ data, indent, staticBase, }) => {
-    let customDateUsed = false;
-    let customFileUsed = false;
-    let mapUsed = false;
-    let setUsed = false;
-    const serializedString = JSON.stringify(data, function (key, value) {
-        const item = this[key];
-        if (item instanceof Date) {
-            customDateUsed = true;
-            return `${DATE_TOKEN}${item.toISOString()}`;
-        }
-        if (item instanceof Map) {
-            mapUsed = true;
-            return value;
-        }
-        if (item instanceof Set) {
-            setUsed = true;
-            return value;
-        }
-        if (typeof item === 'string' &&
-            staticBase !== null &&
-            item.startsWith(staticBase)) {
-            customFileUsed = true;
-            return `${FILE_TOKEN}${item.replace(staticBase + '/', '')}`;
-        }
-        return value;
-    }, indent);
-    return { serializedString, customDateUsed, customFileUsed, mapUsed, setUsed };
-};
-exports.serializeJSONWithDate = serializeJSONWithDate;