🎥 Make videos programmatically with React
`@remotion/studio`: Consume Browser Studio bootstrap query
Jonny Burger24ba3cc943cc
diff --git a/packages/browser-studio/e2e/browser-studio.test.ts b/packages/browser-studio/e2e/browser-studio.test.tsindex 6066f0cb8f..1150eeeaf8 100644--- a/packages/browser-studio/e2e/browser-studio.test.ts+++ b/packages/browser-studio/e2e/browser-studio.test.ts@@ -471,9 +471,7 @@ export const Root = () => <Composition id="OpfsComp" component={OpfsComposition}await expect(studio.getByTitle('/project').getByText('OpfsComp'),).toBeVisible();- await expect- .poll(() => new URL(page.url()).search)- .toBe('?/OpfsComp&github=1');+ await expect.poll(() => new URL(page.url()).search).toBe('?/OpfsComp');await studio.locator('[data-compname="OpfsComp"]').click();await expect(studio.locator('.remotion-studio-composition-container img'),@@ -647,7 +645,7 @@ export const Root = () => <Composition id="OpfsComp" component={OpfsComposition}await secondPage.close();const previousDirectoryName = projectStorage.storage?.directoryName;- await page.reload();+ await page.goto('/?github=1');await expect(studio.getByTitle('/project').getByText('OpfsComp'),).toBeVisible();diff --git a/packages/studio/src/helpers/url-state.ts b/packages/studio/src/helpers/url-state.tsindex 4031d06bfa..fc522c8231 100644--- a/packages/studio/src/helpers/url-state.ts+++ b/packages/studio/src/helpers/url-state.ts@@ -1,11 +1,7 @@-type UrlHandling = 'browser-studio' | 'query-string' | 'spa';+type UrlHandling = 'query-string' | 'spa';const getUrlHandlingType = (): UrlHandling => {- if (window.remotion_browserStudio) {- return 'browser-studio';- }-- if (window.remotion_isReadOnlyStudio) {+ if (window.remotion_isReadOnlyStudio || window.remotion_browserStudio) {return 'query-string';}@@ -21,18 +17,6 @@ export const getNavigationWindow = () => {};export const getUrlForRoute = (route: string) => {- if (getUrlHandlingType() === 'browser-studio') {- const navigationWindow = getNavigationWindow();- const currentSearch = navigationWindow.location.search.substring(1);- const firstSeparator = currentSearch.indexOf('&');- const hostSearch = currentSearch.startsWith('/')- ? firstSeparator === -1- ? ''- : currentSearch.substring(firstSeparator + 1)- : currentSearch;- return `${navigationWindow.location.pathname}?${route}${hostSearch ? `&${hostSearch}` : ''}`;- }-if (getUrlHandlingType() === 'query-string') {return `${getNavigationWindow().location.pathname}?${route}`;}@@ -57,14 +41,6 @@ export const reloadUrl = () => {};export const getRoute = () => {- if (getUrlHandlingType() === 'browser-studio') {- const search = getNavigationWindow().location.search.substring(1);- const firstSeparator = search.indexOf('&');- const route =- firstSeparator === -1 ? search : search.substring(0, firstSeparator);- return route.startsWith('/') ? route : '';- }-if (getUrlHandlingType() === 'query-string') {const route = getNavigationWindow().location.search.substring(1);return route.startsWith('/') ? route : '';diff --git a/packages/studio/src/test/url-state.test.ts b/packages/studio/src/test/url-state.test.tsindex 9afa2a7918..54f2feed94 100644--- a/packages/studio/src/test/url-state.test.ts+++ b/packages/studio/src/test/url-state.test.ts@@ -62,6 +62,6 @@ test('uses query-string routing in Browser Studio', () => {expect(getRoute()).toBe('');replaceUrl('/assets/other.mp4');expect(replaceStateCalls).toEqual([- [{}, 'Studio', '/experimental_new?/assets/other.mp4&source=release'],+ [{}, 'Studio', '/experimental_new?/assets/other.mp4'],]);});