From c91d08f69c7c267924c5ed84da2e832bc7b9a167 Mon Sep 17 00:00:00 2001
From: Chapman Pendery <cpendery@vt.edu>
Date: Sun, 10 Mar 2024 23:15:58 -0700
Subject: [PATCH] build: update xterm to use @xterm/headless

Signed-off-by: Chapman Pendery <cpendery@vt.edu>
---
 package-lock.json            | 20 ++++++++++++++++----
 package.json                 |  2 +-
 src/isterm/commandManager.ts |  2 +-
 src/isterm/pty.ts            |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d16bc14..ae8a851 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "@homebridge/node-pty-prebuilt-multiarch": "^0.11.12",
         "@withfig/autocomplete": "2.651.0",
+        "@xterm/headless": "^5.3.0",
         "ajv": "^8.12.0",
         "ansi-escapes": "^6.2.0",
         "ansi-styles": "^6.2.1",
@@ -21,8 +22,7 @@
         "toml": "^3.0.0",
         "wcwidth": "^1.0.1",
         "which": "^4.0.0",
-        "wrap-ansi": "^8.1.0",
-        "xterm-headless": "^5.3.0"
+        "wrap-ansi": "^8.1.0"
       },
       "bin": {
         "inshellisense": "build/index.js",
@@ -2405,6 +2405,11 @@
       "integrity": "sha512-lg7OR48K408nNPiciZ0HXveJuEgEAaylwk9VEnfPGgoWgNFnEPI32dZdZVTHTEtoE0taLByF8O8uosiYsl2+kQ==",
       "dev": true
     },
+    "node_modules/@xterm/headless": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.4.0.tgz",
+      "integrity": "sha512-CrFsRbkdGe4w8RExNPuXCceJ71ZBPHNJSM4pIbB31ioJj4Bgx51xjc6825m9Ftqfy3Bc9JpHhC8zeFvFeGx9Hg=="
+    },
     "node_modules/acorn": {
       "version": "8.10.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
@@ -8935,7 +8940,8 @@
     "node_modules/xterm-headless": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/xterm-headless/-/xterm-headless-5.3.0.tgz",
-      "integrity": "sha512-HjKkEgvjlyXfZvI0LdQChOqGL5nDiXge6X2IvoQbOn+oavAKUCX9hKHtDxmWVwxgNCCvXDnfQCYL+3wyHQ9PXA=="
+      "integrity": "sha512-HjKkEgvjlyXfZvI0LdQChOqGL5nDiXge6X2IvoQbOn+oavAKUCX9hKHtDxmWVwxgNCCvXDnfQCYL+3wyHQ9PXA==",
+      "dev": true
     },
     "node_modules/y18n": {
       "version": "5.0.8",
@@ -10805,6 +10811,11 @@
       "integrity": "sha512-lg7OR48K408nNPiciZ0HXveJuEgEAaylwk9VEnfPGgoWgNFnEPI32dZdZVTHTEtoE0taLByF8O8uosiYsl2+kQ==",
       "dev": true
     },
+    "@xterm/headless": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.4.0.tgz",
+      "integrity": "sha512-CrFsRbkdGe4w8RExNPuXCceJ71ZBPHNJSM4pIbB31ioJj4Bgx51xjc6825m9Ftqfy3Bc9JpHhC8zeFvFeGx9Hg=="
+    },
     "acorn": {
       "version": "8.10.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
@@ -15414,7 +15425,8 @@
     "xterm-headless": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/xterm-headless/-/xterm-headless-5.3.0.tgz",
-      "integrity": "sha512-HjKkEgvjlyXfZvI0LdQChOqGL5nDiXge6X2IvoQbOn+oavAKUCX9hKHtDxmWVwxgNCCvXDnfQCYL+3wyHQ9PXA=="
+      "integrity": "sha512-HjKkEgvjlyXfZvI0LdQChOqGL5nDiXge6X2IvoQbOn+oavAKUCX9hKHtDxmWVwxgNCCvXDnfQCYL+3wyHQ9PXA==",
+      "dev": true
     },
     "y18n": {
       "version": "5.0.8",
diff --git a/package.json b/package.json
index a550c5e..2e786b1 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "wcwidth": "^1.0.1",
     "which": "^4.0.0",
     "wrap-ansi": "^8.1.0",
-    "xterm-headless": "^5.3.0"
+    "@xterm/headless": "^5.3.0"
   },
   "devDependencies": {
     "@microsoft/tui-test": "^0.0.1-rc.3",
diff --git a/src/isterm/commandManager.ts b/src/isterm/commandManager.ts
index d6cfa08..ba7e71d 100644
--- a/src/isterm/commandManager.ts
+++ b/src/isterm/commandManager.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import convert from "color-convert";
-import { IBufferCell, IMarker, Terminal } from "xterm-headless";
+import { IBufferCell, IMarker, Terminal } from "@xterm/headless";
 import os from "node:os";
 import { Shell } from "../utils/shell.js";
 import log from "../utils/log.js";
diff --git a/src/isterm/pty.ts b/src/isterm/pty.ts
index 47a8fe3..3b3c553 100644
--- a/src/isterm/pty.ts
+++ b/src/isterm/pty.ts
@@ -11,7 +11,7 @@ import fs from "node:fs";
 import pty, { IPty, IEvent } from "@homebridge/node-pty-prebuilt-multiarch";
 import { Shell, getPythonPath, userZdotdir, zdotdir } from "../utils/shell.js";
 import { IsTermOscPs, IstermOscPt, IstermPromptStart, IstermPromptEnd } from "../utils/ansi.js";
-import xterm from "xterm-headless";
+import xterm from "@xterm/headless";
 import { CommandManager, CommandState } from "./commandManager.js";
 import log from "../utils/log.js";
 import { gitBashPath } from "../utils/shell.js";