diff --git a/.eslintrc.json b/.eslintrc.json index a294145a33c..d7edeea91b8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -339,14 +339,14 @@ "vscode-regexpp", "vscode-textmate", "worker_threads", - "xterm", - "xterm-addon-canvas", - "xterm-addon-image", - "xterm-addon-search", - "xterm-addon-serialize", - "xterm-addon-unicode11", - "xterm-addon-webgl", - "xterm-headless", + "@xterm/addon-canvas", + "@xterm/addon-image", + "@xterm/addon-search", + "@xterm/addon-serialize", + "@xterm/addon-unicode11", + "@xterm/addon-webgl", + "@xterm/headless", + "@xterm/xterm", "yauzl", "yazl", "zlib" @@ -543,11 +543,11 @@ "vscode-notebook-renderer", // Type only import { "when": "hasBrowser", - "pattern": "xterm" + "pattern": "@xterm/xterm" }, // node module allowed even in /browser/ { "when": "hasBrowser", - "pattern": "xterm-addon-*" + "pattern": "@xterm/addon-*" }, // node module allowed even in /browser/ { "when": "hasBrowser", @@ -572,11 +572,11 @@ "vscode-notebook-renderer", // Type only import { "when": "hasBrowser", - "pattern": "xterm" + "pattern": "@xterm/xterm" }, // node module allowed even in /browser/ { "when": "hasBrowser", - "pattern": "xterm-addon-*" + "pattern": "@xterm/addon-*" }, // node module allowed even in /browser/ { "when": "hasBrowser", diff --git a/.vscode/settings.json b/.vscode/settings.json index e70c549fd4d..98bd618b14f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -158,8 +158,8 @@ "editor.experimental.asyncTokenization": true, "editor.experimental.asyncTokenizationVerification": true, "typescript.preferences.autoImportFileExcludePatterns": [ - "xterm", - "xterm-headless", + "@xterm/xterm", + "@xterm/headless", "node-pty", "vscode-notebook-renderer", "src/vs/workbench/workbench.web.main.ts", diff --git a/build/.moduleignore b/build/.moduleignore index d92dedf90f9..87dafa92b0f 100644 --- a/build/.moduleignore +++ b/build/.moduleignore @@ -160,11 +160,11 @@ zone.js/dist/** !zone.js/dist/zone-node.js # https://github.com/xtermjs/xterm.js/issues/3137 -xterm/src/** -xterm/tsconfig.all.json +@xterm/xterm/src/** +@xterm/xterm/tsconfig.all.json # https://github.com/xtermjs/xterm.js/issues/3138 -xterm-addon-*/src/** -xterm-addon-*/fixtures/** -xterm-addon-*/out/** -xterm-addon-*/out-test/** +@xterm/xterm-addon-*/src/** +@xterm/xterm-addon-*/fixtures/** +@xterm/xterm-addon-*/out/** +@xterm/xterm-addon-*/out-test/** diff --git a/build/.webignore b/build/.webignore index bc8fe659566..0145e3b7da4 100644 --- a/build/.webignore +++ b/build/.webignore @@ -18,23 +18,23 @@ jschardet/dist/jschardet.js vscode-textmate/webpack.config.js -xterm/src/** +@xterm/xterm/src/** -xterm-addon-canvas/src/** -xterm-addon-canvas/out/** +@xterm/addon-canvas/src/** +@xterm/addon-canvas/out/** -xterm-addon-image/src/** -xterm-addon-image/out/** +@xterm/addon-image/src/** +@xterm/addon-image/out/** -xterm-addon-search/src/** -xterm-addon-search/out/** -xterm-addon-search/fixtures/** +@xterm/addon-search/src/** +@xterm/addon-search/out/** +@xterm/addon-search/fixtures/** -xterm-addon-unicode11/src/** -xterm-addon-unicode11/out/** +@xterm/addon-unicode11/src/** +@xterm/addon-unicode11/out/** -xterm-addon-webgl/src/** -xterm-addon-webgl/out/** +@xterm/addon-webgl/src/** +@xterm/addon-webgl/out/** # This makes sure the model is included in the package !@vscode/vscode-languagedetection/model/** diff --git a/package.json b/package.json index 4736c4dbca5..ac9f019f531 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,14 @@ "@vscode/windows-mutex": "^0.4.4", "@vscode/windows-process-tree": "^0.5.0", "@vscode/windows-registry": "^1.1.0", + "@xterm/addon-canvas": "0.6.0-beta.3", + "@xterm/addon-image": "0.7.0-beta.1", + "@xterm/addon-search": "0.14.0-beta.3", + "@xterm/addon-serialize": "0.12.0-beta.3", + "@xterm/addon-unicode11": "0.7.0-beta.3", + "@xterm/addon-webgl": "0.17.0-beta.3", + "@xterm/headless": "5.4.0-beta.3", + "@xterm/xterm": "5.4.0-beta.3", "graceful-fs": "4.2.11", "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.2", @@ -96,14 +104,6 @@ "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "9.0.0", - "xterm": "5.4.0-beta.37", - "xterm-addon-canvas": "0.6.0-beta.37", - "xterm-addon-image": "0.6.0-beta.21", - "xterm-addon-search": "0.14.0-beta.36", - "xterm-addon-serialize": "0.12.0-beta.36", - "xterm-addon-unicode11": "0.7.0-beta.36", - "xterm-addon-webgl": "0.17.0-beta.36", - "xterm-headless": "5.4.0-beta.37", "yauzl": "^2.9.2", "yazl": "^2.4.3" }, diff --git a/remote/package.json b/remote/package.json index 50e021d504e..8b7de0eea45 100644 --- a/remote/package.json +++ b/remote/package.json @@ -13,6 +13,14 @@ "@vscode/vscode-languagedetection": "1.0.21", "@vscode/windows-process-tree": "^0.5.0", "@vscode/windows-registry": "^1.1.0", + "@xterm/addon-canvas": "0.6.0-beta.3", + "@xterm/addon-image": "0.7.0-beta.1", + "@xterm/addon-search": "0.14.0-beta.3", + "@xterm/addon-serialize": "0.12.0-beta.3", + "@xterm/addon-unicode11": "0.7.0-beta.3", + "@xterm/addon-webgl": "0.17.0-beta.3", + "@xterm/headless": "5.4.0-beta.3", + "@xterm/xterm": "5.4.0-beta.3", "cookie": "^0.4.0", "graceful-fs": "4.2.11", "http-proxy-agent": "^7.0.0", @@ -26,14 +34,6 @@ "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "9.0.0", - "xterm": "5.4.0-beta.37", - "xterm-addon-canvas": "0.6.0-beta.37", - "xterm-addon-image": "0.6.0-beta.21", - "xterm-addon-search": "0.14.0-beta.36", - "xterm-addon-serialize": "0.12.0-beta.36", - "xterm-addon-unicode11": "0.7.0-beta.36", - "xterm-addon-webgl": "0.17.0-beta.36", - "xterm-headless": "5.4.0-beta.37", "yauzl": "^2.9.2", "yazl": "^2.4.3" } diff --git a/remote/web/package.json b/remote/web/package.json index 6570ba0ff0a..52b19d8e14b 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -7,15 +7,15 @@ "@microsoft/1ds-post-js": "^3.2.13", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/vscode-languagedetection": "1.0.21", + "@xterm/addon-canvas": "0.6.0-beta.3", + "@xterm/addon-image": "0.7.0-beta.1", + "@xterm/addon-search": "0.14.0-beta.3", + "@xterm/addon-unicode11": "0.7.0-beta.3", + "@xterm/addon-webgl": "0.17.0-beta.3", + "@xterm/xterm": "5.4.0-beta.3", "jschardet": "3.0.0", "tas-client-umd": "0.1.8", "vscode-oniguruma": "1.7.0", - "vscode-textmate": "9.0.0", - "xterm": "5.4.0-beta.37", - "xterm-addon-canvas": "0.6.0-beta.37", - "xterm-addon-image": "0.6.0-beta.21", - "xterm-addon-search": "0.14.0-beta.36", - "xterm-addon-unicode11": "0.7.0-beta.36", - "xterm-addon-webgl": "0.17.0-beta.36" + "vscode-textmate": "9.0.0" } } diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index 4d7cf110e03..0716c252a40 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -48,6 +48,36 @@ resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3" integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g== +"@xterm/addon-canvas@0.6.0-beta.3": + version "0.6.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.3.tgz#8edc590eb6173079fa43eb536377b2f8897cca4a" + integrity sha512-iZWtIRU2jaarLGLNhH4z+szObkERN3IEZ90zgAykEBIkxkuTJkq/8UvNaBBsXlrfutr/dlbKeZFEI3H3zSjp2Q== + +"@xterm/addon-image@0.7.0-beta.1": + version "0.7.0-beta.1" + resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.1.tgz#8d1df39db103442d18e61d05f1665f49ac7f19a9" + integrity sha512-c+wB+ODtKgWaQHvw1442R63Ivu10cYjelOYob1J6r5VKFD9DQCofyiMC9BLJsS7kJMmg9A7KWtUCTwvcbR3HQg== + +"@xterm/addon-search@0.14.0-beta.3": + version "0.14.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.3.tgz#caf4b928888d83511e227efde678473ed403d955" + integrity sha512-rl0riCMmP9vSkbeNucNVXlK72K9yT+iabpbeTiCydGBimI2ylhNffuUzNPru/jJZl52PSw3AejkhB98/JWfE8A== + +"@xterm/addon-unicode11@0.7.0-beta.3": + version "0.7.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.3.tgz#092a3c685307d3c0135404f15e8b2e32495f2d86" + integrity sha512-ex2Xf94pXhGTvK7VBp57FRl8gP/aQiFMRddPnwDykQb0qwx/ZAfm+oIByrbGWXm0DZFZUCvmXke2Xk7kMojBEw== + +"@xterm/addon-webgl@0.17.0-beta.3": + version "0.17.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.3.tgz#947641632142439d1a8fabcf2850cf3aa6dad0ac" + integrity sha512-RCmBVYgZNNUbMSUT5rQZbV8AnNP1IyGeBZh6D4u4qpVSapQN6OlX72raXx7qyy1aoD9dRbE0YhOOHTz8o/wnuA== + +"@xterm/xterm@5.4.0-beta.3": + version "5.4.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.3.tgz#ea91a83cf3d532beabe7420f4e4842fc294efce5" + integrity sha512-fj88EsJGLkvK+/IMb1V1irjYRrOBVDM31RK+zKTmqqhFAQih/Zkw7ZRBRm+gfpOfcnIrqA/BNt1l+ZnpDUsVzA== + jschardet@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-3.0.0.tgz#898d2332e45ebabbdb6bf2feece9feea9a99e882" @@ -67,33 +97,3 @@ vscode-textmate@9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c" integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg== - -xterm-addon-canvas@0.6.0-beta.37: - version "0.6.0-beta.37" - resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.6.0-beta.37.tgz#4f7692fc87f3500a5a6e7f822ec74796e6a36db2" - integrity sha512-eFN7iPxqiQosUO+rbXKwPz/AR3TLJcLCVWjvT5EaewqNpw+E9rWVwRRPGqYSw+qkSKM/vcNlySIkq4hmpA/ohg== - -xterm-addon-image@0.6.0-beta.21: - version "0.6.0-beta.21" - resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.6.0-beta.21.tgz#e3708bc504c56a23ff31f12a2eeb335331a92aac" - integrity sha512-8/PTaXVPa4kQ0xzVeuZZk10OpbZBj2cgfwhM2B0ChSPvwrk0lX+ksnXdtDKH3tg+JYvo7fIhNXtkr4NwWt7VJQ== - -xterm-addon-search@0.14.0-beta.36: - version "0.14.0-beta.36" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.14.0-beta.36.tgz#4bb161130c39090d506f73468ef65054aedcb9f0" - integrity sha512-2ydZV1Nt8d0vOjZ/y2RXiw3QLgabK+PCA7yETqZNivnmhSfcxtYPyI4aRfG/lc3hoMKiPppSSjJF0MlV/qo8ww== - -xterm-addon-unicode11@0.7.0-beta.36: - version "0.7.0-beta.36" - resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.7.0-beta.36.tgz#bde0b8c98211b74b0288cd5bad09107384b870ca" - integrity sha512-vV/f7dTP/46JjoJLYDCxolCWPoUn0cF7S5upYvY0ZA1VLQ9UnXmaNjzrg+9f+QBoXEQ2eQDLQcRFWOc6BAbF+A== - -xterm-addon-webgl@0.17.0-beta.36: - version "0.17.0-beta.36" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.17.0-beta.36.tgz#6ed16a83cd4bed3cbddd631e7974375aa8f7e023" - integrity sha512-5PNQZcNH2UTaqSf7Exgh/fvsNeTOs+CSEuIaTafzKuMIrWH14+cRdyJdzyo8OKTNzhJOjwWDOTQTD/sur4lrLg== - -xterm@5.4.0-beta.37: - version "5.4.0-beta.37" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.4.0-beta.37.tgz#bae127be8c939f096232d9858e77a457d6b77ddf" - integrity sha512-ys+mXqLFrJc7khmYN/MgBnfLv38NgXfkwkEXsCZKHGqn3h2xUBvTvsrSEWO3NQeDPLj4zMr1RwqTblMK9St3BA== diff --git a/remote/yarn.lock b/remote/yarn.lock index d4ffc6f9d28..5662240d504 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -113,6 +113,46 @@ resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9" integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw== +"@xterm/addon-canvas@0.6.0-beta.3": + version "0.6.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.3.tgz#8edc590eb6173079fa43eb536377b2f8897cca4a" + integrity sha512-iZWtIRU2jaarLGLNhH4z+szObkERN3IEZ90zgAykEBIkxkuTJkq/8UvNaBBsXlrfutr/dlbKeZFEI3H3zSjp2Q== + +"@xterm/addon-image@0.7.0-beta.1": + version "0.7.0-beta.1" + resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.1.tgz#8d1df39db103442d18e61d05f1665f49ac7f19a9" + integrity sha512-c+wB+ODtKgWaQHvw1442R63Ivu10cYjelOYob1J6r5VKFD9DQCofyiMC9BLJsS7kJMmg9A7KWtUCTwvcbR3HQg== + +"@xterm/addon-search@0.14.0-beta.3": + version "0.14.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.3.tgz#caf4b928888d83511e227efde678473ed403d955" + integrity sha512-rl0riCMmP9vSkbeNucNVXlK72K9yT+iabpbeTiCydGBimI2ylhNffuUzNPru/jJZl52PSw3AejkhB98/JWfE8A== + +"@xterm/addon-serialize@0.12.0-beta.3": + version "0.12.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.3.tgz#cf3402b8d9ab4ab4291a628f81005a5984976d34" + integrity sha512-Vin62EC2FZdlvQnvGBqE4rHwchKMasJqg7C7CFrqvpLwBekPg2tYN5SjyiMtjfN3G95wj0qhqil0hxUVG3JmWw== + +"@xterm/addon-unicode11@0.7.0-beta.3": + version "0.7.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.3.tgz#092a3c685307d3c0135404f15e8b2e32495f2d86" + integrity sha512-ex2Xf94pXhGTvK7VBp57FRl8gP/aQiFMRddPnwDykQb0qwx/ZAfm+oIByrbGWXm0DZFZUCvmXke2Xk7kMojBEw== + +"@xterm/addon-webgl@0.17.0-beta.3": + version "0.17.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.3.tgz#947641632142439d1a8fabcf2850cf3aa6dad0ac" + integrity sha512-RCmBVYgZNNUbMSUT5rQZbV8AnNP1IyGeBZh6D4u4qpVSapQN6OlX72raXx7qyy1aoD9dRbE0YhOOHTz8o/wnuA== + +"@xterm/headless@5.4.0-beta.3": + version "5.4.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.4.0-beta.3.tgz#9fe1920b6eba59066469735bacfbd6d840cadc20" + integrity sha512-LfRIURZRpyECQPTfw6PH581ibt6Vt4o/cG7DykfgxRITknFO69yu6DrmTXJy1uTLXkGcXmujn1fCoodjk9z9UA== + +"@xterm/xterm@5.4.0-beta.3": + version "5.4.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.3.tgz#ea91a83cf3d532beabe7420f4e4842fc294efce5" + integrity sha512-fj88EsJGLkvK+/IMb1V1irjYRrOBVDM31RK+zKTmqqhFAQih/Zkw7ZRBRm+gfpOfcnIrqA/BNt1l+ZnpDUsVzA== + agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434" @@ -589,46 +629,6 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -xterm-addon-canvas@0.6.0-beta.37: - version "0.6.0-beta.37" - resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.6.0-beta.37.tgz#4f7692fc87f3500a5a6e7f822ec74796e6a36db2" - integrity sha512-eFN7iPxqiQosUO+rbXKwPz/AR3TLJcLCVWjvT5EaewqNpw+E9rWVwRRPGqYSw+qkSKM/vcNlySIkq4hmpA/ohg== - -xterm-addon-image@0.6.0-beta.21: - version "0.6.0-beta.21" - resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.6.0-beta.21.tgz#e3708bc504c56a23ff31f12a2eeb335331a92aac" - integrity sha512-8/PTaXVPa4kQ0xzVeuZZk10OpbZBj2cgfwhM2B0ChSPvwrk0lX+ksnXdtDKH3tg+JYvo7fIhNXtkr4NwWt7VJQ== - -xterm-addon-search@0.14.0-beta.36: - version "0.14.0-beta.36" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.14.0-beta.36.tgz#4bb161130c39090d506f73468ef65054aedcb9f0" - integrity sha512-2ydZV1Nt8d0vOjZ/y2RXiw3QLgabK+PCA7yETqZNivnmhSfcxtYPyI4aRfG/lc3hoMKiPppSSjJF0MlV/qo8ww== - -xterm-addon-serialize@0.12.0-beta.36: - version "0.12.0-beta.36" - resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.12.0-beta.36.tgz#8e74159317e2c1e5f2724fd92b85df2b87d2c9c9" - integrity sha512-J2mr3Wuxzvxke14IpfJBhwCHlWoB428FE06tOfbGi5lCBm0AnO2cIyRymvgVZG4QVXVxzzWroE8wP/WQQVe45w== - -xterm-addon-unicode11@0.7.0-beta.36: - version "0.7.0-beta.36" - resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.7.0-beta.36.tgz#bde0b8c98211b74b0288cd5bad09107384b870ca" - integrity sha512-vV/f7dTP/46JjoJLYDCxolCWPoUn0cF7S5upYvY0ZA1VLQ9UnXmaNjzrg+9f+QBoXEQ2eQDLQcRFWOc6BAbF+A== - -xterm-addon-webgl@0.17.0-beta.36: - version "0.17.0-beta.36" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.17.0-beta.36.tgz#6ed16a83cd4bed3cbddd631e7974375aa8f7e023" - integrity sha512-5PNQZcNH2UTaqSf7Exgh/fvsNeTOs+CSEuIaTafzKuMIrWH14+cRdyJdzyo8OKTNzhJOjwWDOTQTD/sur4lrLg== - -xterm-headless@5.4.0-beta.37: - version "5.4.0-beta.37" - resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.4.0-beta.37.tgz#1e89dfa7e667a5951974a9e9b5e1b0875198ca65" - integrity sha512-iP28Z419p7anaNetLhmPOpt/DUdeA45jVLqoTn8bRpwFj8kM/gI76tUO9y/TyMfv79yWwPv2MrkALfS6ZyTi7g== - -xterm@5.4.0-beta.37: - version "5.4.0-beta.37" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.4.0-beta.37.tgz#bae127be8c939f096232d9858e77a457d6b77ddf" - integrity sha512-ys+mXqLFrJc7khmYN/MgBnfLv38NgXfkwkEXsCZKHGqn3h2xUBvTvsrSEWO3NQeDPLj4zMr1RwqTblMK9St3BA== - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" diff --git a/scripts/update-xterm.js b/scripts/update-xterm.js index e74fb45f590..01833fbb959 100644 --- a/scripts/update-xterm.js +++ b/scripts/update-xterm.js @@ -7,17 +7,17 @@ const cp = require('child_process'); const path = require('path'); const moduleNames = [ - 'xterm', - 'xterm-addon-canvas', - 'xterm-addon-image', - 'xterm-addon-search', - 'xterm-addon-unicode11', - 'xterm-addon-webgl' + '@xterm/xterm', + '@xterm/addon-canvas', + '@xterm/addon-image', + '@xterm/addon-search', + '@xterm/addon-unicode11', + '@xterm/addon-webgl', ]; const backendOnlyModuleNames = [ - 'xterm-headless', - 'xterm-addon-serialize' + '@xterm/headless', + '@xterm/addon-serialize' ]; const vscodeDir = process.argv.length >= 3 ? process.argv[2] : process.cwd(); @@ -33,15 +33,9 @@ function getLatestModuleVersion(moduleName) { reject(err); } let versions = JSON.parse(stdout); - // HACK: Some bad versions were published as v5 which cannot be unpublished, ignore these - if (moduleName === 'xterm-addon-canvas') { - versions = versions.filter(e => ![ - '0.12.0', - '5.0.0-beta.1', - '5.0.0-beta.2', - '5.0.0-beta.3', - '5.0.0-beta.4', - ].includes(e)); + // Fix format if there is only a single version published + if (typeof versions === 'string') { + versions = [versions]; } resolve(versions[versions.length - 1]); }); diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js index 66da7fb0e41..cbbee6c6226 100644 --- a/src/bootstrap-window.js +++ b/src/bootstrap-window.js @@ -112,13 +112,13 @@ 'vscode-textmate': `${baseNodeModulesPath}/vscode-textmate/release/main.js`, 'vscode-oniguruma': `${baseNodeModulesPath}/vscode-oniguruma/release/main.js`, 'vsda': `${baseNodeModulesPath}/vsda/index.js`, - 'xterm': `${baseNodeModulesPath}/xterm/lib/xterm.js`, - 'xterm-addon-canvas': `${baseNodeModulesPath}/xterm-addon-canvas/lib/xterm-addon-canvas.js`, - 'xterm-addon-image': `${baseNodeModulesPath}/xterm-addon-image/lib/xterm-addon-image.js`, - 'xterm-addon-search': `${baseNodeModulesPath}/xterm-addon-search/lib/xterm-addon-search.js`, - 'xterm-addon-serialize': `${baseNodeModulesPath}/xterm-addon-serialize/lib/xterm-addon-serialize.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`, + '@xterm/xterm': `${baseNodeModulesPath}/@xterm/xterm/lib/xterm.js`, + '@xterm/addon-canvas': `${baseNodeModulesPath}/@xterm/addon-canvas/lib/addon-canvas.js`, + '@xterm/addon-image': `${baseNodeModulesPath}/@xterm/addon-image/lib/addon-image.js`, + '@xterm/addon-search': `${baseNodeModulesPath}/@xterm/addon-search/lib/addon-search.js`, + '@xterm/addon-serialize': `${baseNodeModulesPath}/@xterm/addon-serialize/lib/addon-serialize.js`, + '@xterm/addon-unicode11': `${baseNodeModulesPath}/@xterm/addon-unicode11/lib/addon-unicode11.js`, + '@xterm/addon-webgl': `${baseNodeModulesPath}/@xterm/addon-webgl/lib/addon-webgl.js`, '@vscode/iconv-lite-umd': `${baseNodeModulesPath}/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js`, 'jschardet': `${baseNodeModulesPath}/jschardet/dist/jschardet.min.js`, '@vscode/vscode-languagedetection': `${baseNodeModulesPath}/@vscode/vscode-languagedetection/dist/lib/index.js`, diff --git a/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts b/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts index 9759eeb3c59..64399227a90 100644 --- a/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts +++ b/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.ts @@ -8,7 +8,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { IBufferMarkCapability, TerminalCapability, IMarkProperties } from 'vs/platform/terminal/common/capabilities/capabilities'; // Importing types is safe in any layer // eslint-disable-next-line local/code-import-patterns -import type { IMarker, Terminal } from 'xterm-headless'; +import type { IMarker, Terminal } from '@xterm/headless'; /** * Manages "marks" in the buffer which are lines that are tracked when lines are added to or removed diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts index 71231274d90..b8448c26f69 100644 --- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts +++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts @@ -13,7 +13,7 @@ import { ITerminalOutputMatch, ITerminalOutputMatcher } from 'vs/platform/termin // Importing types is safe in any layer // eslint-disable-next-line local/code-import-patterns -import type { IBuffer, IBufferLine, IDisposable, IMarker, Terminal } from 'xterm-headless'; +import type { IBuffer, IBufferLine, IDisposable, IMarker, Terminal } from '@xterm/headless'; export interface ICurrentPartialCommand { previousCommandMarker?: IMarker; diff --git a/src/vs/platform/terminal/common/capabilities/partialCommandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/partialCommandDetectionCapability.ts index 2b8f7cd0350..07e2ad6b20f 100644 --- a/src/vs/platform/terminal/common/capabilities/partialCommandDetectionCapability.ts +++ b/src/vs/platform/terminal/common/capabilities/partialCommandDetectionCapability.ts @@ -8,7 +8,7 @@ import { DisposableStore } from 'vs/base/common/lifecycle'; import { IPartialCommandDetectionCapability, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; // Importing types is safe in any layer // eslint-disable-next-line local/code-import-patterns -import type { IMarker, Terminal } from 'xterm-headless'; +import type { IMarker, Terminal } from '@xterm/headless'; const enum Constants { /** diff --git a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts index fb070c971d3..5f5dc956aa5 100644 --- a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts +++ b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts @@ -18,7 +18,7 @@ import { Emitter } from 'vs/base/common/event'; import { BufferMarkCapability } from 'vs/platform/terminal/common/capabilities/bufferMarkCapability'; // Importing types is safe in any layer // eslint-disable-next-line local/code-import-patterns -import type { ITerminalAddon, Terminal } from 'xterm-headless'; +import type { ITerminalAddon, Terminal } from '@xterm/headless'; import { URI } from 'vs/base/common/uri'; import { sanitizeCwd } from 'vs/platform/terminal/common/terminalEnvironment'; diff --git a/src/vs/platform/terminal/node/ptyService.ts b/src/vs/platform/terminal/node/ptyService.ts index 31977e91c8c..ec8182b3c1d 100644 --- a/src/vs/platform/terminal/node/ptyService.ts +++ b/src/vs/platform/terminal/node/ptyService.ts @@ -15,9 +15,9 @@ import { RequestStore } from 'vs/platform/terminal/common/requestStore'; import { IProcessDataEvent, IProcessReadyEvent, IPtyService, IRawTerminalInstanceLayoutInfo, IReconnectConstants, IShellLaunchConfig, ITerminalInstanceLayoutInfoById, ITerminalLaunchError, ITerminalsLayoutInfo, ITerminalTabLayoutInfoById, TerminalIcon, IProcessProperty, TitleEventSource, ProcessPropertyType, IProcessPropertyMap, IFixedTerminalDimensions, IPersistentTerminalProcessLaunchConfig, ICrossVersionSerializedTerminalState, ISerializedTerminalState, ITerminalProcessOptions, IPtyHostLatencyMeasurement } from 'vs/platform/terminal/common/terminal'; import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBuffering'; import { escapeNonWindowsPath } from 'vs/platform/terminal/common/terminalEnvironment'; -import { Terminal as XtermTerminal } from 'xterm-headless'; -import type { ISerializeOptions, SerializeAddon as XtermSerializeAddon } from 'xterm-addon-serialize'; -import type { Unicode11Addon as XtermUnicode11Addon } from 'xterm-addon-unicode11'; +import { Terminal as XtermTerminal } from '@xterm/headless'; +import type { ISerializeOptions, SerializeAddon as XtermSerializeAddon } from '@xterm/addon-serialize'; +import type { Unicode11Addon as XtermUnicode11Addon } from '@xterm/addon-unicode11'; import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs, ITerminalTabLayoutInfoDto } from 'vs/platform/terminal/common/terminalProcess'; import { getWindowsBuildNumber } from 'vs/platform/terminal/node/terminalEnvironment'; import { TerminalProcess } from 'vs/platform/terminal/node/terminalProcess'; @@ -1065,14 +1065,14 @@ class XtermSerializer implements ITerminalSerializer { async _getUnicode11Constructor(): Promise { if (!Unicode11Addon) { - Unicode11Addon = (await import('xterm-addon-unicode11')).Unicode11Addon; + Unicode11Addon = (await import('@xterm/addon-unicode11')).Unicode11Addon; } return Unicode11Addon; } async _getSerializeConstructor(): Promise { if (!SerializeAddon) { - SerializeAddon = (await import('xterm-addon-serialize')).SerializeAddon; + SerializeAddon = (await import('@xterm/addon-serialize')).SerializeAddon; } return SerializeAddon; } diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts index ea1b9088874..ce5c9213f6f 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts @@ -25,7 +25,7 @@ import { XtermTerminal } from 'vs/workbench/contrib/terminal/browser/xterm/xterm import { IRegisterContributedProfileArgs, IRemoteTerminalAttachTarget, IStartExtensionTerminalRequest, ITerminalConfigHelper, ITerminalFont, ITerminalProcessExtHostProxy, ITerminalProcessInfo } from 'vs/workbench/contrib/terminal/common/terminal'; import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn'; import { ISimpleSelectedSuggestion } from 'vs/workbench/services/suggest/browser/simpleSuggestWidget'; -import type { IMarker, Terminal as RawXtermTerminal } from 'xterm'; +import type { IMarker, Terminal as RawXtermTerminal } from '@xterm/xterm'; export const ITerminalService = createDecorator('terminalService'); export const ITerminalEditorService = createDecorator('terminalEditorService'); diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts index 1b001ae9433..4345fac23a4 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -85,7 +85,7 @@ import { IPathService } from 'vs/workbench/services/path/common/pathService'; import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences'; import { importAMDNodeModule } from 'vs/amdX'; import { ISimpleSelectedSuggestion } from 'vs/workbench/services/suggest/browser/simpleSuggestWidget'; -import type { IMarker, Terminal as XTermTerminal } from 'xterm'; +import type { IMarker, Terminal as XTermTerminal } from '@xterm/xterm'; import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands'; import { terminalStrings } from 'vs/workbench/contrib/terminal/common/terminalStrings'; @@ -693,7 +693,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { return xtermConstructor; } xtermConstructor = Promises.withAsyncBody(async (resolve) => { - const Terminal = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const Terminal = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; // Localize strings Terminal.strings.promptLabel = nls.localize('terminal.integrated.a11yPromptLabel', 'Terminal input'); Terminal.strings.tooMuchOutput = keybinding ? nls.localize('terminal.integrated.useAccessibleBuffer', 'Use the accessible buffer {0} to manually review output', keybinding.getLabel()) : nls.localize('terminal.integrated.useAccessibleBufferNoKb', 'Use the Terminal: Focus Accessible Buffer command to manually review output'); diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTestHelpers.ts b/src/vs/workbench/contrib/terminal/browser/terminalTestHelpers.ts index 0a63552827c..c0fb9b5e0e4 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalTestHelpers.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalTestHelpers.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { timeout } from 'vs/base/common/async'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; export async function writeP(terminal: Terminal, data: string): Promise { return new Promise((resolve, reject) => { diff --git a/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts b/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts index e20464d5764..f6be9eefb63 100644 --- a/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts +++ b/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts @@ -8,7 +8,7 @@ import { IMarkdownString } from 'vs/base/common/htmlContent'; import { Widget } from 'vs/base/browser/ui/widget'; import { ITerminalWidget } from 'vs/workbench/contrib/terminal/browser/widgets/widgets'; import * as dom from 'vs/base/browser/dom'; -import type { IViewportRange } from 'xterm'; +import type { IViewportRange } from '@xterm/xterm'; import { IHoverTarget, IHoverService, IHoverAction } from 'vs/workbench/services/hover/browser/hover'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { TerminalSettingId } from 'vs/platform/terminal/common/terminal'; diff --git a/src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts b/src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts index 77592d9e033..f4c3723ad90 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts @@ -5,7 +5,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { IBufferCell } from 'xterm'; +import { IBufferCell } from '@xterm/xterm'; export type XtermAttributes = Omit & { clone?(): XtermAttributes }; diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts index e002c245d97..b07fcceed90 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts @@ -25,7 +25,7 @@ import { terminalDecorationError, terminalDecorationIncomplete, terminalDecorati import { DecorationSelector, TerminalDecorationHoverManager, updateLayout } from 'vs/workbench/contrib/terminal/browser/xterm/decorationStyles'; import { TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry'; import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle'; -import type { IDecoration, ITerminalAddon, Terminal } from 'xterm'; +import type { IDecoration, ITerminalAddon, Terminal } from '@xterm/xterm'; interface IDisposableDecoration { decoration: IDecoration; disposables: IDisposable[]; exitCode?: number; markProperties?: IMarkProperties } diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts index 01966b54a01..5512d15c6fb 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.ts @@ -6,7 +6,7 @@ import { Emitter } from 'vs/base/common/event'; import { Disposable, toDisposable } from 'vs/base/common/lifecycle'; import { OperatingSystem } from 'vs/base/common/platform'; -import type { Terminal as XTermTerminal, IBuffer, ITerminalAddon } from 'xterm'; +import type { Terminal as XTermTerminal, IBuffer, ITerminalAddon } from '@xterm/xterm'; /** * Provides extensions to the xterm object in a modular, testable way. diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts index 7d558ffb0da..3ec8a0f746f 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.ts @@ -7,7 +7,7 @@ import { coalesce } from 'vs/base/common/arrays'; import { Disposable, dispose } from 'vs/base/common/lifecycle'; import { IMarkTracker } from 'vs/workbench/contrib/terminal/browser/terminal'; import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; -import type { Terminal, IMarker, ITerminalAddon, IDecoration } from 'xterm'; +import type { Terminal, IMarker, ITerminalAddon, IDecoration } from '@xterm/xterm'; import { timeout } from 'vs/base/common/async'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry'; diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/suggestAddon.ts b/src/vs/workbench/contrib/terminal/browser/xterm/suggestAddon.ts index 7ff72cf1c5a..f13eb6f883e 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/suggestAddon.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/suggestAddon.ts @@ -19,7 +19,7 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag import { activeContrastBorder } from 'vs/platform/theme/common/colorRegistry'; import { ISuggestController } from 'vs/workbench/contrib/terminal/browser/terminal'; import { TerminalStorageKeys } from 'vs/workbench/contrib/terminal/common/terminalStorageKeys'; -import type { ITerminalAddon, Terminal } from 'xterm'; +import type { ITerminalAddon, Terminal } from '@xterm/xterm'; import { getListStyles } from 'vs/platform/theme/browser/defaultStyles'; const enum ShellIntegrationOscPs { diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts index e23f711f611..4963c4f95b6 100644 --- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts @@ -3,13 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { IBuffer, ITerminalOptions, ITheme, Terminal as RawXtermTerminal, LogLevel as XtermLogLevel } from 'xterm'; -import type { CanvasAddon as CanvasAddonType } from 'xterm-addon-canvas'; -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'; -import type { SerializeAddon as SerializeAddonType } from 'xterm-addon-serialize'; -import type { ImageAddon as ImageAddonType } from 'xterm-addon-image'; +import type { IBuffer, ITerminalOptions, ITheme, Terminal as RawXtermTerminal, LogLevel as XtermLogLevel } from '@xterm/xterm'; +import type { CanvasAddon as CanvasAddonType } from '@xterm/addon-canvas'; +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'; +import type { SerializeAddon as SerializeAddonType } from '@xterm/addon-serialize'; +import type { ImageAddon as ImageAddonType } from '@xterm/addon-image'; import * as dom from 'vs/base/browser/dom'; import { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private'; import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration'; @@ -765,7 +765,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach protected async _getCanvasAddonConstructor(): Promise { if (!CanvasAddon) { - CanvasAddon = (await importAMDNodeModule('xterm-addon-canvas', 'lib/xterm-addon-canvas.js')).CanvasAddon; + CanvasAddon = (await importAMDNodeModule('@xterm/addon-canvas', 'lib/xterm-addon-canvas.js')).CanvasAddon; } return CanvasAddon; } @@ -791,35 +791,35 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach protected async _getImageAddonConstructor(): Promise { if (!ImageAddon) { - ImageAddon = (await importAMDNodeModule('xterm-addon-image', 'lib/xterm-addon-image.js')).ImageAddon; + ImageAddon = (await importAMDNodeModule('@xterm/addon-image', 'lib/addon-image.js')).ImageAddon; } return ImageAddon; } protected async _getSearchAddonConstructor(): Promise { if (!SearchAddon) { - SearchAddon = (await importAMDNodeModule('xterm-addon-search', 'lib/xterm-addon-search.js')).SearchAddon; + SearchAddon = (await importAMDNodeModule('@xterm/addon-search', 'lib/addon-search.js')).SearchAddon; } return SearchAddon; } protected async _getUnicode11Constructor(): Promise { if (!Unicode11Addon) { - Unicode11Addon = (await importAMDNodeModule('xterm-addon-unicode11', 'lib/xterm-addon-unicode11.js')).Unicode11Addon; + Unicode11Addon = (await importAMDNodeModule('@xterm/addon-unicode11', 'lib/addon-unicode11.js')).Unicode11Addon; } return Unicode11Addon; } protected async _getWebglAddonConstructor(): Promise { if (!WebglAddon) { - WebglAddon = (await importAMDNodeModule('xterm-addon-webgl', 'lib/xterm-addon-webgl.js')).WebglAddon; + WebglAddon = (await importAMDNodeModule('@xterm/addon-webgl', 'lib/addon-webgl.js')).WebglAddon; } return WebglAddon; } protected async _getSerializeAddonConstructor(): Promise { if (!SerializeAddon) { - SerializeAddon = (await importAMDNodeModule('xterm-addon-serialize', 'lib/xterm-addon-serialize.js')).SerializeAddon; + SerializeAddon = (await importAMDNodeModule('@xterm/addon-serialize', 'lib/addon-serialize.js')).SerializeAddon; } return SerializeAddon; } diff --git a/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts b/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts index e5f357d7780..778cb44e2b2 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/capabilities/commandDetectionCapability.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { deepStrictEqual, ok } from 'assert'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability'; import { NullLogService } from 'vs/platform/log/common/log'; import { ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities'; @@ -62,7 +62,7 @@ suite('CommandDetectionCapability', () => { setup(async () => { disposables = new DisposableStore(); - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = new TerminalCtor({ allowProposedApi: true, cols: 80 }); instantiationService = disposables.add(new TestInstantiationService()); diff --git a/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts b/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts index 26bb55f5654..e37020815fd 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/capabilities/partialCommandDetectionCapability.test.ts @@ -5,7 +5,7 @@ import { deepStrictEqual } from 'assert'; import { PartialCommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/partialCommandDetectionCapability'; -import type { IMarker, Terminal } from 'xterm'; +import type { IMarker, Terminal } from '@xterm/xterm'; import { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private'; import { importAMDNodeModule } from 'vs/amdX'; import { writeP } from 'vs/workbench/contrib/terminal/browser/terminalTestHelpers'; @@ -26,7 +26,7 @@ suite('PartialCommandDetectionCapability', () => { } setup(async () => { - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = new TerminalCtor({ allowProposedApi: true, cols: 80 }) as TestTerminal; capability = new PartialCommandDetectionCapability(xterm); diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts index bfbfebf1d3d..89ca8e8e427 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/decorationAddon.test.ts @@ -10,7 +10,7 @@ import { ILogService, NullLogService } from 'vs/platform/log/common/log'; import { DecorationAddon } from 'vs/workbench/contrib/terminal/browser/xterm/decorationAddon'; import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; -import type { IDecoration, IDecorationOptions, Terminal as RawXtermTerminal } from 'xterm'; +import type { IDecoration, IDecorationOptions, Terminal as RawXtermTerminal } from '@xterm/xterm'; import { ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; import { CommandDetectionCapability } from 'vs/platform/terminal/common/capabilities/commandDetectionCapability'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; @@ -28,7 +28,7 @@ suite('DecorationAddon', () => { let instantiationService: TestInstantiationService; setup(async () => { - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; class TestTerminal extends TerminalCtor { override registerDecoration(decorationOptions: IDecorationOptions): IDecoration | undefined { if (decorationOptions.marker.isDisposed) { diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts index e7099524039..f3b39ba1c16 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/lineDataEventAddon.test.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; import { LineDataEventAddon } from 'vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon'; import { OperatingSystem } from 'vs/base/common/platform'; import { deepStrictEqual } from 'assert'; @@ -25,7 +25,7 @@ suite('LineDataEventAddon', () => { let events: string[]; setup(async () => { - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 4 })); lineDataEventAddon = store.add(new LineDataEventAddon()); xterm.loadAddon(lineDataEventAddon); diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts index 1fcf433b59c..09f2a1bbdc4 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/shellIntegrationAddon.test.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; import { strictEqual, deepStrictEqual, deepEqual } from 'assert'; import * as sinon from 'sinon'; import { parseKeyValueAssignment, parseMarkSequence, deserializeMessage, ShellIntegrationAddon } from 'vs/platform/terminal/common/xterm/shellIntegrationAddon'; @@ -38,7 +38,7 @@ suite('ShellIntegrationAddon', () => { let capabilities: ITerminalCapabilityStore; setup(async () => { - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 })); shellIntegrationAddon = store.add(new TestShellIntegrationAddon('', true, undefined, new NullLogService())); xterm.loadAddon(shellIntegrationAddon); diff --git a/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts b/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts index 39f866b559c..dac3edf612b 100644 --- a/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts +++ b/src/vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { IEvent, Terminal } from 'xterm'; +import type { IEvent, Terminal } from '@xterm/xterm'; import { XtermTerminal } from 'vs/workbench/contrib/terminal/browser/xterm/xtermTerminal'; import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/terminalConfigHelper'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; @@ -18,7 +18,7 @@ import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { Emitter } from 'vs/base/common/event'; import { TERMINAL_BACKGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR, TERMINAL_SELECTION_FOREGROUND_COLOR, TERMINAL_INACTIVE_SELECTION_BACKGROUND_COLOR } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry'; import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme'; -import type { WebglAddon } from 'xterm-addon-webgl'; +import type { WebglAddon } from '@xterm/addon-webgl'; import { NullLogService } from 'vs/platform/log/common/log'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices'; @@ -129,7 +129,7 @@ suite('XtermTerminal', () => { instantiationService.stub(ILayoutService, new TestLayoutService()); configHelper = store.add(instantiationService.createInstance(TerminalConfigHelper)); - XTermBaseCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + XTermBaseCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; const capabilityStore = store.add(new TerminalCapabilityStore()); xterm = store.add(instantiationService.createInstance(TestXtermTerminal, XTermBaseCtor, configHelper, 80, 30, { getBackgroundColor: () => undefined }, capabilityStore, '', new MockContextKeyService().createKey('', true)!, true)); diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker.ts index 14678778467..963b0c9d9f5 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker.ts @@ -7,7 +7,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ITerminalLogService, TerminalSettingId } from 'vs/platform/terminal/common/terminal'; import { IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal'; -import type { IMarker, Terminal } from 'xterm'; +import type { IMarker, Terminal } from '@xterm/xterm'; export class BufferContentTracker extends Disposable { /** diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts index 7847e7b1087..73e394e4e4a 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts @@ -25,7 +25,7 @@ import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/termin import { BufferContentTracker } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/bufferContentTracker'; import { TerminalAccessibilityHelpProvider } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibilityHelp'; import { TextAreaSyncAddon } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; import { Position } from 'vs/editor/common/core/position'; import { ICommandWithEditorLine, TerminalAccessibleBufferProvider } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibilityHelp.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibilityHelp.ts index 61f0d1355ca..46cabae5ac1 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibilityHelp.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibilityHelp.ts @@ -17,7 +17,7 @@ import { AccessibleViewType, IAccessibleContentProvider, IAccessibleViewOptions import { AccessibilityCommandId } from 'vs/workbench/contrib/accessibility/common/accessibilityCommands'; import { ITerminalInstance, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal'; import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; export const enum ClassName { Active = 'active', diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts index 28929a64036..a2c3bf0eb15 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts @@ -7,7 +7,7 @@ import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/l import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility'; import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; import { ITerminalLogService, TerminalSettingId } from 'vs/platform/terminal/common/terminal'; -import type { Terminal, ITerminalAddon } from 'xterm'; +import type { Terminal, ITerminalAddon } from '@xterm/xterm'; import { debounce } from 'vs/base/common/decorators'; import { addDisposableListener } from 'vs/base/browser/dom'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts index 938c7b30498..4e7d8885cf4 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts @@ -31,7 +31,7 @@ import { BufferContentTracker } from 'vs/workbench/contrib/terminalContrib/acces import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle'; import { TestLayoutService, TestLifecycleService } from 'vs/workbench/test/browser/workbenchTestServices'; import { TestLoggerService } from 'vs/workbench/test/common/workbenchTestServices'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; const defaultTerminalConfig: Partial = { fontFamily: 'monospace', @@ -75,7 +75,7 @@ suite('Buffer Content Tracker', () => { if (!isWindows) { capabilities.add(TerminalCapability.NaiveCwdDetection, null!); } - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = store.add(instantiationService.createInstance(XtermTerminal, TerminalCtor, configHelper, 80, 30, { getBackgroundColor: () => undefined }, capabilities, '', new MockContextKeyService().createKey('', true)!, true)); const container = document.createElement('div'); xterm.raw.open(container); diff --git a/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts b/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts index 58699fc7b6d..679001437ce 100644 --- a/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts @@ -21,7 +21,7 @@ import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/brow import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager'; import { ITerminalProcessManager, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal'; import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; registerTerminalAction({ id: TerminalCommandId.ShowTextureAtlas, diff --git a/src/vs/workbench/contrib/terminalContrib/find/browser/terminal.find.contribution.ts b/src/vs/workbench/contrib/terminalContrib/find/browser/terminal.find.contribution.ts index 4de27fd31f5..83404f7cb1e 100644 --- a/src/vs/workbench/contrib/terminalContrib/find/browser/terminal.find.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/find/browser/terminal.find.contribution.ts @@ -19,7 +19,7 @@ import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/wid import { ITerminalProcessManager, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal'; import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey'; import { TerminalFindWidget } from 'vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget'; -import type { Terminal as RawXtermTerminal } from 'xterm'; +import type { Terminal as RawXtermTerminal } from '@xterm/xterm'; class TerminalFindContribution extends Disposable implements ITerminalContribution { static readonly ID = 'terminal.find'; diff --git a/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts b/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts index efb9b621568..dbdc049730b 100644 --- a/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts +++ b/src/vs/workbench/contrib/terminalContrib/find/browser/terminalFindWidget.ts @@ -12,7 +12,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { Event } from 'vs/base/common/event'; -import type { ISearchOptions } from 'xterm-addon-search'; +import type { ISearchOptions } from '@xterm/addon-search'; import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal'; const TERMINAL_FIND_WIDGET_INITIAL_WIDTH = 419; diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/links.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/links.ts index e7669035553..37ba3865fba 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/links.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/links.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { IBufferLine, IBufferRange, Terminal } from 'xterm'; +import type { IBufferLine, IBufferRange, Terminal } from '@xterm/xterm'; import { URI } from 'vs/base/common/uri'; import { IHoverAction } from 'vs/workbench/services/hover/browser/hover'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminal.links.contribution.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminal.links.contribution.ts index 51bd07850d8..f2135689592 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminal.links.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminal.links.contribution.ts @@ -23,7 +23,7 @@ import { IDetectedLinks, TerminalLinkManager } from 'vs/workbench/contrib/termin import { TerminalLinkProviderService } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkProviderService'; import { TerminalLinkQuickpick } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick'; import { TerminalLinkResolver } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver'; -import type { Terminal as RawXtermTerminal } from 'xterm'; +import type { Terminal as RawXtermTerminal } from '@xterm/xterm'; registerSingleton(ITerminalLinkProviderService, TerminalLinkProviderService, InstantiationType.Delayed); diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalExternalLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalExternalLinkDetector.ts index 4a25c52530d..328f8543e65 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalExternalLinkDetector.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalExternalLinkDetector.ts @@ -6,7 +6,7 @@ import { ITerminalLinkDetector, ITerminalSimpleLink, OmitFirstArg } from 'vs/workbench/contrib/terminalContrib/links/browser/links'; import { convertLinkRangeToBuffer, getXtermLineContent } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers'; import { ITerminalExternalLinkProvider } from 'vs/workbench/contrib/terminal/browser/terminal'; -import type { IBufferLine, Terminal } from 'xterm'; +import type { IBufferLine, Terminal } from '@xterm/xterm'; export class TerminalExternalLinkDetector implements ITerminalLinkDetector { readonly maxLinkLength = 2000; diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLink.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLink.ts index 65c333100c2..e221a2e999a 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLink.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLink.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { IViewportRange, IBufferRange, ILink, ILinkDecorations, Terminal } from 'xterm'; +import type { IViewportRange, IBufferRange, ILink, ILinkDecorations, Terminal } from '@xterm/xterm'; import { DisposableStore } from 'vs/base/common/lifecycle'; import * as dom from 'vs/base/browser/dom'; import { RunOnceScheduler } from 'vs/base/common/async'; diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts index 73512c67f42..d8929adcd12 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkDetectorAdapter.ts @@ -10,7 +10,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { ITerminalLinkDetector, ITerminalSimpleLink, TerminalBuiltinLinkType, TerminalLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links'; import { TerminalLink } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLink'; import { XtermLinkMatcherHandler } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager'; -import type { IBufferLine, ILink, ILinkProvider, IViewportRange } from 'xterm'; +import type { IBufferLine, ILink, ILinkProvider, IViewportRange } from '@xterm/xterm'; export interface IActivateLinkEvent { link: ITerminalSimpleLink; diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers.ts index 4db3064bcaf..9da96dcc7cb 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { IViewportRange, IBufferRange, IBufferLine, IBuffer, IBufferCellPosition } from 'xterm'; +import type { IViewportRange, IBufferRange, IBufferLine, IBuffer, IBufferCellPosition } from '@xterm/xterm'; import { IRange } from 'vs/editor/common/core/range'; import { OperatingSystem } from 'vs/base/common/platform'; import { IPath, posix, win32 } from 'vs/base/common/path'; diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts index bdf2d680d99..3073c0692f3 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager.ts @@ -27,7 +27,7 @@ import { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private' import { ITerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/capabilities'; import { ITerminalConfiguration, ITerminalProcessInfo, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal'; import { IHoverAction } from 'vs/workbench/services/hover/browser/hover'; -import type { ILink, ILinkProvider, IViewportRange, Terminal } from 'xterm'; +import type { ILink, ILinkProvider, IViewportRange, Terminal } from '@xterm/xterm'; import { convertBufferRangeToViewport } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers'; import { RunOnceScheduler } from 'vs/base/common/async'; import { ITerminalLogService } from 'vs/platform/terminal/common/terminal'; diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts index eb4a3b60d85..e954be537df 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts @@ -9,7 +9,7 @@ import { localize } from 'vs/nls'; import { QuickPickItem, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput'; import { IDetectedLinks } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkManager'; import { TerminalLinkQuickPickEvent } from 'vs/workbench/contrib/terminal/browser/terminal'; -import type { ILink } from 'xterm'; +import type { ILink } from '@xterm/xterm'; import { DisposableStore } from 'vs/base/common/lifecycle'; import { IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView'; import { AccessibleViewProviderId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration'; diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts index 86847d17ec7..05d7818b236 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector.ts @@ -10,7 +10,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace import { ITerminalLinkDetector, ITerminalLinkResolver, ITerminalSimpleLink, ResolvedLink, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links'; import { convertLinkRangeToBuffer, getXtermLineContent, getXtermRangesByAttr, osPathModule, updateLinkWithRelativeCwd } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers'; import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; -import type { IBufferLine, IBufferRange, Terminal } from 'xterm'; +import type { IBufferLine, IBufferRange, Terminal } from '@xterm/xterm'; import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal'; import { detectLinks } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkParsing'; import { ITerminalBackend, ITerminalLogService } from 'vs/platform/terminal/common/terminal'; diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalMultiLineLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalMultiLineLinkDetector.ts index f04cac9b1ee..cb93cee241b 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalMultiLineLinkDetector.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalMultiLineLinkDetector.ts @@ -8,7 +8,7 @@ import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity' import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { ITerminalLinkDetector, ITerminalLinkResolver, ITerminalSimpleLink, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links'; import { convertLinkRangeToBuffer, getXtermLineContent } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers'; -import type { IBufferLine, Terminal } from 'xterm'; +import type { IBufferLine, Terminal } from '@xterm/xterm'; import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal'; import { ITerminalBackend, ITerminalLogService } from 'vs/platform/terminal/common/terminal'; diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts index 269f9dc2b75..a49017e6786 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalUriLinkDetector.ts @@ -11,7 +11,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace import { ITerminalLinkDetector, ITerminalLinkResolver, ITerminalSimpleLink, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links'; import { convertLinkRangeToBuffer, getXtermLineContent } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers'; import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal'; -import type { IBufferLine, Terminal } from 'xterm'; +import type { IBufferLine, Terminal } from '@xterm/xterm'; import { ITerminalBackend } from 'vs/platform/terminal/common/terminal'; const enum Constants { diff --git a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector.ts b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector.ts index 094ab091f00..3285042999a 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector.ts @@ -13,7 +13,7 @@ import { TerminalSettingId } from 'vs/platform/terminal/common/terminal'; import { ITerminalSimpleLink, ITerminalLinkDetector, TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links'; import { convertLinkRangeToBuffer, getXtermLineContent } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers'; import { ITerminalConfiguration, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal'; -import type { IBufferLine, Terminal } from 'xterm'; +import type { IBufferLine, Terminal } from '@xterm/xterm'; const enum Constants { /** diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts index eb2e4290863..9e7fb9f5cbe 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts @@ -6,7 +6,7 @@ import { deepStrictEqual } from 'assert'; import { ITerminalLinkDetector, TerminalLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links'; import { URI } from 'vs/base/common/uri'; -import type { IBufferLine } from 'xterm'; +import type { IBufferLine } from '@xterm/xterm'; export async function assertLinkHelper( text: string, diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkHelpers.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkHelpers.test.ts index bf12083f0fe..b419b7b94ca 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkHelpers.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkHelpers.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import type { IBufferLine, IBufferCell } from 'xterm'; +import type { IBufferLine, IBufferCell } from '@xterm/xterm'; import { convertLinkRangeToBuffer } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkHelpers'; import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts index d40bbb8a085..79ee061f357 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkManager.test.ts @@ -21,7 +21,7 @@ import { ITerminalCapabilityImplMap, ITerminalCapabilityStore, TerminalCapabilit import { ITerminalConfiguration, ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal'; import { TestViewDescriptorService } from 'vs/workbench/contrib/terminal/test/browser/xterm/xtermTerminal.test'; import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices'; -import type { ILink, Terminal } from 'xterm'; +import type { ILink, Terminal } from '@xterm/xterm'; import { TerminalLinkResolver } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver'; import { importAMDNodeModule } from 'vs/amdX'; import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; @@ -86,7 +86,7 @@ suite('TerminalLinkManager', () => { instantiationService.stub(IThemeService, themeService); instantiationService.stub(IViewDescriptorService, viewDescriptorService); - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 })); linkManager = store.add(instantiationService.createInstance(TestLinkManager, xterm, upcastPartial({ get initialCwd() { diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts index c55b7caff8b..61a1edcc7f0 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLinkOpeners.test.ts @@ -22,7 +22,7 @@ import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilitie import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; import { TestContextService } from 'vs/workbench/test/common/workbenchTestServices'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; import { IFileQuery, ISearchComplete, ISearchService } from 'vs/workbench/services/search/common/search'; import { SearchService } from 'vs/workbench/services/search/common/searchService'; import { ITerminalLogService, ITerminalOutputMatcher } from 'vs/platform/terminal/common/terminal'; @@ -112,7 +112,7 @@ suite('Workbench - TerminalLinkOpeners', () => { } } } as Partial); - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = store.add(new TerminalCtor({ allowProposedApi: true })); }); diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts index 4e7cfa28cf6..ee8aa3f858e 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalLocalLinkDetector.test.ts @@ -12,7 +12,7 @@ import { TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/li import { TerminalLocalLinkDetector } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLocalLinkDetector'; import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilities/terminalCapabilityStore'; import { assertLinkHelper } from 'vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; import { timeout } from 'vs/base/common/async'; import { strictEqual } from 'assert'; import { TerminalLinkResolver } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver'; @@ -193,7 +193,7 @@ suite('Workbench - TerminalLocalLinkDetector', () => { resolver = instantiationService.createInstance(TerminalLinkResolver); validResources = []; - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }); }); diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts index e7725906b21..bfb219e2fec 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalMultiLineLinkDetector.test.ts @@ -10,7 +10,7 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/ import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { TerminalBuiltinLinkType } from 'vs/workbench/contrib/terminalContrib/links/browser/links'; import { assertLinkHelper } from 'vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; import { timeout } from 'vs/base/common/async'; import { strictEqual } from 'assert'; import { TerminalLinkResolver } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalLinkResolver'; @@ -152,7 +152,7 @@ suite('Workbench - TerminalMultiLineLinkDetector', () => { resolver = instantiationService.createInstance(TerminalLinkResolver); validResources = []; - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }); }); diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts index d4adc4f38f0..d9ab1364a72 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalUriLinkDetector.test.ts @@ -13,7 +13,7 @@ import { TerminalUriLinkDetector } from 'vs/workbench/contrib/terminalContrib/li import { assertLinkHelper } from 'vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils'; import { createFileStat } from 'vs/workbench/test/common/workbenchTestServices'; import { URI } from 'vs/base/common/uri'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; import { OperatingSystem } from 'vs/base/common/platform'; import { importAMDNodeModule } from 'vs/amdX'; import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; @@ -41,7 +41,7 @@ suite('Workbench - TerminalUriLinkDetector', () => { }); validResources = []; - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 }); detector = instantiationService.createInstance(TerminalUriLinkDetector, xterm, { initialCwd: '/parent/cwd', diff --git a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts index c30d174f9ff..a12ddf68158 100644 --- a/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/links/test/browser/terminalWordLinkDetector.test.ts @@ -13,7 +13,7 @@ import { ITerminalSimpleLink, TerminalBuiltinLinkType } from 'vs/workbench/contr import { TerminalWordLinkDetector } from 'vs/workbench/contrib/terminalContrib/links/browser/terminalWordLinkDetector'; import { assertLinkHelper } from 'vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils'; import { TestProductService } from 'vs/workbench/test/common/workbenchTestServices'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; suite('Workbench - TerminalWordLinkDetector', () => { const store = ensureNoDisposablesAreLeakedInTestSuite(); @@ -31,7 +31,7 @@ suite('Workbench - TerminalWordLinkDetector', () => { instantiationService.stub(IConfigurationService, configurationService); instantiationService.set(IProductService, TestProductService); - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; xterm = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, rows: 30 })); detector = store.add(instantiationService.createInstance(TerminalWordLinkDetector, xterm)); }); diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts index a929020131d..80e8874e62a 100644 --- a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts +++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts @@ -5,7 +5,7 @@ // Importing types is safe in any layer // eslint-disable-next-line local/code-import-patterns -import type { ITerminalAddon } from 'xterm-headless'; +import type { ITerminalAddon } from '@xterm/headless'; import { Emitter, Event } from 'vs/base/common/event'; import { Disposable } from 'vs/base/common/lifecycle'; import { ITerminalCapabilityStore, ITerminalCommand, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; @@ -16,7 +16,7 @@ import { localize } from 'vs/nls'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { DecorationSelector, updateLayout } from 'vs/workbench/contrib/terminal/browser/xterm/decorationStyles'; -import type { IDecoration, Terminal } from 'xterm'; +import type { IDecoration, Terminal } from '@xterm/xterm'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { CancellationTokenSource } from 'vs/base/common/cancellation'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts index 4fca04ec9a9..ed160e4e08e 100644 --- a/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/quickFix/browser/terminal.quickFix.contribution.ts @@ -20,7 +20,7 @@ import { ITerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/q import { TerminalQuickFixAddon } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon'; import { freePort, gitCreatePr, gitPushSetUpstream, gitSimilar, gitTwoDashes, pwshGeneralError, pwshUnixCommandNotFoundError } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions'; import { TerminalQuickFixService } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixService'; -import type { Terminal as RawXtermTerminal } from 'xterm'; +import type { Terminal as RawXtermTerminal } from '@xterm/xterm'; // Services registerSingleton(ITerminalQuickFixService, TerminalQuickFixService, InstantiationType.Delayed); diff --git a/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts b/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts index 44f01d96083..f6dbee14fb3 100644 --- a/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/quickFix/test/browser/quickFixAddon.test.ts @@ -18,7 +18,7 @@ import { TerminalCapabilityStore } from 'vs/platform/terminal/common/capabilitie import { gitSimilar, freePort, FreePortOutputRegex, gitCreatePr, GitCreatePrOutputRegex, GitPushOutputRegex, gitPushSetUpstream, GitSimilarOutputRegex, gitTwoDashes, GitTwoDashesRegex, pwshUnixCommandNotFoundError, PwshUnixCommandNotFoundErrorOutputRegex, pwshGeneralError, PwshGeneralErrorOutputRegex } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixBuiltinActions'; import { TerminalQuickFixAddon, getQuickFixesForCommand } from 'vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon'; import { URI } from 'vs/base/common/uri'; -import type { Terminal } from 'xterm'; +import type { Terminal } from '@xterm/xterm'; import { Event } from 'vs/base/common/event'; import { LabelService } from 'vs/workbench/services/label/common/labelService'; import { ILabelService } from 'vs/platform/label/common/label'; @@ -45,7 +45,7 @@ suite('QuickFixAddon', () => { setup(async () => { instantiationService = store.add(new TestInstantiationService()); - const TerminalCtor = (await importAMDNodeModule('xterm', 'lib/xterm.js')).Terminal; + const TerminalCtor = (await importAMDNodeModule('@xterm/xterm', 'lib/xterm.js')).Terminal; terminal = store.add(new TerminalCtor({ allowProposedApi: true, cols: 80, diff --git a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminal.typeAhead.contribution.ts b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminal.typeAhead.contribution.ts index 993edae783c..1851d36cf7d 100644 --- a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminal.typeAhead.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminal.typeAhead.contribution.ts @@ -12,7 +12,7 @@ import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/brow import { TerminalWidgetManager } from 'vs/workbench/contrib/terminal/browser/widgets/widgetManager'; import { TypeAheadAddon } from 'vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon'; import { ITerminalConfiguration, ITerminalProcessManager, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal'; -import type { Terminal as RawXtermTerminal } from 'xterm'; +import type { Terminal as RawXtermTerminal } from '@xterm/xterm'; class TerminalTypeAheadContribution extends DisposableStore implements ITerminalContribution { static readonly ID = 'terminal.typeAhead'; diff --git a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts index cbbb9b4309d..9d197172aed 100644 --- a/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts +++ b/src/vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts @@ -13,7 +13,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { XtermAttributes, IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private'; import { DEFAULT_LOCAL_ECHO_EXCLUDE, IBeforeProcessDataEvent, ITerminalConfiguration, ITerminalProcessManager, TERMINAL_CONFIG_SECTION } from 'vs/workbench/contrib/terminal/common/terminal'; -import type { IBuffer, IBufferCell, IDisposable, ITerminalAddon, Terminal } from 'xterm'; +import type { IBuffer, IBufferCell, IDisposable, ITerminalAddon, Terminal } from '@xterm/xterm'; const enum VT { Esc = '\x1b', diff --git a/src/vs/workbench/contrib/terminalContrib/typeAhead/test/browser/terminalTypeAhead.test.ts b/src/vs/workbench/contrib/terminalContrib/typeAhead/test/browser/terminalTypeAhead.test.ts index bbf3e024304..c6524b94eb2 100644 --- a/src/vs/workbench/contrib/terminalContrib/typeAhead/test/browser/terminalTypeAhead.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/typeAhead/test/browser/terminalTypeAhead.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import type { IBuffer, Terminal } from 'xterm'; +import type { IBuffer, Terminal } from '@xterm/xterm'; import { SinonStub, stub, useFakeTimers } from 'sinon'; import { Emitter } from 'vs/base/common/event'; import { CharPredictState, IPrediction, PredictionStats, TypeAheadAddon } from 'vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon'; diff --git a/test/unit/browser/renderer.html b/test/unit/browser/renderer.html index ae678696483..7187baf7bf6 100644 --- a/test/unit/browser/renderer.html +++ b/test/unit/browser/renderer.html @@ -57,7 +57,7 @@ assert: new URL('../assert.js', baseUrl).href, sinon: new URL('../../../node_modules/sinon/pkg/sinon.js', baseUrl).href, 'sinon-test': new URL('../../../node_modules/sinon-test/dist/sinon-test.js', baseUrl).href, - xterm: new URL('../../../node_modules/xterm/lib/xterm.js', baseUrl).href, + '@xterm/xterm': new URL('../../../node_modules/@xterm/xterm/lib/xterm.js', baseUrl).href, '@vscode/iconv-lite-umd': new URL('../../../node_modules/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js', baseUrl).href, jschardet: new URL('../../../node_modules/jschardet/dist/jschardet.min.js', baseUrl).href } diff --git a/yarn.lock b/yarn.lock index 32b1df8ced5..459a1bb1a2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1668,6 +1668,46 @@ resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8" integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw== +"@xterm/addon-canvas@0.6.0-beta.3": + version "0.6.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.3.tgz#8edc590eb6173079fa43eb536377b2f8897cca4a" + integrity sha512-iZWtIRU2jaarLGLNhH4z+szObkERN3IEZ90zgAykEBIkxkuTJkq/8UvNaBBsXlrfutr/dlbKeZFEI3H3zSjp2Q== + +"@xterm/addon-image@0.7.0-beta.1": + version "0.7.0-beta.1" + resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.1.tgz#8d1df39db103442d18e61d05f1665f49ac7f19a9" + integrity sha512-c+wB+ODtKgWaQHvw1442R63Ivu10cYjelOYob1J6r5VKFD9DQCofyiMC9BLJsS7kJMmg9A7KWtUCTwvcbR3HQg== + +"@xterm/addon-search@0.14.0-beta.3": + version "0.14.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.3.tgz#caf4b928888d83511e227efde678473ed403d955" + integrity sha512-rl0riCMmP9vSkbeNucNVXlK72K9yT+iabpbeTiCydGBimI2ylhNffuUzNPru/jJZl52PSw3AejkhB98/JWfE8A== + +"@xterm/addon-serialize@0.12.0-beta.3": + version "0.12.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.3.tgz#cf3402b8d9ab4ab4291a628f81005a5984976d34" + integrity sha512-Vin62EC2FZdlvQnvGBqE4rHwchKMasJqg7C7CFrqvpLwBekPg2tYN5SjyiMtjfN3G95wj0qhqil0hxUVG3JmWw== + +"@xterm/addon-unicode11@0.7.0-beta.3": + version "0.7.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.3.tgz#092a3c685307d3c0135404f15e8b2e32495f2d86" + integrity sha512-ex2Xf94pXhGTvK7VBp57FRl8gP/aQiFMRddPnwDykQb0qwx/ZAfm+oIByrbGWXm0DZFZUCvmXke2Xk7kMojBEw== + +"@xterm/addon-webgl@0.17.0-beta.3": + version "0.17.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.3.tgz#947641632142439d1a8fabcf2850cf3aa6dad0ac" + integrity sha512-RCmBVYgZNNUbMSUT5rQZbV8AnNP1IyGeBZh6D4u4qpVSapQN6OlX72raXx7qyy1aoD9dRbE0YhOOHTz8o/wnuA== + +"@xterm/headless@5.4.0-beta.3": + version "5.4.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.4.0-beta.3.tgz#9fe1920b6eba59066469735bacfbd6d840cadc20" + integrity sha512-LfRIURZRpyECQPTfw6PH581ibt6Vt4o/cG7DykfgxRITknFO69yu6DrmTXJy1uTLXkGcXmujn1fCoodjk9z9UA== + +"@xterm/xterm@5.4.0-beta.3": + version "5.4.0-beta.3" + resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.3.tgz#ea91a83cf3d532beabe7420f4e4842fc294efce5" + integrity sha512-fj88EsJGLkvK+/IMb1V1irjYRrOBVDM31RK+zKTmqqhFAQih/Zkw7ZRBRm+gfpOfcnIrqA/BNt1l+ZnpDUsVzA== + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -10368,46 +10408,6 @@ xtend@~4.0.0, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -xterm-addon-canvas@0.6.0-beta.37: - version "0.6.0-beta.37" - resolved "https://registry.yarnpkg.com/xterm-addon-canvas/-/xterm-addon-canvas-0.6.0-beta.37.tgz#4f7692fc87f3500a5a6e7f822ec74796e6a36db2" - integrity sha512-eFN7iPxqiQosUO+rbXKwPz/AR3TLJcLCVWjvT5EaewqNpw+E9rWVwRRPGqYSw+qkSKM/vcNlySIkq4hmpA/ohg== - -xterm-addon-image@0.6.0-beta.21: - version "0.6.0-beta.21" - resolved "https://registry.yarnpkg.com/xterm-addon-image/-/xterm-addon-image-0.6.0-beta.21.tgz#e3708bc504c56a23ff31f12a2eeb335331a92aac" - integrity sha512-8/PTaXVPa4kQ0xzVeuZZk10OpbZBj2cgfwhM2B0ChSPvwrk0lX+ksnXdtDKH3tg+JYvo7fIhNXtkr4NwWt7VJQ== - -xterm-addon-search@0.14.0-beta.36: - version "0.14.0-beta.36" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.14.0-beta.36.tgz#4bb161130c39090d506f73468ef65054aedcb9f0" - integrity sha512-2ydZV1Nt8d0vOjZ/y2RXiw3QLgabK+PCA7yETqZNivnmhSfcxtYPyI4aRfG/lc3hoMKiPppSSjJF0MlV/qo8ww== - -xterm-addon-serialize@0.12.0-beta.36: - version "0.12.0-beta.36" - resolved "https://registry.yarnpkg.com/xterm-addon-serialize/-/xterm-addon-serialize-0.12.0-beta.36.tgz#8e74159317e2c1e5f2724fd92b85df2b87d2c9c9" - integrity sha512-J2mr3Wuxzvxke14IpfJBhwCHlWoB428FE06tOfbGi5lCBm0AnO2cIyRymvgVZG4QVXVxzzWroE8wP/WQQVe45w== - -xterm-addon-unicode11@0.7.0-beta.36: - version "0.7.0-beta.36" - resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.7.0-beta.36.tgz#bde0b8c98211b74b0288cd5bad09107384b870ca" - integrity sha512-vV/f7dTP/46JjoJLYDCxolCWPoUn0cF7S5upYvY0ZA1VLQ9UnXmaNjzrg+9f+QBoXEQ2eQDLQcRFWOc6BAbF+A== - -xterm-addon-webgl@0.17.0-beta.36: - version "0.17.0-beta.36" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.17.0-beta.36.tgz#6ed16a83cd4bed3cbddd631e7974375aa8f7e023" - integrity sha512-5PNQZcNH2UTaqSf7Exgh/fvsNeTOs+CSEuIaTafzKuMIrWH14+cRdyJdzyo8OKTNzhJOjwWDOTQTD/sur4lrLg== - -xterm-headless@5.4.0-beta.37: - version "5.4.0-beta.37" - resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-5.4.0-beta.37.tgz#1e89dfa7e667a5951974a9e9b5e1b0875198ca65" - integrity sha512-iP28Z419p7anaNetLhmPOpt/DUdeA45jVLqoTn8bRpwFj8kM/gI76tUO9y/TyMfv79yWwPv2MrkALfS6ZyTi7g== - -xterm@5.4.0-beta.37: - version "5.4.0-beta.37" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.4.0-beta.37.tgz#bae127be8c939f096232d9858e77a457d6b77ddf" - integrity sha512-ys+mXqLFrJc7khmYN/MgBnfLv38NgXfkwkEXsCZKHGqn3h2xUBvTvsrSEWO3NQeDPLj4zMr1RwqTblMK9St3BA== - y18n@^3.2.1: version "3.2.2" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"