From af7196215bdfd86a3e109e55e86c54322d54e7e9 Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Corvo Date: Tue, 20 Aug 2024 09:40:08 -0700 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Migrate=20xterm=20to=20?= =?UTF-8?q?@xterm=20(#2444)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/components/session/tabs/index.js | 6 ++-- ui/desktop/ember-cli-build.js | 2 +- ui/desktop/package.json | 6 ++-- yarn.lock | 30 +++++++++---------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ui/desktop/app/components/session/tabs/index.js b/ui/desktop/app/components/session/tabs/index.js index d64674927..392bf60d5 100644 --- a/ui/desktop/app/components/session/tabs/index.js +++ b/ui/desktop/app/components/session/tabs/index.js @@ -6,9 +6,9 @@ import Component from '@glimmer/component'; import { action } from '@ember/object'; import { inject as service } from '@ember/service'; -import { Terminal } from 'xterm'; -import { FitAddon } from 'xterm-addon-fit'; -import { CanvasAddon } from 'xterm-addon-canvas'; +import { Terminal } from '@xterm/xterm'; +import { FitAddon } from '@xterm/addon-fit'; +import { CanvasAddon } from '@xterm/addon-canvas'; import { v4 as uuidv4 } from 'uuid'; import debounce from 'lodash/debounce'; diff --git a/ui/desktop/ember-cli-build.js b/ui/desktop/ember-cli-build.js index 854eca3ab..d06785927 100644 --- a/ui/desktop/ember-cli-build.js +++ b/ui/desktop/ember-cli-build.js @@ -48,7 +48,7 @@ module.exports = function (defaults) { // please specify an object with the list of modules as keys // along with the exports of each module as its value. - app.import('node_modules/xterm/css/xterm.css'); + app.import('node_modules/@xterm/xterm/css/xterm.css'); return app.toTree(); }; diff --git a/ui/desktop/package.json b/ui/desktop/package.json index efedb6389..88b3c4abb 100644 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -47,9 +47,9 @@ "ember-named-blocks-polyfill": "^0.2.5", "lodash": "^4.17.21", "uuid": "^9.0.0", - "xterm": "^5.2.1", - "xterm-addon-canvas": "^0.5.0", - "xterm-addon-fit": "^0.7.0" + "@xterm/xterm": "^5.5.0", + "@xterm/addon-canvas": "^0.7.0", + "@xterm/addon-fit": "^0.10.0" }, "devDependencies": { "@babel/eslint-parser": "^7.21.3", diff --git a/yarn.lock b/yarn.lock index 74a08abb2..74982513e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5477,6 +5477,21 @@ resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== +"@xterm/addon-canvas@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.7.0.tgz#d3a3835f3634e0106e108661315ae14da23e8dd7" + integrity sha512-LF5LYcfvefJuJ7QotNRdRSPc9YASAVDeoT5uyXS/nZshZXjYplGXRECBGiznwvhNL2I8bq1Lf5MzRwstsYQ2Iw== + +"@xterm/addon-fit@^0.10.0": + version "0.10.0" + resolved "https://registry.yarnpkg.com/@xterm/addon-fit/-/addon-fit-0.10.0.tgz#bebf87fadd74e3af30fdcdeef47030e2592c6f55" + integrity sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ== + +"@xterm/xterm@^5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.5.0.tgz#275fb8f6e14afa6e8a0c05d4ebc94523ff775396" + integrity sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A== + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -21163,21 +21178,6 @@ xtend@^4.0.0, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -xterm-addon-canvas@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.5.0.tgz#95d056cec6da42a51b2c47746a011409020c388c" - integrity sha512-QOo/eZCMrCleAgMimfdbaZCgmQRWOml63Ued6RwQ+UTPvQj3Av9QKx3xksmyYrDGRO/AVRXa9oNuzlYvLdmoLQ== - -xterm-addon-fit@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.7.0.tgz#b8ade6d96e63b47443862088f6670b49fb752c6a" - integrity sha512-tQgHGoHqRTgeROPnvmtEJywLKoC/V9eNs4bLLz7iyJr1aW/QFzRwfd3MGiJ6odJd9xEfxcW36/xRU47JkD5NKQ== - -xterm@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.1.tgz#b3fea7bdb55b9be1d4b31f4cd1091f26ac42afb8" - integrity sha512-cs5Y1fFevgcdoh2hJROMVIWwoBHD80P1fIP79gopLHJIE4kTzzblanoivxTiQ4+92YM9IxS36H1q0MxIJXQBcA== - y18n@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"