🎥 Make videos programmatically with React
Merge remote-tracking branch 'origin/main' into codex/studio-startup-error-recovery
JonnyBurgerf7eafbf21882
diff --cc packages/studio-shared/src/studio-html.tsindex 2c6a1ac591,539277ef9c..bc0764ff78--- a/packages/studio-shared/src/studio-html.ts+++ b/packages/studio-shared/src/studio-html.ts@@@ -5,18 -5,9 +5,19 @@@ import type {PackageManager} from './paimport type {RenderDefaults} from './render-defaults';import type {StudioRuntimeConfig} from './studio-runtime-config';+declare global {+ interface Window {+ remotion_browserStudioReload: (() => void) | null;+ remotion_studioStartup: {+ takeErrors: () => Error[];+ dismiss: () => void;+ } | null;+ }+}+export type StudioHtmlOptions = {staticHash: string;+ outputHash: string | null;publicPath: string;editorName: string | null;inputProps: object | null;diff --cc packages/studio/src/error-overlay/remotion-overlay/ErrorDisplay.tsxindex 5987d35dc1,64b2f68045..665cb365bc--- a/packages/studio/src/error-overlay/remotion-overlay/ErrorDisplay.tsx+++ b/packages/studio/src/error-overlay/remotion-overlay/ErrorDisplay.tsx@@@ -11,7 -13,9 +13,10 @@@ importWHITE,WHITE_ALPHA_60,} from '../../helpers/colors';+ import {formatFileLocation} from '../../helpers/format-file-location';+ import {getCodexAnnotation} from '../../helpers/get-codex-annotation';+ import {requestCodexAnnotation} from '../../helpers/request-codex-annotation';+import {didUnmountReactApp} from '../react-overlay';import type {ErrorRecord} from '../react-overlay/listen-to-runtime-errors';import {AskOnDiscord} from './AskOnDiscord';import {CalculateMetadataErrorExplainer} from './CalculateMetadataErrorExplainer';@@@ -93,9 -97,30 +98,33 @@@ export const ErrorDisplay: React.FC<symbolicationFailure,}) => {const {previewServerState} = useContext(StudioServerConnectionCtx);+ const annotationTarget = useRef<HTMLDivElement>(null);+ const {remotionSkillsInfo} = useSettings();++ const canShowProjectActions = !didUnmountReactApp();+ const canAnnotate =- !window.remotion_isReadOnlyStudio && getCodexAnnotation() !== null;++ canShowProjectActions &&++ !window.remotion_isReadOnlyStudio &&++ getCodexAnnotation() !== null;+ const buildErrorLocation = getLocationFromBuildError(display.error);+ const errorKind = calculateMetadata+ ? 'calculateMetadata'+ : display.error instanceof MediaPlaybackError+ ? 'media playback'+ : buildErrorLocation+ ? 'compilation'+ : 'runtime';+ const skillId =+ errorKind === 'media playback'+ ? 'remotion-multimedia'+ : errorKind === 'runtime'+ ? 'remotion-markup'+ : null;+ const skill = remotionSkillsInfo?.skills.find(({name}) => name === skillId);+ const skillAvailable = Boolean(+ skill?.installedInProject || skill?.installedGlobally,+ );const {canOpenInEditor, defaultEditorId, defaultEditorName} =useEditorOpening(previewServerState.type === 'connected');- const canShowProjectActions = !didUnmountReactApp();const stackFrames = useMemo(() => {const withoutReactInternals = display.stackFrames.filter((frame) => {const fileName = `/${frame.originalFileName?.replaceAll('\\', '/') ?? ''}`;@@@ -187,14 -255,18 +260,20 @@@<div style={spacer} /></>) : null}- <CodingAgentButton- label="Fix with"- prompt={fixWithAgentPrompt}- size="default"- style={codingAgentButton}- />+ {canShowProjectActions ? (+ <CodingAgentButton+ label="Fix with"+ prompt={fixWithAgentPrompt}+ size="default"+ style={codingAgentButton}+ />+ ) : null}+ {canAnnotate ? (+ <>+ <ModalButton onClick={onSendToChatGPT}>Send to ChatGPT</ModalButton>+ <div style={spacer} />+ </>+ ) : null}<CopyStackTrace errorText={errorTextForCopy} /><div style={spacer} /><SearchGithubIssues