From eee02ecda2e08c379bca21054e65a0f391544869 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 17 Aug 2017 08:52:41 -0700 Subject: [PATCH 1/3] Uplevel xterm.js This pulls many changes from the v3 branch. Fixes #32725 --- npm-shrinkwrap.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 1112f9fcfdb72..fd2a06ef42047 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -567,9 +567,9 @@ "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.0.tgz" }, "xterm": { - "version": "2.8.1", - "from": "Tyriar/xterm.js#vscode-release/1.15", - "resolved": "git+https://github.com/Tyriar/xterm.js.git#75ffea5ebd5510ad0478b017c3946cb8d504855f" + "version": "2.9.1", + "from": "Tyriar/xterm.js#vscode-release/1.16", + "resolved": "git+https://github.com/Tyriar/xterm.js.git#ec8e705ffef18ec9f90e27baff30105b0278b3bb" }, "yauzl": { "version": "2.8.0", diff --git a/package.json b/package.json index 5c0a1adc7e9fe..13c7d4e58a45a 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "vscode-ripgrep": "0.0.25", "vscode-textmate": "^3.1.5", "winreg": "1.2.0", - "xterm": "Tyriar/xterm.js#vscode-release/1.15", + "xterm": "Tyriar/xterm.js#vscode-release/1.16", "yauzl": "2.8.0" }, "devDependencies": { From 84c7d308370c47cafd716e22498d0b3afb2bc12f Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 18 Aug 2017 16:31:43 -0700 Subject: [PATCH 2/3] Adapt the terminal for xterm v3 Fixes #32725 Fixes #32552 --- src/typings/xterm.d.ts | 4 +--- .../parts/terminal/electron-browser/terminalInstance.ts | 2 +- .../parts/terminal/electron-browser/windowsShellHelper.ts | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/typings/xterm.d.ts b/src/typings/xterm.d.ts index 08c24dcd70cc1..e7e0917e2e0be 100644 --- a/src/typings/xterm.d.ts +++ b/src/typings/xterm.d.ts @@ -6,7 +6,7 @@ declare module 'xterm' { type LinkMatcherHandler = (event: MouseEvent, uri: string) => boolean | void; - class Terminal { + export class Terminal { cols: number; rows: number; ydisp: number; @@ -192,6 +192,4 @@ declare module 'xterm' { */ static loadAddon(addon: string): void; } - - export = Terminal; } \ No newline at end of file diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts index 3b2a163b3328a..2a7fd366e3895 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts @@ -13,7 +13,7 @@ import * as dom from 'vs/base/browser/dom'; import Event, { Emitter } from 'vs/base/common/event'; import Uri from 'vs/base/common/uri'; import { WindowsShellHelper } from 'vs/workbench/parts/terminal/electron-browser/windowsShellHelper'; -import XTermTerminal = require('xterm'); +import { Terminal as XTermTerminal } from 'xterm'; import { Dimension } from 'vs/base/browser/builder'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts index 4effb4b946642..6dab973c67ab0 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts @@ -10,7 +10,7 @@ import * as path from 'path'; import { TPromise } from 'vs/base/common/winjs.base'; import { Emitter, debounceEvent } from 'vs/base/common/event'; import { ITerminalInstance } from 'vs/workbench/parts/terminal/common/terminal'; -import XTermTerminal = require('xterm'); +import { Terminal as XTermTerminal } from 'xterm'; const SHELL_EXECUTABLES = ['cmd.exe', 'powershell.exe', 'bash.exe']; From 43199d610343fbc0577df4bfa04db163bc7edda6 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 18 Aug 2017 16:34:20 -0700 Subject: [PATCH 3/3] Pull in latest xterm.js Fixes #32554 --- npm-shrinkwrap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index fd2a06ef42047..50f1b87edd379 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -569,7 +569,7 @@ "xterm": { "version": "2.9.1", "from": "Tyriar/xterm.js#vscode-release/1.16", - "resolved": "git+https://github.com/Tyriar/xterm.js.git#ec8e705ffef18ec9f90e27baff30105b0278b3bb" + "resolved": "git+https://github.com/Tyriar/xterm.js.git#74fde417c97962730a5fbbc8e8e7dcd47e1b897b" }, "yauzl": { "version": "2.8.0",