try xterm update again

homebridge · Mar 16, 2024 · 88c2f6e · 88c2f6e
1 parent b391f95
commit 88c2f6e
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 43 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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';