Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue

build/gulpfile.reh.js

@@ -7,10 +7,111 @@
 
 const gulp = require('gulp');
 
+const path = require('path');
+const es = require('event-stream');
+const util = require('./lib/util');
+const task = require('./lib/task');
+
+const vfs = require('vinyl-fs');
+const flatmap = require('gulp-flatmap');
+const gunzip = require('gulp-gunzip');
+const untar = require('gulp-untar');
+const File = require('vinyl');
+const fs = require('fs');
+
+const REPO_ROOT = path.dirname(__dirname);
+
 const noop = () => { return Promise.resolve(); };
 
 gulp.task('vscode-reh-win32-ia32-min', noop);
 gulp.task('vscode-reh-win32-x64-min', noop);
 gulp.task('vscode-reh-darwin-min', noop);
 gulp.task('vscode-reh-linux-x64-min', noop);
-gulp.task('vscode-reh-linux-arm-min', noop);
+gulp.task('vscode-reh-linux-armhf-min', noop);
+
+
+function getNodeVersion() {
+	const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
+	const target = /^target "(.*)"$/m.exec(yarnrc)[1];
+	return target;
+}
+
+function ensureDirs(dirPath) {
+	if (!fs.existsSync(dirPath)) {
+		ensureDirs(path.dirname(dirPath));
+		fs.mkdirSync(dirPath);
+	}
+}
+
+/* Downloads the node executable used for the remote server to ./build/node-remote */
+gulp.task(task.define('node-remote', () => {
+	const VERSION = getNodeVersion();
+	const nodePath = path.join('.build', 'node-remote');
+	const nodeVersionPath = path.join(nodePath, 'version');
+	if (!fs.existsSync(nodeVersionPath) || fs.readFileSync(nodeVersionPath).toString() !== VERSION) {
+		ensureDirs(nodePath);
+		util.rimraf(nodePath);
+		fs.writeFileSync(nodeVersionPath, VERSION);
+		return nodejs(process.platform, process.arch).pipe(vfs.dest(nodePath));
+	}
+	return vfs.src(nodePath);
+}));
+
+function nodejs(platform, arch) {
+	const VERSION = getNodeVersion();
+
+	if (arch === 'ia32') {
+		arch = 'x86';
+	}
+
+	if (platform === 'win32') {
+		const downloadPath = `/dist/v${VERSION}/win-${arch}/node.exe`;
+
+		return (
+			util.download({ host: 'nodejs.org', path: downloadPath })
+				.pipe(es.through(function (data) {
+					// base comes in looking like `https:\nodejs.org\dist\v10.2.1\win-x64\node.exe`
+					this.emit('data', new File({
+						path: data.path,
+						base: data.base.replace(/\\node\.exe$/, ''),
+						contents: data.contents,
+						stat: {
+							isFile: true,
+							mode: /* 100755 */ 33261
+						}
+					}));
+				}))
+		);
+	}
+
+	if (platform === 'darwin') {
+		arch = 'x64';
+	}
+
+	if (arch === 'armhf') {
+		arch = 'armv7l';
+	}
+
+	const downloadPath = `/dist/v${VERSION}/node-v${VERSION}-${platform}-${arch}.tar.gz`;
+
+	return (
+		util.download({ host: 'nodejs.org', path: downloadPath })
+			.pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
+			.pipe(es.through(function (data) {
+				// base comes in looking like `https:/nodejs.org/dist/v8.9.3/node-v8.9.3-darwin-x64.tar.gz`
+				// => we must remove the `.tar.gz`
+				// Also, keep only bin/node
+				if (/\/bin\/node$/.test(data.path)) {
+					this.emit('data', new File({
+						path: data.path.replace(/bin\/node$/, 'node'),
+						base: data.base.replace(/\.tar\.gz$/, ''),
+						contents: data.contents,
+						stat: {
+							isFile: true,
+							mode: /* 100755 */ 33261
+						}
+					}));
+				}
+			}))
+	);
+}