') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); [v3-2-test] UI: Use local Monaco editor module instead of CDN (#66647) by vatsrahul1001 · Pull Request #67199 · apache/airflow · GitHub
Skip to content

[v3-2-test] UI: Use local Monaco editor module instead of CDN (#66647) - #67199

Merged
vatsrahul1001 merged 1 commit into
v3-2-testfrom
backport-3a86142-v3-2-test
May 19, 2026
Merged

[v3-2-test] UI: Use local Monaco editor module instead of CDN (#66647)#67199
vatsrahul1001 merged 1 commit into
v3-2-testfrom
backport-3a86142-v3-2-test

Conversation

@vatsrahul1001

@vatsrahul1001vatsrahul1001 commented May 19, 2026

Copy link
Copy Markdown
Contributor

Manual backport of #66647 — auto-backport failed due to conflicts in package.json and pnpm-lock.yaml.

Conflict resolution

  • package.json: main carried an unrelated bump of i18next-http-backend (^3.0.2 → ^3.0.5) on top of UI: Use local Monaco editor module instead of CDN #66647's monaco-editor addition. Kept v3-2-test's i18next-http-backend@^3.0.2 (scope-of-PR isolation); only added monaco-editor@^0.52.2.
  • pnpm-lock.yaml: regenerated from v3-2-test's lockfile + updated package.json via pnpm install --lockfile-only. Avoids hand-merging transitive resolution drift (react 19.2.4 vs 19.2.5, monaco-editor 0.52.2 vs 0.53.0, etc. that came in via unrelated main commits).

All other files (Monaco component scaffolding, license/notice updates, page integrations) cherry-picked cleanly.

@parkhojeong@vatsrahul1001
UI: Use local Monaco editor module instead of CDN (#66647)
74b373c
* UI: Bundle Monaco editor instead of loading it from CDN
* UI: Configure Monaco worker loading for bundled editor
* UI: Lazy load Monaco editor configuration
* UI: Bundle Monaco editor without changing runtime version
* UI: Fix Dag code tab line number selector
* UI: Load bundled Monaco workers with Vite worker imports
* UI: Handle Monaco editor load failures
* UI: Add Monaco Editor license notice
* UI: Add Monaco Editor license notice
(cherry picked from commit 3a86142)
@boring-cyborgboring-cyborgBot added the area:UI Related to UI/UX. For Frontend Developers. label May 19, 2026
@vatsrahul1001vatsrahul1001 added this to the Airflow 3.2.2 milestone May 19, 2026
@vatsrahul1001vatsrahul1001 added the type:bug-fix Changelog: Bug Fixes label May 19, 2026
@vatsrahul1001vatsrahul1001 mentioned this pull request May 19, 2026
Merged
1 task
parkhojeong
parkhojeong approved these changes May 19, 2026
View reviewed changes

@parkhojeongparkhojeong left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for the careful backport.

@vatsrahul1001
vatsrahul1001 merged commit 9672604 into v3-2-testMay 19, 2026
79 checks passed
@vatsrahul1001
vatsrahul1001 deleted the backport-3a86142-v3-2-test branch May 19, 2026 18:35
vatsrahul1001 added a commit that referenced this pull request May 20, 2026
@vatsrahul1001@parkhojeong
UI: Use local Monaco editor module instead of CDN (#66647) (#67199)
8be9de0
* UI: Bundle Monaco editor instead of loading it from CDN
* UI: Configure Monaco worker loading for bundled editor
* UI: Lazy load Monaco editor configuration
* UI: Bundle Monaco editor without changing runtime version
* UI: Fix Dag code tab line number selector
* UI: Load bundled Monaco workers with Vite worker imports
* UI: Handle Monaco editor load failures
* UI: Add Monaco Editor license notice
* UI: Add Monaco Editor license notice
(cherry picked from commit 3a86142)
Co-authored-by: hojeong park <parkhj062@gmail.com>
vatsrahul1001 added a commit that referenced this pull request May 20, 2026
@vatsrahul1001@parkhojeong
UI: Use local Monaco editor module instead of CDN (#66647) (#67199)
535eca0
* UI: Bundle Monaco editor instead of loading it from CDN
* UI: Configure Monaco worker loading for bundled editor
* UI: Lazy load Monaco editor configuration
* UI: Bundle Monaco editor without changing runtime version
* UI: Fix Dag code tab line number selector
* UI: Load bundled Monaco workers with Vite worker imports
* UI: Handle Monaco editor load failures
* UI: Add Monaco Editor license notice
* UI: Add Monaco Editor license notice
(cherry picked from commit 3a86142)
Co-authored-by: hojeong park <parkhj062@gmail.com>
vatsrahul1001 added a commit that referenced this pull request May 21, 2026
@vatsrahul1001@parkhojeong
UI: Use local Monaco editor module instead of CDN (#66647) (#67199)
81d6590
* UI: Bundle Monaco editor instead of loading it from CDN
* UI: Configure Monaco worker loading for bundled editor
* UI: Lazy load Monaco editor configuration
* UI: Bundle Monaco editor without changing runtime version
* UI: Fix Dag code tab line number selector
* UI: Load bundled Monaco workers with Vite worker imports
* UI: Handle Monaco editor load failures
* UI: Add Monaco Editor license notice
* UI: Add Monaco Editor license notice
(cherry picked from commit 3a86142)
Co-authored-by: hojeong park <parkhj062@gmail.com>
@vatsrahul1001vatsrahul1001 mentioned this pull request May 21, 2026
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bbovenzibbovenzibbovenzi approved these changes
@choo121600choo121600Awaiting requested review from choo121600choo121600 is a code owner
@pierrejeambrunpierrejeambrunAwaiting requested review from pierrejeambrunpierrejeambrun is a code owner
@ryanahamiltonryanahamiltonAwaiting requested review from ryanahamiltonryanahamilton is a code owner
@shubhamraj-gitshubhamraj-gitAwaiting requested review from shubhamraj-gitshubhamraj-git is a code owner
@guan404mingguan404mingAwaiting requested review from guan404mingguan404ming is a code owner
+1 more reviewer
@parkhojeongparkhojeongparkhojeong approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area:UIRelated to UI/UX. For Frontend Developers.type:bug-fixChangelog: Bug Fixes

Projects

None yet

Milestone

Airflow 3.2.2

Development

Successfully merging this pull request may close these issues.

3 participants

@vatsrahul1001@bbovenzi@parkhojeong