From 3a2423174cb205c5dde964c7a75b2372cb848d55 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 25 Jul 2019 17:02:04 -0700 Subject: [PATCH] xterm@3.15.0-beta89 Diff: https://github.com/xtermjs/xterm.js/compare/378982a...689fb6b Changes: - Fix NPE when disposing detached terminals Fixes microsoft/vscode-remote-release#1033 --- .../src/singlefolder-tests/terminal.test.ts | 2 +- package.json | 2 +- remote/package.json | 2 +- remote/yarn.lock | 8 ++++---- yarn.lock | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts index 8c78cf68ead..63e39fdd2e4 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts @@ -11,7 +11,7 @@ suite('window namespace tests', () => { // Disable conpty in integration tests because of https://github.com/microsoft/vscode/issues/76548 await workspace.getConfiguration('terminal.integrated').update('windowsEnableConpty', false, ConfigurationTarget.Global); }); - suite.skip('Terminal', () => { + suite('Terminal', () => { test('sendText immediately after createTerminal should not throw', (done) => { const reg1 = window.onDidOpenTerminal(term => { equal(terminal, term); diff --git a/package.json b/package.json index eee312cd134..f59a80c947f 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "vscode-ripgrep": "^1.5.5", "vscode-sqlite3": "4.0.8", "vscode-textmate": "^4.2.2", - "xterm": "3.15.0-beta88", + "xterm": "3.15.0-beta89", "xterm-addon-search": "0.2.0-beta3", "xterm-addon-web-links": "0.1.0-beta10", "yauzl": "^2.9.2", diff --git a/remote/package.json b/remote/package.json index ccb412ef358..34ffee1a4be 100644 --- a/remote/package.json +++ b/remote/package.json @@ -20,7 +20,7 @@ "vscode-proxy-agent": "0.4.0", "vscode-ripgrep": "^1.5.5", "vscode-textmate": "^4.2.2", - "xterm": "3.15.0-beta88", + "xterm": "3.15.0-beta89", "xterm-addon-search": "0.2.0-beta3", "xterm-addon-web-links": "0.1.0-beta10", "yauzl": "^2.9.2", diff --git a/remote/yarn.lock b/remote/yarn.lock index b5077ce87a4..1c4e700f495 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -1159,10 +1159,10 @@ xterm-addon-web-links@0.1.0-beta10: resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.1.0-beta10.tgz#610fa9773a2a5ccd41c1c83ba0e2dd2c9eb66a23" integrity sha512-xfpjy0V6bB4BR44qIgZQPoCMVakxb65gMscPkHpO//QxvUxKzabV3dxOsIbeZRFkUGsWTFlvz2OoaBLoNtv5gg== -xterm@3.15.0-beta88: - version "3.15.0-beta88" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta88.tgz#9a1c8d8a869517a4a8f103426fe0a89473455aa4" - integrity sha512-4nWNf4AbeoTRyOrhmWah9tZTXRepNo4uxzXdGskBWC9dAtItjD6ShNgi5z+xuVB4NmKoDp1b8rWNNMJ1I6/TLA== +xterm@3.15.0-beta89: + version "3.15.0-beta89" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta89.tgz#255962e2595deefb42b8c0043001256526163a3f" + integrity sha512-rNaoUamacPRg+ejbKDGRDNqR3SZ3Uf/pUW0mO+FF25/lIgdLq8x7RgZVBgFweCZ/dijPjxoyMcgfNDTH9h8LOg== yauzl@^2.9.2: version "2.10.0" diff --git a/yarn.lock b/yarn.lock index 700e0195f87..6c206d6fa00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9872,10 +9872,10 @@ xterm-addon-web-links@0.1.0-beta10: resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.1.0-beta10.tgz#610fa9773a2a5ccd41c1c83ba0e2dd2c9eb66a23" integrity sha512-xfpjy0V6bB4BR44qIgZQPoCMVakxb65gMscPkHpO//QxvUxKzabV3dxOsIbeZRFkUGsWTFlvz2OoaBLoNtv5gg== -xterm@3.15.0-beta88: - version "3.15.0-beta88" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta88.tgz#9a1c8d8a869517a4a8f103426fe0a89473455aa4" - integrity sha512-4nWNf4AbeoTRyOrhmWah9tZTXRepNo4uxzXdGskBWC9dAtItjD6ShNgi5z+xuVB4NmKoDp1b8rWNNMJ1I6/TLA== +xterm@3.15.0-beta89: + version "3.15.0-beta89" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta89.tgz#255962e2595deefb42b8c0043001256526163a3f" + integrity sha512-rNaoUamacPRg+ejbKDGRDNqR3SZ3Uf/pUW0mO+FF25/lIgdLq8x7RgZVBgFweCZ/dijPjxoyMcgfNDTH9h8LOg== y18n@^3.2.1: version "3.2.1" -- GitLab