remotion 4.0.0-prefetch.7 → 4.0.0-prefetchapi.16

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-remotion:build: cache hit, replaying output f61b1baa8746d331
-remotion:build: 
-remotion:build: > remotion@3.2.16 build /Users/jonathanburger/remotion/packages/core
-remotion:build: > tsc -d
-remotion:build: 
+remotion:build: cache hit, replaying output 28df07482870d016
+remotion:build: 
+remotion:build: > remotion@3.2.16 build /Users/jonathanburger/remotion/packages/core
+remotion:build: > tsc -d
+remotion:build: 

package/dist/Img.js

@@ -4,13 +4,13 @@ exports.Img = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const delay_render_1 = require("./delay-render");
-const preload_1 = require("./preload");
+const prefetch_1 = require("./prefetch");
 const ImgRefForwarding = ({ onError, src, ...props }, ref) => {
     const imageRef = (0, react_1.useRef)(null);
     (0, react_1.useImperativeHandle)(ref, () => {
         return imageRef.current;
     });
-    const actualSrc = (0, preload_1.usePreload)(src);
+    const actualSrc = (0, prefetch_1.usePreload)(src);
     const didGetError = (0, react_1.useCallback)((e) => {
         var _a;
         if (onError) {

package/dist/RemotionRoot.js

@@ -7,6 +7,7 @@ const shared_audio_tags_1 = require("./audio/shared-audio-tags");
 const CompositionManager_1 = require("./CompositionManager");
 const delay_render_1 = require("./delay-render");
 const nonce_1 = require("./nonce");
+const preload_state_1 = require("./preload-state");
 const random_1 = require("./random");
 const timeline_position_state_1 = require("./timeline-position-state");
 const RemotionRoot = ({ children }) => {
@@ -61,10 +62,10 @@ const RemotionRoot = ({ children }) => {
             });
         }
     }, []);
-    return ((0, jsx_runtime_1.jsx)(nonce_1.NonceContext.Provider, { value: nonceContext, children: (0, jsx_runtime_1.jsx)(timeline_position_state_1.TimelineContext.Provider, { value: timelineContextValue, children: (0, jsx_runtime_1.jsx)(timeline_position_state_1.SetTimelineContext.Provider, { value: setTimelineContextValue, children: (0, jsx_runtime_1.jsx)(CompositionManager_1.CompositionManagerProvider, { children: (0, jsx_runtime_1.jsx)(shared_audio_tags_1.SharedAudioContextProvider
-                    // In the preview, which is mostly played on Desktop, we opt out of the autoplay policy fix as described in https://github.com/remotion-dev/remotion/pull/554, as it mostly applies to mobile.
-                    , { 
+    return ((0, jsx_runtime_1.jsx)(nonce_1.NonceContext.Provider, { value: nonceContext, children: (0, jsx_runtime_1.jsx)(timeline_position_state_1.TimelineContext.Provider, { value: timelineContextValue, children: (0, jsx_runtime_1.jsx)(timeline_position_state_1.SetTimelineContext.Provider, { value: setTimelineContextValue, children: (0, jsx_runtime_1.jsx)(preload_state_1.PreloadProvider, { children: (0, jsx_runtime_1.jsx)(CompositionManager_1.CompositionManagerProvider, { children: (0, jsx_runtime_1.jsx)(shared_audio_tags_1.SharedAudioContextProvider
                         // In the preview, which is mostly played on Desktop, we opt out of the autoplay policy fix as described in https://github.com/remotion-dev/remotion/pull/554, as it mostly applies to mobile.
-                        numberOfAudioTags: 0, children: children }) }) }) }) }));
+                        , { 
+                            // In the preview, which is mostly played on Desktop, we opt out of the autoplay policy fix as described in https://github.com/remotion-dev/remotion/pull/554, as it mostly applies to mobile.
+                            numberOfAudioTags: 0, children: children }) }) }) }) }) }));
 };
 exports.RemotionRoot = RemotionRoot;

package/dist/audio/AudioForDevelopment.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AudioForDevelopment = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
-const preload_1 = require("../preload");
+const prefetch_1 = require("../prefetch");
 const random_1 = require("../random");
 const Sequence_1 = require("../Sequence");
 const use_media_in_timeline_1 = require("../use-media-in-timeline");
@@ -25,7 +25,7 @@ const AudioForDevelopmentForwardRefFunction = (props, ref) => {
     if (!src) {
         throw new TypeError("No 'src' was passed to <Audio>.");
     }
-    const preloadedSrc = (0, preload_1.usePreload)(src);
+    const preloadedSrc = (0, prefetch_1.usePreload)(src);
     const propsToPass = (0, react_1.useMemo)(() => {
         return {
             muted: muted || mediaMuted,

package/dist/get-environment.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRemotionEnvironment = void 0;
 const getRemotionEnvironment = () => {
-    if (process.env.NODE_ENV === 'production') {
+    if (typeof process !== 'undefined' && process.env.NODE_ENV === 'production') {
         if (typeof window !== 'undefined' && window.remotion_isPlayer) {
             return 'player-production';
         }
@@ -11,7 +11,7 @@ const getRemotionEnvironment = () => {
     // The Jest framework sets NODE_ENV as test.
     // Right now we don't need to treat it in a special
     // way which is good - defaulting to `rendering`.
-    if (process.env.NODE_ENV === 'test') {
+    if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
         return 'rendering';
     }
     if (typeof window !== 'undefined' && window.remotion_isPlayer) {

package/dist/index.d.ts

@@ -56,7 +56,7 @@ export * from './internals';
 export * from './interpolate';
 export { interpolateColors } from './interpolate-colors';
 export { Loop } from './loop';
-export { fetchAndPreload } from './preload';
+export { prefetch } from './prefetch';
 export * from './random';
 export { registerRoot } from './register-root';
 export { Sequence } from './Sequence';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useCurrentFrame = exports.staticFile = exports.Series = exports.Sequence = exports.registerRoot = exports.fetchAndPreload = exports.Loop = exports.interpolateColors = exports.getInputProps = exports.Config = void 0;
+exports.useCurrentFrame = exports.staticFile = exports.Series = exports.Sequence = exports.registerRoot = exports.prefetch = exports.Loop = exports.interpolateColors = exports.getInputProps = exports.Config = void 0;
 require("./asset-types");
 const multiple_versions_warning_1 = require("./multiple-versions-warning");
 (0, multiple_versions_warning_1.checkMultipleRemotionVersions)();
@@ -37,8 +37,8 @@ var interpolate_colors_1 = require("./interpolate-colors");
 Object.defineProperty(exports, "interpolateColors", { enumerable: true, get: function () { return interpolate_colors_1.interpolateColors; } });
 var loop_1 = require("./loop");
 Object.defineProperty(exports, "Loop", { enumerable: true, get: function () { return loop_1.Loop; } });
-var preload_1 = require("./preload");
-Object.defineProperty(exports, "fetchAndPreload", { enumerable: true, get: function () { return preload_1.fetchAndPreload; } });
+var prefetch_1 = require("./prefetch");
+Object.defineProperty(exports, "prefetch", { enumerable: true, get: function () { return prefetch_1.prefetch; } });
 __exportStar(require("./random"), exports);
 var register_root_1 = require("./register-root");
 Object.defineProperty(exports, "registerRoot", { enumerable: true, get: function () { return register_root_1.registerRoot; } });

package/dist/internals.d.ts

@@ -79,6 +79,9 @@ export declare const Internals: {
     }>;
     CanUseRemotionHooks: import("react").Context<boolean>;
     enableLegacyRemotionConfig: () => void;
+    PreloadProvider: import("react").FC<{
+        children: import("react").ReactNode;
+    }>;
 };
 declare type WebpackConfiguration = Configuration;
 declare type WebpackOverrideFn = (currentConfiguration: WebpackConfiguration) => WebpackConfiguration;

package/dist/internals.js

@@ -33,6 +33,7 @@ const delay_render_1 = require("./delay-render");
 const get_environment_1 = require("./get-environment");
 const get_preview_dom_element_1 = require("./get-preview-dom-element");
 const portal_node_1 = require("./portal-node");
+const preload_state_1 = require("./preload-state");
 const register_root_1 = require("./register-root");
 const RemotionRoot_1 = require("./RemotionRoot");
 const Sequence_1 = require("./Sequence");
@@ -88,4 +89,5 @@ exports.Internals = {
     CanUseRemotionHooksProvider: CanUseRemotionHooks_1.CanUseRemotionHooksProvider,
     CanUseRemotionHooks: CanUseRemotionHooks_1.CanUseRemotionHooks,
     enableLegacyRemotionConfig: config_1.enableLegacyRemotionConfig,
+    PreloadProvider: preload_state_1.PreloadProvider,
 };

package/dist/prefetch.d.ts

@@ -0,0 +1,7 @@
+export declare const usePreload: (src: string) => string;
+declare type FetchAndPreload = {
+    unpreload: () => void;
+    waitForDone: () => Promise<string>;
+};
+export declare const prefetch: (src: string) => FetchAndPreload;
+export {};

package/dist/prefetch.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prefetch = exports.usePreload = void 0;
+const react_1 = require("react");
+const get_environment_1 = require("./get-environment");
+const preload_state_1 = require("./preload-state");
+const usePreload = (src) => {
+    var _a;
+    const { preloads } = (0, react_1.useContext)(preload_state_1.PreloadContext);
+    return (_a = preloads[src]) !== null && _a !== void 0 ? _a : src;
+};
+exports.usePreload = usePreload;
+const prefetch = (src) => {
+    if ((0, get_environment_1.getRemotionEnvironment)() === 'rendering') {
+        return {
+            unpreload: () => undefined,
+            waitForDone: () => Promise.resolve(src),
+        };
+    }
+    let canceled = false;
+    let objectUrl = null;
+    let resolve = () => undefined;
+    let reject = () => undefined;
+    const waitUntilDone = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    const controller = new AbortController();
+    let canBeAborted = true;
+    fetch(src, {
+        signal: controller.signal,
+    })
+        .then((res) => {
+        canBeAborted = false;
+        if (canceled) {
+            return null;
+        }
+        if (!res.ok) {
+            throw new Error(`HTTP error, status = ${res.status}`);
+        }
+        return res.blob();
+    })
+        .then((buf) => {
+        var _a;
+        if (canceled) {
+            return;
+        }
+        if (buf) {
+            objectUrl = URL.createObjectURL(buf);
+            (_a = preload_state_1.preloadRef.current) === null || _a === void 0 ? void 0 : _a.setPreloads((p) => ({
+                ...p,
+                [src]: objectUrl,
+            }));
+            resolve(objectUrl);
+        }
+    })
+        .catch((err) => {
+        reject(err);
+    });
+    return {
+        unpreload: () => {
+            var _a;
+            if (objectUrl) {
+                URL.revokeObjectURL(objectUrl);
+                (_a = preload_state_1.preloadRef.current) === null || _a === void 0 ? void 0 : _a.setPreloads((p) => {
+                    const copy = { ...p };
+                    delete copy[src];
+                    return copy;
+                });
+            }
+            else {
+                canceled = true;
+                if (canBeAborted) {
+                    try {
+                        controller.abort();
+                    }
+                    catch (e) { }
+                }
+            }
+        },
+        waitForDone: () => {
+            return waitUntilDone;
+        },
+    };
+};
+exports.prefetch = prefetch;

package/dist/preload-state.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+declare type Value = {
+    preloads: Record<string, string>;
+    setPreloads: React.Dispatch<React.SetStateAction<Record<string, string>>>;
+};
+export declare const preloadRef: React.RefObject<{
+    setPreloads: React.Dispatch<React.SetStateAction<Record<string, string>>>;
+}>;
+export declare const PreloadContext: React.Context<Value>;
+export declare const PreloadProvider: React.FC<{
+    children: React.ReactNode;
+}>;
+export {};

package/dist/preload-state.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PreloadProvider = exports.PreloadContext = exports.preloadRef = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+exports.preloadRef = (0, react_1.createRef)();
+exports.PreloadContext = (0, react_1.createContext)({
+    preloads: {},
+    setPreloads: () => undefined,
+});
+const PreloadProvider = ({ children }) => {
+    const [preloads, setPreloads] = (0, react_1.useState)({});
+    const value = (0, react_1.useMemo)(() => {
+        return {
+            preloads,
+            setPreloads,
+        };
+    }, [preloads]);
+    (0, react_1.useImperativeHandle)(exports.preloadRef, () => {
+        return {
+            setPreloads,
+        };
+    });
+    return ((0, jsx_runtime_1.jsx)(exports.PreloadContext.Provider, { value: value, children: children }));
+};
+exports.PreloadProvider = PreloadProvider;

package/dist/preload.js

@@ -3,15 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchAndPreload = exports.usePreload = void 0;
 const react_1 = require("react");
 const get_environment_1 = require("./get-environment");
-const preloadRef = (0, react_1.createRef)();
+const preload_state_1 = require("./preload-state");
 const usePreload = (src) => {
     var _a;
-    const [preloads, setPreloads] = (0, react_1.useState)({});
-    (0, react_1.useImperativeHandle)(preloadRef, () => {
-        return {
-            setPreloads,
-        };
-    });
+    const { preloads } = (0, react_1.useContext)(preload_state_1.PreloadContext);
     return (_a = preloads[src]) !== null && _a !== void 0 ? _a : src;
 };
 exports.usePreload = usePreload;
@@ -30,10 +25,14 @@ const fetchAndPreload = (src) => {
         resolve = res;
         reject = rej;
     });
-    fetch(src)
+    const controller = new AbortController();
+    let canBeAborted = true;
+    fetch(src, {
+        signal: controller.signal,
+    })
         .then((res) => {
+        canBeAborted = false;
         if (canceled) {
-            reject(new Error('Preloading cancelled'));
             return null;
         }
         if (!res.ok) {
@@ -44,12 +43,11 @@ const fetchAndPreload = (src) => {
         .then((buf) => {
         var _a;
         if (canceled) {
-            reject(new Error('Preloading cancelled'));
             return;
         }
         if (buf) {
             objectUrl = URL.createObjectURL(buf);
-            (_a = preloadRef.current) === null || _a === void 0 ? void 0 : _a.setPreloads((p) => ({
+            (_a = preload_state_1.preloadRef.current) === null || _a === void 0 ? void 0 : _a.setPreloads((p) => ({
                 ...p,
                 [src]: objectUrl,
             }));
@@ -64,7 +62,7 @@ const fetchAndPreload = (src) => {
             var _a;
             if (objectUrl) {
                 URL.revokeObjectURL(objectUrl);
-                (_a = preloadRef.current) === null || _a === void 0 ? void 0 : _a.setPreloads((p) => {
+                (_a = preload_state_1.preloadRef.current) === null || _a === void 0 ? void 0 : _a.setPreloads((p) => {
                     const copy = { ...p };
                     delete copy[src];
                     return copy;
@@ -72,7 +70,12 @@ const fetchAndPreload = (src) => {
             }
             else {
                 canceled = true;
-                reject(new Error('Preloading cancelled'));
+                if (canBeAborted) {
+                    try {
+                        controller.abort();
+                    }
+                    catch (e) { }
+                }
             }
         },
         waitForDone: () => {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.0.0-prefetch.7+47cce0679";
+export declare const VERSION = "4.0.0-prefetchapi.16+486ce6105";

package/dist/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // Automatically generated on publish
-exports.VERSION = '4.0.0-prefetch.7+47cce0679';
+exports.VERSION = '4.0.0-prefetchapi.16+486ce6105';

package/dist/video/VideoForDevelopment.js

@@ -4,7 +4,7 @@ exports.VideoForDevelopment = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const use_audio_frame_1 = require("../audio/use-audio-frame");
-const preload_1 = require("../preload");
+const prefetch_1 = require("../prefetch");
 const use_media_in_timeline_1 = require("../use-media-in-timeline");
 const use_media_playback_1 = require("../use-media-playback");
 const use_media_tag_volume_1 = require("../use-media-tag-volume");
@@ -39,7 +39,7 @@ const VideoForDevelopmentRefForwardingFunction = (props, ref) => {
         playbackRate: (_a = props.playbackRate) !== null && _a !== void 0 ? _a : 1,
         onlyWarnForMediaSeekingError,
     });
-    const actualSrc = (0, preload_1.usePreload)(src);
+    const actualSrc = (0, prefetch_1.usePreload)(src);
     (0, react_1.useImperativeHandle)(ref, () => {
         return videoRef.current;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "remotion",
-	"version": "4.0.0-prefetch.7+47cce0679",
+	"version": "4.0.0-prefetchapi.16+486ce6105",
 	"description": "Render videos in React",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -54,5 +54,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "47cce06799563fb244ff25b211ea4055389bd7de"
+	"gitHead": "486ce6105d52f9494351e4fbf564f6cfb0b10408"
 }

package/dist/config/bundle-out-dir.d.ts

@@ -1,2 +0,0 @@
-export declare const getBundleOutDir: () => string | null;
-export declare const setBundleOutDir: (path: string) => void;

package/dist/config/bundle-out-dir.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setBundleOutDir = exports.getBundleOutDir = void 0;
-let bundleOutDir = null;
-const getBundleOutDir = () => {
-    return bundleOutDir;
-};
-exports.getBundleOutDir = getBundleOutDir;
-const setBundleOutDir = (path) => {
-    bundleOutDir = path;
-};
-exports.setBundleOutDir = setBundleOutDir;

package/dist/config/public-path.d.ts

@@ -1,2 +0,0 @@
-export declare const getPublicPath: () => string | null;
-export declare const setPublicPath: (path: string) => void;

package/dist/config/public-path.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setPublicPath = exports.getPublicPath = void 0;
-let publicPath = null;
-const getPublicPath = () => {
-    return publicPath;
-};
-exports.getPublicPath = getPublicPath;
-const setPublicPath = (path) => {
-    publicPath = path;
-};
-exports.setPublicPath = setPublicPath;