remotion 4.0.538 → 4.0.539

package/dist/cjs/prefetch.js

@@ -35,6 +35,7 @@ const usePreload = (src) => {
     return preloads[withoutHashFragment];
 };
 exports.usePreload = usePreload;
+const activePrefetches = new Map();
 const blobToBase64 = function (blob) {
     const reader = new FileReader();
     return new Promise((resolve, reject) => {
@@ -98,6 +99,7 @@ const prefetch = (src, options) => {
     });
     waitUntilDone.catch(() => undefined);
     const controller = new AbortController();
+    const prefetchId = Symbol('prefetch');
     let reader = null;
     fetch(srcWithoutHash, {
         signal: controller.signal,
@@ -148,7 +150,11 @@ const prefetch = (src, options) => {
         return URL.createObjectURL(actualBlob);
     })
         .then((url) => {
+        var _a;
         if (canceled) {
+            if (url && method === 'blob-url') {
+                URL.revokeObjectURL(url);
+            }
             return;
         }
         (0, playback_logging_js_1.playbackLogging)({
@@ -158,6 +164,9 @@ const prefetch = (src, options) => {
             mountTime: null,
         });
         objectUrl = url;
+        const prefetchesForSrc = (_a = activePrefetches.get(srcWithoutHash)) !== null && _a !== void 0 ? _a : new Map();
+        prefetchesForSrc.set(prefetchId, objectUrl);
+        activePrefetches.set(srcWithoutHash, prefetchesForSrc);
         (0, prefetch_state_js_1.setPreloads)((p) => ({
             ...p,
             [srcWithoutHash]: objectUrl,
@@ -172,6 +181,10 @@ const prefetch = (src, options) => {
     });
     return {
         free: () => {
+            if (canceled) {
+                return;
+            }
+            canceled = true;
             (0, playback_logging_js_1.playbackLogging)({
                 logLevel,
                 tag: 'prefetch',
@@ -182,17 +195,29 @@ const prefetch = (src, options) => {
                 if (method === 'blob-url') {
                     URL.revokeObjectURL(objectUrl);
                 }
+                const prefetchesForSrc = activePrefetches.get(srcWithoutHash);
+                prefetchesForSrc === null || prefetchesForSrc === void 0 ? void 0 : prefetchesForSrc.delete(prefetchId);
+                const remainingUrl = prefetchesForSrc
+                    ? [...prefetchesForSrc.values()].pop()
+                    : undefined;
+                if ((prefetchesForSrc === null || prefetchesForSrc === void 0 ? void 0 : prefetchesForSrc.size) === 0) {
+                    activePrefetches.delete(srcWithoutHash);
+                }
                 (0, prefetch_state_js_1.setPreloads)((p) => {
+                    if (p[srcWithoutHash] === remainingUrl) {
+                        return p;
+                    }
                     const copy = { ...p };
-                    delete copy[srcWithoutHash];
+                    if (remainingUrl === undefined) {
+                        delete copy[srcWithoutHash];
+                    }
+                    else {
+                        copy[srcWithoutHash] = remainingUrl;
+                    }
                     return copy;
                 });
             }
             else {
-                if (canceled) {
-                    return;
-                }
-                canceled = true;
                 const cancellationError = new Error('free() called');
                 reject(cancellationError);
                 try {

package/dist/cjs/sequence-order-marker.d.ts

@@ -0,0 +1,58 @@
+import type React from 'react';
+export declare const SEQUENCE_ORDER_MARKER: unique symbol;
+export declare const SEQUENCE_MANAGER_ORDER_MARKER: unique symbol;
+export declare const COMPOSITION_ORDER_MARKER: unique symbol;
+export declare const FOLDER_ORDER_MARKER: unique symbol;
+export declare const COMPOSITION_MANAGER_ORDER_MARKER: unique symbol;
+export declare const COMMIT_ORDER_EVENT = "remotion:commit-order";
+export type CompositionAndFolderOrderItem = {
+    readonly type: 'composition';
+    readonly id: string;
+} | {
+    readonly type: 'folder';
+    readonly id: string;
+};
+export declare const getCompositionAndFolderOrderKey: (item: CompositionAndFolderOrderItem) => string;
+export type CommitOrderEventDetail = {
+    readonly sequenceManagers: readonly {
+        readonly managerId: string;
+        readonly sequenceIds: readonly string[];
+    }[];
+    readonly compositionManagers: readonly {
+        readonly managerId: string;
+        readonly compositionAndFolderOrder: readonly CompositionAndFolderOrderItem[];
+    }[];
+};
+export declare const getFolderOrderId: ({ name, parent, }: {
+    readonly name: string;
+    readonly parent: string | null;
+}) => string;
+export declare const SequenceOrderMarker: React.FC<{
+    readonly children: React.ReactNode;
+    readonly sequenceId: string;
+    readonly outlineChildrenRef: React.RefObject<Element | null> | null;
+}>;
+export declare const SequenceManagerOrderMarker: React.FC<{
+    readonly children: React.ReactNode;
+    readonly managerId: string;
+}>;
+export declare const CompositionOrderMarker: React.FC<{
+    readonly children: React.ReactNode;
+    readonly compositionId: string;
+}>;
+export declare const FolderOrderMarker: React.FC<{
+    readonly children: React.ReactNode;
+    readonly folderId: string;
+}>;
+export declare const CompositionManagerOrderMarker: React.FC<{
+    readonly children: React.ReactNode;
+    readonly managerId: string;
+}>;
+export declare const CommitOrderInternals: {
+    compositionManagerMarker: symbol;
+    compositionMarker: symbol;
+    folderMarker: symbol;
+    sequenceManagerMarker: symbol;
+    sequenceMarker: symbol;
+    eventName: string;
+};

package/dist/cjs/sequence-order-marker.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommitOrderInternals = exports.CompositionManagerOrderMarker = exports.FolderOrderMarker = exports.CompositionOrderMarker = exports.SequenceManagerOrderMarker = exports.SequenceOrderMarker = exports.getFolderOrderId = exports.getCompositionAndFolderOrderKey = exports.COMMIT_ORDER_EVENT = exports.COMPOSITION_MANAGER_ORDER_MARKER = exports.FOLDER_ORDER_MARKER = exports.COMPOSITION_ORDER_MARKER = exports.SEQUENCE_MANAGER_ORDER_MARKER = exports.SEQUENCE_ORDER_MARKER = void 0;
+exports.SEQUENCE_ORDER_MARKER = Symbol.for('remotion.sequence-order-marker');
+exports.SEQUENCE_MANAGER_ORDER_MARKER = Symbol.for('remotion.sequence-manager-order-marker');
+exports.COMPOSITION_ORDER_MARKER = Symbol.for('remotion.composition-order-marker');
+exports.FOLDER_ORDER_MARKER = Symbol.for('remotion.folder-order-marker');
+exports.COMPOSITION_MANAGER_ORDER_MARKER = Symbol.for('remotion.composition-manager-order-marker');
+exports.COMMIT_ORDER_EVENT = 'remotion:commit-order';
+const getCompositionAndFolderOrderKey = (item) => `${item.type}:${item.id}`;
+exports.getCompositionAndFolderOrderKey = getCompositionAndFolderOrderKey;
+const getFolderOrderId = ({ name, parent, }) => [parent, name].filter(Boolean).join('/');
+exports.getFolderOrderId = getFolderOrderId;
+const SequenceOrderMarker = ({ children }) => children;
+exports.SequenceOrderMarker = SequenceOrderMarker;
+Object.defineProperty(exports.SequenceOrderMarker, exports.SEQUENCE_ORDER_MARKER, {
+    value: true,
+});
+const SequenceManagerOrderMarker = ({ children }) => children;
+exports.SequenceManagerOrderMarker = SequenceManagerOrderMarker;
+Object.defineProperty(exports.SequenceManagerOrderMarker, exports.SEQUENCE_MANAGER_ORDER_MARKER, {
+    value: true,
+});
+const CompositionOrderMarker = ({ children }) => children;
+exports.CompositionOrderMarker = CompositionOrderMarker;
+Object.defineProperty(exports.CompositionOrderMarker, exports.COMPOSITION_ORDER_MARKER, {
+    value: true,
+});
+const FolderOrderMarker = ({ children }) => children;
+exports.FolderOrderMarker = FolderOrderMarker;
+Object.defineProperty(exports.FolderOrderMarker, exports.FOLDER_ORDER_MARKER, {
+    value: true,
+});
+const CompositionManagerOrderMarker = ({ children }) => children;
+exports.CompositionManagerOrderMarker = CompositionManagerOrderMarker;
+Object.defineProperty(exports.CompositionManagerOrderMarker, exports.COMPOSITION_MANAGER_ORDER_MARKER, { value: true });
+exports.CommitOrderInternals = {
+    compositionManagerMarker: exports.COMPOSITION_MANAGER_ORDER_MARKER,
+    compositionMarker: exports.COMPOSITION_ORDER_MARKER,
+    folderMarker: exports.FOLDER_ORDER_MARKER,
+    sequenceManagerMarker: exports.SEQUENCE_MANAGER_ORDER_MARKER,
+    sequenceMarker: exports.SEQUENCE_ORDER_MARKER,
+    eventName: exports.COMMIT_ORDER_EVENT,
+};

package/dist/cjs/spring/index.js

@@ -53,9 +53,7 @@ function spring({ frame: passedFrame, fps, config = {}, from = 0, to = 1, durati
         config,
     });
     const inner = config.overshootClamping
-        ? to >= from
-            ? Math.min(spr.current, to)
-            : Math.max(spr.current, to)
+        ? Math.min(spr.current, 1)
         : spr.current;
     const interpolated = from === 0 && to === 1 ? inner : (0, interpolate_js_1.interpolate)(inner, [0, 1], [from, to]);
     return interpolated;

package/dist/cjs/use-lazy-component.js

@@ -92,10 +92,6 @@ const useLazyComponent = ({ compProps, componentName, noSuspense, }) => {
     ]);
     const lazy = (0, react_1.useMemo)(() => {
         if ('component' in compProps) {
-            // In SSR, suspense is not yet supported, we cannot use React.lazy
-            if (typeof document === 'undefined' || noSuspense) {
-                return compProps.component;
-            }
             return Wrapper;
         }
         if ('lazyComponent' in compProps &&
@@ -112,6 +108,11 @@ const useLazyComponent = ({ compProps, componentName, noSuspense, }) => {
         // compProps.component — the stable wrapper subscribes to componentStore instead.
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [lazyComponentFromProps, componentStore, Wrapper]);
+    // Read the current component on every render when bypassing the wrapper.
+    if ('component' in compProps &&
+        (typeof document === 'undefined' || noSuspense)) {
+        return compProps.component;
+    }
     return lazy;
 };
 exports.useLazyComponent = useLazyComponent;

package/dist/cjs/version.d.ts

@@ -3,4 +3,4 @@
  * @see [Documentation](https://remotion.dev/docs/version)
  * @returns {string} The current version of the remotion package
  */
-export declare const VERSION = "4.0.538";
+export declare const VERSION = "4.0.539";

package/dist/cjs/version.js

@@ -7,4 +7,4 @@ exports.VERSION = void 0;
  * @see [Documentation](https://remotion.dev/docs/version)
  * @returns {string} The current version of the remotion package
  */
-exports.VERSION = '4.0.538';
+exports.VERSION = '4.0.539';