Merge remote-tracking branch 'origin/oss/master' into distro

4 files changed, 27 insertions, 22 deletions

diff --git a/remote/package.json b/remote/package.json
index 490d7345df1..0a40551d148 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -5,7 +5,7 @@
     "applicationinsights": "1.0.8",
     "chokidar": "3.1.0",
     "cookie": "^0.4.0",
-    "graceful-fs": "4.1.11",
+    "graceful-fs": "4.2.2",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.1",
     "iconv-lite": "0.5.0",
@@ -21,8 +21,8 @@
     "vscode-ripgrep": "^1.5.7",
     "vscode-textmate": "^4.2.2",
     "vsda": "https://github.com/microsoft/vsda.git#45edd3db96a5e308a5cfc817d1ee42f6d96e1659",
-    "xterm": "4.1.0-beta8",
-    "xterm-addon-search": "0.2.0",
+    "xterm": "4.2.0-beta4",
+    "xterm-addon-search": "0.3.0-beta5",
     "xterm-addon-web-links": "0.2.0",
     "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
diff --git a/remote/web/package.json b/remote/web/package.json
index 01e11a75fb2..db6e5d18e12 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -5,8 +5,8 @@
 		"onigasm-umd": "^2.2.2",
 		"semver-umd": "^5.5.3",
 		"vscode-textmate": "^4.2.2",
-		"xterm": "4.1.0-beta8",
-		"xterm-addon-search": "0.2.0",
+		"xterm": "4.2.0-beta4",
+		"xterm-addon-search": "0.3.0-beta5",
 		"xterm-addon-web-links": "0.2.0"
 	}
 }
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
index 696c1956a47..759deded50b 100644
--- a/remote/web/yarn.lock
+++ b/remote/web/yarn.lock
@@ -31,17 +31,17 @@ vscode-textmate@^4.2.2:
   dependencies:
     oniguruma "^7.2.0"
 
-xterm-addon-search@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.2.0.tgz#46659c7c33f9fc268ad3e7e6c5824bb2fdb65852"
-  integrity sha512-C/v2VvFn3hb1qUgjJPo7LxzxNCLBgNJv8n6v/bH2NqPz32/PNUF+IHu0SFf1TaIH+pydUpKXCtob5a/UyZg/+Q==
+xterm-addon-search@0.3.0-beta5:
+  version "0.3.0-beta5"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.3.0-beta5.tgz#fd53d33a77a0235018479c712be8c12f7c0d083a"
+  integrity sha512-3GkGc4hST35/4hzgnQPLLvQ29WH7MkZ0mUrBE/Vm1IQum7TnMvWPTkGemwM+wAl4tdBmynNccHJlFeQzaQtVUg==
 
 xterm-addon-web-links@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.0.tgz#b408a0be46211d8d4a0bb5e701d8f3c2bd07d473"
   integrity sha512-dq81c4Pzli2PgKVBgY2REte9sCVibR3df8AP3SEvCTM9uYFnUFxtxzMTplPnc7+rXabVhFdbU6x+rstIk8HNQg==
 
-xterm@4.1.0-beta8:
-  version "4.1.0-beta8"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.1.0-beta8.tgz#c1ef323ba336d92f5b52302b66f672dfff75b3ef"
-  integrity sha512-6lf+XVv0qT285w49P92tSYoUB406jdbgdhnPKNzxCIGtGX8kcwK+pHZ8HncDwcEhmTmI4LZ/WXPGtOQJg+onwg==
+xterm@4.2.0-beta4:
+  version "4.2.0-beta4"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta4.tgz#596577f94a1da372119d192363ea2b19d1f8b50c"
+  integrity sha512-BmkpxCpqdOJoNdIcddkRT8S65sGjgBbWI0uIJNSnzZvj81OKcraMSTmF/ODw0TF/MDLc33Fx9cpDx/D6lQgl8Q==
diff --git a/remote/yarn.lock b/remote/yarn.lock
index 6b1c1301c8c..555673118f4 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -148,7 +148,12 @@ glob-parent@^5.0.0:
   dependencies:
     is-glob "^4.0.1"
 
-graceful-fs@4.1.11, graceful-fs@^4.1.2:
+graceful-fs@4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
+  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
+
+graceful-fs@^4.1.2:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
   integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
@@ -415,20 +420,20 @@ vscode-windows-registry@1.0.2:
   version "1.4.1"
   resolved "https://github.com/microsoft/vsda.git#45edd3db96a5e308a5cfc817d1ee42f6d96e1659"
 
-xterm-addon-search@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.2.0.tgz#46659c7c33f9fc268ad3e7e6c5824bb2fdb65852"
-  integrity sha512-C/v2VvFn3hb1qUgjJPo7LxzxNCLBgNJv8n6v/bH2NqPz32/PNUF+IHu0SFf1TaIH+pydUpKXCtob5a/UyZg/+Q==
+xterm-addon-search@0.3.0-beta5:
+  version "0.3.0-beta5"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.3.0-beta5.tgz#fd53d33a77a0235018479c712be8c12f7c0d083a"
+  integrity sha512-3GkGc4hST35/4hzgnQPLLvQ29WH7MkZ0mUrBE/Vm1IQum7TnMvWPTkGemwM+wAl4tdBmynNccHJlFeQzaQtVUg==
 
 xterm-addon-web-links@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.0.tgz#b408a0be46211d8d4a0bb5e701d8f3c2bd07d473"
   integrity sha512-dq81c4Pzli2PgKVBgY2REte9sCVibR3df8AP3SEvCTM9uYFnUFxtxzMTplPnc7+rXabVhFdbU6x+rstIk8HNQg==
 
-xterm@4.1.0-beta8:
-  version "4.1.0-beta8"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.1.0-beta8.tgz#c1ef323ba336d92f5b52302b66f672dfff75b3ef"
-  integrity sha512-6lf+XVv0qT285w49P92tSYoUB406jdbgdhnPKNzxCIGtGX8kcwK+pHZ8HncDwcEhmTmI4LZ/WXPGtOQJg+onwg==
+xterm@4.2.0-beta4:
+  version "4.2.0-beta4"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta4.tgz#596577f94a1da372119d192363ea2b19d1f8b50c"
+  integrity sha512-BmkpxCpqdOJoNdIcddkRT8S65sGjgBbWI0uIJNSnzZvj81OKcraMSTmF/ODw0TF/MDLc33Fx9cpDx/D6lQgl8Q==
 
 yauzl@^2.9.2:
   version "2.10.0"