Update xterm.js to 5.4.0

srv/CMakeLists.txt

@@ -20,10 +20,10 @@ set(JAVA_SCRIPT_FILES
     static/js/terminal.js
     static/js/utils.js
     static/js/main.js
-    static/node_modules/xterm/lib/xterm.js
-    static/node_modules/xterm-addon-search/lib/xterm-addon-search.js)
+    static/node_modules/@xterm/xterm/lib/xterm.js
+    static/node_modules/@xterm/addon-search/lib/addon-search.js)
 set(CSS_FILES static/css/basics.css static/css/genericrendering.css static/css/layout.css static/css/log.css
-              static/css/specifics.css static/node_modules/xterm/css/xterm.css)
+              static/css/specifics.css static/node_modules/@xterm/xterm/css/xterm.css)
 set(IMG_FILES
     static/img/favicon.svg
     static/img/logo.svg

srv/static/index.html

@@ -10,10 +10,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
     <link rel="icon" href="img/favicon.svg" type="image/svg+xml" />
     <!-- include xterm.js -->
-    <link rel="stylesheet" type="text/css" href="node_modules/xterm/css/xterm.css" />
+    <link rel="stylesheet" type="text/css" href="node_modules/@xterm/xterm/css/xterm.css" />
     <script type="text/javascript">window.exports = {} // hack for xtermjs exports as it does not support ES6 modules yet</script>
-    <script src="node_modules/xterm/lib/xterm.js"></script>
-    <script src="node_modules/xterm-addon-search/lib/xterm-addon-search.js"></script>
+    <script src="node_modules/@xterm/xterm/lib/xterm.js"></script>
+    <script src="node_modules/@xterm/addon-search/lib/addon-search.js"></script>
     <!-- include custom styles and scripts -->
     <link rel="stylesheet" type="text/css" href="css/basics.css" />
     <link rel="stylesheet" type="text/css" href="css/layout.css" />

srv/static/node_modules/@xterm/xterm/css/xterm.css

@@ -140,7 +140,7 @@
     cursor: crosshair;
 }
 
-.xterm .xterm-accessibility,
+.xterm .xterm-accessibility:not(.debug),
 .xterm .xterm-message {
     position: absolute;
     left: 0;
@@ -152,6 +152,15 @@
     pointer-events: none;
 }
 
+.xterm .xterm-accessibility-tree:not(.debug) *::selection {
+  color: transparent;
+}
+
+.xterm .xterm-accessibility-tree {
+  user-select: text;
+  white-space: pre;
+}
+
 .xterm .live-region {
     position: absolute;
     left: -9999px;

srv/static/package-lock.json

@@ -5,22 +5,22 @@
   "packages": {
     "": {
       "dependencies": {
-        "xterm": "^5.0.0",
-        "xterm-addon-search": "^0.10.0"
+        "@xterm/addon-search": "^0.14.0",
+        "@xterm/xterm": "^5.4.0"
       }
     },
-    "node_modules/xterm": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz",
-      "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg=="
-    },
-    "node_modules/xterm-addon-search": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/xterm-addon-search/-/xterm-addon-search-0.10.0.tgz",
-      "integrity": "sha512-l+kjDxNDQbkniU5OUo9BHknxUEPZGM0OFpVpc2sMmrb97S0FKJVJO4wAZPJvSGVJ8ZEG6KuDyzXluvnb08t71Q==",
+    "node_modules/@xterm/addon-search": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.14.0.tgz",
+      "integrity": "sha512-gyKIjC1c2bqxBevPmWlMWRsHqiufUgl3HjN3OYim6YPClqNRUlTab7l8aW8i3W83XzU9q0gmAfIOe4KDmo0GfQ==",
       "peerDependencies": {
-        "xterm": "^5.0.0"
+        "@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=="
     }
   }
 }

srv/static/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "xterm": "^5.0.0",
-    "xterm-addon-search": "^0.10.0"
+    "@xterm/addon-search": "^0.14.0",
+    "@xterm/xterm": "^5.4.0"
   }
 }