From 88c2f6e6c5b288a8c01c8af1281be736aa4ca7e1 Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Sat, 16 Mar 2024 22:05:43 +0000 Subject: [PATCH] try xterm update again --- ui/angular.json | 6 +-- ui/package-lock.json | 48 +++++++++---------- ui/package.json | 6 +-- ui/src/app/core/log.service.ts | 6 +-- .../manage-plugins-modal.component.ts | 4 +- ui/src/app/core/terminal.service.ts | 6 +-- .../settings/restore/restore.component.ts | 4 +- .../homebridge-logs-widget.component.ts | 2 +- .../terminal-widget.component.ts | 2 +- ui/src/scss/styles.scss | 2 +- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ui/angular.json b/ui/angular.json index a6b71d50a..b8add062f 100644 --- a/ui/angular.json +++ b/ui/angular.json @@ -41,6 +41,8 @@ ], "allowedCommonJsDependencies": [ "@/app/modules/status/status.component", + "@xterm/xterm", + "@xterm/addon-fit", "ajv", "dayjs", "dragula", @@ -51,9 +53,7 @@ "mobile-detect", "prismjs", "qrcode", - "semver", - "xterm", - "xterm-addon-fit" + "semver" ], "aot": false, "stylePreprocessorOptions": { diff --git a/ui/package-lock.json b/ui/package-lock.json index 0f158bb11..08c07bb08 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -25,6 +25,9 @@ "@oznu/hap-client": "1.9.0", "@oznu/ngx-bs4-jsonform": "7.3.7", "@popperjs/core": "2.11.8", + "@xterm/addon-fit": "^0.9.0", + "@xterm/addon-web-links": "^0.10.0", + "@xterm/xterm": "^5.4.0", "angular-gridster2": "15.0.4", "bootstrap": "4.6.2", "chart.js": "4.4.2", @@ -50,9 +53,6 @@ "socket.io-client": "4.7.5", "tslib": "2.6.2", "uuid": "9.0.1", - "xterm": "4.19.0", - "xterm-addon-fit": "0.5.0", - "xterm-addon-web-links": "0.6.0", "zone.js": "0.12.0" }, "devDependencies": { @@ -4909,6 +4909,27 @@ "@xtuc/long": "4.2.2" } }, + "node_modules/@xterm/addon-fit": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.9.0.tgz", + "integrity": "sha512-hDlPPbTVPYyvwXu/asW8HbJkI/2RMi0cMaJnBZYVeJB0SWP2NeESMCNr+I7CvBlyI0sAxpxOg8Wk4OMkxBz9WA==", + "peerDependencies": { + "@xterm/xterm": "^5.0.0" + } + }, + "node_modules/@xterm/addon-web-links": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@xterm/addon-web-links/-/addon-web-links-0.10.0.tgz", + "integrity": "sha512-QhrHCUr8w6ATGviyXwcAIM1qN3nD1hdxwMC8fsW7z/6aaQlb2nt7zmByJt4eOn7ZzrHOzczljqV5S2pkdQp2xw==", + "peerDependencies": { + "@xterm/xterm": "^5.0.0" + } + }, + "node_modules/@xterm/xterm": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.4.0.tgz", + "integrity": "sha512-GlyzcZZ7LJjhFevthHtikhiDIl8lnTSgol6eTM4aoSNLcuXu3OEhnbqdCVIjtIil3jjabf3gDtb1S8FGahsuEw==" + }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", @@ -15120,27 +15141,6 @@ "@babel/runtime-corejs3": "^7.12.1" } }, - "node_modules/xterm": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/xterm/-/xterm-4.19.0.tgz", - "integrity": "sha512-c3Cp4eOVsYY5Q839dR5IejghRPpxciGmLWWaP9g+ppfMeBChMeLa1DCA+pmX/jyDZ+zxFOmlJL/82qVdayVoGQ==" - }, - "node_modules/xterm-addon-fit": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz", - "integrity": "sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ==", - "peerDependencies": { - "xterm": "^4.0.0" - } - }, - "node_modules/xterm-addon-web-links": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xterm-addon-web-links/-/xterm-addon-web-links-0.6.0.tgz", - "integrity": "sha512-H6XzjWWZu8FBo+fnYpxdPk9w5M6drbsvwPEJZGRS38MihiQaVFpKlCMKdfRgDbKGE530tw1yH54rhpZfHgt2/A==", - "peerDependencies": { - "xterm": "^4.0.0" - } - }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", diff --git a/ui/package.json b/ui/package.json index 3431015c0..4b5b855a6 100644 --- a/ui/package.json +++ b/ui/package.json @@ -27,6 +27,9 @@ "@oznu/hap-client": "1.9.0", "@oznu/ngx-bs4-jsonform": "7.3.7", "@popperjs/core": "2.11.8", + "@xterm/addon-fit": "^0.9.0", + "@xterm/addon-web-links": "^0.10.0", + "@xterm/xterm": "^5.4.0", "angular-gridster2": "15.0.4", "bootstrap": "4.6.2", "chart.js": "4.4.2", @@ -52,9 +55,6 @@ "socket.io-client": "4.7.5", "tslib": "2.6.2", "uuid": "9.0.1", - "xterm": "4.19.0", - "xterm-addon-fit": "0.5.0", - "xterm-addon-web-links": "0.6.0", "zone.js": "0.12.0" }, "devDependencies": { diff --git a/ui/src/app/core/log.service.ts b/ui/src/app/core/log.service.ts index ce6579108..7853b60f4 100644 --- a/ui/src/app/core/log.service.ts +++ b/ui/src/app/core/log.service.ts @@ -1,9 +1,9 @@ import { ElementRef, Injectable } from '@angular/core'; +import { FitAddon } from '@xterm/addon-fit'; +import { WebLinksAddon } from '@xterm/addon-web-links'; +import { ITerminalOptions, Terminal } from '@xterm/xterm'; import { Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; -import { ITerminalOptions, Terminal } from 'xterm'; -import { FitAddon } from 'xterm-addon-fit'; -import { WebLinksAddon } from 'xterm-addon-web-links'; import { IoNamespace, WsService } from '@/app/core/ws.service'; @Injectable({ diff --git a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts index b15456af2..c149cc5ce 100644 --- a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts +++ b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.ts @@ -7,10 +7,10 @@ import { import { Router } from '@angular/router'; import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; +import { FitAddon } from '@xterm/addon-fit'; +import { Terminal } from '@xterm/xterm'; import { saveAs } from 'file-saver'; import { ToastrService } from 'ngx-toastr'; -import { Terminal } from 'xterm'; -import { FitAddon } from 'xterm-addon-fit'; import { ApiService } from '@/app/core/api.service'; import { RestartHomebridgeComponent } from '@/app/core/components/restart-homebridge/restart-homebridge.component'; import { NotificationService } from '@/app/core/notification.service'; diff --git a/ui/src/app/core/terminal.service.ts b/ui/src/app/core/terminal.service.ts index c2d2ad1d6..77906cb51 100644 --- a/ui/src/app/core/terminal.service.ts +++ b/ui/src/app/core/terminal.service.ts @@ -1,9 +1,9 @@ import { ElementRef, Injectable } from '@angular/core'; +import { FitAddon } from '@xterm/addon-fit'; +import { WebLinksAddon } from '@xterm/addon-web-links'; +import { ITerminalOptions, Terminal } from '@xterm/xterm'; import { Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; -import { ITerminalOptions, Terminal } from 'xterm'; -import { FitAddon } from 'xterm-addon-fit'; -import { WebLinksAddon } from 'xterm-addon-web-links'; import { IoNamespace, WsService } from '@/app/core/ws.service'; @Injectable({ diff --git a/ui/src/app/modules/settings/restore/restore.component.ts b/ui/src/app/modules/settings/restore/restore.component.ts index 63dd047f0..1cde5a897 100644 --- a/ui/src/app/modules/settings/restore/restore.component.ts +++ b/ui/src/app/modules/settings/restore/restore.component.ts @@ -8,9 +8,9 @@ import { import { Router } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; +import { FitAddon } from '@xterm/addon-fit'; +import { Terminal } from '@xterm/xterm'; import { ToastrService } from 'ngx-toastr'; -import { Terminal } from 'xterm'; -import { FitAddon } from 'xterm-addon-fit'; import { ApiService } from '@/app/core/api.service'; import { IoNamespace, WsService } from '@/app/core/ws.service'; diff --git a/ui/src/app/modules/status/widgets/homebridge-logs-widget/homebridge-logs-widget.component.ts b/ui/src/app/modules/status/widgets/homebridge-logs-widget/homebridge-logs-widget.component.ts index 13853da53..9cfd4b928 100644 --- a/ui/src/app/modules/status/widgets/homebridge-logs-widget/homebridge-logs-widget.component.ts +++ b/ui/src/app/modules/status/widgets/homebridge-logs-widget/homebridge-logs-widget.component.ts @@ -6,8 +6,8 @@ import { OnInit, ViewChild, } from '@angular/core'; +import { ITerminalOptions } from '@xterm/xterm'; import { Subject } from 'rxjs'; -import { ITerminalOptions } from 'xterm'; import { LogService } from '@/app/core/log.service'; @Component({ diff --git a/ui/src/app/modules/status/widgets/terminal-widget/terminal-widget.component.ts b/ui/src/app/modules/status/widgets/terminal-widget/terminal-widget.component.ts index 58dcf8c45..07cb4d467 100644 --- a/ui/src/app/modules/status/widgets/terminal-widget/terminal-widget.component.ts +++ b/ui/src/app/modules/status/widgets/terminal-widget/terminal-widget.component.ts @@ -6,8 +6,8 @@ import { OnInit, ViewChild, } from '@angular/core'; +import { ITerminalOptions } from '@xterm/xterm'; import { Subject } from 'rxjs'; -import { ITerminalOptions } from 'xterm'; import { TerminalService } from '@/app/core/terminal.service'; @Component({ diff --git a/ui/src/scss/styles.scss b/ui/src/scss/styles.scss index 1b4846559..a84e91271 100644 --- a/ui/src/scss/styles.scss +++ b/ui/src/scss/styles.scss @@ -16,7 +16,7 @@ $image-path: '../../img'; @import 'bootstrap/scss/bootstrap'; @import 'mdbootstrap/scss/mdb-free'; -@import 'xterm/css/xterm.css'; +@import '@xterm/xterm/css/xterm.css'; @import 'nouislider/dist/nouislider.min.css'; @import 'dragula/dist/dragula.min.css';