Skip to content

Revert "Revert xterm.js v6.0.0 upgrade back to v5.5.0"#1247

Merged
Kitenite merged 1 commit into
mainfrom
revert-1226-kitenite/revert-xterm-6-upgrade
Feb 6, 2026
Merged

Revert "Revert xterm.js v6.0.0 upgrade back to v5.5.0"#1247
Kitenite merged 1 commit into
mainfrom
revert-1226-kitenite/revert-xterm-6-upgrade

Conversation

@Kitenite
Copy link
Copy Markdown
Collaborator

@Kitenite Kitenite commented Feb 6, 2026

Reverts #1226

Summary by CodeRabbit

  • Bug Fixes

    • Improved terminal rendering compatibility with xterm 6.0+
  • Changes

    • Updated terminal dependencies to beta versions
    • Terminal renderer now uses WebGL with DOM fallback (Canvas renderer removed)
    • Removed fast scroll modifier keyboard option
    • Enhanced terminal scroll event handling

@Kitenite Kitenite merged commit 09ceee7 into main Feb 6, 2026
3 of 6 checks passed
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Feb 6, 2026

Caution

Review failed

The pull request is closed.

📝 Walkthrough

Walkthrough

Updates xterm.js and addons to beta.109 versions, removes canvas renderer support, adds module resolution alias for @xterm/headless, updates styling for xterm 6.0.0 compatibility, and simplifies terminal scroll API usage.

Changes

Cohort / File(s) Summary
xterm Dependency Upgrade
apps/desktop/electron.vite.config.ts, apps/desktop/package.json
Adds Vite alias to resolve @xterm/headless CJS entry point (working around packaging bug), and upgrades xterm and addon packages to 6.1.0-beta.109 and corresponding beta versions. Removes @xterm/addon-canvas and @xterm/addon-web-links.
xterm Styling and Configuration
apps/desktop/src/renderer/globals.css, apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/config.ts
Broadens xterm sizing CSS rules to include nested elements (.xterm-scrollable-element, .xterm-viewport, .xterm-screen) for xterm 6.0.0+ compatibility. Removes fastScrollModifier and fastScrollSensitivity options from TERMINAL_OPTIONS.
Terminal Rendering
apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/helpers.ts
Removes canvas renderer support; limits TerminalRenderer.kind to "webgl" | "dom". Simplifies renderer selection to accept only webgl/dom from storage, adds global fallback tracking for WebGL failures, and updates context-loss handling to force DOM with refresh.
Terminal Scrolling
apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx, apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/utils.ts
Replaces DOM viewport scroll event listeners with terminal.onScroll() API in ScrollToBottomButton; removes behavior parameter from scrollToBottom() function and simplifies to unconditional terminal.scrollToBottom() call.
Type Exports
apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/FilesView/types.ts
Removes public exports for OnFileOpen type and TreeActionResult interface.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

Possibly related PRs

Suggested reviewers

  • AviPeltz

Poem

🐰 Canvas scrolls away with grace,
Beta versions find their place,
WebGL first, then DOM to fall,
xterm 6.0 now rules them all!
Scroll with joy through APIs new. ✨

✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch revert-1226-kitenite/revert-xterm-6-upgrade

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Feb 6, 2026

🚀 Preview Deployment

🔗 Preview Links

Service Status Link
Neon Database (Neon) Failed to create
Fly.io Electric (Fly.io) Failed to deploy
Vercel API (Vercel) Failed to deploy
Vercel Web (Vercel) Failed to deploy
Vercel Marketing (Vercel) Failed to deploy
Vercel Admin (Vercel) Failed to deploy
Vercel Docs (Vercel) Failed to deploy

Preview updates automatically with new commits

@Kitenite Kitenite deleted the revert-1226-kitenite/revert-xterm-6-upgrade branch February 6, 2026 03:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant