Skip to content

Commit c646be0

Browse files
TyriarTyriar
authored
Merge pull request microsoft#165859 from microsoft/tyriar/update_xterm
Update xterm.js
2 parents d5e5981 + 7461db4 commit c646be0

File tree

7 files changed

+78
-77
lines changed

7 files changed

+78
-77
lines changed

‎package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@
8686
"vscode-proxy-agent": "^0.12.0",
8787
"vscode-regexpp": "^3.1.0",
8888
"vscode-textmate": "7.0.1",
89-
"xterm": "5.1.0-beta.49",
90-
"xterm-addon-canvas": "0.3.0-beta.23",
89+
"xterm": "5.1.0-beta.61",
90+
"xterm-addon-canvas": "0.3.0-beta.26",
9191
"xterm-addon-search": "0.11.0-beta.7",
9292
"xterm-addon-serialize": "0.9.0-beta.3",
93-
"xterm-addon-unicode11": "0.5.0-beta.1",
94-
"xterm-addon-webgl": "0.14.0-beta.32",
95-
"xterm-headless": "5.1.0-beta.49",
93+
"xterm-addon-unicode11": "0.5.0-beta.5",
94+
"xterm-addon-webgl": "0.14.0-beta.38",
95+
"xterm-headless": "5.1.0-beta.61",
9696
"yauzl": "^2.9.2",
9797
"yazl": "^2.4.3"
9898
},

‎remote/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
"vscode-proxy-agent": "^0.12.0",
2525
"vscode-regexpp": "^3.1.0",
2626
"vscode-textmate": "7.0.1",
27-
"xterm": "5.1.0-beta.49",
28-
"xterm-addon-canvas": "0.3.0-beta.23",
27+
"xterm": "5.1.0-beta.61",
28+
"xterm-addon-canvas": "0.3.0-beta.26",
2929
"xterm-addon-search": "0.11.0-beta.7",
3030
"xterm-addon-serialize": "0.9.0-beta.3",
31-
"xterm-addon-unicode11": "0.5.0-beta.1",
32-
"xterm-addon-webgl": "0.14.0-beta.32",
33-
"xterm-headless": "5.1.0-beta.49",
31+
"xterm-addon-unicode11": "0.5.0-beta.5",
32+
"xterm-addon-webgl": "0.14.0-beta.38",
33+
"xterm-headless": "5.1.0-beta.61",
3434
"yauzl": "^2.9.2",
3535
"yazl": "^2.4.3"
3636
},

‎remote/web/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"tas-client-umd": "0.1.6",
1212
"vscode-oniguruma": "1.6.1",
1313
"vscode-textmate": "7.0.1",
14-
"xterm": "5.1.0-beta.49",
15-
"xterm-addon-canvas": "0.3.0-beta.23",
14+
"xterm": "5.1.0-beta.61",
15+
"xterm-addon-canvas": "0.3.0-beta.26",
1616
"xterm-addon-search": "0.11.0-beta.7",
17-
"xterm-addon-unicode11": "0.5.0-beta.1",
18-
"xterm-addon-webgl": "0.14.0-beta.32"
17+
"xterm-addon-unicode11": "0.5.0-beta.5",
18+
"xterm-addon-webgl": "0.14.0-beta.38"
1919
}
2020
}

‎remote/web/yarn.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,27 +68,27 @@ [email protected]:
6868
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-7.0.1.tgz#8118a32b02735dccd14f893b495fa5389ad7de79"
6969
integrity sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw==
7070

71-
[email protected].23:
72-
version "0.3.0-beta.23"
73-
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.23.tgz#aa67f43114e0bd052311f3f88f842e85006e697f"
74-
integrity sha512-xFeuwK1ZuIl+5Go4ZesAWe+pToqjF0LSQfECia3tTZ0emkpzR3c+wU3vWoKPj71A7ZkgCVDmCGyLAWDpTSLgEQ==
71+
[email protected].26:
72+
version "0.3.0-beta.26"
73+
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.26.tgz#8c5665477d168f0c075960d9d86ae21afb3000c4"
74+
integrity sha512-33Btfufs6u8YsU8jmLlQfmmqavKGvP5s4Clxwq+KTT5DIlYDmt0r8GKdBHrB0AwNZiFRXsbPQoLF2XkHnkpTEw==
7575

7676
[email protected]:
7777
version "0.11.0-beta.7"
7878
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0-beta.7.tgz#d90bcbe9e8f9238c18ba6145bd7ec2f8e3240052"
7979
integrity sha512-i/c774V0/Eon3BIFRsRR3OjKTnMGkccBo12yDkOa40tnAD4aa8FjspE3bxW/Hh1mUEhCSgBSLnMDlK/GwnUC+g==
8080

81-
[email protected].1:
82-
version "0.5.0-beta.1"
83-
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.1.tgz#8a9e9356018e082318abbe2be1f9599fcc6b46a2"
84-
integrity sha512-uAErX4gwhW6N524stLG6oZR3yBGgPnFmZ2Tv4vyYy7tcgDuHRoc22xYSCDgO1ohz1FLlOm8JGXRjXliwO9ic3A==
81+
[email protected].5:
82+
version "0.5.0-beta.5"
83+
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.5.tgz#6992a6f56349e67b903201d52b1ad41ba3469d93"
84+
integrity sha512-MaqnU34WTHCUAo7moB4KhynGn03RckI0JJ8E/gXe96EzuCP6bVJIKSc5pc9iFeLF4BX1SuemOqIHYl2Q3u3NTA==
8585

86-
[email protected].32:
87-
version "0.14.0-beta.32"
88-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.32.tgz#35d08d4a0b36434ea5746738987b0170f918a9e3"
89-
integrity sha512-FnD/LX0Obxu+Q3hdkVvStlGFCtp+jzKtV6lzF42Uvh5evbGA2SBO3BxWW26VhurtEN5Pf7Iyx8sJxcPVd/tPXw==
86+
[email protected].38:
87+
version "0.14.0-beta.38"
88+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.38.tgz#e1c6346a80aa3eca7d5e84b43bffc0cc5675c36e"
89+
integrity sha512-ThgAHdaqQJKZi4GrfElvvaFP3H1ANHEn1iRZ7LZYf+3Vk6hWysaLwNrb0dj/aKeXQuKYObhpPn16yZcmJkVYCQ==
9090

91-
[email protected].49:
92-
version "5.1.0-beta.49"
93-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.49.tgz#4c98e5580d690a57d5d055025abb5d0e8ab2f42c"
94-
integrity sha512-jUiJ4lBhHW7XzLPyXVzCwjljDEl5TJj9+fj677fwDb/La8qPov2R+ocjb1H/7j0sODxAV0Op2ftDCtz2JzbCvQ==
91+
[email protected].61:
92+
version "5.1.0-beta.61"
93+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.61.tgz#1a433163bd222b8b06cfe18908f5a03bc1ca7b66"
94+
integrity sha512-EBYlNR2ATKLQJnG6v4z+P6DeYtMPNhO/6Z7WKFLq5WaxyP6q9adDSAOU+S2CrZlCxhvOH4WmZa2vSu2OacfvNQ==

‎remote/yarn.lock

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -788,10 +788,10 @@ wrappy@1:
788788
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
789789
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
790790

791-
[email protected].23:
792-
version "0.3.0-beta.23"
793-
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.23.tgz#aa67f43114e0bd052311f3f88f842e85006e697f"
794-
integrity sha512-xFeuwK1ZuIl+5Go4ZesAWe+pToqjF0LSQfECia3tTZ0emkpzR3c+wU3vWoKPj71A7ZkgCVDmCGyLAWDpTSLgEQ==
791+
[email protected].26:
792+
version "0.3.0-beta.26"
793+
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.26.tgz#8c5665477d168f0c075960d9d86ae21afb3000c4"
794+
integrity sha512-33Btfufs6u8YsU8jmLlQfmmqavKGvP5s4Clxwq+KTT5DIlYDmt0r8GKdBHrB0AwNZiFRXsbPQoLF2XkHnkpTEw==
795795

796796
[email protected]:
797797
version "0.11.0-beta.7"
@@ -803,25 +803,25 @@ [email protected]:
803803
resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.9.0-beta.3.tgz#bb4ed416db5748bcbe55a4b6d4c2151368fdae74"
804804
integrity sha512-LaFuowtdxNdeuLm+KmtsoR4mgPOLu/I9k0hlWXbzAd1okJhthwMH4Y6cuL0/pFk1AclP5s+L42glv8PV0GnVsg==
805805

806-
[email protected].1:
807-
version "0.5.0-beta.1"
808-
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.1.tgz#8a9e9356018e082318abbe2be1f9599fcc6b46a2"
809-
integrity sha512-uAErX4gwhW6N524stLG6oZR3yBGgPnFmZ2Tv4vyYy7tcgDuHRoc22xYSCDgO1ohz1FLlOm8JGXRjXliwO9ic3A==
810-
811-
[email protected].32:
812-
version "0.14.0-beta.32"
813-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.32.tgz#35d08d4a0b36434ea5746738987b0170f918a9e3"
814-
integrity sha512-FnD/LX0Obxu+Q3hdkVvStlGFCtp+jzKtV6lzF42Uvh5evbGA2SBO3BxWW26VhurtEN5Pf7Iyx8sJxcPVd/tPXw==
815-
816-
[email protected].49:
817-
version "5.1.0-beta.49"
818-
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.1.0-beta.49.tgz#c71793f7ba5ba3c403af5e5e9a7c5d89318b663d"
819-
integrity sha512-dDHteT5DMr/li8qbaZ6FvIuZEI6SZUjNeiOrVwr//Qo4s/k4K3dRD0YxoJJ3ml/nPoxnhYyDkf9viLgm1rgEhA==
820-
821-
[email protected].49:
822-
version "5.1.0-beta.49"
823-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.49.tgz#4c98e5580d690a57d5d055025abb5d0e8ab2f42c"
824-
integrity sha512-jUiJ4lBhHW7XzLPyXVzCwjljDEl5TJj9+fj677fwDb/La8qPov2R+ocjb1H/7j0sODxAV0Op2ftDCtz2JzbCvQ==
806+
[email protected].5:
807+
version "0.5.0-beta.5"
808+
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.5.tgz#6992a6f56349e67b903201d52b1ad41ba3469d93"
809+
integrity sha512-MaqnU34WTHCUAo7moB4KhynGn03RckI0JJ8E/gXe96EzuCP6bVJIKSc5pc9iFeLF4BX1SuemOqIHYl2Q3u3NTA==
810+
811+
[email protected].38:
812+
version "0.14.0-beta.38"
813+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.38.tgz#e1c6346a80aa3eca7d5e84b43bffc0cc5675c36e"
814+
integrity sha512-ThgAHdaqQJKZi4GrfElvvaFP3H1ANHEn1iRZ7LZYf+3Vk6hWysaLwNrb0dj/aKeXQuKYObhpPn16yZcmJkVYCQ==
815+
816+
[email protected].61:
817+
version "5.1.0-beta.61"
818+
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.1.0-beta.61.tgz#9a112e64d1cdc3dfce5198c868c20cab510675e5"
819+
integrity sha512-hJMaWP4N0kMzJp7jhexHSAzPtQZSw0aJY2xM6RF9AbA4bWry2T9sF427Iv9us9V1UP0bLDgUmD5HG2bdT7r0rw==
820+
821+
[email protected].61:
822+
version "5.1.0-beta.61"
823+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.61.tgz#1a433163bd222b8b06cfe18908f5a03bc1ca7b66"
824+
integrity sha512-EBYlNR2ATKLQJnG6v4z+P6DeYtMPNhO/6Z7WKFLq5WaxyP6q9adDSAOU+S2CrZlCxhvOH4WmZa2vSu2OacfvNQ==
825825

826826
yallist@^4.0.0:
827827
version "4.0.0"

‎src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuS
3030
import { TestLifecycleService } from 'vs/workbench/test/browser/workbenchTestServices';
3131
import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
3232

33-
class TestWebglAddon {
33+
class TestWebglAddon implements WebglAddon {
3434
static shouldThrow = false;
3535
static isEnabled = false;
3636
readonly onChangeTextureAtlas = new Emitter().event as IEvent<HTMLCanvasElement>;
37+
readonly onAddTextureAtlasCanvas = new Emitter().event as IEvent<HTMLCanvasElement>;
3738
readonly onContextLoss = new Emitter().event as IEvent<void>;
3839
activate() {
3940
TestWebglAddon.isEnabled = !TestWebglAddon.shouldThrow;

‎yarn.lock

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11669,10 +11669,10 @@ xtend@~2.1.1:
1166911669
dependencies:
1167011670
object-keys "~0.4.0"
1167111671

11672-
[email protected].23:
11673-
version "0.3.0-beta.23"
11674-
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.23.tgz#aa67f43114e0bd052311f3f88f842e85006e697f"
11675-
integrity sha512-xFeuwK1ZuIl+5Go4ZesAWe+pToqjF0LSQfECia3tTZ0emkpzR3c+wU3vWoKPj71A7ZkgCVDmCGyLAWDpTSLgEQ==
11672+
[email protected].26:
11673+
version "0.3.0-beta.26"
11674+
resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.3.0-beta.26.tgz#8c5665477d168f0c075960d9d86ae21afb3000c4"
11675+
integrity sha512-33Btfufs6u8YsU8jmLlQfmmqavKGvP5s4Clxwq+KTT5DIlYDmt0r8GKdBHrB0AwNZiFRXsbPQoLF2XkHnkpTEw==
1167611676

1167711677
[email protected]:
1167811678
version "0.11.0-beta.7"
@@ -11684,25 +11684,25 @@ [email protected]:
1168411684
resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.9.0-beta.3.tgz#bb4ed416db5748bcbe55a4b6d4c2151368fdae74"
1168511685
integrity sha512-LaFuowtdxNdeuLm+KmtsoR4mgPOLu/I9k0hlWXbzAd1okJhthwMH4Y6cuL0/pFk1AclP5s+L42glv8PV0GnVsg==
1168611686

11687-
[email protected].1:
11688-
version "0.5.0-beta.1"
11689-
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.1.tgz#8a9e9356018e082318abbe2be1f9599fcc6b46a2"
11690-
integrity sha512-uAErX4gwhW6N524stLG6oZR3yBGgPnFmZ2Tv4vyYy7tcgDuHRoc22xYSCDgO1ohz1FLlOm8JGXRjXliwO9ic3A==
11691-
11692-
[email protected].32:
11693-
version "0.14.0-beta.32"
11694-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.32.tgz#35d08d4a0b36434ea5746738987b0170f918a9e3"
11695-
integrity sha512-FnD/LX0Obxu+Q3hdkVvStlGFCtp+jzKtV6lzF42Uvh5evbGA2SBO3BxWW26VhurtEN5Pf7Iyx8sJxcPVd/tPXw==
11696-
11697-
[email protected].49:
11698-
version "5.1.0-beta.49"
11699-
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.1.0-beta.49.tgz#c71793f7ba5ba3c403af5e5e9a7c5d89318b663d"
11700-
integrity sha512-dDHteT5DMr/li8qbaZ6FvIuZEI6SZUjNeiOrVwr//Qo4s/k4K3dRD0YxoJJ3ml/nPoxnhYyDkf9viLgm1rgEhA==
11701-
11702-
[email protected].49:
11703-
version "5.1.0-beta.49"
11704-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.49.tgz#4c98e5580d690a57d5d055025abb5d0e8ab2f42c"
11705-
integrity sha512-jUiJ4lBhHW7XzLPyXVzCwjljDEl5TJj9+fj677fwDb/La8qPov2R+ocjb1H/7j0sODxAV0Op2ftDCtz2JzbCvQ==
11687+
[email protected].5:
11688+
version "0.5.0-beta.5"
11689+
resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0-beta.5.tgz#6992a6f56349e67b903201d52b1ad41ba3469d93"
11690+
integrity sha512-MaqnU34WTHCUAo7moB4KhynGn03RckI0JJ8E/gXe96EzuCP6bVJIKSc5pc9iFeLF4BX1SuemOqIHYl2Q3u3NTA==
11691+
11692+
[email protected].38:
11693+
version "0.14.0-beta.38"
11694+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.14.0-beta.38.tgz#e1c6346a80aa3eca7d5e84b43bffc0cc5675c36e"
11695+
integrity sha512-ThgAHdaqQJKZi4GrfElvvaFP3H1ANHEn1iRZ7LZYf+3Vk6hWysaLwNrb0dj/aKeXQuKYObhpPn16yZcmJkVYCQ==
11696+
11697+
[email protected].61:
11698+
version "5.1.0-beta.61"
11699+
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.1.0-beta.61.tgz#9a112e64d1cdc3dfce5198c868c20cab510675e5"
11700+
integrity sha512-hJMaWP4N0kMzJp7jhexHSAzPtQZSw0aJY2xM6RF9AbA4bWry2T9sF427Iv9us9V1UP0bLDgUmD5HG2bdT7r0rw==
11701+
11702+
[email protected].61:
11703+
version "5.1.0-beta.61"
11704+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.1.0-beta.61.tgz#1a433163bd222b8b06cfe18908f5a03bc1ca7b66"
11705+
integrity sha512-EBYlNR2ATKLQJnG6v4z+P6DeYtMPNhO/6Z7WKFLq5WaxyP6q9adDSAOU+S2CrZlCxhvOH4WmZa2vSu2OacfvNQ==
1170611706

1170711707
y18n@^3.2.1:
1170811708
version "3.2.2"

0 commit comments

Comments
 (0)