From e62392c1b91d9e56c2af6257a8f32bd6d0fdf295 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Mon, 25 Jul 2022 07:36:29 -0700 Subject: [PATCH 01/11] Terminal ligatures take 3 Fixes #34103 --- package.json | 7 +- remote/package.json | 7 +- remote/web/package.json | 5 +- remote/web/yarn.lock | 75 +++++++++++++++++-- remote/yarn.lock | 71 +++++++++++++++--- scripts/update-xterm.js | 1 + src/main.js | 3 + src/vs/code/electron-main/app.ts | 2 +- .../electron-main/protocolMainService.ts | 2 +- src/vs/platform/terminal/common/terminal.ts | 1 + .../terminal/browser/media/terminal.css | 4 - .../terminal/browser/xterm/xtermTerminal.ts | 37 +++++++++ .../contrib/terminal/common/terminal.ts | 2 +- .../terminal/common/terminalConfiguration.ts | 11 ++- yarn.lock | 71 +++++++++++++++--- 15 files changed, 246 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 838defde1cbd2..b7f99e4a15c3c 100644 --- a/package.json +++ b/package.json @@ -86,12 +86,13 @@ "vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "7.0.1", - "xterm": "4.20.0-beta.20", + "xterm": "4.20.0-beta.24", + "xterm-addon-ligatures": "0.6.0-beta.14", "xterm-addon-search": "0.10.0-beta.3", "xterm-addon-serialize": "0.8.0-beta.3", "xterm-addon-unicode11": "0.4.0-beta.3", - "xterm-addon-webgl": "0.13.0-beta.9", - "xterm-headless": "4.20.0-beta.20", + "xterm-addon-webgl": "0.13.0-beta.13", + "xterm-headless": "4.20.0-beta.24", "yauzl": "^2.9.2", "yazl": "^2.4.3" }, diff --git a/remote/package.json b/remote/package.json index 6b5622069ed84..25900b5f90a59 100644 --- a/remote/package.json +++ b/remote/package.json @@ -24,12 +24,13 @@ "vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "7.0.1", - "xterm": "4.20.0-beta.20", + "xterm": "4.20.0-beta.24", + "xterm-addon-ligatures": "0.6.0-beta.14", "xterm-addon-search": "0.10.0-beta.3", "xterm-addon-serialize": "0.8.0-beta.3", "xterm-addon-unicode11": "0.4.0-beta.3", - "xterm-addon-webgl": "0.13.0-beta.9", - "xterm-headless": "4.20.0-beta.20", + "xterm-addon-webgl": "0.13.0-beta.13", + "xterm-headless": "4.20.0-beta.24", "yauzl": "^2.9.2", "yazl": "^2.4.3" }, diff --git a/remote/web/package.json b/remote/web/package.json index 9e4dc58356678..88ffc06f1c772 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -11,9 +11,10 @@ "tas-client-umd": "0.1.6", "vscode-oniguruma": "1.6.1", "vscode-textmate": "7.0.1", - "xterm": "4.20.0-beta.20", + "xterm": "4.20.0-beta.24", + "xterm-addon-ligatures": "0.6.0-beta.14", "xterm-addon-search": "0.10.0-beta.3", "xterm-addon-unicode11": "0.4.0-beta.3", - "xterm-addon-webgl": "0.13.0-beta.9" + "xterm-addon-webgl": "0.13.0-beta.13" } } diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index a2ae83d5fceb5..d2815ba9795a7 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -48,16 +48,62 @@ resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3" integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g== +font-finder@^1.0.3, font-finder@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/font-finder/-/font-finder-1.1.0.tgz#2bff2b2762acba720239c8bec898a96daae90858" + integrity sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw== + dependencies: + get-system-fonts "^2.0.0" + promise-stream-reader "^1.0.1" + +font-ligatures@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/font-ligatures/-/font-ligatures-1.4.1.tgz#e8c9df7cf6bee80c0cca4a9a578618c7b1f5d8de" + integrity sha512-7W6zlfyhvCqShZ5ReUWqmSd9vBaUudW0Hxis+tqUjtHhsPU+L3Grf8mcZAtCiXHTzorhwdRTId2WeH/88gdFkw== + dependencies: + font-finder "^1.0.3" + lru-cache "^6.0.0" + opentype.js "^0.8.0" + +get-system-fonts@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/get-system-fonts/-/get-system-fonts-2.0.2.tgz#7ada3cc41322daf17c204a6f07c6588341cbc9cb" + integrity sha512-zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ== + jschardet@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-3.0.0.tgz#898d2332e45ebabbdb6bf2feece9feea9a99e882" integrity sha512-lJH6tJ77V8Nzd5QWRkFYCLc13a3vADkh3r/Fi8HupZGWk2OVVDfnZP8V/VgQgZ+lzW0kG2UGb5hFgt3V3ndotQ== +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +opentype.js@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/opentype.js/-/opentype.js-0.8.0.tgz#acabcfa1642fbe894a3e4d759e43ba694e02bd35" + integrity sha512-FQHR4oGP+a0m/f6yHoRpBOIbn/5ZWxKd4D/djHVJu8+KpBTYrJda0b7mLcgDEMWXE9xBCJm+qb0yv6FcvPjukg== + dependencies: + tiny-inflate "^1.0.2" + +promise-stream-reader@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-stream-reader/-/promise-stream-reader-1.0.1.tgz#4e793a79c9d49a73ccd947c6da9c127f12923649" + integrity sha512-Tnxit5trUjBAqqZCGWwjyxhmgMN4hGrtpW3Oc/tRI4bpm/O2+ej72BB08l6JBnGQgVDGCLvHFGjGgQS6vzhwXg== + tas-client-umd@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.1.6.tgz#a0cf70a68f50d406773457630666224f0eb545a6" integrity sha512-eOz5IK4cuNmSZI9QlqlT0FdvgfnnHDB6rjqleFaYAbzYE4RdJzYNiM28zFIXgmOVEgESvfabMFxG8WX5M4z3HA== +tiny-inflate@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4" + integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw== + vscode-oniguruma@1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.6.1.tgz#2bf4dfcfe3dd2e56eb549a3068c8ee39e6c30ce5" @@ -68,6 +114,14 @@ vscode-textmate@7.0.1: resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-7.0.1.tgz#8118a32b02735dccd14f893b495fa5389ad7de79" integrity sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw== +xterm-addon-ligatures@0.6.0-beta.14: + version "0.6.0-beta.14" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.14.tgz#392b8df0e32dcfc87f43b79901ec1c2abc997ae7" + integrity sha512-WeObuNFfGULKhfvbFyCccjxBk+BX6YMvG54lu40kgW5ubwpt0BcnKTQAxHvt9mSeT0lG0A5GxcbimBeRWc484Q== + dependencies: + font-finder "^1.1.0" + font-ligatures "^1.4.1" + xterm-addon-search@0.10.0-beta.3: version "0.10.0-beta.3" resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.10.0-beta.3.tgz#5194434d86105637c71f6f20139a9d0b5c1a956a" @@ -78,12 +132,17 @@ xterm-addon-unicode11@0.4.0-beta.3: resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa" integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q== -xterm-addon-webgl@0.13.0-beta.9: - version "0.13.0-beta.9" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.9.tgz#66a9ac142ae347d0548abbf4e66bb2f35f415adb" - integrity sha512-x1o1tpCqIsICvhcRsZs+BLcwUIdizYS2G4TIH0KBnUDiSN+oSqpVBQNG8qKg56xbK8WtpdbQ9dLB7JR2W5cX0g== +xterm-addon-webgl@0.13.0-beta.13: + version "0.13.0-beta.13" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.13.tgz#5ac6d2ed7e938c82ca1b377bc9eec9b43b203d2b" + integrity sha512-HY/t79Fk8zgMbmfAoiBrwYgs7YQp/7RyOdgzCIjWwCbHuoilH4IMHGE7O/kt3g/yjdOJ4VapNAaDsXJuJqODSw== + +xterm@4.20.0-beta.24: + version "4.20.0-beta.24" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.20.0-beta.24.tgz#72933495a96833ba636706f3bef129f3fd6a63d3" + integrity sha512-rD4TlpQP3KjUnEKQT5ij8w7gAh794c37zJEf5e6Bl1lERwwtJeZwFsAcq1F3iQWMIAcK/PR4RlXaQibOMXbiDg== -xterm@4.20.0-beta.20: - version "4.20.0-beta.20" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.20.0-beta.20.tgz#2979a31839f7b8ee3ffe4f063b40c02facdb0fed" - integrity sha512-ltDtTquH+33tXQPFSDqenbgz6LkvIob6l6Rac85L4aX5Ve7P3ubVLrq+lTFJGQn3iiwGqNmnE1t1EUuGhxsXcQ== +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== diff --git a/remote/yarn.lock b/remote/yarn.lock index 762745d59274d..30b89a3d63c72 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -261,6 +261,23 @@ file-uri-to-path@1.0.0: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== +font-finder@^1.0.3, font-finder@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/font-finder/-/font-finder-1.1.0.tgz#2bff2b2762acba720239c8bec898a96daae90858" + integrity sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw== + dependencies: + get-system-fonts "^2.0.0" + promise-stream-reader "^1.0.1" + +font-ligatures@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/font-ligatures/-/font-ligatures-1.4.1.tgz#e8c9df7cf6bee80c0cca4a9a578618c7b1f5d8de" + integrity sha512-7W6zlfyhvCqShZ5ReUWqmSd9vBaUudW0Hxis+tqUjtHhsPU+L3Grf8mcZAtCiXHTzorhwdRTId2WeH/88gdFkw== + dependencies: + font-finder "^1.0.3" + lru-cache "^6.0.0" + opentype.js "^0.8.0" + fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" @@ -280,6 +297,11 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" +get-system-fonts@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/get-system-fonts/-/get-system-fonts-2.0.2.tgz#7ada3cc41322daf17c204a6f07c6588341cbc9cb" + integrity sha512-zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ== + github-from-package@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" @@ -498,6 +520,13 @@ once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +opentype.js@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/opentype.js/-/opentype.js-0.8.0.tgz#acabcfa1642fbe894a3e4d759e43ba694e02bd35" + integrity sha512-FQHR4oGP+a0m/f6yHoRpBOIbn/5ZWxKd4D/djHVJu8+KpBTYrJda0b7mLcgDEMWXE9xBCJm+qb0yv6FcvPjukg== + dependencies: + tiny-inflate "^1.0.2" + pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" @@ -527,6 +556,11 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +promise-stream-reader@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-stream-reader/-/promise-stream-reader-1.0.1.tgz#4e793a79c9d49a73ccd947c6da9c127f12923649" + integrity sha512-Tnxit5trUjBAqqZCGWwjyxhmgMN4hGrtpW3Oc/tRI4bpm/O2+ej72BB08l6JBnGQgVDGCLvHFGjGgQS6vzhwXg== + proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" @@ -721,6 +755,11 @@ tas-client-umd@0.1.6: resolved "https://registry.yarnpkg.com/tas-client-umd/-/tas-client-umd-0.1.6.tgz#a0cf70a68f50d406773457630666224f0eb545a6" integrity sha512-eOz5IK4cuNmSZI9QlqlT0FdvgfnnHDB6rjqleFaYAbzYE4RdJzYNiM28zFIXgmOVEgESvfabMFxG8WX5M4z3HA== +tiny-inflate@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4" + integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw== + tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" @@ -788,6 +827,14 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +xterm-addon-ligatures@0.6.0-beta.14: + version "0.6.0-beta.14" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.14.tgz#392b8df0e32dcfc87f43b79901ec1c2abc997ae7" + integrity sha512-WeObuNFfGULKhfvbFyCccjxBk+BX6YMvG54lu40kgW5ubwpt0BcnKTQAxHvt9mSeT0lG0A5GxcbimBeRWc484Q== + dependencies: + font-finder "^1.1.0" + font-ligatures "^1.4.1" + xterm-addon-search@0.10.0-beta.3: version "0.10.0-beta.3" resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.10.0-beta.3.tgz#5194434d86105637c71f6f20139a9d0b5c1a956a" @@ -803,20 +850,20 @@ xterm-addon-unicode11@0.4.0-beta.3: resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa" integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q== -xterm-addon-webgl@0.13.0-beta.9: - version "0.13.0-beta.9" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.9.tgz#66a9ac142ae347d0548abbf4e66bb2f35f415adb" - integrity sha512-x1o1tpCqIsICvhcRsZs+BLcwUIdizYS2G4TIH0KBnUDiSN+oSqpVBQNG8qKg56xbK8WtpdbQ9dLB7JR2W5cX0g== +xterm-addon-webgl@0.13.0-beta.13: + version "0.13.0-beta.13" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.13.tgz#5ac6d2ed7e938c82ca1b377bc9eec9b43b203d2b" + integrity sha512-HY/t79Fk8zgMbmfAoiBrwYgs7YQp/7RyOdgzCIjWwCbHuoilH4IMHGE7O/kt3g/yjdOJ4VapNAaDsXJuJqODSw== -xterm-headless@4.20.0-beta.20: - version "4.20.0-beta.20" - resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.20.0-beta.20.tgz#da2d8131b02d6f1e37f47cc17e578f2c2980fbb6" - integrity sha512-JK4jUIiUH7TdzvMrpfDnbGxTuC4s7byjqnMHR8+gIpY8qCFjz0xcMFSbp+ZshxGwVyziI4jtJqTHZjFToT2/kw== +xterm-headless@4.20.0-beta.24: + version "4.20.0-beta.24" + resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.20.0-beta.24.tgz#d0f363025d0b283a2a536a24c88f06b3f473e96b" + integrity sha512-sh4u7BLo/Vlde8AxMF3mxIwYCxm0HX0yHJU70EWZ5YIKloTo8brZZ7Du+RhfX+Ac/yVgffIiUjZgSjdOKxEURw== -xterm@4.20.0-beta.20: - version "4.20.0-beta.20" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.20.0-beta.20.tgz#2979a31839f7b8ee3ffe4f063b40c02facdb0fed" - integrity sha512-ltDtTquH+33tXQPFSDqenbgz6LkvIob6l6Rac85L4aX5Ve7P3ubVLrq+lTFJGQn3iiwGqNmnE1t1EUuGhxsXcQ== +xterm@4.20.0-beta.24: + version "4.20.0-beta.24" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.20.0-beta.24.tgz#72933495a96833ba636706f3bef129f3fd6a63d3" + integrity sha512-rD4TlpQP3KjUnEKQT5ij8w7gAh794c37zJEf5e6Bl1lERwwtJeZwFsAcq1F3iQWMIAcK/PR4RlXaQibOMXbiDg== yallist@^4.0.0: version "4.0.0" diff --git a/scripts/update-xterm.js b/scripts/update-xterm.js index 70637a8493c7d..21abafd380cbd 100644 --- a/scripts/update-xterm.js +++ b/scripts/update-xterm.js @@ -8,6 +8,7 @@ const path = require('path'); const moduleNames = [ 'xterm', + 'xterm-addon-ligatures', 'xterm-addon-search', 'xterm-addon-unicode11', 'xterm-addon-webgl' diff --git a/src/main.js b/src/main.js index c53900217a453..0edb80909de8f 100644 --- a/src/main.js +++ b/src/main.js @@ -218,6 +218,9 @@ function configureCommandlineSwitchesSync(cliArgs) { } }); + // Enable Font Access API (eg. for terminal ligatures) + app.commandLine.appendSwitch('enable-features', 'FontAccess'); + // Support JS Flags const jsFlags = getJSFlags(cliArgs); if (jsFlags) { diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index 670685ffd9de9..4f8cdd03366ca 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -161,7 +161,7 @@ export class CodeApplication extends Disposable { return allowedPermissionsInWebview.has(permission); } - return false; + return permission === 'font-access'; }); //#endregion diff --git a/src/vs/platform/protocol/electron-main/protocolMainService.ts b/src/vs/platform/protocol/electron-main/protocolMainService.ts index b6ef8e8018c06..8cab1cff21f19 100644 --- a/src/vs/platform/protocol/electron-main/protocolMainService.ts +++ b/src/vs/platform/protocol/electron-main/protocolMainService.ts @@ -24,7 +24,7 @@ export class ProtocolMainService extends Disposable implements IProtocolMainServ declare readonly _serviceBrand: undefined; private readonly validRoots = TernarySearchTree.forPaths(!isLinux); - private readonly validExtensions = new Set(['.svg', '.png', '.jpg', '.jpeg', '.gif', '.bmp', '.webp']); // https://github.com/microsoft/vscode/issues/119384 + private readonly validExtensions = new Set(['.svg', '.png', '.jpg', '.jpeg', '.gif', '.bmp', '.webp', '.oft', '.ttf']); // https://github.com/microsoft/vscode/issues/119384 constructor( @INativeEnvironmentService environmentService: INativeEnvironmentService, diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts index 4c3c72a1f309f..0cc0771773e81 100644 --- a/src/vs/platform/terminal/common/terminal.ts +++ b/src/vs/platform/terminal/common/terminal.ts @@ -63,6 +63,7 @@ export const enum TerminalSettingId { FastScrollSensitivity = 'terminal.integrated.fastScrollSensitivity', MouseWheelScrollSensitivity = 'terminal.integrated.mouseWheelScrollSensitivity', BellDuration = 'terminal.integrated.bellDuration', + FontLigatures = 'terminal.integrated.fontLigatures', FontWeight = 'terminal.integrated.fontWeight', FontWeightBold = 'terminal.integrated.fontWeightBold', CursorBlinking = 'terminal.integrated.cursorBlinking', diff --git a/src/vs/workbench/contrib/terminal/browser/media/terminal.css b/src/vs/workbench/contrib/terminal/browser/media/terminal.css index b186c032261ab..e4c636cf1baa2 100644 --- a/src/vs/workbench/contrib/terminal/browser/media/terminal.css +++ b/src/vs/workbench/contrib/terminal/browser/media/terminal.css @@ -158,10 +158,6 @@ width: auto !important; } -.monaco-workbench .pane-body.integrated-terminal { - font-variant-ligatures: none; -} - .monaco-workbench .pane-body.integrated-terminal .split-view-view { box-sizing: border-box; overflow: hidden; diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts index 88a89cb7a6cd9..fa90ea42c5936 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import type { IBuffer, IMarker, ITheme, RendererType, Terminal as RawXtermTerminal } from 'xterm'; +import type { LigaturesAddon as LigaturesAddonType } from 'xterm-addon-ligatures'; import type { ISearchOptions, SearchAddon as SearchAddonType } from 'xterm-addon-search'; import type { Unicode11Addon as Unicode11AddonType } from 'xterm-addon-unicode11'; import type { WebglAddon as WebglAddonType } from 'xterm-addon-webgl'; @@ -42,6 +43,7 @@ import { IGenericMarkProperties } from 'vs/platform/terminal/common/terminalProc const SLOW_CANVAS_RENDER_THRESHOLD = 50; const NUMBER_OF_FRAMES_TO_MEASURE = 20; +let LigaturesAddon: typeof LigaturesAddonType; let SearchAddon: typeof SearchAddonType; let Unicode11Addon: typeof Unicode11AddonType; let WebglAddon: typeof WebglAddonType; @@ -65,6 +67,7 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II private _decorationAddon: DecorationAddon; // Optional addons + private _ligaturesAddon?: LigaturesAddonType; private _searchAddon?: SearchAddonType; private _unicode11Addon?: Unicode11AddonType; private _webglAddon?: WebglAddonType; @@ -215,6 +218,10 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II if (this._shouldLoadWebgl()) { this._enableWebglRenderer(); } + // Enable addons + if (this._configHelper.config.fontLigatures) { + this._enableLigatures(); + } // Screen must be created at this point as xterm.open is called return this._container.querySelector('.xterm-screen')!; } @@ -237,12 +244,21 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II this.raw.options.rightClickSelectsWord = config.rightClickBehavior === 'selectWord'; this.raw.options.wordSeparator = config.wordSeparators; this.raw.options.customGlyphs = config.customGlyphs; + + // WebGL addon if (this._shouldLoadWebgl()) { this._enableWebglRenderer(); } else { this._disposeOfWebglRenderer(); this.raw.options.rendererType = this._getBuiltInXtermRenderer(config.gpuAcceleration, XtermTerminal._suggestedRendererType); } + + // Ligatures addon + if (config.fontLigatures) { + this._enableLigatures(); + } else { + this._disableLigatures(); + } } private _shouldLoadWebgl(): boolean { @@ -460,6 +476,13 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II } } + protected async _getLigaturesAddonConstructor(): Promise { + if (!LigaturesAddon) { + LigaturesAddon = (await import('xterm-addon-ligatures')).LigaturesAddon; + } + return LigaturesAddon; + } + protected async _getSearchAddonConstructor(): Promise { if (!SearchAddon) { SearchAddon = (await import('xterm-addon-search')).SearchAddon; @@ -550,6 +573,20 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II }; } + private async _enableLigatures(): Promise { + if (!this.raw.element || this._ligaturesAddon) { + return; + } + const LigaturesAddon = await this._getLigaturesAddonConstructor(); + this._ligaturesAddon = new LigaturesAddon(); + this.raw.loadAddon(this._ligaturesAddon); + } + + private _disableLigatures() { + this._ligaturesAddon?.dispose(); + this._ligaturesAddon = undefined; + } + private _getXtermTheme(theme?: IColorTheme): ITheme { if (!theme) { theme = this._themeService.getColorTheme(); diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts index e935775fcd374..c023d8cff0e38 100644 --- a/src/vs/workbench/contrib/terminal/common/terminal.ts +++ b/src/vs/workbench/contrib/terminal/common/terminal.ts @@ -251,7 +251,7 @@ export interface ITerminalConfiguration { minimumContrastRatio: number; mouseWheelScrollSensitivity: number; sendKeybindingsToShell: boolean; - // fontLigatures: boolean; + fontLigatures: boolean; fontSize: number; letterSpacing: number; lineHeight: number; diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts index c5b6caee4af99..4cd60cf87a944 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts @@ -173,12 +173,11 @@ const terminalConfiguration: IConfigurationNode = { markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to {0}'s value.", '`#editor.fontFamily#`'), type: 'string' }, - // TODO: Support font ligatures - // 'terminal.integrated.fontLigatures': { - // 'description': localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal."), - // 'type': 'boolean', - // 'default': false - // }, + 'terminal.integrated.fontLigatures': { + 'description': localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal."), + 'type': 'boolean', + 'default': false + }, [TerminalSettingId.FontSize]: { description: localize('terminal.integrated.fontSize', "Controls the font size in pixels of the terminal."), type: 'number', diff --git a/yarn.lock b/yarn.lock index 9121ca37524c7..8cb9139e2b9d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5157,6 +5157,23 @@ flush-write-stream@^1.0.0, flush-write-stream@^1.0.2: inherits "^2.0.3" readable-stream "^2.3.6" +font-finder@^1.0.3, font-finder@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/font-finder/-/font-finder-1.1.0.tgz#2bff2b2762acba720239c8bec898a96daae90858" + integrity sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw== + dependencies: + get-system-fonts "^2.0.0" + promise-stream-reader "^1.0.1" + +font-ligatures@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/font-ligatures/-/font-ligatures-1.4.1.tgz#e8c9df7cf6bee80c0cca4a9a578618c7b1f5d8de" + integrity sha512-7W6zlfyhvCqShZ5ReUWqmSd9vBaUudW0Hxis+tqUjtHhsPU+L3Grf8mcZAtCiXHTzorhwdRTId2WeH/88gdFkw== + dependencies: + font-finder "^1.0.3" + lru-cache "^6.0.0" + opentype.js "^0.8.0" + for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -5392,6 +5409,11 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" +get-system-fonts@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/get-system-fonts/-/get-system-fonts-2.0.2.tgz#7ada3cc41322daf17c204a6f07c6588341cbc9cb" + integrity sha512-zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ== + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -8396,6 +8418,13 @@ open@8.4.0: is-docker "^2.1.1" is-wsl "^2.2.0" +opentype.js@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/opentype.js/-/opentype.js-0.8.0.tgz#acabcfa1642fbe894a3e4d759e43ba694e02bd35" + integrity sha512-FQHR4oGP+a0m/f6yHoRpBOIbn/5ZWxKd4D/djHVJu8+KpBTYrJda0b7mLcgDEMWXE9xBCJm+qb0yv6FcvPjukg== + dependencies: + tiny-inflate "^1.0.2" + opn@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/opn/-/opn-6.0.0.tgz#3c5b0db676d5f97da1233d1ed42d182bc5a27d2d" @@ -9329,6 +9358,11 @@ promise-inflight@^1.0.1: resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= +promise-stream-reader@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/promise-stream-reader/-/promise-stream-reader-1.0.1.tgz#4e793a79c9d49a73ccd947c6da9c127f12923649" + integrity sha512-Tnxit5trUjBAqqZCGWwjyxhmgMN4hGrtpW3Oc/tRI4bpm/O2+ej72BB08l6JBnGQgVDGCLvHFGjGgQS6vzhwXg== + proper-lockfile@4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f" @@ -11023,6 +11057,11 @@ timsort@^0.3.0: resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= +tiny-inflate@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4" + integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw== + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -12072,6 +12111,14 @@ xtend@~2.1.1: dependencies: object-keys "~0.4.0" +xterm-addon-ligatures@0.6.0-beta.14: + version "0.6.0-beta.14" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.14.tgz#392b8df0e32dcfc87f43b79901ec1c2abc997ae7" + integrity sha512-WeObuNFfGULKhfvbFyCccjxBk+BX6YMvG54lu40kgW5ubwpt0BcnKTQAxHvt9mSeT0lG0A5GxcbimBeRWc484Q== + dependencies: + font-finder "^1.1.0" + font-ligatures "^1.4.1" + xterm-addon-search@0.10.0-beta.3: version "0.10.0-beta.3" resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.10.0-beta.3.tgz#5194434d86105637c71f6f20139a9d0b5c1a956a" @@ -12087,20 +12134,20 @@ xterm-addon-unicode11@0.4.0-beta.3: resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa" integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q== -xterm-addon-webgl@0.13.0-beta.9: - version "0.13.0-beta.9" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.9.tgz#66a9ac142ae347d0548abbf4e66bb2f35f415adb" - integrity sha512-x1o1tpCqIsICvhcRsZs+BLcwUIdizYS2G4TIH0KBnUDiSN+oSqpVBQNG8qKg56xbK8WtpdbQ9dLB7JR2W5cX0g== +xterm-addon-webgl@0.13.0-beta.13: + version "0.13.0-beta.13" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.13.tgz#5ac6d2ed7e938c82ca1b377bc9eec9b43b203d2b" + integrity sha512-HY/t79Fk8zgMbmfAoiBrwYgs7YQp/7RyOdgzCIjWwCbHuoilH4IMHGE7O/kt3g/yjdOJ4VapNAaDsXJuJqODSw== -xterm-headless@4.20.0-beta.20: - version "4.20.0-beta.20" - resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.20.0-beta.20.tgz#da2d8131b02d6f1e37f47cc17e578f2c2980fbb6" - integrity sha512-JK4jUIiUH7TdzvMrpfDnbGxTuC4s7byjqnMHR8+gIpY8qCFjz0xcMFSbp+ZshxGwVyziI4jtJqTHZjFToT2/kw== +xterm-headless@4.20.0-beta.24: + version "4.20.0-beta.24" + resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.20.0-beta.24.tgz#d0f363025d0b283a2a536a24c88f06b3f473e96b" + integrity sha512-sh4u7BLo/Vlde8AxMF3mxIwYCxm0HX0yHJU70EWZ5YIKloTo8brZZ7Du+RhfX+Ac/yVgffIiUjZgSjdOKxEURw== -xterm@4.20.0-beta.20: - version "4.20.0-beta.20" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.20.0-beta.20.tgz#2979a31839f7b8ee3ffe4f063b40c02facdb0fed" - integrity sha512-ltDtTquH+33tXQPFSDqenbgz6LkvIob6l6Rac85L4aX5Ve7P3ubVLrq+lTFJGQn3iiwGqNmnE1t1EUuGhxsXcQ== +xterm@4.20.0-beta.24: + version "4.20.0-beta.24" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.20.0-beta.24.tgz#72933495a96833ba636706f3bef129f3fd6a63d3" + integrity sha512-rD4TlpQP3KjUnEKQT5ij8w7gAh794c37zJEf5e6Bl1lERwwtJeZwFsAcq1F3iQWMIAcK/PR4RlXaQibOMXbiDg== y18n@^3.2.1: version "3.2.2" From ebedb759ea445e03ea588497caa87fd4d69da06d Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Wed, 3 Aug 2022 07:23:26 -0700 Subject: [PATCH 02/11] Update ligatures, ignore bad package versions --- package.json | 4 ++-- remote/package.json | 4 ++-- remote/web/package.json | 4 ++-- remote/web/yarn.lock | 28 +++++++++------------------- remote/yarn.lock | 16 ++++++++-------- scripts/update-xterm.js | 6 ++++++ yarn.lock | 34 ++++++++-------------------------- 7 files changed, 37 insertions(+), 59 deletions(-) diff --git a/package.json b/package.json index 5d673a582298f..a1d984b10c203 100644 --- a/package.json +++ b/package.json @@ -86,9 +86,9 @@ "vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "7.0.1", - "xterm": "5.0.0-beta.32", + "xterm": "5.0.0-beta.33", "xterm-addon-canvas": "0.2.0-beta.15", - "xterm-addon-ligatures": "0.6.0-beta.14", + "xterm-addon-ligatures": "0.6.0-beta.19", "xterm-addon-search": "0.10.0-beta.3", "xterm-addon-serialize": "0.8.0-beta.3", "xterm-addon-unicode11": "0.4.0-beta.3", diff --git a/remote/package.json b/remote/package.json index add3294fcf6a2..e9b047439b4c2 100644 --- a/remote/package.json +++ b/remote/package.json @@ -24,9 +24,9 @@ "vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "7.0.1", - "xterm": "5.0.0-beta.32", + "xterm": "5.0.0-beta.33", "xterm-addon-canvas": "0.2.0-beta.15", - "xterm-addon-ligatures": "0.6.0-beta.14", + "xterm-addon-ligatures": "0.6.0-beta.19", "xterm-addon-search": "0.10.0-beta.3", "xterm-addon-serialize": "0.8.0-beta.3", "xterm-addon-unicode11": "0.4.0-beta.3", diff --git a/remote/web/package.json b/remote/web/package.json index 1dddbbc70bf3d..aa1e1959f401e 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -11,9 +11,9 @@ "tas-client-umd": "0.1.6", "vscode-oniguruma": "1.6.1", "vscode-textmate": "7.0.1", - "xterm": "5.0.0-beta.32", + "xterm": "5.0.0-beta.33", "xterm-addon-canvas": "0.2.0-beta.15", - "xterm-addon-ligatures": "0.6.0-beta.14", + "xterm-addon-ligatures": "0.6.0-beta.19", "xterm-addon-search": "0.10.0-beta.3", "xterm-addon-unicode11": "0.4.0-beta.3", "xterm-addon-webgl": "0.13.0-beta.32" diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index a576bf9663ec8..a20b9d49dd7e0 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -119,10 +119,10 @@ xterm-addon-canvas@0.2.0-beta.15: resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.15.tgz#de863e46410b1de357b153abf1984227777760e4" integrity sha512-E1pNCDSVTINchwWLysZ9ZD/BPv1WLGV52xRHB00US1PHHELbhtvms+6dZ44WZEDXhtfpptRZ1VBx+QpvfJIuvw== -xterm-addon-ligatures@0.6.0-beta.14: - version "0.6.0-beta.14" - resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.14.tgz#392b8df0e32dcfc87f43b79901ec1c2abc997ae7" - integrity sha512-WeObuNFfGULKhfvbFyCccjxBk+BX6YMvG54lu40kgW5ubwpt0BcnKTQAxHvt9mSeT0lG0A5GxcbimBeRWc484Q== +xterm-addon-ligatures@0.6.0-beta.19: + version "0.6.0-beta.19" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.19.tgz#5e43eeaf84968e014769a5f2c6a3a3601dc4771c" + integrity sha512-A0BIjFF6g5aPI0HiI2JMhhMV3gaHbpZ+ua+UNagkID0GxZ/ezn0wVOAtNQl/KlqnFueoyZIxlbyXmWNAfJVPRg== dependencies: font-finder "^1.1.0" font-ligatures "^1.4.1" @@ -137,27 +137,17 @@ xterm-addon-unicode11@0.4.0-beta.3: resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa" integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q== -xterm-addon-webgl@0.13.0-beta.13: - version "0.13.0-beta.13" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.13.tgz#5ac6d2ed7e938c82ca1b377bc9eec9b43b203d2b" - integrity sha512-HY/t79Fk8zgMbmfAoiBrwYgs7YQp/7RyOdgzCIjWwCbHuoilH4IMHGE7O/kt3g/yjdOJ4VapNAaDsXJuJqODSw== - -xterm@4.20.0-beta.24: - version "4.20.0-beta.24" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.20.0-beta.24.tgz#72933495a96833ba636706f3bef129f3fd6a63d3" - integrity sha512-rD4TlpQP3KjUnEKQT5ij8w7gAh794c37zJEf5e6Bl1lERwwtJeZwFsAcq1F3iQWMIAcK/PR4RlXaQibOMXbiDg== - xterm-addon-webgl@0.13.0-beta.32: version "0.13.0-beta.32" resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.32.tgz#ae7335f788ae611733e03f6ca38280ab7b86d212" integrity sha512-xOudNzYXaRh9QZ+IigXM5EB3bM8l3/F8F35EpJRYvvsylVxiB6Km8X8l7+nxlWt+uYdnHZs0ka2rvtL8kOP/uw== -xterm@5.0.0-beta.32: - version "5.0.0-beta.32" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.32.tgz#62bb9902429c0055fd2fd85c9eecfbf1756ed31c" - integrity sha512-OAM1GaBs/chK63Cr86XbVhfVCLLXLpNxxFrv3RK9xoyb9dwiY3gaMxK9jeGzTnrbGLWJb+k5nxaC0rx2YsHvUA== +xterm@5.0.0-beta.33: + version "5.0.0-beta.33" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.33.tgz#ee0795779fb5fe8079d3400684fc384ad861cc88" + integrity sha512-9bz+N6UHTxAZZ1zM/UuzGQvwxbEnlfVi3ZqIhoPWnscQVS0zoqf6plxU1rTj1ZMqMN7liXgHS9ZgBePyP3jGzg== yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== \ No newline at end of file + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== diff --git a/remote/yarn.lock b/remote/yarn.lock index 36d12a60ca14a..efc902d73305f 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -832,10 +832,10 @@ xterm-addon-canvas@0.2.0-beta.15: resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.15.tgz#de863e46410b1de357b153abf1984227777760e4" integrity sha512-E1pNCDSVTINchwWLysZ9ZD/BPv1WLGV52xRHB00US1PHHELbhtvms+6dZ44WZEDXhtfpptRZ1VBx+QpvfJIuvw== -xterm-addon-ligatures@0.6.0-beta.14: - version "0.6.0-beta.14" - resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.14.tgz#392b8df0e32dcfc87f43b79901ec1c2abc997ae7" - integrity sha512-WeObuNFfGULKhfvbFyCccjxBk+BX6YMvG54lu40kgW5ubwpt0BcnKTQAxHvt9mSeT0lG0A5GxcbimBeRWc484Q== +xterm-addon-ligatures@0.6.0-beta.19: + version "0.6.0-beta.19" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.19.tgz#5e43eeaf84968e014769a5f2c6a3a3601dc4771c" + integrity sha512-A0BIjFF6g5aPI0HiI2JMhhMV3gaHbpZ+ua+UNagkID0GxZ/ezn0wVOAtNQl/KlqnFueoyZIxlbyXmWNAfJVPRg== dependencies: font-finder "^1.1.0" font-ligatures "^1.4.1" @@ -865,10 +865,10 @@ xterm-headless@5.0.0-beta.5: resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.0.0-beta.5.tgz#e29b6c5081f31f887122b7263ba996b0c46b3c22" integrity sha512-CMQ1+prBNF92oBMeZzc2rfTcmOaCGfwwSaoPYNTjyziZT6mZsEg7amajYkb0YAnqJ29MFm4kPGZbU78/dX4k2A== -xterm@5.0.0-beta.32: - version "5.0.0-beta.32" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.32.tgz#62bb9902429c0055fd2fd85c9eecfbf1756ed31c" - integrity sha512-OAM1GaBs/chK63Cr86XbVhfVCLLXLpNxxFrv3RK9xoyb9dwiY3gaMxK9jeGzTnrbGLWJb+k5nxaC0rx2YsHvUA== +xterm@5.0.0-beta.33: + version "5.0.0-beta.33" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.33.tgz#ee0795779fb5fe8079d3400684fc384ad861cc88" + integrity sha512-9bz+N6UHTxAZZ1zM/UuzGQvwxbEnlfVi3ZqIhoPWnscQVS0zoqf6plxU1rTj1ZMqMN7liXgHS9ZgBePyP3jGzg== yallist@^4.0.0: version "4.0.0" diff --git a/scripts/update-xterm.js b/scripts/update-xterm.js index 2237887d8b30d..cac3bbd928c75 100644 --- a/scripts/update-xterm.js +++ b/scripts/update-xterm.js @@ -43,6 +43,12 @@ function getLatestModuleVersion(moduleName) { '5.0.0-beta.4', ].includes(e)); } + if (moduleName === 'xterm-addon-ligatures') { + versions = versions.filter(e => ![ + '5.0.0-beta.1', + '5.0.0-beta.2', + ].includes(e)); + } resolve(versions[versions.length - 1]); }); }); diff --git a/yarn.lock b/yarn.lock index 3061904c2e341..3c441c211037f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7684,15 +7684,6 @@ only@~0.0.2: resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4" integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q= -open@8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - opentype.js@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/opentype.js/-/opentype.js-0.8.0.tgz#acabcfa1642fbe894a3e4d759e43ba694e02bd35" @@ -8588,15 +8579,6 @@ promise-stream-reader@^1.0.1: resolved "https://registry.yarnpkg.com/promise-stream-reader/-/promise-stream-reader-1.0.1.tgz#4e793a79c9d49a73ccd947c6da9c127f12923649" integrity sha512-Tnxit5trUjBAqqZCGWwjyxhmgMN4hGrtpW3Oc/tRI4bpm/O2+ej72BB08l6JBnGQgVDGCLvHFGjGgQS6vzhwXg== -proper-lockfile@4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f" - integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA== - dependencies: - graceful-fs "^4.2.4" - retry "^0.12.0" - signal-exit "^3.0.2" - proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" @@ -11303,10 +11285,10 @@ xterm-addon-canvas@0.2.0-beta.15: resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.15.tgz#de863e46410b1de357b153abf1984227777760e4" integrity sha512-E1pNCDSVTINchwWLysZ9ZD/BPv1WLGV52xRHB00US1PHHELbhtvms+6dZ44WZEDXhtfpptRZ1VBx+QpvfJIuvw== -xterm-addon-ligatures@0.6.0-beta.14: - version "0.6.0-beta.14" - resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.14.tgz#392b8df0e32dcfc87f43b79901ec1c2abc997ae7" - integrity sha512-WeObuNFfGULKhfvbFyCccjxBk+BX6YMvG54lu40kgW5ubwpt0BcnKTQAxHvt9mSeT0lG0A5GxcbimBeRWc484Q== +xterm-addon-ligatures@0.6.0-beta.19: + version "0.6.0-beta.19" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.19.tgz#5e43eeaf84968e014769a5f2c6a3a3601dc4771c" + integrity sha512-A0BIjFF6g5aPI0HiI2JMhhMV3gaHbpZ+ua+UNagkID0GxZ/ezn0wVOAtNQl/KlqnFueoyZIxlbyXmWNAfJVPRg== dependencies: font-finder "^1.1.0" font-ligatures "^1.4.1" @@ -11336,10 +11318,10 @@ xterm-headless@5.0.0-beta.5: resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.0.0-beta.5.tgz#e29b6c5081f31f887122b7263ba996b0c46b3c22" integrity sha512-CMQ1+prBNF92oBMeZzc2rfTcmOaCGfwwSaoPYNTjyziZT6mZsEg7amajYkb0YAnqJ29MFm4kPGZbU78/dX4k2A== -xterm@5.0.0-beta.32: - version "5.0.0-beta.32" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.32.tgz#62bb9902429c0055fd2fd85c9eecfbf1756ed31c" - integrity sha512-OAM1GaBs/chK63Cr86XbVhfVCLLXLpNxxFrv3RK9xoyb9dwiY3gaMxK9jeGzTnrbGLWJb+k5nxaC0rx2YsHvUA== +xterm@5.0.0-beta.33: + version "5.0.0-beta.33" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.33.tgz#ee0795779fb5fe8079d3400684fc384ad861cc88" + integrity sha512-9bz+N6UHTxAZZ1zM/UuzGQvwxbEnlfVi3ZqIhoPWnscQVS0zoqf6plxU1rTj1ZMqMN7liXgHS9ZgBePyP3jGzg== y18n@^3.2.1: version "3.2.2" From 50266e6feff17e890f48dbee8424f5aae58ef84a Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Wed, 3 Aug 2022 08:40:03 -0700 Subject: [PATCH 03/11] Make terminal ligatures experimental Part of #34103 --- src/vs/platform/terminal/common/terminal.ts | 2 +- .../workbench/contrib/terminal/browser/xterm/xtermTerminal.ts | 4 ++-- src/vs/workbench/contrib/terminal/common/terminal.ts | 4 +++- .../contrib/terminal/common/terminalConfiguration.ts | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts index 33566eca12f64..cbbaba0fe15e3 100644 --- a/src/vs/platform/terminal/common/terminal.ts +++ b/src/vs/platform/terminal/common/terminal.ts @@ -63,7 +63,7 @@ export const enum TerminalSettingId { FastScrollSensitivity = 'terminal.integrated.fastScrollSensitivity', MouseWheelScrollSensitivity = 'terminal.integrated.mouseWheelScrollSensitivity', BellDuration = 'terminal.integrated.bellDuration', - FontLigatures = 'terminal.integrated.fontLigatures', + ExperimentalFontLigatures = 'terminal.integrated.experimental.fontLigatures', FontWeight = 'terminal.integrated.fontWeight', FontWeightBold = 'terminal.integrated.fontWeightBold', CursorBlinking = 'terminal.integrated.cursorBlinking', diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts index d3e36e45d9fec..2fe93b408d3b7 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts @@ -238,7 +238,7 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II this._enableCanvasRenderer(); } // Enable addons - if (this._configHelper.config.fontLigatures) { + if (this._configHelper.config.experimental.fontLigatures) { this._enableLigatures(); } // Screen must be created at this point as xterm.open is called @@ -278,7 +278,7 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II } // Ligatures addon - if (config.fontLigatures) { + if (config.experimental.fontLigatures) { this._enableLigatures(); } else { this._disableLigatures(); diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts index 0f45d89d2069b..5d8fb7333a0cc 100644 --- a/src/vs/workbench/contrib/terminal/common/terminal.ts +++ b/src/vs/workbench/contrib/terminal/common/terminal.ts @@ -251,7 +251,6 @@ export interface ITerminalConfiguration { minimumContrastRatio: number; mouseWheelScrollSensitivity: number; sendKeybindingsToShell: boolean; - fontLigatures: boolean; fontSize: number; letterSpacing: number; lineHeight: number; @@ -303,6 +302,9 @@ export interface ITerminalConfiguration { decorationsEnabled: boolean; }; smoothScrolling: boolean; + experimental: { + fontLigatures: boolean; + }; } export const DEFAULT_LOCAL_ECHO_EXCLUDE: ReadonlyArray = ['vim', 'vi', 'nano', 'tmux']; diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts index a4b98de26455c..fd6392bd5b5b3 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts @@ -175,7 +175,7 @@ const terminalConfiguration: IConfigurationNode = { markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to {0}'s value.", '`#editor.fontFamily#`'), type: 'string' }, - 'terminal.integrated.fontLigatures': { + [TerminalSettingId.ExperimentalFontLigatures]: { 'description': localize('terminal.integrated.fontLigatures', "Controls whether font ligatures are enabled in the terminal."), 'type': 'boolean', 'default': false From 785f2f1d1df1d469221a9358f3c5a9d46ba7b820 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Wed, 3 Aug 2022 08:56:31 -0700 Subject: [PATCH 04/11] Update distro to temp branch Pointing at distro tyriar/34103_distro_ligatures --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a1d984b10c203..11d69fd13440c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.70.0", - "distro": "7dc7a14b0f0031128c799f96c856bd3290c3ebee", + "distro": "7ec4522169389156f4aa543876695506b3327658", "author": { "name": "Microsoft Corporation" }, From a7cb6851ea2fe94740fea17c9acb6f4c612e8026 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Wed, 3 Aug 2022 09:15:00 -0700 Subject: [PATCH 05/11] Update distro --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 11d69fd13440c..0ab40c5acbcf3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.70.0", - "distro": "7ec4522169389156f4aa543876695506b3327658", + "distro": "4e351eb58962c8f746557eb54c06e0428b84417d", "author": { "name": "Microsoft Corporation" }, From ef553716ec9c4414720f4254b1db4e7831af6142 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Thu, 4 Aug 2022 05:12:34 -0700 Subject: [PATCH 06/11] Fix bundling of xterm-addon-ligatures --- .eslintrc.json | 1 + build/.webignore | 3 +++ src/bootstrap-window.js | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.eslintrc.json b/.eslintrc.json index d86f6103a7dd3..ceb3f8e373d63 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -260,6 +260,7 @@ "worker_threads", "xterm", "xterm-addon-canvas", + "xterm-addon-ligatures", "xterm-addon-search", "xterm-addon-serialize", "xterm-addon-unicode11", diff --git a/build/.webignore b/build/.webignore index 1a5b3ee2c1009..8f462d55f7005 100644 --- a/build/.webignore +++ b/build/.webignore @@ -23,6 +23,9 @@ xterm/src/** xterm-addon-canvas/src/** xterm-addon-canvas/out/** +xterm-addon-ligatures/src/** +xterm-addon-ligatures/out/** + xterm-addon-search/src/** xterm-addon-search/out/** xterm-addon-search/fixtures/** diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js index 61ca6dd847798..1958556af215b 100644 --- a/src/bootstrap-window.js +++ b/src/bootstrap-window.js @@ -137,6 +137,7 @@ 'vscode-oniguruma': `${baseNodeModulesPath}/vscode-oniguruma/release/main.js`, 'xterm': `${baseNodeModulesPath}/xterm/lib/xterm.js`, 'xterm-addon-canvas': `${baseNodeModulesPath}/xterm-addon-canvas/lib/xterm-addon-canvas.js`, + 'xterm-addon-ligatures': `${baseNodeModulesPath}/xterm-addon-ligatures/lib/xterm-addon-ligatures.js`, 'xterm-addon-search': `${baseNodeModulesPath}/xterm-addon-search/lib/xterm-addon-search.js`, 'xterm-addon-unicode11': `${baseNodeModulesPath}/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`, 'xterm-addon-webgl': `${baseNodeModulesPath}/xterm-addon-webgl/lib/xterm-addon-webgl.js`, @@ -151,7 +152,7 @@ // which has a fallback to using node.js `require` // (node.js enabled renderers only) if (!safeProcess.sandboxed) { - loaderConfig.amdModulesPattern = /(^vs\/)|(^vscode-textmate$)|(^vscode-oniguruma$)|(^xterm$)|(^xterm-addon-canvas$)|(^xterm-addon-search$)|(^xterm-addon-unicode11$)|(^xterm-addon-webgl$)|(^@vscode\/iconv-lite-umd$)|(^jschardet$)|(^@vscode\/vscode-languagedetection$)|(^vscode-regexp-languagedetection$)|(^tas-client-umd$)/; + loaderConfig.amdModulesPattern = /(^vs\/)|(^vscode-textmate$)|(^vscode-oniguruma$)|(^xterm$)|(^xterm-addon-canvas$)|(^xterm-addon-ligatures$)|(^xterm-addon-search$)|(^xterm-addon-unicode11$)|(^xterm-addon-webgl$)|(^@vscode\/iconv-lite-umd$)|(^jschardet$)|(^@vscode\/vscode-languagedetection$)|(^vscode-regexp-languagedetection$)|(^tas-client-umd$)/; } // Signal before require.config() From 8690bdb789d89565d49ad87598d9609fddbf2ef0 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Thu, 4 Aug 2022 05:14:46 -0700 Subject: [PATCH 07/11] Add todo to remove font access flag --- src/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.js b/src/main.js index 0edb80909de8f..a8874eb8bcfbe 100644 --- a/src/main.js +++ b/src/main.js @@ -218,6 +218,7 @@ function configureCommandlineSwitchesSync(cliArgs) { } }); + // TODO: Remove this when we update to Electron 20 as font access is enabled by default in Chromium 104 // Enable Font Access API (eg. for terminal ligatures) app.commandLine.appendSwitch('enable-features', 'FontAccess'); From 4e3270439048d07cf2d6de24ed6a1b999c8328be Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Thu, 4 Aug 2022 07:53:22 -0700 Subject: [PATCH 08/11] Update xterm --- package.json | 14 +++++------ remote/package.json | 14 +++++------ remote/web/package.json | 12 ++++----- remote/web/yarn.lock | 56 ++++++++++++++++++++--------------------- remote/yarn.lock | 56 ++++++++++++++++++++--------------------- yarn.lock | 56 ++++++++++++++++++++--------------------- 6 files changed, 104 insertions(+), 104 deletions(-) diff --git a/package.json b/package.json index 0ab40c5acbcf3..90e84e1ec5c8e 100644 --- a/package.json +++ b/package.json @@ -86,13 +86,13 @@ "vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "7.0.1", - "xterm": "5.0.0-beta.33", - "xterm-addon-canvas": "0.2.0-beta.15", - "xterm-addon-ligatures": "0.6.0-beta.19", - "xterm-addon-search": "0.10.0-beta.3", - "xterm-addon-serialize": "0.8.0-beta.3", - "xterm-addon-unicode11": "0.4.0-beta.3", - "xterm-addon-webgl": "0.13.0-beta.32", + "xterm": "5.0.0-beta.34", + "xterm-addon-canvas": "0.2.0-beta.17", + "xterm-addon-ligatures": "0.6.0-beta.22", + "xterm-addon-search": "0.10.0-beta.5", + "xterm-addon-serialize": "0.8.0-beta.5", + "xterm-addon-unicode11": "0.4.0-beta.5", + "xterm-addon-webgl": "0.13.0-beta.34", "xterm-headless": "5.0.0-beta.5", "yauzl": "^2.9.2", "yazl": "^2.4.3" diff --git a/remote/package.json b/remote/package.json index e9b047439b4c2..cb3c3d0693a5f 100644 --- a/remote/package.json +++ b/remote/package.json @@ -24,13 +24,13 @@ "vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "7.0.1", - "xterm": "5.0.0-beta.33", - "xterm-addon-canvas": "0.2.0-beta.15", - "xterm-addon-ligatures": "0.6.0-beta.19", - "xterm-addon-search": "0.10.0-beta.3", - "xterm-addon-serialize": "0.8.0-beta.3", - "xterm-addon-unicode11": "0.4.0-beta.3", - "xterm-addon-webgl": "0.13.0-beta.32", + "xterm": "5.0.0-beta.34", + "xterm-addon-canvas": "0.2.0-beta.17", + "xterm-addon-ligatures": "0.6.0-beta.22", + "xterm-addon-search": "0.10.0-beta.5", + "xterm-addon-serialize": "0.8.0-beta.5", + "xterm-addon-unicode11": "0.4.0-beta.5", + "xterm-addon-webgl": "0.13.0-beta.34", "xterm-headless": "5.0.0-beta.5", "yauzl": "^2.9.2", "yazl": "^2.4.3" diff --git a/remote/web/package.json b/remote/web/package.json index aa1e1959f401e..77744b4f58db7 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -11,11 +11,11 @@ "tas-client-umd": "0.1.6", "vscode-oniguruma": "1.6.1", "vscode-textmate": "7.0.1", - "xterm": "5.0.0-beta.33", - "xterm-addon-canvas": "0.2.0-beta.15", - "xterm-addon-ligatures": "0.6.0-beta.19", - "xterm-addon-search": "0.10.0-beta.3", - "xterm-addon-unicode11": "0.4.0-beta.3", - "xterm-addon-webgl": "0.13.0-beta.32" + "xterm": "5.0.0-beta.34", + "xterm-addon-canvas": "0.2.0-beta.17", + "xterm-addon-ligatures": "0.6.0-beta.22", + "xterm-addon-search": "0.10.0-beta.5", + "xterm-addon-unicode11": "0.4.0-beta.5", + "xterm-addon-webgl": "0.13.0-beta.34" } } diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index a20b9d49dd7e0..ae9484fe42e9b 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -114,38 +114,38 @@ vscode-textmate@7.0.1: resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-7.0.1.tgz#8118a32b02735dccd14f893b495fa5389ad7de79" integrity sha512-zQ5U/nuXAAMsh691FtV0wPz89nSkHbs+IQV8FDk+wew9BlSDhf4UmWGlWJfTR2Ti6xZv87Tj5fENzKf6Qk7aLw== -xterm-addon-canvas@0.2.0-beta.15: - version "0.2.0-beta.15" - resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.15.tgz#de863e46410b1de357b153abf1984227777760e4" - integrity sha512-E1pNCDSVTINchwWLysZ9ZD/BPv1WLGV52xRHB00US1PHHELbhtvms+6dZ44WZEDXhtfpptRZ1VBx+QpvfJIuvw== - -xterm-addon-ligatures@0.6.0-beta.19: - version "0.6.0-beta.19" - resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.19.tgz#5e43eeaf84968e014769a5f2c6a3a3601dc4771c" - integrity sha512-A0BIjFF6g5aPI0HiI2JMhhMV3gaHbpZ+ua+UNagkID0GxZ/ezn0wVOAtNQl/KlqnFueoyZIxlbyXmWNAfJVPRg== +xterm-addon-canvas@0.2.0-beta.17: + version "0.2.0-beta.17" + resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.17.tgz#e84a86530b20bd3edcce16b4566f346cd186ab4d" + integrity sha512-2ukPdCA92VTFYQRE56ylzvI3cfaQYDWd/Mc4jlEItI6sV/EA5RnUbbP+2sFIx0JlmHK6nVYXXNY2p6QRB7MRew== + +xterm-addon-ligatures@0.6.0-beta.22: + version "0.6.0-beta.22" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.22.tgz#d7c2d8ac6454b8401c2f297689cc168f8ca91716" + integrity sha512-dzTWusH9rmY+OJd9F/kUlPZmnA0EMkR/cQZIUSoPLdUHKTY94im6bx9ZMNwBvjXuzHa9HCknDmXLMczmR7y7Jg== dependencies: font-finder "^1.1.0" font-ligatures "^1.4.1" -xterm-addon-search@0.10.0-beta.3: - version "0.10.0-beta.3" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.10.0-beta.3.tgz#5194434d86105637c71f6f20139a9d0b5c1a956a" - integrity sha512-UeGm/ymnp7HUYJJtsP0D+bljOWbdk3MctcLJ+0jv8AmU6YlAzJFtouvYSQrD5SAMyht5CRsvjzFgqic9X02JYg== - -xterm-addon-unicode11@0.4.0-beta.3: - version "0.4.0-beta.3" - resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa" - integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q== - -xterm-addon-webgl@0.13.0-beta.32: - version "0.13.0-beta.32" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.32.tgz#ae7335f788ae611733e03f6ca38280ab7b86d212" - integrity sha512-xOudNzYXaRh9QZ+IigXM5EB3bM8l3/F8F35EpJRYvvsylVxiB6Km8X8l7+nxlWt+uYdnHZs0ka2rvtL8kOP/uw== - -xterm@5.0.0-beta.33: - version "5.0.0-beta.33" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.33.tgz#ee0795779fb5fe8079d3400684fc384ad861cc88" - integrity sha512-9bz+N6UHTxAZZ1zM/UuzGQvwxbEnlfVi3ZqIhoPWnscQVS0zoqf6plxU1rTj1ZMqMN7liXgHS9ZgBePyP3jGzg== +xterm-addon-search@0.10.0-beta.5: + version "0.10.0-beta.5" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.10.0-beta.5.tgz#a2cb16bda4ddf8783b80433155ad94f5822271f8" + integrity sha512-kjog7cm1iEZ2XyQFVs3KAvoI2pKoX0cq2WWjL0FuXYXpKQ9vXmfrWSR7PiJ6zpTIRvr6UtaSGKhmZVHLNA79WA== + +xterm-addon-unicode11@0.4.0-beta.5: + version "0.4.0-beta.5" + resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.5.tgz#3900e66f10d2e506133b61d7421aab6878d32665" + integrity sha512-+g+fuxAd/tkCEJ/jhdnebXKtdPrhsu4VKWNnB/3qM35GbuGQOasmYFYnKL+HYZMpbQ6YqeZcXTVg/wnCTttz0g== + +xterm-addon-webgl@0.13.0-beta.34: + version "0.13.0-beta.34" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.34.tgz#95f57c1bfd1d0f533584746594b676bab7bfd5af" + integrity sha512-hWYC/WAQL67DSN0Z8bbxV+UresJWQaFthAa1oQCubqK5tjEyHbzU06W9ZICdYvvDzxde685HIZ/K7hY4Eco8SA== + +xterm@5.0.0-beta.34: + version "5.0.0-beta.34" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.34.tgz#893d855b7429b0c836c807ef4425fd3abba5e648" + integrity sha512-253G3+L81wr1qk1n07AZV74qc8tfOgbHgTQiszoB2pyL3LmQ5cIOI4YGL5ZnONwusFbGEZTlUbNrNh8uoO+J8g== yallist@^4.0.0: version "4.0.0" diff --git a/remote/yarn.lock b/remote/yarn.lock index efc902d73305f..b2b54955672af 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -827,48 +827,48 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -xterm-addon-canvas@0.2.0-beta.15: - version "0.2.0-beta.15" - resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.15.tgz#de863e46410b1de357b153abf1984227777760e4" - integrity sha512-E1pNCDSVTINchwWLysZ9ZD/BPv1WLGV52xRHB00US1PHHELbhtvms+6dZ44WZEDXhtfpptRZ1VBx+QpvfJIuvw== +xterm-addon-canvas@0.2.0-beta.17: + version "0.2.0-beta.17" + resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.17.tgz#e84a86530b20bd3edcce16b4566f346cd186ab4d" + integrity sha512-2ukPdCA92VTFYQRE56ylzvI3cfaQYDWd/Mc4jlEItI6sV/EA5RnUbbP+2sFIx0JlmHK6nVYXXNY2p6QRB7MRew== -xterm-addon-ligatures@0.6.0-beta.19: - version "0.6.0-beta.19" - resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.19.tgz#5e43eeaf84968e014769a5f2c6a3a3601dc4771c" - integrity sha512-A0BIjFF6g5aPI0HiI2JMhhMV3gaHbpZ+ua+UNagkID0GxZ/ezn0wVOAtNQl/KlqnFueoyZIxlbyXmWNAfJVPRg== +xterm-addon-ligatures@0.6.0-beta.22: + version "0.6.0-beta.22" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.22.tgz#d7c2d8ac6454b8401c2f297689cc168f8ca91716" + integrity sha512-dzTWusH9rmY+OJd9F/kUlPZmnA0EMkR/cQZIUSoPLdUHKTY94im6bx9ZMNwBvjXuzHa9HCknDmXLMczmR7y7Jg== dependencies: font-finder "^1.1.0" font-ligatures "^1.4.1" -xterm-addon-search@0.10.0-beta.3: - version "0.10.0-beta.3" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.10.0-beta.3.tgz#5194434d86105637c71f6f20139a9d0b5c1a956a" - integrity sha512-UeGm/ymnp7HUYJJtsP0D+bljOWbdk3MctcLJ+0jv8AmU6YlAzJFtouvYSQrD5SAMyht5CRsvjzFgqic9X02JYg== +xterm-addon-search@0.10.0-beta.5: + version "0.10.0-beta.5" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.10.0-beta.5.tgz#a2cb16bda4ddf8783b80433155ad94f5822271f8" + integrity sha512-kjog7cm1iEZ2XyQFVs3KAvoI2pKoX0cq2WWjL0FuXYXpKQ9vXmfrWSR7PiJ6zpTIRvr6UtaSGKhmZVHLNA79WA== -xterm-addon-serialize@0.8.0-beta.3: - version "0.8.0-beta.3" - resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.8.0-beta.3.tgz#47ade3fedacbb75bd26e63cfe0120586623e0e4f" - integrity sha512-gvfempZCYuAhLqN4O6fA2TuoavPjOxFKlh8hLcOzPackiLUhwKr1jQpDXcnq8VgqUiGgb+XNZpPEbI0Q7EhTgA== +xterm-addon-serialize@0.8.0-beta.5: + version "0.8.0-beta.5" + resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.8.0-beta.5.tgz#3d2f3be173f4f1c31ae7bf25179e8ecddf2b33b2" + integrity sha512-rkSUaO1XBcy3ipScZMA5PrOKu/DfXo8XC/V7hZlhMiBNbZKlbk2rFb3X0FB1f07hw7oEkHLjuIJEY5Qtxfe9/w== -xterm-addon-unicode11@0.4.0-beta.3: - version "0.4.0-beta.3" - resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa" - integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q== +xterm-addon-unicode11@0.4.0-beta.5: + version "0.4.0-beta.5" + resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.5.tgz#3900e66f10d2e506133b61d7421aab6878d32665" + integrity sha512-+g+fuxAd/tkCEJ/jhdnebXKtdPrhsu4VKWNnB/3qM35GbuGQOasmYFYnKL+HYZMpbQ6YqeZcXTVg/wnCTttz0g== -xterm-addon-webgl@0.13.0-beta.32: - version "0.13.0-beta.32" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.32.tgz#ae7335f788ae611733e03f6ca38280ab7b86d212" - integrity sha512-xOudNzYXaRh9QZ+IigXM5EB3bM8l3/F8F35EpJRYvvsylVxiB6Km8X8l7+nxlWt+uYdnHZs0ka2rvtL8kOP/uw== +xterm-addon-webgl@0.13.0-beta.34: + version "0.13.0-beta.34" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.34.tgz#95f57c1bfd1d0f533584746594b676bab7bfd5af" + integrity sha512-hWYC/WAQL67DSN0Z8bbxV+UresJWQaFthAa1oQCubqK5tjEyHbzU06W9ZICdYvvDzxde685HIZ/K7hY4Eco8SA== xterm-headless@5.0.0-beta.5: version "5.0.0-beta.5" resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.0.0-beta.5.tgz#e29b6c5081f31f887122b7263ba996b0c46b3c22" integrity sha512-CMQ1+prBNF92oBMeZzc2rfTcmOaCGfwwSaoPYNTjyziZT6mZsEg7amajYkb0YAnqJ29MFm4kPGZbU78/dX4k2A== -xterm@5.0.0-beta.33: - version "5.0.0-beta.33" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.33.tgz#ee0795779fb5fe8079d3400684fc384ad861cc88" - integrity sha512-9bz+N6UHTxAZZ1zM/UuzGQvwxbEnlfVi3ZqIhoPWnscQVS0zoqf6plxU1rTj1ZMqMN7liXgHS9ZgBePyP3jGzg== +xterm@5.0.0-beta.34: + version "5.0.0-beta.34" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.34.tgz#893d855b7429b0c836c807ef4425fd3abba5e648" + integrity sha512-253G3+L81wr1qk1n07AZV74qc8tfOgbHgTQiszoB2pyL3LmQ5cIOI4YGL5ZnONwusFbGEZTlUbNrNh8uoO+J8g== yallist@^4.0.0: version "4.0.0" diff --git a/yarn.lock b/yarn.lock index 3c441c211037f..4ce89f4558a1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11280,48 +11280,48 @@ xtend@~2.1.1: dependencies: object-keys "~0.4.0" -xterm-addon-canvas@0.2.0-beta.15: - version "0.2.0-beta.15" - resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.15.tgz#de863e46410b1de357b153abf1984227777760e4" - integrity sha512-E1pNCDSVTINchwWLysZ9ZD/BPv1WLGV52xRHB00US1PHHELbhtvms+6dZ44WZEDXhtfpptRZ1VBx+QpvfJIuvw== +xterm-addon-canvas@0.2.0-beta.17: + version "0.2.0-beta.17" + resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.17.tgz#e84a86530b20bd3edcce16b4566f346cd186ab4d" + integrity sha512-2ukPdCA92VTFYQRE56ylzvI3cfaQYDWd/Mc4jlEItI6sV/EA5RnUbbP+2sFIx0JlmHK6nVYXXNY2p6QRB7MRew== -xterm-addon-ligatures@0.6.0-beta.19: - version "0.6.0-beta.19" - resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.19.tgz#5e43eeaf84968e014769a5f2c6a3a3601dc4771c" - integrity sha512-A0BIjFF6g5aPI0HiI2JMhhMV3gaHbpZ+ua+UNagkID0GxZ/ezn0wVOAtNQl/KlqnFueoyZIxlbyXmWNAfJVPRg== +xterm-addon-ligatures@0.6.0-beta.22: + version "0.6.0-beta.22" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.22.tgz#d7c2d8ac6454b8401c2f297689cc168f8ca91716" + integrity sha512-dzTWusH9rmY+OJd9F/kUlPZmnA0EMkR/cQZIUSoPLdUHKTY94im6bx9ZMNwBvjXuzHa9HCknDmXLMczmR7y7Jg== dependencies: font-finder "^1.1.0" font-ligatures "^1.4.1" -xterm-addon-search@0.10.0-beta.3: - version "0.10.0-beta.3" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.10.0-beta.3.tgz#5194434d86105637c71f6f20139a9d0b5c1a956a" - integrity sha512-UeGm/ymnp7HUYJJtsP0D+bljOWbdk3MctcLJ+0jv8AmU6YlAzJFtouvYSQrD5SAMyht5CRsvjzFgqic9X02JYg== +xterm-addon-search@0.10.0-beta.5: + version "0.10.0-beta.5" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.10.0-beta.5.tgz#a2cb16bda4ddf8783b80433155ad94f5822271f8" + integrity sha512-kjog7cm1iEZ2XyQFVs3KAvoI2pKoX0cq2WWjL0FuXYXpKQ9vXmfrWSR7PiJ6zpTIRvr6UtaSGKhmZVHLNA79WA== -xterm-addon-serialize@0.8.0-beta.3: - version "0.8.0-beta.3" - resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.8.0-beta.3.tgz#47ade3fedacbb75bd26e63cfe0120586623e0e4f" - integrity sha512-gvfempZCYuAhLqN4O6fA2TuoavPjOxFKlh8hLcOzPackiLUhwKr1jQpDXcnq8VgqUiGgb+XNZpPEbI0Q7EhTgA== +xterm-addon-serialize@0.8.0-beta.5: + version "0.8.0-beta.5" + resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.8.0-beta.5.tgz#3d2f3be173f4f1c31ae7bf25179e8ecddf2b33b2" + integrity sha512-rkSUaO1XBcy3ipScZMA5PrOKu/DfXo8XC/V7hZlhMiBNbZKlbk2rFb3X0FB1f07hw7oEkHLjuIJEY5Qtxfe9/w== -xterm-addon-unicode11@0.4.0-beta.3: - version "0.4.0-beta.3" - resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.3.tgz#f350184155fafd5ad0d6fbf31d13e6ca7dea1efa" - integrity sha512-FryZAVwbUjKTmwXnm1trch/2XO60F5JsDvOkZhzobV1hm10sFLVuZpFyHXiUx7TFeeFsvNP+S77LAtWoeT5z+Q== +xterm-addon-unicode11@0.4.0-beta.5: + version "0.4.0-beta.5" + resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.4.0-beta.5.tgz#3900e66f10d2e506133b61d7421aab6878d32665" + integrity sha512-+g+fuxAd/tkCEJ/jhdnebXKtdPrhsu4VKWNnB/3qM35GbuGQOasmYFYnKL+HYZMpbQ6YqeZcXTVg/wnCTttz0g== -xterm-addon-webgl@0.13.0-beta.32: - version "0.13.0-beta.32" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.32.tgz#ae7335f788ae611733e03f6ca38280ab7b86d212" - integrity sha512-xOudNzYXaRh9QZ+IigXM5EB3bM8l3/F8F35EpJRYvvsylVxiB6Km8X8l7+nxlWt+uYdnHZs0ka2rvtL8kOP/uw== +xterm-addon-webgl@0.13.0-beta.34: + version "0.13.0-beta.34" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.13.0-beta.34.tgz#95f57c1bfd1d0f533584746594b676bab7bfd5af" + integrity sha512-hWYC/WAQL67DSN0Z8bbxV+UresJWQaFthAa1oQCubqK5tjEyHbzU06W9ZICdYvvDzxde685HIZ/K7hY4Eco8SA== xterm-headless@5.0.0-beta.5: version "5.0.0-beta.5" resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.0.0-beta.5.tgz#e29b6c5081f31f887122b7263ba996b0c46b3c22" integrity sha512-CMQ1+prBNF92oBMeZzc2rfTcmOaCGfwwSaoPYNTjyziZT6mZsEg7amajYkb0YAnqJ29MFm4kPGZbU78/dX4k2A== -xterm@5.0.0-beta.33: - version "5.0.0-beta.33" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.33.tgz#ee0795779fb5fe8079d3400684fc384ad861cc88" - integrity sha512-9bz+N6UHTxAZZ1zM/UuzGQvwxbEnlfVi3ZqIhoPWnscQVS0zoqf6plxU1rTj1ZMqMN7liXgHS9ZgBePyP3jGzg== +xterm@5.0.0-beta.34: + version "5.0.0-beta.34" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.0.0-beta.34.tgz#893d855b7429b0c836c807ef4425fd3abba5e648" + integrity sha512-253G3+L81wr1qk1n07AZV74qc8tfOgbHgTQiszoB2pyL3LmQ5cIOI4YGL5ZnONwusFbGEZTlUbNrNh8uoO+J8g== y18n@^3.2.1: version "3.2.2" From 6378abb20df4abccf3ab1197817e3740451efc93 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Thu, 4 Aug 2022 13:13:39 -0700 Subject: [PATCH 09/11] Update xterm --- package.json | 2 +- remote/package.json | 2 +- remote/web/package.json | 2 +- remote/web/yarn.lock | 8 ++++---- remote/yarn.lock | 8 ++++---- yarn.lock | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 90a0a4f32ee90..89fa030abc5ff 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "vscode-textmate": "7.0.1", "xterm": "5.0.0-beta.34", "xterm-addon-canvas": "0.2.0-beta.17", - "xterm-addon-ligatures": "0.6.0-beta.22", + "xterm-addon-ligatures": "0.6.0-beta.23", "xterm-addon-search": "0.10.0-beta.5", "xterm-addon-serialize": "0.8.0-beta.5", "xterm-addon-unicode11": "0.4.0-beta.5", diff --git a/remote/package.json b/remote/package.json index cb3c3d0693a5f..416fded2c12f2 100644 --- a/remote/package.json +++ b/remote/package.json @@ -26,7 +26,7 @@ "vscode-textmate": "7.0.1", "xterm": "5.0.0-beta.34", "xterm-addon-canvas": "0.2.0-beta.17", - "xterm-addon-ligatures": "0.6.0-beta.22", + "xterm-addon-ligatures": "0.6.0-beta.23", "xterm-addon-search": "0.10.0-beta.5", "xterm-addon-serialize": "0.8.0-beta.5", "xterm-addon-unicode11": "0.4.0-beta.5", diff --git a/remote/web/package.json b/remote/web/package.json index 77744b4f58db7..4ad08731125cb 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -13,7 +13,7 @@ "vscode-textmate": "7.0.1", "xterm": "5.0.0-beta.34", "xterm-addon-canvas": "0.2.0-beta.17", - "xterm-addon-ligatures": "0.6.0-beta.22", + "xterm-addon-ligatures": "0.6.0-beta.23", "xterm-addon-search": "0.10.0-beta.5", "xterm-addon-unicode11": "0.4.0-beta.5", "xterm-addon-webgl": "0.13.0-beta.34" diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index ae9484fe42e9b..f80f07580ec85 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -119,10 +119,10 @@ xterm-addon-canvas@0.2.0-beta.17: resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.17.tgz#e84a86530b20bd3edcce16b4566f346cd186ab4d" integrity sha512-2ukPdCA92VTFYQRE56ylzvI3cfaQYDWd/Mc4jlEItI6sV/EA5RnUbbP+2sFIx0JlmHK6nVYXXNY2p6QRB7MRew== -xterm-addon-ligatures@0.6.0-beta.22: - version "0.6.0-beta.22" - resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.22.tgz#d7c2d8ac6454b8401c2f297689cc168f8ca91716" - integrity sha512-dzTWusH9rmY+OJd9F/kUlPZmnA0EMkR/cQZIUSoPLdUHKTY94im6bx9ZMNwBvjXuzHa9HCknDmXLMczmR7y7Jg== +xterm-addon-ligatures@0.6.0-beta.23: + version "0.6.0-beta.23" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.23.tgz#e71b9e2f165883dbff6e17c82e3f39f1e902f6db" + integrity sha512-Hom+MBfRE0PxuvZ2C5qdRhTAmBvCYem3AiIbRMraz/kQeBR9O3ZJl4DbEhuXNwrmU9d5A8eUllLJuqNvnlYSbw== dependencies: font-finder "^1.1.0" font-ligatures "^1.4.1" diff --git a/remote/yarn.lock b/remote/yarn.lock index b2b54955672af..c226b174aa4b7 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -832,10 +832,10 @@ xterm-addon-canvas@0.2.0-beta.17: resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.17.tgz#e84a86530b20bd3edcce16b4566f346cd186ab4d" integrity sha512-2ukPdCA92VTFYQRE56ylzvI3cfaQYDWd/Mc4jlEItI6sV/EA5RnUbbP+2sFIx0JlmHK6nVYXXNY2p6QRB7MRew== -xterm-addon-ligatures@0.6.0-beta.22: - version "0.6.0-beta.22" - resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.22.tgz#d7c2d8ac6454b8401c2f297689cc168f8ca91716" - integrity sha512-dzTWusH9rmY+OJd9F/kUlPZmnA0EMkR/cQZIUSoPLdUHKTY94im6bx9ZMNwBvjXuzHa9HCknDmXLMczmR7y7Jg== +xterm-addon-ligatures@0.6.0-beta.23: + version "0.6.0-beta.23" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.23.tgz#e71b9e2f165883dbff6e17c82e3f39f1e902f6db" + integrity sha512-Hom+MBfRE0PxuvZ2C5qdRhTAmBvCYem3AiIbRMraz/kQeBR9O3ZJl4DbEhuXNwrmU9d5A8eUllLJuqNvnlYSbw== dependencies: font-finder "^1.1.0" font-ligatures "^1.4.1" diff --git a/yarn.lock b/yarn.lock index d39b47bc19575..9cdbe7d7ba8d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11272,10 +11272,10 @@ xterm-addon-canvas@0.2.0-beta.17: resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.2.0-beta.17.tgz#e84a86530b20bd3edcce16b4566f346cd186ab4d" integrity sha512-2ukPdCA92VTFYQRE56ylzvI3cfaQYDWd/Mc4jlEItI6sV/EA5RnUbbP+2sFIx0JlmHK6nVYXXNY2p6QRB7MRew== -xterm-addon-ligatures@0.6.0-beta.22: - version "0.6.0-beta.22" - resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.22.tgz#d7c2d8ac6454b8401c2f297689cc168f8ca91716" - integrity sha512-dzTWusH9rmY+OJd9F/kUlPZmnA0EMkR/cQZIUSoPLdUHKTY94im6bx9ZMNwBvjXuzHa9HCknDmXLMczmR7y7Jg== +xterm-addon-ligatures@0.6.0-beta.23: + version "0.6.0-beta.23" + resolved "https://registry.yarnpkg.com/xterm-addon-ligatures/-/xterm-addon-ligatures-0.6.0-beta.23.tgz#e71b9e2f165883dbff6e17c82e3f39f1e902f6db" + integrity sha512-Hom+MBfRE0PxuvZ2C5qdRhTAmBvCYem3AiIbRMraz/kQeBR9O3ZJl4DbEhuXNwrmU9d5A8eUllLJuqNvnlYSbw== dependencies: font-finder "^1.1.0" font-ligatures "^1.4.1" From 2abf2437908cf8916113f9dd2fe4a9ad2e981c68 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Thu, 4 Aug 2022 15:26:18 -0700 Subject: [PATCH 10/11] Update distro --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c60cb4b25722..c9a28820072f0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.71.0", - "distro": "7dc7a14b0f0031128c799f96c856bd3290c3ebee", + "distro": "ea5392519d5bc5a208fd2437b903db0cd8972372", "author": { "name": "Microsoft Corporation" }, From 2f27e1b375456f459f986239da89cef509b05d6f Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Fri, 5 Aug 2022 08:01:03 -0700 Subject: [PATCH 11/11] Update distro --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7bf4c4c801676..fb386725629bc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.71.0", - "distro": "eb23fca20abeeed869f14d2581658864b99ba1e2", + "distro": "c36ad55489967d920ebc707ad9b5950e1b53a690", "author": { "name": "Microsoft Corporation" },