chore: Update xterm

From version 5.4.0 onwards, xterm scopes its package names as
`@xterm/foo` instead of just `xterm-foo`.

We currently have a copy of xterm.css which we use instead of directly
including the one from the `@xterm/xterm` package, so I've updated the
contents of that too.
This commit is contained in:
Sam Atkins 2024-05-14 13:46:43 +01:00
parent fafbc292ca
commit 2656b47640
4 changed files with 33 additions and 35 deletions

43
package-lock.json generated
View File

@ -4071,6 +4071,19 @@
} }
} }
}, },
"node_modules/@xterm/addon-fit": {
"version": "0.10.0",
"resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.10.0.tgz",
"integrity": "sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==",
"peerDependencies": {
"@xterm/xterm": "^5.0.0"
}
},
"node_modules/@xterm/xterm": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
"integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A=="
},
"node_modules/@xtuc/ieee754": { "node_modules/@xtuc/ieee754": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@ -11561,9 +11574,7 @@
"fs-mode-to-string": "^0.0.2", "fs-mode-to-string": "^0.0.2",
"json-query": "^2.2.2", "json-query": "^2.2.2",
"path-browserify": "^1.0.1", "path-browserify": "^1.0.1",
"sinon": "^17.0.1", "sinon": "^17.0.1"
"xterm": "^5.1.0",
"xterm-addon-fit": "^0.7.0"
}, },
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^24.1.0", "@rollup/plugin-commonjs": "^24.1.0",
@ -12131,17 +12142,6 @@
"defaults": "^1.0.3" "defaults": "^1.0.3"
} }
}, },
"packages/phoenix/node_modules/xterm": {
"version": "5.1.0",
"license": "MIT"
},
"packages/phoenix/node_modules/xterm-addon-fit": {
"version": "0.7.0",
"license": "MIT",
"peerDependencies": {
"xterm": "^5.0.0"
}
},
"packages/phoenix/packages/contextlink": { "packages/phoenix/packages/contextlink": {
"version": "0.0.0", "version": "0.0.0",
"extraneous": true, "extraneous": true,
@ -12180,8 +12180,8 @@
"version": "0.0.0", "version": "0.0.0",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"dependencies": { "dependencies": {
"xterm": "^5.3.0", "@xterm/addon-fit": "^0.10.0",
"xterm-addon-fit": "^0.7.0" "@xterm/xterm": "^5.5.0"
}, },
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^24.1.0", "@rollup/plugin-commonjs": "^24.1.0",
@ -12723,17 +12723,6 @@
"engines": { "engines": {
"node": ">=12" "node": ">=12"
} }
},
"packages/terminal/node_modules/xterm": {
"version": "5.3.0",
"license": "MIT"
},
"packages/terminal/node_modules/xterm-addon-fit": {
"version": "0.7.0",
"license": "MIT",
"peerDependencies": {
"xterm": "^5.0.0"
}
} }
} }
} }

View File

@ -140,7 +140,7 @@
cursor: crosshair; cursor: crosshair;
} }
.xterm .xterm-accessibility, .xterm .xterm-accessibility:not(.debug),
.xterm .xterm-message { .xterm .xterm-message {
position: absolute; position: absolute;
left: 0; left: 0;
@ -152,6 +152,15 @@
pointer-events: none; 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 { .xterm .live-region {
position: absolute; position: absolute;
left: -9999px; left: -9999px;
@ -187,12 +196,12 @@
} }
.xterm-screen .xterm-decoration-container .xterm-decoration { .xterm-screen .xterm-decoration-container .xterm-decoration {
z-index: 6; z-index: 6;
position: absolute; position: absolute;
} }
.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer { .xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer {
z-index: 7; z-index: 7;
} }
.xterm-decoration-overview-ruler { .xterm-decoration-overview-ruler {

View File

@ -19,7 +19,7 @@
"rollup-plugin-copy": "^3.4.0" "rollup-plugin-copy": "^3.4.0"
}, },
"dependencies": { "dependencies": {
"xterm": "^5.3.0", "@xterm/xterm": "^5.5.0",
"xterm-addon-fit": "^0.7.0" "@xterm/addon-fit": "^0.10.0"
} }
} }

View File

@ -16,8 +16,8 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { Terminal } from 'xterm'; import { Terminal } from '@xterm/xterm';
import { FitAddon } from 'xterm-addon-fit'; import { FitAddon } from '@xterm/addon-fit';
import { PTY } from './pty/PTY'; import { PTY } from './pty/PTY';
import { XDocumentANSIShell } from './pty/XDocumentANSIShell'; import { XDocumentANSIShell } from './pty/XDocumentANSIShell';