@remotion/studio-server 4.0.536 → 4.0.537

package/dist/preview-server/api-routes.js

@@ -71,6 +71,7 @@ const unsubscribe_from_default_props_1 = require("./routes/unsubscribe-from-defa
 const unsubscribe_from_file_existence_1 = require("./routes/unsubscribe-from-file-existence");
 const unsubscribe_from_sequence_props_1 = require("./routes/unsubscribe-from-sequence-props");
 const unwrap_folder_1 = require("./routes/unwrap-folder");
+const unwrap_node_1 = require("./routes/unwrap-node");
 const update_available_1 = require("./routes/update-available");
 const update_composition_metadata_1 = require("./routes/update-composition-metadata");
 const update_default_props_1 = require("./routes/update-default-props");
@@ -133,6 +134,7 @@ exports.allApiRoutes = {
     '/api/paste-effects': paste_effects_1.pasteEffectsHandler,
     '/api/delete-nodes': delete_nodes_1.deleteNodesHandler,
     '/api/duplicate-nodes': duplicate_nodes_1.duplicateNodesHandler,
+    '/api/unwrap-node': unwrap_node_1.unwrapNodeHandler,
     '/api/wrap-node': wrap_node_1.wrapNodeHandler,
     '/api/precompose-jsx-nodes': precompose_jsx_nodes_1.precomposeJsxNodesHandler,
     '/api/split-sequences': split_sequences_1.splitSequencesHandler,

package/dist/preview-server/default-props-watchers.d.ts

@@ -1,7 +1,8 @@
-import type { CanUpdateDefaultPropsResponse } from '@remotion/studio-shared';
-export declare const subscribeToDefaultPropsWatchers: ({ compositionId, clientId, remotionRoot, entryPoint, }: {
+import type { CanUpdateDefaultPropsResponse, SymbolicatedStackFrame } from '@remotion/studio-shared';
+export declare const subscribeToDefaultPropsWatchers: ({ compositionId, clientId, symbolicatedStack, remotionRoot, entryPoint, }: {
     compositionId: string;
     clientId: string;
+    symbolicatedStack: SymbolicatedStackFrame | null;
     remotionRoot: string;
     entryPoint: string;
 }) => Promise<CanUpdateDefaultPropsResponse>;

package/dist/preview-server/default-props-watchers.js

@@ -4,104 +4,75 @@ exports.unsubscribeClientDefaultPropsWatchers = exports.unsubscribeFromDefaultPr
 const file_watcher_1 = require("../file-watcher");
 const live_events_1 = require("./live-events");
 const can_update_default_props_1 = require("./routes/can-update-default-props");
-// Global file watcher — at most one for the root file
-let globalWatcher = null;
-// Per-compositionId set of subscribed clientIds
-const subscriptions = {};
-// Cached config for recomputation on file change
-let watcherConfig = null;
-const ensureGlobalWatcher = (rootFile) => {
-    if (globalWatcher) {
-        globalWatcher.refCount++;
+// Each client watches its own resolved registration file or root-file fallback.
+const watchers = {};
+const removeClient = (compositionId, clientId) => {
+    const compositionWatchers = watchers[compositionId];
+    if (!compositionWatchers) {
         return;
     }
-    const { unwatch } = (0, file_watcher_1.installFileWatcher)({
-        file: rootFile,
-        existenceOnly: false,
-        onChange: (event) => {
-            if (event.type === 'deleted') {
-                return;
-            }
-            if (!watcherConfig) {
-                return;
-            }
-            const compositionIds = Object.keys(subscriptions);
-            for (const compositionId of compositionIds) {
-                if (subscriptions[compositionId].size === 0) {
-                    continue;
+    for (const [file, watcher] of compositionWatchers) {
+        watcher.clientIds.delete(clientId);
+        if (watcher.clientIds.size === 0) {
+            watcher.unwatch();
+            compositionWatchers.delete(file);
+        }
+    }
+    if (compositionWatchers.size === 0) {
+        delete watchers[compositionId];
+    }
+};
+const subscribeToDefaultPropsWatchers = async ({ compositionId, clientId, symbolicatedStack, remotionRoot, entryPoint, }) => {
+    var _a;
+    const { result, compositionFile } = await (0, can_update_default_props_1.computeCanUpdateDefaultProps)({
+        compositionId,
+        symbolicatedStack,
+        remotionRoot,
+        entryPoint,
+    });
+    // Remove from any previous subscription for this client+composition
+    removeClient(compositionId, clientId);
+    if (!compositionFile) {
+        return result;
+    }
+    (_a = watchers[compositionId]) !== null && _a !== void 0 ? _a : (watchers[compositionId] = new Map());
+    const compositionWatchers = watchers[compositionId];
+    if (!compositionWatchers.has(compositionFile)) {
+        const clientIds = new Set();
+        const { unwatch } = (0, file_watcher_1.installFileWatcher)({
+            file: compositionFile,
+            existenceOnly: false,
+            onChange: (event) => {
+                if (event.type === 'deleted') {
+                    return;
                 }
-                const clientIds = [...subscriptions[compositionId]];
                 const newResult = (0, can_update_default_props_1.computeCanUpdateDefaultPropsFromContent)(event.content, compositionId);
+                const subscribedClientIds = [...clientIds];
                 (0, live_events_1.waitForLiveEventsListener)().then((listener) => {
                     const updateEvent = {
                         type: 'default-props-updatable-changed',
                         compositionId,
                         result: newResult,
                     };
-                    for (const cId of clientIds) {
+                    for (const cId of subscribedClientIds) {
                         listener.sendEventToClientId(cId, updateEvent);
                     }
                 });
-            }
-        },
-    });
-    globalWatcher = { unwatch, rootFile, refCount: 1 };
-};
-const releaseGlobalWatcher = () => {
-    if (!globalWatcher) {
-        return;
-    }
-    globalWatcher.refCount--;
-    if (globalWatcher.refCount <= 0) {
-        globalWatcher.unwatch();
-        globalWatcher = null;
-        watcherConfig = null;
-    }
-};
-const subscribeToDefaultPropsWatchers = async ({ compositionId, clientId, remotionRoot, entryPoint, }) => {
-    var _a;
-    const { result, rootFile } = await (0, can_update_default_props_1.computeCanUpdateDefaultProps)({
-        compositionId,
-        remotionRoot,
-        entryPoint,
-    });
-    // Remove from any previous subscription for this client+composition
-    if ((_a = subscriptions[compositionId]) === null || _a === void 0 ? void 0 : _a.has(clientId)) {
-        subscriptions[compositionId].delete(clientId);
-        releaseGlobalWatcher();
-    }
-    if (rootFile) {
-        watcherConfig = { remotionRoot, entryPoint };
-        if (!subscriptions[compositionId]) {
-            subscriptions[compositionId] = new Set();
-        }
-        subscriptions[compositionId].add(clientId);
-        ensureGlobalWatcher(rootFile);
+            },
+        });
+        compositionWatchers.set(compositionFile, { unwatch, clientIds });
     }
+    compositionWatchers.get(compositionFile).clientIds.add(clientId);
     return result;
 };
 exports.subscribeToDefaultPropsWatchers = subscribeToDefaultPropsWatchers;
 const unsubscribeFromDefaultPropsWatchers = ({ compositionId, clientId, }) => {
-    var _a;
-    if (!((_a = subscriptions[compositionId]) === null || _a === void 0 ? void 0 : _a.has(clientId))) {
-        return;
-    }
-    subscriptions[compositionId].delete(clientId);
-    if (subscriptions[compositionId].size === 0) {
-        delete subscriptions[compositionId];
-    }
-    releaseGlobalWatcher();
+    removeClient(compositionId, clientId);
 };
 exports.unsubscribeFromDefaultPropsWatchers = unsubscribeFromDefaultPropsWatchers;
 const unsubscribeClientDefaultPropsWatchers = (clientId) => {
-    for (const compositionId of Object.keys(subscriptions)) {
-        if (subscriptions[compositionId].has(clientId)) {
-            subscriptions[compositionId].delete(clientId);
-            if (subscriptions[compositionId].size === 0) {
-                delete subscriptions[compositionId];
-            }
-            releaseGlobalWatcher();
-        }
+    for (const compositionId of Object.keys(watchers)) {
+        removeClient(compositionId, clientId);
     }
 };
 exports.unsubscribeClientDefaultPropsWatchers = unsubscribeClientDefaultPropsWatchers;

package/dist/preview-server/routes/can-update-default-props.d.ts

@@ -1,11 +1,17 @@
-import type { CanUpdateDefaultPropsResponse } from '@remotion/studio-shared';
+import type { CanUpdateDefaultPropsResponse, SymbolicatedStackFrame } from '@remotion/studio-shared';
 export declare const computeCanUpdateDefaultPropsFromContent: (content: string, compositionId: string) => CanUpdateDefaultPropsResponse;
 export declare const checkIfTypeScriptFile: (file: string) => void;
-export declare const computeCanUpdateDefaultProps: ({ compositionId, remotionRoot, entryPoint, }: {
+export declare const getDefaultPropsFile: ({ symbolicatedStack, remotionRoot, entryPoint, }: {
+    symbolicatedStack: SymbolicatedStackFrame | null;
+    remotionRoot: string;
+    entryPoint: string;
+}) => Promise<string>;
+export declare const computeCanUpdateDefaultProps: ({ compositionId, symbolicatedStack, remotionRoot, entryPoint, }: {
     compositionId: string;
+    symbolicatedStack: SymbolicatedStackFrame | null;
     remotionRoot: string;
     entryPoint: string;
 }) => Promise<{
     result: CanUpdateDefaultPropsResponse;
-    rootFile: string | null;
+    compositionFile: string | null;
 }>;

package/dist/preview-server/routes/can-update-default-props.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.computeCanUpdateDefaultProps = exports.checkIfTypeScriptFile = exports.computeCanUpdateDefaultPropsFromContent = void 0;
+exports.computeCanUpdateDefaultProps = exports.getDefaultPropsFile = exports.checkIfTypeScriptFile = exports.computeCanUpdateDefaultPropsFromContent = void 0;
 const node_fs_1 = require("node:fs");
 const codemods_1 = require("@remotion/codemods");
+const resolve_file_inside_project_1 = require("../../helpers/resolve-file-inside-project");
 const project_info_1 = require("../project-info");
 ({ computeCanUpdateDefaultPropsFromContent: exports.computeCanUpdateDefaultPropsFromContent } = codemods_1.CodemodsInternals);
 const checkIfTypeScriptFile = (file) => {
@@ -14,18 +15,50 @@ const checkIfTypeScriptFile = (file) => {
     }
 };
 exports.checkIfTypeScriptFile = checkIfTypeScriptFile;
-const computeCanUpdateDefaultProps = async ({ compositionId, remotionRoot, entryPoint, }) => {
+// Compositions can be registered in files imported by the root file. The
+// client sends the location of the registration, otherwise use the root file.
+const getDefaultPropsFile = async ({ symbolicatedStack, remotionRoot, entryPoint, }) => {
+    if (symbolicatedStack === null || symbolicatedStack === void 0 ? void 0 : symbolicatedStack.originalFileName) {
+        return (0, resolve_file_inside_project_1.resolveFileInsideProject)({
+            remotionRoot,
+            fileName: symbolicatedStack.originalFileName,
+            action: 'update default props in',
+        }).absolutePath;
+    }
+    const { rootFile } = await (0, project_info_1.getProjectInfo)(remotionRoot, entryPoint);
+    if (!rootFile) {
+        throw new Error('Cannot find root file in project');
+    }
+    return rootFile;
+};
+exports.getDefaultPropsFile = getDefaultPropsFile;
+const computeCanUpdateDefaultProps = async ({ compositionId, symbolicatedStack, remotionRoot, entryPoint, }) => {
     try {
-        const projectInfo = await (0, project_info_1.getProjectInfo)(remotionRoot, entryPoint);
-        if (!projectInfo.rootFile) {
-            throw new Error('Cannot find root file in project');
-        }
-        (0, exports.checkIfTypeScriptFile)(projectInfo.rootFile);
-        const input = (0, node_fs_1.readFileSync)(projectInfo.rootFile, 'utf-8');
+        const compositionFile = await (0, exports.getDefaultPropsFile)({
+            symbolicatedStack,
+            remotionRoot,
+            entryPoint,
+        });
+        (0, exports.checkIfTypeScriptFile)(compositionFile);
+        const input = (0, node_fs_1.readFileSync)(compositionFile, 'utf-8');
         const result = (0, exports.computeCanUpdateDefaultPropsFromContent)(input, compositionId);
+        if (!result.canUpdate &&
+            !(symbolicatedStack === null || symbolicatedStack === void 0 ? void 0 : symbolicatedStack.originalFileName) &&
+            codemods_1.CodemodsInternals.getCompositionFile({
+                compositionId,
+                project: { files: { [compositionFile]: input }, rootDir: remotionRoot },
+            }) === null) {
+            return {
+                result: {
+                    canUpdate: false,
+                    reason: `Could not determine which file registers this composition, checked the root file: ${result.reason}`,
+                },
+                compositionFile,
+            };
+        }
         return {
             result,
-            rootFile: projectInfo.rootFile,
+            compositionFile,
         };
     }
     catch (err) {
@@ -34,7 +67,7 @@ const computeCanUpdateDefaultProps = async ({ compositionId, remotionRoot, entry
                 canUpdate: false,
                 reason: err.message,
             },
-            rootFile: null,
+            compositionFile: null,
         };
     }
 };

package/dist/preview-server/routes/subscribe-to-default-props.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribeToDefaultProps = void 0;
 const default_props_watchers_1 = require("../default-props-watchers");
-const subscribeToDefaultProps = ({ input: { compositionId, clientId }, remotionRoot, entryPoint }) => {
+const subscribeToDefaultProps = ({ input: { compositionId, clientId, symbolicatedStack }, remotionRoot, entryPoint, }) => {
     return (0, default_props_watchers_1.subscribeToDefaultPropsWatchers)({
         compositionId,
         clientId,
+        symbolicatedStack,
         remotionRoot,
         entryPoint,
     });

package/dist/preview-server/routes/unsubscribe-from-sequence-props.d.ts

@@ -1,3 +1,3 @@
-import type { UnsubscribeFromSequencePropsRequest } from '@remotion/studio-shared';
+import type { UnsubscribeFromSequencePropsBatchRequest } from '@remotion/studio-shared';
 import type { ApiHandler } from '../api-types';
-export declare const unsubscribeFromSequenceProps: ApiHandler<UnsubscribeFromSequencePropsRequest, undefined>;
+export declare const unsubscribeFromSequenceProps: ApiHandler<UnsubscribeFromSequencePropsBatchRequest, undefined>;

package/dist/preview-server/routes/unsubscribe-from-sequence-props.js

@@ -2,16 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unsubscribeFromSequenceProps = void 0;
 const sequence_props_watchers_1 = require("../sequence-props-watchers");
-const unsubscribeFromSequenceProps = ({ input: { fileName, nodePath, clientId, sequenceKeys, assetKeys = [], effectKeys, }, remotionRoot, }) => {
-    (0, sequence_props_watchers_1.unsubscribeFromSequencePropsWatchers)({
-        fileName,
-        nodePath: nodePath.nodePath,
-        remotionRoot,
-        clientId,
-        sequenceKeys,
-        assetKeys,
-        effectKeys,
-    });
+const unsubscribeFromSequenceProps = ({ input, remotionRoot }) => {
+    for (const { fileName, nodePath, clientId, sequenceKeys, assetKeys = [], effectKeys, } of input.requests) {
+        (0, sequence_props_watchers_1.unsubscribeFromSequencePropsWatchers)({
+            fileName,
+            nodePath: nodePath.nodePath,
+            remotionRoot,
+            clientId,
+            sequenceKeys,
+            assetKeys,
+            effectKeys,
+        });
+    }
     return Promise.resolve(undefined);
 };
 exports.unsubscribeFromSequenceProps = unsubscribeFromSequenceProps;

package/dist/preview-server/routes/unwrap-node.d.ts

@@ -0,0 +1,3 @@
+import type { UnwrapNodeRequest, UnwrapNodeResponse } from '@remotion/studio-shared';
+import type { ApiHandler } from '../api-types';
+export declare const unwrapNodeHandler: ApiHandler<UnwrapNodeRequest, UnwrapNodeResponse>;

package/dist/preview-server/routes/unwrap-node.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unwrapNodeHandler = void 0;
+const node_fs_1 = require("node:fs");
+const codemods_1 = require("@remotion/codemods");
+const renderer_1 = require("@remotion/renderer");
+const file_watcher_1 = require("../../file-watcher");
+const resolve_file_inside_project_1 = require("../../helpers/resolve-file-inside-project");
+const format_log_file_location_1 = require("../format-log-file-location");
+const sequence_node_path_mutation_1 = require("../sequence-node-path-mutation");
+const undo_stack_1 = require("../undo-stack");
+const source_file_write_queue_1 = require("./source-file-write-queue");
+const unwrapNodeHandler = ({ input: { fileName, compositionId, nodePath, dryRun }, remotionRoot, logLevel, }) => {
+    return (0, source_file_write_queue_1.withSourceFileWriteQueue)(() => {
+        var _a;
+        try {
+            const { absolutePath, fileRelativeToRoot } = (0, resolve_file_inside_project_1.resolveFileInsideProject)({
+                remotionRoot,
+                fileName,
+                action: 'modify',
+            });
+            const fileContents = (0, node_fs_1.readFileSync)(absolutePath, 'utf-8');
+            const canUnwrap = (0, codemods_1.canUnwrapNode)({ input: fileContents, nodePath });
+            if (dryRun) {
+                return Promise.resolve({
+                    success: true,
+                    canUnwrap,
+                    nodePathMutation: null,
+                });
+            }
+            const result = (0, codemods_1.unwrapNode)({
+                project: { files: { [absolutePath]: fileContents }, rootDir: remotionRoot },
+                node: { filePath: absolutePath, nodePath },
+            });
+            const change = result.changes.find(({ filePath }) => filePath === absolutePath);
+            if ((change === null || change === void 0 ? void 0 : change.previousContents) !== fileContents ||
+                change.nextContents === null) {
+                throw new Error('Could not unwrap JSX node');
+            }
+            const output = change.nextContents;
+            const remappings = result.nodePathRemappings.map(({ oldNodePath, newNodePath, oldJsxName, newJsxName }) => ({
+                oldNodePath,
+                newNodePath,
+                oldJsxName,
+                newJsxName,
+            }));
+            const { childNodePath } = result;
+            const nodePathMutation = (0, sequence_node_path_mutation_1.broadcastSequenceNodePathMutation)([{ absolutePath, remappings }], childNodePath !== null
+                ? { compositionId, absolutePath, nodePath: childNodePath }
+                : null);
+            const line = result.logLine;
+            (0, undo_stack_1.pushTransactionToUndoStack)({
+                snapshots: [
+                    {
+                        filePath: absolutePath,
+                        oldContents: fileContents,
+                        newContents: null,
+                        logLine: line,
+                        nodePathRemappings: remappings,
+                    },
+                ],
+                logLevel,
+                remotionRoot,
+                description: {
+                    undoMessage: '↩️  Unwrapping JSX',
+                    redoMessage: '↪️  Unwrapping JSX',
+                },
+                entryType: 'unwrap-node',
+                suppressHmrOnFileRestore: false,
+                undoRedoNavigation: null,
+            });
+            (0, undo_stack_1.suppressUndoStackInvalidation)(absolutePath);
+            (0, file_watcher_1.writeFileAndNotifyFileWatchers)({
+                file: absolutePath,
+                content: output,
+                originatorClientId: undefined,
+                metadata: { skipSequencePropsUpdate: true },
+            });
+            const locationLabel = (0, format_log_file_location_1.formatLogFileLocation)({
+                remotionRoot,
+                absolutePath,
+                line,
+            });
+            renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${(0, source_file_write_queue_1.getCodemodTimingPrefix)(logLevel)}${renderer_1.RenderInternals.chalk.blueBright(locationLabel)} Unwrapped JSX`);
+            renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `[unwrap-node] Wrote ${fileRelativeToRoot}`);
+            (0, undo_stack_1.printUndoHint)(logLevel);
+            return Promise.resolve({ success: true, canUnwrap, nodePathMutation });
+        }
+        catch (err) {
+            return Promise.resolve({
+                success: false,
+                reason: err.message,
+                stack: (_a = err.stack) !== null && _a !== void 0 ? _a : '',
+            });
+        }
+    });
+};
+exports.unwrapNodeHandler = unwrapNodeHandler;

package/dist/preview-server/routes/update-default-props.js

@@ -6,29 +6,29 @@ const codemods_1 = require("@remotion/codemods");
 const renderer_1 = require("@remotion/renderer");
 const file_watcher_1 = require("../../file-watcher");
 const format_log_file_location_1 = require("../format-log-file-location");
-const project_info_1 = require("../project-info");
 const undo_stack_1 = require("../undo-stack");
 const watch_ignore_next_change_1 = require("../watch-ignore-next-change");
 const can_update_default_props_1 = require("./can-update-default-props");
 const source_file_write_queue_1 = require("./source-file-write-queue");
-const updateDefaultPropsHandler = ({ input: { compositionId, defaultProps, enumPaths }, remotionRoot, entryPoint, logLevel, }) => {
+const updateDefaultPropsHandler = ({ input: { compositionId, defaultProps, enumPaths, symbolicatedStack }, remotionRoot, entryPoint, logLevel, }) => {
     return (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
         var _a;
         var _b;
         try {
             renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[update-default-props] Received request for compositionId="${compositionId}"`);
-            const projectInfo = await (0, project_info_1.getProjectInfo)(remotionRoot, entryPoint);
-            if (!projectInfo.rootFile) {
-                throw new Error('Cannot find root file in project');
-            }
-            (0, can_update_default_props_1.checkIfTypeScriptFile)(projectInfo.rootFile);
-            const fileContents = (0, node_fs_1.readFileSync)(projectInfo.rootFile, 'utf-8');
+            const compositionFile = await (0, can_update_default_props_1.getDefaultPropsFile)({
+                symbolicatedStack,
+                remotionRoot,
+                entryPoint,
+            });
+            (0, can_update_default_props_1.checkIfTypeScriptFile)(compositionFile);
+            const fileContents = (0, node_fs_1.readFileSync)(compositionFile, 'utf-8');
             const result = (0, codemods_1.setCompositionDefaultProps)({
                 project: {
-                    files: { [projectInfo.rootFile]: fileContents },
+                    files: { [compositionFile]: fileContents },
                     rootDir: remotionRoot,
                 },
-                compositionFile: projectInfo.rootFile,
+                compositionFile,
                 compositionId,
                 defaultProps: JSON.parse(defaultProps),
                 enumPaths,
@@ -36,7 +36,7 @@ const updateDefaultPropsHandler = ({ input: { compositionId, defaultProps, enumP
             const { logLine } = result;
             const output = (_b = (_a = result.changes[0]) === null || _a === void 0 ? void 0 : _a.nextContents) !== null && _b !== void 0 ? _b : fileContents;
             (0, undo_stack_1.pushToUndoStack)({
-                filePath: projectInfo.rootFile,
+                filePath: compositionFile,
                 oldContents: fileContents,
                 newContents: null,
                 logLevel,
@@ -50,17 +50,17 @@ const updateDefaultPropsHandler = ({ input: { compositionId, defaultProps, enumP
                 suppressHmrOnFileRestore: true,
                 nodePathRemappings: null,
             });
-            (0, undo_stack_1.suppressUndoStackInvalidation)(projectInfo.rootFile);
-            (0, watch_ignore_next_change_1.suppressBundlerUpdateForFile)(projectInfo.rootFile);
+            (0, undo_stack_1.suppressUndoStackInvalidation)(compositionFile);
+            (0, watch_ignore_next_change_1.suppressBundlerUpdateForFile)(compositionFile);
             (0, file_watcher_1.writeFileAndNotifyFileWatchers)({
-                file: projectInfo.rootFile,
+                file: compositionFile,
                 content: output,
                 originatorClientId: undefined,
                 metadata: null,
             });
             const locationLabel = (0, format_log_file_location_1.formatLogFileLocation)({
                 remotionRoot,
-                absolutePath: projectInfo.rootFile,
+                absolutePath: compositionFile,
                 line: logLine,
             });
             renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${(0, source_file_write_queue_1.getCodemodTimingPrefix)(logLevel)}${renderer_1.RenderInternals.chalk.blueBright(`${locationLabel}`)} Updated default props for "${compositionId}"`);

package/dist/preview-server/sequence-props-watchers.js

@@ -144,8 +144,13 @@ const subscribeToSequencePropsWatchers = ({ fileName, line, column, nodePath: pr
         return initialResult;
     }
     const absolutePath = node_path_1.default.resolve(remotionRoot, fileName);
-    // Cache the resolved nodePath for future lookups with stale source maps
-    (0, node_path_cache_1.setCachedNodePath)(fileName, line, column, initialResult.nodePath.nodePath);
+    // A preferred path may have been remapped while these coordinates still
+    // come from the previous bundle. Caching that pair can make a later mount
+    // at the same location inherit a different sibling's props after Refresh.
+    // Only a location-based subscription can establish a location cache entry.
+    if (preferredNodePath === null) {
+        (0, node_path_cache_1.setCachedNodePath)(fileName, line, column, initialResult.nodePath.nodePath);
+    }
     const { nodePath } = initialResult;
     const watcherKey = getWatcherKey(nodePath, assetKeys);
     const existingWatcher = (_a = sequencePropsWatchers[clientId]) === null || _a === void 0 ? void 0 : _a[watcherKey];

package/dist/preview-server/undo-stack.d.ts

@@ -4,7 +4,7 @@ export interface UndoEntryDescription {
     undoMessage: string;
     redoMessage: string;
 }
-type UndoEntryType = 'visual-control' | 'default-props' | 'sequence-props' | 'effect-props' | 'keyframe-add' | 'keyframe-delete' | 'add-effect' | 'delete-effect' | 'duplicate-effect' | 'paste-effects' | 'reorder-effect' | 'reorder-sequence' | 'delete-nodes' | 'duplicate-nodes' | 'wrap-node' | 'precompose-jsx-nodes' | 'split-sequences' | 'split-video-from-audio' | 'insert-basic-captions' | 'replace-video-source' | 'insert-composition-element' | 'delete-composition' | 'rename-composition' | 'update-composition-metadata' | 'new-composition' | 'duplicate-composition' | 'move-composition-or-folder' | 'new-folder' | 'delete-folder' | 'rename-folder';
+type UndoEntryType = 'visual-control' | 'default-props' | 'sequence-props' | 'effect-props' | 'keyframe-add' | 'keyframe-delete' | 'add-effect' | 'delete-effect' | 'duplicate-effect' | 'paste-effects' | 'reorder-effect' | 'reorder-sequence' | 'delete-nodes' | 'duplicate-nodes' | 'wrap-node' | 'unwrap-node' | 'precompose-jsx-nodes' | 'split-sequences' | 'split-video-from-audio' | 'insert-basic-captions' | 'replace-video-source' | 'insert-composition-element' | 'delete-composition' | 'rename-composition' | 'update-composition-metadata' | 'new-composition' | 'duplicate-composition' | 'move-composition-or-folder' | 'new-folder' | 'delete-folder' | 'rename-folder';
 type UndoEntrySnapshot = {
     filePath: string;
     oldContents: string | null;

package/package.json

@@ -3,7 +3,7 @@
 		"url": "https://github.com/remotion-dev/remotion/tree/main/packages/studio-server"
 	},
 	"name": "@remotion/studio-server",
-	"version": "4.0.536",
+	"version": "4.0.537",
 	"description": "Run a Remotion Studio with a server backend",
 	"main": "dist",
 	"scripts": {
@@ -23,7 +23,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@remotion/studio-protocol": "4.0.536",
+		"@remotion/studio-protocol": "4.0.537",
 		"@babel/types": "7.24.0",
 		"@babel/parser": "7.24.1",
 		"@svgr/core": "8.1.0",
@@ -31,12 +31,12 @@
 		"kiwi-schema": "0.5.0",
 		"semver": "7.5.3",
 		"zod": "4.5.4",
-		"remotion": "4.0.536",
+		"remotion": "4.0.537",
 		"recast": "0.23.21",
-		"@remotion/bundler": "4.0.536",
-		"@remotion/renderer": "4.0.536",
-		"@remotion/codemods": "4.0.536",
-		"@remotion/studio-shared": "4.0.536",
+		"@remotion/bundler": "4.0.537",
+		"@remotion/renderer": "4.0.537",
+		"@remotion/codemods": "4.0.537",
+		"@remotion/studio-shared": "4.0.537",
 		"memfs": "3.4.3",
 		"open": "8.4.2"
 	},
@@ -44,7 +44,7 @@
 		"ast-types": "0.16.1",
 		"react": "19.2.3",
 		"@types/semver": "7.5.3",
-		"@remotion/eslint-config-internal": "4.0.536",
+		"@remotion/eslint-config-internal": "4.0.537",
 		"eslint": "9.19.0",
 		"prettier": "3.8.1",
 		"@types/node": "20.12.14",