From be51fe00e2e64a05b96b59e606bb3240f440ed87 Mon Sep 17 00:00:00 2001 From: Philip Peterson Date: Sun, 10 Nov 2024 19:21:52 -0900 Subject: [PATCH] Moves xterm-* dependencies to @xterm/* dependencies and performs select upgrades: * Bumps xterm from 5.3.0 to 5.4.0 * Bumps xterm-addon-canvas from 0.5.0 to 0.6.0 * Bumps xterm-addon-fit from 0.8.0 to 0.9.0 * Bumps xterm-addon-image from 0.5.0 to 0.7.0 * Bumps xterm-addon-ligatures from 0.7.0 to 0.8.0 * Bumps xterm-addon-search from 0.13.0 to 0.14.0 * Bumps xterm-addon-unicode11 from 0.6.0 to 0.7.0 * Bumps xterm-addon-web-links from 0.9.0 to 0.10.0 * Bumps xterm-addon-webgl from 0.16.0 to 0.17.0 Signed-off-by: Philip Peterson --- bin/snapshot-libs.js | 16 ++--- lib/components/term.tsx | 24 ++++---- package.json | 18 +++--- typings/config.d.ts | 2 +- typings/hyper.d.ts | 6 +- webpack.config.ts | 14 ++--- yarn.lock | 127 ++++++++++++++++++++++++---------------- 7 files changed, 116 insertions(+), 91 deletions(-) diff --git a/bin/snapshot-libs.js b/bin/snapshot-libs.js index 791e8ec868b5..ad4d7f239d0c 100644 --- a/bin/snapshot-libs.js +++ b/bin/snapshot-libs.js @@ -12,7 +12,7 @@ require('redux'); require('reselect'); require('seamless-immutable'); require('stylis'); -require('xterm-addon-unicode11'); +require('@xterm/addon-unicode11'); // eslint-disable-next-line no-constant-condition if (false) { require('args'); @@ -21,11 +21,11 @@ if (false) { require('react-dom'); require('react-redux'); require('react'); - require('xterm-addon-fit'); - require('xterm-addon-image'); - require('xterm-addon-search'); - require('xterm-addon-web-links'); - require('xterm-addon-webgl'); - require('xterm-addon-canvas'); - require('xterm'); + require('@xterm/addon-fit'); + require('@xterm/addon-image'); + require('@xterm/addon-search'); + require('@xterm/addon-web-links'); + require('@xterm/addon-webgl'); + require('@xterm/addon-canvas'); + require('@xterm/xterm'); } diff --git a/lib/components/term.tsx b/lib/components/term.tsx index 45c1464c97cc..923f398cb490 100644 --- a/lib/components/term.tsx +++ b/lib/components/term.tsx @@ -1,20 +1,20 @@ import {clipboard, shell} from 'electron'; import React from 'react'; +import {CanvasAddon} from '@xterm/addon-canvas'; +import {FitAddon} from '@xterm/addon-fit'; +import {ImageAddon} from '@xterm/addon-image'; +import {LigaturesAddon} from '@xterm/addon-ligatures'; +import {SearchAddon} from '@xterm/addon-search'; +import type {ISearchDecorationOptions} from '@xterm/addon-search'; +import {Unicode11Addon} from '@xterm/addon-unicode11'; +import {WebLinksAddon} from '@xterm/addon-web-links'; +import {WebglAddon} from '@xterm/addon-webgl'; +import {Terminal} from '@xterm/xterm'; +import type {ITerminalOptions, IDisposable} from '@xterm/xterm'; import Color from 'color'; import isEqual from 'lodash/isEqual'; import pickBy from 'lodash/pickBy'; -import {Terminal} from 'xterm'; -import type {ITerminalOptions, IDisposable} from 'xterm'; -import {CanvasAddon} from 'xterm-addon-canvas'; -import {FitAddon} from 'xterm-addon-fit'; -import {ImageAddon} from 'xterm-addon-image'; -import {LigaturesAddon} from 'xterm-addon-ligatures'; -import {SearchAddon} from 'xterm-addon-search'; -import type {ISearchDecorationOptions} from 'xterm-addon-search'; -import {Unicode11Addon} from 'xterm-addon-unicode11'; -import {WebLinksAddon} from 'xterm-addon-web-links'; -import {WebglAddon} from 'xterm-addon-webgl'; import type {TermProps} from '../../typings/hyper'; import terms from '../terms'; @@ -23,7 +23,7 @@ import {decorate} from '../utils/plugins'; import _SearchBox from './searchBox'; -import 'xterm/css/xterm.css'; +import '@xterm/xterm/css/xterm.css'; const SearchBox = decorate(_SearchBox, 'SearchBox'); diff --git a/package.json b/package.json index 337b05b5a70b..d60d6524f68b 100644 --- a/package.json +++ b/package.json @@ -61,15 +61,15 @@ "typescript-json-schema": "0.63.0", "uuid": "9.0.1", "webpack-cli": "5.1.4", - "xterm": "5.3.0", - "xterm-addon-canvas": "0.5.0", - "xterm-addon-fit": "0.8.0", - "xterm-addon-image": "0.5.0", - "xterm-addon-ligatures": "0.7.0", - "xterm-addon-search": "0.13.0", - "xterm-addon-unicode11": "0.6.0", - "xterm-addon-web-links": "0.9.0", - "xterm-addon-webgl": "0.16.0" + "@xterm/xterm": "5.4.0", + "@xterm/addon-canvas": "0.6.0", + "@xterm/addon-fit": "0.9.0", + "@xterm/addon-image": "0.7.0", + "@xterm/addon-ligatures": "0.8.0", + "@xterm/addon-search": "0.14.0", + "@xterm/addon-unicode11": "0.7.0", + "@xterm/addon-web-links": "0.10.0", + "@xterm/addon-webgl": "0.17.0" }, "devDependencies": { "@ava/babel": "2.0.0", diff --git a/typings/config.d.ts b/typings/config.d.ts index 7a6053e93fe3..583ff5476b49 100644 --- a/typings/config.d.ts +++ b/typings/config.d.ts @@ -1,4 +1,4 @@ -import type {FontWeight} from 'xterm'; +import type {FontWeight} from '@xterm/xterm'; export type ColorMap = { black: string; diff --git a/typings/hyper.d.ts b/typings/hyper.d.ts index dcc48f54a802..4ba77c54c97c 100644 --- a/typings/hyper.d.ts +++ b/typings/hyper.d.ts @@ -41,7 +41,7 @@ export type ITermState = Immutable<{ }>; export type cursorShapes = 'BEAM' | 'UNDERLINE' | 'BLOCK'; -import type {FontWeight, IWindowsPty, Terminal} from 'xterm'; +import type {FontWeight, IWindowsPty, Terminal} from '@xterm/xterm'; import type {ColorMap, configOptions} from './config'; export type uiState = Immutable<{ @@ -342,8 +342,8 @@ export type SearchBoxProps = { font: string; }; -import type {FitAddon} from 'xterm-addon-fit'; -import type {SearchAddon} from 'xterm-addon-search'; +import type {FitAddon} from '@xterm/addon-fit'; +import type {SearchAddon} from '@xterm/addon-search'; export type TermProps = { backgroundColor: string; bell: 'SOUND' | false; diff --git a/webpack.config.ts b/webpack.config.ts index 432b575f2ee2..6953ecc9b20c 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -117,16 +117,16 @@ const config: webpack.Configuration[] = [ reselect: 'require("./node_modules/reselect/lib/index.js")', 'seamless-immutable': 'require("./node_modules/seamless-immutable/src/seamless-immutable.js")', stylis: 'require("./node_modules/stylis/stylis.js")', - 'xterm-addon-unicode11': 'require("./node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js")', + '@xterm/addon-unicode11': 'require("./node_modules/@xterm/addon-unicode11/lib/addon-unicode11.js")', args: 'require("./node_modules/args/lib/index.js")', mousetrap: 'require("./node_modules/mousetrap/mousetrap.js")', open: 'require("./node_modules/open/index.js")', - 'xterm-addon-fit': 'require("./node_modules/xterm-addon-fit/lib/xterm-addon-fit.js")', - 'xterm-addon-image': 'require("./node_modules/xterm-addon-image/lib/xterm-addon-image.js")', - 'xterm-addon-search': 'require("./node_modules/xterm-addon-search/lib/xterm-addon-search.js")', - 'xterm-addon-web-links': 'require("./node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js")', - 'xterm-addon-webgl': 'require("./node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js")', - 'xterm-addon-canvas': 'require("./node_modules/xterm-addon-canvas/lib/xterm-addon-canvas.js")', + '@xterm/addon-fit': 'require("./node_modules/@xterm/addon-fit/lib/addon-fit.js")', + '@xterm/addon-image': 'require("./node_modules/@xterm/addon-image/lib/addon-image.js")', + '@xterm/addon-search': 'require("./node_modules/@xterm/addon-search/lib/addon-search.js")', + '@xterm/addon-web-links': 'require("./node_modules/@xterm/addon-web-links/lib/addon-web-links.js")', + '@xterm/addon-webgl': 'require("./node_modules/@xterm/addon-webgl/lib/addon-webgl.js")', + '@xterm/addon-canvas': 'require("./node_modules/@xterm/addon-canvas/lib/addon-canvas.js")', xterm: 'require("./node_modules/xterm/lib/xterm.js")' }, plugins: [ diff --git a/yarn.lock b/yarn.lock index 110f0f9ecb25..3d9eb781e338 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1565,6 +1565,54 @@ resolved "https://registry.npmjs.org/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d" integrity sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ== +"@xterm/addon-canvas@0.6.0": + version "0.6.0" + resolved "https://registry.npmjs.org/@xterm/addon-canvas/-/addon-canvas-0.6.0.tgz#08b2af252b8e4c5af3870820576a9a6ca18d517e" + integrity sha512-+nj2x595vItxfuAFxzXp46Izrh4EnEyS0Z60hX1iy6OFliP5OQu8Wu7n59m7m1vT6Q4nIWoN1WiH+VLAk4D9jQ== + +"@xterm/addon-fit@0.9.0": + version "0.9.0" + resolved "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.9.0.tgz#29846f08782c51ad85b949528c45b84ad4ec45d7" + integrity sha512-hDlPPbTVPYyvwXu/asW8HbJkI/2RMi0cMaJnBZYVeJB0SWP2NeESMCNr+I7CvBlyI0sAxpxOg8Wk4OMkxBz9WA== + +"@xterm/addon-image@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.7.0.tgz#86e7342a3fe3fac6ba42944054e660916ec44953" + integrity sha512-OXJvmWXhJ5tdqSFX9yR2/d9AXwOz8+lJOghEPu2lSuwgLlMcOZ2YA+YuxPrisXIB2UctEHPAvVDGLbS9cESbzg== + +"@xterm/addon-ligatures@0.8.0": + version "0.8.0" + resolved "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.8.0.tgz#d7f196c09edad0e7e45c691dce74f28bab683c37" + integrity sha512-hvClRA4a4saHXJV+Svxo6tC9NLN17coKbbFChhaQFvTe+TAx+G+LI1NytI8rmSIosOhg9m4uYB3J9o3Qyj4qxA== + dependencies: + font-finder "^1.1.0" + font-ligatures "^1.4.1" + +"@xterm/addon-search@0.14.0": + version "0.14.0" + resolved "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.14.0.tgz#783c1a3fb301a98f0d0598453bd80d22cb0863ed" + integrity sha512-gyKIjC1c2bqxBevPmWlMWRsHqiufUgl3HjN3OYim6YPClqNRUlTab7l8aW8i3W83XzU9q0gmAfIOe4KDmo0GfQ== + +"@xterm/addon-unicode11@0.7.0": + version "0.7.0" + resolved "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.7.0.tgz#cf4fa4da58b0cbcad3666e03d642184f76fe7d27" + integrity sha512-HIhQpRenrslPn6GlUmCYZcSXvdU0JkTgXQ66dx9QwXEzgNhoh70b7hXPZDBoMD/bH/7DYlseeGO7qKQlFzyhbA== + +"@xterm/addon-web-links@0.10.0": + version "0.10.0" + resolved "https://registry.npmjs.org/@xterm/addon-web-links/-/addon-web-links-0.10.0.tgz#be3eccaf1cbd4063161458205cd4bbee2b0f34f9" + integrity sha512-QhrHCUr8w6ATGviyXwcAIM1qN3nD1hdxwMC8fsW7z/6aaQlb2nt7zmByJt4eOn7ZzrHOzczljqV5S2pkdQp2xw== + +"@xterm/addon-webgl@0.17.0": + version "0.17.0" + resolved "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.17.0.tgz#1da534456b7971ebb2f08c381d4732d1f104d7d8" + integrity sha512-KUH//EZCz7j1+IekW8sZzmcj/y9gOLf/HMcsWXjg0Xr5cT1lIBIIbbBlbf5kZ+XnA/8c1IuBm1vx+blzlfPk0g== + +"@xterm/xterm@5.4.0": + version "5.4.0" + resolved "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.4.0.tgz#a35b585750ca492cbf2a4c99472c480d8c122840" + integrity sha512-GlyzcZZ7LJjhFevthHtikhiDIl8lnTSgol6eTM4aoSNLcuXu3OEhnbqdCVIjtIil3jjabf3gDtb1S8FGahsuEw== + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -7855,7 +7903,16 @@ stdin-discarder@^0.2.1: resolved "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz#390037f44c4ae1a1ae535c5fe38dc3aba8d997be" integrity sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -7966,7 +8023,14 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -8799,7 +8863,7 @@ wildcard@^2.0.0: resolved "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -8817,6 +8881,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" @@ -8859,54 +8932,6 @@ xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0: resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -xterm-addon-canvas@0.5.0: - version "0.5.0" - resolved "https://registry.npmjs.org/xterm-addon-canvas/-/xterm-addon-canvas-0.5.0.tgz#95d056cec6da42a51b2c47746a011409020c388c" - integrity sha512-QOo/eZCMrCleAgMimfdbaZCgmQRWOml63Ued6RwQ+UTPvQj3Av9QKx3xksmyYrDGRO/AVRXa9oNuzlYvLdmoLQ== - -xterm-addon-fit@0.8.0: - version "0.8.0" - resolved "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.8.0.tgz#48ca99015385141918f955ca7819e85f3691d35f" - integrity sha512-yj3Np7XlvxxhYF/EJ7p3KHaMt6OdwQ+HDu573Vx1lRXsVxOcnVJs51RgjZOouIZOczTsskaS+CpXspK81/DLqw== - -xterm-addon-image@0.5.0: - version "0.5.0" - resolved "https://registry.npmjs.org/xterm-addon-image/-/xterm-addon-image-0.5.0.tgz#3c9bb332a3de55ab200dbefd3411e3b0d985314f" - integrity sha512-bWXUBeDzhisYh0clVKx4JgQrZjpn+/QRMRwNsfnRpjCMhgmZ+SL3Bivktd7q03O4uKMMcAOe6bSmppwP9/um0Q== - -xterm-addon-ligatures@0.7.0: - version "0.7.0" - resolved "https://registry.npmjs.org/xterm-addon-ligatures/-/xterm-addon-ligatures-0.7.0.tgz#28e24744fc06e83b0e3dad51f96823b036714ab3" - integrity sha512-5HXKCN5vB8KkqLIloItZkYAwMWF4Y2yOQsc4oFUXOjV3GnZskZpH0W+8rJH+80wxLNym7OMpdmg3a/Vd/+owDg== - dependencies: - font-finder "^1.1.0" - font-ligatures "^1.4.1" - -xterm-addon-search@0.13.0: - version "0.13.0" - resolved "https://registry.npmjs.org/xterm-addon-search/-/xterm-addon-search-0.13.0.tgz#21286f4db48aa949fbefce34bb8bc0c9d3cec627" - integrity sha512-sDUwG4CnqxUjSEFh676DlS3gsh3XYCzAvBPSvJ5OPgF3MRL3iHLPfsb06doRicLC2xXNpeG2cWk8x1qpESWJMA== - -xterm-addon-unicode11@0.6.0: - version "0.6.0" - resolved "https://registry.npmjs.org/xterm-addon-unicode11/-/xterm-addon-unicode11-0.6.0.tgz#733fd17bdf2ae6e818493db1d41241c999de0786" - integrity sha512-5pkb8YoS/deRtNqQRw8t640mu+Ga8B2MG3RXGQu0bwgcfr8XiXIRI880TWM49ICAHhTmnOLPzIIBIjEnCq7k2A== - -xterm-addon-web-links@0.9.0: - version "0.9.0" - resolved "https://registry.npmjs.org/xterm-addon-web-links/-/xterm-addon-web-links-0.9.0.tgz#c65b18588d1f613e703eb6feb7f129e7ff1c63e7" - integrity sha512-LIzi4jBbPlrKMZF3ihoyqayWyTXAwGfu4yprz1aK2p71e9UKXN6RRzVONR0L+Zd+Ik5tPVI9bwp9e8fDTQh49Q== - -xterm-addon-webgl@0.16.0: - version "0.16.0" - resolved "https://registry.npmjs.org/xterm-addon-webgl/-/xterm-addon-webgl-0.16.0.tgz#9872d08a64136f893b27ef9a6412136d3bf563c4" - integrity sha512-E8cq1AiqNOv0M/FghPT+zPAEnvIQRDbAbkb04rRYSxUym69elPWVJ4sv22FCLBqM/3LcrmBLl/pELnBebVFKgA== - -xterm@5.3.0: - version "5.3.0" - resolved "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz#867daf9cc826f3d45b5377320aabd996cb0fce46" - integrity sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg== - y18n@^5.0.5: version "5.0.5" resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"