Skip to content

🎥 Make videos programmatically with React

Share Transformers runtime in Studio

JonnyBurger0b3bac397ec3
diff --git a/bun.lock b/bun.lock
index 6b362d6bcb..e8ef29d712 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1803,6 +1803,7 @@
"name": "@remotion/studio",
"version": "4.0.522",
"dependencies": {
+ "@huggingface/transformers": "catalog:",
"@jridgewell/trace-mapping": "0.3.31",
"@remotion/canvas": "workspace:*",
"@remotion/captions": "workspace:*",
diff --git a/packages/browser-studio/bundle.ts b/packages/browser-studio/bundle.ts
index 0ad73888d7..f51317a456 100644
--- a/packages/browser-studio/bundle.ts
+++ b/packages/browser-studio/bundle.ts
@@ -1,7 +1,6 @@
import path from 'path';
import {fileURLToPath} from 'url';
import {build} from 'bun';
-import {BROWSER_STUDIO_WHISPER_TRANSFORMERS_PACKAGE} from './src/browser-studio-import-map';
import {getBrowserStudioDependencyVersionsForBuild} from './src/dev/get-dependency-versions-for-build';
import {getBrowserStudioReactRefreshFilesForBuild} from './src/dev/get-react-refresh-files-for-build';
import {getBrowserStudioSetupEnvironmentForBuild} from './src/dev/get-setup-environment-for-build';
@@ -25,10 +24,7 @@ const workspacePackageExports =
const vendorOutput = await build({
define: {'process.env.NODE_ENV': JSON.stringify('development')},
entrypoints: ['src/browser-studio-vendor-entry.ts'],
- external: [
- '@huggingface/transformers',
- BROWSER_STUDIO_WHISPER_TRANSFORMERS_PACKAGE,
- ],
+ external: ['@huggingface/transformers'],
format: 'iife',
minify: true,
naming: '[name].mjs',
@@ -46,16 +42,6 @@ const vendorEntryOutput = vendorOutput.outputs.find(
if (!vendorEntryOutput) {
throw new Error('Browser Studio vendor entry was not generated');
}
-if (
- !(await vendorEntryOutput.text()).includes(
- BROWSER_STUDIO_WHISPER_TRANSFORMERS_PACKAGE,
- )
-) {
- throw new Error(
- 'The Browser Studio vendor entry must preserve the private Transformers import.',
- );
-}
-
const transformersOutput = await build({
entrypoints: ['src/browser-studio-transformers-entry.ts'],
format: 'esm',
diff --git a/packages/browser-studio/e2e/browser-studio.test.ts b/packages/browser-studio/e2e/browser-studio.test.ts
index 8ecb82d5cb..1068435811 100644
--- a/packages/browser-studio/e2e/browser-studio.test.ts
+++ b/packages/browser-studio/e2e/browser-studio.test.ts
@@ -1055,53 +1055,40 @@ test('loads the local Transformers bundle on demand from the vendor Blob bundle'
expect(
await studio.locator('script[type="module"]').getAttribute('src'),
).toMatch(/^blob:/);
- const transformersUrls = await studio
+ const transformersUrl = await studio
.locator('script[type="importmap"]')
.evaluate((element) => {
const importMap = JSON.parse(element.textContent ?? '') as {
imports: Record<string, string>;
};
- return {
- consumer: importMap.imports['@huggingface/transformers'],
- whisper:
- importMap.imports['@remotion/whisper-webgpu/private-transformers'],
- };
+ return importMap.imports['@huggingface/transformers'];
});
- expect(transformersUrls.whisper).not.toBe(transformersUrls.consumer);
- expect(requests).not.toContain(transformersUrls.consumer);
- expect(requests).not.toContain(transformersUrls.whisper);
-
- const loaded = await studio
- .locator('body')
- .evaluate(async (_body, privateTransformersPackage) => {
- const loadTransformers = (
- window as typeof window & {
- __loadBrowserStudioTransformers: () => Promise<{
- env: unknown;
- pipeline: unknown;
- }>;
- }
- ).__loadBrowserStudioTransformers;
- const consumerTransformers = await loadTransformers();
- const whisperTransformers = (await import(
- privateTransformersPackage
- )) as {env: unknown; pipeline: unknown};
- return {
- consumerPipelineType: typeof consumerTransformers.pipeline,
- environmentsAreIsolated:
- consumerTransformers.env !== whisperTransformers.env,
- whisperPipelineType: typeof whisperTransformers.pipeline,
- };
- }, '@remotion/whisper-webgpu/private-transformers');
+ expect(requests).not.toContain(transformersUrl);
+
+ const loaded = await studio.locator('body').evaluate(async () => {
+ const loadTransformers = (
+ window as typeof window & {
+ __loadBrowserStudioTransformers: () => Promise<{
+ env: unknown;
+ pipeline: unknown;
+ }>;
+ }
+ ).__loadBrowserStudioTransformers;
+ const consumerTransformers = await loadTransformers();
+ const auxiliaryTransformers = await import('@huggingface/transformers');
+ return {
+ consumerPipelineType: typeof consumerTransformers.pipeline,
+ environmentsAreShared:
+ consumerTransformers.env === auxiliaryTransformers.env,
+ auxiliaryPipelineType: typeof auxiliaryTransformers.pipeline,
+ };
+ });
expect(loaded.consumerPipelineType).toBe('function');
- expect(loaded.whisperPipelineType).toBe('function');
- expect(loaded.environmentsAreIsolated).toBe(true);
- expect(
- requests.filter((request) => request === transformersUrls.consumer),
- ).toHaveLength(1);
+ expect(loaded.auxiliaryPipelineType).toBe('function');
+ expect(loaded.environmentsAreShared).toBe(true);
expect(
- requests.filter((request) => request === transformersUrls.whisper),
+ requests.filter((request) => request === transformersUrl),
).toHaveLength(1);
});
diff --git a/packages/browser-studio/src/BrowserStudio.tsx b/packages/browser-studio/src/BrowserStudio.tsx
index eebf9113eb..3b7c8b962d 100644
--- a/packages/browser-studio/src/BrowserStudio.tsx
+++ b/packages/browser-studio/src/BrowserStudio.tsx
@@ -7,9 +7,7 @@ import {
} from './browser-studio-hmr-assets';
import {
BROWSER_STUDIO_TRANSFORMERS_PACKAGE,
- BROWSER_STUDIO_WHISPER_TRANSFORMERS_PACKAGE,
getBrowserStudioTransformersUrl,
- getBrowserStudioWhisperTransformersUrl,
} from './browser-studio-import-map';
import {createBrowserStudioOperations} from './browser-studio-operations';
import {
@@ -55,9 +53,6 @@ const localTransformersEntry = new URL(
'./browser-studio-transformers-entry.mjs',
import.meta.url,
).href;
-const localWhisperTransformersEntry = getBrowserStudioWhisperTransformersUrl(
- localTransformersEntry,
-);
const localVendorEntryWithMarker = `${localVendorEntry}?browserStudioVendor`;
const browserStudioPointerLeaveEvent = 'remotion-browser-studio-pointerleave';
@@ -638,8 +633,6 @@ export const BrowserStudio: React.FC<BrowserStudioProps> = ({
const html = studioHtml({
importMap: {
[BROWSER_STUDIO_TRANSFORMERS_PACKAGE]: transformersUrl,
- [BROWSER_STUDIO_WHISPER_TRANSFORMERS_PACKAGE]:
- localWhisperTransformersEntry,
},
audioLatencyHint: 'playback',
experimentalKeepAudioContextAlive: false,
diff --git a/packages/browser-studio/src/browser-studio-import-map.ts b/packages/browser-studio/src/browser-studio-import-map.ts
index 285dd245dc..3aa69ad8b3 100644
--- a/packages/browser-studio/src/browser-studio-import-map.ts
+++ b/packages/browser-studio/src/browser-studio-import-map.ts
@@ -2,8 +2,6 @@ import type {BrowserStudioDependencyResolution} from './types';
export const BROWSER_STUDIO_TRANSFORMERS_PACKAGE =
'@huggingface/transformers' as const;
-export const BROWSER_STUDIO_WHISPER_TRANSFORMERS_PACKAGE =
- '@remotion/whisper-webgpu/private-transformers' as const;
const getEsmShUrl = (version: string) => {
const url = new URL(
@@ -36,9 +34,3 @@ export const getBrowserStudioTransformersUrl = ({
return localUrl;
};
-
-export const getBrowserStudioWhisperTransformersUrl = (localUrl: string) => {
- const url = new URL(localUrl);
- url.searchParams.set('whisper-webgpu-private', '');
- return url.href;
-};
diff --git a/packages/browser-studio/src/browser-studio-worker.ts b/packages/browser-studio/src/browser-studio-worker.ts
index 270c5c804c..58290a10c5 100644
--- a/packages/browser-studio/src/browser-studio-worker.ts
+++ b/packages/browser-studio/src/browser-studio-worker.ts
@@ -2,10 +2,7 @@ import type {HotMiddlewareMessage} from '@remotion/studio-shared';
import {getStudioEntryPoints} from '@remotion/studio-shared/studio-entry-points';
import type * as RspackBrowser from '@rspack/browser';
import {makeBrowserStudioHttpClient} from './browser-studio-http-client';
-import {
- BROWSER_STUDIO_TRANSFORMERS_PACKAGE,
- BROWSER_STUDIO_WHISPER_TRANSFORMERS_PACKAGE,
-} from './browser-studio-import-map';
+import {BROWSER_STUDIO_TRANSFORMERS_PACKAGE} from './browser-studio-import-map';
import {browserStudioDependencyVersions} from './dependency-versions';
import {studioRenderEntryExternal} from './dev/studio-render-entry-external';
import type {
@@ -418,10 +415,7 @@ const createCompiler = async ({
externals: [
...(useVendorBundle ? [browserStudioVendorExternals] : []),
({request}, callback) => {
- if (
- request === BROWSER_STUDIO_TRANSFORMERS_PACKAGE ||
- request === BROWSER_STUDIO_WHISPER_TRANSFORMERS_PACKAGE
- ) {
+ if (request === BROWSER_STUDIO_TRANSFORMERS_PACKAGE) {
callback(undefined, request, 'import');
return;
}
diff --git a/packages/browser-studio/src/dev/server.ts b/packages/browser-studio/src/dev/server.ts
index 67ce8a05d6..e56b70eca4 100644
--- a/packages/browser-studio/src/dev/server.ts
+++ b/packages/browser-studio/src/dev/server.ts
@@ -1,7 +1,6 @@
import path from 'path';
import {fileURLToPath} from 'url';
import {build} from 'bun';
-import {BROWSER_STUDIO_WHISPER_TRANSFORMERS_PACKAGE} from '../browser-studio-import-map';
import {browserStudioPackageJsonArtifactFilename} from '../workspace-package-exports';
import {getBrowserStudioDependencyVersionsForBuild} from './get-dependency-versions-for-build';
import {getBrowserStudioReactRefreshFilesForBuild} from './get-react-refresh-files-for-build';
@@ -83,10 +82,7 @@ const buildDevAssets = async () => {
const vendorOutput = await build({
define: {'process.env.NODE_ENV': JSON.stringify('development')},
entrypoints: ['src/browser-studio-vendor-entry.ts'],
- external: [
- '@huggingface/transformers',
- BROWSER_STUDIO_WHISPER_TRANSFORMERS_PACKAGE,
- ],
+ external: ['@huggingface/transformers'],
format: 'iife',
naming: '[name].mjs',
outdir: outDir,
diff --git a/packages/browser-studio/src/dev/studio-render-entry-external.ts b/packages/browser-studio/src/dev/studio-render-entry-external.ts
index c0efd7e0df..a4ed12caab 100644
--- a/packages/browser-studio/src/dev/studio-render-entry-external.ts
+++ b/packages/browser-studio/src/dev/studio-render-entry-external.ts
@@ -1,6 +1,5 @@
export const studioRenderEntryExternal = [
'@huggingface/transformers',
- '@remotion/whisper-webgpu/private-transformers',
'@jridgewell/trace-mapping',
'@remotion/media-utils',
'@remotion/renderer',
diff --git a/packages/browser-studio/src/test/browser-studio-import-map.test.ts b/packages/browser-studio/src/test/browser-studio-import-map.test.ts
index 5b26ddd28e..5bf822ef09 100644
--- a/packages/browser-studio/src/test/browser-studio-import-map.test.ts
+++ b/packages/browser-studio/src/test/browser-studio-import-map.test.ts
@@ -1,8 +1,5 @@
import {expect, test} from 'bun:test';
-import {
- getBrowserStudioTransformersUrl,
- getBrowserStudioWhisperTransformersUrl,
-} from '../browser-studio-import-map';
+import {getBrowserStudioTransformersUrl} from '../browser-studio-import-map';
const localUrl = 'https://studio.test/browser-studio-transformers-entry.mjs';
@@ -41,9 +38,3 @@ test('turns custom Transformers versions into pinned esm.sh URLs', () => {
}),
).toBe('https://esm.sh/@huggingface/[email protected]?dev=');
});
-
-test('uses a separate Transformers module instance for Whisper', () => {
- expect(getBrowserStudioWhisperTransformersUrl(localUrl)).toBe(
- 'https://studio.test/browser-studio-transformers-entry.mjs?whisper-webgpu-private=',
- );
-});
diff --git a/packages/studio/bundle.ts b/packages/studio/bundle.ts
index 10b9d7c012..9ae5a711c4 100644
--- a/packages/studio/bundle.ts
+++ b/packages/studio/bundle.ts
@@ -1,6 +1,7 @@
import {buildPackage} from '../.monorepo/builder';
const external = [
+ '@huggingface/transformers',
'react',
'remotion',
'@remotion/canvas',
diff --git a/packages/studio/package.json b/packages/studio/package.json
index 2652d6b57d..ddc8f71ce5 100644
--- a/packages/studio/package.json
+++ b/packages/studio/package.json
@@ -30,6 +30,7 @@
}
},
"dependencies": {
+ "@huggingface/transformers": "catalog:",
"@tanstack/react-virtual": "3.14.9",
"@remotion/canvas": "workspace:*",
"@remotion/studio-protocol": "workspace:*",