🎥 Make videos programmatically with React
refactor(studio-server): remove codemod re-export files
JonnyBurger3c7788e0ede5
diff --git a/packages/studio-server/src/codemods/add-effect.ts b/packages/studio-server/src/codemods/add-effect.tsdeleted file mode 100644index ba45cb51c1..0000000000--- a/packages/studio-server/src/codemods/add-effect.ts+++ /dev/null@@ -1,8 +0,0 @@-import {CodemodsInternals} from '@remotion/codemods';--export const {- addEffect,- assertValidEffect,- ensureEffectImport,- makeConfigObjectExpression,-} = CodemodsInternals;diff --git a/packages/studio-server/src/codemods/delete-effect.ts b/packages/studio-server/src/codemods/delete-effect.tsdeleted file mode 100644index 853a4ed24f..0000000000--- a/packages/studio-server/src/codemods/delete-effect.ts+++ /dev/null@@ -1,5 +0,0 @@-import {CodemodsInternals} from '@remotion/codemods';--export type {EffectDeletionTarget} from '@remotion/codemods';--export const {deleteEffect, deleteEffects} = CodemodsInternals;diff --git a/packages/studio-server/src/codemods/duplicate-effect.ts b/packages/studio-server/src/codemods/duplicate-effect.tsdeleted file mode 100644index ec5406c80c..0000000000--- a/packages/studio-server/src/codemods/duplicate-effect.ts+++ /dev/null@@ -1,5 +0,0 @@-import {CodemodsInternals} from '@remotion/codemods';--export type {EffectTarget as EffectDuplicationTarget} from '@remotion/codemods';--export const {duplicateEffect, duplicateEffects} = CodemodsInternals;diff --git a/packages/studio-server/src/codemods/insert-basic-captions.ts b/packages/studio-server/src/codemods/insert-basic-captions.tsdeleted file mode 100644index cfbdc9c91d..0000000000--- a/packages/studio-server/src/codemods/insert-basic-captions.ts+++ /dev/null@@ -1,3 +0,0 @@-import {CodemodsInternals} from '@remotion/codemods';--export const {insertBasicCaptions} = CodemodsInternals;diff --git a/packages/studio-server/src/codemods/reorder-effect.ts b/packages/studio-server/src/codemods/reorder-effect.tsdeleted file mode 100644index 9b5364db47..0000000000--- a/packages/studio-server/src/codemods/reorder-effect.ts+++ /dev/null@@ -1,3 +0,0 @@-import {CodemodsInternals} from '@remotion/codemods';--export const {reorderEffect} = CodemodsInternals;diff --git a/packages/studio-server/src/codemods/reorder-sequence.ts b/packages/studio-server/src/codemods/reorder-sequence.tsdeleted file mode 100644index fd8d6d0362..0000000000--- a/packages/studio-server/src/codemods/reorder-sequence.ts+++ /dev/null@@ -1,3 +0,0 @@-import {CodemodsInternals} from '@remotion/codemods';--export const {reorderSequence} = CodemodsInternals;diff --git a/packages/studio-server/src/codemods/split-video-from-audio.ts b/packages/studio-server/src/codemods/split-video-from-audio.tsdeleted file mode 100644index e6dbd5706b..0000000000--- a/packages/studio-server/src/codemods/split-video-from-audio.ts+++ /dev/null@@ -1,3 +0,0 @@-import {CodemodsInternals} from '@remotion/codemods';--export const {splitVideoFromAudio} = CodemodsInternals;diff --git a/packages/studio-server/src/codemods/update-default-props.ts b/packages/studio-server/src/codemods/update-default-props.tsdeleted file mode 100644index 2b4e576f36..0000000000--- a/packages/studio-server/src/codemods/update-default-props.ts+++ /dev/null@@ -1,4 +0,0 @@-import {CodemodsInternals} from '@remotion/codemods';--export const {getCompositionDefaultPropsLine, updateDefaultProps} =- CodemodsInternals;diff --git a/packages/studio-server/src/codemods/update-inline-caption-patches.ts b/packages/studio-server/src/codemods/update-inline-caption-patches.tsdeleted file mode 100644index 8f0ae6173d..0000000000--- a/packages/studio-server/src/codemods/update-inline-caption-patches.ts+++ /dev/null@@ -1,3 +0,0 @@-import {CodemodsInternals} from '@remotion/codemods';--export const {updateInlineCaptionPatches} = CodemodsInternals;diff --git a/packages/studio-server/src/codemods/update-keyframes/ensure-imports-and-frame-hook.ts b/packages/studio-server/src/codemods/update-keyframes/ensure-imports-and-frame-hook.tsdeleted file mode 100644index ebab14e85e..0000000000--- a/packages/studio-server/src/codemods/update-keyframes/ensure-imports-and-frame-hook.ts+++ /dev/null@@ -1,7 +0,0 @@-import {CodemodsInternals} from '@remotion/codemods';--export const {- ensureRemotionImports,- ensureUseCurrentFrameHook,- findEnclosingFunctionPath,-} = CodemodsInternals;diff --git a/packages/studio-server/src/index.ts b/packages/studio-server/src/index.tsindex dd74fa3285..d4fdf0328e 100644--- a/packages/studio-server/src/index.ts+++ b/packages/studio-server/src/index.ts@@ -31,7 +31,6 @@ import {removeCompletedClientRender,} from './client-render-queue';import {applyCodemodToFile} from './codemods/apply-codemod-to-file';-import {updateDefaultProps} from './codemods/update-default-props';import {detectOutdatedRemotionSkills,parseRemotionSkillVersion,@@ -65,6 +64,8 @@ import {getRemotionVersion} from './preview-server/update-available';import {remotionSkillNames} from './remotion-skill-names';import {startStudio} from './start-studio';+const {updateDefaultProps} = CodemodsInternals;+const parseAndApplyCodemod = ({input,codeMod,diff --git a/packages/studio-server/src/preview-server/routes/add-effect.ts b/packages/studio-server/src/preview-server/routes/add-effect.tsindex 6cdb30ebdc..210098a58b 100644--- a/packages/studio-server/src/preview-server/routes/add-effect.ts+++ b/packages/studio-server/src/preview-server/routes/add-effect.ts@@ -1,10 +1,10 @@import {readFileSync} from 'node:fs';+import {CodemodsInternals} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';import type {AddEffectRequest,AddEffectResponse,} from '@remotion/studio-shared';-import {addEffect} from '../../codemods/add-effect';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';import type {ApiHandler} from '../api-types';@@ -21,6 +21,8 @@ import {withSourceFileWriteQueue,} from './source-file-write-queue';+const {addEffect} = CodemodsInternals;+export const addEffectHandler: ApiHandler<AddEffectRequest,AddEffectResponsediff --git a/packages/studio-server/src/preview-server/routes/delete-effect.ts b/packages/studio-server/src/preview-server/routes/delete-effect.tsindex 5197b1d7ec..919ee615bb 100644--- a/packages/studio-server/src/preview-server/routes/delete-effect.ts+++ b/packages/studio-server/src/preview-server/routes/delete-effect.ts@@ -1,10 +1,10 @@import {readFileSync} from 'node:fs';+import {CodemodsInternals} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';import type {DeleteEffectRequest,DeleteEffectResponse,} from '@remotion/studio-shared';-import {deleteEffects} from '../../codemods/delete-effect';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';import type {ApiHandler} from '../api-types';@@ -21,6 +21,8 @@ import {withSourceFileWriteQueue,} from './source-file-write-queue';+const {deleteEffects} = CodemodsInternals;+const getDeletedEffectDescription = (effectLabels: string[]): string => {if (effectLabels.length === 1) {return effectLabels[0];diff --git a/packages/studio-server/src/preview-server/routes/duplicate-effect.ts b/packages/studio-server/src/preview-server/routes/duplicate-effect.tsindex ef409c132b..8fc7e4d175 100644--- a/packages/studio-server/src/preview-server/routes/duplicate-effect.ts+++ b/packages/studio-server/src/preview-server/routes/duplicate-effect.ts@@ -1,10 +1,10 @@import {readFileSync} from 'node:fs';+import {CodemodsInternals} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';import type {DuplicateEffectRequest,DuplicateEffectResponse,} from '@remotion/studio-shared';-import {duplicateEffects} from '../../codemods/duplicate-effect';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';import type {ApiHandler} from '../api-types';@@ -21,6 +21,8 @@ import {withSourceFileWriteQueue,} from './source-file-write-queue';+const {duplicateEffects} = CodemodsInternals;+const getDuplicatedEffectDescription = (effectLabels: string[]): string => {if (effectLabels.length === 1) {return effectLabels[0];diff --git a/packages/studio-server/src/preview-server/routes/insert-basic-captions.ts b/packages/studio-server/src/preview-server/routes/insert-basic-captions.tsindex 30f2570c15..4ac0b11ca3 100644--- a/packages/studio-server/src/preview-server/routes/insert-basic-captions.ts+++ b/packages/studio-server/src/preview-server/routes/insert-basic-captions.ts@@ -5,7 +5,6 @@ import type {InsertBasicCaptionsRequest,InsertBasicCaptionsResponse,} from '@remotion/studio-shared';-import {insertBasicCaptions} from '../../codemods/insert-basic-captions';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';import type {ApiHandler} from '../api-types';@@ -21,8 +20,11 @@ import {withSourceFileWriteQueue,} from './source-file-write-queue';-const {basicCaptionsElementSource, getBasicCaptionsElementFile} =- CodemodsInternals;+const {+ basicCaptionsElementSource,+ getBasicCaptionsElementFile,+ insertBasicCaptions,+} = CodemodsInternals;export const insertBasicCaptionsHandler: ApiHandler<InsertBasicCaptionsRequest,diff --git a/packages/studio-server/src/preview-server/routes/reorder-effect.ts b/packages/studio-server/src/preview-server/routes/reorder-effect.tsindex cf84344969..ceffff5ebe 100644--- a/packages/studio-server/src/preview-server/routes/reorder-effect.ts+++ b/packages/studio-server/src/preview-server/routes/reorder-effect.ts@@ -1,10 +1,10 @@import {readFileSync} from 'node:fs';+import {CodemodsInternals} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';import type {ReorderEffectRequest,ReorderEffectResponse,} from '@remotion/studio-shared';-import {reorderEffect} from '../../codemods/reorder-effect';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';import type {ApiHandler} from '../api-types';@@ -21,6 +21,8 @@ import {withSourceFileWriteQueue,} from './source-file-write-queue';+const {reorderEffect} = CodemodsInternals;+export const reorderEffectHandler: ApiHandler<ReorderEffectRequest,ReorderEffectResponsediff --git a/packages/studio-server/src/preview-server/routes/reorder-sequence.ts b/packages/studio-server/src/preview-server/routes/reorder-sequence.tsindex 3297be06f5..9bfae7eee0 100644--- a/packages/studio-server/src/preview-server/routes/reorder-sequence.ts+++ b/packages/studio-server/src/preview-server/routes/reorder-sequence.ts@@ -1,10 +1,10 @@import {readFileSync} from 'node:fs';+import {CodemodsInternals} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';import type {ReorderSequenceRequest,ReorderSequenceResponse,} from '@remotion/studio-shared';-import {reorderSequence} from '../../codemods/reorder-sequence';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';import type {ApiHandler} from '../api-types';@@ -21,6 +21,8 @@ import {withSourceFileWriteQueue,} from './source-file-write-queue';+const {reorderSequence} = CodemodsInternals;+export const reorderSequenceHandler: ApiHandler<ReorderSequenceRequest,ReorderSequenceResponsediff --git a/packages/studio-server/src/preview-server/routes/save-sequence-props.ts b/packages/studio-server/src/preview-server/routes/save-sequence-props.tsindex 422e520ed3..27e38e5f83 100644--- a/packages/studio-server/src/preview-server/routes/save-sequence-props.ts+++ b/packages/studio-server/src/preview-server/routes/save-sequence-props.ts@@ -1,5 +1,6 @@import {readFileSync} from 'node:fs';import type {File} from '@babel/types';+import {CodemodsInternals} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';import type {AddSequenceKeyframe,@@ -13,7 +14,6 @@ import type {} from '@remotion/studio-shared';import {getAllSchemaKeys, getAssetSchemaKeys} from '@remotion/studio-shared';import type {SequenceNodePath} from 'remotion';-import {updateInlineCaptionPatches} from '../../codemods/update-inline-caption-patches';import {updateEffectKeyframes,updateSequenceKeyframes,@@ -41,6 +41,8 @@ import {logEffectUpdate} from './log-updates/log-effect-update';import {logUpdate} from './log-updates/log-update';import {withSourceFileWriteQueue} from './source-file-write-queue';+const {updateInlineCaptionPatches} = CodemodsInternals;+type ResolvedSequencePropEdit = {index: number;fileName: SaveSequencePropEdit['fileName'];diff --git a/packages/studio-server/src/preview-server/routes/split-video-from-audio.ts b/packages/studio-server/src/preview-server/routes/split-video-from-audio.tsindex e5c614435a..681d420ea5 100644--- a/packages/studio-server/src/preview-server/routes/split-video-from-audio.ts+++ b/packages/studio-server/src/preview-server/routes/split-video-from-audio.ts@@ -1,10 +1,10 @@import {readFileSync} from 'node:fs';+import {CodemodsInternals} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';import type {SplitVideoFromAudioRequest,SplitVideoFromAudioResponse,} from '@remotion/studio-shared';-import {splitVideoFromAudio} from '../../codemods/split-video-from-audio';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';import type {ApiHandler} from '../api-types';@@ -21,6 +21,8 @@ import {withSourceFileWriteQueue,} from './source-file-write-queue';+const {splitVideoFromAudio} = CodemodsInternals;+export const splitVideoFromAudioHandler: ApiHandler<SplitVideoFromAudioRequest,SplitVideoFromAudioResponsediff --git a/packages/studio-server/src/preview-server/routes/update-default-props.ts b/packages/studio-server/src/preview-server/routes/update-default-props.tsindex cbf3d76379..6343611ac2 100644--- a/packages/studio-server/src/preview-server/routes/update-default-props.ts+++ b/packages/studio-server/src/preview-server/routes/update-default-props.ts@@ -1,13 +1,10 @@import {readFileSync} from 'node:fs';+import {CodemodsInternals} from '@remotion/codemods';import {RenderInternals} from '@remotion/renderer';import type {UpdateDefaultPropsRequest,UpdateDefaultPropsResponse,} from '@remotion/studio-shared';-import {- getCompositionDefaultPropsLine,- updateDefaultProps,-} from '../../codemods/update-default-props';import {writeFileAndNotifyFileWatchers} from '../../file-watcher';import type {ApiHandler} from '../api-types';import {formatLogFileLocation} from '../format-log-file-location';@@ -24,6 +21,8 @@ import {withSourceFileWriteQueue,} from './source-file-write-queue';+const {getCompositionDefaultPropsLine, updateDefaultProps} = CodemodsInternals;+export const updateDefaultPropsHandler: ApiHandler<UpdateDefaultPropsRequest,UpdateDefaultPropsResponsediff --git a/packages/studio-server/src/test/add-effect.test.ts b/packages/studio-server/src/test/add-effect.test.tsindex 6b3cc638b0..634c1e734a 100644--- a/packages/studio-server/src/test/add-effect.test.ts+++ b/packages/studio-server/src/test/add-effect.test.ts@@ -1,7 +1,9 @@import {expect, test} from 'bun:test';-import {addEffect} from '../codemods/add-effect';+import {CodemodsInternals} from '@remotion/codemods';import {lineColumnToNodePath} from './test-utils';+const {addEffect} = CodemodsInternals;+const buildInput = (jsx: string) => `import {Solid} from 'remotion';export const Comp = () => {diff --git a/packages/studio-server/src/test/delete-effect.test.ts b/packages/studio-server/src/test/delete-effect.test.tsindex 7569ebc2f7..c5e0e04bb4 100644--- a/packages/studio-server/src/test/delete-effect.test.ts+++ b/packages/studio-server/src/test/delete-effect.test.ts@@ -1,7 +1,9 @@import {expect, test} from 'bun:test';-import {deleteEffect, deleteEffects} from '../codemods/delete-effect';+import {CodemodsInternals} from '@remotion/codemods';import {lineColumnToNodePath} from './test-utils';+const {deleteEffect, deleteEffects} = CodemodsInternals;+const buildInput = (effects: string,) => `import {HtmlInCanvas} from '@remotion/html-in-canvas';diff --git a/packages/studio-server/src/test/duplicate-effect.test.ts b/packages/studio-server/src/test/duplicate-effect.test.tsindex cc5b650ee8..096c30681e 100644--- a/packages/studio-server/src/test/duplicate-effect.test.ts+++ b/packages/studio-server/src/test/duplicate-effect.test.ts@@ -1,7 +1,9 @@import {expect, test} from 'bun:test';-import {duplicateEffect, duplicateEffects} from '../codemods/duplicate-effect';+import {CodemodsInternals} from '@remotion/codemods';import {lineColumnToNodePath} from './test-utils';+const {duplicateEffect, duplicateEffects} = CodemodsInternals;+const buildInput = (effects: string,) => `import {HtmlInCanvas} from '@remotion/html-in-canvas';diff --git a/packages/studio-server/src/test/insert-basic-captions.test.ts b/packages/studio-server/src/test/insert-basic-captions.test.tsindex 4092349a25..37b73aea2d 100644--- a/packages/studio-server/src/test/insert-basic-captions.test.ts+++ b/packages/studio-server/src/test/insert-basic-captions.test.ts@@ -9,7 +9,6 @@ import {import {tmpdir} from 'node:os';import path from 'node:path';import {CodemodsInternals} from '@remotion/codemods';-import {insertBasicCaptions} from '../codemods/insert-basic-captions';import {createFileWatcherRegistry,setFileWatcherRegistry,@@ -19,8 +18,11 @@ import {insertBasicCaptionsHandler} from '../preview-server/routes/insert-basic-import {getUndoStack} from '../preview-server/undo-stack';import {lineContainingToNodePath} from './test-utils';-const {basicCaptionsElementSource, getBasicCaptionsElementFile} =- CodemodsInternals;+const {+ basicCaptionsElementSource,+ getBasicCaptionsElementFile,+ insertBasicCaptions,+} = CodemodsInternals;test('transcription inserts inline Basic captions beside selected Video and Audio tags', async () => {const remotionRoot = mkdtempSync(path.join(tmpdir(), 'remotion-captions-'));diff --git a/packages/studio-server/src/test/reorder-effect.test.ts b/packages/studio-server/src/test/reorder-effect.test.tsindex d7f29c02fd..582569acde 100644--- a/packages/studio-server/src/test/reorder-effect.test.ts+++ b/packages/studio-server/src/test/reorder-effect.test.ts@@ -1,7 +1,9 @@import {expect, test} from 'bun:test';-import {reorderEffect} from '../codemods/reorder-effect';+import {CodemodsInternals} from '@remotion/codemods';import {lineColumnToNodePath} from './test-utils';+const {reorderEffect} = CodemodsInternals;+const buildInput = (effects: string,) => `import {HtmlInCanvas} from '@remotion/html-in-canvas';diff --git a/packages/studio-server/src/test/reorder-sequence.test.ts b/packages/studio-server/src/test/reorder-sequence.test.tsindex f44bd79c26..14a1c31c6a 100644--- a/packages/studio-server/src/test/reorder-sequence.test.ts+++ b/packages/studio-server/src/test/reorder-sequence.test.ts@@ -1,9 +1,11 @@import {expect, test} from 'bun:test';+import {CodemodsInternals} from '@remotion/codemods';import {parseAst} from '../codemods/parse-ast';-import {reorderSequence} from '../codemods/reorder-sequence';import {lineColumnToNodePath as getNodePathAtPosition} from '../preview-server/routes/can-update-sequence-props';import {lineColumnToNodePath} from './test-utils';+const {reorderSequence} = CodemodsInternals;+const sequenceContaining = (input: string, search: string) => {const searchOffset = input.indexOf(search);if (searchOffset === -1) {diff --git a/packages/studio-server/src/test/split-video-from-audio.test.ts b/packages/studio-server/src/test/split-video-from-audio.test.tsindex d32635efdb..f215d9bd78 100644--- a/packages/studio-server/src/test/split-video-from-audio.test.ts+++ b/packages/studio-server/src/test/split-video-from-audio.test.ts@@ -2,7 +2,7 @@ import {expect, test} from 'bun:test';import {mkdtempSync, readFileSync, rmSync, writeFileSync} from 'node:fs';import {tmpdir} from 'node:os';import path from 'node:path';-import {splitVideoFromAudio} from '../codemods/split-video-from-audio';+import {CodemodsInternals} from '@remotion/codemods';import {createFileWatcherRegistry,setFileWatcherRegistry,@@ -12,6 +12,8 @@ import {splitVideoFromAudioHandler} from '../preview-server/routes/split-video-fimport {getUndoStack} from '../preview-server/undo-stack';import {lineColumnToNodePath, lineContainingToNodePath} from './test-utils';+const {splitVideoFromAudio} = CodemodsInternals;+const wrap = (element: string,imports = `import {Video} from '@remotion/media';`,diff --git a/packages/studio-server/src/test/update-default-props.test.ts b/packages/studio-server/src/test/update-default-props.test.tsindex f88622d608..0028042141 100644--- a/packages/studio-server/src/test/update-default-props.test.ts+++ b/packages/studio-server/src/test/update-default-props.test.ts@@ -1,11 +1,10 @@import {expect, test} from 'bun:test';import {readFileSync} from 'node:fs';import path from 'node:path';+import {CodemodsInternals} from '@remotion/codemods';import {parseAst} from '../codemods/parse-ast';-import {- getCompositionDefaultPropsLine,- updateDefaultProps,-} from '../codemods/update-default-props';++const {getCompositionDefaultPropsLine, updateDefaultProps} = CodemodsInternals;test('updates default props without changing surrounding source', () => {const file = readFileSync(diff --git a/packages/studio-server/src/test/update-inline-caption-patches.test.ts b/packages/studio-server/src/test/update-inline-caption-patches.test.tsindex 84deb2990e..1f7d3f6cba 100644--- a/packages/studio-server/src/test/update-inline-caption-patches.test.ts+++ b/packages/studio-server/src/test/update-inline-caption-patches.test.ts@@ -1,7 +1,9 @@import {expect, test} from 'bun:test';-import {updateInlineCaptionPatches} from '../codemods/update-inline-caption-patches';+import {CodemodsInternals} from '@remotion/codemods';import {lineColumnToNodePath} from './test-utils';+const {updateInlineCaptionPatches} = CodemodsInternals;+const input = `import {TimedCaptions} from './TimedCaptions';export const Example = () => {