Update xterm (#44594)

(cherry picked from commit e6ff706)
gravitational · Jul 29, 2024 · b6203b4 · b6203b4
1 parent 3e1fc1c
commit b6203b4
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 86 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/web/packages/teleport/package.json b/web/packages/teleport/package.json
@@ -32,13 +32,13 @@
     "@opentelemetry/sdk-trace-base": "1.25.1",
     "@opentelemetry/sdk-trace-web": "1.25.1",
     "@opentelemetry/semantic-conventions": "1.25.1",
+    "@xterm/xterm": "^5.5.0",
+    "@xterm/addon-canvas": "^0.7.0",
+    "@xterm/addon-fit": "^0.10.0",
+    "@xterm/addon-web-links": "^0.11.0",
+    "@xterm/addon-webgl": "^0.18.0",
     "create-react-class": "^15.6.3",
-    "events": "3.3.0",
-    "xterm": "^5.3.0",
-    "xterm-addon-canvas": "^0.5.0",
-    "xterm-addon-fit": "^0.8.0",
-    "xterm-addon-web-links": "^0.9.0",
-    "xterm-addon-webgl": "^0.16.0"
+    "events": "3.3.0"
   },
   "devDependencies": {
     "@gravitational/build": "workspace:*",

diff --git a/web/packages/teleport/src/Console/DocumentSsh/Terminal/Terminal.tsx b/web/packages/teleport/src/Console/DocumentSsh/Terminal/Terminal.tsx
@@ -23,7 +23,7 @@ import React, {
   useRef,
 } from 'react';
 import { Flex } from 'design';
-import { ITheme } from 'xterm';
+import { ITheme } from '@xterm/xterm';
 
 import { getPlatformType } from 'design/platform';
 

diff --git a/web/packages/teleport/src/Console/StyledXterm/StyledXterm.tsx b/web/packages/teleport/src/Console/StyledXterm/StyledXterm.tsx
@@ -19,7 +19,7 @@
 import styled from 'styled-components';
 import { Box } from 'design';
 
-import 'xterm/css/xterm.css';
+import '@xterm/xterm/css/xterm.css';
 
 const StyledXterm = styled(Box)(
   () => `

diff --git a/web/packages/teleport/src/lib/term/terminal.ts b/web/packages/teleport/src/lib/term/terminal.ts
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'xterm/css/xterm.css';
-import { ITheme, Terminal } from 'xterm';
-import { FitAddon } from 'xterm-addon-fit';
-import { WebglAddon } from 'xterm-addon-webgl';
+import '@xterm/xterm/css/xterm.css';
+import { ITheme, Terminal } from '@xterm/xterm';
+import { FitAddon } from '@xterm/addon-fit';
+import { WebglAddon } from '@xterm/addon-webgl';
+import { WebLinksAddon } from '@xterm/addon-web-links';
+import { CanvasAddon } from '@xterm/addon-canvas';
 import { debounce, isInteger } from 'shared/utils/highbar';
-import { WebLinksAddon } from 'xterm-addon-web-links';
-import { CanvasAddon } from 'xterm-addon-canvas';
 import Logger from 'shared/libs/logger';
 
 import cfg from 'teleport/config';

diff --git a/web/packages/teleterm/package.json b/web/packages/teleterm/package.json
@@ -42,6 +42,8 @@
     "@types/node-forge": "^1.3.11",
     "@types/tar-fs": "^2.0.4",
     "@types/whatwg-url": "^11.0.5",
+    "@xterm/xterm": "^5.5.0",
+    "@xterm/addon-fit": "^0.10.0",
     "electron": "31.1.0",
     "electron-builder": "^25.0.1",
     "electron-notarize": "^1.2.2",
@@ -52,8 +54,6 @@
     "react-dnd": "^14.0.4",
     "react-dnd-html5-backend": "^14.0.2",
     "whatwg-url": "^13.0.0",
-    "xterm": "^5.3.0",
-    "xterm-addon-fit": "^0.8.0",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.1"
   },

diff --git a/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/ctrl.ts b/web/packages/teleterm/src/ui/DocumentTerminal/Terminal/ctrl.ts
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import 'xterm/css/xterm.css';
-import { IDisposable, ITheme, Terminal } from 'xterm';
-import { FitAddon } from 'xterm-addon-fit';
+import '@xterm/xterm/css/xterm.css';
+import { IDisposable, ITheme, Terminal } from '@xterm/xterm';
+import { FitAddon } from '@xterm/addon-fit';
 import { debounce } from 'shared/utils/highbar';
 
 import { IPtyProcess } from 'teleterm/sharedProcess/ptyHost';