🎥 Make videos programmatically with React
fix(studio-server): contain find-in-file and file-existence watchers inside the project
DeryFerdb5193d53325e
diff --git a/packages/studio-server/src/preview-server/file-existence-watchers.ts b/packages/studio-server/src/preview-server/file-existence-watchers.tsindex 9dfd0dd117..84bf289eaa 100644--- a/packages/studio-server/src/preview-server/file-existence-watchers.ts+++ b/packages/studio-server/src/preview-server/file-existence-watchers.ts@@ -1,5 +1,5 @@-import path from 'node:path';import {installFileWatcher} from '../file-watcher';+import {resolveFileInsideProject} from '../helpers/resolve-file-inside-project';import {waitForLiveEventsListener} from './live-events';const fileExistenceWatchers: Record<string, Record<string, () => void>> = {};@@ -13,7 +13,11 @@ export const subscribeToFileExistenceWatchers = ({remotionRoot: string;clientId: string;}): {exists: boolean} => {- const file = path.resolve(remotionRoot, relativeFile);+ const {absolutePath: file} = resolveFileInsideProject({+ remotionRoot,+ fileName: relativeFile,+ action: 'watch',+ });const {unwatch, exists} = installFileWatcher({file,@@ -58,7 +62,11 @@ export const unsubscribeFromFileExistenceWatchers = ({remotionRoot: string;clientId: string;}) => {- const actualPath = path.resolve(remotionRoot, file);+ const {absolutePath: actualPath} = resolveFileInsideProject({+ remotionRoot,+ fileName: file,+ action: 'unwatch',+ });if (!fileExistenceWatchers[clientId]) {return;}diff --git a/packages/studio-server/src/preview-server/routes/find-in-file.ts b/packages/studio-server/src/preview-server/routes/find-in-file.tsindex 224aeffbf9..274e3e669b 100644--- a/packages/studio-server/src/preview-server/routes/find-in-file.ts+++ b/packages/studio-server/src/preview-server/routes/find-in-file.ts@@ -1,10 +1,10 @@import fs from 'node:fs';-import path from 'node:path';import {CodemodsInternals} from '@remotion/codemods';import type {FindInFileRequest,FindInFileResponse,} from '@remotion/studio-shared';+import {resolveFileInsideProject} from '../../helpers/resolve-file-inside-project';import type {ApiHandler} from '../api-types';export const {findSearchPosition} = CodemodsInternals;@@ -14,10 +14,12 @@ export const findInFileHandler: ApiHandler<FindInFileResponse> = async ({input, remotionRoot}) => {const {fileName, lineNumber, columnNumber, search} = input;- const contents = await fs.promises.readFile(- path.resolve(remotionRoot, fileName),- 'utf-8',- );+ const {absolutePath} = resolveFileInsideProject({+ remotionRoot,+ fileName,+ action: 'read',+ });+ const contents = await fs.promises.readFile(absolutePath, 'utf-8');return findSearchPosition({contents,