Skip to content

Commit fe9154e

Browse files
TyriarTyriar
authored
Merge pull request microsoft#182963 from microsoft/tyriar/xterm_update_20230519
[email protected]
2 parents 2e57d8c + 3c4583c commit fe9154e

File tree

8 files changed

+45
-44
lines changed

8 files changed

+45
-44
lines changed

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@
8787
"vscode-oniguruma": "1.7.0",
8888
"vscode-regexpp": "^3.1.0",
8989
"vscode-textmate": "9.0.0",
90-
"xterm": "5.2.0-beta.41",
90+
"xterm": "5.2.0-beta.43",
9191
"xterm-addon-canvas": "0.4.0-beta.11",
9292
"xterm-addon-image": "0.4.0",
93-
"xterm-addon-search": "0.11.0",
93+
"xterm-addon-search": "0.12.0-beta.3",
9494
"xterm-addon-serialize": "0.9.0",
9595
"xterm-addon-unicode11": "0.5.0",
9696
"xterm-addon-webgl": "0.15.0-beta.10",
97-
"xterm-headless": "5.2.0-beta.41",
97+
"xterm-headless": "5.2.0-beta.43",
9898
"yauzl": "^2.9.2",
9999
"yazl": "^2.4.3"
100100
},

‎remote/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
"vscode-oniguruma": "1.7.0",
2525
"vscode-regexpp": "^3.1.0",
2626
"vscode-textmate": "9.0.0",
27-
"xterm": "5.2.0-beta.41",
27+
"xterm": "5.2.0-beta.43",
2828
"xterm-addon-canvas": "0.4.0-beta.11",
2929
"xterm-addon-image": "0.4.0",
30-
"xterm-addon-search": "0.11.0",
30+
"xterm-addon-search": "0.12.0-beta.3",
3131
"xterm-addon-serialize": "0.9.0",
3232
"xterm-addon-unicode11": "0.5.0",
3333
"xterm-addon-webgl": "0.15.0-beta.10",
34-
"xterm-headless": "5.2.0-beta.41",
34+
"xterm-headless": "5.2.0-beta.43",
3535
"yauzl": "^2.9.2",
3636
"yazl": "^2.4.3"
3737
},

‎remote/web/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"tas-client-umd": "0.1.8",
1212
"vscode-oniguruma": "1.7.0",
1313
"vscode-textmate": "9.0.0",
14-
"xterm": "5.2.0-beta.41",
14+
"xterm": "5.2.0-beta.43",
1515
"xterm-addon-canvas": "0.4.0-beta.11",
1616
"xterm-addon-image": "0.4.0",
17-
"xterm-addon-search": "0.11.0",
17+
"xterm-addon-search": "0.12.0-beta.3",
1818
"xterm-addon-unicode11": "0.5.0",
1919
"xterm-addon-webgl": "0.15.0-beta.10"
2020
}

‎remote/web/yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ [email protected]:
7878
resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.4.0.tgz#36e98fa892db11755a5f6e9654f924e876e29bf8"
7979
integrity sha512-3wumCJo4WTzxvecSMxJ7XtpVQeFe4gE2cdHCyUdo7zagVkS18YXJacGx6DjlAIccdJn6/LhGuD99xOSSvYx9Gw==
8080

81-
xterm-addon-search@0.11.0:
82-
version "0.11.0"
83-
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0.tgz#2a00ff7f9848f6140e7c4d1782486b0b18b06e0d"
84-
integrity sha512-6U4uHXcQ7G5igsdaGqrJ9ehm7vep24bXqWxuy3AnIosXF2Z5uy2MvmYRyTGNembIqPV/x1YhBQ7uShtuqBHhOQ==
81+
xterm-addon-search@0.12.0-beta.3:
82+
version "0.12.0-beta.3"
83+
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.12.0-beta.3.tgz#9ced9431378d37f4b42010691eb5b76f66b8b9e5"
84+
integrity sha512-NgzmUP5/764+csltcteHvIoNOScQHkIXkwEj+KgQr4QR48qFZMq3iGybcvv6icJsGglvvdG7YRputyT35eCjpQ==
8585

8686
[email protected]:
8787
version "0.5.0"
@@ -93,7 +93,7 @@ [email protected]:
9393
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.10.tgz#39ebbfb1b89c6773a2d8cb8e1d2f3ef1f08b28f9"
9494
integrity sha512-JVv4t5q6QGWyLiEAcAk9H2B83hFlIalzEwWu1VVYso0MJyZAlZ0NP5Za03iSKxYi7RQIA5bOe8r7W24esQDjLg==
9595

96-
[email protected].41:
97-
version "5.2.0-beta.41"
98-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.41.tgz#ff9f5ed8890a751db2263ebdd362f5443699026d"
99-
integrity sha512-yvDMaeELF8YuqTv220/+i5MKvy9GB4Vu7tH1T3OIqPvHwgnC8SY1vOSjskxHsHsRE5qLluiQJo6/wvt3kZH8+A==
96+
[email protected].43:
97+
version "5.2.0-beta.43"
98+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.43.tgz#08657de5aebaef2cbac3f030f2017441ba9b1453"
99+
integrity sha512-/0BcW7ZavHCtnHsr+t6jHWXBQ5H2J+yg22t8R8YaGebb+0LlMhut2cPTbyOZxYOFHkkiGolEIgGmU4XW1b6toA==

‎remote/yarn.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -846,10 +846,10 @@ [email protected]:
846846
resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.4.0.tgz#36e98fa892db11755a5f6e9654f924e876e29bf8"
847847
integrity sha512-3wumCJo4WTzxvecSMxJ7XtpVQeFe4gE2cdHCyUdo7zagVkS18YXJacGx6DjlAIccdJn6/LhGuD99xOSSvYx9Gw==
848848

849-
xterm-addon-search@0.11.0:
850-
version "0.11.0"
851-
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0.tgz#2a00ff7f9848f6140e7c4d1782486b0b18b06e0d"
852-
integrity sha512-6U4uHXcQ7G5igsdaGqrJ9ehm7vep24bXqWxuy3AnIosXF2Z5uy2MvmYRyTGNembIqPV/x1YhBQ7uShtuqBHhOQ==
849+
xterm-addon-search@0.12.0-beta.3:
850+
version "0.12.0-beta.3"
851+
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.12.0-beta.3.tgz#9ced9431378d37f4b42010691eb5b76f66b8b9e5"
852+
integrity sha512-NgzmUP5/764+csltcteHvIoNOScQHkIXkwEj+KgQr4QR48qFZMq3iGybcvv6icJsGglvvdG7YRputyT35eCjpQ==
853853

854854
[email protected]:
855855
version "0.9.0"
@@ -866,15 +866,15 @@ [email protected]:
866866
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.10.tgz#39ebbfb1b89c6773a2d8cb8e1d2f3ef1f08b28f9"
867867
integrity sha512-JVv4t5q6QGWyLiEAcAk9H2B83hFlIalzEwWu1VVYso0MJyZAlZ0NP5Za03iSKxYi7RQIA5bOe8r7W24esQDjLg==
868868

869-
[email protected].41:
870-
version "5.2.0-beta.41"
871-
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.2.0-beta.41.tgz#17085c0ef255214c244bdaa73e5914fd722be28e"
872-
integrity sha512-cAKuiYPs2GQpCWFIWHakRF+57vPDmqLzMFX3kOcMj+deHPuDnxucQTZvjxKNbMZKG9u9r+shIyfGzgC0oA+bBw==
869+
[email protected].43:
870+
version "5.2.0-beta.43"
871+
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.2.0-beta.43.tgz#efcf143f29d5e656329e732d46280c50508d2c36"
872+
integrity sha512-iMPkICe93emuX0KBjbE3fBmeRlBoE05ohLAlsBEr1OtSIpFervMxXP18Ch8EULSU25lSmZ6xISuAj9TdQSbvYA==
873873

874-
[email protected].41:
875-
version "5.2.0-beta.41"
876-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.41.tgz#ff9f5ed8890a751db2263ebdd362f5443699026d"
877-
integrity sha512-yvDMaeELF8YuqTv220/+i5MKvy9GB4Vu7tH1T3OIqPvHwgnC8SY1vOSjskxHsHsRE5qLluiQJo6/wvt3kZH8+A==
874+
[email protected].43:
875+
version "5.2.0-beta.43"
876+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.43.tgz#08657de5aebaef2cbac3f030f2017441ba9b1453"
877+
integrity sha512-/0BcW7ZavHCtnHsr+t6jHWXBQ5H2J+yg22t8R8YaGebb+0LlMhut2cPTbyOZxYOFHkkiGolEIgGmU4XW1b6toA==
878878

879879
yallist@^4.0.0:
880880
version "4.0.0"

‎src/vs/workbench/contrib/terminal/browser/media/terminal.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,3 +580,7 @@
580580
z-index: 33;
581581
background-color: var(--vscode-terminal-background, --vscode-panel-background);
582582
}
583+
584+
.monaco-workbench .xterm.terminal.hide {
585+
visibility: hidden;
586+
}

‎src/vs/workbench/contrib/terminal/browser/media/xterm.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
right: 0;
154154
z-index: 10;
155155
color: transparent;
156+
pointer-events: none;
156157
}
157158

158159
.xterm .live-region {
@@ -208,7 +209,3 @@
208209
z-index: 2;
209210
position: relative;
210211
}
211-
212-
.xterm.terminal.hide {
213-
visibility: hidden;
214-
}

‎yarn.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10463,10 +10463,10 @@ [email protected]:
1046310463
resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.4.0.tgz#36e98fa892db11755a5f6e9654f924e876e29bf8"
1046410464
integrity sha512-3wumCJo4WTzxvecSMxJ7XtpVQeFe4gE2cdHCyUdo7zagVkS18YXJacGx6DjlAIccdJn6/LhGuD99xOSSvYx9Gw==
1046510465

10466-
xterm-addon-search@0.11.0:
10467-
version "0.11.0"
10468-
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.11.0.tgz#2a00ff7f9848f6140e7c4d1782486b0b18b06e0d"
10469-
integrity sha512-6U4uHXcQ7G5igsdaGqrJ9ehm7vep24bXqWxuy3AnIosXF2Z5uy2MvmYRyTGNembIqPV/x1YhBQ7uShtuqBHhOQ==
10466+
xterm-addon-search@0.12.0-beta.3:
10467+
version "0.12.0-beta.3"
10468+
resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.12.0-beta.3.tgz#9ced9431378d37f4b42010691eb5b76f66b8b9e5"
10469+
integrity sha512-NgzmUP5/764+csltcteHvIoNOScQHkIXkwEj+KgQr4QR48qFZMq3iGybcvv6icJsGglvvdG7YRputyT35eCjpQ==
1047010470

1047110471
[email protected]:
1047210472
version "0.9.0"
@@ -10483,15 +10483,15 @@ [email protected]:
1048310483
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0-beta.10.tgz#39ebbfb1b89c6773a2d8cb8e1d2f3ef1f08b28f9"
1048410484
integrity sha512-JVv4t5q6QGWyLiEAcAk9H2B83hFlIalzEwWu1VVYso0MJyZAlZ0NP5Za03iSKxYi7RQIA5bOe8r7W24esQDjLg==
1048510485

10486-
[email protected].41:
10487-
version "5.2.0-beta.41"
10488-
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.2.0-beta.41.tgz#17085c0ef255214c244bdaa73e5914fd722be28e"
10489-
integrity sha512-cAKuiYPs2GQpCWFIWHakRF+57vPDmqLzMFX3kOcMj+deHPuDnxucQTZvjxKNbMZKG9u9r+shIyfGzgC0oA+bBw==
10486+
[email protected].43:
10487+
version "5.2.0-beta.43"
10488+
resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.2.0-beta.43.tgz#efcf143f29d5e656329e732d46280c50508d2c36"
10489+
integrity sha512-iMPkICe93emuX0KBjbE3fBmeRlBoE05ohLAlsBEr1OtSIpFervMxXP18Ch8EULSU25lSmZ6xISuAj9TdQSbvYA==
1049010490

10491-
[email protected].41:
10492-
version "5.2.0-beta.41"
10493-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.41.tgz#ff9f5ed8890a751db2263ebdd362f5443699026d"
10494-
integrity sha512-yvDMaeELF8YuqTv220/+i5MKvy9GB4Vu7tH1T3OIqPvHwgnC8SY1vOSjskxHsHsRE5qLluiQJo6/wvt3kZH8+A==
10491+
[email protected].43:
10492+
version "5.2.0-beta.43"
10493+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.0-beta.43.tgz#08657de5aebaef2cbac3f030f2017441ba9b1453"
10494+
integrity sha512-/0BcW7ZavHCtnHsr+t6jHWXBQ5H2J+yg22t8R8YaGebb+0LlMhut2cPTbyOZxYOFHkkiGolEIgGmU4XW1b6toA==
1049510495

1049610496
y18n@^3.2.1:
1049710497
version "3.2.2"

0 commit comments

Comments
 (0)