From 336b45a64597ad756ae95893a15be8b317538254 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Fri, 25 Feb 2022 11:24:40 -0800 Subject: [PATCH 1/6] Make vscode tasks faster on reload See microsoft/vscode#142413 --- .vscode/tasks.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 4673ba79..f5207541 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -18,6 +18,7 @@ "problemMatcher": [] }, { + "label": "npm: watch", "type": "npm", "script": "watch", "group": "build", @@ -28,6 +29,7 @@ } }, { + "label": "npm: start", "type": "npm", "script": "start", "dependsOn": "npm: watch", From 771d5f580abcdbd24db9315057c3a0a26f81aa83 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Fri, 25 Feb 2022 11:25:38 -0800 Subject: [PATCH 2/6] Simplify task names --- .vscode/tasks.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f5207541..be833820 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -18,7 +18,7 @@ "problemMatcher": [] }, { - "label": "npm: watch", + "label": "watch", "type": "npm", "script": "watch", "group": "build", @@ -29,10 +29,10 @@ } }, { - "label": "npm: start", + "label": "start", "type": "npm", "script": "start", - "dependsOn": "npm: watch", + "dependsOn": "watch", "group": "build", "isBackground": true, "problemMatcher": [], @@ -42,7 +42,7 @@ }, { "label": "Start demo", - "dependsOn": "npm: start", + "dependsOn": "start", "group": { "kind": "build", "isDefault": true From 14366e7c406943fe5ce03546e9d67c4153aec813 Mon Sep 17 00:00:00 2001 From: hello-smile6 <73048226+hello-smile6@users.noreply.github.com> Date: Sat, 26 Feb 2022 16:54:05 -0800 Subject: [PATCH 3/6] Add libv86 terminal forwarding https://github.com/hello-smile6/libv86-terminal-forwarding --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7fcbe1a8..94494c71 100644 --- a/README.md +++ b/README.md @@ -188,6 +188,7 @@ Xterm.js is used in several world-class applications to provide great terminal e - [**OpenSumi**](https://github.com/opensumi/core): A framework helps you quickly build Cloud or Desktop IDE products. - [**KubeSail**](https://kubesail.com): The Self-Hosting Company - uses xterm to allow users to exec into kubernetes pods and build github apps - [**WiTTY**](https://github.com/syssecfsu/witty): Web-based interactive terminal emulator that allows users to easily record, share, and replay console sessions. +- [**libv86 Terminal Forwarding**](https://github.com/hello-smile6/libv86-terminal-forwarding): Peer-to-peer SSH for the web, using WebRTC via [Bugout](https://github.com/chr15m/bugout) for data transfer and [v86](https://github.com/copy/v86) for web-based virtualization. - [And much more...](https://github.com/xtermjs/xterm.js/network/dependents?package_id=UGFja2FnZS0xNjYzMjc4OQ%3D%3D) Do you use xterm.js in your application as well? Please [open a Pull Request](https://github.com/sourcelair/xterm.js/pulls) to include it here. We would love to have it on our list. Note: Please add any new contributions to the end of the list only. From 9b02e950f82ef517186aae94f08d359f52c918c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=84=BF=E6=97=B6?= <58261676+childrentime@users.noreply.github.com> Date: Sun, 27 Feb 2022 13:25:07 +0800 Subject: [PATCH 4/6] Make registerMarker's cursor offset optional --- src/browser/public/Terminal.ts | 2 +- src/headless/public/Terminal.ts | 2 +- typings/xterm-headless.d.ts | 2 +- typings/xterm.d.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/browser/public/Terminal.ts b/src/browser/public/Terminal.ts index 9571afa6..1acde934 100644 --- a/src/browser/public/Terminal.ts +++ b/src/browser/public/Terminal.ts @@ -166,7 +166,7 @@ export class Terminal implements ITerminalApi { this._checkProposedApi(); this._core.deregisterCharacterJoiner(joinerId); } - public registerMarker(cursorYOffset: number): IMarker | undefined { + public registerMarker(cursorYOffset: number = 0): IMarker | undefined { this._checkProposedApi(); this._verifyIntegers(cursorYOffset); return this._core.addMarker(cursorYOffset); diff --git a/src/headless/public/Terminal.ts b/src/headless/public/Terminal.ts index 9aa171a4..5a35fae2 100644 --- a/src/headless/public/Terminal.ts +++ b/src/headless/public/Terminal.ts @@ -136,7 +136,7 @@ export class Terminal implements ITerminalApi { this._verifyIntegers(columns, rows); this._core.resize(columns, rows); } - public registerMarker(cursorYOffset: number): IMarker | undefined { + public registerMarker(cursorYOffset: number = 0): IMarker | undefined { this._checkProposedApi(); this._verifyIntegers(cursorYOffset); return this._core.addMarker(cursorYOffset); diff --git a/typings/xterm-headless.d.ts b/typings/xterm-headless.d.ts index 6d2b3e27..0ab8bd96 100644 --- a/typings/xterm-headless.d.ts +++ b/typings/xterm-headless.d.ts @@ -643,7 +643,7 @@ declare module 'xterm-headless' { * @param cursorYOffset The y position offset of the marker from the cursor. * @returns The new marker or undefined. */ - registerMarker(cursorYOffset: number): IMarker | undefined; + registerMarker(cursorYOffset?: number): IMarker | undefined; /** * @deprecated use `registerMarker` instead. diff --git a/typings/xterm.d.ts b/typings/xterm.d.ts index 17bf8d50..2cd4daa6 100644 --- a/typings/xterm.d.ts +++ b/typings/xterm.d.ts @@ -930,7 +930,7 @@ declare module 'xterm' { * @param cursorYOffset The y position offset of the marker from the cursor. * @returns The new marker or undefined. */ - registerMarker(cursorYOffset: number): IMarker | undefined; + registerMarker(cursorYOffset?: number): IMarker | undefined; /** * @deprecated use `registerMarker` instead. From 83cb7c3184c3f7fbf35e20baa62cc8e4d7620513 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Mon, 28 Feb 2022 11:14:42 -0600 Subject: [PATCH 5/6] update version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d959246..03811997 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "xterm", "description": "Full xterm terminal, in your browser", - "version": "4.17.0", + "version": "4.18.0", "main": "lib/xterm.js", "style": "css/xterm.css", "types": "typings/xterm.d.ts", From ff6fa739c43165ad187683f6bdca0481ca4b7c93 Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Wed, 2 Mar 2022 17:58:27 +0000 Subject: [PATCH 6/6] update addons --- addons/xterm-addon-ligatures/package.json | 2 +- addons/xterm-addon-serialize/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/xterm-addon-ligatures/package.json b/addons/xterm-addon-ligatures/package.json index f3c3aeff..7e5e5e90 100644 --- a/addons/xterm-addon-ligatures/package.json +++ b/addons/xterm-addon-ligatures/package.json @@ -1,6 +1,6 @@ { "name": "xterm-addon-ligatures", - "version": "0.5.2", + "version": "0.5.3", "description": "Add support for programming ligatures to xterm.js", "author": { "name": "The xterm.js authors", diff --git a/addons/xterm-addon-serialize/package.json b/addons/xterm-addon-serialize/package.json index 1565a7e4..01a8b68f 100644 --- a/addons/xterm-addon-serialize/package.json +++ b/addons/xterm-addon-serialize/package.json @@ -1,6 +1,6 @@ { "name": "xterm-addon-serialize", - "version": "0.6.1", + "version": "0.6.2", "author": { "name": "The xterm.js authors", "url": "https://xtermjs.org/"