@remotion/studio-server 4.0.524 → 4.0.526

package/dist/preview-server/routes/apply-codemod.js

@@ -3,12 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyCodemodHandler = exports.getCodemodLogMessage = void 0;
+exports.applyCodemodHandler = exports.getCodemodLogMessage = exports.formatNewCompositionFile = void 0;
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const renderer_1 = require("@remotion/renderer");
 const studio_codemods_1 = require("@remotion/studio-codemods");
-const generate_canvas_capture_composition_1 = require("../../canvas-capture/generate-canvas-capture-composition");
 const apply_codemod_to_file_1 = require("../../codemods/apply-codemod-to-file");
 const file_watcher_1 = require("../../file-watcher");
 const format_log_file_location_1 = require("../format-log-file-location");
@@ -16,29 +15,8 @@ const project_info_1 = require("../project-info");
 const undo_stack_1 = require("../undo-stack");
 const can_update_default_props_1 = require("./can-update-default-props");
 const source_file_write_queue_1 = require("./source-file-write-queue");
-const formatNewCompositionFile = (codemod) => {
-    if (codemod.canvasCapture !== null) {
-        return (0, generate_canvas_capture_composition_1.generateCanvasCaptureComposition)({
-            componentName: codemod.componentName,
-            compositionId: codemod.newId,
-            data: codemod.canvasCapture.data,
-            durationInFrames: codemod.newDurationInFrames,
-            fps: codemod.newFps,
-            height: codemod.newHeight,
-            keyframeFps: codemod.canvasCapture.keyframeFps,
-            videoFileName: codemod.canvasCapture.videoFileName,
-            videoHeight: codemod.canvasCapture.videoHeight,
-            videoWidth: codemod.canvasCapture.videoWidth,
-            width: codemod.newWidth,
-        });
-    }
-    return `import React from 'react';
-
-export const ${codemod.componentName}: React.FC = () => {
-	return null;
-};
-`;
-};
+const formatNewCompositionFile = (codemod) => (0, studio_codemods_1.makeNewCompositionComponentSource)(codemod);
+exports.formatNewCompositionFile = formatNewCompositionFile;
 const getFolderPath = (parentName, folderName) => {
     return parentName ? `${parentName}/${folderName}` : folderName;
 };
@@ -184,7 +162,7 @@ const getCodemodUndoDescription = (codemod) => {
         entryType: 'visual-control',
     };
 };
-const applyCodemodHandler = ({ input: { codemod, dryRun, symbolicatedStack }, logLevel, remotionRoot, entryPoint, }) => {
+const applyCodemodHandler = ({ input: { codemod, dryRun, symbolicatedStack, undoRedoNavigation }, logLevel, remotionRoot, entryPoint, }) => {
     return (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
         var _a;
         try {
@@ -231,7 +209,7 @@ const applyCodemodHandler = ({ input: { codemod, dryRun, symbolicatedStack }, lo
                     if (componentFilePath === null) {
                         throw new Error('Could not determine the new component file path');
                     }
-                    componentFileContents = await formatNewCompositionFile(codemod);
+                    componentFileContents = await (0, exports.formatNewCompositionFile)(codemod);
                     snapshots.push({
                         filePath: componentFilePath,
                         oldContents: null,
@@ -239,35 +217,19 @@ const applyCodemodHandler = ({ input: { codemod, dryRun, symbolicatedStack }, lo
                         logLine: 1,
                         nodePathRemappings: null,
                     });
-                    (0, undo_stack_1.pushTransactionToUndoStack)({
-                        snapshots,
-                        logLevel,
-                        remotionRoot,
-                        description: {
-                            undoMessage,
-                            redoMessage,
-                        },
-                        entryType,
-                        suppressHmrOnFileRestore: false,
-                    });
-                }
-                else {
-                    (0, undo_stack_1.pushToUndoStack)({
-                        filePath,
-                        oldContents: input,
-                        newContents: null,
-                        logLevel,
-                        remotionRoot,
-                        logLine,
-                        description: {
-                            undoMessage,
-                            redoMessage,
-                        },
-                        entryType,
-                        suppressHmrOnFileRestore: false,
-                        nodePathRemappings: null,
-                    });
                 }
+                (0, undo_stack_1.pushTransactionToUndoStack)({
+                    snapshots,
+                    logLevel,
+                    remotionRoot,
+                    description: {
+                        undoMessage,
+                        redoMessage,
+                    },
+                    entryType,
+                    suppressHmrOnFileRestore: false,
+                    undoRedoNavigation,
+                });
                 (0, undo_stack_1.suppressUndoStackInvalidation)(filePath);
                 if (componentFilePath) {
                     (0, undo_stack_1.suppressUndoStackInvalidation)(componentFilePath);

package/dist/preview-server/routes/apply-visual-control-change.js

@@ -45,7 +45,6 @@ const format_log_file_location_1 = require("../format-log-file-location");
 const live_events_1 = require("../live-events");
 const undo_stack_1 = require("../undo-stack");
 const watch_ignore_next_change_1 = require("../watch-ignore-next-change");
-const log_update_1 = require("./log-updates/log-update");
 const source_file_write_queue_1 = require("./source-file-write-queue");
 const getVisualControlChangeLine = (file, changeId) => {
     let line = 1;
@@ -68,7 +67,7 @@ const getVisualControlChangeLine = (file, changeId) => {
     return line;
 };
 const applyVisualControlHandler = ({ input: { fileName, changes }, remotionRoot, logLevel }) => {
-    return (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
+    return (0, source_file_write_queue_1.withSourceFileWriteQueue)(() => {
         renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[apply-visual-control] Received request for ${fileName} with ${changes.length} changes`);
         const { absolutePath } = (0, resolve_file_inside_project_1.resolveFileInsideProject)({
             remotionRoot,
@@ -78,9 +77,9 @@ const applyVisualControlHandler = ({ input: { fileName, changes }, remotionRoot,
         const fileContents = (0, node_fs_1.readFileSync)(absolutePath, 'utf-8');
         const ast = (0, parse_ast_1.parseAst)(fileContents);
         const logLine = changes.length > 0 ? getVisualControlChangeLine(ast, changes[0].id) : 1;
-        const { newAst, changesMade } = (0, studio_codemods_1.applyCodemod)({
-            file: ast,
-            codeMod: {
+        const { newContents: output, changesMade } = (0, studio_codemods_1.applyVisualControl)({
+            input: fileContents,
+            transformation: {
                 type: 'apply-visual-control',
                 changes,
             },
@@ -88,28 +87,6 @@ const applyVisualControlHandler = ({ input: { fileName, changes }, remotionRoot,
         if (changesMade.length === 0) {
             throw new Error('No changes were made to the file');
         }
-        let output = (0, parse_ast_1.serializeAst)(newAst);
-        let formatted = false;
-        try {
-            const prettier = await Promise.resolve().then(() => __importStar(require('prettier')));
-            const { format, resolveConfig, resolveConfigFile } = prettier;
-            const configFilePath = await resolveConfigFile();
-            if (configFilePath) {
-                const prettierConfig = await resolveConfig(configFilePath);
-                if (prettierConfig) {
-                    output = await format(output, {
-                        ...prettierConfig,
-                        filepath: 'test.tsx',
-                        plugins: [],
-                        endOfLine: 'auto',
-                    });
-                    formatted = true;
-                }
-            }
-        }
-        catch (_a) {
-            // Prettier not available, use unformatted output
-        }
         (0, undo_stack_1.pushToUndoStack)({
             filePath: absolutePath,
             oldContents: fileContents,
@@ -151,13 +128,8 @@ const applyVisualControlHandler = ({ input: { fileName, changes }, remotionRoot,
             line: logLine,
         });
         renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${(0, source_file_write_queue_1.getCodemodTimingPrefix)(logLevel)}${renderer_1.RenderInternals.chalk.blueBright(`${locationLabel}`)} Applied visual control changes`);
-        if (!formatted) {
-            (0, log_update_1.warnAboutPrettierOnce)(logLevel);
-        }
         (0, undo_stack_1.printUndoHint)(logLevel);
-        return {
-            success: true,
-        };
+        return Promise.resolve({ success: true });
     });
 };
 exports.applyVisualControlHandler = applyVisualControlHandler;

package/dist/preview-server/routes/batch-update-keyframe-settings.js

@@ -151,6 +151,7 @@ const batchUpdateKeyframeSettings = async ({ sequenceKeyframes, effectKeyframes,
             },
         entryType: sequenceKeyframes.length > 0 ? 'sequence-props' : 'effect-props',
         suppressHmrOnFileRestore: true,
+        undoRedoNavigation: null,
     });
     for (const snapshot of snapshots) {
         (0, undo_stack_1.suppressUndoStackInvalidation)(snapshot.filePath);

package/dist/preview-server/routes/delete-keyframes.js

@@ -186,6 +186,7 @@ const deleteKeyframes = async ({ sequenceKeyframes, effectKeyframes, clientId, r
                 ? 'sequence-props'
                 : 'effect-props',
         suppressHmrOnFileRestore: true,
+        undoRedoNavigation: null,
     });
     for (const snapshot of snapshots) {
         (0, undo_stack_1.suppressUndoStackInvalidation)(snapshot.filePath);

package/dist/preview-server/routes/duplicate-jsx-node.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.duplicateJsxNodeHandler = void 0;
 const node_fs_1 = require("node:fs");
 const renderer_1 = require("@remotion/renderer");
-const duplicate_jsx_node_1 = require("../../codemods/duplicate-jsx-node");
+const studio_codemods_1 = require("@remotion/studio-codemods");
 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 log_update_1 = require("./log-updates/log-update");
 const source_file_write_queue_1 = require("./source-file-write-queue");
 const duplicateJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) => {
     return (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
@@ -32,7 +31,7 @@ const duplicateJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) =
                     action: 'modify',
                 });
                 const fileContents = (0, node_fs_1.readFileSync)(absolutePath, 'utf-8');
-                const { output, formatted, nodeLabels, logLines, nodePathRemappings } = await (0, duplicate_jsx_node_1.duplicateJsxNodes)({
+                const { output, nodeLabels, logLines, nodePathRemappings } = await (0, studio_codemods_1.duplicateJsxNodes)({
                     input: fileContents,
                     nodePaths: fileItems.map((item) => item.nodePath),
                 });
@@ -40,7 +39,6 @@ const duplicateJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) =
                     absolutePath,
                     fileRelativeToRoot,
                     fileContents,
-                    formatted,
                     logLine: Math.min(...logLines),
                     nodeLabels,
                     nodePathRemappings,
@@ -70,6 +68,7 @@ const duplicateJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) =
                 },
                 entryType: 'duplicate-jsx-node',
                 suppressHmrOnFileRestore: false,
+                undoRedoNavigation: null,
             });
             for (const update of updates) {
                 (0, undo_stack_1.suppressUndoStackInvalidation)(update.absolutePath);
@@ -88,10 +87,7 @@ const duplicateJsxNodeHandler = ({ input: { nodes }, remotionRoot, logLevel }) =
                     ? update.nodeLabels[0]
                     : `${update.nodeLabels.length} JSX nodes`;
                 renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${(0, source_file_write_queue_1.getCodemodTimingPrefix)(logLevel)}${renderer_1.RenderInternals.chalk.blueBright(`${locationLabel}`)} Duplicated ${fileDescription}`);
-                if (!update.formatted) {
-                    (0, log_update_1.warnAboutPrettierOnce)(logLevel);
-                }
-                renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `[duplicate-jsx-node] Wrote ${update.fileRelativeToRoot}${update.formatted ? ' (formatted)' : ''}`);
+                renderer_1.RenderInternals.Log.verbose({ indent: false, logLevel }, `[duplicate-jsx-node] Wrote ${update.fileRelativeToRoot}`);
             }
             (0, undo_stack_1.printUndoHint)(logLevel);
             return {

package/dist/preview-server/routes/insert-element.js

@@ -1,12 +1,21 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.insertElementHandler = void 0;
+const node_fs_1 = require("node:fs");
+const node_path_1 = __importDefault(require("node:path"));
 const renderer_1 = require("@remotion/renderer");
+const apply_codemod_to_file_1 = require("../../codemods/apply-codemod-to-file");
 const file_watcher_1 = require("../../file-watcher");
 const resolve_composition_component_1 = require("../../helpers/resolve-composition-component");
 const format_log_file_location_1 = require("../format-log-file-location");
+const project_info_1 = require("../project-info");
 const sequence_node_path_mutation_1 = require("../sequence-node-path-mutation");
 const undo_stack_1 = require("../undo-stack");
+const apply_codemod_1 = require("./apply-codemod");
+const can_update_default_props_1 = require("./can-update-default-props");
 const element_install_plan_1 = require("./element-install-plan");
 const source_file_write_queue_1 = require("./source-file-write-queue");
 const hasExpectedFileState = ({ expected, actual, }) => {
@@ -21,9 +30,9 @@ const hasExpectedFileState = ({ expected, actual, }) => {
     }
     return actual.sourceHash === expected.sourceHash;
 };
-const insertElementHandler = ({ input: { compositionFile, compositionId, element, installationName, expectedFileState, from, position, overwriteExisting, }, entryPoint, remotionRoot, logLevel, }) => (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
-    var _a;
-    var _b;
+const insertElementHandler = ({ input: { compositionFile, compositionId, element, installationName, expectedFileState, from, position, overwriteExisting, undoRedoNavigation, newComposition, }, entryPoint, remotionRoot, logLevel, }) => (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
+    var _a, _b, _c;
+    var _d, _e, _f;
     try {
         (0, element_install_plan_1.validateElementInstallPosition)(position);
         if (from !== null &&
@@ -50,13 +59,57 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
             throw new Error('Component-owned Element initial style must be an object');
         }
         renderer_1.RenderInternals.Log.trace({ indent: false, logLevel }, `[insert-element] Received request for compositionFile="${compositionFile}" compositionId="${compositionId}" element="${element.slug}"`);
-        const plan = await (0, element_install_plan_1.getElementInstallPlan)({
-            installationName,
-            destination: {
+        let compositionCreation = null;
+        let sourceFileOverrides = null;
+        if (newComposition !== null) {
+            if (newComposition.codemod.newId !== compositionId) {
+                throw new Error('New composition ID does not match installation target');
+            }
+            const registrationFilePath = newComposition.symbolicatedStack
+                ? (0, apply_codemod_to_file_1.resolveFilePathFromSymbolicatedStack)(remotionRoot, newComposition.symbolicatedStack)
+                : (await (0, project_info_1.getProjectInfo)(remotionRoot, entryPoint)).rootFile;
+            if (registrationFilePath === null) {
+                throw new Error('Cannot find file for composition in project');
+            }
+            (0, can_update_default_props_1.checkIfTypeScriptFile)(registrationFilePath);
+            if (node_path_1.default.resolve(remotionRoot, compositionFile) !== registrationFilePath) {
+                throw new Error('New composition source does not match installation target');
+            }
+            const componentFilePath = node_path_1.default.join(node_path_1.default.dirname(registrationFilePath), `${newComposition.codemod.componentName}.tsx`);
+            if ((0, node_fs_1.existsSync)(componentFilePath)) {
+                throw new Error(`Cannot create ${node_path_1.default.relative(remotionRoot, componentFilePath)} because it already exists`);
+            }
+            const registrationFileOldContents = (0, node_fs_1.readFileSync)(registrationFilePath, 'utf-8');
+            const registrationFileNewContents = await (0, apply_codemod_to_file_1.applyCodemodToFile)({
+                filePath: registrationFilePath,
+                codeMod: newComposition.codemod,
+            });
+            const componentFileContents = await (0, apply_codemod_1.formatNewCompositionFile)(newComposition.codemod);
+            compositionCreation = {
+                componentFileContents,
+                componentFilePath,
+                registrationFileNewContents,
+                registrationFileOldContents,
+                registrationFilePath,
+            };
+            sourceFileOverrides = new Map([
+                [registrationFilePath, registrationFileNewContents],
+                [componentFilePath, componentFileContents],
+            ]);
+        }
+        const installDestination = newComposition === null
+            ? {
                 type: 'current-composition',
                 compositionFile,
                 compositionId,
-            },
+            }
+            : {
+                type: 'new-composition',
+                compositionFile,
+            };
+        const plan = await (0, element_install_plan_1.getElementInstallPlan)({
+            installationName,
+            destination: installDestination,
             element,
             entryPoint,
             remotionRoot,
@@ -93,8 +146,13 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
                 },
             };
         }
+        if (compositionCreation !== null &&
+            plan.elementFileName ===
+                node_path_1.default.join(node_path_1.default.dirname(plan.safePaths.compositionFileName), node_path_1.default.basename(compositionCreation.componentFilePath))) {
+            throw new Error('Element source file conflicts with the new composition file');
+        }
         const shouldWriteElementFile = !plan.elementFileExists || elementSourcesDiffer;
-        const inserted = await (0, resolve_composition_component_1.insertJsxElementIntoComposition)({
+        const insertionInput = {
             remotionRoot,
             compositionFile,
             compositionId,
@@ -104,7 +162,7 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
                 importName: plan.componentName,
                 importPath: plan.importPath,
                 props: [
-                    ...Object.entries((_b = element.initialProps) !== null && _b !== void 0 ? _b : {}).map(([name, value]) => ({ name, value })),
+                    ...Object.entries((_d = element.initialProps) !== null && _d !== void 0 ? _d : {}).map(([name, value]) => ({ name, value })),
                     ...(componentOwnsSequence && element.durationInFrames !== null
                         ? [
                             {
@@ -130,14 +188,18 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
                     name: element.displayName,
                     position,
                 },
+        };
+        const inserted = await (0, resolve_composition_component_1.insertJsxElementIntoComposition)({
+            ...insertionInput,
+            sourceFileOverrides,
         });
+        if (compositionCreation !== null &&
+            inserted.fileName !== compositionCreation.componentFilePath) {
+            throw new Error('New composition component does not match installation target');
+        }
         const finalPlan = await (0, element_install_plan_1.getElementInstallPlan)({
             installationName,
-            destination: {
-                type: 'current-composition',
-                compositionFile,
-                compositionId,
-            },
+            destination: installDestination,
             element,
             entryPoint,
             remotionRoot,
@@ -152,6 +214,12 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
         })) {
             throw new Error('Element source changed during installation');
         }
+        if (compositionCreation !== null &&
+            ((0, node_fs_1.readFileSync)(compositionCreation.registrationFilePath, 'utf-8') !==
+                compositionCreation.registrationFileOldContents ||
+                (0, node_fs_1.existsSync)(compositionCreation.componentFilePath))) {
+            throw new Error('Composition source changed during Element installation');
+        }
         const nodePathMutation = (0, sequence_node_path_mutation_1.broadcastSequenceNodePathMutation)([
             {
                 absolutePath: inserted.fileName,
@@ -160,6 +228,17 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
         ], null);
         (0, undo_stack_1.pushTransactionToUndoStack)({
             snapshots: [
+                ...(compositionCreation === null
+                    ? []
+                    : [
+                        {
+                            filePath: compositionCreation.registrationFilePath,
+                            oldContents: compositionCreation.registrationFileOldContents,
+                            newContents: compositionCreation.registrationFileNewContents,
+                            logLine: (_e = (_b = newComposition === null || newComposition === void 0 ? void 0 : newComposition.symbolicatedStack) === null || _b === void 0 ? void 0 : _b.originalLineNumber) !== null && _e !== void 0 ? _e : 1,
+                            nodePathRemappings: null,
+                        },
+                    ]),
                 ...(shouldWriteElementFile
                     ? [
                         {
@@ -173,7 +252,7 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
                     : []),
                 {
                     filePath: inserted.fileName,
-                    oldContents: inserted.oldContents,
+                    oldContents: compositionCreation === null ? inserted.oldContents : null,
                     newContents: inserted.output,
                     logLine: inserted.logLine,
                     nodePathRemappings: inserted.nodePathRemappings,
@@ -181,17 +260,34 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
             ],
             logLevel,
             remotionRoot,
-            description: {
-                undoMessage: `↩️  Added ${element.displayName}`,
-                redoMessage: `↪️  Added ${element.displayName}`,
-            },
+            description: newComposition === null
+                ? {
+                    undoMessage: `↩️  Added ${element.displayName}`,
+                    redoMessage: `↪️  Added ${element.displayName}`,
+                }
+                : {
+                    undoMessage: `↩️  Installation of ${element.displayName} into composition "${compositionId}"`,
+                    redoMessage: `↪️  Installation of ${element.displayName} into composition "${compositionId}"`,
+                },
             entryType: 'insert-jsx-element',
             suppressHmrOnFileRestore: false,
+            undoRedoNavigation,
         });
+        if (compositionCreation !== null) {
+            (0, undo_stack_1.suppressUndoStackInvalidation)(compositionCreation.registrationFilePath);
+        }
         if (shouldWriteElementFile) {
             (0, undo_stack_1.suppressUndoStackInvalidation)(plan.elementFileName);
         }
         (0, undo_stack_1.suppressUndoStackInvalidation)(inserted.fileName);
+        if (compositionCreation !== null) {
+            (0, file_watcher_1.writeFileAndNotifyFileWatchers)({
+                file: compositionCreation.registrationFilePath,
+                content: compositionCreation.registrationFileNewContents,
+                originatorClientId: undefined,
+                metadata: null,
+            });
+        }
         if (shouldWriteElementFile) {
             (0, file_watcher_1.writeFileAndNotifyFileWatchers)({
                 file: plan.elementFileName,
@@ -206,6 +302,13 @@ const insertElementHandler = ({ input: { compositionFile, compositionId, element
             originatorClientId: undefined,
             metadata: { skipSequencePropsUpdate: true },
         });
+        if (newComposition !== null && compositionCreation !== null) {
+            renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, `${(0, source_file_write_queue_1.getCodemodTimingPrefix)(logLevel)}${renderer_1.RenderInternals.chalk.blueBright((0, format_log_file_location_1.formatLogFileLocation)({
+                remotionRoot,
+                absolutePath: compositionCreation.registrationFilePath,
+                line: (_f = (_c = newComposition.symbolicatedStack) === null || _c === void 0 ? void 0 : _c.originalLineNumber) !== null && _f !== void 0 ? _f : 1,
+            }))} Created composition "${compositionId}"`);
+        }
         const compositionLocationLabel = (0, format_log_file_location_1.formatLogFileLocation)({
             remotionRoot,
             absolutePath: inserted.fileName,

package/dist/preview-server/routes/insert-jsx-element.js

@@ -165,6 +165,7 @@ const insertJsxElementHandler = ({ input: { compositionFile, compositionId, elem
             element,
             from,
             prettierConfigOverride: null,
+            sourceFileOverrides: null,
         });
         const nodePathMutation = (0, sequence_node_path_mutation_1.broadcastSequenceNodePathMutation)([
             {

package/dist/preview-server/routes/install-remotion-skill.d.ts

@@ -0,0 +1,4 @@
+import type { GetRemotionSkillsInfoResponse, InstallRemotionSkillRequest, RemoveRemotionSkillRequest } from '@remotion/studio-shared';
+import type { ApiHandler } from '../api-types';
+export declare const installRemotionSkillHandler: ApiHandler<InstallRemotionSkillRequest, GetRemotionSkillsInfoResponse>;
+export declare const removeRemotionSkillHandler: ApiHandler<RemoveRemotionSkillRequest, GetRemotionSkillsInfoResponse>;

package/dist/preview-server/routes/install-remotion-skill.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeRemotionSkillHandler = exports.installRemotionSkillHandler = void 0;
+const node_child_process_1 = require("node:child_process");
+const renderer_1 = require("@remotion/renderer");
+const package_manager_spawn_options_1 = require("../../helpers/package-manager-spawn-options");
+const remotion_skill_names_1 = require("../../remotion-skill-names");
+const get_package_manager_1 = require("../get-package-manager");
+const remotion_skills_info_1 = require("./remotion-skills-info");
+const changingSkillsInProjects = new Set();
+const changeRemotionSkill = async ({ action, remotionRoot, input: { skill }, logLevel, }) => {
+    if (!remotion_skill_names_1.remotionSkillNames.some((name) => name === skill)) {
+        throw new Error(`Unknown Remotion skill: ${JSON.stringify(skill)}`);
+    }
+    if (changingSkillsInProjects.has(remotionRoot)) {
+        throw new Error('A skill is already being installed or removed. Please try again once it finishes.');
+    }
+    changingSkillsInProjects.add(remotionRoot);
+    try {
+        const installedSkill = (0, remotion_skills_info_1.getRemotionSkillsInfo)({ remotionRoot }).skills.find(({ name }) => name === skill);
+        const removingGlobally = action === 'remove' &&
+            (installedSkill === null || installedSkill === void 0 ? void 0 : installedSkill.installedInProject) === false &&
+            installedSkill.installedGlobally;
+        if (action === 'remove' &&
+            !removingGlobally &&
+            !(installedSkill === null || installedSkill === void 0 ? void 0 : installedSkill.installedInProject)) {
+            throw new Error(`${skill} is not installed.`);
+        }
+        const packageManager = (0, get_package_manager_1.getPackageManager)({
+            remotionRoot,
+            packageManager: undefined,
+            dirUp: 0,
+            logLevel,
+        });
+        const useBunx = packageManager !== 'unknown' && packageManager.manager === 'bun';
+        const executable = useBunx
+            ? 'bunx'
+            : process.platform === 'win32'
+                ? 'npx.cmd'
+                : 'npx';
+        const commandArgs = action === 'install'
+            ? ['add', `remotion-dev/skills@${skill}`, '--yes']
+            : ['remove', ...(removingGlobally ? ['--global'] : []), skill, '--yes'];
+        const args = useBunx
+            ? ['--silent', 'skills@1.5.26', ...commandArgs]
+            : ['--yes', '--loglevel=error', 'skills@1.5.26', ...commandArgs];
+        renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, renderer_1.RenderInternals.chalk.gray(`╭─  ${executable} ${args.join(' ')}`));
+        const time = Date.now();
+        try {
+            await new Promise((resolve, reject) => {
+                const child = (0, node_child_process_1.spawn)(executable, args, {
+                    cwd: remotionRoot,
+                    env: { ...process.env, DISABLE_TELEMETRY: '1' },
+                    stdio: ['ignore', 'pipe', 'pipe'],
+                    ...(0, package_manager_spawn_options_1.getPackageManagerSpawnOptions)(),
+                });
+                let output = '';
+                const onData = (data) => {
+                    output = (output + data.toString()).slice(-8000);
+                    data
+                        .toString()
+                        .trim()
+                        .split('\n')
+                        .forEach((line) => renderer_1.RenderInternals.Log.info({ indent: true, logLevel }, line));
+                };
+                child.stdout.on('data', onData);
+                child.stderr.on('data', onData);
+                child.on('error', reject);
+                child.on('close', (code, signal) => {
+                    if (code === 0) {
+                        resolve();
+                    }
+                    else {
+                        reject(new Error(`Could not ${action} ${skill} (exit code ${code}, signal ${signal}). ${output.trim()}`));
+                    }
+                });
+            });
+            const info = (0, remotion_skills_info_1.getRemotionSkillsInfo)({ remotionRoot });
+            const updatedSkill = info.skills.find(({ name }) => name === skill);
+            if (action === 'install' && !(updatedSkill === null || updatedSkill === void 0 ? void 0 : updatedSkill.installedInProject)) {
+                throw new Error(`The installer finished, but ${skill} was not found in the project. Please try again.`);
+            }
+            if (action === 'remove' &&
+                (removingGlobally
+                    ? updatedSkill === null || updatedSkill === void 0 ? void 0 : updatedSkill.installedGlobally
+                    : updatedSkill === null || updatedSkill === void 0 ? void 0 : updatedSkill.installedInProject)) {
+                throw new Error(`The remover finished, but ${skill} is still installed ${removingGlobally ? 'globally' : 'in the project'}. Please try again.`);
+            }
+            renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, renderer_1.RenderInternals.chalk.gray('╰─ '), `Done in ${Date.now() - time}ms`);
+            return info;
+        }
+        catch (error) {
+            renderer_1.RenderInternals.Log.info({ indent: false, logLevel }, renderer_1.RenderInternals.chalk.gray('╰─ '), renderer_1.RenderInternals.chalk.red(`Errored in ${Date.now() - time}ms`));
+            throw error;
+        }
+    }
+    finally {
+        changingSkillsInProjects.delete(remotionRoot);
+    }
+};
+const installRemotionSkillHandler = (input) => {
+    return changeRemotionSkill({ ...input, action: 'install' });
+};
+exports.installRemotionSkillHandler = installRemotionSkillHandler;
+const removeRemotionSkillHandler = (input) => {
+    return changeRemotionSkill({ ...input, action: 'remove' });
+};
+exports.removeRemotionSkillHandler = removeRemotionSkillHandler;

package/dist/preview-server/routes/invalidate-bundle.d.ts

@@ -0,0 +1,3 @@
+import type { ApiRoutes } from '@remotion/studio-shared';
+import type { ApiHandler } from '../api-types';
+export declare const invalidateBundleHandler: ApiHandler<ApiRoutes['/api/invalidate-bundle']['Request'], ApiRoutes['/api/invalidate-bundle']['Response']>;

package/dist/preview-server/routes/invalidate-bundle.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.invalidateBundleHandler = void 0;
+const watch_ignore_next_change_1 = require("../watch-ignore-next-change");
+const source_file_write_queue_1 = require("./source-file-write-queue");
+const invalidateBundleHandler = () => {
+    return (0, source_file_write_queue_1.withSourceFileWriteQueue)(async () => {
+        return { didInvalidate: await (0, watch_ignore_next_change_1.invalidatePreviouslySuppressedFiles)() };
+    });
+};
+exports.invalidateBundleHandler = invalidateBundleHandler;

package/dist/preview-server/routes/move-keyframes.js

@@ -195,6 +195,7 @@ const moveKeyframes = async ({ sequenceKeyframes, effectKeyframes, clientId, rem
                 ? 'sequence-props'
                 : 'effect-props',
         suppressHmrOnFileRestore: true,
+        undoRedoNavigation: null,
     });
     for (const snapshot of snapshots) {
         (0, undo_stack_1.suppressUndoStackInvalidation)(snapshot.filePath);