Skip to content

🎥 Make videos programmatically with React

Revert "Add bundle invalidation to API handlers"

JonnyBurger6778195b09b4
diff --git a/packages/studio-server/src/preview-server/api-types.ts b/packages/studio-server/src/preview-server/api-types.ts
index 95a488d438..48ab0e2cf2 100644
--- a/packages/studio-server/src/preview-server/api-types.ts
+++ b/packages/studio-server/src/preview-server/api-types.ts
@@ -35,5 +35,4 @@ export type ApiHandler<ReqData, ResData> = (params: {
configFile: string | null;
getDefaultCodingAgent: () => DefaultCodingAgent | null;
getDefaultEditor: () => DefaultEditor | null;
- invalidateBundle?: () => Promise<void>;
}) => Promise<ResData>;
diff --git a/packages/studio-server/src/preview-server/handler.ts b/packages/studio-server/src/preview-server/handler.ts
index c198a73150..1e318a5192 100644
--- a/packages/studio-server/src/preview-server/handler.ts
+++ b/packages/studio-server/src/preview-server/handler.ts
@@ -21,7 +21,6 @@ export const handleRequest = async <Req, Res>({
configFile,
getDefaultCodingAgent,
getDefaultEditor,
- invalidateBundle,
}: {
remotionRoot: string;
publicDir: string;
@@ -32,7 +31,6 @@ export const handleRequest = async <Req, Res>({
configFile: string | null;
getDefaultCodingAgent: () => DefaultCodingAgent | null;
getDefaultEditor: () => DefaultEditor | null;
- invalidateBundle?: () => Promise<void>;
handler: ApiHandler<Req, Res>;
logLevel: LogLevel;
methods: QueueMethods;
@@ -64,7 +62,6 @@ export const handleRequest = async <Req, Res>({
configFile,
getDefaultCodingAgent,
getDefaultEditor,
- invalidateBundle,
});
response.end(
diff --git a/packages/studio-server/src/preview-server/routes/install-dependency.ts b/packages/studio-server/src/preview-server/routes/install-dependency.ts
index 8e6926fc81..2997d79c7c 100644
--- a/packages/studio-server/src/preview-server/routes/install-dependency.ts
+++ b/packages/studio-server/src/preview-server/routes/install-dependency.ts
@@ -29,19 +29,14 @@ export const getPackageInstallSpec = (
return extraVersion === null ? name : `${name}@${extraVersion}`;
};
-export const handleInstallPackage: ApiHandler<
- InstallPackageRequest,
- InstallPackageResponse
-> = async ({
+export const handleInstallPackage = async ({
logLevel,
remotionRoot,
input: {dependencies},
invalidateBundle,
-}) => {
- if (!invalidateBundle) {
- throw new Error('Cannot install a package without a bundle invalidator.');
- }
-
+}: Parameters<ApiHandler<InstallPackageRequest, InstallPackageResponse>>[0] & {
+ readonly invalidateBundle: () => Promise<void>;
+}): Promise<InstallPackageResponse> => {
for (const dependency of dependencies) {
if (!isValidPackageName(dependency.name)) {
return Promise.reject(
diff --git a/packages/studio-server/src/routes.ts b/packages/studio-server/src/routes.ts
index cc51dc112a..d6f53eb9f3 100644
--- a/packages/studio-server/src/routes.ts
+++ b/packages/studio-server/src/routes.ts
@@ -576,7 +576,6 @@ export const handleRoutes = ({
configFile,
getDefaultCodingAgent,
getDefaultEditor,
- invalidateBundle,
});
}
@@ -584,7 +583,7 @@ export const handleRoutes = ({
return handleRequest<InstallPackageRequest, InstallPackageResponse>({
remotionRoot,
entryPoint,
- handler: handleInstallPackage,
+ handler: (params) => handleInstallPackage({...params, invalidateBundle}),
request,
response,
logLevel,
@@ -594,7 +593,6 @@ export const handleRoutes = ({
configFile,
getDefaultCodingAgent,
getDefaultEditor,
- invalidateBundle,
});
}
@@ -616,7 +614,6 @@ export const handleRoutes = ({
configFile,
getDefaultCodingAgent,
getDefaultEditor,
- invalidateBundle,
});
}
}