Skip to content

Commit cc7141c

Browse files
philip-petersonphilip-peterson
committed
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 <[email protected]>
1 parent cfee97c commit cc7141c

File tree

7 files changed

+88
-88
lines changed

7 files changed

+88
-88
lines changed

‎bin/snapshot-libs.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require('redux');
1212
require('reselect');
1313
require('seamless-immutable');
1414
require('stylis');
15-
require('xterm-addon-unicode11');
15+
require('@xterm/addon-unicode11');
1616
// eslint-disable-next-line no-constant-condition
1717
if (false) {
1818
require('args');
@@ -21,11 +21,11 @@ if (false) {
2121
require('react-dom');
2222
require('react-redux');
2323
require('react');
24-
require('xterm-addon-fit');
25-
require('xterm-addon-image');
26-
require('xterm-addon-search');
27-
require('xterm-addon-web-links');
28-
require('xterm-addon-webgl');
29-
require('xterm-addon-canvas');
30-
require('xterm');
24+
require('@xterm/addon-fit');
25+
require('@xterm/addon-image');
26+
require('@xterm/addon-search');
27+
require('@xterm/addon-web-links');
28+
require('@xterm/addon-webgl');
29+
require('@xterm/addon-canvas');
30+
require('@xterm/xterm');
3131
}

‎lib/components/term.tsx

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import {clipboard, shell} from 'electron';
22
import React from 'react';
33

4+
import {CanvasAddon} from '@xterm/addon-canvas';
5+
import {FitAddon} from '@xterm/addon-fit';
6+
import {ImageAddon} from '@xterm/addon-image';
7+
import {LigaturesAddon} from '@xterm/addon-ligatures';
8+
import {SearchAddon} from '@xterm/addon-search';
9+
import type {ISearchDecorationOptions} from '@xterm/addon-search';
10+
import {Unicode11Addon} from '@xterm/addon-unicode11';
11+
import {WebLinksAddon} from '@xterm/addon-web-links';
12+
import {WebglAddon} from '@xterm/addon-webgl';
13+
import {Terminal} from '@xterm/xterm';
14+
import type {ITerminalOptions, IDisposable} from '@xterm/xterm';
415
import Color from 'color';
516
import isEqual from 'lodash/isEqual';
617
import pickBy from 'lodash/pickBy';
7-
import {Terminal} from 'xterm';
8-
import type {ITerminalOptions, IDisposable} from 'xterm';
9-
import {CanvasAddon} from 'xterm-addon-canvas';
10-
import {FitAddon} from 'xterm-addon-fit';
11-
import {ImageAddon} from 'xterm-addon-image';
12-
import {LigaturesAddon} from 'xterm-addon-ligatures';
13-
import {SearchAddon} from 'xterm-addon-search';
14-
import type {ISearchDecorationOptions} from 'xterm-addon-search';
15-
import {Unicode11Addon} from 'xterm-addon-unicode11';
16-
import {WebLinksAddon} from 'xterm-addon-web-links';
17-
import {WebglAddon} from 'xterm-addon-webgl';
1818

1919
import type {TermProps} from '../../typings/hyper';
2020
import terms from '../terms';
@@ -23,7 +23,7 @@ import {decorate} from '../utils/plugins';
2323

2424
import _SearchBox from './searchBox';
2525

26-
import 'xterm/css/xterm.css';
26+
import '@xterm/xterm/css/xterm.css';
2727

2828
const SearchBox = decorate(_SearchBox, 'SearchBox');
2929

‎package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@
6161
"typescript-json-schema": "0.65.1",
6262
"uuid": "9.0.1",
6363
"webpack-cli": "5.1.4",
64-
"xterm": "5.3.0",
65-
"xterm-addon-canvas": "0.5.0",
66-
"xterm-addon-fit": "0.8.0",
67-
"xterm-addon-image": "0.5.0",
68-
"xterm-addon-ligatures": "0.7.0",
69-
"xterm-addon-search": "0.13.0",
70-
"xterm-addon-unicode11": "0.6.0",
71-
"xterm-addon-web-links": "0.9.0",
72-
"xterm-addon-webgl": "0.16.0"
64+
"@xterm/xterm": "5.4.0",
65+
"@xterm/addon-canvas": "0.6.0",
66+
"@xterm/addon-fit": "0.9.0",
67+
"@xterm/addon-image": "0.7.0",
68+
"@xterm/addon-ligatures": "0.8.0",
69+
"@xterm/addon-search": "0.14.0",
70+
"@xterm/addon-unicode11": "0.7.0",
71+
"@xterm/addon-web-links": "0.10.0",
72+
"@xterm/addon-webgl": "0.17.0"
7373
},
7474
"devDependencies": {
7575
"@ava/babel": "2.0.0",

‎typings/config.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type {FontWeight} from 'xterm';
1+
import type {FontWeight} from '@xterm/xterm';
22

33
export type ColorMap = {
44
black: string;

‎typings/hyper.d.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export type ITermState = Immutable<{
4141
}>;
4242

4343
export type cursorShapes = 'BEAM' | 'UNDERLINE' | 'BLOCK';
44-
import type {FontWeight, IWindowsPty, Terminal} from 'xterm';
44+
import type {FontWeight, IWindowsPty, Terminal} from '@xterm/xterm';
4545
import type {ColorMap, configOptions} from './config';
4646

4747
export type uiState = Immutable<{
@@ -342,8 +342,8 @@ export type SearchBoxProps = {
342342
font: string;
343343
};
344344

345-
import type {FitAddon} from 'xterm-addon-fit';
346-
import type {SearchAddon} from 'xterm-addon-search';
345+
import type {FitAddon} from '@xterm/addon-fit';
346+
import type {SearchAddon} from '@xterm/addon-search';
347347
export type TermProps = {
348348
backgroundColor: string;
349349
bell: 'SOUND' | false;

‎webpack.config.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,16 @@ const config: webpack.Configuration[] = [
117117
reselect: 'require("./node_modules/reselect/lib/index.js")',
118118
'seamless-immutable': 'require("./node_modules/seamless-immutable/src/seamless-immutable.js")',
119119
stylis: 'require("./node_modules/stylis/stylis.js")',
120-
'xterm-addon-unicode11': 'require("./node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js")',
120+
'@xterm/addon-unicode11': 'require("./node_modules/@xterm/addon-unicode11/lib/addon-unicode11.js")',
121121
args: 'require("./node_modules/args/lib/index.js")',
122122
mousetrap: 'require("./node_modules/mousetrap/mousetrap.js")',
123123
open: 'require("./node_modules/open/index.js")',
124-
'xterm-addon-fit': 'require("./node_modules/xterm-addon-fit/lib/xterm-addon-fit.js")',
125-
'xterm-addon-image': 'require("./node_modules/xterm-addon-image/lib/xterm-addon-image.js")',
126-
'xterm-addon-search': 'require("./node_modules/xterm-addon-search/lib/xterm-addon-search.js")',
127-
'xterm-addon-web-links': 'require("./node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js")',
128-
'xterm-addon-webgl': 'require("./node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js")',
129-
'xterm-addon-canvas': 'require("./node_modules/xterm-addon-canvas/lib/xterm-addon-canvas.js")',
124+
'@xterm/addon-fit': 'require("./node_modules/@xterm/addon-fit/lib/addon-fit.js")',
125+
'@xterm/addon-image': 'require("./node_modules/@xterm/addon-image/lib/addon-image.js")',
126+
'@xterm/addon-search': 'require("./node_modules/@xterm/addon-search/lib/addon-search.js")',
127+
'@xterm/addon-web-links': 'require("./node_modules/@xterm/addon-web-links/lib/addon-web-links.js")',
128+
'@xterm/addon-webgl': 'require("./node_modules/@xterm/addon-webgl/lib/addon-webgl.js")',
129+
'@xterm/addon-canvas': 'require("./node_modules/@xterm/addon-canvas/lib/addon-canvas.js")',
130130
xterm: 'require("./node_modules/xterm/lib/xterm.js")'
131131
},
132132
plugins: [

‎yarn.lock

+48-48
Original file line numberDiff line numberDiff line change
@@ -1572,6 +1572,54 @@
15721572
resolved "https://registry.npmjs.org/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d"
15731573
integrity sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==
15741574

1575+
"@xterm/[email protected]":
1576+
version "0.6.0"
1577+
resolved "https://registry.npmjs.org/@xterm/addon-canvas/-/addon-canvas-0.6.0.tgz#08b2af252b8e4c5af3870820576a9a6ca18d517e"
1578+
integrity sha512-+nj2x595vItxfuAFxzXp46Izrh4EnEyS0Z60hX1iy6OFliP5OQu8Wu7n59m7m1vT6Q4nIWoN1WiH+VLAk4D9jQ==
1579+
1580+
"@xterm/[email protected]":
1581+
version "0.9.0"
1582+
resolved "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.9.0.tgz#29846f08782c51ad85b949528c45b84ad4ec45d7"
1583+
integrity sha512-hDlPPbTVPYyvwXu/asW8HbJkI/2RMi0cMaJnBZYVeJB0SWP2NeESMCNr+I7CvBlyI0sAxpxOg8Wk4OMkxBz9WA==
1584+
1585+
"@xterm/[email protected]":
1586+
version "0.7.0"
1587+
resolved "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.7.0.tgz#86e7342a3fe3fac6ba42944054e660916ec44953"
1588+
integrity sha512-OXJvmWXhJ5tdqSFX9yR2/d9AXwOz8+lJOghEPu2lSuwgLlMcOZ2YA+YuxPrisXIB2UctEHPAvVDGLbS9cESbzg==
1589+
1590+
"@xterm/[email protected]":
1591+
version "0.8.0"
1592+
resolved "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.8.0.tgz#d7f196c09edad0e7e45c691dce74f28bab683c37"
1593+
integrity sha512-hvClRA4a4saHXJV+Svxo6tC9NLN17coKbbFChhaQFvTe+TAx+G+LI1NytI8rmSIosOhg9m4uYB3J9o3Qyj4qxA==
1594+
dependencies:
1595+
font-finder "^1.1.0"
1596+
font-ligatures "^1.4.1"
1597+
1598+
"@xterm/[email protected]":
1599+
version "0.14.0"
1600+
resolved "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.14.0.tgz#783c1a3fb301a98f0d0598453bd80d22cb0863ed"
1601+
integrity sha512-gyKIjC1c2bqxBevPmWlMWRsHqiufUgl3HjN3OYim6YPClqNRUlTab7l8aW8i3W83XzU9q0gmAfIOe4KDmo0GfQ==
1602+
1603+
"@xterm/[email protected]":
1604+
version "0.7.0"
1605+
resolved "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.7.0.tgz#cf4fa4da58b0cbcad3666e03d642184f76fe7d27"
1606+
integrity sha512-HIhQpRenrslPn6GlUmCYZcSXvdU0JkTgXQ66dx9QwXEzgNhoh70b7hXPZDBoMD/bH/7DYlseeGO7qKQlFzyhbA==
1607+
1608+
"@xterm/[email protected]":
1609+
version "0.10.0"
1610+
resolved "https://registry.npmjs.org/@xterm/addon-web-links/-/addon-web-links-0.10.0.tgz#be3eccaf1cbd4063161458205cd4bbee2b0f34f9"
1611+
integrity sha512-QhrHCUr8w6ATGviyXwcAIM1qN3nD1hdxwMC8fsW7z/6aaQlb2nt7zmByJt4eOn7ZzrHOzczljqV5S2pkdQp2xw==
1612+
1613+
"@xterm/[email protected]":
1614+
version "0.17.0"
1615+
resolved "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.17.0.tgz#1da534456b7971ebb2f08c381d4732d1f104d7d8"
1616+
integrity sha512-KUH//EZCz7j1+IekW8sZzmcj/y9gOLf/HMcsWXjg0Xr5cT1lIBIIbbBlbf5kZ+XnA/8c1IuBm1vx+blzlfPk0g==
1617+
1618+
"@xterm/[email protected]":
1619+
version "5.4.0"
1620+
resolved "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.4.0.tgz#a35b585750ca492cbf2a4c99472c480d8c122840"
1621+
integrity sha512-GlyzcZZ7LJjhFevthHtikhiDIl8lnTSgol6eTM4aoSNLcuXu3OEhnbqdCVIjtIil3jjabf3gDtb1S8FGahsuEw==
1622+
15751623
"@xtuc/ieee754@^1.2.0":
15761624
version "1.2.0"
15771625
resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -8915,54 +8963,6 @@ xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0:
89158963
resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
89168964
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
89178965

8918-
[email protected]:
8919-
version "0.5.0"
8920-
resolved "https://registry.npmjs.org/xterm-addon-canvas/-/xterm-addon-canvas-0.5.0.tgz#95d056cec6da42a51b2c47746a011409020c388c"
8921-
integrity sha512-QOo/eZCMrCleAgMimfdbaZCgmQRWOml63Ued6RwQ+UTPvQj3Av9QKx3xksmyYrDGRO/AVRXa9oNuzlYvLdmoLQ==
8922-
8923-
[email protected]:
8924-
version "0.8.0"
8925-
resolved "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.8.0.tgz#48ca99015385141918f955ca7819e85f3691d35f"
8926-
integrity sha512-yj3Np7XlvxxhYF/EJ7p3KHaMt6OdwQ+HDu573Vx1lRXsVxOcnVJs51RgjZOouIZOczTsskaS+CpXspK81/DLqw==
8927-
8928-
[email protected]:
8929-
version "0.5.0"
8930-
resolved "https://registry.npmjs.org/xterm-addon-image/-/xterm-addon-image-0.5.0.tgz#3c9bb332a3de55ab200dbefd3411e3b0d985314f"
8931-
integrity sha512-bWXUBeDzhisYh0clVKx4JgQrZjpn+/QRMRwNsfnRpjCMhgmZ+SL3Bivktd7q03O4uKMMcAOe6bSmppwP9/um0Q==
8932-
8933-
[email protected]:
8934-
version "0.7.0"
8935-
resolved "https://registry.npmjs.org/xterm-addon-ligatures/-/xterm-addon-ligatures-0.7.0.tgz#28e24744fc06e83b0e3dad51f96823b036714ab3"
8936-
integrity sha512-5HXKCN5vB8KkqLIloItZkYAwMWF4Y2yOQsc4oFUXOjV3GnZskZpH0W+8rJH+80wxLNym7OMpdmg3a/Vd/+owDg==
8937-
dependencies:
8938-
font-finder "^1.1.0"
8939-
font-ligatures "^1.4.1"
8940-
8941-
[email protected]:
8942-
version "0.13.0"
8943-
resolved "https://registry.npmjs.org/xterm-addon-search/-/xterm-addon-search-0.13.0.tgz#21286f4db48aa949fbefce34bb8bc0c9d3cec627"
8944-
integrity sha512-sDUwG4CnqxUjSEFh676DlS3gsh3XYCzAvBPSvJ5OPgF3MRL3iHLPfsb06doRicLC2xXNpeG2cWk8x1qpESWJMA==
8945-
8946-
[email protected]:
8947-
version "0.6.0"
8948-
resolved "https://registry.npmjs.org/xterm-addon-unicode11/-/xterm-addon-unicode11-0.6.0.tgz#733fd17bdf2ae6e818493db1d41241c999de0786"
8949-
integrity sha512-5pkb8YoS/deRtNqQRw8t640mu+Ga8B2MG3RXGQu0bwgcfr8XiXIRI880TWM49ICAHhTmnOLPzIIBIjEnCq7k2A==
8950-
8951-
[email protected]:
8952-
version "0.9.0"
8953-
resolved "https://registry.npmjs.org/xterm-addon-web-links/-/xterm-addon-web-links-0.9.0.tgz#c65b18588d1f613e703eb6feb7f129e7ff1c63e7"
8954-
integrity sha512-LIzi4jBbPlrKMZF3ihoyqayWyTXAwGfu4yprz1aK2p71e9UKXN6RRzVONR0L+Zd+Ik5tPVI9bwp9e8fDTQh49Q==
8955-
8956-
[email protected]:
8957-
version "0.16.0"
8958-
resolved "https://registry.npmjs.org/xterm-addon-webgl/-/xterm-addon-webgl-0.16.0.tgz#9872d08a64136f893b27ef9a6412136d3bf563c4"
8959-
integrity sha512-E8cq1AiqNOv0M/FghPT+zPAEnvIQRDbAbkb04rRYSxUym69elPWVJ4sv22FCLBqM/3LcrmBLl/pELnBebVFKgA==
8960-
8961-
[email protected]:
8962-
version "5.3.0"
8963-
resolved "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz#867daf9cc826f3d45b5377320aabd996cb0fce46"
8964-
integrity sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg==
8965-
89668966
y18n@^5.0.5:
89678967
version "5.0.5"
89688968
resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"

0 commit comments

Comments
 (0)