Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check

remote/.yarnrc

@@ -1,3 +1,3 @@
 disturl "http://nodejs.org/dist"
-target "10.2.1"
+target "10.11.0"
 runtime "node"

remote/installDevModules.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-set -ex
-
-# Install Node and Yarn
-export NODE_VERSION=10.2.1
-export YARN_VERSION=1.10.1
-curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz"
-curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz"
-tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C "$HOME" --no-same-owner
-tar -xzf "yarn-v$YARN_VERSION.tar.gz" -C "$HOME"
-mkdir -p "$HOME/bin"
-ln -s "$HOME/node-v$NODE_VERSION-linux-x64/bin/node" "$HOME/bin/node"
-ln -s "$HOME/yarn-v$YARN_VERSION/bin/yarn" "$HOME/bin/yarn"
-ln -s "$HOME/yarn-v$YARN_VERSION/bin/yarnpkg" "$HOME/bin/yarnpkg"
-rm "node-v$NODE_VERSION-linux-x64.tar.xz" "yarn-v$YARN_VERSION.tar.gz"
-
-# Compile native /remote node_modules
-PATH="$HOME/bin:$PATH" \
-PYTHON=/usr/bin/python2.7 \
-yarn --ignore-optional

remote/installDevPackagesAsRoot.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-set -ex
-
-# Install libraries and tools
-apt-get update
-apt-get install -y \
-	curl \
-	make \
-	gcc \
-	g++ \
-	python2.7 \
-	libx11-dev \
-	libxkbfile-dev \
-	libsecret-1-dev \
-	xz-utils
-rm -rf /var/lib/apt/lists/*

remote/launchDevMode.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-set -e
-
-export NODE_ENV=development
-export VSCODE_DEV=1
-export VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH="$HOME/.vscode-remote/bin/dev-remote/node_modules"
-
-cd $VSCODE_REPO
-
-if [ -z "$extensions" ] ; then
-	echo No extensions to install.
-	mkdir -p /root/.vscode-remote
-else
-	(PATH="$HOME/bin:$PATH" node out/remoteExtensionHostAgent.js ${VSCODE_TELEMETRY_ARG} ${extensions} || true)
-fi
-
-PATH="$HOME/bin:$PATH" node out/remoteExtensionHostAgent.js ${VSCODE_TELEMETRY_ARG} --port $PORT

remote/package.json

@@ -3,26 +3,31 @@
   "version": "0.0.0",
   "dependencies": {
     "applicationinsights": "1.0.8",
-    "getmac": "^1.4.6",
+    "getmac": "1.4.1",
     "graceful-fs": "4.1.11",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.1",
-    "iconv-lite": "0.4.23",
+    "iconv-lite": "0.5.0",
     "jschardet": "1.6.0",
-    "keytar": "4.2.1",
     "minimist": "1.2.0",
     "native-watchdog": "1.0.0",
-    "node-pty": "0.8.1",
+    "node-pty": "0.9.0-beta19",
+    "nsfw": "1.2.5",
+    "onigasm-umd": "^2.2.2",
     "semver": "^5.5.0",
-    "spdlog": "0.8.1",
-    "vscode-chokidar": "1.6.5",
-    "vscode-nsfw": "1.1.1",
+    "spdlog": "^0.9.0",
+    "vscode-chokidar": "2.1.7",
     "vscode-proxy-agent": "0.4.0",
-    "vscode-ripgrep": "^1.2.5",
-    "yauzl": "^2.9.1",
+    "vscode-ripgrep": "^1.3.1",
+    "vscode-textmate": "^4.2.2",
+    "xterm": "3.15.0-beta71",
+    "xterm-addon-search": "0.2.0-beta2",
+    "xterm-addon-web-links": "0.1.0-beta10",
+    "yauzl": "^2.9.2",
     "yazl": "^2.4.3"
   },
   "optionalDependencies": {
-    "vscode-windows-ca-certs": "0.1.0"
+    "vscode-windows-ca-certs": "0.1.0",
+    "vscode-windows-registry": "1.0.1"
   }
 }

remote/web/.yarnrc

@@ -0,0 +1,3 @@
+disturl "http://nodejs.org/dist"
+target "10.11.0"
+runtime "node"

remote/web/package.json

@@ -0,0 +1,11 @@
+{
+	"name": "vscode-web",
+	"version": "0.0.0",
+	"dependencies": {
+	  "onigasm-umd": "^2.2.2",
+	  "vscode-textmate": "^4.1.1",
+	  "xterm": "3.15.0-beta67",
+	  "xterm-addon-search": "0.2.0-beta2",
+	  "xterm-addon-web-links": "0.1.0-beta10"
+	}
+  }

remote/web/yarn.lock

@@ -0,0 +1,42 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+nan@^2.14.0:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+
+onigasm-umd@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/onigasm-umd/-/onigasm-umd-2.2.2.tgz#b989d762df61f899a3052ac794a50bd93fe20257"
+  integrity sha512-v2eMOJu7iE444L2iJN+U6s6s5S0y7oj/N0DAkrd6wokRtTVoq/v/yaDI1lIqFrTeJbNtqNzYvguDF5yNzW3Rvw==
+
+oniguruma@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/oniguruma/-/oniguruma-7.2.0.tgz#c9a59c1ea7b9fe67e237a02e02139b638856f3af"
+  integrity sha512-bh+ZLdykY1sdIx8jBp2zpLbVFDBc3XmKH4Ceo2lijNaN1WhEqtnpqFlmtCbRuDB17nJ58RAUStVwfW8e8uEbnA==
+  dependencies:
+    nan "^2.14.0"
+
+vscode-textmate@^4.1.1:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-4.2.2.tgz#0b4dabc69a6fba79a065cb6b615f66eac07c8f4c"
+  integrity sha512-1U4ih0E/KP1zNK/EbpUqyYtI7PY+Ccd2nDGTtiMR/UalLFnmaYkwoWhN1oI7B91ptBN8NdVwWuvyUnvJAulCUw==
+  dependencies:
+    oniguruma "^7.2.0"
+
+xterm-addon-search@0.2.0-beta2:
+  version "0.2.0-beta2"
+  resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.2.0-beta2.tgz#c3173f0a6f207ee9f1848849174ee5d6b6ce8262"
+  integrity sha512-XEcwi2TeFGk2MuIFjiI/OpVXSNO5dGQBvHH3o+9KzqG3ooVqhhDqzwxs092QGNcNCGh8hGn/PWZiczaBBnKm/g==
+
+xterm-addon-web-links@0.1.0-beta10:
+  version "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-beta67:
+  version "3.15.0-beta67"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta67.tgz#71973e174bdc08df620945eecd3f87912f1ac550"
+  integrity sha512-qLfo9GHVlu/IxgDI3vRGObWZM7UL4eLhMfjZhprx2aXNMpzmrOW6l3JDRsCjUWm93EoVavbULtnDhGSiTlKitQ==