Merge pull request #4409 from mzedel/chore/update-xterm

chore: moved xterm to maintained packages again
mendersoftware · May 15, 2024 · 5ceb866 · 5ceb866
2 parents 6a1deae + a691792
commit 5ceb866
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 49 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,10 +42,10 @@
     "uuid": "9.0.1",
     "validator": "13.12.0",
     "victory": "37.0.2",
-    "xterm": "5.3.0",
-    "xterm-addon-fit": "0.8.0",
-    "xterm-addon-search": "0.13.0",
-    "xterm-addon-web-links": "0.9.0",
+    "@xterm/xterm": "5.5.0",
+    "@xterm/addon-fit": "0.10.0",
+    "@xterm/addon-search": "0.15.0",
+    "@xterm/addon-web-links": "0.11.0",
     "zxcvbn": "4.4.2"
   },
   "devDependencies": {

diff --git a/src/js/components/auditlogs/eventdetails/__snapshots__/terminalsession.test.js.snap b/src/js/components/auditlogs/eventdetails/__snapshots__/terminalsession.test.js.snap
diff --git a/src/js/components/common/xterm.js b/src/js/components/common/xterm.js
@@ -13,10 +13,10 @@
 //    limitations under the License.
 import React, { useEffect } from 'react';
 
-import { Terminal } from 'xterm';
-import { FitAddon } from 'xterm-addon-fit';
-import { SearchAddon } from 'xterm-addon-search';
-import 'xterm/css/xterm.css';
+import { FitAddon } from '@xterm/addon-fit';
+import { SearchAddon } from '@xterm/addon-search';
+import { Terminal } from '@xterm/xterm';
+import '@xterm/xterm/css/xterm.css';
 
 const searchAddon = new SearchAddon();
 const fitAddon = new FitAddon();

diff --git a/src/js/components/devices/device-details/__snapshots__/connection.test.js.snap b/src/js/components/devices/device-details/__snapshots__/connection.test.js.snap
diff --git a/src/js/components/devices/troubleshoot/__snapshots__/terminal.test.js.snap b/src/js/components/devices/troubleshoot/__snapshots__/terminal.test.js.snap
diff --git a/src/js/components/devices/troubleshoot/terminal.js b/src/js/components/devices/troubleshoot/terminal.js
@@ -13,7 +13,7 @@
 //    limitations under the License.
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { WebLinksAddon } from 'xterm-addon-web-links';
+import { WebLinksAddon } from '@xterm/addon-web-links';
 
 import { DEVICE_MESSAGE_TYPES as MessageTypes } from '../../../constants/deviceConstants';
 import { toggle } from '../../../helpers';

diff --git a/tests/licenses/directDependencies.csv b/tests/licenses/directDependencies.csv
@@ -25,6 +25,10 @@
 "@trivago/prettier-plugin-sort-imports","Apache-2.0","https://github.com/trivago/prettier-plugin-sort-imports"
 "@typescript-eslint/eslint-plugin","MIT","https://github.com/typescript-eslint/typescript-eslint"
 "@typescript-eslint/parser","BSD-2-Clause","https://github.com/typescript-eslint/typescript-eslint"
+"@xterm/addon-fit","MIT","https://github.com/xtermjs/xterm.js.git#master"
+"@xterm/addon-search","MIT","https://github.com/xtermjs/xterm.js.git#master"
+"@xterm/addon-web-links","MIT","https://github.com/xtermjs/xterm.js.git#master"
+"@xterm/xterm","MIT","https://github.com/xtermjs/xterm.js"
 "assert","MIT","https://github.com/browserify/commonjs-assert"
 "autoprefixer","MIT","https://github.com/postcss/autoprefixer"
 "axios","MIT","https://github.com/axios/axios"
@@ -96,9 +100,5 @@
 "victory","MIT","https://github.com/FormidableLabs/victory"
 "webpack-cli","MIT","https://github.com/webpack/webpack-cli"
 "webpack","MIT","https://github.com/webpack/webpack"
-"xterm-addon-fit","MIT","https://github.com/xtermjs/xterm.js"
-"xterm-addon-search","MIT","https://github.com/xtermjs/xterm.js"
-"xterm-addon-web-links","MIT","https://github.com/xtermjs/xterm.js"
-"xterm","MIT","https://github.com/xtermjs/xterm.js"
 "yarn","BSD-2-Clause","https://github.com/yarnpkg/yarn"
 "zxcvbn","MIT","https://github.com/dropbox/zxcvbn"