diff --git a/apps/studio/lib/configure-monaco-loader.ts b/apps/studio/lib/configure-monaco-loader.ts index 6ed89b095d7..fefbd0f38b7 100644 --- a/apps/studio/lib/configure-monaco-loader.ts +++ b/apps/studio/lib/configure-monaco-loader.ts @@ -1,19 +1,20 @@ import { loader } from '@monaco-editor/react' -import { BASE_PATH } from '@/lib/constants' +import { BASE_PATH, IS_PLATFORM } from '@/lib/constants' -// [Ivan] Serve the Monaco assets locally from the public folder (see #47182, which -// dropped CDN loading in every environment and re-nested the assets under `vs/`). The -// worker bootstrap (vs/base/worker/workerMain.js) loads the language workers (e.g. -// tsWorker.js) via fetch() from inside the web worker. A root-relative path fails to -// resolve there in some browsers (Firefox throws "... is not a valid URL"), so we point -// `vs` at an absolute URL including the origin. Guarded on `window` since callers are -// also evaluated during SSR (where `window` is undefined and there's no editor to mount). +// [Ivan] Serve the Monaco assets locally from the public folder for self-hosted deployments, but use the CDN for +// the platform deployment to reduce bundle size and improve caching. // // Shared by both runtime entry points — `pages/_app.tsx` (Next) and // `routes/__root.tsx` (TanStack) — so the asset path can't drift between them. export function configureMonacoLoader() { if (typeof window !== 'undefined') { - loader.config({ paths: { vs: `${window.location.origin}${BASE_PATH}/monaco-editor/vs` } }) + loader.config({ + paths: { + vs: IS_PLATFORM + ? 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.52.2/min/vs' + : `${BASE_PATH}/monaco-editor/vs`, + }, + }) } }