Merge from master

2026-01-13 17:22:15 -05:00 · 2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,19 +0,0 @@
-{
-	"env": {
-		"node": true,
-		"es6": true
-	},
-	"rules": {
-		"no-console": 0,
-		"no-cond-assign": 0,
-		"no-unused-vars": 1,
-		"no-extra-semi": "warn",
-		"semi": "warn"
-	},
-	"extends": "eslint:recommended",
-	"parserOptions": {
-		"ecmaFeatures": {
-			"experimentalObjectRestSpread": true
-		}
-	}
-}
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -0,0 +1,20 @@
+{
+	"root": true,
+	"env": {
+		"node": true,
+		"es6": true
+	},
+	"rules": {
+		"no-console": 0,
+		"no-cond-assign": 0,
+		"no-unused-vars": 1,
+		"no-extra-semi": "warn",
+		"semi": "warn"
+	},
+	"extends": "eslint:recommended",
+	"parserOptions": {
+		"ecmaFeatures": {
+			"experimentalObjectRestSpread": true
+		}
+	}
+}
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ npm-debug.log
 Thumbs.db
 node_modules/
 .build/
+extensions/**/dist/
 out/
 out-build/
 out-editor/
--- a/.vscode/cglicenses.schema.json
+++ b/.vscode/cglicenses.schema.json
@@ -0,0 +1,23 @@
+{
+	"type": "array",
+	"items": {
+		"type": "object",
+		"required": [
+			"name",
+			"licenseDetail"
+		],
+		"properties": {
+			"name": {
+				"type": "string",
+				"description": "The name of the dependency"
+			},
+			"licenseDetail": {
+				"type": "array",
+				"description": "The complete license text of the dependency",
+				"items": {
+					"type": "string"
+				}
+			}
+		}
+	}
+}
--- a/.vscode/cgmanifest.schema.json
+++ b/.vscode/cgmanifest.schema.json
@@ -0,0 +1,142 @@
+{
+	"type": "object",
+	"properties": {
+		"registrations": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"component": {
+						"oneOf": [
+							{
+								"type": "object",
+								"required": [
+									"type",
+									"git"
+								],
+								"properties": {
+									"type": {
+										"type": "string",
+										"enum": [
+											"git"
+										]
+									},
+									"git": {
+										"type": "object",
+										"required": [
+											"name",
+											"repositoryUrl",
+											"commitHash"
+										],
+										"properties": {
+											"name": {
+												"type": "string"
+											},
+											"repositoryUrl": {
+												"type": "string"
+											},
+											"commitHash": {
+												"type": "string"
+											}
+										}
+									}
+								}
+							},
+							{
+								"type": "object",
+								"required": [
+									"type",
+									"npm"
+								],
+								"properties": {
+									"type": {
+										"type": "string",
+										"enum": [
+											"npm"
+										]
+									},
+									"npm": {
+										"type": "object",
+										"required": [
+											"name",
+											"version"
+										],
+										"properties": {
+											"name": {
+												"type": "string"
+											},
+											"version": {
+												"type": "string"
+											}
+										}
+									}
+								}
+							},
+							{
+								"type": "object",
+								"required": [
+									"type",
+									"other"
+								],
+								"properties": {
+									"type": {
+										"type": "string",
+										"enum": [
+											"other"
+										]
+									},
+									"other": {
+										"type": "object",
+										"required": [
+											"name",
+											"downloadUrl",
+											"version"
+										],
+										"properties": {
+											"name": {
+												"type": "string"
+											},
+											"downloadUrl": {
+												"type": "string"
+											},
+											"version": {
+												"type": "string"
+											}
+										}
+									}
+								}
+							}
+						]
+					},
+					"repositoryUrl": {
+						"type": "string",
+						"description": "The git url of the component"
+					},
+					"version": {
+						"type": "string",
+						"description": "The version of the component"
+					},
+					"license": {
+						"type": "string",
+						"description": "The name of the license"
+					},
+					"developmentDependency": {
+						"type": "boolean",
+						"description": "This component is inlined in the vscode repo and **is not shipped**."
+					},
+					"isOnlyProductionDependency": {
+						"type": "boolean",
+						"description": "This component is shipped and **is not inlined in the vscode repo**."
+					},
+					"licenseDetail": {
+						"type": "array",
+						"items": {
+							"type": "string"
+						},
+						"description": "The license text"
+					}
+				}
+			}
+		}
+	}
+}
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -2,7 +2,7 @@
 	// See https://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
-		"eg2.tslint",
+		"ms-vscode.vscode-typescript-tslint-plugin",
 		"dbaeumer.vscode-eslint",
 		"msjsdiag.debugger-for-chrome"
 	]
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,14 +9,12 @@
 			"stopOnEntry": true,
 			"args": [
 				"hygiene"
-			],
-			"cwd": "${workspaceFolder}"
+			]
 		},
 		{
 			"type": "node",
 			"request": "attach",
 			"name": "Attach to Extension Host",
-			"protocol": "inspector",
 			"port": 5870,
 			"restart": true,
 			"outFiles": [
@@ -24,19 +22,15 @@
 			]
 		},
 		{
-			"type": "node",
+			"type": "chrome",
 			"request": "attach",
 			"name": "Attach to Shared Process",
-			"protocol": "inspector",
-			"port": 5871,
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			]
+			"port": 9222,
+			"urlFilter": "*"
 		},
 		{
 			"type": "node",
 			"request": "attach",
-			"protocol": "inspector",
 			"name": "Attach to Search Process",
 			"port": 5876,
 			"outFiles": [
@@ -47,7 +41,6 @@
 			"type": "node",
 			"request": "attach",
 			"name": "Attach to CLI Process",
-			"protocol": "inspector",
 			"port": 5874,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
@@ -57,7 +50,6 @@
 			"type": "node",
 			"request": "attach",
 			"name": "Attach to Main Process",
-			"protocol": "inspector",
 			"port": 5875,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
@@ -82,9 +74,9 @@
 			"linux": {
 				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
 			},
-			"urlFilter": "*index.html*",
+			"urlFilter": "*workbench.html*",
 			"runtimeArgs": [
-				"--inspect=5875"
+				"--inspect=5875", "--no-cached-data"
 			],
 			"skipFiles": [
 				"**/winjs*.js"
@@ -116,34 +108,6 @@
 			"webRoot": "${workspaceFolder}",
 			"timeout": 45000
 		},
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Unit Tests",
-			"protocol": "inspector",
-			"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
-			"runtimeExecutable": "${workspaceFolder}/.build/electron/Azure Data Studio.app/Contents/MacOS/Electron",
-			"windows": {
-				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio.exe"
-			},
-			"linux": {
-				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio"
-			},
-			"stopOnEntry": false,
-			"outputCapture": "std",
-			"args": [
-				"--delay",
-				"--timeout",
-				"2000"
-			],
-			"cwd": "${workspaceFolder}",
-			"env": {
-				"ELECTRON_RUN_AS_NODE": "true"
-			},
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			]
-		},
 		{
 			"name": "Launch Built-in Extension",
 			"type": "extensionHost",
@@ -162,9 +126,37 @@
 			"env": {
 				"BUILD_ARTIFACTSTAGINGDIRECTORY": "${workspaceFolder}"
 			}
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Run Unit Tests",
+			"program": "${workspaceFolder}/test/electron/index.js",
+			"runtimeExecutable": "${workspaceFolder}/.build/electron/Azure Data Studio.app/Contents/MacOS/Electron",
+			"windows": {
+				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio.exe"
+			},
+			"linux": {
+				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio"
+			},
+			"outputCapture": "std",
+			"args": [
+				"--remote-debugging-port=9222"
+			],
+			"cwd": "${workspaceFolder}",
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			]
 		}
 	],
 	"compounds": [
+		{
+			"name": "Debug Unit Tests",
+			"configurations": [
+				"Attach to azuredatastudio",
+				"Run Unit Tests"
+			]
+		},
 		{
 			"name": "Debug azuredatastudio Main and Renderer",
 			"configurations": [
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,7 +11,7 @@
 		}
 	},
 	"files.associations": {
-		"OSSREADME.json": "jsonc"
+		"cglicenses.json": "jsonc"
 	},
 	"search.exclude": {
 		"**/node_modules": true,
@@ -22,9 +22,9 @@
 		"out-vscode/**": true,
 		"i18n/**": true,
 		"extensions/**/out/**": true,
-		"test/smoke/out/**": true
+		"test/smoke/out/**": true,
+		"src/vs/base/test/node/uri.test.data.txt": true
 	},
-	"tslint.enable": true,
 	"lcov.path": [
 		"./.build/coverage/lcov.info",
 		"./.build/coverage-single/lcov.info"
@@ -43,6 +43,12 @@
 	"git.ignoreLimitWarning": true,
 	"emmet.excludeLanguages": [],
 	"typescript.preferences.importModuleSpecifier": "non-relative",
-	"typescript.preferences.quoteStyle": "single"
-
+	"typescript.preferences.quoteStyle": "single",
+	"json.schemas": [{
+		"fileMatch": [ "cgmanifest.json" ],
+		"url": "./.vscode/cgmanifest.schema.json"
+	}, {
+		"fileMatch": [ "cglicenses.json" ],
+		"url": "./.vscode/cglicenses.schema.json"
+	}]
 }
--- a/.vscode/shared.code-snippets
+++ b/.vscode/shared.code-snippets
@@ -0,0 +1,38 @@
+{
+	// Each snippet is defined under a snippet name and has a scope, prefix, body and
+	// description. The scope defines in watch languages the snippet is applicable. The prefix is what is
+	// used to trigger the snippet and the body will be expanded and inserted.Possible variables are:
+	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
+	// Placeholders with the same ids are connected.
+	// Example:
+	"MSFT Copyright Header": {
+		"scope": "javascript,typescript,css",
+		"prefix": [
+			"header",
+			"stub",
+			"copyright"
+		],
+		"body": [
+			"/*---------------------------------------------------------------------------------------------",
+			" *  Copyright (c) Microsoft Corporation. All rights reserved.",
+			" *  Licensed under the Source EULA. See License.txt in the project root for license information.",
+			" *--------------------------------------------------------------------------------------------*/",
+			"",
+			"$0"
+		],
+		"description": "Insert Copyright Statement"
+	},
+	"TS -> Inject Service": {
+		"description": "Constructor Injection Pattern",
+		"prefix": "@inject",
+		"body": "@$1 private readonly _$2: ${1},$0"
+	},
+	"TS -> Event & Emitter": {
+		"prefix": "emitter",
+		"description": "Add emitter and event properties",
+		"body": [
+			"private readonly _onDid$1 = new Emitter<$2>();",
+			"readonly onDid$1: Event<$2> = this._onDid$1.event;"
+		],
+	}
+}
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -28,6 +28,23 @@
 				}
 			}
 		},
+		{
+			"type": "npm",
+			"script": "strict-null-check-watch",
+			"label": "TS - Strict Null Checks",
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never"
+			},
+			"problemMatcher": {
+				"base": "$tsc-watch",
+				"owner": "typescript-strict-null",
+				"applyTo": "allDocuments"
+			},
+			"runOptions": {
+				"runOn": "folderOpen"
+			}
+		},
 		{
 			"type": "gulp",
 			"task": "tslint",
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "2.0.9"
+target "2.0.12"
 runtime "electron"
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,9 @@ File a single issue per problem and feature request.
 * Do not enumerate multiple bugs or feature requests in the same issue.
 * Do not add your issue as a comment to an existing issue unless it's for the identical input. Many issues look similar, but have different causes.

-The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix.
+The more information you can provide, the more likely someone will be successful at reproducing the issue and finding a fix.
+
+The built-in tool for reporting an issue, which you can access by using `Report Issue` in Azure Data Studio's Help menu, can help streamline this process by automatically providing the version of Azure Data Studio, all your installed extensions, and your system info.

 Please include the following with each issue.

--- a/OSSREADME.json
+++ b/OSSREADME.json
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -74,8 +74,6 @@ expressly granted herein, whether by implication, estoppel or otherwise.
    Microsoft PROSE SDK: https://microsoft.github.io/prose

 %% angular NOTICES AND INFORMATION BEGIN HERE
-=========================================
-The MIT License

 Copyright (c) 2014-2017 Google, Inc. http://angular.io

--- a/azure-pipelines-linux-mac.yml
+++ b/azure-pipelines-linux-mac.yml
@@ -12,9 +12,13 @@ steps:
  displayName: 'preinstall'

 - script: |
-    export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0
-    sh -e /etc/init.d/xvfb start
-    sleep 3
+    export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:10
+    sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
+    sudo chmod +x /etc/init.d/xvfb
+    sudo update-rc.d xvfb defaults
+    sudo service xvfb start
+    # sh -e /etc/init.d/xvfb start
+    # sleep 3
  displayName: 'Linux preinstall'
  condition: eq(variables['Agent.OS'], 'Linux')

@@ -23,13 +27,13 @@ steps:
  displayName:  'Install'

 - script: |
-    node_modules/.bin/gulp electron --silent
-    node_modules/.bin/gulp compile --silent --max_old_space_size=4096
-    node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096
+    node_modules/.bin/gulp electron
+    node_modules/.bin/gulp compile --max_old_space_size=4096
+    node_modules/.bin/gulp optimize-vscode --max_old_space_size=4096
  displayName: 'Scripts'

 - script: |
-    ./scripts/test.sh --reporter mocha-junit-reporter
+    DISPLAY=:10 ./scripts/test.sh --reporter mocha-junit-reporter
  displayName: 'Tests'

 - task: PublishTestResults@2
--- a/build/azure-pipelines/common/.gitignore
+++ b/build/azure-pipelines/common/.gitignore
--- a/build/azure-pipelines/common/installDistro.ts
+++ b/build/azure-pipelines/common/installDistro.ts
@@ -3,10 +3,10 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-const cp = require('child_process');
+import * as  cp from 'child_process';

-function yarnInstall(package: string): void {
-	cp.execSync(`yarn add --no-lockfile ${package}`);
+function yarnInstall(packageName: string): void {
+	cp.execSync(`yarn add --no-lockfile ${packageName}`);
 }

 const product = require('../../../product.json');
--- a/build/azure-pipelines/common/publish.ts
+++ b/build/azure-pipelines/common/publish.ts
@@ -14,9 +14,8 @@ import * as mime from 'mime';
 import * as minimist from 'minimist';
 import { DocumentClient, NewDocument } from 'documentdb';

-// {{SQL CARBON EDIT}}
-if (process.argv.length < 9) {
-	console.error('Usage: node publish.js <product_quality> <platform> <file_type> <file_name> <version> <is_update> <file> [commit_id]');
+if (process.argv.length < 6) {
+	console.error('Usage: node publish.js <product> <platform> <type> <name> <version> <commit> <is_update> <file>');
 	process.exit(-1);
 }

@@ -44,7 +43,7 @@ function createDefaultConfig(quality: string): Config {
 }

 function getConfig(quality: string): Promise<Config> {
-	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
 	const collection = 'dbs/builds/colls/config';
 	const query = {
 		query: `SELECT TOP 1 * FROM c WHERE c.id = @quality`,
@@ -74,7 +73,7 @@ interface Asset {
 }

 function createOrUpdate(commit: string, quality: string, platform: string, type: string, release: NewDocument, asset: Asset, isUpdate: boolean): Promise<void> {
-	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
 	const collection = 'dbs/builds/colls/' + quality;
 	const updateQuery = {
 		query: 'SELECT TOP 1 * FROM c WHERE c.id = @id',
@@ -128,7 +127,7 @@ async function assertContainer(blobService: azure.BlobService, quality: string):
 	await new Promise((c, e) => blobService.createContainerIfNotExists(quality, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
 }

-async function doesAssetExist(blobService: azure.BlobService, quality: string, blobName: string): Promise<boolean> {
+async function doesAssetExist(blobService: azure.BlobService, quality: string, blobName: string): Promise<boolean | undefined> {
 	const existsResult = await new Promise<azure.BlobService.BlobResult>((c, e) => blobService.doesBlobExist(quality, blobName, (err, r) => err ? e(err) : c(r)));
 	return existsResult.exists;
 }
@@ -151,8 +150,8 @@ interface PublishOptions {
 async function publish(commit: string, quality: string, platform: string, type: string, name: string, version: string, _isUpdate: string, file: string, opts: PublishOptions): Promise<void> {
 	const isUpdate = _isUpdate === 'true';

-	const queuedBy = process.env['BUILD_QUEUEDBY'];
-	const sourceBranch = process.env['BUILD_SOURCEBRANCH'];
+	const queuedBy = process.env['BUILD_QUEUEDBY']!;
+	const sourceBranch = process.env['BUILD_SOURCEBRANCH']!;
 	const isReleased = quality === 'insider'
 		&& /^master$|^refs\/heads\/master$/.test(sourceBranch)
 		&& /Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy);
@@ -180,25 +179,12 @@ async function publish(commit: string, quality: string, platform: string, type:
 	console.log('SHA256:', sha256hash);

 	const blobName = commit + '/' + name;
-	const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2'];
+	const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2']!;

-	const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2'])
+	const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2']!)
 		.withFilter(new azure.ExponentialRetryPolicyFilter(20));

-	// {{SQL CARBON EDIT}}
-	await assertContainer(blobService, quality);
-
-	const blobExists = await doesAssetExist(blobService, quality, blobName);
-
-	const promises = [];
-
-	if (!blobExists) {
-		promises.push(uploadBlob(blobService, quality, blobName, file));
-	}
-
-	// {{SQL CARBON EDIT}}
-	if (process.env['MOONCAKE_STORAGE_ACCESS_KEY']) {
-		const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY'], `${storageAccount}.blob.core.chinacloudapi.cn`)
+	const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY']!, `${storageAccount}.blob.core.chinacloudapi.cn`)
 		.withFilter(new azure.ExponentialRetryPolicyFilter(20));

 	// mooncake is fussy and far away, this is needed!
@@ -214,7 +200,7 @@ async function publish(commit: string, quality: string, platform: string, type:
 		doesAssetExist(mooncakeBlobService, quality, blobName)
 	]);

-		const promises = [];
+	const promises: Array<Promise<void>> = [];

 	if (!blobExists) {
 		promises.push(uploadBlob(blobService, quality, blobName, file));
@@ -223,10 +209,6 @@ async function publish(commit: string, quality: string, platform: string, type:
 	if (!moooncakeBlobExists) {
 		promises.push(uploadBlob(mooncakeBlobService, quality, blobName, file));
 	}
-	} else {
-		console.log('Skipping Mooncake publishing.');
-	}
-

 	if (promises.length === 0) {
 		console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
@@ -247,8 +229,7 @@ async function publish(commit: string, quality: string, platform: string, type:
 		platform: platform,
 		type: type,
 		url: `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`,
-		// {{SQL CARBON EDIT}}
-		mooncakeUrl: process.env['MOONCAKE_CDN_URL'] ? `${process.env['MOONCAKE_CDN_URL']}/${quality}/${blobName}` : undefined,
+		mooncakeUrl: `${process.env['MOONCAKE_CDN_URL']}/${quality}/${blobName}`,
 		hash: sha1hash,
 		sha256hash,
 		size
@@ -268,7 +249,7 @@ async function publish(commit: string, quality: string, platform: string, type:
 		isReleased: config.frozen ? false : isReleased,
 		sourceBranch,
 		queuedBy,
-		assets: [],
+		assets: [] as Array<Asset>,
 		updates: {} as any
 	};

@@ -284,15 +265,17 @@ async function publish(commit: string, quality: string, platform: string, type:
 }

 function main(): void {
+	if (process.env['VSCODE_BUILD_SKIP_PUBLISH']) {
+		console.warn('Skipping publish due to VSCODE_BUILD_SKIP_PUBLISH');
+		return;
+	}
+
 	const opts = minimist<PublishOptions>(process.argv.slice(2), {
 		boolean: ['upload-only']
 	});

-	// {{SQL CARBON EDIT}}
-	let [quality, platform, type, name, version, _isUpdate, file, commit] = opts._;
-	if (!commit) {
-		commit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();
-	}
+	const [quality, platform, type, name, version, _isUpdate, file] = opts._;
+	const commit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();

 	publish(commit, quality, platform, type, name, version, _isUpdate, file, opts).catch(err => {
 		console.error(err);
--- a/build/azure-pipelines/common/symbols.ts
+++ b/build/azure-pipelines/common/symbols.ts
@@ -97,7 +97,7 @@ function updateVersion(accessor: IVersionAccessor, symbolsPath: string) {

 function asyncRequest<T>(options: request.UrlOptions & request.CoreOptions): Promise<T> {
 	return new Promise<T>((resolve, reject) => {
-		request(options, (error, response, body) => {
+		request(options, (error, _response, body) => {
 			if (error) {
 				reject(error);
 			} else {
@@ -107,17 +107,17 @@ function asyncRequest<T>(options: request.UrlOptions & request.CoreOptions): Pro
 	});
 }

-function downloadAsset(repository, assetName: string, targetPath: string, electronVersion: string) {
+function downloadAsset(repository: any, assetName: string, targetPath: string, electronVersion: string) {
 	return new Promise((resolve, reject) => {
-		repository.getReleases({ tag_name: `v${electronVersion}` }, (err, releases) => {
+		repository.getReleases({ tag_name: `v${electronVersion}` }, (err: any, releases: any) => {
 			if (err) {
 				reject(err);
 			} else {
-				const asset = releases[0].assets.filter(asset => asset.name === assetName)[0];
+				const asset = releases[0].assets.filter((asset: any) => asset.name === assetName)[0];
 				if (!asset) {
 					reject(new Error(`Asset with name ${assetName} not found`));
 				} else {
-					repository.downloadAsset(asset, (err, reader) => {
+					repository.downloadAsset(asset, (err: any, reader: any) => {
 						if (err) {
 							reject(err);
 						} else {
@@ -156,7 +156,7 @@ async function ensureVersionAndSymbols(options: IOptions) {
 	const symbolsName = symbolsZipName(options.platform, options.versions.electron, options.versions.insiders);
 	const symbolsPath = await tmpFile('symbols.zip');
 	console.log(`HockeyApp: downloading symbols ${symbolsName} for electron ${options.versions.electron} (${options.platform}) into ${symbolsPath}`);
-	await downloadAsset(new github({ repo: options.repository, token: options.access.githubToken }), symbolsName, symbolsPath, options.versions.electron);
+	await downloadAsset(new (github as any)({ repo: options.repository, token: options.access.githubToken }), symbolsName, symbolsPath, options.versions.electron);

 	// Create version
 	console.log(`HockeyApp: creating new version ${options.versions.code} (${options.platform})`);
--- a/build/azure-pipelines/darwin/continuous-build-darwin.yml
+++ b/build/azure-pipelines/darwin/continuous-build-darwin.yml
@@ -0,0 +1,40 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.12.0"
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.10.1"
+- script: |
+    yarn
+  displayName: Install Dependencies
+- script: |
+    yarn gulp electron-x64
+  displayName: Download Electron
+- script: |
+    yarn gulp hygiene
+  displayName: Run Hygiene Checks
+- script: |
+    yarn monaco-compile-check
+  displayName: Run Monaco Editor Checks
+- script: |
+    yarn strict-null-check
+  displayName: Run Strict Null Checks
+- script: |
+    yarn compile
+  displayName: Compile Sources
+- script: |
+    yarn download-builtin-extensions
+  displayName: Download Built-in Extensions
+- script: |
+    ./scripts/test.sh --tfs "Unit Tests"
+  displayName: Run Unit Tests
+- script: |
+    ./scripts/test-integration.sh --tfs "Integration Tests"
+  displayName: Run Integration Tests
+- task: PublishTestResults@2
+  displayName: Publish Tests Results
+  inputs:
+    testResultsFiles: '*-results.xml'
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
+  condition: succeededOrFailed()
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -0,0 +1,91 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.12.0"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.10.1"
+
+- script: |
+    set -e
+    echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
+    yarn
+    yarn gulp -- hygiene
+    yarn monaco-compile-check
+    yarn strict-null-check
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" yarn gulp -- mixin
+    node build/azure-pipelines/common/installDistro.js
+    node build/lib/builtInExtensions.js
+  displayName: Prepare build
+
+- script: |
+    set -e
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
+    AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
+    yarn gulp -- vscode-darwin-min upload-vscode-sourcemaps
+  displayName: Build
+
+- script: |
+    set -e
+    ./scripts/test.sh --build --tfs "Unit Tests"
+    # APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`"
+    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME"
+  displayName: Run unit tests
+
+- script: |
+    set -e
+    pushd ../VSCode-darwin && zip -r -X -y ../VSCode-darwin.zip * && popd
+  displayName: Archive build
+
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  inputs:
+    ConnectedServiceName: 'ESRP CodeSign'
+    FolderPath: '$(agent.builddirectory)'
+    Pattern: 'VSCode-darwin.zip'
+    signConfigType: inlineSignParams
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-401337-Apple",
+          "operationSetCode": "MacAppDeveloperSign",
+          "parameters": [ ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 120
+  displayName: Codesign
+
+- script: |
+    set -e
+
+    # remove pkg from archive
+    zip -d ../VSCode-darwin.zip "*.pkg"
+
+    # publish the build
+    PACKAGEJSON=`ls ../VSCode-darwin/*.app/Contents/Resources/app/package.json`
+    VERSION=`node -p "require(\"$PACKAGEJSON\").version"`
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/azure-pipelines/common/publish.js \
+      "$(VSCODE_QUALITY)" \
+      darwin \
+      archive \
+      "VSCode-darwin-$(VSCODE_QUALITY).zip" \
+      $VERSION \
+      true \
+      ../VSCode-darwin.zip
+
+    # publish hockeyapp symbols
+    node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_MACOS)"
+
+    # upload configuration
+    AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
+    yarn gulp -- upload-vscode-configuration
+  displayName: Publish
+
+- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+  displayName: 'Component Detection'
+  continueOnError: true
--- a/build/azure-pipelines/linux/.gitignore
+++ b/build/azure-pipelines/linux/.gitignore
@@ -0,0 +1 @@
+pat
--- a/build/azure-pipelines/linux/continuous-build-linux.yml
+++ b/build/azure-pipelines/linux/continuous-build-linux.yml
@@ -0,0 +1,45 @@
+steps:
+- script: |
+    set -e
+    sudo apt-get update
+    sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0
+    sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
+    sudo chmod +x /etc/init.d/xvfb
+    sudo update-rc.d xvfb defaults
+    sudo service xvfb start
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.12.0"
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.10.1"
+- script: |
+    yarn
+  displayName: Install Dependencies
+- script: |
+    yarn gulp electron-x64
+  displayName: Download Electron
+- script: |
+    yarn gulp hygiene
+  displayName: Run Hygiene Checks
+- script: |
+    yarn monaco-compile-check
+  displayName: Run Monaco Editor Checks
+- script: |
+    yarn strict-null-check
+  displayName: Run Strict Null Checks
+- script: |
+    yarn compile
+  displayName: Compile Sources
+- script: |
+    yarn download-builtin-extensions
+  displayName: Download Built-in Extensions
+- script: |
+    DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
+  displayName: Run Unit Tests
+- task: PublishTestResults@2
+  displayName: Publish Tests Results
+  inputs:
+    testResultsFiles: '*-results.xml'
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
+  condition: succeededOrFailed()
--- a/build/azure-pipelines/linux/frozen-check.js
+++ b/build/azure-pipelines/linux/frozen-check.js
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const documentdb_1 = require("documentdb");
+function createDefaultConfig(quality) {
+    return {
+        id: quality,
+        frozen: false
+    };
+}
+function getConfig(quality) {
+    const client = new documentdb_1.DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    const collection = 'dbs/builds/colls/config';
+    const query = {
+        query: `SELECT TOP 1 * FROM c WHERE c.id = @quality`,
+        parameters: [
+            { name: '@quality', value: quality }
+        ]
+    };
+    return new Promise((c, e) => {
+        client.queryDocuments(collection, query).toArray((err, results) => {
+            if (err && err.code !== 409) {
+                return e(err);
+            }
+            c(!results || results.length === 0 ? createDefaultConfig(quality) : results[0]);
+        });
+    });
+}
+getConfig(process.argv[2])
+    .then(config => {
+    console.log(config.frozen);
+    process.exit(0);
+})
+    .catch(err => {
+    console.error(err);
+    process.exit(1);
+});
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -0,0 +1,112 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.12.0"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.10.1"
+
+- script: |
+    set -e
+    export npm_config_arch="$(VSCODE_ARCH)"
+    if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
+      export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
+    fi
+
+    echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
+    CHILD_CONCURRENCY=1 yarn
+    npm run gulp -- hygiene
+    npm run monaco-compile-check
+    npm run strict-null-check
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
+    node build/azure-pipelines/common/installDistro.js
+    node build/lib/builtInExtensions.js
+
+- script: |
+    set -e
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
+  name: build
+
+- script: |
+    set -e
+    npm run gulp -- "electron-$(VSCODE_ARCH)"
+
+    # xvfb seems to be crashing often, let's make sure it's always up
+    service xvfb start
+
+    DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
+    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
+  name: test
+
+- script: |
+    set -e
+    REPO="$(pwd)"
+    ROOT="$REPO/.."
+    ARCH="$(VSCODE_ARCH)"
+
+    # Publish tarball
+    PLATFORM_LINUX="linux-$(VSCODE_ARCH)"
+    [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
+    [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
+    BUILDNAME="VSCode-$PLATFORM_LINUX"
+    BUILD="$ROOT/$BUILDNAME"
+    BUILD_VERSION="$(date +%s)"
+    [ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.tar.gz"
+    TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
+    PACKAGEJSON="$BUILD/resources/app/package.json"
+    VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
+
+    rm -rf $ROOT/code-*.tar.*
+    (cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
+
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$VERSION" true "$TARBALL_PATH"
+
+    # Publish hockeyapp symbols
+    node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX64)"
+
+    # Publish DEB
+    npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-deb"
+    PLATFORM_DEB="linux-deb-$ARCH"
+    [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
+    DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
+    DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
+
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" package "$DEB_FILENAME" "$VERSION" true "$DEB_PATH"
+
+    # Publish RPM
+    npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+    PLATFORM_RPM="linux-rpm-$ARCH"
+    [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
+    RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
+    RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
+
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH"
+
+    # Publish Snap
+    npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
+
+    # Pack snap tarball artifact, in order to preserve file perms
+    mkdir -p $REPO/.build/linux/snap-tarball
+    SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$(VSCODE_ARCH).tar.gz"
+    rm -rf $SNAP_TARBALL_PATH
+    (cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)
+
+- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+  displayName: 'Component Detection'
+  continueOnError: true
+
+- task: PublishPipelineArtifact@0
+  displayName: 'Publish Pipeline Artifact'
+  inputs:
+    artifactName: snap-$(VSCODE_ARCH)
+    targetPath: .build/linux/snap-tarball
--- a/build/azure-pipelines/linux/snap-build-linux.yml
+++ b/build/azure-pipelines/linux/snap-build-linux.yml
@@ -0,0 +1,42 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.12.0"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.10.1"
+
+- task: DownloadPipelineArtifact@0
+  displayName: 'Download Pipeline Artifact'
+  inputs:
+    artifactName: snap-$(VSCODE_ARCH)
+    targetPath: .build/linux/snap-tarball
+
+- script: |
+    set -e
+
+    REPO="$(pwd)"
+    ARCH="$(VSCODE_ARCH)"
+    SNAP_ROOT="$REPO/.build/linux/snap/$ARCH"
+
+    # Install build dependencies
+    (cd build && yarn)
+
+    # Unpack snap tarball artifact, in order to preserve file perms
+    SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$ARCH.tar.gz"
+    (cd .build/linux && tar -xzf $SNAP_TARBALL_PATH)
+
+    # Create snap package
+    BUILD_VERSION="$(date +%s)"
+    SNAP_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.snap"
+    PACKAGEJSON="$(ls $SNAP_ROOT/code*/usr/share/code*/resources/app/package.json)"
+    VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
+    SNAP_PATH="$SNAP_ROOT/$SNAP_FILENAME"
+    (cd $SNAP_ROOT/code-* && snapcraft snap --output "$SNAP_PATH")
+
+    # Publish snap package
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "linux-snap-$ARCH" package "$SNAP_FILENAME" "$VERSION" true "$SNAP_PATH"
--- a/build/azure-pipelines/linux/xvfb.init
+++ b/build/azure-pipelines/linux/xvfb.init
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -0,0 +1,65 @@
+resources:
+  containers:
+  - container: vscode-x64
+    image: joaomoreno/vscode-linux-build-agent:x64
+  - container: vscode-ia32
+    image: joaomoreno/vscode-linux-build-agent:ia32
+  - container: snapcraft
+    image: snapcore/snapcraft
+
+jobs:
+- job: Windows
+  condition: eq(variables['VSCODE_BUILD_WIN32'], 'true')
+  pool:
+    vmImage: VS2017-Win2016
+  variables:
+    VSCODE_ARCH: x64
+  steps:
+  - template: win32/product-build-win32.yml
+
+- job: Windows32
+  condition: eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true')
+  pool:
+    vmImage: VS2017-Win2016
+  variables:
+    VSCODE_ARCH: ia32
+  steps:
+  - template: win32/product-build-win32.yml
+
+- job: Linux
+  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  variables:
+    VSCODE_ARCH: x64
+  container: vscode-x64
+  steps:
+  - template: linux/product-build-linux.yml
+
+- job: LinuxSnap
+  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  variables:
+    VSCODE_ARCH: x64
+  container: snapcraft
+  dependsOn: Linux
+  steps:
+  - template: linux/snap-build-linux.yml
+
+- job: Linux32
+  condition: eq(variables['VSCODE_BUILD_LINUX_32BIT'], 'true')
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  variables:
+    VSCODE_ARCH: ia32
+  container: vscode-ia32
+  steps:
+  - template: linux/product-build-linux.yml
+
+- job: macOS
+  condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
+  pool:
+    vmImage: macOS 10.13
+  steps:
+  - template: darwin/product-build-darwin.yml
--- a/build/azure-pipelines/win32/ESRPClient/NuGet.config
+++ b/build/azure-pipelines/win32/ESRPClient/NuGet.config
--- a/build/azure-pipelines/win32/ESRPClient/packages.config
+++ b/build/azure-pipelines/win32/ESRPClient/packages.config
--- a/build/azure-pipelines/win32/continuous-build-win32.yml
+++ b/build/azure-pipelines/win32/continuous-build-win32.yml
@@ -0,0 +1,44 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.12.0"
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.10.1"
+- task: UsePythonVersion@0
+  inputs:
+    versionSpec: '2.x'
+    addToPath: true
+- powershell: |
+    yarn
+  displayName: Install Dependencies
+- powershell: |
+    yarn gulp electron
+  displayName: Download Electron
+- powershell: |
+    yarn gulp hygiene
+  displayName: Run Hygiene Checks
+- powershell: |
+    yarn monaco-compile-check
+  displayName: Run Monaco Editor Checks
+- script: |
+    yarn strict-null-check
+  displayName: Run Strict Null Checks
+- powershell: |
+    yarn compile
+  displayName: Compile Sources
+- powershell: |
+    yarn download-builtin-extensions
+  displayName: Download Built-in Extensions
+- powershell: |
+    .\scripts\test.bat --tfs "Unit Tests"
+  displayName: Run Unit Tests
+- powershell: |
+    .\scripts\test-integration.bat --tfs "Integration Tests"
+  displayName: Run Integration Tests
+- task: PublishTestResults@2
+  displayName: Publish Tests Results
+  inputs:
+    testResultsFiles: '*-results.xml'
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
+  condition: succeededOrFailed()
--- a/build/azure-pipelines/win32/exec.ps1
+++ b/build/azure-pipelines/win32/exec.ps1
--- a/build/azure-pipelines/win32/import-esrp-auth-cert.ps1
+++ b/build/azure-pipelines/win32/import-esrp-auth-cert.ps1
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -0,0 +1,152 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.12.0"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.10.1"
+
+- task: UsePythonVersion@0
+  inputs:
+    versionSpec: '2.x'
+    addToPath: true
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    "machine monacotools.visualstudio.com password $(VSO_PAT)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
+    $env:npm_config_arch="$(VSCODE_ARCH)"
+    $env:CHILD_CONCURRENCY="1"
+    $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
+    exec { yarn }
+    exec { npm run gulp -- hygiene }
+    exec { npm run monaco-compile-check }
+    exec { npm run strict-null-check }
+    exec { npm run gulp -- mixin }
+    exec { node build/azure-pipelines/common/installDistro.js }
+    exec { node build/lib/builtInExtensions.js }
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-min" }
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
+  name: build
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { npm run gulp -- "electron-$(VSCODE_ARCH)" }
+    exec { .\scripts\test.bat --build --tfs "Unit Tests" }
+    # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+  name: test
+
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  inputs:
+    ConnectedServiceName: 'ESRP CodeSign'
+    FolderPath: '$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)'
+    Pattern: '*.dll,*.exe,*.node'
+    signConfigType: inlineSignParams
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-230012",
+          "operationSetCode": "SigntoolSign",
+          "parameters": [
+            {
+              "parameterName": "OpusName",
+              "parameterValue": "VS Code"
+            },
+            {
+              "parameterName": "OpusInfo",
+              "parameterValue": "https://code.visualstudio.com/"
+            },
+            {
+              "parameterName": "Append",
+              "parameterValue": "/as"
+            },
+            {
+              "parameterName": "FileDigest",
+              "parameterValue": "/fd \"SHA256\""
+            },
+            {
+              "parameterName": "PageHash",
+              "parameterValue": "/NPH"
+            },
+            {
+              "parameterName": "TimeStamp",
+              "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        },
+        {
+          "keyCode": "CP-230012",
+          "operationSetCode": "SigntoolVerify",
+          "parameters": [
+            {
+              "parameterName": "VerifyAll",
+              "parameterValue": "/all"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 120
+
+- task: NuGetCommand@2
+  displayName: Install ESRPClient.exe
+  inputs:
+    restoreSolution: 'build\azure-pipelines\win32\ESRPClient\packages.config'
+    feedsToUse: config
+    nugetConfigPath: 'build\azure-pipelines\win32\ESRPClient\NuGet.config'
+    externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b
+    restoreDirectory: packages
+
+- task: ESRPImportCertTask@1
+  displayName: Import ESRP Request Signing Certificate
+  inputs:
+    ESRP: 'ESRP CodeSign'
+
+- powershell: |
+    $ErrorActionPreference = "Stop"
+    .\build\azure-pipelines\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(ESRP_AUTH_CERTIFICATE) -AuthCertificateKey $(ESRP_AUTH_CERTIFICATE_KEY)
+  displayName: Import ESRP Auth Certificate
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign }
+
+    $Repo = "$(pwd)"
+    $Root = "$Repo\.."
+    $SystemExe = "$Repo\.build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe"
+    $UserExe = "$Repo\.build\win32-$(VSCODE_ARCH)\user-setup\VSCodeSetup.exe"
+    $Zip = "$Repo\.build\win32-$(VSCODE_ARCH)\archive\VSCode-win32-$(VSCODE_ARCH).zip"
+    $Build = "$Root\VSCode-win32-$(VSCODE_ARCH)"
+
+    # get version
+    $PackageJson = Get-Content -Raw -Path "$Build\resources\app\package.json" | ConvertFrom-Json
+    $Version = $PackageJson.version
+    $Quality = "$env:VSCODE_QUALITY"
+    $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(AZURE_STORAGE_ACCESS_KEY_2)"
+    $env:MOONCAKE_STORAGE_ACCESS_KEY = "$(MOONCAKE_STORAGE_ACCESS_KEY)"
+    $env:AZURE_DOCUMENTDB_MASTERKEY = "$(AZURE_DOCUMENTDB_MASTERKEY)"
+
+    $assetPlatform = if ("$(VSCODE_ARCH)" -eq "ia32") { "win32" } else { "win32-x64" }
+
+    exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip }
+    exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $SystemExe }
+    exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform-user" setup "VSCodeUserSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $UserExe }
+
+    # publish hockeyapp symbols
+    $hockeyAppId = if ("$(VSCODE_ARCH)" -eq "ia32") { "$(VSCODE_HOCKEYAPP_ID_WIN32)" } else { "$(VSCODE_HOCKEYAPP_ID_WIN64)" }
+    exec { node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" $hockeyAppId }
+
+- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+  displayName: 'Component Detection'
+  continueOnError: true
--- a/build/azure-pipelines/win32/sign.ps1
+++ b/build/azure-pipelines/win32/sign.ps1
@@ -0,0 +1,70 @@
+function Create-TmpJson($Obj) {
+	$FileName = [System.IO.Path]::GetTempFileName()
+	ConvertTo-Json -Depth 100 $Obj | Out-File -Encoding UTF8 $FileName
+	return $FileName
+}
+
+$Auth = Create-TmpJson @{
+	Version = "1.0.0"
+	AuthenticationType = "AAD_CERT"
+	ClientId = $env:ESRPClientId
+	AuthCert = @{
+		SubjectName = $env:ESRPAuthCertificateSubjectName
+		StoreLocation = "LocalMachine"
+		StoreName = "My"
+	}
+	RequestSigningCert = @{
+		SubjectName = $env:ESRPCertificateSubjectName
+		StoreLocation = "LocalMachine"
+		StoreName = "My"
+	}
+}
+
+$Policy = Create-TmpJson @{
+	Version = "1.0.0"
+}
+
+$Input = Create-TmpJson @{
+	Version = "1.0.0"
+	SignBatches = @(
+		@{
+			SourceLocationType = "UNC"
+			SignRequestFiles = @(
+				@{
+					SourceLocation = $args[0]
+				}
+			)
+			SigningInfo = @{
+				Operations = @(
+					@{
+						KeyCode = "CP-230012"
+						OperationCode = "SigntoolSign"
+						Parameters = @{
+							OpusName = "VS Code"
+							OpusInfo = "https://code.visualstudio.com/"
+							Append = "/as"
+							FileDigest = "/fd `"SHA256`""
+							PageHash = "/NPH"
+							TimeStamp = "/tr `"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer`" /td sha256"
+						}
+						ToolName = "sign"
+						ToolVersion = "1.0"
+					},
+					@{
+						KeyCode = "CP-230012"
+						OperationCode = "SigntoolVerify"
+						Parameters = @{
+							VerifyAll = "/all"
+						}
+						ToolName = "sign"
+						ToolVersion = "1.0"
+					}
+				)
+			}
+		}
+	)
+}
+
+$Output = [System.IO.Path]::GetTempFileName()
+$ScriptPath = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+& "$ScriptPath\ESRPClient\packages\EsrpClient.1.0.27\tools\ESRPClient.exe" Sign -a $Auth -p $Policy -i $Input -o $Output
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -1,12 +1,2 @@
 [
-	{
-		"name": "ms-vscode.node-debug",
-		"version": "1.26.7",
-		"repo": "https://github.com/Microsoft/vscode-node-debug"
-	},
-	{
-		"name": "ms-vscode.node-debug2",
-		"version": "1.26.8",
-		"repo": "https://github.com/Microsoft/vscode-node-debug2"
-	}
 ]
--- a/build/dependencies.js
+++ b/build/dependencies.js
@@ -43,7 +43,7 @@ function asYarnDependency(prefix, tree) {
 }

 function getYarnProductionDependencies(cwd) {
-	const raw = cp.execSync('yarn list --json', { cwd, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, 'ignore'] });
+	const raw = cp.execSync('yarn list --json', { cwd, encoding: 'utf8', env: { ...process.env, NODE_ENV: 'production' }, stdio: [null, null, 'inherit'] });
 	const match = /^{"type":"tree".*$/m.exec(raw);

 	if (!match || match.length !== 1) {
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -28,7 +28,7 @@ var editorEntryPoints = [
 		name: 'vs/editor/editor.main',
 		include: [],
 		exclude: ['vs/css', 'vs/nls'],
-		prepend: ['out-build/vs/css.js', 'out-build/vs/nls.js'],
+		prepend: ['out-editor-build/vs/css.js', 'out-editor-build/vs/nls.js'],
 	},
 	{
 		name: 'vs/base/common/worker/simpleWorker',
@@ -79,16 +79,21 @@ gulp.task('extract-editor-src', ['clean-editor-src'], function () {
 			apiusages,
 			extrausages
 		],
+		typings: [
+			'typings/lib.ie11_safe_es6.d.ts',
+			'typings/thenable.d.ts',
+			'typings/es6-promise.d.ts',
+			'typings/require-monaco.d.ts',
+			'vs/monaco.d.ts'
+		],
 		libs: [
-			`lib.d.ts`,
-			`lib.es2015.collection.d.ts`
+			`lib.es5.d.ts`,
+			`lib.dom.d.ts`,
+			`lib.webworker.importscripts.d.ts`
 		],
 		redirects: {
 			'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
 		},
-		compilerOptions: {
-			module: 2, // ModuleKind.AMD
-		},
 		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
 		importIgnorePattern: /^vs\/css!/,
 		destRoot: path.join(root, 'out-editor-src')
@@ -108,6 +113,8 @@ gulp.task('optimize-editor', ['clean-optimized-editor', 'compile-editor-build'],
 	loaderConfig: {
 		paths: {
 			'vs': 'out-editor-build/vs',
+			'vs/css': 'out-editor-build/vs/css.build',
+			'vs/nls': 'out-editor-build/vs/nls.build',
 			'vscode': 'empty:'
 		}
 	},
@@ -122,25 +129,42 @@ gulp.task('clean-minified-editor', util.rimraf('out-editor-min'));
 gulp.task('minify-editor', ['clean-minified-editor', 'optimize-editor'], common.minifyTask('out-editor'));

 gulp.task('clean-editor-esm', util.rimraf('out-editor-esm'));
-gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro'], function () {
-	standalone.createESMSourcesAndResources({
-		entryPoints: [
-			'vs/editor/editor.main',
-			'vs/editor/editor.worker'
-		],
-		outFolder: './out-editor-esm/src',
+gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro', 'extract-editor-src'], function () {
+	standalone.createESMSourcesAndResources2({
+		srcFolder: './out-editor-src',
+		outFolder: './out-editor-esm',
 		outResourcesFolder: './out-monaco-editor-core/esm',
-		redirects: {
-			'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
-			'vs/nls': 'vs/nls.mock',
+		ignores: [
+			'inlineEntryPoint:0.ts',
+			'inlineEntryPoint:1.ts',
+			'vs/loader.js',
+			'vs/nls.ts',
+			'vs/nls.build.js',
+			'vs/nls.d.ts',
+			'vs/css.js',
+			'vs/css.build.js',
+			'vs/css.d.ts',
+			'vs/base/worker/workerMain.ts',
+		],
+		renames: {
+			'vs/nls.mock.ts': 'vs/nls.ts'
 		}
 	});
 });
 gulp.task('compile-editor-esm', ['extract-editor-esm', 'clean-editor-distro'], function () {
+	if (process.platform === 'win32') {
+		const result = cp.spawnSync(`..\\node_modules\\.bin\\tsc.cmd`, {
+			cwd: path.join(__dirname, '../out-editor-esm')
+		});
+		console.log(result.stdout.toString());
+		console.log(result.stderr.toString());
+	} else {
 		const result = cp.spawnSync(`node`, [`../node_modules/.bin/tsc`], {
 			cwd: path.join(__dirname, '../out-editor-esm')
 		});
 		console.log(result.stdout.toString());
+		console.log(result.stderr.toString());
+	}
 });

 function toExternalDTS(contents) {
@@ -194,7 +218,7 @@ gulp.task('editor-distro', ['clean-editor-distro', 'compile-editor-esm', 'minify
 				this.emit('data', new File({
 					path: data.path.replace(/monaco\.d\.ts/, 'editor.api.d.ts'),
 					base: data.base,
-					contents: new Buffer(toExternalDTS(data.contents.toString()))
+					contents: Buffer.from(toExternalDTS(data.contents.toString()))
 				}));
 			}))
 			.pipe(gulp.dest('out-monaco-editor-core/esm/vs/editor')),
--- a/build/gulpfile.extensions.js
+++ b/build/gulpfile.extensions.js
@@ -21,6 +21,7 @@ const nlsDev = require('vscode-nls-dev');
 const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
 const plumber = require('gulp-plumber');
+const _ = require('underscore');

 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');

@@ -35,7 +36,8 @@ const tasks = compilations.map(function (tsconfigFile) {
 	const absolutePath = path.join(extensionsPath, tsconfigFile);
 	const relativeDirname = path.dirname(tsconfigFile);

-	const tsOptions = require(absolutePath).compilerOptions;
+	const tsconfig = require(absolutePath);
+	const tsOptions = _.assign({}, tsconfig.extends ? require(path.join(extensionsPath, relativeDirname, tsconfig.extends)).compilerOptions : {}, tsconfig.compilerOptions);
 	tsOptions.verbose = false;
 	tsOptions.sourceMap = true;

--- a/build/gulpfile.hygiene.js
+++ b/build/gulpfile.hygiene.js
@@ -43,8 +43,11 @@ const indentationFilter = [
 	// except specific files
 	'!ThirdPartyNotices.txt',
 	'!LICENSE.txt',
+	'!**/LICENSE',
 	'!src/vs/nls.js',
+	'!src/vs/nls.build.js',
 	'!src/vs/css.js',
+	'!src/vs/css.build.js',
 	'!src/vs/loader.js',
 	'!src/vs/base/common/marked/marked.js',
 	'!src/vs/base/common/winjs.base.js',
@@ -78,12 +81,14 @@ const indentationFilter = [
 	'!src/vs/*/**/*.d.ts',
 	'!src/typings/**/*.d.ts',
 	'!extensions/**/*.d.ts',
-	'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe}',
+	'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns}',
 	'!build/{lib,tslintRules}/**/*.js',
 	'!build/**/*.sh',
-	'!build/tfs/**/*.js',
-	'!build/tfs/**/*.config',
+	'!build/azure-pipelines/**/*.js',
+	'!build/azure-pipelines/**/*.config',
 	'!**/Dockerfile',
+	'!**/*.Dockerfile',
+	'!**/*.dockerfile',
 	'!extensions/markdown-language-features/media/*.js'
 ];

@@ -96,6 +101,8 @@ const copyrightFilter = [
 	'!**/*.md',
 	'!**/*.bat',
 	'!**/*.cmd',
+	'!**/*.ico',
+	'!**/*.icns',
 	'!**/*.xml',
 	'!**/*.sh',
 	'!**/*.txt',
--- a/build/gulpfile.mixin.js
+++ b/build/gulpfile.mixin.js
@@ -13,7 +13,6 @@ const es = require('event-stream');
 const util = require('./lib/util');
 const remote = require('gulp-remote-src');
 const zip = require('gulp-vinyl-zip');
-const assign = require('object-assign');

 // {{SQL CARBON EDIT}}
 const jeditor = require('gulp-json-editor');
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -33,16 +33,17 @@ const i18n = require('./lib/i18n');
 const serviceDownloader = require('service-downloader').ServiceDownloadProvider;
 const platformInfo = require('service-downloader/out/platform').PlatformInformation;
 const glob = require('glob');
+// {{SQL CARBON EDIT}} - End
 const deps = require('./dependencies');
 const getElectronVersion = require('./lib/electron').getElectronVersion;
 const createAsar = require('./lib/asar').createAsar;
+const minimist = require('minimist');

 const productionDependencies = deps.getProductionDependencies(path.dirname(__dirname));
 // @ts-ignore
 // {{SQL CARBON EDIT}}
 var del = require('del');
-const extensionsRoot = path.join(root, 'extensions');
-const extensionsProductionDependencies = deps.getProductionDependencies(extensionsRoot);
+
 const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
 // {{SQL CARBON EDIT}}
 const nodeModules = [
@@ -56,32 +57,7 @@ const nodeModules = [
 	.concat(_.uniq(productionDependencies.map(d => d.name)))
 	.concat(baseModules);

-
 // Build
-const builtInExtensions = require('./builtInExtensions.json');
-
-const excludedExtensions = [
-	'vscode-api-tests',
-	'vscode-colorize-tests',
-	'ms-vscode.node-debug',
-	'ms-vscode.node-debug2',
-	// {{SQL CARBON EDIT}}
-	'integration-tests'
-];
-
-// {{SQL CARBON EDIT}}
-const vsce = require('vsce');
-const sqlBuiltInExtensions = [
-	// Add SQL built-in extensions here.
-	// the extension will be excluded from SQLOps package and will have separate vsix packages
-	'agent',
-	'import',
-	'profiler',
-	'admin-pack',
-	'big-data-cluster'
-];
-var azureExtensions = ['azurecore', 'mssql'];
-
 const vscodeEntryPoints = _.flatten([
 	buildfile.entrypoint('vs/workbench/workbench.main'),
 	buildfile.base,
@@ -94,14 +70,15 @@ const vscodeResources = [
 	'out-build/cli.js',
 	'out-build/driver.js',
 	'out-build/bootstrap.js',
+	'out-build/bootstrap-fork.js',
 	'out-build/bootstrap-amd.js',
+	'out-build/bootstrap-window.js',
 	'out-build/paths.js',
 	'out-build/vs/**/*.{svg,png,cur,html}',
 	'out-build/vs/base/common/performance.js',
 	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh}',
 	'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
 	'out-build/vs/workbench/browser/media/*-theme.css',
-	'out-build/vs/workbench/electron-browser/bootstrap/**',
 	'out-build/vs/workbench/parts/debug/**/*.json',
 	'out-build/vs/workbench/parts/execution/**/*.scpt',
 	'out-build/vs/workbench/parts/webview/electron-browser/webview-pre.js',
@@ -110,6 +87,7 @@ const vscodeResources = [
 	'out-build/vs/workbench/parts/welcome/walkThrough/**/*.md',
 	'out-build/vs/workbench/services/files/**/*.exe',
 	'out-build/vs/workbench/services/files/**/*.md',
+	'out-build/vs/code/electron-browser/workbench/**',
 	'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
 	'out-build/vs/code/electron-browser/issue/issueReporter.js',
 	'out-build/vs/code/electron-browser/processExplorer/processExplorer.js',
@@ -157,21 +135,31 @@ gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compil


 gulp.task('optimize-index-js', ['optimize-vscode'], () => {
-	const fullpath = path.join(process.cwd(), 'out-vscode/vs/workbench/electron-browser/bootstrap/index.js');
+	const fullpath = path.join(process.cwd(), 'out-vscode/vs/code/electron-browser/workbench/workbench.js');
 	const contents = fs.readFileSync(fullpath).toString();
 	const newContents = contents.replace('[/*BUILD->INSERT_NODE_MODULES*/]', JSON.stringify(nodeModules));
 	fs.writeFileSync(fullpath, newContents);
 });

-const baseUrl = `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`;
+const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
 gulp.task('clean-minified-vscode', util.rimraf('out-vscode-min'));
-gulp.task('minify-vscode', ['clean-minified-vscode', 'optimize-index-js'], common.minifyTask('out-vscode', baseUrl));
+gulp.task('minify-vscode', ['clean-minified-vscode', 'optimize-index-js'], common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`));

 // Package

 // @ts-ignore JSON checking: darwinCredits is optional
 const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));

+function darwinBundleDocumentType(extensions, icon) {
+	return {
+		name: product.nameLong + ' document',
+		role: 'Editor',
+		ostypes: ["TEXT", "utxt", "TUTX", "****"],
+		extensions: extensions,
+		iconFile: icon
+	};
+}
+
 const config = {
 	version: getElectronVersion(),
 	productAppName: product.nameLong,
@@ -182,19 +170,16 @@ const config = {
 	darwinApplicationCategoryType: 'public.app-category.developer-tools',
 	darwinHelpBookFolder: 'VS Code HelpBook',
 	darwinHelpBookName: 'VS Code HelpBook',
-	darwinBundleDocumentTypes: [{
-		name: product.nameLong + ' document',
-		role: 'Editor',
-		ostypes: ["TEXT", "utxt", "TUTX", "****"],
-		// {{SQL CARBON EDIT}}
-		extensions: ["csv", "json", "sqlplan", "sql", "xml"],
-		iconFile: 'resources/darwin/code_file.icns'
-	}],
+	darwinBundleDocumentTypes: [
+		// {{SQL CARBON EDIT}} - Remove most document types and replace with ours
+		darwinBundleDocumentType(["csv", "json", "sqlplan", "sql", "xml"], 'resources/darwin/code_file.icns'),
+	],
 	darwinBundleURLTypes: [{
 		role: 'Viewer',
 		name: product.nameLong,
 		urlSchemes: [product.urlProtocol]
 	}],
+	darwinForceDarkModeSupport: true,
 	darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : void 0,
 	linuxExecutableName: product.applicationName,
 	winIcon: 'resources/win32/code.ico',
@@ -225,6 +210,8 @@ gulp.task('clean-electron', util.rimraf('.build/electron'));
 gulp.task('electron', ['clean-electron'], getElectron(process.arch));
 gulp.task('electron-ia32', ['clean-electron'], getElectron('ia32'));
 gulp.task('electron-x64', ['clean-electron'], getElectron('x64'));
+gulp.task('electron-arm', ['clean-electron'], getElectron('arm'));
+gulp.task('electron-arm64', ['clean-electron'], getElectron('arm64'));


 /**
@@ -261,60 +248,6 @@ function computeChecksum(filename) {
 	return hash;
 }

-function packageBuiltInExtensions() {
-	const sqlBuiltInLocalExtensionDescriptions = glob.sync('extensions/*/package.json')
-		.map(manifestPath => {
-			const extensionPath = path.dirname(path.join(root, manifestPath));
-			const extensionName = path.basename(extensionPath);
-			return { name: extensionName, path: extensionPath };
-		})
-		.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
-		.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
-		.filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0);
-	sqlBuiltInLocalExtensionDescriptions.forEach(element => {
-		const packagePath = path.join(path.dirname(root), element.name + '.vsix');
-		console.info('Creating vsix for ' + element.path + ' result:' + packagePath);
-		vsce.createVSIX({
-			cwd: element.path,
-			packagePath: packagePath,
-			useYarn: true
-		});
-	});
-}
-
-function packageExtensionTask(extensionName, platform, arch) {
-	var destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
-	if (platform === 'darwin') {
-		destination = path.join(destination, 'Azure Data Studio.app', 'Contents', 'Resources', 'app', 'extensions', extensionName);
-	} else {
-		destination = path.join(destination, 'resources', 'app', 'extensions', extensionName);
-	}
-
-	platform = platform || process.platform;
-
-	return () => {
-		const root = path.resolve(path.join(__dirname, '..'));
-		const localExtensionDescriptions = glob.sync('extensions/*/package.json')
-			.map(manifestPath => {
-				const extensionPath = path.dirname(path.join(root, manifestPath));
-				const extensionName = path.basename(extensionPath);
-				return { name: extensionName, path: extensionPath };
-			})
-			.filter(({ name }) => extensionName === name);
-
-		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
-			return ext.fromLocal(extension.path);
-		}));
-
-		let result = localExtensions
-			.pipe(util.skipDirectories())
-			.pipe(util.fixWin32DirectoryPermissions())
-			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version']));
-
-		return result.pipe(vfs.dest(destination));
-	};
-}
-
 function packageTask(platform, arch, opts) {
 	opts = opts || {};

@@ -328,48 +261,24 @@ function packageTask(platform, arch, opts) {
 		const checksums = computeChecksums(out, [
 			'vs/workbench/workbench.main.js',
 			'vs/workbench/workbench.main.css',
-			'vs/workbench/electron-browser/bootstrap/index.html',
-			'vs/workbench/electron-browser/bootstrap/index.js',
-			'vs/workbench/electron-browser/bootstrap/preload.js'
+			'vs/code/electron-browser/workbench/workbench.html',
+			'vs/code/electron-browser/workbench/workbench.js'
 		]);

 		const src = gulp.src(out + '/**', { base: '.' })
-			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + out), 'out'); }));
-
-		const root = path.resolve(path.join(__dirname, '..'));
-		const localExtensionDescriptions = glob.sync('extensions/*/package.json')
-			.map(manifestPath => {
-				const extensionPath = path.dirname(path.join(root, manifestPath));
-				const extensionName = path.basename(extensionPath);
-				return { name: extensionName, path: extensionPath };
-			})
-			.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
-			.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
-			// {{SQL CARBON EDIT}}
-			.filter(({ name }) => sqlBuiltInExtensions.indexOf(name) === -1)
-			.filter(({ name }) => azureExtensions.indexOf(name) === -1);
-
-		packageBuiltInExtensions();
-
-		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
-			return ext.fromLocal(extension.path)
-				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-		}));
-
-		// {{SQL CARBON EDIT}}
-		const extensionDepsSrc = [
-			..._.flatten(extensionsProductionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`])),
-		];
-
-		const localExtensionDependencies = gulp.src(extensionDepsSrc, { base: '.', dot: true })
-			.pipe(filter(['**', '!**/package-lock.json']))
-			.pipe(util.cleanNodeModule('account-provider-azure', ['node_modules/date-utils/doc/**', 'node_modules/adal_node/node_modules/**'], undefined))
-			.pipe(util.cleanNodeModule('typescript', ['**/**'], undefined));
-
-		const sources = es.merge(src, localExtensions, localExtensionDependencies)
+			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + out), 'out'); }))
 			.pipe(util.setExecutableBit(['**/*.sh']))
 			.pipe(filter(['**', '!**/*.js.map']));

+		const root = path.resolve(path.join(__dirname, '..'));
+
+		// {{SQL CARBON EDIT}}
+		ext.packageBuiltInExtensions();
+
+		const sources = es.merge(src, ext.packageExtensionsStream({
+			sourceMappingURLBase: sourceMappingURLBase
+		}));
+
 		let version = packageJson.version;
 		// @ts-ignore JSON checking: quality is optional
 		const quality = product.quality;
@@ -380,8 +289,15 @@ function packageTask(platform, arch, opts) {

 		// {{SQL CARBON EDIT}}
 		const name = (platform === 'darwin') ? 'Azure Data Studio' : product.nameShort;
+		const packageJsonUpdates = { name, version };
+
+		// for linux url handling
+		if (platform === 'linux') {
+			packageJsonUpdates.desktopName = `${product.applicationName}-url-handler.desktop`;
+		}
+
 		const packageJsonStream = gulp.src(['package.json'], { base: '.' })
-			.pipe(json({ name, version }));
+			.pipe(json(packageJsonUpdates));

 		const date = new Date().toISOString();
 		const productJsonUpdate = { commit, date, checksums };
@@ -411,16 +327,17 @@ function packageTask(platform, arch, opts) {
 		const deps = gulp.src(depsSrc, { base: '.', dot: true })
 			.pipe(filter(['**', '!**/package-lock.json']))
 			.pipe(util.cleanNodeModule('fsevents', ['binding.gyp', 'fsevents.cc', 'build/**', 'src/**', 'test/**'], ['**/*.node']))
-			.pipe(util.cleanNodeModule('oniguruma', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/*.js']))
+			.pipe(util.cleanNodeModule('vscode-sqlite3', ['binding.gyp', 'benchmark/**', 'cloudformation/**', 'deps/**', 'test/**', 'build/**', 'src/**'], ['build/Release/*.node']))
+			.pipe(util.cleanNodeModule('oniguruma', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/*.node', 'src/*.js']))
 			.pipe(util.cleanNodeModule('windows-mutex', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
-			.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
-			.pipe(util.cleanNodeModule('native-is-elevated', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
-			.pipe(util.cleanNodeModule('native-watchdog', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
-			.pipe(util.cleanNodeModule('spdlog', ['binding.gyp', 'build/**', 'deps/**', 'src/**', 'test/**'], ['**/*.node']))
+			.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/*.node']))
+			.pipe(util.cleanNodeModule('native-is-elevated', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/*.node']))
+			.pipe(util.cleanNodeModule('native-watchdog', ['binding.gyp', 'build/**', 'src/**'], ['build/Release/*.node']))
+			.pipe(util.cleanNodeModule('spdlog', ['binding.gyp', 'build/**', 'deps/**', 'src/**', 'test/**'], ['build/Release/*.node']))
 			.pipe(util.cleanNodeModule('jschardet', ['dist/**']))
 			.pipe(util.cleanNodeModule('windows-foreground-love', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
 			.pipe(util.cleanNodeModule('windows-process-tree', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
-			.pipe(util.cleanNodeModule('gc-signals', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/index.js']))
+			.pipe(util.cleanNodeModule('gc-signals', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/*.node', 'src/index.js']))
 			.pipe(util.cleanNodeModule('keytar', ['binding.gyp', 'build/**', 'src/**', 'script/**', 'node_modules/**'], ['**/*.node']))
 			.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'tools/**'], ['build/Release/*.exe', 'build/Release/*.dll', 'build/Release/*.node']))
 			// {{SQL CARBON EDIT}}
@@ -432,6 +349,7 @@ function packageTask(platform, arch, opts) {
 			.pipe(util.cleanNodeModule('slickgrid', ['node_modules/**', 'examples/**'], undefined))
 			.pipe(util.cleanNodeModule('nsfw', ['binding.gyp', 'build/**', 'src/**', 'openpa/**', 'includes/**'], ['**/*.node', '**/*.a']))
 			.pipe(util.cleanNodeModule('vscode-nsfw', ['binding.gyp', 'build/**', 'src/**', 'openpa/**', 'includes/**'], ['**/*.node', '**/*.a']))
+			// {{SQL CARBON EDIT}} - End
 			.pipe(util.cleanNodeModule('vsda', ['binding.gyp', 'README.md', 'build/**', '*.bat', '*.sh', '*.cpp', '*.h'], ['build/Release/vsda.node']))
 			.pipe(createAsar(path.join(process.cwd(), 'node_modules'), ['**/*.node', '**/vscode-ripgrep/bin/*', '**/node-pty/build/Release/*'], 'app/node_modules.asar'));

@@ -442,7 +360,7 @@ function packageTask(platform, arch, opts) {
 			'node_modules/slickgrid/**/*.*',
 			'node_modules/underscore/**/*.*',
 			'node_modules/zone.js/**/*.*',
-			'node_modules/chart.js/**/*.*'
+			'node_modules/chart.js/**/*.*',
 		], { base: '.', dot: true });

 		let all = es.merge(
@@ -459,7 +377,37 @@ function packageTask(platform, arch, opts) {
 		);

 		if (platform === 'win32') {
-			all = es.merge(all, gulp.src(['resources/win32/code_file.ico', 'resources/win32/code_70x70.png', 'resources/win32/code_150x150.png'], { base: '.' }));
+			all = es.merge(all, gulp.src([
+				'resources/win32/bower.ico',
+				'resources/win32/c.ico',
+				'resources/win32/config.ico',
+				'resources/win32/cpp.ico',
+				'resources/win32/csharp.ico',
+				'resources/win32/css.ico',
+				'resources/win32/default.ico',
+				'resources/win32/go.ico',
+				'resources/win32/html.ico',
+				'resources/win32/jade.ico',
+				'resources/win32/java.ico',
+				'resources/win32/javascript.ico',
+				'resources/win32/json.ico',
+				'resources/win32/less.ico',
+				'resources/win32/markdown.ico',
+				'resources/win32/php.ico',
+				'resources/win32/powershell.ico',
+				'resources/win32/python.ico',
+				'resources/win32/react.ico',
+				'resources/win32/ruby.ico',
+				'resources/win32/sass.ico',
+				'resources/win32/shell.ico',
+				'resources/win32/sql.ico',
+				'resources/win32/typescript.ico',
+				'resources/win32/vue.ico',
+				'resources/win32/xml.ico',
+				'resources/win32/yaml.ico',
+				'resources/win32/code_70x70.png',
+				'resources/win32/code_150x150.png'
+			], { base: '.' }));
 		} else if (platform === 'linux') {
 			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
 		} else if (platform === 'darwin') {
@@ -484,6 +432,8 @@ function packageTask(platform, arch, opts) {

 			result = es.merge(result, gulp.src('resources/win32/bin/code.sh', { base: 'resources/win32' })
 				.pipe(replace('@@NAME@@', product.nameShort))
+				.pipe(replace('@@COMMIT@@', commit))
+				.pipe(replace('@@APPNAME@@', product.applicationName))
 				.pipe(rename(function (f) { f.basename = product.applicationName; f.extname = ''; })));

 			result = es.merge(result, gulp.src('resources/win32/VisualElementsManifest.xml', { base: 'resources/win32' })
@@ -494,6 +444,15 @@ function packageTask(platform, arch, opts) {
 				.pipe(rename('bin/' + product.applicationName)));
 		}

+		// submit all stats that have been collected
+		// during the build phase
+		if (opts.stats) {
+			result.on('end', () => {
+				const { submitAllStats } = require('./lib/stats');
+				submitAllStats(product, commit).then(() => console.log('Submitted bundle stats!'));
+			});
+		}
+
 		return result.pipe(vfs.dest(destination));
 	};
 }
@@ -501,13 +460,13 @@ function packageTask(platform, arch, opts) {
 const buildRoot = path.dirname(root);

 // {{SQL CARBON EDIT}}
-gulp.task('vscode-win32-x64-azurecore', ['optimize-vscode'], packageExtensionTask('azurecore', 'win32', 'x64'));
-gulp.task('vscode-darwin-azurecore', ['optimize-vscode'], packageExtensionTask('azurecore', 'darwin'));
-gulp.task('vscode-linux-x64-azurecore', ['optimize-vscode'], packageExtensionTask('azurecore', 'linux', 'x64'));
+gulp.task('vscode-win32-x64-azurecore', ['optimize-vscode'], ext.packageExtensionTask('azurecore', 'win32', 'x64'));
+gulp.task('vscode-darwin-azurecore', ['optimize-vscode'], ext.packageExtensionTask('azurecore', 'darwin'));
+gulp.task('vscode-linux-x64-azurecore', ['optimize-vscode'], ext.packageExtensionTask('azurecore', 'linux', 'x64'));

-gulp.task('vscode-win32-x64-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], packageExtensionTask('mssql', 'win32', 'x64'));
-gulp.task('vscode-darwin-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], packageExtensionTask('mssql', 'darwin'));
-gulp.task('vscode-linux-x64-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], packageExtensionTask('mssql', 'linux', 'x64'));
+gulp.task('vscode-win32-x64-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], ext.packageExtensionTask('mssql', 'win32', 'x64'));
+gulp.task('vscode-darwin-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], ext.packageExtensionTask('mssql', 'darwin'));
+gulp.task('vscode-linux-x64-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], ext.packageExtensionTask('mssql', 'linux', 'x64'));

 gulp.task('clean-vscode-win32-ia32', util.rimraf(path.join(buildRoot, 'azuredatastudio-win32-ia32')));
 gulp.task('clean-vscode-win32-x64', util.rimraf(path.join(buildRoot, 'azuredatastudio-win32-x64')));
@@ -515,20 +474,23 @@ gulp.task('clean-vscode-darwin', util.rimraf(path.join(buildRoot, 'azuredatastud
 gulp.task('clean-vscode-linux-ia32', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-ia32')));
 gulp.task('clean-vscode-linux-x64', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-x64')));
 gulp.task('clean-vscode-linux-arm', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-arm')));
+gulp.task('clean-vscode-linux-arm64', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-arm64')));

 gulp.task('vscode-win32-ia32', ['optimize-vscode', 'clean-vscode-win32-ia32'], packageTask('win32', 'ia32'));
 gulp.task('vscode-win32-x64', ['vscode-win32-x64-azurecore', 'vscode-win32-x64-mssql', 'optimize-vscode', 'clean-vscode-win32-x64'], packageTask('win32', 'x64'));
-gulp.task('vscode-darwin', ['vscode-darwin-azurecore', 'vscode-darwin-mssql', 'optimize-vscode', 'clean-vscode-darwin'], packageTask('darwin'));
+gulp.task('vscode-darwin', ['vscode-darwin-azurecore', 'vscode-darwin-mssql', 'optimize-vscode', 'clean-vscode-darwin'], packageTask('darwin', null, { stats: true }));
 gulp.task('vscode-linux-ia32', ['optimize-vscode', 'clean-vscode-linux-ia32'], packageTask('linux', 'ia32'));
 gulp.task('vscode-linux-x64', ['vscode-linux-x64-azurecore', 'vscode-linux-x64-mssql', 'optimize-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64'));
 gulp.task('vscode-linux-arm', ['optimize-vscode', 'clean-vscode-linux-arm'], packageTask('linux', 'arm'));
+gulp.task('vscode-linux-arm64', ['optimize-vscode', 'clean-vscode-linux-arm64'], packageTask('linux', 'arm64'));

 gulp.task('vscode-win32-ia32-min', ['minify-vscode', 'clean-vscode-win32-ia32'], packageTask('win32', 'ia32', { minified: true }));
 gulp.task('vscode-win32-x64-min', ['minify-vscode', 'clean-vscode-win32-x64'], packageTask('win32', 'x64', { minified: true }));
-gulp.task('vscode-darwin-min', ['minify-vscode', 'clean-vscode-darwin'], packageTask('darwin', null, { minified: true }));
+gulp.task('vscode-darwin-min', ['minify-vscode', 'clean-vscode-darwin'], packageTask('darwin', null, { minified: true, stats: true }));
 gulp.task('vscode-linux-ia32-min', ['minify-vscode', 'clean-vscode-linux-ia32'], packageTask('linux', 'ia32', { minified: true }));
 gulp.task('vscode-linux-x64-min', ['minify-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64', { minified: true }));
 gulp.task('vscode-linux-arm-min', ['minify-vscode', 'clean-vscode-linux-arm'], packageTask('linux', 'arm', { minified: true }));
+gulp.task('vscode-linux-arm64-min', ['minify-vscode', 'clean-vscode-linux-arm64'], packageTask('linux', 'arm64', { minified: true }));

 // Transifex Localizations

@@ -564,7 +526,7 @@ gulp.task('vscode-translations-push', ['optimize-vscode'], function () {
 	).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken));
 });

-gulp.task('vscode-translations-push-test', ['optimize-vscode'], function () {
+gulp.task('vscode-translations-export', ['optimize-vscode'], function () {
 	const pathToMetadata = './out-vscode/nls.metadata.json';
 	const pathToExtensions = './extensions/*';
 	const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}';
@@ -573,46 +535,44 @@ gulp.task('vscode-translations-push-test', ['optimize-vscode'], function () {
 		gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()),
 		gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
 		gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
-		// {{SQL CARBON EDIT}}
-		// disable since function makes calls to VS Code Transifex API
-		// ).pipe(i18n.findObsoleteResources(apiHostname, apiName, apiToken)
-	).pipe(vfs.dest('../vscode-transifex-input'));
+	).pipe(vfs.dest('../vscode-translations-export'));
 });

 gulp.task('vscode-translations-pull', function () {
-	[...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => {
-		i18n.pullCoreAndExtensionsXlfFiles(apiHostname, apiName, apiToken, language).pipe(vfs.dest(`../vscode-localization/${language.id}/build`));
-
+	return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => {
 		let includeDefault = !!innoSetupConfig[language.id].defaultInfo;
-		i18n.pullSetupXlfFiles(apiHostname, apiName, apiToken, language, includeDefault).pipe(vfs.dest(`../vscode-localization/${language.id}/setup`));
-	});
+		return i18n.pullSetupXlfFiles(apiHostname, apiName, apiToken, language, includeDefault).pipe(vfs.dest(`../vscode-translations-import/${language.id}/setup`));
+	}));
 });

 gulp.task('vscode-translations-import', function () {
+	// {{SQL CARBON EDIT}} - Replace function body with our own
 	[...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => {
 		gulp.src(`../vscode-localization/${language.id}/build/*/*.xlf`)
 			.pipe(i18n.prepareI18nFiles())
 			.pipe(vfs.dest(`./i18n/${language.folderName}`));
-
-		// {{SQL CARBON EDIT}}
-		// gulp.src(`../vscode-localization/${language.id}/setup/*/*.xlf`)
-		// 	.pipe(i18n.prepareIslFiles(language, innoSetupConfig[language.id]))
-		// 	.pipe(vfs.dest(`./build/win32/i18n`));
 	});
+	// {{SQL CARBON EDIT}} - End
 });

 // Sourcemaps

-gulp.task('upload-vscode-sourcemaps', ['minify-vscode'], () => {
+gulp.task('upload-vscode-sourcemaps', ['vscode-darwin-min', 'minify-vscode'], () => {
 	const vs = gulp.src('out-vscode-min/**/*.map', { base: 'out-vscode-min' })
 		.pipe(es.mapSync(f => {
 			f.path = `${f.base}/core/${f.relative}`;
 			return f;
 		}));

-	const extensions = gulp.src('extensions/**/out/**/*.map', { base: '.' });
+	const extensionsOut = gulp.src('extensions/**/out/**/*.map', { base: '.' });
+	const extensionsDist = gulp.src('extensions/**/dist/**/*.map', { base: '.' });

-	return es.merge(vs, extensions)
+	return es.merge(vs, extensionsOut, extensionsDist)
+		.pipe(es.through(function (data) {
+			// debug
+			console.log('Uploading Sourcemap', data.relative);
+			this.emit('data', data);
+		}))
 		.pipe(azure.upload({
 			account: process.env.AZURE_STORAGE_ACCOUNT,
 			key: process.env.AZURE_STORAGE_ACCESS_KEY,
@@ -732,4 +692,3 @@ function installService() {
 gulp.task('install-sqltoolsservice', () => {
 	return installService();
 });
-
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -19,7 +19,7 @@ const rpmDependencies = require('../resources/linux/rpm/dependencies.json');
 const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);

 function getDebPackageArch(arch) {
-	return { x64: 'amd64', ia32: 'i386', arm: 'armhf' }[arch];
+	return { x64: 'amd64', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
 }

 function prepareDebPackage(arch) {
@@ -30,11 +30,17 @@ function prepareDebPackage(arch) {

 	return function () {
 		const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
+			.pipe(rename('usr/share/applications/' + product.applicationName + '.desktop'));
+
+		const desktopUrlHandler = gulp.src('resources/linux/code-url-handler.desktop', { base: '.' })
+			.pipe(rename('usr/share/applications/' + product.applicationName + '-url-handler.desktop'));
+
+		const desktops = es.merge(desktop, desktopUrlHandler)
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
 			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(replace('@@ICON@@', product.applicationName))
-			.pipe(rename('usr/share/applications/' + product.applicationName + '.desktop'));
+			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));

 		const appdata = gulp.src('resources/linux/code.appdata.xml', { base: '.' })
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
@@ -79,7 +85,7 @@ function prepareDebPackage(arch) {
 			.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
 			.pipe(rename('DEBIAN/postinst'));

-		const all = es.merge(control, postinst, postrm, prerm, desktop, appdata, icon, code);
+		const all = es.merge(control, postinst, postrm, prerm, desktops, appdata, icon, code);

 		return all.pipe(vfs.dest(destination));
 	};
@@ -99,7 +105,7 @@ function getRpmBuildPath(rpmArch) {
 }

 function getRpmPackageArch(arch) {
-	return { x64: 'x86_64', ia32: 'i386', arm: 'armhf' }[arch];
+	return { x64: 'x86_64', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
 }

 function prepareRpmPackage(arch) {
@@ -109,11 +115,17 @@ function prepareRpmPackage(arch) {

 	return function () {
 		const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
+			.pipe(rename('BUILD/usr/share/applications/' + product.applicationName + '.desktop'));
+
+		const desktopUrlHandler = gulp.src('resources/linux/code-url-handler.desktop', { base: '.' })
+			.pipe(rename('BUILD/usr/share/applications/' + product.applicationName + '-url-handler.desktop'));
+
+		const desktops = es.merge(desktop, desktopUrlHandler)
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
 			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(replace('@@ICON@@', product.applicationName))
-			.pipe(rename('BUILD/usr/share/applications/' + product.applicationName + '.desktop'));
+			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));

 		const appdata = gulp.src('resources/linux/code.appdata.xml', { base: '.' })
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
@@ -144,7 +156,7 @@ function prepareRpmPackage(arch) {
 		const specIcon = gulp.src('resources/linux/rpm/code.xpm', { base: '.' })
 			.pipe(rename('SOURCES/' + product.applicationName + '.xpm'));

-		const all = es.merge(code, desktop, appdata, icon, spec, specIcon);
+		const all = es.merge(code, desktops, appdata, icon, spec, specIcon);

 		return all.pipe(vfs.dest(getRpmBuildPath(rpmArch)));
 	};
@@ -162,6 +174,7 @@ function buildRpmPackage(arch) {
 		'cp "' + rpmOut + '/$(ls ' + rpmOut + ')" ' + destination + '/'
 	]);
 }
+
 function getSnapBuildPath(arch) {
 	return `.build/linux/snap/${arch}/${product.applicationName}-${arch}`;
 }
@@ -182,17 +195,21 @@ function prepareSnapPackage(arch) {
 			.pipe(rename(`usr/share/pixmaps/${product.applicationName}.png`));

 		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
-			.pipe(rename(function (p) { p.dirname = 'usr/share/' + product.applicationName + '/' + p.dirname; }));
+			.pipe(rename(function (p) { p.dirname = `usr/share/${product.applicationName}/${p.dirname}`; }));

 		const snapcraft = gulp.src('resources/linux/snap/snapcraft.yaml', { base: '.' })
 			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@VERSION@@', packageJson.version))
+			.pipe(replace('@@VERSION@@', `${packageJson.version}-${linuxPackageRevision}`))
 			.pipe(rename('snap/snapcraft.yaml'));

+		const snapUpdate = gulp.src('resources/linux/snap/snapUpdate.sh', { base: '.' })
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(rename(`usr/share/${product.applicationName}/snapUpdate.sh`));
+
 		const electronLaunch = gulp.src('resources/linux/snap/electron-launch', { base: '.' })
 			.pipe(rename('electron-launch'));

-		const all = es.merge(desktop, icon, code, snapcraft, electronLaunch);
+		const all = es.merge(desktop, icon, code, snapcraft, electronLaunch, snapUpdate);

 		return all.pipe(vfs.dest(destination));
 	};
@@ -200,11 +217,7 @@ function prepareSnapPackage(arch) {

 function buildSnapPackage(arch) {
 	const snapBuildPath = getSnapBuildPath(arch);
-	const snapFilename = `${product.applicationName}-${packageJson.version}-${linuxPackageRevision}-${arch}.snap`;
-	return shell.task([
-		`chmod +x ${snapBuildPath}/electron-launch`,
-		`cd ${snapBuildPath} && snapcraft snap --output ../${snapFilename}`
-	]);
+	return shell.task(`cd ${snapBuildPath} && snapcraft build`);
 }

 function getFlatpakArch(arch) {
@@ -284,33 +297,39 @@ function buildFlatpak(arch) {
 gulp.task('clean-vscode-linux-ia32-deb', util.rimraf('.build/linux/deb/i386'));
 gulp.task('clean-vscode-linux-x64-deb', util.rimraf('.build/linux/deb/amd64'));
 gulp.task('clean-vscode-linux-arm-deb', util.rimraf('.build/linux/deb/armhf'));
+gulp.task('clean-vscode-linux-arm64-deb', util.rimraf('.build/linux/deb/arm64'));
 gulp.task('clean-vscode-linux-ia32-rpm', util.rimraf('.build/linux/rpm/i386'));
 gulp.task('clean-vscode-linux-x64-rpm', util.rimraf('.build/linux/rpm/x86_64'));
 gulp.task('clean-vscode-linux-arm-rpm', util.rimraf('.build/linux/rpm/armhf'));
+gulp.task('clean-vscode-linux-arm64-rpm', util.rimraf('.build/linux/rpm/arm64'));
 gulp.task('clean-vscode-linux-ia32-snap', util.rimraf('.build/linux/snap/x64'));
 gulp.task('clean-vscode-linux-x64-snap', util.rimraf('.build/linux/snap/x64'));
 gulp.task('clean-vscode-linux-arm-snap', util.rimraf('.build/linux/snap/x64'));
-gulp.task('clean-vscode-linux-ia32-flatpak', util.rimraf('.build/linux/flatpak/i386'));
-gulp.task('clean-vscode-linux-x64-flatpak', util.rimraf('.build/linux/flatpak/x86_64'));
-gulp.task('clean-vscode-linux-arm-flatpak', util.rimraf('.build/linux/flatpak/arm'));
+gulp.task('clean-vscode-linux-arm64-snap', util.rimraf('.build/linux/snap/x64'));

 gulp.task('vscode-linux-ia32-prepare-deb', ['clean-vscode-linux-ia32-deb'], prepareDebPackage('ia32'));
 gulp.task('vscode-linux-x64-prepare-deb', ['clean-vscode-linux-x64-deb'], prepareDebPackage('x64'));
 gulp.task('vscode-linux-arm-prepare-deb', ['clean-vscode-linux-arm-deb'], prepareDebPackage('arm'));
+gulp.task('vscode-linux-arm64-prepare-deb', ['clean-vscode-linux-arm64-deb'], prepareDebPackage('arm64'));
 gulp.task('vscode-linux-ia32-build-deb', ['vscode-linux-ia32-prepare-deb'], buildDebPackage('ia32'));
 gulp.task('vscode-linux-x64-build-deb', ['vscode-linux-x64-prepare-deb'], buildDebPackage('x64'));
 gulp.task('vscode-linux-arm-build-deb', ['vscode-linux-arm-prepare-deb'], buildDebPackage('arm'));
+gulp.task('vscode-linux-arm64-build-deb', ['vscode-linux-arm64-prepare-deb'], buildDebPackage('arm64'));

 gulp.task('vscode-linux-ia32-prepare-rpm', ['clean-vscode-linux-ia32-rpm'], prepareRpmPackage('ia32'));
 gulp.task('vscode-linux-x64-prepare-rpm', ['clean-vscode-linux-x64-rpm'], prepareRpmPackage('x64'));
 gulp.task('vscode-linux-arm-prepare-rpm', ['clean-vscode-linux-arm-rpm'], prepareRpmPackage('arm'));
+gulp.task('vscode-linux-arm64-prepare-rpm', ['clean-vscode-linux-arm64-rpm'], prepareRpmPackage('arm64'));
 gulp.task('vscode-linux-ia32-build-rpm', ['vscode-linux-ia32-prepare-rpm'], buildRpmPackage('ia32'));
 gulp.task('vscode-linux-x64-build-rpm', ['vscode-linux-x64-prepare-rpm'], buildRpmPackage('x64'));
 gulp.task('vscode-linux-arm-build-rpm', ['vscode-linux-arm-prepare-rpm'], buildRpmPackage('arm'));
+gulp.task('vscode-linux-arm64-build-rpm', ['vscode-linux-arm64-prepare-rpm'], buildRpmPackage('arm64'));

 gulp.task('vscode-linux-ia32-prepare-snap', ['clean-vscode-linux-ia32-snap'], prepareSnapPackage('ia32'));
 gulp.task('vscode-linux-x64-prepare-snap', ['clean-vscode-linux-x64-snap'], prepareSnapPackage('x64'));
 gulp.task('vscode-linux-arm-prepare-snap', ['clean-vscode-linux-arm-snap'], prepareSnapPackage('arm'));
+gulp.task('vscode-linux-arm64-prepare-snap', ['clean-vscode-linux-arm64-snap'], prepareSnapPackage('arm64'));
 gulp.task('vscode-linux-ia32-build-snap', ['vscode-linux-ia32-prepare-snap'], buildSnapPackage('ia32'));
 gulp.task('vscode-linux-x64-build-snap', ['vscode-linux-x64-prepare-snap'], buildSnapPackage('x64'));
 gulp.task('vscode-linux-arm-build-snap', ['vscode-linux-arm-prepare-snap'], buildSnapPackage('arm'));
+gulp.task('vscode-linux-arm64-build-snap', ['vscode-linux-arm64-prepare-snap'], buildSnapPackage('arm64'));
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -15,6 +15,7 @@ const util = require('./lib/util');
 const pkg = require('../package.json');
 const product = require('../product.json');
 const vfs = require('vinyl-fs');
+const rcedit = require('rcedit');
 const mkdirp = require('mkdirp');

 const repoPath = path.dirname(__dirname);
@@ -25,18 +26,21 @@ const zipPath = arch => path.join(zipDir(arch), `VSCode-win32-${arch}.zip`);
 const setupDir = (arch, target) => path.join(repoPath, '.build', `win32-${arch}`, `${target}-setup`);
 const issPath = path.join(__dirname, 'win32', 'code.iss');
 const innoSetupPath = path.join(path.dirname(path.dirname(require.resolve('innosetup-compiler'))), 'bin', 'ISCC.exe');
-const signPS1 = path.join(repoPath, 'build', 'tfs', 'win32', 'sign.ps1');
+const signPS1 = path.join(repoPath, 'build', 'azure-pipelines', 'win32', 'sign.ps1');

 function packageInnoSetup(iss, options, cb) {
 	options = options || {};

 	const definitions = options.definitions || {};
-	const debug = process.argv.some(arg => arg === '--debug-inno');

-	if (debug) {
+	if (process.argv.some(arg => arg === '--debug-inno')) {
 		definitions['Debug'] = 'true';
 	}

+	if (process.argv.some(arg => arg === '--sign')) {
+		definitions['Sign'] = 'true';
+	}
+
 	const keys = Object.keys(definitions);

 	keys.forEach(key => assert(typeof definitions[key] === 'string', `Missing value for '${key}' in Inno Setup package step`));
@@ -137,3 +141,13 @@ function copyInnoUpdater(arch) {

 gulp.task('vscode-win32-ia32-copy-inno-updater', copyInnoUpdater('ia32'));
 gulp.task('vscode-win32-x64-copy-inno-updater', copyInnoUpdater('x64'));
+
+function patchInnoUpdater(arch) {
+	return cb => {
+		const icon = path.join(repoPath, 'resources', 'win32', 'code.ico');
+		rcedit(path.join(buildPath(arch), 'tools', 'inno_updater.exe'), { icon }, cb);
+	};
+}
+
+gulp.task('vscode-win32-ia32-inno-updater', ['vscode-win32-ia32-copy-inno-updater'], patchInnoUpdater('ia32'));
+gulp.task('vscode-win32-x64-inno-updater', ['vscode-win32-x64-copy-inno-updater'], patchInnoUpdater('x64'));
--- a/build/jsconfig.json
+++ b/build/jsconfig.json
@@ -0,0 +1,15 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "es2017",
+		"jsx": "preserve",
+		"checkJs": true
+	},
+	"include": [
+		"**/*.js"
+	],
+	"exclude": [
+		"node_modules",
+		"**/node_modules/*"
+	]
+}
--- a/build/lib/asar.js
+++ b/build/lib/asar.js
@@ -4,33 +4,33 @@
 *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-var path = require("path");
-var es = require("event-stream");
-var pickle = require("chromium-pickle-js");
-var Filesystem = require("asar/lib/filesystem");
-var VinylFile = require("vinyl");
-var minimatch = require("minimatch");
+const path = require("path");
+const es = require("event-stream");
+const pickle = require('chromium-pickle-js');
+const Filesystem = require('asar/lib/filesystem');
+const VinylFile = require("vinyl");
+const minimatch = require("minimatch");
 function createAsar(folderPath, unpackGlobs, destFilename) {
-    var shouldUnpackFile = function (file) {
-        for (var i = 0; i < unpackGlobs.length; i++) {
+    const shouldUnpackFile = (file) => {
+        for (let i = 0; i < unpackGlobs.length; i++) {
            if (minimatch(file.relative, unpackGlobs[i])) {
                return true;
            }
        }
        return false;
    };
-    var filesystem = new Filesystem(folderPath);
-    var out = [];
+    const filesystem = new Filesystem(folderPath);
+    const out = [];
    // Keep track of pending inserts
-    var pendingInserts = 0;
-    var onFileInserted = function () { pendingInserts--; };
+    let pendingInserts = 0;
+    let onFileInserted = () => { pendingInserts--; };
    // Do not insert twice the same directory
-    var seenDir = {};
-    var insertDirectoryRecursive = function (dir) {
+    const seenDir = {};
+    const insertDirectoryRecursive = (dir) => {
        if (seenDir[dir]) {
            return;
        }
-        var lastSlash = dir.lastIndexOf('/');
+        let lastSlash = dir.lastIndexOf('/');
        if (lastSlash === -1) {
            lastSlash = dir.lastIndexOf('\\');
        }
@@ -40,8 +40,8 @@ function createAsar(folderPath, unpackGlobs, destFilename) {
        seenDir[dir] = true;
        filesystem.insertDirectory(dir);
    };
-    var insertDirectoryForFile = function (file) {
-        var lastSlash = file.lastIndexOf('/');
+    const insertDirectoryForFile = (file) => {
+        let lastSlash = file.lastIndexOf('/');
        if (lastSlash === -1) {
            lastSlash = file.lastIndexOf('\\');
        }
@@ -49,7 +49,7 @@ function createAsar(folderPath, unpackGlobs, destFilename) {
            insertDirectoryRecursive(file.substring(0, lastSlash));
        }
    };
-    var insertFile = function (relativePath, stat, shouldUnpack) {
+    const insertFile = (relativePath, stat, shouldUnpack) => {
        insertDirectoryForFile(relativePath);
        pendingInserts++;
        filesystem.insertFile(relativePath, shouldUnpack, { stat: stat }, {}, onFileInserted);
@@ -59,13 +59,13 @@ function createAsar(folderPath, unpackGlobs, destFilename) {
            return;
        }
        if (!file.stat.isFile()) {
-            throw new Error("unknown item in stream!");
+            throw new Error(`unknown item in stream!`);
        }
-        var shouldUnpack = shouldUnpackFile(file);
+        const shouldUnpack = shouldUnpackFile(file);
        insertFile(file.relative, { size: file.contents.length, mode: file.stat.mode }, shouldUnpack);
        if (shouldUnpack) {
            // The file goes outside of xx.asar, in a folder xx.asar.unpacked
-            var relative = path.relative(folderPath, file.path);
+            const relative = path.relative(folderPath, file.path);
            this.queue(new VinylFile({
                cwd: folderPath,
                base: folderPath,
@@ -79,34 +79,33 @@ function createAsar(folderPath, unpackGlobs, destFilename) {
            out.push(file.contents);
        }
    }, function () {
-        var _this = this;
-        var finish = function () {
+        let finish = () => {
            {
-                var headerPickle = pickle.createEmpty();
+                const headerPickle = pickle.createEmpty();
                headerPickle.writeString(JSON.stringify(filesystem.header));
-                var headerBuf = headerPickle.toBuffer();
-                var sizePickle = pickle.createEmpty();
+                const headerBuf = headerPickle.toBuffer();
+                const sizePickle = pickle.createEmpty();
                sizePickle.writeUInt32(headerBuf.length);
-                var sizeBuf = sizePickle.toBuffer();
+                const sizeBuf = sizePickle.toBuffer();
                out.unshift(headerBuf);
                out.unshift(sizeBuf);
            }
-            var contents = Buffer.concat(out);
+            const contents = Buffer.concat(out);
            out.length = 0;
-            _this.queue(new VinylFile({
+            this.queue(new VinylFile({
                cwd: folderPath,
                base: folderPath,
                path: destFilename,
                contents: contents
            }));
-            _this.queue(null);
+            this.queue(null);
        };
        // Call finish() only when all file inserts have finished...
        if (pendingInserts === 0) {
            finish();
        }
        else {
-            onFileInserted = function () {
+            onFileInserted = () => {
                pendingInserts--;
                if (pendingInserts === 0) {
                    finish();
--- a/build/lib/asar.ts
+++ b/build/lib/asar.ts
@@ -7,8 +7,8 @@

 import * as path from 'path';
 import * as es from 'event-stream';
-import * as pickle from 'chromium-pickle-js';
-import * as Filesystem from 'asar/lib/filesystem';
+const pickle = require('chromium-pickle-js');
+const Filesystem = require('asar/lib/filesystem');
 import * as VinylFile from 'vinyl';
 import * as minimatch from 'minimatch';

--- a/build/lib/builtInExtensions.js
+++ b/build/lib/builtInExtensions.js
@@ -49,7 +49,7 @@ function syncMarketplaceExtension(extension) {

 	rimraf.sync(getExtensionPath(extension));

-	return ext.fromMarketplace(extension.name, extension.version)
+	return ext.fromMarketplace(extension.name, extension.version, extension.metadata)
 		.pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`))
 		.pipe(vfs.dest('.build/builtInExtensions'))
 		.on('end', () => util.log(util.colors.blue('[marketplace]'), extension.name, util.colors.green('✔︎')));
--- a/build/lib/bundle.js
+++ b/build/lib/bundle.js
@@ -4,19 +4,19 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-var fs = require("fs");
-var path = require("path");
-var vm = require("vm");
+const fs = require("fs");
+const path = require("path");
+const vm = require("vm");
 /**
 * Bundle `entryPoints` given config `config`.
 */
 function bundle(entryPoints, config, callback) {
-    var entryPointsMap = {};
-    entryPoints.forEach(function (module) {
+    const entryPointsMap = {};
+    entryPoints.forEach((module) => {
        entryPointsMap[module.name] = module;
    });
-    var allMentionedModulesMap = {};
-    entryPoints.forEach(function (module) {
+    const allMentionedModulesMap = {};
+    entryPoints.forEach((module) => {
        allMentionedModulesMap[module.name] = true;
        (module.include || []).forEach(function (includedModule) {
            allMentionedModulesMap[includedModule] = true;
@@ -25,26 +25,30 @@ function bundle(entryPoints, config, callback) {
            allMentionedModulesMap[excludedModule] = true;
        });
    });
-    var code = require('fs').readFileSync(path.join(__dirname, '../../src/vs/loader.js'));
-    var r = vm.runInThisContext('(function(require, module, exports) { ' + code + '\n});');
-    var loaderModule = { exports: {} };
+    const code = require('fs').readFileSync(path.join(__dirname, '../../src/vs/loader.js'));
+    const r = vm.runInThisContext('(function(require, module, exports) { ' + code + '\n});');
+    const loaderModule = { exports: {} };
    r.call({}, require, loaderModule, loaderModule.exports);
-    var loader = loaderModule.exports;
+    const loader = loaderModule.exports;
    config.isBuild = true;
    config.paths = config.paths || {};
+    if (!config.paths['vs/nls']) {
        config.paths['vs/nls'] = 'out-build/vs/nls.build';
+    }
+    if (!config.paths['vs/css']) {
        config.paths['vs/css'] = 'out-build/vs/css.build';
+    }
    loader.config(config);
-    loader(['require'], function (localRequire) {
-        var resolvePath = function (path) {
-            var r = localRequire.toUrl(path);
+    loader(['require'], (localRequire) => {
+        const resolvePath = (path) => {
+            const r = localRequire.toUrl(path);
            if (!/\.js/.test(r)) {
                return r + '.js';
            }
            return r;
        };
-        for (var moduleId in entryPointsMap) {
-            var entryPoint = entryPointsMap[moduleId];
+        for (const moduleId in entryPointsMap) {
+            const entryPoint = entryPointsMap[moduleId];
            if (entryPoint.append) {
                entryPoint.append = entryPoint.append.map(resolvePath);
            }
@@ -53,59 +57,59 @@ function bundle(entryPoints, config, callback) {
            }
        }
    });
-    loader(Object.keys(allMentionedModulesMap), function () {
-        var modules = loader.getBuildInfo();
-        var partialResult = emitEntryPoints(modules, entryPointsMap);
-        var cssInlinedResources = loader('vs/css').getInlinedResources();
+    loader(Object.keys(allMentionedModulesMap), () => {
+        const modules = loader.getBuildInfo();
+        const partialResult = emitEntryPoints(modules, entryPointsMap);
+        const cssInlinedResources = loader('vs/css').getInlinedResources();
        callback(null, {
            files: partialResult.files,
            cssInlinedResources: cssInlinedResources,
            bundleData: partialResult.bundleData
        });
-    }, function (err) { return callback(err, null); });
+    }, (err) => callback(err, null));
 }
 exports.bundle = bundle;
 function emitEntryPoints(modules, entryPoints) {
-    var modulesMap = {};
-    modules.forEach(function (m) {
+    const modulesMap = {};
+    modules.forEach((m) => {
        modulesMap[m.id] = m;
    });
-    var modulesGraph = {};
-    modules.forEach(function (m) {
+    const modulesGraph = {};
+    modules.forEach((m) => {
        modulesGraph[m.id] = m.dependencies;
    });
-    var sortedModules = topologicalSort(modulesGraph);
-    var result = [];
-    var usedPlugins = {};
-    var bundleData = {
+    const sortedModules = topologicalSort(modulesGraph);
+    let result = [];
+    const usedPlugins = {};
+    const bundleData = {
        graph: modulesGraph,
        bundles: {}
    };
-    Object.keys(entryPoints).forEach(function (moduleToBundle) {
-        var info = entryPoints[moduleToBundle];
-        var rootNodes = [moduleToBundle].concat(info.include || []);
-        var allDependencies = visit(rootNodes, modulesGraph);
-        var excludes = ['require', 'exports', 'module'].concat(info.exclude || []);
-        excludes.forEach(function (excludeRoot) {
-            var allExcludes = visit([excludeRoot], modulesGraph);
-            Object.keys(allExcludes).forEach(function (exclude) {
+    Object.keys(entryPoints).forEach((moduleToBundle) => {
+        const info = entryPoints[moduleToBundle];
+        const rootNodes = [moduleToBundle].concat(info.include || []);
+        const allDependencies = visit(rootNodes, modulesGraph);
+        const excludes = ['require', 'exports', 'module'].concat(info.exclude || []);
+        excludes.forEach((excludeRoot) => {
+            const allExcludes = visit([excludeRoot], modulesGraph);
+            Object.keys(allExcludes).forEach((exclude) => {
                delete allDependencies[exclude];
            });
        });
-        var includedModules = sortedModules.filter(function (module) {
+        const includedModules = sortedModules.filter((module) => {
            return allDependencies[module];
        });
        bundleData.bundles[moduleToBundle] = includedModules;
-        var res = emitEntryPoint(modulesMap, modulesGraph, moduleToBundle, includedModules, info.prepend, info.append, info.dest);
+        const res = emitEntryPoint(modulesMap, modulesGraph, moduleToBundle, includedModules, info.prepend || [], info.append || [], info.dest);
        result = result.concat(res.files);
-        for (var pluginName in res.usedPlugins) {
+        for (const pluginName in res.usedPlugins) {
            usedPlugins[pluginName] = usedPlugins[pluginName] || res.usedPlugins[pluginName];
        }
    });
-    Object.keys(usedPlugins).forEach(function (pluginName) {
-        var plugin = usedPlugins[pluginName];
+    Object.keys(usedPlugins).forEach((pluginName) => {
+        const plugin = usedPlugins[pluginName];
        if (typeof plugin.finishBuild === 'function') {
-            var write = function (filename, contents) {
+            const write = (filename, contents) => {
                result.push({
                    dest: filename,
                    sources: [{
@@ -124,16 +128,16 @@ function emitEntryPoints(modules, entryPoints) {
    };
 }
 function extractStrings(destFiles) {
-    var parseDefineCall = function (moduleMatch, depsMatch) {
-        var module = moduleMatch.replace(/^"|"$/g, '');
-        var deps = depsMatch.split(',');
-        deps = deps.map(function (dep) {
+    const parseDefineCall = (moduleMatch, depsMatch) => {
+        const module = moduleMatch.replace(/^"|"$/g, '');
+        let deps = depsMatch.split(',');
+        deps = deps.map((dep) => {
            dep = dep.trim();
            dep = dep.replace(/^"|"$/g, '');
            dep = dep.replace(/^'|'$/g, '');
-            var prefix = null;
-            var _path = null;
-            var pieces = dep.split('!');
+            let prefix = null;
+            let _path = null;
+            const pieces = dep.split('!');
            if (pieces.length > 1) {
                prefix = pieces[0] + '!';
                _path = pieces[1];
@@ -143,7 +147,7 @@ function extractStrings(destFiles) {
                _path = pieces[0];
            }
            if (/^\.\//.test(_path) || /^\.\.\//.test(_path)) {
-                var res = path.join(path.dirname(module), _path).replace(/\\/g, '/');
+                const res = path.join(path.dirname(module), _path).replace(/\\/g, '/');
                return prefix + res;
            }
            return prefix + _path;
@@ -153,7 +157,7 @@ function extractStrings(destFiles) {
            deps: deps
        };
    };
-    destFiles.forEach(function (destFile, index) {
+    destFiles.forEach((destFile) => {
        if (!/\.js$/.test(destFile.dest)) {
            return;
        }
@@ -161,44 +165,44 @@ function extractStrings(destFiles) {
            return;
        }
        // Do one pass to record the usage counts for each module id
-        var useCounts = {};
-        destFile.sources.forEach(function (source) {
-            var matches = source.contents.match(/define\(("[^"]+"),\s*\[(((, )?("|')[^"']+("|'))+)\]/);
+        const useCounts = {};
+        destFile.sources.forEach((source) => {
+            const matches = source.contents.match(/define\(("[^"]+"),\s*\[(((, )?("|')[^"']+("|'))+)\]/);
            if (!matches) {
                return;
            }
-            var defineCall = parseDefineCall(matches[1], matches[2]);
+            const defineCall = parseDefineCall(matches[1], matches[2]);
            useCounts[defineCall.module] = (useCounts[defineCall.module] || 0) + 1;
-            defineCall.deps.forEach(function (dep) {
+            defineCall.deps.forEach((dep) => {
                useCounts[dep] = (useCounts[dep] || 0) + 1;
            });
        });
-        var sortedByUseModules = Object.keys(useCounts);
-        sortedByUseModules.sort(function (a, b) {
+        const sortedByUseModules = Object.keys(useCounts);
+        sortedByUseModules.sort((a, b) => {
            return useCounts[b] - useCounts[a];
        });
-        var replacementMap = {};
-        sortedByUseModules.forEach(function (module, index) {
+        const replacementMap = {};
+        sortedByUseModules.forEach((module, index) => {
            replacementMap[module] = index;
        });
-        destFile.sources.forEach(function (source) {
-            source.contents = source.contents.replace(/define\(("[^"]+"),\s*\[(((, )?("|')[^"']+("|'))+)\]/, function (_, moduleMatch, depsMatch) {
-                var defineCall = parseDefineCall(moduleMatch, depsMatch);
-                return "define(__m[" + replacementMap[defineCall.module] + "/*" + defineCall.module + "*/], __M([" + defineCall.deps.map(function (dep) { return replacementMap[dep] + '/*' + dep + '*/'; }).join(',') + "])";
+        destFile.sources.forEach((source) => {
+            source.contents = source.contents.replace(/define\(("[^"]+"),\s*\[(((, )?("|')[^"']+("|'))+)\]/, (_, moduleMatch, depsMatch) => {
+                const defineCall = parseDefineCall(moduleMatch, depsMatch);
+                return `define(__m[${replacementMap[defineCall.module]}/*${defineCall.module}*/], __M([${defineCall.deps.map(dep => replacementMap[dep] + '/*' + dep + '*/').join(',')}])`;
            });
        });
        destFile.sources.unshift({
            path: null,
            contents: [
                '(function() {',
-                "var __m = " + JSON.stringify(sortedByUseModules) + ";",
-                "var __M = function(deps) {",
-                "  var result = [];",
-                "  for (var i = 0, len = deps.length; i < len; i++) {",
-                "    result[i] = __m[deps[i]];",
-                "  }",
-                "  return result;",
-                "};"
+                `var __m = ${JSON.stringify(sortedByUseModules)};`,
+                `var __M = function(deps) {`,
+                `  var result = [];`,
+                `  for (var i = 0, len = deps.length; i < len; i++) {`,
+                `    result[i] = __m[deps[i]];`,
+                `  }`,
+                `  return result;`,
+                `};`
            ].join('\n')
        });
        destFile.sources.push({
@@ -210,7 +214,7 @@ function extractStrings(destFiles) {
 }
 function removeDuplicateTSBoilerplate(destFiles) {
    // Taken from typescript compiler => emitFiles
-    var BOILERPLATE = [
+    const BOILERPLATE = [
        { start: /^var __extends/, end: /^}\)\(\);$/ },
        { start: /^var __assign/, end: /^};$/ },
        { start: /^var __decorate/, end: /^};$/ },
@@ -219,14 +223,14 @@ function removeDuplicateTSBoilerplate(destFiles) {
        { start: /^var __awaiter/, end: /^};$/ },
        { start: /^var __generator/, end: /^};$/ },
    ];
-    destFiles.forEach(function (destFile) {
-        var SEEN_BOILERPLATE = [];
-        destFile.sources.forEach(function (source) {
-            var lines = source.contents.split(/\r\n|\n|\r/);
-            var newLines = [];
-            var IS_REMOVING_BOILERPLATE = false, END_BOILERPLATE;
-            for (var i = 0; i < lines.length; i++) {
-                var line = lines[i];
+    destFiles.forEach((destFile) => {
+        const SEEN_BOILERPLATE = [];
+        destFile.sources.forEach((source) => {
+            const lines = source.contents.split(/\r\n|\n|\r/);
+            const newLines = [];
+            let IS_REMOVING_BOILERPLATE = false, END_BOILERPLATE;
+            for (let i = 0; i < lines.length; i++) {
+                const line = lines[i];
                if (IS_REMOVING_BOILERPLATE) {
                    newLines.push('');
                    if (END_BOILERPLATE.test(line)) {
@@ -234,8 +238,8 @@ function removeDuplicateTSBoilerplate(destFiles) {
                    }
                }
                else {
-                    for (var j = 0; j < BOILERPLATE.length; j++) {
-                        var boilerplate = BOILERPLATE[j];
+                    for (let j = 0; j < BOILERPLATE.length; j++) {
+                        const boilerplate = BOILERPLATE[j];
                        if (boilerplate.start.test(line)) {
                            if (SEEN_BOILERPLATE[j]) {
                                IS_REMOVING_BOILERPLATE = true;
@@ -263,45 +267,45 @@ function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend,
    if (!dest) {
        dest = entryPoint + '.js';
    }
-    var mainResult = {
+    const mainResult = {
        sources: [],
        dest: dest
    }, results = [mainResult];
-    var usedPlugins = {};
-    var getLoaderPlugin = function (pluginName) {
+    const usedPlugins = {};
+    const getLoaderPlugin = (pluginName) => {
        if (!usedPlugins[pluginName]) {
            usedPlugins[pluginName] = modulesMap[pluginName].exports;
        }
        return usedPlugins[pluginName];
    };
-    includedModules.forEach(function (c) {
-        var bangIndex = c.indexOf('!');
+    includedModules.forEach((c) => {
+        const bangIndex = c.indexOf('!');
        if (bangIndex >= 0) {
-            var pluginName = c.substr(0, bangIndex);
-            var plugin = getLoaderPlugin(pluginName);
+            const pluginName = c.substr(0, bangIndex);
+            const plugin = getLoaderPlugin(pluginName);
            mainResult.sources.push(emitPlugin(entryPoint, plugin, pluginName, c.substr(bangIndex + 1)));
            return;
        }
-        var module = modulesMap[c];
+        const module = modulesMap[c];
        if (module.path === 'empty:') {
            return;
        }
-        var contents = readFileAndRemoveBOM(module.path);
+        const contents = readFileAndRemoveBOM(module.path);
        if (module.shim) {
            mainResult.sources.push(emitShimmedModule(c, deps[c], module.shim, module.path, contents));
        }
        else {
-            mainResult.sources.push(emitNamedModule(c, deps[c], module.defineLocation, module.path, contents));
+            mainResult.sources.push(emitNamedModule(c, module.defineLocation, module.path, contents));
        }
    });
-    Object.keys(usedPlugins).forEach(function (pluginName) {
-        var plugin = usedPlugins[pluginName];
+    Object.keys(usedPlugins).forEach((pluginName) => {
+        const plugin = usedPlugins[pluginName];
        if (typeof plugin.writeFile === 'function') {
-            var req = (function () {
+            const req = (() => {
                throw new Error('no-no!');
            });
-            req.toUrl = function (something) { return something; };
-            var write = function (filename, contents) {
+            req.toUrl = something => something;
+            const write = (filename, contents) => {
                results.push({
                    dest: filename,
                    sources: [{
@@ -313,15 +317,15 @@ function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend,
            plugin.writeFile(pluginName, entryPoint, req, write, {});
        }
    });
-    var toIFile = function (path) {
-        var contents = readFileAndRemoveBOM(path);
+    const toIFile = (path) => {
+        const contents = readFileAndRemoveBOM(path);
        return {
            path: path,
            contents: contents
        };
    };
-    var toPrepend = (prepend || []).map(toIFile);
-    var toAppend = (append || []).map(toIFile);
+    const toPrepend = (prepend || []).map(toIFile);
+    const toAppend = (append || []).map(toIFile);
    mainResult.sources = toPrepend.concat(mainResult.sources).concat(toAppend);
    return {
        files: results,
@@ -329,8 +333,8 @@ function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend,
    };
 }
 function readFileAndRemoveBOM(path) {
-    var BOM_CHAR_CODE = 65279;
-    var contents = fs.readFileSync(path, 'utf8');
+    const BOM_CHAR_CODE = 65279;
+    let contents = fs.readFileSync(path, 'utf8');
    // Remove BOM
    if (contents.charCodeAt(0) === BOM_CHAR_CODE) {
        contents = contents.substring(1);
@@ -338,15 +342,15 @@ function readFileAndRemoveBOM(path) {
    return contents;
 }
 function emitPlugin(entryPoint, plugin, pluginName, moduleName) {
-    var result = '';
+    let result = '';
    if (typeof plugin.write === 'function') {
-        var write = (function (what) {
+        const write = ((what) => {
            result += what;
        });
-        write.getEntryPoint = function () {
+        write.getEntryPoint = () => {
            return entryPoint;
        };
-        write.asModule = function (moduleId, code) {
+        write.asModule = (moduleId, code) => {
            code = code.replace(/^define\(/, 'define("' + moduleId + '",');
            result += code;
        };
@@ -357,20 +361,20 @@ function emitPlugin(entryPoint, plugin, pluginName, moduleName) {
        contents: result
    };
 }
-function emitNamedModule(moduleId, myDeps, defineCallPosition, path, contents) {
+function emitNamedModule(moduleId, defineCallPosition, path, contents) {
    // `defineCallPosition` is the position in code: |define()
-    var defineCallOffset = positionToOffset(contents, defineCallPosition.line, defineCallPosition.col);
+    const defineCallOffset = positionToOffset(contents, defineCallPosition.line, defineCallPosition.col);
    // `parensOffset` is the position in code: define|()
-    var parensOffset = contents.indexOf('(', defineCallOffset);
-    var insertStr = '"' + moduleId + '", ';
+    const parensOffset = contents.indexOf('(', defineCallOffset);
+    const insertStr = '"' + moduleId + '", ';
    return {
        path: path,
        contents: contents.substr(0, parensOffset + 1) + insertStr + contents.substr(parensOffset + 1)
    };
 }
 function emitShimmedModule(moduleId, myDeps, factory, path, contents) {
-    var strDeps = (myDeps.length > 0 ? '"' + myDeps.join('", "') + '"' : '');
-    var strDefine = 'define("' + moduleId + '", [' + strDeps + '], ' + factory + ');';
+    const strDeps = (myDeps.length > 0 ? '"' + myDeps.join('", "') + '"' : '');
+    const strDefine = 'define("' + moduleId + '", [' + strDeps + '], ' + factory + ');';
    return {
        path: path,
        contents: contents + '\n;\n' + strDefine
@@ -383,7 +387,8 @@ function positionToOffset(str, desiredLine, desiredCol) {
    if (desiredLine === 1) {
        return desiredCol - 1;
    }
-    var line = 1, lastNewLineOffset = -1;
+    let line = 1;
+    let lastNewLineOffset = -1;
    do {
        if (desiredLine === line) {
            return lastNewLineOffset + 1 + desiredCol - 1;
@@ -397,14 +402,15 @@ function positionToOffset(str, desiredLine, desiredCol) {
 * Return a set of reachable nodes in `graph` starting from `rootNodes`
 */
 function visit(rootNodes, graph) {
-    var result = {}, queue = rootNodes;
-    rootNodes.forEach(function (node) {
+    const result = {};
+    const queue = rootNodes;
+    rootNodes.forEach((node) => {
        result[node] = true;
    });
    while (queue.length > 0) {
-        var el = queue.shift();
-        var myEdges = graph[el] || [];
-        myEdges.forEach(function (toNode) {
+        const el = queue.shift();
+        const myEdges = graph[el] || [];
+        myEdges.forEach((toNode) => {
            if (!result[toNode]) {
                result[toNode] = true;
                queue.push(toNode);
@@ -417,11 +423,11 @@ function visit(rootNodes, graph) {
 * Perform a topological sort on `graph`
 */
 function topologicalSort(graph) {
-    var allNodes = {}, outgoingEdgeCount = {}, inverseEdges = {};
-    Object.keys(graph).forEach(function (fromNode) {
+    const allNodes = {}, outgoingEdgeCount = {}, inverseEdges = {};
+    Object.keys(graph).forEach((fromNode) => {
        allNodes[fromNode] = true;
        outgoingEdgeCount[fromNode] = graph[fromNode].length;
-        graph[fromNode].forEach(function (toNode) {
+        graph[fromNode].forEach((toNode) => {
            allNodes[toNode] = true;
            outgoingEdgeCount[toNode] = outgoingEdgeCount[toNode] || 0;
            inverseEdges[toNode] = inverseEdges[toNode] || [];
@@ -429,8 +435,8 @@ function topologicalSort(graph) {
        });
    });
    // https://en.wikipedia.org/wiki/Topological_sorting
-    var S = [], L = [];
-    Object.keys(allNodes).forEach(function (node) {
+    const S = [], L = [];
+    Object.keys(allNodes).forEach((node) => {
        if (outgoingEdgeCount[node] === 0) {
            delete outgoingEdgeCount[node];
            S.push(node);
@@ -439,10 +445,10 @@ function topologicalSort(graph) {
    while (S.length > 0) {
        // Ensure the exact same order all the time with the same inputs
        S.sort();
-        var n = S.shift();
+        const n = S.shift();
        L.push(n);
-        var myInverseEdges = inverseEdges[n] || [];
-        myInverseEdges.forEach(function (m) {
+        const myInverseEdges = inverseEdges[n] || [];
+        myInverseEdges.forEach((m) => {
            outgoingEdgeCount[m]--;
            if (outgoingEdgeCount[m] === 0) {
                delete outgoingEdgeCount[m];
--- a/build/lib/bundle.ts
+++ b/build/lib/bundle.ts
@@ -3,9 +3,9 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import fs = require('fs');
-import path = require('path');
-import vm = require('vm');
+import * as fs from 'fs';
+import * as path from 'path';
+import * as vm from 'vm';

 interface IPosition {
 	line: number;
@@ -46,7 +46,7 @@ export interface IEntryPoint {
 	name: string;
 	include?: string[];
 	exclude?: string[];
-	prepend: string[];
+	prepend?: string[];
 	append?: string[];
 	dest?: string;
 }
@@ -64,7 +64,7 @@ interface INodeSet {
 }

 export interface IFile {
-	path: string;
+	path: string | null;
 	contents: string;
 }

@@ -97,13 +97,13 @@ export interface ILoaderConfig {
 /**
 * Bundle `entryPoints` given config `config`.
 */
-export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callback: (err: any, result: IBundleResult) => void): void {
-	let entryPointsMap: IEntryPointMap = {};
+export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callback: (err: any, result: IBundleResult | null) => void): void {
+	const entryPointsMap: IEntryPointMap = {};
 	entryPoints.forEach((module: IEntryPoint) => {
 		entryPointsMap[module.name] = module;
 	});

-	let allMentionedModulesMap: { [modules: string]: boolean; } = {};
+	const allMentionedModulesMap: { [modules: string]: boolean; } = {};
 	entryPoints.forEach((module: IEntryPoint) => {
 		allMentionedModulesMap[module.name] = true;
 		(module.include || []).forEach(function (includedModule) {
@@ -115,28 +115,32 @@ export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callba
 	});


-	var code = require('fs').readFileSync(path.join(__dirname, '../../src/vs/loader.js'));
-	var r: Function = <any>vm.runInThisContext('(function(require, module, exports) { ' + code + '\n});');
-	var loaderModule = { exports: {} };
+	const code = require('fs').readFileSync(path.join(__dirname, '../../src/vs/loader.js'));
+	const r: Function = <any>vm.runInThisContext('(function(require, module, exports) { ' + code + '\n});');
+	const loaderModule = { exports: {} };
 	r.call({}, require, loaderModule, loaderModule.exports);

-	var loader: any = loaderModule.exports;
+	const loader: any = loaderModule.exports;
 	config.isBuild = true;
 	config.paths = config.paths || {};
+	if (!config.paths['vs/nls']) {
 		config.paths['vs/nls'] = 'out-build/vs/nls.build';
+	}
+	if (!config.paths['vs/css']) {
 		config.paths['vs/css'] = 'out-build/vs/css.build';
+	}
 	loader.config(config);

-	loader(['require'], (localRequire) => {
-		let resolvePath = (path: string) => {
-			let r = localRequire.toUrl(path);
+	loader(['require'], (localRequire: any) => {
+		const resolvePath = (path: string) => {
+			const r = localRequire.toUrl(path);
 			if (!/\.js/.test(r)) {
 				return r + '.js';
 			}
 			return r;
 		};
-		for (let moduleId in entryPointsMap) {
-			let entryPoint = entryPointsMap[moduleId];
+		for (const moduleId in entryPointsMap) {
+			const entryPoint = entryPointsMap[moduleId];
 			if (entryPoint.append) {
 				entryPoint.append = entryPoint.append.map(resolvePath);
 			}
@@ -147,76 +151,76 @@ export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callba
 	});

 	loader(Object.keys(allMentionedModulesMap), () => {
-		let modules = <IBuildModuleInfo[]>loader.getBuildInfo();
-		let partialResult = emitEntryPoints(modules, entryPointsMap);
-		let cssInlinedResources = loader('vs/css').getInlinedResources();
+		const modules = <IBuildModuleInfo[]>loader.getBuildInfo();
+		const partialResult = emitEntryPoints(modules, entryPointsMap);
+		const cssInlinedResources = loader('vs/css').getInlinedResources();
 		callback(null, {
 			files: partialResult.files,
 			cssInlinedResources: cssInlinedResources,
 			bundleData: partialResult.bundleData
 		});
-	}, (err) => callback(err, null));
+	}, (err: any) => callback(err, null));
 }

 function emitEntryPoints(modules: IBuildModuleInfo[], entryPoints: IEntryPointMap): IPartialBundleResult {
-	let modulesMap: IBuildModuleInfoMap = {};
+	const modulesMap: IBuildModuleInfoMap = {};
 	modules.forEach((m: IBuildModuleInfo) => {
 		modulesMap[m.id] = m;
 	});

-	let modulesGraph: IGraph = {};
+	const modulesGraph: IGraph = {};
 	modules.forEach((m: IBuildModuleInfo) => {
 		modulesGraph[m.id] = m.dependencies;
 	});

-	let sortedModules = topologicalSort(modulesGraph);
+	const sortedModules = topologicalSort(modulesGraph);

 	let result: IConcatFile[] = [];
-	let usedPlugins: IPluginMap = {};
-	let bundleData: IBundleData = {
+	const usedPlugins: IPluginMap = {};
+	const bundleData: IBundleData = {
 		graph: modulesGraph,
 		bundles: {}
 	};

 	Object.keys(entryPoints).forEach((moduleToBundle: string) => {
-		let info = entryPoints[moduleToBundle];
-		let rootNodes = [moduleToBundle].concat(info.include || []);
-		let allDependencies = visit(rootNodes, modulesGraph);
-		let excludes: string[] = ['require', 'exports', 'module'].concat(info.exclude || []);
+		const info = entryPoints[moduleToBundle];
+		const rootNodes = [moduleToBundle].concat(info.include || []);
+		const allDependencies = visit(rootNodes, modulesGraph);
+		const excludes: string[] = ['require', 'exports', 'module'].concat(info.exclude || []);

 		excludes.forEach((excludeRoot: string) => {
-			let allExcludes = visit([excludeRoot], modulesGraph);
+			const allExcludes = visit([excludeRoot], modulesGraph);
 			Object.keys(allExcludes).forEach((exclude: string) => {
 				delete allDependencies[exclude];
 			});
 		});

-		let includedModules = sortedModules.filter((module: string) => {
+		const includedModules = sortedModules.filter((module: string) => {
 			return allDependencies[module];
 		});

 		bundleData.bundles[moduleToBundle] = includedModules;

-		let res = emitEntryPoint(
+		const res = emitEntryPoint(
 			modulesMap,
 			modulesGraph,
 			moduleToBundle,
 			includedModules,
-			info.prepend,
-			info.append,
+			info.prepend || [],
+			info.append || [],
 			info.dest
 		);

 		result = result.concat(res.files);
-		for (let pluginName in res.usedPlugins) {
+		for (const pluginName in res.usedPlugins) {
 			usedPlugins[pluginName] = usedPlugins[pluginName] || res.usedPlugins[pluginName];
 		}
 	});

 	Object.keys(usedPlugins).forEach((pluginName: string) => {
-		let plugin = usedPlugins[pluginName];
+		const plugin = usedPlugins[pluginName];
 		if (typeof plugin.finishBuild === 'function') {
-			let write = (filename: string, contents: string) => {
+			const write = (filename: string, contents: string) => {
 				result.push({
 					dest: filename,
 					sources: [{
@@ -237,16 +241,16 @@ function emitEntryPoints(modules: IBuildModuleInfo[], entryPoints: IEntryPointMa
 }

 function extractStrings(destFiles: IConcatFile[]): IConcatFile[] {
-	let parseDefineCall = (moduleMatch: string, depsMatch: string) => {
-		let module = moduleMatch.replace(/^"|"$/g, '');
+	const parseDefineCall = (moduleMatch: string, depsMatch: string) => {
+		const module = moduleMatch.replace(/^"|"$/g, '');
 		let deps = depsMatch.split(',');
 		deps = deps.map((dep) => {
 			dep = dep.trim();
 			dep = dep.replace(/^"|"$/g, '');
 			dep = dep.replace(/^'|'$/g, '');
-			let prefix: string = null;
-			let _path: string = null;
-			let pieces = dep.split('!');
+			let prefix: string | null = null;
+			let _path: string | null = null;
+			const pieces = dep.split('!');
 			if (pieces.length > 1) {
 				prefix = pieces[0] + '!';
 				_path = pieces[1];
@@ -256,7 +260,7 @@ function extractStrings(destFiles: IConcatFile[]): IConcatFile[] {
 			}

 			if (/^\.\//.test(_path) || /^\.\.\//.test(_path)) {
-				let res = path.join(path.dirname(module), _path).replace(/\\/g, '/');
+				const res = path.join(path.dirname(module), _path).replace(/\\/g, '/');
 				return prefix + res;
 			}
 			return prefix + _path;
@@ -267,7 +271,7 @@ function extractStrings(destFiles: IConcatFile[]): IConcatFile[] {
 		};
 	};

-	destFiles.forEach((destFile, index) => {
+	destFiles.forEach((destFile) => {
 		if (!/\.js$/.test(destFile.dest)) {
 			return;
 		}
@@ -276,33 +280,33 @@ function extractStrings(destFiles: IConcatFile[]): IConcatFile[] {
 		}

 		// Do one pass to record the usage counts for each module id
-		let useCounts: { [moduleId: string]: number; } = {};
+		const useCounts: { [moduleId: string]: number; } = {};
 		destFile.sources.forEach((source) => {
-			let matches = source.contents.match(/define\(("[^"]+"),\s*\[(((, )?("|')[^"']+("|'))+)\]/);
+			const matches = source.contents.match(/define\(("[^"]+"),\s*\[(((, )?("|')[^"']+("|'))+)\]/);
 			if (!matches) {
 				return;
 			}

-			let defineCall = parseDefineCall(matches[1], matches[2]);
+			const defineCall = parseDefineCall(matches[1], matches[2]);
 			useCounts[defineCall.module] = (useCounts[defineCall.module] || 0) + 1;
 			defineCall.deps.forEach((dep) => {
 				useCounts[dep] = (useCounts[dep] || 0) + 1;
 			});
 		});

-		let sortedByUseModules = Object.keys(useCounts);
+		const sortedByUseModules = Object.keys(useCounts);
 		sortedByUseModules.sort((a, b) => {
 			return useCounts[b] - useCounts[a];
 		});

-		let replacementMap: { [moduleId: string]: number; } = {};
+		const replacementMap: { [moduleId: string]: number; } = {};
 		sortedByUseModules.forEach((module, index) => {
 			replacementMap[module] = index;
 		});

 		destFile.sources.forEach((source) => {
 			source.contents = source.contents.replace(/define\(("[^"]+"),\s*\[(((, )?("|')[^"']+("|'))+)\]/, (_, moduleMatch, depsMatch) => {
-				let defineCall = parseDefineCall(moduleMatch, depsMatch);
+				const defineCall = parseDefineCall(moduleMatch, depsMatch);
 				return `define(__m[${replacementMap[defineCall.module]}/*${defineCall.module}*/], __M([${defineCall.deps.map(dep => replacementMap[dep] + '/*' + dep + '*/').join(',')}])`;
 			});
 		});
@@ -332,7 +336,7 @@ function extractStrings(destFiles: IConcatFile[]): IConcatFile[] {

 function removeDuplicateTSBoilerplate(destFiles: IConcatFile[]): IConcatFile[] {
 	// Taken from typescript compiler => emitFiles
-	let BOILERPLATE = [
+	const BOILERPLATE = [
 		{ start: /^var __extends/, end: /^}\)\(\);$/ },
 		{ start: /^var __assign/, end: /^};$/ },
 		{ start: /^var __decorate/, end: /^};$/ },
@@ -343,22 +347,22 @@ function removeDuplicateTSBoilerplate(destFiles: IConcatFile[]): IConcatFile[] {
 	];

 	destFiles.forEach((destFile) => {
-		let SEEN_BOILERPLATE = [];
+		const SEEN_BOILERPLATE: boolean[] = [];
 		destFile.sources.forEach((source) => {
-			let lines = source.contents.split(/\r\n|\n|\r/);
-			let newLines: string[] = [];
+			const lines = source.contents.split(/\r\n|\n|\r/);
+			const newLines: string[] = [];
 			let IS_REMOVING_BOILERPLATE = false, END_BOILERPLATE: RegExp;

 			for (let i = 0; i < lines.length; i++) {
-				let line = lines[i];
+				const line = lines[i];
 				if (IS_REMOVING_BOILERPLATE) {
 					newLines.push('');
-					if (END_BOILERPLATE.test(line)) {
+					if (END_BOILERPLATE!.test(line)) {
 						IS_REMOVING_BOILERPLATE = false;
 					}
 				} else {
 					for (let j = 0; j < BOILERPLATE.length; j++) {
-						let boilerplate = BOILERPLATE[j];
+						const boilerplate = BOILERPLATE[j];
 						if (boilerplate.start.test(line)) {
 							if (SEEN_BOILERPLATE[j]) {
 								IS_REMOVING_BOILERPLATE = true;
@@ -398,19 +402,19 @@ function emitEntryPoint(
 	includedModules: string[],
 	prepend: string[],
 	append: string[],
-	dest: string
+	dest: string | undefined
 ): IEmitEntryPointResult {
 	if (!dest) {
 		dest = entryPoint + '.js';
 	}
-	let mainResult: IConcatFile = {
+	const mainResult: IConcatFile = {
 		sources: [],
 		dest: dest
 	},
 		results: IConcatFile[] = [mainResult];

-	let usedPlugins: IPluginMap = {};
-	let getLoaderPlugin = (pluginName: string): ILoaderPlugin => {
+	const usedPlugins: IPluginMap = {};
+	const getLoaderPlugin = (pluginName: string): ILoaderPlugin => {
 		if (!usedPlugins[pluginName]) {
 			usedPlugins[pluginName] = modulesMap[pluginName].exports;
 		}
@@ -418,39 +422,39 @@ function emitEntryPoint(
 	};

 	includedModules.forEach((c: string) => {
-		let bangIndex = c.indexOf('!');
+		const bangIndex = c.indexOf('!');

 		if (bangIndex >= 0) {
-			let pluginName = c.substr(0, bangIndex);
-			let plugin = getLoaderPlugin(pluginName);
+			const pluginName = c.substr(0, bangIndex);
+			const plugin = getLoaderPlugin(pluginName);
 			mainResult.sources.push(emitPlugin(entryPoint, plugin, pluginName, c.substr(bangIndex + 1)));
 			return;
 		}

-		let module = modulesMap[c];
+		const module = modulesMap[c];

 		if (module.path === 'empty:') {
 			return;
 		}

-		let contents = readFileAndRemoveBOM(module.path);
+		const contents = readFileAndRemoveBOM(module.path);

 		if (module.shim) {
 			mainResult.sources.push(emitShimmedModule(c, deps[c], module.shim, module.path, contents));
 		} else {
-			mainResult.sources.push(emitNamedModule(c, deps[c], module.defineLocation, module.path, contents));
+			mainResult.sources.push(emitNamedModule(c, module.defineLocation, module.path, contents));
 		}
 	});

 	Object.keys(usedPlugins).forEach((pluginName: string) => {
-		let plugin = usedPlugins[pluginName];
+		const plugin = usedPlugins[pluginName];
 		if (typeof plugin.writeFile === 'function') {
-			let req: ILoaderPluginReqFunc = <any>(() => {
+			const req: ILoaderPluginReqFunc = <any>(() => {
 				throw new Error('no-no!');
 			});
 			req.toUrl = something => something;

-			let write = (filename: string, contents: string) => {
+			const write = (filename: string, contents: string) => {
 				results.push({
 					dest: filename,
 					sources: [{
@@ -463,16 +467,16 @@ function emitEntryPoint(
 		}
 	});

-	let toIFile = (path): IFile => {
-		let contents = readFileAndRemoveBOM(path);
+	const toIFile = (path: string): IFile => {
+		const contents = readFileAndRemoveBOM(path);
 		return {
 			path: path,
 			contents: contents
 		};
 	};

-	let toPrepend = (prepend || []).map(toIFile);
-	let toAppend = (append || []).map(toIFile);
+	const toPrepend = (prepend || []).map(toIFile);
+	const toAppend = (append || []).map(toIFile);

 	mainResult.sources = toPrepend.concat(mainResult.sources).concat(toAppend);

@@ -483,8 +487,8 @@ function emitEntryPoint(
 }

 function readFileAndRemoveBOM(path: string): string {
-	var BOM_CHAR_CODE = 65279;
-	var contents = fs.readFileSync(path, 'utf8');
+	const BOM_CHAR_CODE = 65279;
+	let contents = fs.readFileSync(path, 'utf8');
 	// Remove BOM
 	if (contents.charCodeAt(0) === BOM_CHAR_CODE) {
 		contents = contents.substring(1);
@@ -495,7 +499,7 @@ function readFileAndRemoveBOM(path: string): string {
 function emitPlugin(entryPoint: string, plugin: ILoaderPlugin, pluginName: string, moduleName: string): IFile {
 	let result = '';
 	if (typeof plugin.write === 'function') {
-		let write: ILoaderPluginWriteFunc = <any>((what) => {
+		const write: ILoaderPluginWriteFunc = <any>((what: string) => {
 			result += what;
 		});
 		write.getEntryPoint = () => {
@@ -513,15 +517,15 @@ function emitPlugin(entryPoint: string, plugin: ILoaderPlugin, pluginName: strin
 	};
 }

-function emitNamedModule(moduleId: string, myDeps: string[], defineCallPosition: IPosition, path: string, contents: string): IFile {
+function emitNamedModule(moduleId: string, defineCallPosition: IPosition, path: string, contents: string): IFile {

 	// `defineCallPosition` is the position in code: |define()
-	let defineCallOffset = positionToOffset(contents, defineCallPosition.line, defineCallPosition.col);
+	const defineCallOffset = positionToOffset(contents, defineCallPosition.line, defineCallPosition.col);

 	// `parensOffset` is the position in code: define|()
-	let parensOffset = contents.indexOf('(', defineCallOffset);
+	const parensOffset = contents.indexOf('(', defineCallOffset);

-	let insertStr = '"' + moduleId + '", ';
+	const insertStr = '"' + moduleId + '", ';

 	return {
 		path: path,
@@ -530,8 +534,8 @@ function emitNamedModule(moduleId: string, myDeps: string[], defineCallPosition:
 }

 function emitShimmedModule(moduleId: string, myDeps: string[], factory: string, path: string, contents: string): IFile {
-	let strDeps = (myDeps.length > 0 ? '"' + myDeps.join('", "') + '"' : '');
-	let strDefine = 'define("' + moduleId + '", [' + strDeps + '], ' + factory + ');';
+	const strDeps = (myDeps.length > 0 ? '"' + myDeps.join('", "') + '"' : '');
+	const strDefine = 'define("' + moduleId + '", [' + strDeps + '], ' + factory + ');';
 	return {
 		path: path,
 		contents: contents + '\n;\n' + strDefine
@@ -546,8 +550,8 @@ function positionToOffset(str: string, desiredLine: number, desiredCol: number):
 		return desiredCol - 1;
 	}

-	let line = 1,
-		lastNewLineOffset = -1;
+	let line = 1;
+	let lastNewLineOffset = -1;

 	do {
 		if (desiredLine === line) {
@@ -565,16 +569,16 @@ function positionToOffset(str: string, desiredLine: number, desiredCol: number):
 * Return a set of reachable nodes in `graph` starting from `rootNodes`
 */
 function visit(rootNodes: string[], graph: IGraph): INodeSet {
-	let result: INodeSet = {},
-		queue = rootNodes;
+	const result: INodeSet = {};
+	const queue = rootNodes;

 	rootNodes.forEach((node) => {
 		result[node] = true;
 	});

 	while (queue.length > 0) {
-		let el = queue.shift();
-		let myEdges = graph[el] || [];
+		const el = queue.shift();
+		const myEdges = graph[el!] || [];
 		myEdges.forEach((toNode) => {
 			if (!result[toNode]) {
 				result[toNode] = true;
@@ -591,7 +595,7 @@ function visit(rootNodes: string[], graph: IGraph): INodeSet {
 */
 function topologicalSort(graph: IGraph): string[] {

-	let allNodes: INodeSet = {},
+	const allNodes: INodeSet = {},
 		outgoingEdgeCount: { [node: string]: number; } = {},
 		inverseEdges: IGraph = {};

@@ -609,7 +613,7 @@ function topologicalSort(graph: IGraph): string[] {
 	});

 	// https://en.wikipedia.org/wiki/Topological_sorting
-	let S: string[] = [],
+	const S: string[] = [],
 		L: string[] = [];

 	Object.keys(allNodes).forEach((node: string) => {
@@ -623,10 +627,10 @@ function topologicalSort(graph: IGraph): string[] {
 		// Ensure the exact same order all the time with the same inputs
 		S.sort();

-		let n: string = S.shift();
+		const n: string = S.shift()!;
 		L.push(n);

-		let myInverseEdges = inverseEdges[n] || [];
+		const myInverseEdges = inverseEdges[n] || [];
 		myInverseEdges.forEach((m: string) => {
 			outgoingEdgeCount[m]--;
 			if (outgoingEdgeCount[m] === 0) {
--- a/build/lib/compilation.js
+++ b/build/lib/compilation.js
@@ -4,44 +4,53 @@
 *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-var gulp = require("gulp");
-var tsb = require("gulp-tsb");
-var es = require("event-stream");
-var watch = require('./watch');
-var nls = require("./nls");
-var util = require("./util");
-var reporter_1 = require("./reporter");
-var path = require("path");
-var bom = require("gulp-bom");
-var sourcemaps = require("gulp-sourcemaps");
-var _ = require("underscore");
-var monacodts = require("../monaco/api");
-var fs = require("fs");
-var reporter = reporter_1.createReporter();
+const es = require("event-stream");
+const fs = require("fs");
+const gulp = require("gulp");
+const bom = require("gulp-bom");
+const sourcemaps = require("gulp-sourcemaps");
+const tsb = require("gulp-tsb");
+const path = require("path");
+const _ = require("underscore");
+const monacodts = require("../monaco/api");
+const nls = require("./nls");
+const reporter_1 = require("./reporter");
+const util = require("./util");
+const util2 = require("gulp-util");
+const watch = require('./watch');
+const reporter = reporter_1.createReporter();
 function getTypeScriptCompilerOptions(src) {
-    var rootDir = path.join(__dirname, "../../" + src);
-    var options = require("../../" + src + "/tsconfig.json").compilerOptions;
+    const rootDir = path.join(__dirname, `../../${src}`);
+    const tsconfig = require(`../../${src}/tsconfig.json`);
+    let options;
+    if (tsconfig.extends) {
+        options = Object.assign({}, require(path.join(rootDir, tsconfig.extends)).compilerOptions, tsconfig.compilerOptions);
+    }
+    else {
+        options = tsconfig.compilerOptions;
+    }
    options.verbose = false;
    options.sourceMap = true;
    if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
        options.sourceMap = false;
    }
    options.rootDir = rootDir;
+    options.baseUrl = rootDir;
    options.sourceRoot = util.toFileUri(rootDir);
    options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 'CRLF' : 'LF';
    return options;
 }
 function createCompile(src, build, emitError) {
-    var opts = _.clone(getTypeScriptCompilerOptions(src));
+    const opts = _.clone(getTypeScriptCompilerOptions(src));
    opts.inlineSources = !!build;
    opts.noFilesystemLookup = true;
-    var ts = tsb.create(opts, null, null, function (err) { return reporter(err.toString()); });
+    const ts = tsb.create(opts, true, undefined, err => reporter(err.toString()));
    return function (token) {
-        var utf8Filter = util.filter(function (data) { return /(\/|\\)test(\/|\\).*utf8/.test(data.path); });
-        var tsFilter = util.filter(function (data) { return /\.ts$/.test(data.path); });
-        var noDeclarationsFilter = util.filter(function (data) { return !(/\.d\.ts$/.test(data.path)); });
-        var input = es.through();
-        var output = input
+        const utf8Filter = util.filter(data => /(\/|\\)test(\/|\\).*utf8/.test(data.path));
+        const tsFilter = util.filter(data => /\.ts$/.test(data.path));
+        const noDeclarationsFilter = util.filter(data => !(/\.d\.ts$/.test(data.path)));
+        const input = es.through();
+        const output = input
            .pipe(utf8Filter)
            .pipe(bom())
            .pipe(utf8Filter.restore)
@@ -57,91 +66,122 @@ function createCompile(src, build, emitError) {
            sourceRoot: opts.sourceRoot
        }))
            .pipe(tsFilter.restore)
-            .pipe(reporter.end(emitError));
+            .pipe(reporter.end(!!emitError));
        return es.duplex(input, output);
    };
 }
+const typesDts = [
+    'node_modules/typescript/lib/*.d.ts',
+    'node_modules/@types/**/*.d.ts',
+    '!node_modules/@types/webpack/**/*',
+    '!node_modules/@types/uglify-js/**/*',
+];
 function compileTask(src, out, build) {
    return function () {
-        var compile = createCompile(src, build, true);
-        var srcPipe = es.merge(gulp.src(src + "/**", { base: "" + src }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
-        // Do not write .d.ts files to disk, as they are not needed there.
-        var dtsFilter = util.filter(function (data) { return !/\.d\.ts$/.test(data.path); });
+        const compile = createCompile(src, build, true);
+        const srcPipe = es.merge(gulp.src(`${src}/**`, { base: `${src}` }), gulp.src(typesDts));
+        let generator = new MonacoGenerator(false);
+        if (src === 'src') {
+            generator.execute();
+        }
        return srcPipe
+            .pipe(generator.stream)
            .pipe(compile())
-            .pipe(dtsFilter)
-            .pipe(gulp.dest(out))
-            .pipe(dtsFilter.restore)
-            .pipe(src !== 'src' ? es.through() : monacodtsTask(out, false));
+            .pipe(gulp.dest(out));
    };
 }
 exports.compileTask = compileTask;
 function watchTask(out, build) {
    return function () {
-        var compile = createCompile('src', build);
-        var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
-        var watchSrc = watch('src/**', { base: 'src' });
-        // Do not write .d.ts files to disk, as they are not needed there.
-        var dtsFilter = util.filter(function (data) { return !/\.d\.ts$/.test(data.path); });
+        const compile = createCompile('src', build);
+        const src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src(typesDts));
+        const watchSrc = watch('src/**', { base: 'src' });
+        let generator = new MonacoGenerator(true);
+        generator.execute();
        return watchSrc
+            .pipe(generator.stream)
            .pipe(util.incremental(compile, src, true))
-            .pipe(dtsFilter)
-            .pipe(gulp.dest(out))
-            .pipe(dtsFilter.restore)
-            .pipe(monacodtsTask(out, true));
+            .pipe(gulp.dest(out));
    };
 }
 exports.watchTask = watchTask;
-function monacodtsTask(out, isWatch) {
-    var basePath = path.resolve(process.cwd(), out);
-    var neededFiles = {};
-    monacodts.getFilesToWatch(out).forEach(function (filePath) {
-        filePath = path.normalize(filePath);
-        neededFiles[filePath] = true;
-    });
-    var inputFiles = {};
-    for (var filePath in neededFiles) {
-        if (/\bsrc(\/|\\)vs\b/.test(filePath)) {
-            // This file is needed from source => simply read it now
-            inputFiles[filePath] = fs.readFileSync(filePath).toString();
-        }
-    }
-    var setInputFile = function (filePath, contents) {
-        if (inputFiles[filePath] === contents) {
-            // no change
+const REPO_SRC_FOLDER = path.join(__dirname, '../../src');
+class MonacoGenerator {
+    constructor(isWatch) {
+        this._executeSoonTimer = null;
+        this._isWatch = isWatch;
+        this.stream = es.through();
+        this._watchers = [];
+        this._watchedFiles = {};
+        let onWillReadFile = (moduleId, filePath) => {
+            if (!this._isWatch) {
                return;
            }
-        inputFiles[filePath] = contents;
-        var neededInputFilesCount = Object.keys(neededFiles).length;
-        var availableInputFilesCount = Object.keys(inputFiles).length;
-        if (neededInputFilesCount === availableInputFilesCount) {
-            run();
+            if (this._watchedFiles[filePath]) {
+                return;
            }
-    };
-    var run = function () {
-        var result = monacodts.run(out, inputFiles);
-        if (!result.isTheSame) {
-            if (isWatch) {
-                fs.writeFileSync(result.filePath, result.content);
-            }
-            else {
-                fs.writeFileSync(result.filePath, result.content);
-                resultStream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
-            }
-        }
-    };
-    var resultStream;
-    if (isWatch) {
-        watch('build/monaco/*').pipe(es.through(function () {
-            run();
-        }));
-    }
-    resultStream = es.through(function (data) {
-        var filePath = path.normalize(path.resolve(basePath, data.relative));
-        if (neededFiles[filePath]) {
-            setInputFile(filePath, data.contents.toString());
-        }
-        this.emit('data', data);
+            this._watchedFiles[filePath] = true;
+            const watcher = fs.watch(filePath);
+            watcher.addListener('change', () => {
+                this._declarationResolver.invalidateCache(moduleId);
+                this._executeSoon();
            });
-    return resultStream;
+            this._watchers.push(watcher);
+        };
+        this._fsProvider = new class extends monacodts.FSProvider {
+            readFileSync(moduleId, filePath) {
+                onWillReadFile(moduleId, filePath);
+                return super.readFileSync(moduleId, filePath);
+            }
+        };
+        this._declarationResolver = new monacodts.DeclarationResolver(this._fsProvider);
+        if (this._isWatch) {
+            const recipeWatcher = fs.watch(monacodts.RECIPE_PATH);
+            recipeWatcher.addListener('change', () => {
+                this._executeSoon();
+            });
+            this._watchers.push(recipeWatcher);
+        }
+    }
+    _executeSoon() {
+        if (this._executeSoonTimer !== null) {
+            clearTimeout(this._executeSoonTimer);
+            this._executeSoonTimer = null;
+        }
+        this._executeSoonTimer = setTimeout(() => {
+            this._executeSoonTimer = null;
+            this.execute();
+        }, 20);
+    }
+    dispose() {
+        this._watchers.forEach(watcher => watcher.close());
+    }
+    _run() {
+        let r = monacodts.run3(this._declarationResolver);
+        if (!r && !this._isWatch) {
+            // The build must always be able to generate the monaco.d.ts
+            throw new Error(`monaco.d.ts generation error - Cannot continue`);
+        }
+        return r;
+    }
+    _log(message, ...rest) {
+        util2.log(util2.colors.cyan('[monaco.d.ts]'), message, ...rest);
+    }
+    execute() {
+        const startTime = Date.now();
+        const result = this._run();
+        if (!result) {
+            // nothing really changed
+            return;
+        }
+        if (result.isTheSame) {
+            return;
+        }
+        fs.writeFileSync(result.filePath, result.content);
+        fs.writeFileSync(path.join(REPO_SRC_FOLDER, 'vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
+        this._log(`monaco.d.ts is changed - total time took ${Date.now() - startTime} ms`);
+        if (!this._isWatch) {
+            this.stream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
+        }
+    }
 }
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -5,31 +5,39 @@

 'use strict';

-import * as gulp from 'gulp';
-import * as tsb from 'gulp-tsb';
 import * as es from 'event-stream';
-const watch = require('./watch');
-import * as nls from './nls';
-import * as util from './util';
-import { createReporter } from './reporter';
-import * as path from 'path';
+import * as fs from 'fs';
+import * as gulp from 'gulp';
 import * as bom from 'gulp-bom';
 import * as sourcemaps from 'gulp-sourcemaps';
+import * as tsb from 'gulp-tsb';
+import * as path from 'path';
 import * as _ from 'underscore';
 import * as monacodts from '../monaco/api';
-import * as fs from 'fs';
+import * as nls from './nls';
+import { createReporter } from './reporter';
+import * as util from './util';
+import * as util2 from 'gulp-util';
+const watch = require('./watch');

 const reporter = createReporter();

 function getTypeScriptCompilerOptions(src: string) {
 	const rootDir = path.join(__dirname, `../../${src}`);
-	const options = require(`../../${src}/tsconfig.json`).compilerOptions;
+	const tsconfig = require(`../../${src}/tsconfig.json`);
+	let options: { [key: string]: any };
+	if (tsconfig.extends) {
+		options = Object.assign({}, require(path.join(rootDir, tsconfig.extends)).compilerOptions, tsconfig.compilerOptions);
+	} else {
+		options = tsconfig.compilerOptions;
+	}
 	options.verbose = false;
 	options.sourceMap = true;
 	if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
 		options.sourceMap = false;
 	}
 	options.rootDir = rootDir;
+	options.baseUrl = rootDir;
 	options.sourceRoot = util.toFileUri(rootDir);
 	options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 'CRLF' : 'LF';
 	return options;
@@ -40,7 +48,7 @@ function createCompile(src: string, build: boolean, emitError?: boolean): (token
 	opts.inlineSources = !!build;
 	opts.noFilesystemLookup = true;

-	const ts = tsb.create(opts, null, null, err => reporter(err.toString()));
+	const ts = tsb.create(opts, true, undefined, err => reporter(err.toString()));

 	return function (token?: util.ICancellationToken) {

@@ -65,12 +73,19 @@ function createCompile(src: string, build: boolean, emitError?: boolean): (token
 				sourceRoot: opts.sourceRoot
 			}))
 			.pipe(tsFilter.restore)
-			.pipe(reporter.end(emitError));
+			.pipe(reporter.end(!!emitError));

 		return es.duplex(input, output);
 	};
 }

+const typesDts = [
+	'node_modules/typescript/lib/*.d.ts',
+	'node_modules/@types/**/*.d.ts',
+	'!node_modules/@types/webpack/**/*',
+	'!node_modules/@types/uglify-js/**/*',
+];
+
 export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {

 	return function () {
@@ -78,18 +93,18 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod

 		const srcPipe = es.merge(
 			gulp.src(`${src}/**`, { base: `${src}` }),
-			gulp.src('node_modules/typescript/lib/lib.d.ts'),
+			gulp.src(typesDts),
 		);

-		// Do not write .d.ts files to disk, as they are not needed there.
-		const dtsFilter = util.filter(data => !/\.d\.ts$/.test(data.path));
+		let generator = new MonacoGenerator(false);
+		if (src === 'src') {
+			generator.execute();
+		}

 		return srcPipe
+			.pipe(generator.stream)
 			.pipe(compile())
-			.pipe(dtsFilter)
-			.pipe(gulp.dest(out))
-			.pipe(dtsFilter.restore)
-			.pipe(src !== 'src' ? es.through() : monacodtsTask(out, false));
+			.pipe(gulp.dest(out));
 	};
 }

@@ -100,80 +115,114 @@ export function watchTask(out: string, build: boolean): () => NodeJS.ReadWriteSt

 		const src = es.merge(
 			gulp.src('src/**', { base: 'src' }),
-			gulp.src('node_modules/typescript/lib/lib.d.ts'),
+			gulp.src(typesDts),
 		);
 		const watchSrc = watch('src/**', { base: 'src' });

-		// Do not write .d.ts files to disk, as they are not needed there.
-		const dtsFilter = util.filter(data => !/\.d\.ts$/.test(data.path));
+		let generator = new MonacoGenerator(true);
+		generator.execute();

 		return watchSrc
+			.pipe(generator.stream)
 			.pipe(util.incremental(compile, src, true))
-			.pipe(dtsFilter)
-			.pipe(gulp.dest(out))
-			.pipe(dtsFilter.restore)
-			.pipe(monacodtsTask(out, true));
+			.pipe(gulp.dest(out));
 	};
 }

-function monacodtsTask(out: string, isWatch: boolean): NodeJS.ReadWriteStream {
+const REPO_SRC_FOLDER = path.join(__dirname, '../../src');

-	const basePath = path.resolve(process.cwd(), out);
+class MonacoGenerator {
+	private readonly _isWatch: boolean;
+	public readonly stream: NodeJS.ReadWriteStream;

-	const neededFiles: { [file: string]: boolean; } = {};
-	monacodts.getFilesToWatch(out).forEach(function (filePath) {
-		filePath = path.normalize(filePath);
-		neededFiles[filePath] = true;
-	});
+	private readonly _watchers: fs.FSWatcher[];
+	private readonly _watchedFiles: { [filePath: string]: boolean; };
+	private readonly _fsProvider: monacodts.FSProvider;
+	private readonly _declarationResolver: monacodts.DeclarationResolver;

-	const inputFiles: { [file: string]: string; } = {};
-	for (let filePath in neededFiles) {
-		if (/\bsrc(\/|\\)vs\b/.test(filePath)) {
-			// This file is needed from source => simply read it now
-			inputFiles[filePath] = fs.readFileSync(filePath).toString();
-		}
-	}
-
-	const setInputFile = (filePath: string, contents: string) => {
-		if (inputFiles[filePath] === contents) {
-			// no change
+	constructor(isWatch: boolean) {
+		this._isWatch = isWatch;
+		this.stream = es.through();
+		this._watchers = [];
+		this._watchedFiles = {};
+		let onWillReadFile = (moduleId: string, filePath: string) => {
+			if (!this._isWatch) {
 				return;
 			}
-		inputFiles[filePath] = contents;
-		const neededInputFilesCount = Object.keys(neededFiles).length;
-		const availableInputFilesCount = Object.keys(inputFiles).length;
-		if (neededInputFilesCount === availableInputFilesCount) {
-			run();
+			if (this._watchedFiles[filePath]) {
+				return;
 			}
-	};
+			this._watchedFiles[filePath] = true;

-	const run = () => {
-		const result = monacodts.run(out, inputFiles);
-		if (!result.isTheSame) {
-			if (isWatch) {
-				fs.writeFileSync(result.filePath, result.content);
-			} else {
-				fs.writeFileSync(result.filePath, result.content);
-				resultStream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
-			}
-		}
-	};
-
-	let resultStream: NodeJS.ReadWriteStream;
-
-	if (isWatch) {
-		watch('build/monaco/*').pipe(es.through(function () {
-			run();
-		}));
-	}
-
-	resultStream = es.through(function (data) {
-		const filePath = path.normalize(path.resolve(basePath, data.relative));
-		if (neededFiles[filePath]) {
-			setInputFile(filePath, data.contents.toString());
-		}
-		this.emit('data', data);
+			const watcher = fs.watch(filePath);
+			watcher.addListener('change', () => {
+				this._declarationResolver.invalidateCache(moduleId);
+				this._executeSoon();
 			});
-
-	return resultStream;
+			this._watchers.push(watcher);
+		};
+		this._fsProvider = new class extends monacodts.FSProvider {
+			public readFileSync(moduleId: string, filePath: string): Buffer {
+				onWillReadFile(moduleId, filePath);
+				return super.readFileSync(moduleId, filePath);
+			}
+		};
+		this._declarationResolver = new monacodts.DeclarationResolver(this._fsProvider);
+
+		if (this._isWatch) {
+			const recipeWatcher = fs.watch(monacodts.RECIPE_PATH);
+			recipeWatcher.addListener('change', () => {
+				this._executeSoon();
+			});
+			this._watchers.push(recipeWatcher);
+		}
+	}
+
+	private _executeSoonTimer: NodeJS.Timer | null = null;
+	private _executeSoon(): void {
+		if (this._executeSoonTimer !== null) {
+			clearTimeout(this._executeSoonTimer);
+			this._executeSoonTimer = null;
+		}
+		this._executeSoonTimer = setTimeout(() => {
+			this._executeSoonTimer = null;
+			this.execute();
+		}, 20);
+	}
+
+	public dispose(): void {
+		this._watchers.forEach(watcher => watcher.close());
+	}
+
+	private _run(): monacodts.IMonacoDeclarationResult | null {
+		let r = monacodts.run3(this._declarationResolver);
+		if (!r && !this._isWatch) {
+			// The build must always be able to generate the monaco.d.ts
+			throw new Error(`monaco.d.ts generation error - Cannot continue`);
+		}
+		return r;
+	}
+
+	private _log(message: any, ...rest: any[]): void {
+		util2.log(util2.colors.cyan('[monaco.d.ts]'), message, ...rest);
+	}
+
+	public execute(): void {
+		const startTime = Date.now();
+		const result = this._run();
+		if (!result) {
+			// nothing really changed
+			return;
+		}
+		if (result.isTheSame) {
+			return;
+		}
+
+		fs.writeFileSync(result.filePath, result.content);
+		fs.writeFileSync(path.join(REPO_SRC_FOLDER, 'vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
+		this._log(`monaco.d.ts is changed - total time took ${Date.now() - startTime} ms`);
+		if (!this._isWatch) {
+			this.stream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
+		}
+	}
 }
--- a/build/lib/electron.js
+++ b/build/lib/electron.js
@@ -11,6 +11,7 @@ const root = path.dirname(path.dirname(__dirname));

 function getElectronVersion() {
 	const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
+	// @ts-ignore
 	const target = /^target "(.*)"$/m.exec(yarnrc)[1];

 	return target;
@@ -19,6 +20,7 @@ function getElectronVersion() {
 module.exports.getElectronVersion = getElectronVersion;

 // returns 0 if the right version of electron is in .build/electron
+// @ts-ignore
 if (require.main === module) {
 	const version = getElectronVersion();
 	const versionFile = path.join(root, '.build', 'electron', 'version');
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -4,116 +4,316 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-var es = require("event-stream");
-var assign = require("object-assign");
-var remote = require("gulp-remote-src");
-var flatmap = require('gulp-flatmap');
-var vzip = require('gulp-vinyl-zip');
-var filter = require('gulp-filter');
-var rename = require('gulp-rename');
-var util = require('gulp-util');
-var buffer = require('gulp-buffer');
-var json = require('gulp-json-editor');
-var fs = require("fs");
-var path = require("path");
-var vsce = require("vsce");
-var File = require("vinyl");
-function fromLocal(extensionPath) {
-    var result = es.through();
-    vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
-        .then(function (fileNames) {
-        var files = fileNames
-            .map(function (fileName) { return path.join(extensionPath, fileName); })
-            .map(function (filePath) { return new File({
+const es = require("event-stream");
+const fs = require("fs");
+const glob = require("glob");
+const gulp = require("gulp");
+const path = require("path");
+const File = require("vinyl");
+const vsce = require("vsce");
+const stats_1 = require("./stats");
+const util2 = require("./util");
+const remote = require("gulp-remote-src");
+const vzip = require('gulp-vinyl-zip');
+const filter = require("gulp-filter");
+const rename = require("gulp-rename");
+const util = require('gulp-util');
+const buffer = require('gulp-buffer');
+const json = require("gulp-json-editor");
+const webpack = require('webpack');
+const webpackGulp = require('webpack-stream');
+const root = path.resolve(path.join(__dirname, '..', '..'));
+// {{SQL CARBON EDIT}}
+const _ = require("underscore");
+const vfs = require("vinyl-fs");
+const deps = require('../dependencies');
+const extensionsRoot = path.join(root, 'extensions');
+const extensionsProductionDependencies = deps.getProductionDependencies(extensionsRoot);
+function packageBuiltInExtensions() {
+    const sqlBuiltInLocalExtensionDescriptions = glob.sync('extensions/*/package.json')
+        .map(manifestPath => {
+        const extensionPath = path.dirname(path.join(root, manifestPath));
+        const extensionName = path.basename(extensionPath);
+        return { name: extensionName, path: extensionPath };
+    })
+        .filter(({ name }) => excludedExtensions.indexOf(name) === -1)
+        .filter(({ name }) => builtInExtensions.every(b => b.name !== name))
+        .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0);
+    sqlBuiltInLocalExtensionDescriptions.forEach(element => {
+        const packagePath = path.join(path.dirname(root), element.name + '.vsix');
+        console.info('Creating vsix for ' + element.path + ' result:' + packagePath);
+        vsce.createVSIX({
+            cwd: element.path,
+            packagePath: packagePath,
+            useYarn: true
+        });
+    });
+}
+exports.packageBuiltInExtensions = packageBuiltInExtensions;
+function packageExtensionTask(extensionName, platform, arch) {
+    var destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
+    if (platform === 'darwin') {
+        destination = path.join(destination, 'Azure Data Studio.app', 'Contents', 'Resources', 'app', 'extensions', extensionName);
+    }
+    else {
+        destination = path.join(destination, 'resources', 'app', 'extensions', extensionName);
+    }
+    platform = platform || process.platform;
+    return () => {
+        const root = path.resolve(path.join(__dirname, '../..'));
+        const localExtensionDescriptions = glob.sync('extensions/*/package.json')
+            .map(manifestPath => {
+            const extensionPath = path.dirname(path.join(root, manifestPath));
+            const extensionName = path.basename(extensionPath);
+            return { name: extensionName, path: extensionPath };
+        })
+            .filter(({ name }) => extensionName === name);
+        const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
+            return fromLocal(extension.path);
+        }));
+        let result = localExtensions
+            .pipe(util2.skipDirectories())
+            .pipe(util2.fixWin32DirectoryPermissions())
+            .pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version']));
+        return result.pipe(vfs.dest(destination));
+    };
+}
+exports.packageExtensionTask = packageExtensionTask;
+// {{SQL CARBON EDIT}} - End
+function fromLocal(extensionPath, sourceMappingURLBase) {
+    const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
+    if (fs.existsSync(webpackFilename)) {
+        return fromLocalWebpack(extensionPath, sourceMappingURLBase);
+    }
+    else {
+        return fromLocalNormal(extensionPath);
+    }
+}
+function fromLocalWebpack(extensionPath, sourceMappingURLBase) {
+    const result = es.through();
+    const packagedDependencies = [];
+    const packageJsonConfig = require(path.join(extensionPath, 'package.json'));
+    if (packageJsonConfig.dependencies) {
+        const webpackRootConfig = require(path.join(extensionPath, 'extension.webpack.config.js'));
+        for (const key in webpackRootConfig.externals) {
+            if (key in packageJsonConfig.dependencies) {
+                packagedDependencies.push(key);
+            }
+        }
+    }
+    vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn, packagedDependencies }).then(fileNames => {
+        const files = fileNames
+            .map(fileName => path.join(extensionPath, fileName))
+            .map(filePath => new File({
            path: filePath,
            stat: fs.statSync(filePath),
            base: extensionPath,
            contents: fs.createReadStream(filePath)
-        }); });
+        }));
+        const filesStream = es.readArray(files);
+        // check for a webpack configuration files, then invoke webpack
+        // and merge its output with the files stream. also rewrite the package.json
+        // file to a new entry point
+        const webpackConfigLocations = glob.sync(path.join(extensionPath, '/**/extension.webpack.config.js'), { ignore: ['**/node_modules'] });
+        const packageJsonFilter = filter(f => {
+            if (path.basename(f.path) === 'package.json') {
+                // only modify package.json's next to the webpack file.
+                // to be safe, use existsSync instead of path comparison.
+                return fs.existsSync(path.join(path.dirname(f.path), 'extension.webpack.config.js'));
+            }
+            return false;
+        }, { restore: true });
+        const patchFilesStream = filesStream
+            .pipe(packageJsonFilter)
+            .pipe(buffer())
+            .pipe(json((data) => {
+            if (data.main) {
+                // hardcoded entry point directory!
+                data.main = data.main.replace('/out/', /dist/);
+            }
+            return data;
+        }))
+            .pipe(packageJsonFilter.restore);
+        const webpackStreams = webpackConfigLocations.map(webpackConfigPath => () => {
+            const webpackDone = (err, stats) => {
+                util.log(`Bundled extension: ${util.colors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
+                if (err) {
+                    result.emit('error', err);
+                }
+                const { compilation } = stats;
+                if (compilation.errors.length > 0) {
+                    result.emit('error', compilation.errors.join('\n'));
+                }
+                if (compilation.warnings.length > 0) {
+                    result.emit('error', compilation.warnings.join('\n'));
+                }
+            };
+            const webpackConfig = Object.assign({}, require(webpackConfigPath), { mode: 'production' });
+            const relativeOutputPath = path.relative(extensionPath, webpackConfig.output.path);
+            return webpackGulp(webpackConfig, webpack, webpackDone)
+                .pipe(es.through(function (data) {
+                data.stat = data.stat || {};
+                data.base = extensionPath;
+                this.emit('data', data);
+            }))
+                .pipe(es.through(function (data) {
+                // source map handling:
+                // * rewrite sourceMappingURL
+                // * save to disk so that upload-task picks this up
+                if (sourceMappingURLBase) {
+                    const contents = data.contents.toString('utf8');
+                    data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
+                        return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
+                    }), 'utf8');
+                    if (/\.js\.map$/.test(data.path)) {
+                        if (!fs.existsSync(path.dirname(data.path))) {
+                            fs.mkdirSync(path.dirname(data.path));
+                        }
+                        fs.writeFileSync(data.path, data.contents);
+                    }
+                }
+                this.emit('data', data);
+            }));
+        });
+        es.merge(sequence(webpackStreams), patchFilesStream)
+            // .pipe(es.through(function (data) {
+            // 	// debug
+            // 	console.log('out', data.path, data.contents.length);
+            // 	this.emit('data', data);
+            // }))
+            .pipe(result);
+    }).catch(err => {
+        console.error(extensionPath);
+        console.error(packagedDependencies);
+        result.emit('error', err);
+    });
+    return result.pipe(stats_1.createStatsStream(path.basename(extensionPath)));
+}
+function fromLocalNormal(extensionPath) {
+    const result = es.through();
+    vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
+        .then(fileNames => {
+        const files = fileNames
+            .map(fileName => path.join(extensionPath, fileName))
+            .map(filePath => new File({
+            path: filePath,
+            stat: fs.statSync(filePath),
+            base: extensionPath,
+            contents: fs.createReadStream(filePath)
+        }));
        es.readArray(files).pipe(result);
    })
-        .catch(function (err) { return result.emit('error', err); });
-    return result;
+        .catch(err => result.emit('error', err));
+    return result.pipe(stats_1.createStatsStream(path.basename(extensionPath)));
 }
-exports.fromLocal = fromLocal;
-function error(err) {
-    var result = es.through();
-    setTimeout(function () { return result.emit('error', err); });
-    return result;
-}
-var baseHeaders = {
+const baseHeaders = {
    'X-Market-Client-Id': 'VSCode Build',
    'User-Agent': 'VSCode Build',
    'X-Market-User-Id': '291C1CD0-051A-4123-9B4B-30D60EF52EE2',
 };
-function fromMarketplace(extensionName, version) {
-    var filterType = 7;
-    var value = extensionName;
-    var criterium = { filterType: filterType, value: value };
-    var criteria = [criterium];
-    var pageNumber = 1;
-    var pageSize = 1;
-    var sortBy = 0;
-    var sortOrder = 0;
-    var flags = 0x1 | 0x2 | 0x80;
-    var assetTypes = ['Microsoft.VisualStudio.Services.VSIXPackage'];
-    var filters = [{ criteria: criteria, pageNumber: pageNumber, pageSize: pageSize, sortBy: sortBy, sortOrder: sortOrder }];
-    var body = JSON.stringify({ filters: filters, assetTypes: assetTypes, flags: flags });
-    var headers = assign({}, baseHeaders, {
-        'Content-Type': 'application/json',
-        'Accept': 'application/json;api-version=3.0-preview.1',
-        'Content-Length': body.length
-    });
-    var options = {
-        base: 'https://marketplace.visualstudio.com/_apis/public/gallery',
-        requestOptions: {
-            method: 'POST',
-            gzip: true,
-            headers: headers,
-            body: body
-        }
-    };
-    return remote('/extensionquery', options)
-        .pipe(flatmap(function (stream, f) {
-        var rawResult = f.contents.toString('utf8');
-        var result = JSON.parse(rawResult);
-        var extension = result.results[0].extensions[0];
-        if (!extension) {
-            return error("No such extension: " + extension);
-        }
-        var metadata = {
-            id: extension.extensionId,
-            publisherId: extension.publisher,
-            publisherDisplayName: extension.publisher.displayName
-        };
-        var extensionVersion = extension.versions.filter(function (v) { return v.version === version; })[0];
-        if (!extensionVersion) {
-            return error("No such extension version: " + extensionName + " @ " + version);
-        }
-        var asset = extensionVersion.files.filter(function (f) { return f.assetType === 'Microsoft.VisualStudio.Services.VSIXPackage'; })[0];
-        if (!asset) {
-            return error("No VSIX found for extension version: " + extensionName + " @ " + version);
-        }
-        util.log('Downloading extension:', util.colors.yellow(extensionName + "@" + version), '...');
-        var options = {
-            base: asset.source,
+function fromMarketplace(extensionName, version, metadata) {
+    const [publisher, name] = extensionName.split('.');
+    const url = `https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${publisher}/vsextensions/${name}/${version}/vspackage`;
+    util.log('Downloading extension:', util.colors.yellow(`${extensionName}@${version}`), '...');
+    const options = {
+        base: url,
        requestOptions: {
            gzip: true,
            headers: baseHeaders
        }
    };
+    const packageJsonFilter = filter('package.json', { restore: true });
    return remote('', options)
-            .pipe(flatmap(function (stream) {
-            var packageJsonFilter = filter('package.json', { restore: true });
-            return stream
        .pipe(vzip.src())
        .pipe(filter('extension/**'))
-                .pipe(rename(function (p) { return p.dirname = p.dirname.replace(/^extension\/?/, ''); }))
+        .pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
        .pipe(packageJsonFilter)
        .pipe(buffer())
        .pipe(json({ __metadata: metadata }))
        .pipe(packageJsonFilter.restore);
-        }));
-    }));
 }
 exports.fromMarketplace = fromMarketplace;
+const excludedExtensions = [
+    'vscode-api-tests',
+    'vscode-colorize-tests',
+    'ms-vscode.node-debug',
+    'ms-vscode.node-debug2',
+    // {{SQL CARBON EDIT}}
+    'integration-tests'
+];
+// {{SQL CARBON EDIT}}
+const sqlBuiltInExtensions = [
+    // Add SQL built-in extensions here.
+    // the extension will be excluded from SQLOps package and will have separate vsix packages
+    'agent',
+    'import',
+    'profiler',
+    'admin-pack',
+    'big-data-cluster'
+];
+var azureExtensions = ['azurecore', 'mssql'];
+const builtInExtensions = require('../builtInExtensions.json');
+/**
+ * We're doing way too much stuff at once, with webpack et al. So much stuff
+ * that while downloading extensions from the marketplace, node js doesn't get enough
+ * stack frames to complete the download in under 2 minutes, at which point the
+ * marketplace server cuts off the http request. So, we sequentialize the extensino tasks.
+ */
+function sequence(streamProviders) {
+    const result = es.through();
+    function pop() {
+        if (streamProviders.length === 0) {
+            result.emit('end');
+        }
+        else {
+            const fn = streamProviders.shift();
+            fn()
+                .on('end', function () { setTimeout(pop, 0); })
+                .pipe(result, { end: false });
+        }
+    }
+    pop();
+    return result;
+}
+function packageExtensionsStream(optsIn) {
+    const opts = optsIn || {};
+    const localExtensionDescriptions = glob.sync('extensions/*/package.json')
+        .map(manifestPath => {
+        const extensionPath = path.dirname(path.join(root, manifestPath));
+        const extensionName = path.basename(extensionPath);
+        return { name: extensionName, path: extensionPath };
+    })
+        .filter(({ name }) => excludedExtensions.indexOf(name) === -1)
+        .filter(({ name }) => opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true)
+        .filter(({ name }) => builtInExtensions.every(b => b.name !== name))
+        // {{SQL CARBON EDIT}}
+        .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) === -1)
+        .filter(({ name }) => azureExtensions.indexOf(name) === -1);
+    const localExtensions = () => sequence([...localExtensionDescriptions.map(extension => () => {
+            return fromLocal(extension.path, opts.sourceMappingURLBase)
+                .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+        })]);
+    // {{SQL CARBON EDIT}}
+    const extensionDepsSrc = [
+        ..._.flatten(extensionsProductionDependencies.map((d) => path.relative(root, d.path)).map((d) => [`${d}/**`, `!${d}/**/{test,tests}/**`])),
+    ];
+    const localExtensionDependencies = () => gulp.src(extensionDepsSrc, { base: '.', dot: true })
+        .pipe(filter(['**', '!**/package-lock.json']))
+        .pipe(util2.cleanNodeModule('account-provider-azure', ['node_modules/date-utils/doc/**', 'node_modules/adal_node/node_modules/**'], undefined))
+        .pipe(util2.cleanNodeModule('typescript', ['**/**'], undefined));
+    // Original code commented out here
+    // const localExtensionDependencies = () => gulp.src('extensions/node_modules/**', { base: '.' });
+    // const marketplaceExtensions = () => es.merge(
+    // 	...builtInExtensions
+    // 		.filter(({ name }) => opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true)
+    // 		.map(extension => {
+    // 			return fromMarketplace(extension.name, extension.version, extension.metadata)
+    // 				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+    // 		})
+    // );
+    return sequence([localExtensions, localExtensionDependencies,])
+        .pipe(util2.setExecutableBit(['**/*.sh']))
+        .pipe(filter(['**', '!**/*.js.map']));
+    // {{SQL CARBON EDIT}} - End
+}
+exports.packageExtensionsStream = packageExtensionsStream;
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -4,22 +4,221 @@
 *--------------------------------------------------------------------------------------------*/

 import * as es from 'event-stream';
+import * as fs from 'fs';
+import * as glob from 'glob';
+import * as gulp from 'gulp';
+import * as path from 'path';
 import { Stream } from 'stream';
-import assign = require('object-assign');
+import * as File from 'vinyl';
+import * as vsce from 'vsce';
+import { createStatsStream } from './stats';
+import * as util2 from './util';
 import remote = require('gulp-remote-src');
-const flatmap = require('gulp-flatmap');
 const vzip = require('gulp-vinyl-zip');
-const filter = require('gulp-filter');
-const rename = require('gulp-rename');
+import filter = require('gulp-filter');
+import rename = require('gulp-rename');
 const util = require('gulp-util');
 const buffer = require('gulp-buffer');
-const json = require('gulp-json-editor');
-import * as fs from 'fs';
-import * as path from 'path';
-import * as vsce from 'vsce';
-import * as File from 'vinyl';
+import json = require('gulp-json-editor');
+const webpack = require('webpack');
+const webpackGulp = require('webpack-stream');

-export function fromLocal(extensionPath: string): Stream {
+const root = path.resolve(path.join(__dirname, '..', '..'));
+
+// {{SQL CARBON EDIT}}
+import * as _ from 'underscore';
+import * as vfs from 'vinyl-fs';
+const deps = require('../dependencies');
+const extensionsRoot = path.join(root, 'extensions');
+const extensionsProductionDependencies = deps.getProductionDependencies(extensionsRoot);
+
+export function packageBuiltInExtensions() {
+	const sqlBuiltInLocalExtensionDescriptions = glob.sync('extensions/*/package.json')
+		.map(manifestPath => {
+			const extensionPath = path.dirname(path.join(root, manifestPath));
+			const extensionName = path.basename(extensionPath);
+			return { name: extensionName, path: extensionPath };
+		})
+		.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
+		.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
+		.filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0);
+	sqlBuiltInLocalExtensionDescriptions.forEach(element => {
+		const packagePath = path.join(path.dirname(root), element.name + '.vsix');
+		console.info('Creating vsix for ' + element.path + ' result:' + packagePath);
+		vsce.createVSIX({
+			cwd: element.path,
+			packagePath: packagePath,
+			useYarn: true
+		});
+	});
+}
+
+export function packageExtensionTask(extensionName: string, platform: string, arch: string) {
+	var destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
+	if (platform === 'darwin') {
+		destination = path.join(destination, 'Azure Data Studio.app', 'Contents', 'Resources', 'app', 'extensions', extensionName);
+	} else {
+		destination = path.join(destination, 'resources', 'app', 'extensions', extensionName);
+	}
+
+	platform = platform || process.platform;
+
+	return () => {
+		const root = path.resolve(path.join(__dirname, '../..'));
+		const localExtensionDescriptions = glob.sync('extensions/*/package.json')
+			.map(manifestPath => {
+				const extensionPath = path.dirname(path.join(root, manifestPath));
+				const extensionName = path.basename(extensionPath);
+				return { name: extensionName, path: extensionPath };
+			})
+			.filter(({ name }) => extensionName === name);
+
+		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
+			return fromLocal(extension.path);
+		}));
+
+		let result = localExtensions
+			.pipe(util2.skipDirectories())
+			.pipe(util2.fixWin32DirectoryPermissions())
+			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version']));
+
+		return result.pipe(vfs.dest(destination));
+	};
+}
+// {{SQL CARBON EDIT}} - End
+
+function fromLocal(extensionPath: string, sourceMappingURLBase?: string): Stream {
+	const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
+	if (fs.existsSync(webpackFilename)) {
+		return fromLocalWebpack(extensionPath, sourceMappingURLBase);
+	} else {
+		return fromLocalNormal(extensionPath);
+	}
+}
+
+function fromLocalWebpack(extensionPath: string, sourceMappingURLBase: string | undefined): Stream {
+	const result = es.through();
+
+	const packagedDependencies: string[] = [];
+	const packageJsonConfig = require(path.join(extensionPath, 'package.json'));
+	if (packageJsonConfig.dependencies) {
+		const webpackRootConfig = require(path.join(extensionPath, 'extension.webpack.config.js'));
+		for (const key in webpackRootConfig.externals) {
+			if (key in packageJsonConfig.dependencies) {
+				packagedDependencies.push(key);
+			}
+		}
+	}
+
+	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn, packagedDependencies }).then(fileNames => {
+		const files = fileNames
+			.map(fileName => path.join(extensionPath, fileName))
+			.map(filePath => new File({
+				path: filePath,
+				stat: fs.statSync(filePath),
+				base: extensionPath,
+				contents: fs.createReadStream(filePath) as any
+			}));
+
+		const filesStream = es.readArray(files);
+
+		// check for a webpack configuration files, then invoke webpack
+		// and merge its output with the files stream. also rewrite the package.json
+		// file to a new entry point
+		const webpackConfigLocations = (<string[]>glob.sync(
+			path.join(extensionPath, '/**/extension.webpack.config.js'),
+			{ ignore: ['**/node_modules'] }
+		));
+
+		const packageJsonFilter = filter(f => {
+			if (path.basename(f.path) === 'package.json') {
+				// only modify package.json's next to the webpack file.
+				// to be safe, use existsSync instead of path comparison.
+				return fs.existsSync(path.join(path.dirname(f.path), 'extension.webpack.config.js'));
+			}
+			return false;
+		}, { restore: true });
+
+		const patchFilesStream = filesStream
+			.pipe(packageJsonFilter)
+			.pipe(buffer())
+			.pipe(json((data: any) => {
+				if (data.main) {
+					// hardcoded entry point directory!
+					data.main = data.main.replace('/out/', /dist/);
+				}
+				return data;
+			}))
+			.pipe(packageJsonFilter.restore);
+
+
+		const webpackStreams = webpackConfigLocations.map(webpackConfigPath => () => {
+
+			const webpackDone = (err: any, stats: any) => {
+				util.log(`Bundled extension: ${util.colors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
+				if (err) {
+					result.emit('error', err);
+				}
+				const { compilation } = stats;
+				if (compilation.errors.length > 0) {
+					result.emit('error', compilation.errors.join('\n'));
+				}
+				if (compilation.warnings.length > 0) {
+					result.emit('error', compilation.warnings.join('\n'));
+				}
+			};
+
+			const webpackConfig = {
+				...require(webpackConfigPath),
+				...{ mode: 'production' }
+			};
+			const relativeOutputPath = path.relative(extensionPath, webpackConfig.output.path);
+
+			return webpackGulp(webpackConfig, webpack, webpackDone)
+				.pipe(es.through(function (data) {
+					data.stat = data.stat || {};
+					data.base = extensionPath;
+					this.emit('data', data);
+				}))
+				.pipe(es.through(function (data: File) {
+					// source map handling:
+					// * rewrite sourceMappingURL
+					// * save to disk so that upload-task picks this up
+					if (sourceMappingURLBase) {
+						const contents = (<Buffer>data.contents).toString('utf8');
+						data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
+							return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
+						}), 'utf8');
+
+						if (/\.js\.map$/.test(data.path)) {
+							if (!fs.existsSync(path.dirname(data.path))) {
+								fs.mkdirSync(path.dirname(data.path));
+							}
+							fs.writeFileSync(data.path, data.contents);
+						}
+					}
+					this.emit('data', data);
+				}));
+		});
+
+		es.merge(sequence(webpackStreams), patchFilesStream)
+			// .pipe(es.through(function (data) {
+			// 	// debug
+			// 	console.log('out', data.path, data.contents.length);
+			// 	this.emit('data', data);
+			// }))
+			.pipe(result);
+
+	}).catch(err => {
+		console.error(extensionPath);
+		console.error(packagedDependencies);
+		result.emit('error', err);
+	});
+
+	return result.pipe(createStatsStream(path.basename(extensionPath)));
+}
+
+function fromLocalNormal(extensionPath: string): Stream {
 	const result = es.through();

 	vsce.listFiles({ cwd: extensionPath, packageManager: vsce.PackageManager.Yarn })
@@ -37,13 +236,7 @@ export function fromLocal(extensionPath: string): Stream {
 		})
 		.catch(err => result.emit('error', err));

-	return result;
-}
-
-function error(err: any): Stream {
-	const result = es.through();
-	setTimeout(() => result.emit('error', err));
-	return result;
+	return result.pipe(createStatsStream(path.basename(extensionPath)));
 }

 const baseHeaders = {
@@ -52,82 +245,140 @@ const baseHeaders = {
 	'X-Market-User-Id': '291C1CD0-051A-4123-9B4B-30D60EF52EE2',
 };

-export function fromMarketplace(extensionName: string, version: string): Stream {
-	const filterType = 7;
-	const value = extensionName;
-	const criterium = { filterType, value };
-	const criteria = [criterium];
-	const pageNumber = 1;
-	const pageSize = 1;
-	const sortBy = 0;
-	const sortOrder = 0;
-	const flags = 0x1 | 0x2 | 0x80;
-	const assetTypes = ['Microsoft.VisualStudio.Services.VSIXPackage'];
-	const filters = [{ criteria, pageNumber, pageSize, sortBy, sortOrder }];
-	const body = JSON.stringify({ filters, assetTypes, flags });
-	const headers: any = assign({}, baseHeaders, {
-		'Content-Type': 'application/json',
-		'Accept': 'application/json;api-version=3.0-preview.1',
-		'Content-Length': body.length
-	});
-
-	const options = {
-		base: 'https://marketplace.visualstudio.com/_apis/public/gallery',
-		requestOptions: {
-			method: 'POST',
-			gzip: true,
-			headers,
-			body: body
-		}
-	};
-
-	return remote('/extensionquery', options)
-		.pipe(flatmap((stream, f) => {
-			const rawResult = f.contents.toString('utf8');
-			const result = JSON.parse(rawResult);
-			const extension = result.results[0].extensions[0];
-			if (!extension) {
-				return error(`No such extension: ${extension}`);
-			}
-
-			const metadata = {
-				id: extension.extensionId,
-				publisherId: extension.publisher,
-				publisherDisplayName: extension.publisher.displayName
-			};
-
-			const extensionVersion = extension.versions.filter(v => v.version === version)[0];
-			if (!extensionVersion) {
-				return error(`No such extension version: ${extensionName} @ ${version}`);
-			}
-
-			const asset = extensionVersion.files.filter(f => f.assetType === 'Microsoft.VisualStudio.Services.VSIXPackage')[0];
-			if (!asset) {
-				return error(`No VSIX found for extension version: ${extensionName} @ ${version}`);
-			}
+export function fromMarketplace(extensionName: string, version: string, metadata: any): Stream {
+	const [publisher, name] = extensionName.split('.');
+	const url = `https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${publisher}/vsextensions/${name}/${version}/vspackage`;

 	util.log('Downloading extension:', util.colors.yellow(`${extensionName}@${version}`), '...');

 	const options = {
-				base: asset.source,
+		base: url,
 		requestOptions: {
 			gzip: true,
 			headers: baseHeaders
 		}
 	};

-			return remote('', options)
-				.pipe(flatmap(stream => {
 	const packageJsonFilter = filter('package.json', { restore: true });

-					return stream
+	return remote('', options)
 		.pipe(vzip.src())
 		.pipe(filter('extension/**'))
-						.pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
+		.pipe(rename(p => p.dirname = p.dirname!.replace(/^extension\/?/, '')))
 		.pipe(packageJsonFilter)
 		.pipe(buffer())
 		.pipe(json({ __metadata: metadata }))
 		.pipe(packageJsonFilter.restore);
-				}));
-		}));
+}
+
+interface IPackageExtensionsOptions {
+	/**
+	 * Set to undefined to package all of them.
+	 */
+	desiredExtensions?: string[];
+	sourceMappingURLBase?: string;
+}
+
+const excludedExtensions = [
+	'vscode-api-tests',
+	'vscode-colorize-tests',
+	'ms-vscode.node-debug',
+	'ms-vscode.node-debug2',
+	// {{SQL CARBON EDIT}}
+	'integration-tests'
+];
+
+// {{SQL CARBON EDIT}}
+const sqlBuiltInExtensions = [
+	// Add SQL built-in extensions here.
+	// the extension will be excluded from SQLOps package and will have separate vsix packages
+	'agent',
+	'import',
+	'profiler',
+	'admin-pack',
+	'big-data-cluster'
+];
+var azureExtensions = ['azurecore', 'mssql'];
+// {{SQL CARBON EDIT}} - End
+
+interface IBuiltInExtension {
+	name: string;
+	version: string;
+	repo: string;
+	metadata: any;
+}
+
+const builtInExtensions: IBuiltInExtension[] = require('../builtInExtensions.json');
+
+/**
+ * We're doing way too much stuff at once, with webpack et al. So much stuff
+ * that while downloading extensions from the marketplace, node js doesn't get enough
+ * stack frames to complete the download in under 2 minutes, at which point the
+ * marketplace server cuts off the http request. So, we sequentialize the extensino tasks.
+ */
+function sequence(streamProviders: { (): Stream }[]): Stream {
+	const result = es.through();
+
+	function pop() {
+		if (streamProviders.length === 0) {
+			result.emit('end');
+		} else {
+			const fn = streamProviders.shift()!;
+			fn()
+				.on('end', function () { setTimeout(pop, 0); })
+				.pipe(result, { end: false });
+		}
+	}
+
+	pop();
+	return result;
+}
+
+export function packageExtensionsStream(optsIn?: IPackageExtensionsOptions): NodeJS.ReadWriteStream {
+	const opts = optsIn || {};
+
+	const localExtensionDescriptions = (<string[]>glob.sync('extensions/*/package.json'))
+		.map(manifestPath => {
+			const extensionPath = path.dirname(path.join(root, manifestPath));
+			const extensionName = path.basename(extensionPath);
+			return { name: extensionName, path: extensionPath };
+		})
+		.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
+		.filter(({ name }) => opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true)
+		.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
+		// {{SQL CARBON EDIT}}
+		.filter(({ name }) => sqlBuiltInExtensions.indexOf(name) === -1)
+		.filter(({ name }) => azureExtensions.indexOf(name) === -1);
+
+	const localExtensions = () => sequence([...localExtensionDescriptions.map(extension => () => {
+		return fromLocal(extension.path, opts.sourceMappingURLBase)
+			.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+	})]);
+
+	// {{SQL CARBON EDIT}}
+	const extensionDepsSrc = [
+		..._.flatten(extensionsProductionDependencies.map((d: any) => path.relative(root, d.path)).map((d: any) => [`${d}/**`, `!${d}/**/{test,tests}/**`])),
+	];
+
+	const localExtensionDependencies = () => gulp.src(extensionDepsSrc, { base: '.', dot: true })
+			.pipe(filter(['**', '!**/package-lock.json']))
+			.pipe(util2.cleanNodeModule('account-provider-azure', ['node_modules/date-utils/doc/**', 'node_modules/adal_node/node_modules/**'], undefined))
+			.pipe(util2.cleanNodeModule('typescript', ['**/**'], undefined));
+
+	// Original code commented out here
+	// const localExtensionDependencies = () => gulp.src('extensions/node_modules/**', { base: '.' });
+
+	// const marketplaceExtensions = () => es.merge(
+	// 	...builtInExtensions
+	// 		.filter(({ name }) => opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true)
+	// 		.map(extension => {
+	// 			return fromMarketplace(extension.name, extension.version, extension.metadata)
+	// 				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+	// 		})
+	// );
+
+	return sequence([localExtensions, localExtensionDependencies, /*marketplaceExtensions*/])
+		.pipe(util2.setExecutableBit(['**/*.sh']))
+		.pipe(filter(['**', '!**/*.js.map']));
+	// {{SQL CARBON EDIT}} - End
 }
--- a/build/lib/git.js
+++ b/build/lib/git.js
@@ -4,15 +4,15 @@
 *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-var path = require("path");
-var fs = require("fs");
+const path = require("path");
+const fs = require("fs");
 /**
 * Returns the sha1 commit version of a repository or undefined in case of failure.
 */
 function getVersion(repo) {
-    var git = path.join(repo, '.git');
-    var headPath = path.join(git, 'HEAD');
-    var head;
+    const git = path.join(repo, '.git');
+    const headPath = path.join(git, 'HEAD');
+    let head;
    try {
        head = fs.readFileSync(headPath, 'utf8').trim();
    }
@@ -22,29 +22,29 @@ function getVersion(repo) {
    if (/^[0-9a-f]{40}$/i.test(head)) {
        return head;
    }
-    var refMatch = /^ref: (.*)$/.exec(head);
+    const refMatch = /^ref: (.*)$/.exec(head);
    if (!refMatch) {
        return void 0;
    }
-    var ref = refMatch[1];
-    var refPath = path.join(git, ref);
+    const ref = refMatch[1];
+    const refPath = path.join(git, ref);
    try {
        return fs.readFileSync(refPath, 'utf8').trim();
    }
    catch (e) {
        // noop
    }
-    var packedRefsPath = path.join(git, 'packed-refs');
-    var refsRaw;
+    const packedRefsPath = path.join(git, 'packed-refs');
+    let refsRaw;
    try {
        refsRaw = fs.readFileSync(packedRefsPath, 'utf8').trim();
    }
    catch (e) {
        return void 0;
    }
-    var refsRegex = /^([0-9a-f]{40})\s+(.+)$/gm;
-    var refsMatch;
-    var refs = {};
+    const refsRegex = /^([0-9a-f]{40})\s+(.+)$/gm;
+    let refsMatch;
+    let refs = {};
    while (refsMatch = refsRegex.exec(refsRaw)) {
        refs[refsMatch[2]] = refsMatch[1];
    }
--- a/build/lib/git.ts
+++ b/build/lib/git.ts
@@ -10,7 +10,7 @@ import * as fs from 'fs';
 /**
 * Returns the sha1 commit version of a repository or undefined in case of failure.
 */
-export function getVersion(repo: string): string {
+export function getVersion(repo: string): string | undefined {
 	const git = path.join(repo, '.git');
 	const headPath = path.join(git, 'HEAD');
 	let head: string;
@@ -50,7 +50,7 @@ export function getVersion(repo: string): string {
 	}

 	const refsRegex = /^([0-9a-f]{40})\s+(.+)$/gm;
-	let refsMatch: RegExpExecArray;
+	let refsMatch: RegExpExecArray | null;
 	let refs: { [ref: string]: string } = {};

 	while (refsMatch = refsRegex.exec(refsRaw)) {
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -78,10 +78,6 @@
 			"name": "vs/workbench/parts/logs",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/parts/navigation",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/parts/output",
 			"project": "vscode-workbench"
@@ -114,6 +110,10 @@
 			"name": "vs/workbench/parts/snippets",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/parts/stats",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/parts/surveys",
 			"project": "vscode-workbench"
@@ -166,6 +166,10 @@
 			"name": "vs/workbench/services/bulkEdit",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/commands",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/configuration",
 			"project": "vscode-workbench"
@@ -210,6 +214,10 @@
 			"name": "vs/workbench/services/progress",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/remote",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/textfile",
 			"project": "vscode-workbench"
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -7,15 +7,15 @@ import * as path from 'path';
 import * as fs from 'fs';

 import { through, readable, ThroughStream } from 'event-stream';
-import File = require('vinyl');
+import * as File from 'vinyl';
 import * as Is from 'is';
 import * as xml2js from 'xml2js';
 import * as glob from 'glob';
 import * as https from 'https';
 import * as gulp from 'gulp';

-var util = require('gulp-util');
-var iconv = require('iconv-lite');
+import * as util from 'gulp-util';
+import * as iconv from 'iconv-lite';

 const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;

@@ -57,7 +57,7 @@ export const extraLanguages: Language[] = [
 ];

 // non built-in extensions also that are transifex and need to be part of the language packs
-const externalExtensionsWithTranslations = {
+export const externalExtensionsWithTranslations = {
 	'vscode-chrome-debug': 'msjsdiag.debugger-for-chrome',
 	'vscode-node-debug': 'ms-vscode.node-debug',
 	'vscode-node-debug2': 'ms-vscode.node-debug2'
@@ -71,7 +71,7 @@ interface Map<V> {
 interface Item {
 	id: string;
 	message: string;
-	comment: string;
+	comment?: string;
 }

 export interface Resource {
@@ -137,27 +137,6 @@ module PackageJsonFormat {
 	}
 }

-interface ModuleJsonFormat {
-	messages: string[];
-	keys: (string | LocalizeInfo)[];
-}
-
-module ModuleJsonFormat {
-	export function is(value: any): value is ModuleJsonFormat {
-		let candidate = value as ModuleJsonFormat;
-		return Is.defined(candidate)
-			&& Is.array(candidate.messages) && candidate.messages.every(message => Is.string(message))
-			&& Is.array(candidate.keys) && candidate.keys.every(key => Is.string(key) || LocalizeInfo.is(key));
-	}
-}
-
-interface BundledExtensionHeaderFormat {
-	id: string;
-	type: string;
-	hash: string;
-	outDir: string;
-}
-
 interface BundledExtensionFormat {
 	[key: string]: {
 		messages: string[];
@@ -168,7 +147,7 @@ interface BundledExtensionFormat {
 export class Line {
 	private buffer: string[] = [];

-	constructor(private indent: number = 0) {
+	constructor(indent: number = 0) {
 		if (indent > 0) {
 			this.buffer.push(new Array(indent + 1).join(' '));
 		}
@@ -235,8 +214,8 @@ export class XLF {
 		let existingKeys = new Set<string>();
 		for (let i = 0; i < keys.length; i++) {
 			let key = keys[i];
-			let realKey: string;
-			let comment: string;
+			let realKey: string | undefined;
+			let comment: string | undefined;
 			if (Is.string(key)) {
 				realKey = key;
 				comment = undefined;
@@ -286,17 +265,17 @@ export class XLF {
 	}

 	static parsePseudo = function (xlfString: string): Promise<ParsedXLF[]> {
-		return new Promise((resolve, reject) => {
+		return new Promise((resolve) => {
 			let parser = new xml2js.Parser();
 			let files: { messages: Map<string>, originalFilePath: string, language: string }[] = [];
-			parser.parseString(xlfString, function (err, result) {
+			parser.parseString(xlfString, function (_err: any, result: any) {
 				const fileNodes: any[] = result['xliff']['file'];
 				fileNodes.forEach(file => {
 					const originalFilePath = file.$.original;
 					const messages: Map<string> = {};
 					const transUnits = file.body[0]['trans-unit'];
 					if (transUnits) {
-						transUnits.forEach(unit => {
+						transUnits.forEach((unit: any) => {
 							const key = unit.$.id;
 							const val = pseudify(unit.source[0]['_'].toString());
 							if (key && val) {
@@ -317,7 +296,7 @@ export class XLF {

 			let files: { messages: Map<string>, originalFilePath: string, language: string }[] = [];

-			parser.parseString(xlfString, function (err, result) {
+			parser.parseString(xlfString, function (err: any, result: any) {
 				if (err) {
 					reject(new Error(`XLF parsing error: Failed to parse XLIFF string. ${err}`));
 				}
@@ -340,17 +319,20 @@ export class XLF {

 					const transUnits = file.body[0]['trans-unit'];
 					if (transUnits) {
-						transUnits.forEach(unit => {
+						transUnits.forEach((unit: any) => {
 							const key = unit.$.id;
 							if (!unit.target) {
 								return; // No translation available
 							}

-							const val = unit.target.toString();
+							let val = unit.target[0];
+							if (typeof val !== 'string') {
+								val = val._;
+							}
 							if (key && val) {
 								messages[key] = decodeEntities(val);
 							} else {
-								reject(new Error(`XLF parsing error: XLIFF file does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
+								reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
 							}
 						});
 						files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
@@ -369,7 +351,7 @@ export interface ITask<T> {

 interface ILimitedTaskFactory<T> {
 	factory: ITask<Promise<T>>;
-	c: (value?: T | Thenable<T>) => void;
+	c: (value?: T | Promise<T>) => void;
 	e: (error?: any) => void;
 }

@@ -391,7 +373,7 @@ export class Limiter<T> {

 	private consume(): void {
 		while (this.outstandingPromises.length && this.runningPromises < this.maxDegreeOfParalellism) {
-			const iLimitedTask = this.outstandingPromises.shift();
+			const iLimitedTask = this.outstandingPromises.shift()!;
 			this.runningPromises++;

 			const promise = iLimitedTask.factory();
@@ -419,8 +401,8 @@ function stripComments(content: string): string {
 	* Third matches block comments
 	* Fourth matches line comments
 	*/
-	var regexp: RegExp = /("(?:[^\\\"]*(?:\\.)?)*")|('(?:[^\\\']*(?:\\.)?)*')|(\/\*(?:\r?\n|.)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g;
-	let result = content.replace(regexp, (match, m1, m2, m3, m4) => {
+	const regexp = /("(?:[^\\\"]*(?:\\.)?)*")|('(?:[^\\\']*(?:\\.)?)*')|(\/\*(?:\r?\n|.)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g;
+	let result = content.replace(regexp, (match, _m1, _m2, m3, m4) => {
 		// Only one of m1, m2, m3, m4 matches
 		if (m3) {
 			// A block comment. Replace with nothing
@@ -442,9 +424,9 @@ function stripComments(content: string): string {
 }

 function escapeCharacters(value: string): string {
-	var result: string[] = [];
-	for (var i = 0; i < value.length; i++) {
-		var ch = value.charAt(i);
+	const result: string[] = [];
+	for (let i = 0; i < value.length; i++) {
+		const ch = value.charAt(i);
 		switch (ch) {
 			case '\'':
 				result.push('\\\'');
@@ -484,7 +466,6 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json

 	let statistics: Map<number> = Object.create(null);

-	let total: number = 0;
 	let defaultMessages: Map<Map<string>> = Object.create(null);
 	let modules = Object.keys(keysSection);
 	modules.forEach((module) => {
@@ -497,7 +478,6 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 		let messageMap: Map<string> = Object.create(null);
 		defaultMessages[module] = messageMap;
 		keys.map((key, i) => {
-			total++;
 			if (typeof key === 'string') {
 				messageMap[key] = messages[i];
 			} else {
@@ -520,7 +500,7 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 		modules.forEach((module) => {
 			let order = keysSection[module];
 			let i18nFile = path.join(cwd, module) + '.i18n.json';
-			let messages: Map<string> = null;
+			let messages: Map<string> | null = null;
 			if (fs.existsSync(i18nFile)) {
 				let content = stripComments(fs.readFileSync(i18nFile, 'utf8'));
 				messages = JSON.parse(content);
@@ -533,13 +513,13 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 			}
 			let localizedMessages: string[] = [];
 			order.forEach((keyInfo) => {
-				let key: string = null;
+				let key: string | null = null;
 				if (typeof keyInfo === 'string') {
 					key = keyInfo;
 				} else {
 					key = keyInfo.key;
 				}
-				let message: string = messages[key];
+				let message: string = messages![key];
 				if (!message) {
 					if (process.env['VSCODE_BUILD_VERBOSE']) {
 						log(`No localized message found for key ${key} in module ${module}. Using default message.`);
@@ -824,8 +804,8 @@ export function createXlfFilesForIsl(): ThroughStream {
 }

 export function pushXlfFiles(apiHostname: string, username: string, password: string): ThroughStream {
-	let tryGetPromises = [];
-	let updateCreatePromises = [];
+	let tryGetPromises: Array<Promise<boolean>> = [];
+	let updateCreatePromises: Array<Promise<boolean>> = [];

 	return through(function (this: ThroughStream, file: File) {
 		const project = path.dirname(file.relative);
@@ -890,7 +870,7 @@ function getAllResources(project: string, apiHostname: string, username: string,

 export function findObsoleteResources(apiHostname: string, username: string, password: string): ThroughStream {
 	let resourcesByProject: Map<string[]> = Object.create(null);
-	resourcesByProject[extensionsProject] = [].concat(externalExtensionsWithTranslations); // clone
+	resourcesByProject[extensionsProject] = ([] as any[]).concat(externalExtensionsWithTranslations); // clone

 	return through(function (this: ThroughStream, file: File) {
 		const project = path.dirname(file.relative);
@@ -907,7 +887,7 @@ export function findObsoleteResources(apiHostname: string, username: string, pas

 		const json = JSON.parse(fs.readFileSync('./build/lib/i18n.resources.json', 'utf8'));
 		let i18Resources = [...json.editor, ...json.workbench].map((r: Resource) => r.project + '/' + r.name.replace(/\//g, '_'));
-		let extractedResources = [];
+		let extractedResources: string[] = [];
 		for (let project of [workbenchProject, editorProject]) {
 			for (let resource of resourcesByProject[project]) {
 				if (resource !== 'setup_messages') {
@@ -920,7 +900,7 @@ export function findObsoleteResources(apiHostname: string, username: string, pas
 			console.log(`[i18n] Missing resources in file 'build/lib/i18n.resources.json': JSON.stringify(${extractedResources.filter(p => i18Resources.indexOf(p) === -1)})`);
 		}

-		let promises = [];
+		let promises: Array<Promise<void>> = [];
 		for (let project in resourcesByProject) {
 			promises.push(
 				getAllResources(project, apiHostname, username, password).then(resources => {
@@ -965,7 +945,7 @@ function tryGetResource(project: string, slug: string, apiHostname: string, cred
 }

 function createResource(project: string, slug: string, xlfFile: File, apiHostname: string, credentials: any): Promise<any> {
-	return new Promise((resolve, reject) => {
+	return new Promise((_resolve, reject) => {
 		const data = JSON.stringify({
 			'content': xlfFile.contents.toString(),
 			'name': slug,
@@ -1056,8 +1036,8 @@ export function pullCoreAndExtensionsXlfFiles(apiHostname: string, username: str

 		// extensions
 		let extensionsToLocalize = Object.create(null);
-		glob.sync('./extensions/**/*.nls.json', ).forEach(extension => extensionsToLocalize[extension.split('/')[2]] = true);
-		glob.sync('./extensions/*/node_modules/vscode-nls', ).forEach(extension => extensionsToLocalize[extension.split('/')[2]] = true);
+		glob.sync('./extensions/**/*.nls.json').forEach(extension => extensionsToLocalize[extension.split('/')[2]] = true);
+		glob.sync('./extensions/*/node_modules/vscode-nls').forEach(extension => extensionsToLocalize[extension.split('/')[2]] = true);

 		Object.keys(extensionsToLocalize).forEach(extension => {
 			_coreAndExtensionResources.push({ name: extension, project: extensionsProject });
@@ -1085,7 +1065,7 @@ function pullXlfFiles(apiHostname: string, username: string, password: string, l
 	let expectedTranslationsCount = resources.length;
 	let translationsRetrieved = 0, called = false;

-	return readable(function (count, callback) {
+	return readable(function (_count: any, callback: any) {
 		// Mark end of stream when all resources were retrieved
 		if (translationsRetrieved === expectedTranslationsCount) {
 			return this.emit('end');
@@ -1095,7 +1075,7 @@ function pullXlfFiles(apiHostname: string, username: string, password: string, l
 			called = true;
 			const stream = this;
 			resources.map(function (resource) {
-				retrieveResource(language, resource, apiHostname, credentials).then((file: File) => {
+				retrieveResource(language, resource, apiHostname, credentials).then((file: File | null) => {
 					if (file) {
 						stream.emit('data', file);
 					}
@@ -1107,10 +1087,10 @@ function pullXlfFiles(apiHostname: string, username: string, password: string, l
 		callback();
 	});
 }
-const limiter = new Limiter<File>(NUMBER_OF_CONCURRENT_DOWNLOADS);
+const limiter = new Limiter<File | null>(NUMBER_OF_CONCURRENT_DOWNLOADS);

-function retrieveResource(language: Language, resource: Resource, apiHostname, credentials): Promise<File> {
-	return limiter.queue(() => new Promise<File>((resolve, reject) => {
+function retrieveResource(language: Language, resource: Resource, apiHostname: string, credentials: string): Promise<File | null> {
+	return limiter.queue(() => new Promise<File | null>((resolve, reject) => {
 		const slug = resource.name.replace(/\//g, '_');
 		const project = resource.project;
 		let transifexLanguageId = language.id === 'ps' ? 'en' : language.transifexId || language.id;
@@ -1212,10 +1192,10 @@ export function prepareI18nPackFiles(externalExtensions: Map<string>, resultingT
 	let parsePromises: Promise<ParsedXLF[]>[] = [];
 	let mainPack: I18nPack = { version: i18nPackVersion, contents: {} };
 	let extensionsPacks: Map<I18nPack> = {};
+	let errors: any[] = [];
 	return through(function (this: ThroughStream, xlf: File) {
-		let stream = this;
-		let project = path.dirname(xlf.path);
-		let resource = path.basename(xlf.path, '.xlf');
+		let project = path.dirname(xlf.relative);
+		let resource = path.basename(xlf.relative, '.xlf');
 		let contents = xlf.contents.toString();
 		let parsePromise = pseudo ? XLF.parsePseudo(contents) : XLF.parse(contents);
 		parsePromises.push(parsePromise);
@@ -1242,10 +1222,15 @@ export function prepareI18nPackFiles(externalExtensions: Map<string>, resultingT
 					}
 				});
 			}
-		);
+		).catch(reason => {
+			errors.push(reason);
+		});
 	}, function () {
 		Promise.all(parsePromises)
 			.then(() => {
+				if (errors.length > 0) {
+					throw errors;
+				}
 				const translatedMainFile = createI18nFile('./main', mainPack);
 				resultingTranslationPaths.push({ id: 'vscode', resourceName: 'main.i18n.json' });

@@ -1264,7 +1249,9 @@ export function prepareI18nPackFiles(externalExtensions: Map<string>, resultingT
 				}
 				this.queue(null);
 			})
-			.catch(reason => { throw new Error(reason); });
+			.catch((reason) => {
+				this.emit('error', reason);
+			});
 	});
 }

@@ -1285,11 +1272,15 @@ export function prepareIslFiles(language: Language, innoSetupConfig: InnoSetup):
 					stream.queue(translatedFile);
 				});
 			}
-		);
+		).catch(reason => {
+			this.emit('error', reason);
+		});
 	}, function () {
 		Promise.all(parsePromises)
 			.then(() => { this.queue(null); })
-			.catch(reason => { throw new Error(reason); });
+			.catch(reason => {
+				this.emit('error', reason);
+			});
 	});
 }

@@ -1306,7 +1297,7 @@ function createIslFile(originalFilePath: string, messages: Map<string>, language
 			let firstChar = line.charAt(0);
 			if (firstChar === '[' || firstChar === ';') {
 				if (line === '; *** Inno Setup version 5.5.3+ English messages ***') {
-					content.push(`; *** Inno Setup version 5.5.3+ ${innoSetup.defaultInfo.name} messages ***`);
+					content.push(`; *** Inno Setup version 5.5.3+ ${innoSetup.defaultInfo!.name} messages ***`);
 				} else {
 					content.push(line);
 				}
@@ -1316,9 +1307,9 @@ function createIslFile(originalFilePath: string, messages: Map<string>, language
 				let translated = line;
 				if (key) {
 					if (key === 'LanguageName') {
-						translated = `${key}=${innoSetup.defaultInfo.name}`;
+						translated = `${key}=${innoSetup.defaultInfo!.name}`;
 					} else if (key === 'LanguageID') {
-						translated = `${key}=${innoSetup.defaultInfo.id}`;
+						translated = `${key}=${innoSetup.defaultInfo!.id}`;
 					} else if (key === 'LanguageCodePage') {
 						translated = `${key}=${innoSetup.codePage.substr(2)}`;
 					} else {
@@ -1339,14 +1330,14 @@ function createIslFile(originalFilePath: string, messages: Map<string>, language

 	return new File({
 		path: filePath,
-		contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8'), innoSetup.codePage)
+		contents: iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage)
 	});
 }

 function encodeEntities(value: string): string {
-	var result: string[] = [];
-	for (var i = 0; i < value.length; i++) {
-		var ch = value[i];
+	let result: string[] = [];
+	for (let i = 0; i < value.length; i++) {
+		let ch = value[i];
 		switch (ch) {
 			case '<':
 				result.push('&lt;');
--- a/build/lib/nls.js
+++ b/build/lib/nls.js
@@ -3,13 +3,12 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-var ts = require("typescript");
-var lazy = require("lazy.js");
-var event_stream_1 = require("event-stream");
-var File = require("vinyl");
-var sm = require("source-map");
-var assign = require("object-assign");
-var path = require("path");
+const ts = require("typescript");
+const lazy = require("lazy.js");
+const event_stream_1 = require("event-stream");
+const File = require("vinyl");
+const sm = require("source-map");
+const path = require("path");
 var CollectStepResult;
 (function (CollectStepResult) {
    CollectStepResult[CollectStepResult["Yes"] = 0] = "Yes";
@@ -18,9 +17,9 @@ var CollectStepResult;
    CollectStepResult[CollectStepResult["NoAndRecurse"] = 3] = "NoAndRecurse";
 })(CollectStepResult || (CollectStepResult = {}));
 function collect(node, fn) {
-    var result = [];
+    const result = [];
    function loop(node) {
-        var stepResult = fn(node);
+        const stepResult = fn(node);
        if (stepResult === CollectStepResult.Yes || stepResult === CollectStepResult.YesAndRecurse) {
            result.push(node);
        }
@@ -32,43 +31,45 @@ function collect(node, fn) {
    return result;
 }
 function clone(object) {
-    var result = {};
-    for (var id in object) {
+    const result = {};
+    for (const id in object) {
        result[id] = object[id];
    }
    return result;
 }
 function template(lines) {
-    var indent = '', wrap = '';
+    let indent = '', wrap = '';
    if (lines.length > 1) {
        indent = '\t';
        wrap = '\n';
    }
-    return "/*---------------------------------------------------------\n * Copyright (C) Microsoft Corporation. All rights reserved.\n *--------------------------------------------------------*/\ndefine([], [" + (wrap + lines.map(function (l) { return indent + l; }).join(',\n') + wrap) + "]);";
+    return `/*---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------*/
+define([], [${wrap + lines.map(l => indent + l).join(',\n') + wrap}]);`;
 }
 /**
 * Returns a stream containing the patched JavaScript and source maps.
 */
 function nls() {
-    var input = event_stream_1.through();
-    var output = input.pipe(event_stream_1.through(function (f) {
-        var _this = this;
+    const input = event_stream_1.through();
+    const output = input.pipe(event_stream_1.through(function (f) {
        if (!f.sourceMap) {
-            return this.emit('error', new Error("File " + f.relative + " does not have sourcemaps."));
+            return this.emit('error', new Error(`File ${f.relative} does not have sourcemaps.`));
        }
-        var source = f.sourceMap.sources[0];
+        let source = f.sourceMap.sources[0];
        if (!source) {
-            return this.emit('error', new Error("File " + f.relative + " does not have a source in the source map."));
+            return this.emit('error', new Error(`File ${f.relative} does not have a source in the source map.`));
        }
-        var root = f.sourceMap.sourceRoot;
+        const root = f.sourceMap.sourceRoot;
        if (root) {
            source = path.join(root, source);
        }
-        var typescript = f.sourceMap.sourcesContent[0];
+        const typescript = f.sourceMap.sourcesContent[0];
        if (!typescript) {
-            return this.emit('error', new Error("File " + f.relative + " does not have the original content in the source map."));
+            return this.emit('error', new Error(`File ${f.relative} does not have the original content in the source map.`));
        }
-        nls.patchFiles(f, typescript).forEach(function (f) { return _this.emit('data', f); });
+        nls.patchFiles(f, typescript).forEach(f => this.emit('data', f));
    }));
    return event_stream_1.duplex(input, output);
 }
@@ -76,8 +77,7 @@ function isImportNode(node) {
    return node.kind === ts.SyntaxKind.ImportDeclaration || node.kind === ts.SyntaxKind.ImportEqualsDeclaration;
 }
 (function (nls_1) {
-    function fileFrom(file, contents, path) {
-        if (path === void 0) { path = file.path; }
+    function fileFrom(file, contents, path = file.path) {
        return new File({
            contents: Buffer.from(contents),
            base: file.base,
@@ -87,29 +87,27 @@ function isImportNode(node) {
    }
    nls_1.fileFrom = fileFrom;
    function mappedPositionFrom(source, lc) {
-        return { source: source, line: lc.line + 1, column: lc.character };
+        return { source, line: lc.line + 1, column: lc.character };
    }
    nls_1.mappedPositionFrom = mappedPositionFrom;
    function lcFrom(position) {
        return { line: position.line - 1, character: position.column };
    }
    nls_1.lcFrom = lcFrom;
-    var SingleFileServiceHost = /** @class */ (function () {
-        function SingleFileServiceHost(options, filename, contents) {
-            var _this = this;
+    class SingleFileServiceHost {
+        constructor(options, filename, contents) {
            this.options = options;
            this.filename = filename;
-            this.getCompilationSettings = function () { return _this.options; };
-            this.getScriptFileNames = function () { return [_this.filename]; };
-            this.getScriptVersion = function () { return '1'; };
-            this.getScriptSnapshot = function (name) { return name === _this.filename ? _this.file : _this.lib; };
-            this.getCurrentDirectory = function () { return ''; };
-            this.getDefaultLibFileName = function () { return 'lib.d.ts'; };
+            this.getCompilationSettings = () => this.options;
+            this.getScriptFileNames = () => [this.filename];
+            this.getScriptVersion = () => '1';
+            this.getScriptSnapshot = (name) => name === this.filename ? this.file : this.lib;
+            this.getCurrentDirectory = () => '';
+            this.getDefaultLibFileName = () => 'lib.d.ts';
            this.file = ts.ScriptSnapshot.fromString(contents);
            this.lib = ts.ScriptSnapshot.fromString('');
        }
-        return SingleFileServiceHost;
-    }());
+    }
    nls_1.SingleFileServiceHost = SingleFileServiceHost;
    function isCallExpressionWithinTextSpanCollectStep(textSpan, node) {
        if (!ts.textSpanContainsTextSpan({ start: node.pos, length: node.end - node.pos }, textSpan)) {
@@ -117,97 +115,96 @@ function isImportNode(node) {
        }
        return node.kind === ts.SyntaxKind.CallExpression ? CollectStepResult.YesAndRecurse : CollectStepResult.NoAndRecurse;
    }
-    function analyze(contents, options) {
-        if (options === void 0) { options = {}; }
-        var filename = 'file.ts';
-        var serviceHost = new SingleFileServiceHost(assign(clone(options), { noResolve: true }), filename, contents);
-        var service = ts.createLanguageService(serviceHost);
-        var sourceFile = ts.createSourceFile(filename, contents, ts.ScriptTarget.ES5, true);
+    function analyze(contents, options = {}) {
+        const filename = 'file.ts';
+        const serviceHost = new SingleFileServiceHost(Object.assign(clone(options), { noResolve: true }), filename, contents);
+        const service = ts.createLanguageService(serviceHost);
+        const sourceFile = ts.createSourceFile(filename, contents, ts.ScriptTarget.ES5, true);
        // all imports
-        var imports = lazy(collect(sourceFile, function (n) { return isImportNode(n) ? CollectStepResult.YesAndRecurse : CollectStepResult.NoAndRecurse; }));
+        const imports = lazy(collect(sourceFile, n => isImportNode(n) ? CollectStepResult.YesAndRecurse : CollectStepResult.NoAndRecurse));
        // import nls = require('vs/nls');
-        var importEqualsDeclarations = imports
-            .filter(function (n) { return n.kind === ts.SyntaxKind.ImportEqualsDeclaration; })
-            .map(function (n) { return n; })
-            .filter(function (d) { return d.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference; })
-            .filter(function (d) { return d.moduleReference.expression.getText() === '\'vs/nls\''; });
+        const importEqualsDeclarations = imports
+            .filter(n => n.kind === ts.SyntaxKind.ImportEqualsDeclaration)
+            .map(n => n)
+            .filter(d => d.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference)
+            .filter(d => d.moduleReference.expression.getText() === '\'vs/nls\'');
        // import ... from 'vs/nls';
-        var importDeclarations = imports
-            .filter(function (n) { return n.kind === ts.SyntaxKind.ImportDeclaration; })
-            .map(function (n) { return n; })
-            .filter(function (d) { return d.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral; })
-            .filter(function (d) { return d.moduleSpecifier.getText() === '\'vs/nls\''; })
-            .filter(function (d) { return !!d.importClause && !!d.importClause.namedBindings; });
-        var nlsExpressions = importEqualsDeclarations
-            .map(function (d) { return d.moduleReference.expression; })
-            .concat(importDeclarations.map(function (d) { return d.moduleSpecifier; }))
-            .map(function (d) { return ({
+        const importDeclarations = imports
+            .filter(n => n.kind === ts.SyntaxKind.ImportDeclaration)
+            .map(n => n)
+            .filter(d => d.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)
+            .filter(d => d.moduleSpecifier.getText() === '\'vs/nls\'')
+            .filter(d => !!d.importClause && !!d.importClause.namedBindings);
+        const nlsExpressions = importEqualsDeclarations
+            .map(d => d.moduleReference.expression)
+            .concat(importDeclarations.map(d => d.moduleSpecifier))
+            .map(d => ({
            start: ts.getLineAndCharacterOfPosition(sourceFile, d.getStart()),
            end: ts.getLineAndCharacterOfPosition(sourceFile, d.getEnd())
-        }); });
+        }));
        // `nls.localize(...)` calls
-        var nlsLocalizeCallExpressions = importDeclarations
-            .filter(function (d) { return d.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport; })
-            .map(function (d) { return d.importClause.namedBindings.name; })
-            .concat(importEqualsDeclarations.map(function (d) { return d.name; }))
+        const nlsLocalizeCallExpressions = importDeclarations
+            .filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport))
+            .map(d => d.importClause.namedBindings.name)
+            .concat(importEqualsDeclarations.map(d => d.name))
            // find read-only references to `nls`
-            .map(function (n) { return service.getReferencesAtPosition(filename, n.pos + 1); })
+            .map(n => service.getReferencesAtPosition(filename, n.pos + 1))
            .flatten()
-            .filter(function (r) { return !r.isWriteAccess; })
+            .filter(r => !r.isWriteAccess)
            // find the deepest call expressions AST nodes that contain those references
-            .map(function (r) { return collect(sourceFile, function (n) { return isCallExpressionWithinTextSpanCollectStep(r.textSpan, n); }); })
-            .map(function (a) { return lazy(a).last(); })
-            .filter(function (n) { return !!n; })
-            .map(function (n) { return n; })
+            .map(r => collect(sourceFile, n => isCallExpressionWithinTextSpanCollectStep(r.textSpan, n)))
+            .map(a => lazy(a).last())
+            .filter(n => !!n)
+            .map(n => n)
            // only `localize` calls
-            .filter(function (n) { return n.expression.kind === ts.SyntaxKind.PropertyAccessExpression && n.expression.name.getText() === 'localize'; });
+            .filter(n => n.expression.kind === ts.SyntaxKind.PropertyAccessExpression && n.expression.name.getText() === 'localize');
        // `localize` named imports
-        var allLocalizeImportDeclarations = importDeclarations
-            .filter(function (d) { return d.importClause.namedBindings.kind === ts.SyntaxKind.NamedImports; })
-            .map(function (d) { return [].concat(d.importClause.namedBindings.elements); })
+        const allLocalizeImportDeclarations = importDeclarations
+            .filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamedImports))
+            .map(d => [].concat(d.importClause.namedBindings.elements))
            .flatten();
        // `localize` read-only references
-        var localizeReferences = allLocalizeImportDeclarations
-            .filter(function (d) { return d.name.getText() === 'localize'; })
-            .map(function (n) { return service.getReferencesAtPosition(filename, n.pos + 1); })
+        const localizeReferences = allLocalizeImportDeclarations
+            .filter(d => d.name.getText() === 'localize')
+            .map(n => service.getReferencesAtPosition(filename, n.pos + 1))
            .flatten()
-            .filter(function (r) { return !r.isWriteAccess; });
+            .filter(r => !r.isWriteAccess);
        // custom named `localize` read-only references
-        var namedLocalizeReferences = allLocalizeImportDeclarations
-            .filter(function (d) { return d.propertyName && d.propertyName.getText() === 'localize'; })
-            .map(function (n) { return service.getReferencesAtPosition(filename, n.name.pos + 1); })
+        const namedLocalizeReferences = allLocalizeImportDeclarations
+            .filter(d => d.propertyName && d.propertyName.getText() === 'localize')
+            .map(n => service.getReferencesAtPosition(filename, n.name.pos + 1))
            .flatten()
-            .filter(function (r) { return !r.isWriteAccess; });
+            .filter(r => !r.isWriteAccess);
        // find the deepest call expressions AST nodes that contain those references
-        var localizeCallExpressions = localizeReferences
+        const localizeCallExpressions = localizeReferences
            .concat(namedLocalizeReferences)
-            .map(function (r) { return collect(sourceFile, function (n) { return isCallExpressionWithinTextSpanCollectStep(r.textSpan, n); }); })
-            .map(function (a) { return lazy(a).last(); })
-            .filter(function (n) { return !!n; })
-            .map(function (n) { return n; });
+            .map(r => collect(sourceFile, n => isCallExpressionWithinTextSpanCollectStep(r.textSpan, n)))
+            .map(a => lazy(a).last())
+            .filter(n => !!n)
+            .map(n => n);
        // collect everything
-        var localizeCalls = nlsLocalizeCallExpressions
+        const localizeCalls = nlsLocalizeCallExpressions
            .concat(localizeCallExpressions)
-            .map(function (e) { return e.arguments; })
-            .filter(function (a) { return a.length > 1; })
-            .sort(function (a, b) { return a[0].getStart() - b[0].getStart(); })
-            .map(function (a) { return ({
+            .map(e => e.arguments)
+            .filter(a => a.length > 1)
+            .sort((a, b) => a[0].getStart() - b[0].getStart())
+            .map(a => ({
            keySpan: { start: ts.getLineAndCharacterOfPosition(sourceFile, a[0].getStart()), end: ts.getLineAndCharacterOfPosition(sourceFile, a[0].getEnd()) },
            key: a[0].getText(),
            valueSpan: { start: ts.getLineAndCharacterOfPosition(sourceFile, a[1].getStart()), end: ts.getLineAndCharacterOfPosition(sourceFile, a[1].getEnd()) },
            value: a[1].getText()
-        }); });
+        }));
        return {
            localizeCalls: localizeCalls.toArray(),
            nlsExpressions: nlsExpressions.toArray()
        };
    }
    nls_1.analyze = analyze;
-    var TextModel = /** @class */ (function () {
-        function TextModel(contents) {
-            var regex = /\r\n|\r|\n/g;
-            var index = 0;
-            var match;
+    class TextModel {
+        constructor(contents) {
+            const regex = /\r\n|\r|\n/g;
+            let index = 0;
+            let match;
            this.lines = [];
            this.lineEndings = [];
            while (match = regex.exec(contents)) {
@@ -220,85 +217,80 @@ function isImportNode(node) {
                this.lineEndings.push('');
            }
        }
-        TextModel.prototype.get = function (index) {
+        get(index) {
            return this.lines[index];
-        };
-        TextModel.prototype.set = function (index, line) {
+        }
+        set(index, line) {
            this.lines[index] = line;
-        };
-        Object.defineProperty(TextModel.prototype, "lineCount", {
-            get: function () {
+        }
+        get lineCount() {
            return this.lines.length;
-            },
-            enumerable: true,
-            configurable: true
-        });
+        }
        /**
         * Applies patch(es) to the model.
         * Multiple patches must be ordered.
         * Does not support patches spanning multiple lines.
         */
-        TextModel.prototype.apply = function (patch) {
-            var startLineNumber = patch.span.start.line;
-            var endLineNumber = patch.span.end.line;
-            var startLine = this.lines[startLineNumber] || '';
-            var endLine = this.lines[endLineNumber] || '';
+        apply(patch) {
+            const startLineNumber = patch.span.start.line;
+            const endLineNumber = patch.span.end.line;
+            const startLine = this.lines[startLineNumber] || '';
+            const endLine = this.lines[endLineNumber] || '';
            this.lines[startLineNumber] = [
                startLine.substring(0, patch.span.start.character),
                patch.content,
                endLine.substring(patch.span.end.character)
            ].join('');
-            for (var i = startLineNumber + 1; i <= endLineNumber; i++) {
+            for (let i = startLineNumber + 1; i <= endLineNumber; i++) {
                this.lines[i] = '';
            }
-        };
-        TextModel.prototype.toString = function () {
+        }
+        toString() {
            return lazy(this.lines).zip(this.lineEndings)
                .flatten().toArray().join('');
-        };
-        return TextModel;
-    }());
+        }
+    }
    nls_1.TextModel = TextModel;
    function patchJavascript(patches, contents, moduleId) {
-        var model = new nls.TextModel(contents);
+        const model = new nls.TextModel(contents);
        // patch the localize calls
-        lazy(patches).reverse().each(function (p) { return model.apply(p); });
+        lazy(patches).reverse().each(p => model.apply(p));
        // patch the 'vs/nls' imports
-        var firstLine = model.get(0);
-        var patchedFirstLine = firstLine.replace(/(['"])vs\/nls\1/g, "$1vs/nls!" + moduleId + "$1");
+        const firstLine = model.get(0);
+        const patchedFirstLine = firstLine.replace(/(['"])vs\/nls\1/g, `$1vs/nls!${moduleId}$1`);
        model.set(0, patchedFirstLine);
        return model.toString();
    }
    nls_1.patchJavascript = patchJavascript;
    function patchSourcemap(patches, rsm, smc) {
-        var smg = new sm.SourceMapGenerator({
+        const smg = new sm.SourceMapGenerator({
            file: rsm.file,
            sourceRoot: rsm.sourceRoot
        });
        patches = patches.reverse();
-        var currentLine = -1;
-        var currentLineDiff = 0;
-        var source = null;
-        smc.eachMapping(function (m) {
-            var patch = patches[patches.length - 1];
-            var original = { line: m.originalLine, column: m.originalColumn };
-            var generated = { line: m.generatedLine, column: m.generatedColumn };
+        let currentLine = -1;
+        let currentLineDiff = 0;
+        let source = null;
+        smc.eachMapping(m => {
+            const patch = patches[patches.length - 1];
+            const original = { line: m.originalLine, column: m.originalColumn };
+            const generated = { line: m.generatedLine, column: m.generatedColumn };
            if (currentLine !== generated.line) {
                currentLineDiff = 0;
            }
            currentLine = generated.line;
            generated.column += currentLineDiff;
            if (patch && m.generatedLine - 1 === patch.span.end.line && m.generatedColumn === patch.span.end.character) {
-                var originalLength = patch.span.end.character - patch.span.start.character;
-                var modifiedLength = patch.content.length;
-                var lengthDiff = modifiedLength - originalLength;
+                const originalLength = patch.span.end.character - patch.span.start.character;
+                const modifiedLength = patch.content.length;
+                const lengthDiff = modifiedLength - originalLength;
                currentLineDiff += lengthDiff;
                generated.column += lengthDiff;
                patches.pop();
            }
            source = rsm.sourceRoot ? path.relative(rsm.sourceRoot, m.source) : m.source;
            source = source.replace(/\\/g, '/');
-            smg.addMapping({ source: source, name: m.name, original: original, generated: generated });
+            smg.addMapping({ source, name: m.name, original, generated });
        }, null, sm.SourceMapConsumer.GENERATED_ORDER);
        if (source) {
            smg.setSourceContent(source, smc.sourceContentFor(source));
@@ -307,47 +299,47 @@ function isImportNode(node) {
    }
    nls_1.patchSourcemap = patchSourcemap;
    function patch(moduleId, typescript, javascript, sourcemap) {
-        var _a = analyze(typescript), localizeCalls = _a.localizeCalls, nlsExpressions = _a.nlsExpressions;
+        const { localizeCalls, nlsExpressions } = analyze(typescript);
        if (localizeCalls.length === 0) {
-            return { javascript: javascript, sourcemap: sourcemap };
+            return { javascript, sourcemap };
        }
-        var nlsKeys = template(localizeCalls.map(function (lc) { return lc.key; }));
-        var nls = template(localizeCalls.map(function (lc) { return lc.value; }));
-        var smc = new sm.SourceMapConsumer(sourcemap);
-        var positionFrom = mappedPositionFrom.bind(null, sourcemap.sources[0]);
-        var i = 0;
+        const nlsKeys = template(localizeCalls.map(lc => lc.key));
+        const nls = template(localizeCalls.map(lc => lc.value));
+        const smc = new sm.SourceMapConsumer(sourcemap);
+        const positionFrom = mappedPositionFrom.bind(null, sourcemap.sources[0]);
+        let i = 0;
        // build patches
-        var patches = lazy(localizeCalls)
-            .map(function (lc) { return ([
+        const patches = lazy(localizeCalls)
+            .map(lc => ([
            { range: lc.keySpan, content: '' + (i++) },
            { range: lc.valueSpan, content: 'null' }
-        ]); })
+        ]))
            .flatten()
-            .map(function (c) {
-            var start = lcFrom(smc.generatedPositionFor(positionFrom(c.range.start)));
-            var end = lcFrom(smc.generatedPositionFor(positionFrom(c.range.end)));
-            return { span: { start: start, end: end }, content: c.content };
+            .map(c => {
+            const start = lcFrom(smc.generatedPositionFor(positionFrom(c.range.start)));
+            const end = lcFrom(smc.generatedPositionFor(positionFrom(c.range.end)));
+            return { span: { start, end }, content: c.content };
        })
            .toArray();
        javascript = patchJavascript(patches, javascript, moduleId);
        // since imports are not within the sourcemap information,
        // we must do this MacGyver style
        if (nlsExpressions.length) {
-            javascript = javascript.replace(/^define\(.*$/m, function (line) {
-                return line.replace(/(['"])vs\/nls\1/g, "$1vs/nls!" + moduleId + "$1");
+            javascript = javascript.replace(/^define\(.*$/m, line => {
+                return line.replace(/(['"])vs\/nls\1/g, `$1vs/nls!${moduleId}$1`);
            });
        }
        sourcemap = patchSourcemap(patches, sourcemap, smc);
-        return { javascript: javascript, sourcemap: sourcemap, nlsKeys: nlsKeys, nls: nls };
+        return { javascript, sourcemap, nlsKeys, nls };
    }
    nls_1.patch = patch;
    function patchFiles(javascriptFile, typescript) {
        // hack?
-        var moduleId = javascriptFile.relative
+        const moduleId = javascriptFile.relative
            .replace(/\.js$/, '')
            .replace(/\\/g, '/');
-        var _a = patch(moduleId, typescript, javascriptFile.contents.toString(), javascriptFile.sourceMap), javascript = _a.javascript, sourcemap = _a.sourcemap, nlsKeys = _a.nlsKeys, nls = _a.nls;
-        var result = [fileFrom(javascriptFile, javascript)];
+        const { javascript, sourcemap, nlsKeys, nls } = patch(moduleId, typescript, javascriptFile.contents.toString(), javascriptFile.sourceMap);
+        const result = [fileFrom(javascriptFile, javascript)];
        result[0].sourceMap = sourcemap;
        if (nlsKeys) {
            result.push(fileFrom(javascriptFile, nlsKeys, javascriptFile.path.replace(/\.js$/, '.nls.keys.js')));
--- a/build/lib/nls.ts
+++ b/build/lib/nls.ts
@@ -6,10 +6,9 @@
 import * as ts from 'typescript';
 import * as lazy from 'lazy.js';
 import { duplex, through } from 'event-stream';
-import File = require('vinyl');
+import * as File from 'vinyl';
 import * as sm from 'source-map';
-import assign = require('object-assign');
-import path = require('path');
+import * as  path from 'path';

 declare class FileSourceMap extends File {
 	public sourceMap: sm.RawSourceMap;
@@ -26,7 +25,7 @@ function collect(node: ts.Node, fn: (node: ts.Node) => CollectStepResult): ts.No
 	const result: ts.Node[] = [];

 	function loop(node: ts.Node) {
-		var stepResult = fn(node);
+		const stepResult = fn(node);

 		if (stepResult === CollectStepResult.Yes || stepResult === CollectStepResult.YesAndRecurse) {
 			result.push(node);
@@ -42,8 +41,8 @@ function collect(node: ts.Node, fn: (node: ts.Node) => CollectStepResult): ts.No
 }

 function clone<T>(object: T): T {
-	var result = <T>{};
-	for (var id in object) {
+	const result = <T>{};
+	for (const id in object) {
 		result[id] = object[id];
 	}
 	return result;
@@ -67,8 +66,8 @@ define([], [${ wrap + lines.map(l => indent + l).join(',\n') + wrap}]);`;
 * Returns a stream containing the patched JavaScript and source maps.
 */
 function nls(): NodeJS.ReadWriteStream {
-	var input = through();
-	var output = input.pipe(through(function (f: FileSourceMap) {
+	const input = through();
+	const output = input.pipe(through(function (f: FileSourceMap) {
 		if (!f.sourceMap) {
 			return this.emit('error', new Error(`File ${f.relative} does not have sourcemaps.`));
 		}
@@ -83,7 +82,7 @@ function nls(): NodeJS.ReadWriteStream {
 			source = path.join(root, source);
 		}

-		const typescript = f.sourceMap.sourcesContent[0];
+		const typescript = f.sourceMap.sourcesContent![0];
 		if (!typescript) {
 			return this.emit('error', new Error(`File ${f.relative} does not have the original content in the source map.`));
 		}
@@ -174,7 +173,7 @@ module nls {

 	export function analyze(contents: string, options: ts.CompilerOptions = {}): ILocalizeAnalysisResult {
 		const filename = 'file.ts';
-		const serviceHost = new SingleFileServiceHost(assign(clone(options), { noResolve: true }), filename, contents);
+		const serviceHost = new SingleFileServiceHost(Object.assign(clone(options), { noResolve: true }), filename, contents);
 		const service = ts.createLanguageService(serviceHost);
 		const sourceFile = ts.createSourceFile(filename, contents, ts.ScriptTarget.ES5, true);

@@ -206,8 +205,8 @@ module nls {

 		// `nls.localize(...)` calls
 		const nlsLocalizeCallExpressions = importDeclarations
-			.filter(d => d.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport)
-			.map(d => (<ts.NamespaceImport>d.importClause.namedBindings).name)
+			.filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport))
+			.map(d => (<ts.NamespaceImport>d.importClause!.namedBindings).name)
 			.concat(importEqualsDeclarations.map(d => d.name))

 			// find read-only references to `nls`
@@ -226,8 +225,8 @@ module nls {

 		// `localize` named imports
 		const allLocalizeImportDeclarations = importDeclarations
-			.filter(d => d.importClause.namedBindings.kind === ts.SyntaxKind.NamedImports)
-			.map(d => [].concat((<ts.NamedImports>d.importClause.namedBindings).elements))
+			.filter(d => !!(d.importClause && d.importClause.namedBindings && d.importClause.namedBindings.kind === ts.SyntaxKind.NamedImports))
+			.map(d => ([] as any[]).concat((<ts.NamedImports>d.importClause!.namedBindings!).elements))
 			.flatten();

 		// `localize` read-only references
@@ -279,7 +278,7 @@ module nls {
 		constructor(contents: string) {
 			const regex = /\r\n|\r|\n/g;
 			let index = 0;
-			let match: RegExpExecArray;
+			let match: RegExpExecArray | null;

 			this.lines = [];
 			this.lineEndings = [];
@@ -360,7 +359,7 @@ module nls {
 		patches = patches.reverse();
 		let currentLine = -1;
 		let currentLineDiff = 0;
-		let source = null;
+		let source: string | null = null;

 		smc.eachMapping(m => {
 			const patch = patches[patches.length - 1];
--- a/build/lib/optimize.js
+++ b/build/lib/optimize.js
@@ -4,29 +4,31 @@
 *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-var path = require("path");
-var gulp = require("gulp");
-var sourcemaps = require("gulp-sourcemaps");
-var filter = require("gulp-filter");
-var minifyCSS = require("gulp-cssnano");
-var uglify = require("gulp-uglify");
-var composer = require("gulp-uglify/composer");
-var uglifyes = require("uglify-es");
-var es = require("event-stream");
-var concat = require("gulp-concat");
-var VinylFile = require("vinyl");
-var bundle = require("./bundle");
-var util = require("./util");
-var gulpUtil = require("gulp-util");
-var flatmap = require("gulp-flatmap");
-var pump = require("pump");
-var REPO_ROOT_PATH = path.join(__dirname, '../..');
+const es = require("event-stream");
+const gulp = require("gulp");
+const concat = require("gulp-concat");
+const minifyCSS = require("gulp-cssnano");
+const filter = require("gulp-filter");
+const flatmap = require("gulp-flatmap");
+const sourcemaps = require("gulp-sourcemaps");
+const uglify = require("gulp-uglify");
+const composer = require("gulp-uglify/composer");
+const gulpUtil = require("gulp-util");
+const path = require("path");
+const pump = require("pump");
+const uglifyes = require("uglify-es");
+const VinylFile = require("vinyl");
+const bundle = require("./bundle");
+const i18n_1 = require("./i18n");
+const stats_1 = require("./stats");
+const util = require("./util");
+const REPO_ROOT_PATH = path.join(__dirname, '../..');
 function log(prefix, message) {
    gulpUtil.log(gulpUtil.colors.cyan('[' + prefix + ']'), message);
 }
 // {{SQL CARBON EDIT}}
 function loaderConfig(emptyPaths) {
-    var result = {
+    const result = {
        paths: {
            'vs': 'out-build/vs',
            'sql': 'out-build/sql',
@@ -38,26 +40,26 @@ function loaderConfig(emptyPaths) {
    return result;
 }
 exports.loaderConfig = loaderConfig;
-var IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i;
+const IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i;
 function loader(src, bundledFileHeader, bundleLoader) {
-    var sources = [
-        src + "/vs/loader.js"
+    let sources = [
+        `${src}/vs/loader.js`
    ];
    if (bundleLoader) {
        sources = sources.concat([
-            src + "/vs/css.js",
-            src + "/vs/nls.js"
+            `${src}/vs/css.js`,
+            `${src}/vs/nls.js`
        ]);
    }
-    var isFirst = true;
+    let isFirst = true;
    return (gulp
-        .src(sources, { base: "" + src })
+        .src(sources, { base: `${src}` })
        .pipe(es.through(function (data) {
        if (isFirst) {
            isFirst = false;
            this.emit('data', new VinylFile({
                path: 'fake',
-                base: '',
+                base: undefined,
                contents: Buffer.from(bundledFileHeader)
            }));
            this.emit('data', data);
@@ -74,12 +76,12 @@ function loader(src, bundledFileHeader, bundleLoader) {
    })));
 }
 function toConcatStream(src, bundledFileHeader, sources, dest) {
-    var useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);
+    const useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);
    // If a bundle ends up including in any of the sources our copyright, then
    // insert a fake source at the beginning of each bundle with our copyright
-    var containsOurCopyright = false;
-    for (var i = 0, len = sources.length; i < len; i++) {
-        var fileContents = sources[i].contents;
+    let containsOurCopyright = false;
+    for (let i = 0, len = sources.length; i < len; i++) {
+        const fileContents = sources[i].contents;
        if (IS_OUR_COPYRIGHT_REGEXP.test(fileContents)) {
            containsOurCopyright = true;
            break;
@@ -91,9 +93,9 @@ function toConcatStream(src, bundledFileHeader, sources, dest) {
            contents: bundledFileHeader
        });
    }
-    var treatedSources = sources.map(function (source) {
-        var root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
-        var base = source.path ? root + ("/" + src) : '';
+    const treatedSources = sources.map(function (source) {
+        const root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
+        const base = source.path ? root + `/${src}` : undefined;
        return new VinylFile({
            path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
            base: base,
@@ -102,7 +104,8 @@ function toConcatStream(src, bundledFileHeader, sources, dest) {
    });
    return es.readArray(treatedSources)
        .pipe(useSourcemaps ? util.loadSourcemaps() : es.through())
-        .pipe(concat(dest));
+        .pipe(concat(dest))
+        .pipe(stats_1.createStatsStream(dest));
 }
 function toBundleStream(src, bundledFileHeader, bundles) {
    return es.merge(bundles.map(function (bundle) {
@@ -110,33 +113,33 @@ function toBundleStream(src, bundledFileHeader, bundles) {
    }));
 }
 function optimizeTask(opts) {
-    var src = opts.src;
-    var entryPoints = opts.entryPoints;
-    var otherSources = opts.otherSources;
-    var resources = opts.resources;
-    var loaderConfig = opts.loaderConfig;
-    var bundledFileHeader = opts.header;
-    var bundleLoader = (typeof opts.bundleLoader === 'undefined' ? true : opts.bundleLoader);
-    var out = opts.out;
+    const src = opts.src;
+    const entryPoints = opts.entryPoints;
+    const otherSources = opts.otherSources;
+    const resources = opts.resources;
+    const loaderConfig = opts.loaderConfig;
+    const bundledFileHeader = opts.header;
+    const bundleLoader = (typeof opts.bundleLoader === 'undefined' ? true : opts.bundleLoader);
+    const out = opts.out;
    return function () {
-        var bundlesStream = es.through(); // this stream will contain the bundled files
-        var resourcesStream = es.through(); // this stream will contain the resources
-        var bundleInfoStream = es.through(); // this stream will contain bundleInfo.json
+        const bundlesStream = es.through(); // this stream will contain the bundled files
+        const resourcesStream = es.through(); // this stream will contain the resources
+        const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json
        bundle.bundle(entryPoints, loaderConfig, function (err, result) {
-            if (err) {
+            if (err || !result) {
                return bundlesStream.emit('error', JSON.stringify(err));
            }
            toBundleStream(src, bundledFileHeader, result.files).pipe(bundlesStream);
            // Remove css inlined resources
-            var filteredResources = resources.slice();
+            const filteredResources = resources.slice();
            result.cssInlinedResources.forEach(function (resource) {
                if (process.env['VSCODE_BUILD_VERBOSE']) {
                    log('optimizer', 'excluding inlined: ' + resource);
                }
                filteredResources.push('!' + resource);
            });
-            gulp.src(filteredResources, { base: "" + src }).pipe(resourcesStream);
-            var bundleInfoArray = [];
+            gulp.src(filteredResources, { base: `${src}` }).pipe(resourcesStream);
+            const bundleInfoArray = [];
            if (opts.bundleInfo) {
                bundleInfoArray.push(new VinylFile({
                    path: 'bundleInfo.json',
@@ -146,9 +149,9 @@ function optimizeTask(opts) {
            }
            es.readArray(bundleInfoArray).pipe(bundleInfoStream);
        });
-        var otherSourcesStream = es.through();
-        var otherSourcesStreamArr = [];
-        gulp.src(otherSources, { base: "" + src })
+        const otherSourcesStream = es.through();
+        const otherSourcesStreamArr = [];
+        gulp.src(otherSources, { base: `${src}` })
            .pipe(es.through(function (data) {
            otherSourcesStreamArr.push(toConcatStream(src, bundledFileHeader, [data], data.relative));
        }, function () {
@@ -159,13 +162,17 @@ function optimizeTask(opts) {
                es.merge(otherSourcesStreamArr).pipe(otherSourcesStream);
            }
        }));
-        var result = es.merge(loader(src, bundledFileHeader, bundleLoader), bundlesStream, otherSourcesStream, resourcesStream, bundleInfoStream);
+        const result = es.merge(loader(src, bundledFileHeader, bundleLoader), bundlesStream, otherSourcesStream, resourcesStream, bundleInfoStream);
        return result
            .pipe(sourcemaps.write('./', {
-            sourceRoot: null,
+            sourceRoot: undefined,
            addComment: true,
            includeContent: true
        }))
+            .pipe(opts.languages && opts.languages.length ? i18n_1.processNlsFiles({
+            fileHeader: bundledFileHeader,
+            languages: opts.languages
+        }) : es.through())
            .pipe(gulp.dest(out));
    };
 }
@@ -175,14 +182,14 @@ exports.optimizeTask = optimizeTask;
 * to have a file "context" to include our copyright only once per file.
 */
 function uglifyWithCopyrights() {
-    var preserveComments = function (f) {
-        return function (node, comment) {
-            var text = comment.value;
-            var type = comment.type;
+    const preserveComments = (f) => {
+        return (_node, comment) => {
+            const text = comment.value;
+            const type = comment.type;
            if (/@minifier_do_not_preserve/.test(text)) {
                return false;
            }
-            var isOurCopyright = IS_OUR_COPYRIGHT_REGEXP.test(text);
+            const isOurCopyright = IS_OUR_COPYRIGHT_REGEXP.test(text);
            if (isOurCopyright) {
                if (f.__hasOurCopyright) {
                    return false;
@@ -200,10 +207,10 @@ function uglifyWithCopyrights() {
            return false;
        };
    };
-    var minify = composer(uglifyes);
-    var input = es.through();
-    var output = input
-        .pipe(flatmap(function (stream, f) {
+    const minify = composer(uglifyes);
+    const input = es.through();
+    const output = input
+        .pipe(flatmap((stream, f) => {
        return stream.pipe(minify({
            output: {
                comments: preserveComments(f),
@@ -214,18 +221,18 @@ function uglifyWithCopyrights() {
    return es.duplex(input, output);
 }
 function minifyTask(src, sourceMapBaseUrl) {
-    var sourceMappingURL = sourceMapBaseUrl && (function (f) { return sourceMapBaseUrl + "/" + f.relative + ".map"; });
-    return function (cb) {
-        var jsFilter = filter('**/*.js', { restore: true });
-        var cssFilter = filter('**/*.css', { restore: true });
+    const sourceMappingURL = sourceMapBaseUrl ? ((f) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
+    return cb => {
+        const jsFilter = filter('**/*.js', { restore: true });
+        const cssFilter = filter('**/*.css', { restore: true });
        pump(gulp.src([src + '/**', '!' + src + '/**/*.map']), jsFilter, sourcemaps.init({ loadMaps: true }), uglifyWithCopyrights(), jsFilter.restore, cssFilter, minifyCSS({ reduceIdents: false }), cssFilter.restore, sourcemaps.write('./', {
-            sourceMappingURL: sourceMappingURL,
-            sourceRoot: null,
+            sourceMappingURL,
+            sourceRoot: undefined,
            includeContent: true,
            addComment: true
-        }), gulp.dest(src + '-min'), function (err) {
+        }), gulp.dest(src + '-min'), (err) => {
            if (err instanceof uglify.GulpUglifyError) {
-                console.error("Uglify error in '" + (err.cause && err.cause.filename) + "'");
+                console.error(`Uglify error in '${err.cause && err.cause.filename}'`);
            }
            cb(err);
        });
--- a/build/lib/optimize.ts
+++ b/build/lib/optimize.ts
@@ -5,24 +5,25 @@

 'use strict';

-import * as path from 'path';
+import * as es from 'event-stream';
 import * as gulp from 'gulp';
-import * as sourcemaps from 'gulp-sourcemaps';
-import * as filter from 'gulp-filter';
+import * as concat from 'gulp-concat';
 import * as minifyCSS from 'gulp-cssnano';
+import * as filter from 'gulp-filter';
+import * as flatmap from 'gulp-flatmap';
+import * as sourcemaps from 'gulp-sourcemaps';
 import * as uglify from 'gulp-uglify';
 import * as composer from 'gulp-uglify/composer';
-import * as uglifyes from 'uglify-es';
-import * as es from 'event-stream';
-import * as concat from 'gulp-concat';
-import * as VinylFile from 'vinyl';
-import * as bundle from './bundle';
-import * as util from './util';
 import * as gulpUtil from 'gulp-util';
-import * as flatmap from 'gulp-flatmap';
+import * as path from 'path';
 import * as pump from 'pump';
 import * as sm from 'source-map';
-import { Language } from './i18n';
+import * as uglifyes from 'uglify-es';
+import * as VinylFile from 'vinyl';
+import * as bundle from './bundle';
+import { Language, processNlsFiles } from './i18n';
+import { createStatsStream } from './stats';
+import * as util from './util';

 const REPO_ROOT_PATH = path.join(__dirname, '../..');

@@ -32,7 +33,7 @@ function log(prefix: string, message: string): void {

 // {{SQL CARBON EDIT}}
 export function loaderConfig(emptyPaths?: string[]) {
-	const result = {
+	const result: any = {
 		paths: {
 			'vs': 'out-build/vs',
 			'sql': 'out-build/sql',
@@ -72,7 +73,7 @@ function loader(src: string, bundledFileHeader: string, bundleLoader: boolean):
 					isFirst = false;
 					this.emit('data', new VinylFile({
 						path: 'fake',
-						base: '',
+						base: undefined,
 						contents: Buffer.from(bundledFileHeader)
 					}));
 					this.emit('data', data);
@@ -112,7 +113,7 @@ function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.

 	const treatedSources = sources.map(function (source) {
 		const root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
-		const base = source.path ? root + `/${src}` : '';
+		const base = source.path ? root + `/${src}` : undefined;

 		return new VinylFile({
 			path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
@@ -123,7 +124,8 @@ function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.

 	return es.readArray(treatedSources)
 		.pipe(useSourcemaps ? util.loadSourcemaps() : es.through())
-		.pipe(concat(dest));
+		.pipe(concat(dest))
+		.pipe(createStatsStream(dest));
 }

 function toBundleStream(src: string, bundledFileHeader: string, bundles: bundle.IConcatFile[]): NodeJS.ReadWriteStream {
@@ -188,7 +190,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 		const bundleInfoStream = es.through(); // this stream will contain bundleInfo.json

 		bundle.bundle(entryPoints, loaderConfig, function (err, result) {
-			if (err) { return bundlesStream.emit('error', JSON.stringify(err)); }
+			if (err || !result) { return bundlesStream.emit('error', JSON.stringify(err)); }

 			toBundleStream(src, bundledFileHeader, result.files).pipe(bundlesStream);

@@ -237,10 +239,14 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr

 		return result
 			.pipe(sourcemaps.write('./', {
-				sourceRoot: null,
+				sourceRoot: undefined,
 				addComment: true,
 				includeContent: true
 			}))
+			.pipe(opts.languages && opts.languages.length ? processNlsFiles({
+				fileHeader: bundledFileHeader,
+				languages: opts.languages
+			}) : es.through())
 			.pipe(gulp.dest(out));
 	};
 }
@@ -254,7 +260,7 @@ declare class FileWithCopyright extends VinylFile {
 */
 function uglifyWithCopyrights(): NodeJS.ReadWriteStream {
 	const preserveComments = (f: FileWithCopyright) => {
-		return (node, comment: { value: string; type: string; }) => {
+		return (_node: any, comment: { value: string; type: string; }) => {
 			const text = comment.value;
 			const type = comment.type;

@@ -282,7 +288,7 @@ function uglifyWithCopyrights(): NodeJS.ReadWriteStream {
 		};
 	};

-	const minify = composer(uglifyes);
+	const minify = (composer as any)(uglifyes);
 	const input = es.through();
 	const output = input
 		.pipe(flatmap((stream, f) => {
@@ -298,7 +304,7 @@ function uglifyWithCopyrights(): NodeJS.ReadWriteStream {
 }

 export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) => void {
-	const sourceMappingURL = sourceMapBaseUrl && (f => `${sourceMapBaseUrl}/${f.relative}.map`);
+	const sourceMappingURL = sourceMapBaseUrl ? ((f: any) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;

 	return cb => {
 		const jsFilter = filter('**/*.js', { restore: true });
@@ -315,13 +321,13 @@ export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) =>
 			cssFilter.restore,
 			sourcemaps.write('./', {
 				sourceMappingURL,
-				sourceRoot: null,
+				sourceRoot: undefined,
 				includeContent: true,
 				addComment: true
-			}),
+			} as any),
 			gulp.dest(src + '-min')
 			, (err: any) => {
-				if (err instanceof uglify.GulpUglifyError) {
+				if (err instanceof (uglify as any).GulpUglifyError) {
 					console.error(`Uglify error in '${err.cause && err.cause.filename}'`);
 				}

--- a/build/lib/reporter.js
+++ b/build/lib/reporter.js
@@ -4,20 +4,20 @@
 *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-var es = require("event-stream");
-var _ = require("underscore");
-var util = require("gulp-util");
-var fs = require("fs");
-var path = require("path");
-var allErrors = [];
-var startTime = null;
-var count = 0;
+const es = require("event-stream");
+const _ = require("underscore");
+const util = require("gulp-util");
+const fs = require("fs");
+const path = require("path");
+const allErrors = [];
+let startTime = null;
+let count = 0;
 function onStart() {
    if (count++ > 0) {
        return;
    }
    startTime = new Date().getTime();
-    util.log("Starting " + util.colors.green('compilation') + "...");
+    util.log(`Starting ${util.colors.green('compilation')}...`);
 }
 function onEnd() {
    if (--count > 0) {
@@ -25,7 +25,7 @@ function onEnd() {
    }
    log();
 }
-var buildLogPath = path.join(path.dirname(path.dirname(__dirname)), '.build', 'log');
+const buildLogPath = path.join(path.dirname(path.dirname(__dirname)), '.build', 'log');
 try {
    fs.mkdirSync(path.dirname(buildLogPath));
 }
@@ -33,51 +33,44 @@ catch (err) {
    // ignore
 }
 function log() {
-    var errors = _.flatten(allErrors);
-    var seen = new Set();
-    errors.map(function (err) {
+    const errors = _.flatten(allErrors);
+    const seen = new Set();
+    errors.map(err => {
        if (!seen.has(err)) {
            seen.add(err);
-            util.log(util.colors.red('Error') + ": " + err);
+            util.log(`${util.colors.red('Error')}: ${err}`);
        }
    });
-    var regex = /^([^(]+)\((\d+),(\d+)\): (.*)$/;
-    var messages = errors
-        .map(function (err) { return regex.exec(err); })
-        .filter(function (match) { return !!match; })
-        .map(function (_a) {
-        var path = _a[1], line = _a[2], column = _a[3], message = _a[4];
-        return ({ path: path, line: parseInt(line), column: parseInt(column), message: message });
-    });
+    const regex = /^([^(]+)\((\d+),(\d+)\): (.*)$/;
+    const messages = errors
+        .map(err => regex.exec(err))
+        .filter(match => !!match)
+        .map(x => x)
+        .map(([, path, line, column, message]) => ({ path, line: parseInt(line), column: parseInt(column), message }));
    try {
        fs.writeFileSync(buildLogPath, JSON.stringify(messages));
    }
    catch (err) {
        //noop
    }
-    util.log("Finished " + util.colors.green('compilation') + " with " + errors.length + " errors after " + util.colors.magenta((new Date().getTime() - startTime) + ' ms'));
+    util.log(`Finished ${util.colors.green('compilation')} with ${errors.length} errors after ${util.colors.magenta((new Date().getTime() - startTime) + ' ms')}`);
 }
 function createReporter() {
-    var errors = [];
+    const errors = [];
    allErrors.push(errors);
-    var ReportFunc = /** @class */ (function () {
-        function ReportFunc(err) {
-            errors.push(err);
-        }
-        ReportFunc.hasErrors = function () {
-            return errors.length > 0;
-        };
-        ReportFunc.end = function (emitError) {
+    const result = (err) => errors.push(err);
+    result.hasErrors = () => errors.length > 0;
+    result.end = (emitError) => {
        errors.length = 0;
        onStart();
-            return es.through(null, function () {
+        return es.through(undefined, function () {
            onEnd();
            if (emitError && errors.length > 0) {
-                    errors.__logged__ = true;
                if (!errors.__logged__) {
                    log();
                }
-                    var err = new Error("Found " + errors.length + " errors");
+                errors.__logged__ = true;
+                const err = new Error(`Found ${errors.length} errors`);
                err.__reporter__ = true;
                this.emit('error', err);
            }
@@ -86,8 +79,6 @@ function createReporter() {
            }
        });
    };
-        return ReportFunc;
-    }());
-    return ReportFunc;
+    return result;
 }
 exports.createReporter = createReporter;
--- a/build/lib/reporter.ts
+++ b/build/lib/reporter.ts
@@ -12,7 +12,7 @@ import * as fs from 'fs';
 import * as path from 'path';

 const allErrors: string[][] = [];
-let startTime: number = null;
+let startTime: number | null = null;
 let count = 0;

 function onStart(): void {
@@ -55,6 +55,7 @@ function log(): void {
 	const messages = errors
 		.map(err => regex.exec(err))
 		.filter(match => !!match)
+		.map(x => x as string[])
 		.map(([, path, line, column, message]) => ({ path, line: parseInt(line), column: parseInt(column), message }));

 	try {
@@ -64,7 +65,7 @@ function log(): void {
 		//noop
 	}

-	util.log(`Finished ${util.colors.green('compilation')} with ${errors.length} errors after ${util.colors.magenta((new Date().getTime() - startTime) + ' ms')}`);
+	util.log(`Finished ${util.colors.green('compilation')} with ${errors.length} errors after ${util.colors.magenta((new Date().getTime() - startTime!) + ' ms')}`);
 }

 export interface IReporter {
@@ -77,29 +78,24 @@ export function createReporter(): IReporter {
 	const errors: string[] = [];
 	allErrors.push(errors);

-	class ReportFunc {
-		constructor(err: string) {
-			errors.push(err);
-		}
+	const result = (err: string) => errors.push(err);

-		static hasErrors(): boolean {
-			return errors.length > 0;
-		}
+	result.hasErrors = () => errors.length > 0;

-		static end(emitError: boolean): NodeJS.ReadWriteStream {
+	result.end = (emitError: boolean): NodeJS.ReadWriteStream => {
 		errors.length = 0;
 		onStart();

-			return es.through(null, function () {
+		return es.through(undefined, function () {
 			onEnd();

 			if (emitError && errors.length > 0) {
-					(errors as any).__logged__ = true;
-
 				if (!(errors as any).__logged__) {
 					log();
 				}

+				(errors as any).__logged__ = true;
+
 				const err = new Error(`Found ${errors.length} errors`);
 				(err as any).__reporter__ = true;
 				this.emit('error', err);
@@ -107,8 +103,7 @@ export function createReporter(): IReporter {
 				this.emit('end');
 			}
 		});
-		}
-	}
+	};

-	return <IReporter><any>ReportFunc;
+	return result;
 }
--- a/build/lib/snapshotLoader.js
+++ b/build/lib/snapshotLoader.js
@@ -5,35 +5,51 @@
 'use strict';
 var snaps;
 (function (snaps) {
-    var fs = require('fs');
-    var path = require('path');
-    var os = require('os');
-    var cp = require('child_process');
-    var mksnapshot = path.join(__dirname, "../../node_modules/.bin/" + (process.platform === 'win32' ? 'mksnapshot.cmd' : 'mksnapshot'));
-    var product = require('../../product.json');
-    var arch = (process.argv.join('').match(/--arch=(.*)/) || [])[1];
+    const fs = require('fs');
+    const path = require('path');
+    const os = require('os');
+    const cp = require('child_process');
+    const mksnapshot = path.join(__dirname, `../../node_modules/.bin/${process.platform === 'win32' ? 'mksnapshot.cmd' : 'mksnapshot'}`);
+    const product = require('../../product.json');
+    const arch = (process.argv.join('').match(/--arch=(.*)/) || [])[1];
    //
-    var loaderFilepath;
-    var startupBlobFilepath;
+    let loaderFilepath;
+    let startupBlobFilepath;
    switch (process.platform) {
        case 'darwin':
-            loaderFilepath = "VSCode-darwin/" + product.nameLong + ".app/Contents/Resources/app/out/vs/loader.js";
-            startupBlobFilepath = "VSCode-darwin/" + product.nameLong + ".app/Contents/Frameworks/Electron Framework.framework/Resources/snapshot_blob.bin";
+            loaderFilepath = `VSCode-darwin/${product.nameLong}.app/Contents/Resources/app/out/vs/loader.js`;
+            startupBlobFilepath = `VSCode-darwin/${product.nameLong}.app/Contents/Frameworks/Electron Framework.framework/Resources/snapshot_blob.bin`;
            break;
        case 'win32':
        case 'linux':
-            loaderFilepath = "VSCode-" + process.platform + "-" + arch + "/resources/app/out/vs/loader.js";
-            startupBlobFilepath = "VSCode-" + process.platform + "-" + arch + "/snapshot_blob.bin";
+            loaderFilepath = `VSCode-${process.platform}-${arch}/resources/app/out/vs/loader.js`;
+            startupBlobFilepath = `VSCode-${process.platform}-${arch}/snapshot_blob.bin`;
+            break;
+        default:
+            throw new Error('Unknown platform');
    }
    loaderFilepath = path.join(__dirname, '../../../', loaderFilepath);
    startupBlobFilepath = path.join(__dirname, '../../../', startupBlobFilepath);
    snapshotLoader(loaderFilepath, startupBlobFilepath);
    function snapshotLoader(loaderFilepath, startupBlobFilepath) {
-        var inputFile = fs.readFileSync(loaderFilepath);
-        var wrappedInputFile = "\n\t\tvar Monaco_Loader_Init;\n\t\t(function() {\n\t\t\tvar doNotInitLoader = true;\n\t\t\t" + inputFile.toString() + ";\n\t\t\tMonaco_Loader_Init = function() {\n\t\t\t\tAMDLoader.init();\n\t\t\t\tCSSLoaderPlugin.init();\n\t\t\t\tNLSLoaderPlugin.init();\n\n\t\t\t\treturn { define, require };\n\t\t\t}\n\t\t})();\n\t\t";
-        var wrappedInputFilepath = path.join(os.tmpdir(), 'wrapped-loader.js');
+        const inputFile = fs.readFileSync(loaderFilepath);
+        const wrappedInputFile = `
+		var Monaco_Loader_Init;
+		(function() {
+			var doNotInitLoader = true;
+			${inputFile.toString()};
+			Monaco_Loader_Init = function() {
+				AMDLoader.init();
+				CSSLoaderPlugin.init();
+				NLSLoaderPlugin.init();
+
+				return { define, require };
+			}
+		})();
+		`;
+        const wrappedInputFilepath = path.join(os.tmpdir(), 'wrapped-loader.js');
        console.log(wrappedInputFilepath);
        fs.writeFileSync(wrappedInputFilepath, wrappedInputFile);
-        cp.execFileSync(mksnapshot, [wrappedInputFilepath, "--startup_blob", startupBlobFilepath]);
+        cp.execFileSync(mksnapshot, [wrappedInputFilepath, `--startup_blob`, startupBlobFilepath]);
    }
 })(snaps || (snaps = {}));
--- a/build/lib/snapshotLoader.ts
+++ b/build/lib/snapshotLoader.ts
@@ -30,6 +30,10 @@ namespace snaps {
 		case 'linux':
 			loaderFilepath = `VSCode-${process.platform}-${arch}/resources/app/out/vs/loader.js`;
 			startupBlobFilepath = `VSCode-${process.platform}-${arch}/snapshot_blob.bin`;
+			break;
+
+		default:
+			throw new Error('Unknown platform');
 	}

 	loaderFilepath = path.join(__dirname, '../../../', loaderFilepath);
--- a/build/lib/standalone.js
+++ b/build/lib/standalone.js
@@ -4,14 +4,13 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-var ts = require("typescript");
-var fs = require("fs");
-var path = require("path");
-var tss = require("./treeshaking");
-var REPO_ROOT = path.join(__dirname, '../../');
-var SRC_DIR = path.join(REPO_ROOT, 'src');
-var OUT_EDITOR = path.join(REPO_ROOT, 'out-editor');
-var dirCache = {};
+const ts = require("typescript");
+const fs = require("fs");
+const path = require("path");
+const tss = require("./treeshaking");
+const REPO_ROOT = path.join(__dirname, '../../');
+const SRC_DIR = path.join(REPO_ROOT, 'src');
+let dirCache = {};
 function writeFile(filePath, contents) {
    function ensureDirs(dirPath) {
        if (dirCache[dirPath]) {
@@ -28,32 +27,49 @@ function writeFile(filePath, contents) {
    fs.writeFileSync(filePath, contents);
 }
 function extractEditor(options) {
-    var result = tss.shake(options);
-    for (var fileName in result) {
+    const tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.json')).toString());
+    let compilerOptions;
+    if (tsConfig.extends) {
+        compilerOptions = Object.assign({}, require(path.join(options.sourcesRoot, tsConfig.extends)).compilerOptions, tsConfig.compilerOptions);
+    }
+    else {
+        compilerOptions = tsConfig.compilerOptions;
+    }
+    tsConfig.compilerOptions = compilerOptions;
+    compilerOptions.noUnusedLocals = false;
+    compilerOptions.preserveConstEnums = false;
+    compilerOptions.declaration = false;
+    compilerOptions.moduleResolution = ts.ModuleResolutionKind.Classic;
+    delete compilerOptions.types;
+    delete tsConfig.extends;
+    tsConfig.exclude = [];
+    options.compilerOptions = compilerOptions;
+    let result = tss.shake(options);
+    for (let fileName in result) {
        if (result.hasOwnProperty(fileName)) {
            writeFile(path.join(options.destRoot, fileName), result[fileName]);
        }
    }
-    var copied = {};
-    var copyFile = function (fileName) {
+    let copied = {};
+    const copyFile = (fileName) => {
        if (copied[fileName]) {
            return;
        }
        copied[fileName] = true;
-        var srcPath = path.join(options.sourcesRoot, fileName);
-        var dstPath = path.join(options.destRoot, fileName);
+        const srcPath = path.join(options.sourcesRoot, fileName);
+        const dstPath = path.join(options.destRoot, fileName);
        writeFile(dstPath, fs.readFileSync(srcPath));
    };
-    var writeOutputFile = function (fileName, contents) {
+    const writeOutputFile = (fileName, contents) => {
        writeFile(path.join(options.destRoot, fileName), contents);
    };
-    for (var fileName in result) {
+    for (let fileName in result) {
        if (result.hasOwnProperty(fileName)) {
-            var fileContents = result[fileName];
-            var info = ts.preProcessFile(fileContents);
-            for (var i = info.importedFiles.length - 1; i >= 0; i--) {
-                var importedFileName = info.importedFiles[i].fileName;
-                var importedFilePath = void 0;
+            const fileContents = result[fileName];
+            const info = ts.preProcessFile(fileContents);
+            for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+                const importedFileName = info.importedFiles[i].fileName;
+                let importedFilePath;
                if (/^vs\/css!/.test(importedFileName)) {
                    importedFilePath = importedFileName.substr('vs/css!'.length) + '.css';
                }
@@ -74,62 +90,126 @@ function extractEditor(options) {
            }
        }
    }
-    var tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.json')).toString());
-    tsConfig.compilerOptions.noUnusedLocals = false;
+    delete tsConfig.compilerOptions.moduleResolution;
    writeOutputFile('tsconfig.json', JSON.stringify(tsConfig, null, '\t'));
    [
        'vs/css.build.js',
        'vs/css.d.ts',
        'vs/css.js',
        'vs/loader.js',
-        'vs/monaco.d.ts',
        'vs/nls.build.js',
        'vs/nls.d.ts',
        'vs/nls.js',
        'vs/nls.mock.ts',
-        'typings/lib.ie11_safe_es6.d.ts',
-        'typings/thenable.d.ts',
-        'typings/es6-promise.d.ts',
-        'typings/require.d.ts',
    ].forEach(copyFile);
 }
 exports.extractEditor = extractEditor;
-function createESMSourcesAndResources(options) {
-    var OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
-    var OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);
-    var in_queue = Object.create(null);
-    var queue = [];
-    var enqueue = function (module) {
-        if (in_queue[module]) {
-            return;
+function createESMSourcesAndResources2(options) {
+    const SRC_FOLDER = path.join(REPO_ROOT, options.srcFolder);
+    const OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
+    const OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);
+    const getDestAbsoluteFilePath = (file) => {
+        let dest = options.renames[file.replace(/\\/g, '/')] || file;
+        if (dest === 'tsconfig.json') {
+            return path.join(OUT_FOLDER, `tsconfig.json`);
        }
-        in_queue[module] = true;
-        queue.push(module);
+        if (/\.ts$/.test(dest)) {
+            return path.join(OUT_FOLDER, dest);
+        }
+        return path.join(OUT_RESOURCES_FOLDER, dest);
    };
-    var seenDir = {};
-    var createDirectoryRecursive = function (dir) {
-        if (seenDir[dir]) {
-            return;
+    const allFiles = walkDirRecursive(SRC_FOLDER);
+    for (let i = 0; i < allFiles.length; i++) {
+        const file = allFiles[i];
+        if (options.ignores.indexOf(file.replace(/\\/g, '/')) >= 0) {
+            continue;
        }
-        var lastSlash = dir.lastIndexOf('/');
-        if (lastSlash === -1) {
-            lastSlash = dir.lastIndexOf('\\');
+        if (file === 'tsconfig.json') {
+            const tsConfig = JSON.parse(fs.readFileSync(path.join(SRC_FOLDER, file)).toString());
+            tsConfig.compilerOptions.module = 'es6';
+            tsConfig.compilerOptions.outDir = path.join(path.relative(OUT_FOLDER, OUT_RESOURCES_FOLDER), 'vs').replace(/\\/g, '/');
+            write(getDestAbsoluteFilePath(file), JSON.stringify(tsConfig, null, '\t'));
+            continue;
        }
-        if (lastSlash !== -1) {
-            createDirectoryRecursive(dir.substring(0, lastSlash));
+        if (/\.d\.ts$/.test(file) || /\.css$/.test(file) || /\.js$/.test(file)) {
+            // Transport the files directly
+            write(getDestAbsoluteFilePath(file), fs.readFileSync(path.join(SRC_FOLDER, file)));
+            continue;
        }
-        seenDir[dir] = true;
-        try {
-            fs.mkdirSync(dir);
+        if (/\.ts$/.test(file)) {
+            // Transform the .ts file
+            let fileContents = fs.readFileSync(path.join(SRC_FOLDER, file)).toString();
+            const info = ts.preProcessFile(fileContents);
+            for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+                const importedFilename = info.importedFiles[i].fileName;
+                const pos = info.importedFiles[i].pos;
+                const end = info.importedFiles[i].end;
+                let importedFilepath;
+                if (/^vs\/css!/.test(importedFilename)) {
+                    importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
                }
-        catch (err) { }
-    };
-    seenDir[REPO_ROOT] = true;
-    var toggleComments = function (fileContents) {
-        var lines = fileContents.split(/\r\n|\r|\n/);
-        var mode = 0;
-        for (var i = 0; i < lines.length; i++) {
-            var line = lines[i];
+                else {
+                    importedFilepath = importedFilename;
+                }
+                if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
+                    importedFilepath = path.join(path.dirname(file), importedFilepath);
+                }
+                let relativePath;
+                if (importedFilepath === path.dirname(file).replace(/\\/g, '/')) {
+                    relativePath = '../' + path.basename(path.dirname(file));
+                }
+                else if (importedFilepath === path.dirname(path.dirname(file)).replace(/\\/g, '/')) {
+                    relativePath = '../../' + path.basename(path.dirname(path.dirname(file)));
+                }
+                else {
+                    relativePath = path.relative(path.dirname(file), importedFilepath);
+                }
+                relativePath = relativePath.replace(/\\/g, '/');
+                if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
+                    relativePath = './' + relativePath;
+                }
+                fileContents = (fileContents.substring(0, pos + 1)
+                    + relativePath
+                    + fileContents.substring(end + 1));
+            }
+            fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
+                return `import * as ${m1} from ${m2};`;
+            });
+            write(getDestAbsoluteFilePath(file), fileContents);
+            continue;
+        }
+        console.log(`UNKNOWN FILE: ${file}`);
+    }
+    function walkDirRecursive(dir) {
+        if (dir.charAt(dir.length - 1) !== '/' || dir.charAt(dir.length - 1) !== '\\') {
+            dir += '/';
+        }
+        let result = [];
+        _walkDirRecursive(dir, result, dir.length);
+        return result;
+    }
+    function _walkDirRecursive(dir, result, trimPos) {
+        const files = fs.readdirSync(dir);
+        for (let i = 0; i < files.length; i++) {
+            const file = path.join(dir, files[i]);
+            if (fs.statSync(file).isDirectory()) {
+                _walkDirRecursive(file, result, trimPos);
+            }
+            else {
+                result.push(file.substr(trimPos));
+            }
+        }
+    }
+    function write(absoluteFilePath, contents) {
+        if (/(\.ts$)|(\.js$)/.test(absoluteFilePath)) {
+            contents = toggleComments(contents.toString());
+        }
+        writeFile(absoluteFilePath, contents);
+        function toggleComments(fileContents) {
+            let lines = fileContents.split(/\r\n|\r|\n/);
+            let mode = 0;
+            for (let i = 0; i < lines.length; i++) {
+                const line = lines[i];
                if (mode === 0) {
                    if (/\/\/ ESM-comment-begin/.test(line)) {
                        mode = 1;
@@ -160,129 +240,38 @@ function createESMSourcesAndResources(options) {
                }
            }
            return lines.join('\n');
-    };
-    var write = function (filePath, contents) {
-        var absoluteFilePath;
-        if (/\.ts$/.test(filePath)) {
-            absoluteFilePath = path.join(OUT_FOLDER, filePath);
        }
-        else {
-            absoluteFilePath = path.join(OUT_RESOURCES_FOLDER, filePath);
    }
-        createDirectoryRecursive(path.dirname(absoluteFilePath));
-        if (/(\.ts$)|(\.js$)/.test(filePath)) {
-            contents = toggleComments(contents.toString());
 }
-        fs.writeFileSync(absoluteFilePath, contents);
-    };
-    options.entryPoints.forEach(function (entryPoint) { return enqueue(entryPoint); });
-    while (queue.length > 0) {
-        var module_1 = queue.shift();
-        if (transportCSS(module_1, enqueue, write)) {
-            continue;
-        }
-        if (transportResource(options, module_1, enqueue, write)) {
-            continue;
-        }
-        if (transportDTS(options, module_1, enqueue, write)) {
-            continue;
-        }
-        var filename = void 0;
-        if (options.redirects[module_1]) {
-            filename = path.join(SRC_DIR, options.redirects[module_1] + '.ts');
-        }
-        else {
-            filename = path.join(SRC_DIR, module_1 + '.ts');
-        }
-        var fileContents = fs.readFileSync(filename).toString();
-        var info = ts.preProcessFile(fileContents);
-        for (var i = info.importedFiles.length - 1; i >= 0; i--) {
-            var importedFilename = info.importedFiles[i].fileName;
-            var pos = info.importedFiles[i].pos;
-            var end = info.importedFiles[i].end;
-            var importedFilepath = void 0;
-            if (/^vs\/css!/.test(importedFilename)) {
-                importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
-            }
-            else {
-                importedFilepath = importedFilename;
-            }
-            if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
-                importedFilepath = path.join(path.dirname(module_1), importedFilepath);
-            }
-            enqueue(importedFilepath);
-            var relativePath = void 0;
-            if (importedFilepath === path.dirname(module_1)) {
-                relativePath = '../' + path.basename(path.dirname(module_1));
-            }
-            else if (importedFilepath === path.dirname(path.dirname(module_1))) {
-                relativePath = '../../' + path.basename(path.dirname(path.dirname(module_1)));
-            }
-            else {
-                relativePath = path.relative(path.dirname(module_1), importedFilepath);
-            }
-            if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
-                relativePath = './' + relativePath;
-            }
-            fileContents = (fileContents.substring(0, pos + 1)
-                + relativePath
-                + fileContents.substring(end + 1));
-        }
-        fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
-            return "import * as " + m1 + " from " + m2 + ";";
-        });
-        fileContents = fileContents.replace(/Thenable/g, 'PromiseLike');
-        write(module_1 + '.ts', fileContents);
-    }
-    var esm_opts = {
-        "compilerOptions": {
-            "outDir": path.relative(path.dirname(OUT_FOLDER), OUT_RESOURCES_FOLDER),
-            "rootDir": "src",
-            "module": "es6",
-            "target": "es5",
-            "experimentalDecorators": true,
-            "lib": [
-                "dom",
-                "es5",
-                "es2015.collection",
-                "es2015.promise"
-            ],
-            "types": []
-        }
-    };
-    fs.writeFileSync(path.join(path.dirname(OUT_FOLDER), 'tsconfig.json'), JSON.stringify(esm_opts, null, '\t'));
-    var monacodts = fs.readFileSync(path.join(SRC_DIR, 'vs/monaco.d.ts')).toString();
-    fs.writeFileSync(path.join(OUT_FOLDER, 'vs/monaco.d.ts'), monacodts);
-}
-exports.createESMSourcesAndResources = createESMSourcesAndResources;
+exports.createESMSourcesAndResources2 = createESMSourcesAndResources2;
 function transportCSS(module, enqueue, write) {
    if (!/\.css/.test(module)) {
        return false;
    }
-    var filename = path.join(SRC_DIR, module);
-    var fileContents = fs.readFileSync(filename).toString();
-    var inlineResources = 'base64'; // see https://github.com/Microsoft/monaco-editor/issues/148
-    var inlineResourcesLimit = 300000; //3000; // see https://github.com/Microsoft/monaco-editor/issues/336
-    var newContents = _rewriteOrInlineUrls(fileContents, inlineResources === 'base64', inlineResourcesLimit);
+    const filename = path.join(SRC_DIR, module);
+    const fileContents = fs.readFileSync(filename).toString();
+    const inlineResources = 'base64'; // see https://github.com/Microsoft/monaco-editor/issues/148
+    const inlineResourcesLimit = 300000; //3000; // see https://github.com/Microsoft/monaco-editor/issues/336
+    const newContents = _rewriteOrInlineUrls(fileContents, inlineResources === 'base64', inlineResourcesLimit);
    write(module, newContents);
    return true;
    function _rewriteOrInlineUrls(contents, forceBase64, inlineByteLimit) {
-        return _replaceURL(contents, function (url) {
-            var imagePath = path.join(path.dirname(module), url);
-            var fileContents = fs.readFileSync(path.join(SRC_DIR, imagePath));
+        return _replaceURL(contents, (url) => {
+            let imagePath = path.join(path.dirname(module), url);
+            let fileContents = fs.readFileSync(path.join(SRC_DIR, imagePath));
            if (fileContents.length < inlineByteLimit) {
-                var MIME = /\.svg$/.test(url) ? 'image/svg+xml' : 'image/png';
-                var DATA = ';base64,' + fileContents.toString('base64');
+                const MIME = /\.svg$/.test(url) ? 'image/svg+xml' : 'image/png';
+                let DATA = ';base64,' + fileContents.toString('base64');
                if (!forceBase64 && /\.svg$/.test(url)) {
                    // .svg => url encode as explained at https://codepen.io/tigt/post/optimizing-svgs-in-data-uris
-                    var newText = fileContents.toString()
+                    let newText = fileContents.toString()
                        .replace(/"/g, '\'')
                        .replace(/</g, '%3C')
                        .replace(/>/g, '%3E')
                        .replace(/&/g, '%26')
                        .replace(/#/g, '%23')
                        .replace(/\s+/g, ' ');
-                    var encodedData = ',' + newText;
+                    let encodedData = ',' + newText;
                    if (encodedData.length < DATA.length) {
                        DATA = encodedData;
                    }
@@ -295,12 +284,8 @@ function transportCSS(module, enqueue, write) {
    }
    function _replaceURL(contents, replacer) {
        // Use ")" as the terminator as quotes are oftentimes not used at all
-        return contents.replace(/url\(\s*([^\)]+)\s*\)?/g, function (_) {
-            var matches = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                matches[_i - 1] = arguments[_i];
-            }
-            var url = matches[0];
+        return contents.replace(/url\(\s*([^\)]+)\s*\)?/g, (_, ...matches) => {
+            let url = matches[0];
            // Eliminate starting quotes (the initial whitespace is not captured)
            if (url.charAt(0) === '"' || url.charAt(0) === '\'') {
                url = url.substring(1);
@@ -323,27 +308,3 @@ function transportCSS(module, enqueue, write) {
        return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
    }
 }
-function transportResource(options, module, enqueue, write) {
-    if (!/\.svg/.test(module)) {
-        return false;
-    }
-    write(module, fs.readFileSync(path.join(SRC_DIR, module)));
-    return true;
-}
-function transportDTS(options, module, enqueue, write) {
-    if (options.redirects[module] && fs.existsSync(path.join(SRC_DIR, options.redirects[module] + '.ts'))) {
-        return false;
-    }
-    if (!fs.existsSync(path.join(SRC_DIR, module + '.d.ts'))) {
-        return false;
-    }
-    write(module + '.d.ts', fs.readFileSync(path.join(SRC_DIR, module + '.d.ts')));
-    var filename;
-    if (options.redirects[module]) {
-        write(module + '.js', fs.readFileSync(path.join(SRC_DIR, options.redirects[module] + '.js')));
-    }
-    else {
-        write(module + '.js', fs.readFileSync(path.join(SRC_DIR, module + '.js')));
-    }
-    return true;
-}
--- a/build/lib/standalone.ts
+++ b/build/lib/standalone.ts
@@ -10,7 +10,6 @@ import * as tss from './treeshaking';

 const REPO_ROOT = path.join(__dirname, '../../');
 const SRC_DIR = path.join(REPO_ROOT, 'src');
-const OUT_EDITOR = path.join(REPO_ROOT, 'out-editor');

 let dirCache: { [dir: string]: boolean; } = {};

@@ -32,6 +31,26 @@ function writeFile(filePath: string, contents: Buffer | string): void {
 }

 export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: string }): void {
+	const tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.json')).toString());
+	let compilerOptions: { [key: string]: any };
+	if (tsConfig.extends) {
+		compilerOptions = Object.assign({}, require(path.join(options.sourcesRoot, tsConfig.extends)).compilerOptions, tsConfig.compilerOptions);
+	} else {
+		compilerOptions = tsConfig.compilerOptions;
+	}
+	tsConfig.compilerOptions = compilerOptions;
+
+	compilerOptions.noUnusedLocals = false;
+	compilerOptions.preserveConstEnums = false;
+	compilerOptions.declaration = false;
+	compilerOptions.moduleResolution = ts.ModuleResolutionKind.Classic;
+
+	delete compilerOptions.types;
+	delete tsConfig.extends;
+	tsConfig.exclude = [];
+
+	options.compilerOptions = compilerOptions;
+
 	let result = tss.shake(options);
 	for (let fileName in result) {
 		if (result.hasOwnProperty(fileName)) {
@@ -48,7 +67,7 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str
 		const dstPath = path.join(options.destRoot, fileName);
 		writeFile(dstPath, fs.readFileSync(srcPath));
 	};
-	const writeOutputFile = (fileName: string, contents: string) => {
+	const writeOutputFile = (fileName: string, contents: string | Buffer) => {
 		writeFile(path.join(options.destRoot, fileName), contents);
 	};
 	for (let fileName in result) {
@@ -80,8 +99,7 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str
 		}
 	}

-	const tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.json')).toString());
-	tsConfig.compilerOptions.noUnusedLocals = false;
+	delete tsConfig.compilerOptions.moduleResolution;
 	writeOutputFile('tsconfig.json', JSON.stringify(tsConfig, null, '\t'));

 	[
@@ -89,60 +107,139 @@ export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: str
 		'vs/css.d.ts',
 		'vs/css.js',
 		'vs/loader.js',
-		'vs/monaco.d.ts',
 		'vs/nls.build.js',
 		'vs/nls.d.ts',
 		'vs/nls.js',
 		'vs/nls.mock.ts',
-		'typings/lib.ie11_safe_es6.d.ts',
-		'typings/thenable.d.ts',
-		'typings/es6-promise.d.ts',
-		'typings/require.d.ts',
 	].forEach(copyFile);
 }

-export interface IOptions {
-	entryPoints: string[];
+export interface IOptions2 {
+	srcFolder: string;
 	outFolder: string;
 	outResourcesFolder: string;
-	redirects: { [module: string]: string; };
+	ignores: string[];
+	renames: { [filename: string]: string; };
 }

-export function createESMSourcesAndResources(options: IOptions): void {
+export function createESMSourcesAndResources2(options: IOptions2): void {
+	const SRC_FOLDER = path.join(REPO_ROOT, options.srcFolder);
 	const OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
 	const OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);

-	let in_queue: { [module: string]: boolean; } = Object.create(null);
-	let queue: string[] = [];
-
-	const enqueue = (module: string) => {
-		if (in_queue[module]) {
-			return;
+	const getDestAbsoluteFilePath = (file: string): string => {
+		let dest = options.renames[file.replace(/\\/g, '/')] || file;
+		if (dest === 'tsconfig.json') {
+			return path.join(OUT_FOLDER, `tsconfig.json`);
 		}
-		in_queue[module] = true;
-		queue.push(module);
+		if (/\.ts$/.test(dest)) {
+			return path.join(OUT_FOLDER, dest);
+		}
+		return path.join(OUT_RESOURCES_FOLDER, dest);
 	};

-	const seenDir: { [key: string]: boolean; } = {};
-	const createDirectoryRecursive = (dir: string) => {
-		if (seenDir[dir]) {
-			return;
+	const allFiles = walkDirRecursive(SRC_FOLDER);
+	for (let i = 0; i < allFiles.length; i++) {
+		const file = allFiles[i];
+
+		if (options.ignores.indexOf(file.replace(/\\/g, '/')) >= 0) {
+			continue;
 		}

-		let lastSlash = dir.lastIndexOf('/');
-		if (lastSlash === -1) {
-			lastSlash = dir.lastIndexOf('\\');
+		if (file === 'tsconfig.json') {
+			const tsConfig = JSON.parse(fs.readFileSync(path.join(SRC_FOLDER, file)).toString());
+			tsConfig.compilerOptions.module = 'es6';
+			tsConfig.compilerOptions.outDir = path.join(path.relative(OUT_FOLDER, OUT_RESOURCES_FOLDER), 'vs').replace(/\\/g, '/');
+			write(getDestAbsoluteFilePath(file), JSON.stringify(tsConfig, null, '\t'));
+			continue;
 		}
-		if (lastSlash !== -1) {
-			createDirectoryRecursive(dir.substring(0, lastSlash));
+
+		if (/\.d\.ts$/.test(file) || /\.css$/.test(file) || /\.js$/.test(file)) {
+			// Transport the files directly
+			write(getDestAbsoluteFilePath(file), fs.readFileSync(path.join(SRC_FOLDER, file)));
+			continue;
 		}
-		seenDir[dir] = true;
-		try { fs.mkdirSync(dir); } catch (err) { }
-	};

-	seenDir[REPO_ROOT] = true;
+		if (/\.ts$/.test(file)) {
+			// Transform the .ts file
+			let fileContents = fs.readFileSync(path.join(SRC_FOLDER, file)).toString();

-	const toggleComments = (fileContents: string) => {
+			const info = ts.preProcessFile(fileContents);
+
+			for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+				const importedFilename = info.importedFiles[i].fileName;
+				const pos = info.importedFiles[i].pos;
+				const end = info.importedFiles[i].end;
+
+				let importedFilepath: string;
+				if (/^vs\/css!/.test(importedFilename)) {
+					importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
+				} else {
+					importedFilepath = importedFilename;
+				}
+				if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
+					importedFilepath = path.join(path.dirname(file), importedFilepath);
+				}
+
+				let relativePath: string;
+				if (importedFilepath === path.dirname(file).replace(/\\/g, '/')) {
+					relativePath = '../' + path.basename(path.dirname(file));
+				} else if (importedFilepath === path.dirname(path.dirname(file)).replace(/\\/g, '/')) {
+					relativePath = '../../' + path.basename(path.dirname(path.dirname(file)));
+				} else {
+					relativePath = path.relative(path.dirname(file), importedFilepath);
+				}
+				relativePath = relativePath.replace(/\\/g, '/');
+				if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
+					relativePath = './' + relativePath;
+				}
+				fileContents = (
+					fileContents.substring(0, pos + 1)
+					+ relativePath
+					+ fileContents.substring(end + 1)
+				);
+			}
+
+			fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
+				return `import * as ${m1} from ${m2};`;
+			});
+
+			write(getDestAbsoluteFilePath(file), fileContents);
+			continue;
+		}
+
+		console.log(`UNKNOWN FILE: ${file}`);
+	}
+
+
+	function walkDirRecursive(dir: string): string[] {
+		if (dir.charAt(dir.length - 1) !== '/' || dir.charAt(dir.length - 1) !== '\\') {
+			dir += '/';
+		}
+		let result: string[] = [];
+		_walkDirRecursive(dir, result, dir.length);
+		return result;
+	}
+
+	function _walkDirRecursive(dir: string, result: string[], trimPos: number): void {
+		const files = fs.readdirSync(dir);
+		for (let i = 0; i < files.length; i++) {
+			const file = path.join(dir, files[i]);
+			if (fs.statSync(file).isDirectory()) {
+				_walkDirRecursive(file, result, trimPos);
+			} else {
+				result.push(file.substr(trimPos));
+			}
+		}
+	}
+
+	function write(absoluteFilePath: string, contents: string | Buffer): void {
+		if (/(\.ts$)|(\.js$)/.test(absoluteFilePath)) {
+			contents = toggleComments(contents.toString());
+		}
+		writeFile(absoluteFilePath, contents);
+
+		function toggleComments(fileContents: string): string {
 			let lines = fileContents.split(/\r\n|\r|\n/);
 			let mode = 0;
 			for (let i = 0; i < lines.length; i++) {
@@ -181,111 +278,8 @@ export function createESMSourcesAndResources(options: IOptions): void {
 			}

 			return lines.join('\n');
-	};
-
-	const write = (filePath: string, contents: string | Buffer) => {
-		let absoluteFilePath: string;
-		if (/\.ts$/.test(filePath)) {
-			absoluteFilePath = path.join(OUT_FOLDER, filePath);
-		} else {
-			absoluteFilePath = path.join(OUT_RESOURCES_FOLDER, filePath);
 		}
-		createDirectoryRecursive(path.dirname(absoluteFilePath));
-		if (/(\.ts$)|(\.js$)/.test(filePath)) {
-			contents = toggleComments(contents.toString());
 	}
-		fs.writeFileSync(absoluteFilePath, contents);
-	};
-
-	options.entryPoints.forEach((entryPoint) => enqueue(entryPoint));
-
-	while (queue.length > 0) {
-		const module = queue.shift();
-		if (transportCSS(module, enqueue, write)) {
-			continue;
-		}
-		if (transportResource(options, module, enqueue, write)) {
-			continue;
-		}
-		if (transportDTS(options, module, enqueue, write)) {
-			continue;
-		}
-
-		let filename: string;
-		if (options.redirects[module]) {
-			filename = path.join(SRC_DIR, options.redirects[module] + '.ts');
-		} else {
-			filename = path.join(SRC_DIR, module + '.ts');
-		}
-		let fileContents = fs.readFileSync(filename).toString();
-
-		const info = ts.preProcessFile(fileContents);
-
-		for (let i = info.importedFiles.length - 1; i >= 0; i--) {
-			const importedFilename = info.importedFiles[i].fileName;
-			const pos = info.importedFiles[i].pos;
-			const end = info.importedFiles[i].end;
-
-			let importedFilepath: string;
-			if (/^vs\/css!/.test(importedFilename)) {
-				importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
-			} else {
-				importedFilepath = importedFilename;
-			}
-			if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
-				importedFilepath = path.join(path.dirname(module), importedFilepath);
-			}
-
-			enqueue(importedFilepath);
-
-			let relativePath: string;
-			if (importedFilepath === path.dirname(module)) {
-				relativePath = '../' + path.basename(path.dirname(module));
-			} else if (importedFilepath === path.dirname(path.dirname(module))) {
-				relativePath = '../../' + path.basename(path.dirname(path.dirname(module)));
-			} else {
-				relativePath = path.relative(path.dirname(module), importedFilepath);
-			}
-			if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
-				relativePath = './' + relativePath;
-			}
-			fileContents = (
-				fileContents.substring(0, pos + 1)
-				+ relativePath
-				+ fileContents.substring(end + 1)
-			);
-		}
-
-		fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
-			return `import * as ${m1} from ${m2};`;
-		});
-		fileContents = fileContents.replace(/Thenable/g, 'PromiseLike');
-
-		write(module + '.ts', fileContents);
-	}
-
-	const esm_opts = {
-		"compilerOptions": {
-			"outDir": path.relative(path.dirname(OUT_FOLDER), OUT_RESOURCES_FOLDER),
-			"rootDir": "src",
-			"module": "es6",
-			"target": "es5",
-			"experimentalDecorators": true,
-			"lib": [
-				"dom",
-				"es5",
-				"es2015.collection",
-				"es2015.promise"
-			],
-			"types": [
-			]
-		}
-	};
-	fs.writeFileSync(path.join(path.dirname(OUT_FOLDER), 'tsconfig.json'), JSON.stringify(esm_opts, null, '\t'));
-
-	const monacodts = fs.readFileSync(path.join(SRC_DIR, 'vs/monaco.d.ts')).toString();
-	fs.writeFileSync(path.join(OUT_FOLDER, 'vs/monaco.d.ts'), monacodts);
-
 }

 function transportCSS(module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
@@ -337,7 +331,7 @@ function transportCSS(module: string, enqueue: (module: string) => void, write:
 	function _replaceURL(contents: string, replacer: (url: string) => string): string {
 		// Use ")" as the terminator as quotes are oftentimes not used at all
 		return contents.replace(/url\(\s*([^\)]+)\s*\)?/g, (_: string, ...matches: string[]) => {
-			var url = matches[0];
+			let url = matches[0];
 			// Eliminate starting quotes (the initial whitespace is not captured)
 			if (url.charAt(0) === '"' || url.charAt(0) === '\'') {
 				url = url.substring(1);
@@ -363,33 +357,3 @@ function transportCSS(module: string, enqueue: (module: string) => void, write:
 		return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
 	}
 }
-
-function transportResource(options: IOptions, module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
-
-	if (!/\.svg/.test(module)) {
-		return false;
-	}
-
-	write(module, fs.readFileSync(path.join(SRC_DIR, module)));
-	return true;
-}
-
-function transportDTS(options: IOptions, module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
-
-	if (options.redirects[module] && fs.existsSync(path.join(SRC_DIR, options.redirects[module] + '.ts'))) {
-		return false;
-	}
-
-	if (!fs.existsSync(path.join(SRC_DIR, module + '.d.ts'))) {
-		return false;
-	}
-
-	write(module + '.d.ts', fs.readFileSync(path.join(SRC_DIR, module + '.d.ts')));
-	let filename: string;
-	if (options.redirects[module]) {
-		write(module + '.js', fs.readFileSync(path.join(SRC_DIR, options.redirects[module] + '.js')));
-	} else {
-		write(module + '.js', fs.readFileSync(path.join(SRC_DIR, module + '.js')));
-	}
-	return true;
-}
--- a/build/lib/stats.js
+++ b/build/lib/stats.js
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const es = require("event-stream");
+const util = require("gulp-util");
+const appInsights = require("applicationinsights");
+class Entry {
+    constructor(name, totalCount, totalSize) {
+        this.name = name;
+        this.totalCount = totalCount;
+        this.totalSize = totalSize;
+    }
+    toString(pretty) {
+        if (!pretty) {
+            if (this.totalCount === 1) {
+                return `${this.name}: ${this.totalSize} bytes`;
+            }
+            else {
+                return `${this.name}: ${this.totalCount} files with ${this.totalSize} bytes`;
+            }
+        }
+        else {
+            if (this.totalCount === 1) {
+                return `Stats for '${util.colors.grey(this.name)}': ${Math.round(this.totalSize / 1204)}KB`;
+            }
+            else {
+                const count = this.totalCount < 100
+                    ? util.colors.green(this.totalCount.toString())
+                    : util.colors.red(this.totalCount.toString());
+                return `Stats for '${util.colors.grey(this.name)}': ${count} files, ${Math.round(this.totalSize / 1204)}KB`;
+            }
+        }
+    }
+}
+const _entries = new Map();
+function createStatsStream(group, log) {
+    const entry = new Entry(group, 0, 0);
+    _entries.set(entry.name, entry);
+    return es.through(function (data) {
+        const file = data;
+        if (typeof file.path === 'string') {
+            entry.totalCount += 1;
+            if (Buffer.isBuffer(file.contents)) {
+                entry.totalSize += file.contents.length;
+            }
+            else if (file.stat && typeof file.stat.size === 'number') {
+                entry.totalSize += file.stat.size;
+            }
+            else {
+                // funky file...
+            }
+        }
+        this.emit('data', data);
+    }, function () {
+        if (log) {
+            if (entry.totalCount === 1) {
+                util.log(`Stats for '${util.colors.grey(entry.name)}': ${Math.round(entry.totalSize / 1204)}KB`);
+            }
+            else {
+                const count = entry.totalCount < 100
+                    ? util.colors.green(entry.totalCount.toString())
+                    : util.colors.red(entry.totalCount.toString());
+                util.log(`Stats for '${util.colors.grey(entry.name)}': ${count} files, ${Math.round(entry.totalSize / 1204)}KB`);
+            }
+        }
+        this.emit('end');
+    });
+}
+exports.createStatsStream = createStatsStream;
+function submitAllStats(productJson, commit) {
+    const sorted = [];
+    // move entries for single files to the front
+    _entries.forEach(value => {
+        if (value.totalCount === 1) {
+            sorted.unshift(value);
+        }
+        else {
+            sorted.push(value);
+        }
+    });
+    // print to console
+    for (const entry of sorted) {
+        console.log(entry.toString(true));
+    }
+    // send data as telementry event when the
+    // product is configured to send telemetry
+    if (!productJson || !productJson.aiConfig || typeof productJson.aiConfig.asimovKey !== 'string') {
+        return Promise.resolve(false);
+    }
+    return new Promise(resolve => {
+        try {
+            const sizes = {};
+            const counts = {};
+            for (const entry of sorted) {
+                sizes[entry.name] = entry.totalSize;
+                counts[entry.name] = entry.totalCount;
+            }
+            appInsights.setup(productJson.aiConfig.asimovKey)
+                .setAutoCollectConsole(false)
+                .setAutoCollectExceptions(false)
+                .setAutoCollectPerformance(false)
+                .setAutoCollectRequests(false)
+                .setAutoCollectDependencies(false)
+                .setAutoDependencyCorrelation(false)
+                .start();
+            appInsights.defaultClient.config.endpointUrl = 'https://vortex.data.microsoft.com/collect/v1';
+            /* __GDPR__
+                "monacoworkbench/packagemetrics" : {
+                    "commit" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+                    "size" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+                    "count" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+                }
+            */
+            appInsights.defaultClient.trackEvent({
+                name: 'monacoworkbench/packagemetrics',
+                properties: { commit, size: JSON.stringify(sizes), count: JSON.stringify(counts) }
+            });
+            appInsights.defaultClient.flush({
+                callback: () => {
+                    appInsights.dispose();
+                    resolve(true);
+                }
+            });
+        }
+        catch (err) {
+            console.error('ERROR sending build stats as telemetry event!');
+            console.error(err);
+            resolve(false);
+        }
+    });
+}
+exports.submitAllStats = submitAllStats;
--- a/build/lib/stats.ts
+++ b/build/lib/stats.ts
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as es from 'event-stream';
+import * as util from 'gulp-util';
+import * as File from 'vinyl';
+import * as appInsights from 'applicationinsights';
+
+class Entry {
+	constructor(readonly name: string, public totalCount: number, public totalSize: number) { }
+
+	toString(pretty?: boolean): string {
+		if (!pretty) {
+			if (this.totalCount === 1) {
+				return `${this.name}: ${this.totalSize} bytes`;
+			} else {
+				return `${this.name}: ${this.totalCount} files with ${this.totalSize} bytes`;
+			}
+		} else {
+			if (this.totalCount === 1) {
+				return `Stats for '${util.colors.grey(this.name)}': ${Math.round(this.totalSize / 1204)}KB`;
+
+			} else {
+				const count = this.totalCount < 100
+					? util.colors.green(this.totalCount.toString())
+					: util.colors.red(this.totalCount.toString());
+
+				return `Stats for '${util.colors.grey(this.name)}': ${count} files, ${Math.round(this.totalSize / 1204)}KB`;
+			}
+		}
+	}
+}
+
+const _entries = new Map<string, Entry>();
+
+export function createStatsStream(group: string, log?: boolean): es.ThroughStream {
+
+	const entry = new Entry(group, 0, 0);
+	_entries.set(entry.name, entry);
+
+	return es.through(function (data) {
+		const file = data as File;
+		if (typeof file.path === 'string') {
+			entry.totalCount += 1;
+			if (Buffer.isBuffer(file.contents)) {
+				entry.totalSize += file.contents.length;
+			} else if (file.stat && typeof file.stat.size === 'number') {
+				entry.totalSize += file.stat.size;
+			} else {
+				// funky file...
+			}
+		}
+		this.emit('data', data);
+	}, function () {
+		if (log) {
+			if (entry.totalCount === 1) {
+				util.log(`Stats for '${util.colors.grey(entry.name)}': ${Math.round(entry.totalSize / 1204)}KB`);
+
+			} else {
+				const count = entry.totalCount < 100
+					? util.colors.green(entry.totalCount.toString())
+					: util.colors.red(entry.totalCount.toString());
+
+				util.log(`Stats for '${util.colors.grey(entry.name)}': ${count} files, ${Math.round(entry.totalSize / 1204)}KB`);
+			}
+		}
+
+		this.emit('end');
+	});
+}
+
+export function submitAllStats(productJson: any, commit: string): Promise<boolean> {
+
+	const sorted: Entry[] = [];
+	// move entries for single files to the front
+	_entries.forEach(value => {
+		if (value.totalCount === 1) {
+			sorted.unshift(value);
+		} else {
+			sorted.push(value);
+		}
+	});
+
+	// print to console
+	for (const entry of sorted) {
+		console.log(entry.toString(true));
+	}
+
+	// send data as telementry event when the
+	// product is configured to send telemetry
+	if (!productJson || !productJson.aiConfig || typeof productJson.aiConfig.asimovKey !== 'string') {
+		return Promise.resolve(false);
+	}
+
+	return new Promise(resolve => {
+		try {
+
+			const sizes: any = {};
+			const counts: any = {};
+			for (const entry of sorted) {
+				sizes[entry.name] = entry.totalSize;
+				counts[entry.name] = entry.totalCount;
+			}
+
+			appInsights.setup(productJson.aiConfig.asimovKey)
+				.setAutoCollectConsole(false)
+				.setAutoCollectExceptions(false)
+				.setAutoCollectPerformance(false)
+				.setAutoCollectRequests(false)
+				.setAutoCollectDependencies(false)
+				.setAutoDependencyCorrelation(false)
+				.start();
+
+			appInsights.defaultClient.config.endpointUrl = 'https://vortex.data.microsoft.com/collect/v1';
+
+			/* __GDPR__
+				"monacoworkbench/packagemetrics" : {
+					"commit" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"size" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					"count" : {"classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+				}
+			*/
+			appInsights.defaultClient.trackEvent({
+				name: 'monacoworkbench/packagemetrics',
+				properties: { commit, size: JSON.stringify(sizes), count: JSON.stringify(counts) }
+			});
+
+
+			appInsights.defaultClient.flush({
+				callback: () => {
+					appInsights.dispose();
+					resolve(true);
+				}
+			});
+
+		} catch (err) {
+			console.error('ERROR sending build stats as telemetry event!');
+			console.error(err);
+			resolve(false);
+		}
+	});
+
+}
--- a/build/lib/test/i18n.test.js
+++ b/build/lib/test/i18n.test.js
@@ -4,30 +4,30 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-var assert = require("assert");
-var i18n = require("../i18n");
-suite('XLF Parser Tests', function () {
-    var sampleXlf = '<?xml version="1.0" encoding="utf-8"?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"><file original="vs/base/common/keybinding" source-language="en" datatype="plaintext"><body><trans-unit id="key1"><source xml:lang="en">Key #1</source></trans-unit><trans-unit id="key2"><source xml:lang="en">Key #2 &amp;</source></trans-unit></body></file></xliff>';
-    var sampleTranslatedXlf = '<?xml version="1.0" encoding="utf-8"?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"><file original="vs/base/common/keybinding" source-language="en" target-language="ru" datatype="plaintext"><body><trans-unit id="key1"><source xml:lang="en">Key #1</source><target>Кнопка #1</target></trans-unit><trans-unit id="key2"><source xml:lang="en">Key #2 &amp;</source><target>Кнопка #2 &amp;</target></trans-unit></body></file></xliff>';
-    var originalFilePath = 'vs/base/common/keybinding';
-    var keys = ['key1', 'key2'];
-    var messages = ['Key #1', 'Key #2 &'];
-    var translatedMessages = { key1: 'Кнопка #1', key2: 'Кнопка #2 &' };
-    test('Keys & messages to XLF conversion', function () {
-        var xlf = new i18n.XLF('vscode-workbench');
+const assert = require("assert");
+const i18n = require("../i18n");
+suite('XLF Parser Tests', () => {
+    const sampleXlf = '<?xml version="1.0" encoding="utf-8"?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"><file original="vs/base/common/keybinding" source-language="en" datatype="plaintext"><body><trans-unit id="key1"><source xml:lang="en">Key #1</source></trans-unit><trans-unit id="key2"><source xml:lang="en">Key #2 &amp;</source></trans-unit></body></file></xliff>';
+    const sampleTranslatedXlf = '<?xml version="1.0" encoding="utf-8"?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"><file original="vs/base/common/keybinding" source-language="en" target-language="ru" datatype="plaintext"><body><trans-unit id="key1"><source xml:lang="en">Key #1</source><target>Кнопка #1</target></trans-unit><trans-unit id="key2"><source xml:lang="en">Key #2 &amp;</source><target>Кнопка #2 &amp;</target></trans-unit></body></file></xliff>';
+    const originalFilePath = 'vs/base/common/keybinding';
+    const keys = ['key1', 'key2'];
+    const messages = ['Key #1', 'Key #2 &'];
+    const translatedMessages = { key1: 'Кнопка #1', key2: 'Кнопка #2 &' };
+    test('Keys & messages to XLF conversion', () => {
+        const xlf = new i18n.XLF('vscode-workbench');
        xlf.addFile(originalFilePath, keys, messages);
-        var xlfString = xlf.toString();
+        const xlfString = xlf.toString();
        assert.strictEqual(xlfString.replace(/\s{2,}/g, ''), sampleXlf);
    });
-    test('XLF to keys & messages conversion', function () {
+    test('XLF to keys & messages conversion', () => {
        i18n.XLF.parse(sampleTranslatedXlf).then(function (resolvedFiles) {
            assert.deepEqual(resolvedFiles[0].messages, translatedMessages);
            assert.strictEqual(resolvedFiles[0].originalFilePath, originalFilePath);
        });
    });
-    test('JSON file source path to Transifex resource match', function () {
-        var editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench';
-        var platform = { name: 'vs/platform', project: editorProject }, editorContrib = { name: 'vs/editor/contrib', project: editorProject }, editor = { name: 'vs/editor', project: editorProject }, base = { name: 'vs/base', project: editorProject }, code = { name: 'vs/code', project: workbenchProject }, workbenchParts = { name: 'vs/workbench/parts/html', project: workbenchProject }, workbenchServices = { name: 'vs/workbench/services/files', project: workbenchProject }, workbench = { name: 'vs/workbench', project: workbenchProject };
+    test('JSON file source path to Transifex resource match', () => {
+        const editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench';
+        const platform = { name: 'vs/platform', project: editorProject }, editorContrib = { name: 'vs/editor/contrib', project: editorProject }, editor = { name: 'vs/editor', project: editorProject }, base = { name: 'vs/base', project: editorProject }, code = { name: 'vs/code', project: workbenchProject }, workbenchParts = { name: 'vs/workbench/parts/html', project: workbenchProject }, workbenchServices = { name: 'vs/workbench/services/files', project: workbenchProject }, workbench = { name: 'vs/workbench', project: workbenchProject };
        assert.deepEqual(i18n.getResource('vs/platform/actions/browser/menusExtensionPoint'), platform);
        assert.deepEqual(i18n.getResource('vs/editor/contrib/clipboard/browser/clipboard'), editorContrib);
        assert.deepEqual(i18n.getResource('vs/editor/common/modes/modesRegistry'), editor);
--- a/build/lib/test/i18n.test.ts
+++ b/build/lib/test/i18n.test.ts
@@ -15,7 +15,7 @@ suite('XLF Parser Tests', () => {
 	const translatedMessages = { key1: 'Кнопка #1', key2: 'Кнопка #2 &' };

 	test('Keys & messages to XLF conversion', () => {
-		let xlf = new i18n.XLF('vscode-workbench');
+		const xlf = new i18n.XLF('vscode-workbench');
 		xlf.addFile(originalFilePath, keys, messages);
 		const xlfString = xlf.toString();

--- a/build/lib/treeshaking.js
+++ b/build/lib/treeshaking.js
@@ -4,18 +4,49 @@
 *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-var fs = require("fs");
-var path = require("path");
-var ts = require("typescript");
-var TYPESCRIPT_LIB_FOLDER = path.dirname(require.resolve('typescript/lib/lib.d.ts'));
+const fs = require("fs");
+const path = require("path");
+const ts = require("typescript");
+const TYPESCRIPT_LIB_FOLDER = path.dirname(require.resolve('typescript/lib/lib.d.ts'));
 var ShakeLevel;
 (function (ShakeLevel) {
    ShakeLevel[ShakeLevel["Files"] = 0] = "Files";
    ShakeLevel[ShakeLevel["InnerFile"] = 1] = "InnerFile";
    ShakeLevel[ShakeLevel["ClassMembers"] = 2] = "ClassMembers";
 })(ShakeLevel = exports.ShakeLevel || (exports.ShakeLevel = {}));
+function printDiagnostics(diagnostics) {
+    for (let i = 0; i < diagnostics.length; i++) {
+        const diag = diagnostics[i];
+        let result = '';
+        if (diag.file) {
+            result += `${diag.file.fileName}: `;
+        }
+        if (diag.file && diag.start) {
+            let location = diag.file.getLineAndCharacterOfPosition(diag.start);
+            result += `- ${location.line + 1},${location.character} - `;
+        }
+        result += JSON.stringify(diag.messageText);
+        console.log(result);
+    }
+}
 function shake(options) {
-    var languageService = createTypeScriptLanguageService(options);
+    const languageService = createTypeScriptLanguageService(options);
+    const program = languageService.getProgram();
+    const globalDiagnostics = program.getGlobalDiagnostics();
+    if (globalDiagnostics.length > 0) {
+        printDiagnostics(globalDiagnostics);
+        throw new Error(`Compilation Errors encountered.`);
+    }
+    const syntacticDiagnostics = program.getSyntacticDiagnostics();
+    if (syntacticDiagnostics.length > 0) {
+        printDiagnostics(syntacticDiagnostics);
+        throw new Error(`Compilation Errors encountered.`);
+    }
+    const semanticDiagnostics = program.getSemanticDiagnostics();
+    if (semanticDiagnostics.length > 0) {
+        printDiagnostics(semanticDiagnostics);
+        throw new Error(`Compilation Errors encountered.`);
+    }
    markNodes(languageService, options);
    return generateResult(languageService, options.shakeLevel);
 }
@@ -23,93 +54,99 @@ exports.shake = shake;
 //#region Discovery, LanguageService & Setup
 function createTypeScriptLanguageService(options) {
    // Discover referenced files
-    var FILES = discoverAndReadFiles(options);
+    const FILES = discoverAndReadFiles(options);
    // Add fake usage files
-    options.inlineEntryPoints.forEach(function (inlineEntryPoint, index) {
-        FILES["inlineEntryPoint:" + index + ".ts"] = inlineEntryPoint;
+    options.inlineEntryPoints.forEach((inlineEntryPoint, index) => {
+        FILES[`inlineEntryPoint.${index}.ts`] = inlineEntryPoint;
+    });
+    // Add additional typings
+    options.typings.forEach((typing) => {
+        const filePath = path.join(options.sourcesRoot, typing);
+        FILES[typing] = fs.readFileSync(filePath).toString();
    });
    // Resolve libs
-    var RESOLVED_LIBS = {};
-    options.libs.forEach(function (filename) {
-        var filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
-        RESOLVED_LIBS["defaultLib:" + filename] = fs.readFileSync(filepath).toString();
+    const RESOLVED_LIBS = {};
+    options.libs.forEach((filename) => {
+        const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
+        RESOLVED_LIBS[`defaultLib:${filename}`] = fs.readFileSync(filepath).toString();
    });
-    var host = new TypeScriptLanguageServiceHost(RESOLVED_LIBS, FILES, options.compilerOptions);
+    const compilerOptions = ts.convertCompilerOptionsFromJson(options.compilerOptions, options.sourcesRoot).options;
+    const host = new TypeScriptLanguageServiceHost(RESOLVED_LIBS, FILES, compilerOptions);
    return ts.createLanguageService(host);
 }
 /**
 * Read imports and follow them until all files have been handled
 */
 function discoverAndReadFiles(options) {
-    var FILES = {};
-    var in_queue = Object.create(null);
-    var queue = [];
-    var enqueue = function (moduleId) {
+    const FILES = {};
+    const in_queue = Object.create(null);
+    const queue = [];
+    const enqueue = (moduleId) => {
        if (in_queue[moduleId]) {
            return;
        }
        in_queue[moduleId] = true;
        queue.push(moduleId);
    };
-    options.entryPoints.forEach(function (entryPoint) { return enqueue(entryPoint); });
+    options.entryPoints.forEach((entryPoint) => enqueue(entryPoint));
    while (queue.length > 0) {
-        var moduleId = queue.shift();
-        var dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
+        const moduleId = queue.shift();
+        const dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
        if (fs.existsSync(dts_filename)) {
-            var dts_filecontents = fs.readFileSync(dts_filename).toString();
-            FILES[moduleId + '.d.ts'] = dts_filecontents;
+            const dts_filecontents = fs.readFileSync(dts_filename).toString();
+            FILES[`${moduleId}.d.ts`] = dts_filecontents;
            continue;
        }
-        var ts_filename = void 0;
+        let ts_filename;
        if (options.redirects[moduleId]) {
            ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
        }
        else {
            ts_filename = path.join(options.sourcesRoot, moduleId + '.ts');
        }
-        var ts_filecontents = fs.readFileSync(ts_filename).toString();
-        var info = ts.preProcessFile(ts_filecontents);
-        for (var i = info.importedFiles.length - 1; i >= 0; i--) {
-            var importedFileName = info.importedFiles[i].fileName;
+        const ts_filecontents = fs.readFileSync(ts_filename).toString();
+        const info = ts.preProcessFile(ts_filecontents);
+        for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+            const importedFileName = info.importedFiles[i].fileName;
            if (options.importIgnorePattern.test(importedFileName)) {
                // Ignore vs/css! imports
                continue;
            }
-            var importedModuleId = importedFileName;
+            let importedModuleId = importedFileName;
            if (/(^\.\/)|(^\.\.\/)/.test(importedModuleId)) {
                importedModuleId = path.join(path.dirname(moduleId), importedModuleId);
            }
            enqueue(importedModuleId);
        }
-        FILES[moduleId + '.ts'] = ts_filecontents;
+        FILES[`${moduleId}.ts`] = ts_filecontents;
    }
    return FILES;
 }
 /**
 * A TypeScript language service host
 */
-var TypeScriptLanguageServiceHost = /** @class */ (function () {
-    function TypeScriptLanguageServiceHost(libs, files, compilerOptions) {
+class TypeScriptLanguageServiceHost {
+    constructor(libs, files, compilerOptions) {
        this._libs = libs;
        this._files = files;
        this._compilerOptions = compilerOptions;
    }
    // --- language service host ---------------
-    TypeScriptLanguageServiceHost.prototype.getCompilationSettings = function () {
+    getCompilationSettings() {
        return this._compilerOptions;
-    };
-    TypeScriptLanguageServiceHost.prototype.getScriptFileNames = function () {
+    }
+    getScriptFileNames() {
        return ([]
            .concat(Object.keys(this._libs))
            .concat(Object.keys(this._files)));
-    };
-    TypeScriptLanguageServiceHost.prototype.getScriptVersion = function (fileName) {
+    }
+    getScriptVersion(_fileName) {
        return '1';
-    };
-    TypeScriptLanguageServiceHost.prototype.getProjectVersion = function () {
+    }
+    getProjectVersion() {
        return '1';
-    };
-    TypeScriptLanguageServiceHost.prototype.getScriptSnapshot = function (fileName) {
+    }
+    getScriptSnapshot(fileName) {
        if (this._files.hasOwnProperty(fileName)) {
            return ts.ScriptSnapshot.fromString(this._files[fileName]);
        }
@@ -119,21 +156,20 @@ var TypeScriptLanguageServiceHost = /** @class */ (function () {
        else {
            return ts.ScriptSnapshot.fromString('');
        }
-    };
-    TypeScriptLanguageServiceHost.prototype.getScriptKind = function (fileName) {
+    }
+    getScriptKind(_fileName) {
        return ts.ScriptKind.TS;
-    };
-    TypeScriptLanguageServiceHost.prototype.getCurrentDirectory = function () {
+    }
+    getCurrentDirectory() {
        return '';
-    };
-    TypeScriptLanguageServiceHost.prototype.getDefaultLibFileName = function (options) {
+    }
+    getDefaultLibFileName(_options) {
        return 'defaultLib:lib.d.ts';
-    };
-    TypeScriptLanguageServiceHost.prototype.isDefaultLibFileName = function (fileName) {
+    }
+    isDefaultLibFileName(fileName) {
        return fileName === this.getDefaultLibFileName(this._compilerOptions);
-    };
-    return TypeScriptLanguageServiceHost;
-}());
+    }
+}
 //#endregion
 //#region Tree Shaking
 var NodeColor;
@@ -150,7 +186,7 @@ function setColor(node, color) {
 }
 function nodeOrParentIsBlack(node) {
    while (node) {
-        var color = getColor(node);
+        const color = getColor(node);
        if (color === 2 /* Black */) {
            return true;
        }
@@ -162,8 +198,7 @@ function nodeOrChildIsBlack(node) {
    if (getColor(node) === 2 /* Black */) {
        return true;
    }
-    for (var _i = 0, _a = node.getChildren(); _i < _a.length; _i++) {
-        var child = _a[_i];
+    for (const child of node.getChildren()) {
        if (nodeOrChildIsBlack(child)) {
            return true;
        }
@@ -171,19 +206,22 @@ function nodeOrChildIsBlack(node) {
    return false;
 }
 function markNodes(languageService, options) {
-    var program = languageService.getProgram();
+    const program = languageService.getProgram();
+    if (!program) {
+        throw new Error('Could not get program from language service');
+    }
    if (options.shakeLevel === 0 /* Files */) {
        // Mark all source files Black
-        program.getSourceFiles().forEach(function (sourceFile) {
+        program.getSourceFiles().forEach((sourceFile) => {
            setColor(sourceFile, 2 /* Black */);
        });
        return;
    }
-    var black_queue = [];
-    var gray_queue = [];
-    var sourceFilesLoaded = {};
+    const black_queue = [];
+    const gray_queue = [];
+    const sourceFilesLoaded = {};
    function enqueueTopLevelModuleStatements(sourceFile) {
-        sourceFile.forEachChild(function (node) {
+        sourceFile.forEachChild((node) => {
            if (ts.isImportDeclaration(node)) {
                if (!node.importClause && ts.isStringLiteral(node.moduleSpecifier)) {
                    setColor(node, 2 /* Black */);
@@ -192,7 +230,7 @@ function markNodes(languageService, options) {
                return;
            }
            if (ts.isExportDeclaration(node)) {
-                if (ts.isStringLiteral(node.moduleSpecifier)) {
+                if (node.moduleSpecifier && ts.isStringLiteral(node.moduleSpecifier)) {
                    setColor(node, 2 /* Black */);
                    enqueueImport(node, node.moduleSpecifier.text);
                }
@@ -220,7 +258,7 @@ function markNodes(languageService, options) {
        gray_queue.push(node);
    }
    function enqueue_black(node) {
-        var previousColor = getColor(node);
+        const previousColor = getColor(node);
        if (previousColor === 2 /* Black */) {
            return;
        }
@@ -238,12 +276,12 @@ function markNodes(languageService, options) {
        if (nodeOrParentIsBlack(node)) {
            return;
        }
-        var fileName = node.getSourceFile().fileName;
+        const fileName = node.getSourceFile().fileName;
        if (/^defaultLib:/.test(fileName) || /\.d\.ts$/.test(fileName)) {
            setColor(node, 2 /* Black */);
            return;
        }
-        var sourceFile = node.getSourceFile();
+        const sourceFile = node.getSourceFile();
        if (!sourceFilesLoaded[sourceFile.fileName]) {
            sourceFilesLoaded[sourceFile.fileName] = true;
            enqueueTopLevelModuleStatements(sourceFile);
@@ -254,12 +292,15 @@ function markNodes(languageService, options) {
        setColor(node, 2 /* Black */);
        black_queue.push(node);
        if (options.shakeLevel === 2 /* ClassMembers */ && (ts.isMethodDeclaration(node) || ts.isMethodSignature(node) || ts.isPropertySignature(node) || ts.isGetAccessor(node) || ts.isSetAccessor(node))) {
-            var references = languageService.getReferencesAtPosition(node.getSourceFile().fileName, node.name.pos + node.name.getLeadingTriviaWidth());
+            const references = languageService.getReferencesAtPosition(node.getSourceFile().fileName, node.name.pos + node.name.getLeadingTriviaWidth());
            if (references) {
-                for (var i = 0, len = references.length; i < len; i++) {
-                    var reference = references[i];
-                    var referenceSourceFile = program.getSourceFile(reference.fileName);
-                    var referenceNode = getTokenAtPosition(referenceSourceFile, reference.textSpan.start, false, false);
+                for (let i = 0, len = references.length; i < len; i++) {
+                    const reference = references[i];
+                    const referenceSourceFile = program.getSourceFile(reference.fileName);
+                    if (!referenceSourceFile) {
+                        continue;
+                    }
+                    const referenceNode = getTokenAtPosition(referenceSourceFile, reference.textSpan.start, false, false);
                    if (ts.isMethodDeclaration(referenceNode.parent)
                        || ts.isPropertyDeclaration(referenceNode.parent)
                        || ts.isGetAccessor(referenceNode.parent)
@@ -271,9 +312,9 @@ function markNodes(languageService, options) {
        }
    }
    function enqueueFile(filename) {
-        var sourceFile = program.getSourceFile(filename);
+        const sourceFile = program.getSourceFile(filename);
        if (!sourceFile) {
-            console.warn("Cannot find source file " + filename);
+            console.warn(`Cannot find source file ${filename}`);
            return;
        }
        enqueue_black(sourceFile);
@@ -283,8 +324,8 @@ function markNodes(languageService, options) {
            // this import should be ignored
            return;
        }
-        var nodeSourceFile = node.getSourceFile();
-        var fullPath;
+        const nodeSourceFile = node.getSourceFile();
+        let fullPath;
        if (/(^\.\/)|(^\.\.\/)/.test(importText)) {
            fullPath = path.join(path.dirname(nodeSourceFile.fileName), importText) + '.ts';
        }
@@ -293,25 +334,25 @@ function markNodes(languageService, options) {
        }
        enqueueFile(fullPath);
    }
-    options.entryPoints.forEach(function (moduleId) { return enqueueFile(moduleId + '.ts'); });
+    options.entryPoints.forEach(moduleId => enqueueFile(moduleId + '.ts'));
    // Add fake usage files
-    options.inlineEntryPoints.forEach(function (_, index) { return enqueueFile("inlineEntryPoint:" + index + ".ts"); });
-    var step = 0;
-    var checker = program.getTypeChecker();
-    var _loop_1 = function () {
+    options.inlineEntryPoints.forEach((_, index) => enqueueFile(`inlineEntryPoint.${index}.ts`));
+    let step = 0;
+    const checker = program.getTypeChecker();
+    while (black_queue.length > 0 || gray_queue.length > 0) {
        ++step;
-        var node = void 0;
+        let node;
        if (step % 100 === 0) {
-            console.log(step + "/" + (step + black_queue.length + gray_queue.length) + " (" + black_queue.length + ", " + gray_queue.length + ")");
+            console.log(`${step}/${step + black_queue.length + gray_queue.length} (${black_queue.length}, ${gray_queue.length})`);
        }
        if (black_queue.length === 0) {
-            for (var i = 0; i < gray_queue.length; i++) {
-                var node_1 = gray_queue[i];
-                var nodeParent = node_1.parent;
+            for (let i = 0; i < gray_queue.length; i++) {
+                const node = gray_queue[i];
+                const nodeParent = node.parent;
                if ((ts.isClassDeclaration(nodeParent) || ts.isInterfaceDeclaration(nodeParent)) && nodeOrChildIsBlack(nodeParent)) {
                    gray_queue.splice(i, 1);
-                    black_queue.push(node_1);
-                    setColor(node_1, 2 /* Black */);
+                    black_queue.push(node);
+                    setColor(node, 2 /* Black */);
                    i--;
                }
            }
@@ -320,17 +361,18 @@ function markNodes(languageService, options) {
            node = black_queue.shift();
        }
        else {
-            return "break";
+            // only gray nodes remaining...
+            break;
        }
-        var nodeSourceFile = node.getSourceFile();
-        var loop = function (node) {
-            var _a = getRealNodeSymbol(checker, node), symbol = _a[0], symbolImportNode = _a[1];
+        const nodeSourceFile = node.getSourceFile();
+        const loop = (node) => {
+            const [symbol, symbolImportNode] = getRealNodeSymbol(checker, node);
            if (symbolImportNode) {
                setColor(symbolImportNode, 2 /* Black */);
            }
            if (symbol && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) {
-                for (var i = 0, len = symbol.declarations.length; i < len; i++) {
-                    var declaration = symbol.declarations[i];
+                for (let i = 0, len = symbol.declarations.length; i < len; i++) {
+                    const declaration = symbol.declarations[i];
                    if (ts.isSourceFile(declaration)) {
                        // Do not enqueue full source files
                        // (they can be the declaration of a module import)
@@ -338,9 +380,9 @@ function markNodes(languageService, options) {
                    }
                    if (options.shakeLevel === 2 /* ClassMembers */ && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration))) {
                        enqueue_black(declaration.name);
-                        for (var j = 0; j < declaration.members.length; j++) {
-                            var member = declaration.members[j];
-                            var memberName = member.name ? member.name.getText() : null;
+                        for (let j = 0; j < declaration.members.length; j++) {
+                            const member = declaration.members[j];
+                            const memberName = member.name ? member.name.getText() : null;
                            if (ts.isConstructorDeclaration(member)
                                || ts.isConstructSignatureDeclaration(member)
                                || ts.isIndexSignatureDeclaration(member)
@@ -354,8 +396,7 @@ function markNodes(languageService, options) {
                        }
                        // queue the heritage clauses
                        if (declaration.heritageClauses) {
-                            for (var _i = 0, _b = declaration.heritageClauses; _i < _b.length; _i++) {
-                                var heritageClause = _b[_i];
+                            for (let heritageClause of declaration.heritageClauses) {
                                enqueue_black(heritageClause);
                            }
                        }
@@ -368,17 +409,12 @@ function markNodes(languageService, options) {
            node.forEachChild(loop);
        };
        node.forEachChild(loop);
-    };
-    while (black_queue.length > 0 || gray_queue.length > 0) {
-        var state_1 = _loop_1();
-        if (state_1 === "break")
-            break;
    }
 }
 function nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol) {
-    for (var i = 0, len = symbol.declarations.length; i < len; i++) {
-        var declaration = symbol.declarations[i];
-        var declarationSourceFile = declaration.getSourceFile();
+    for (let i = 0, len = symbol.declarations.length; i < len; i++) {
+        const declaration = symbol.declarations[i];
+        const declarationSourceFile = declaration.getSourceFile();
        if (nodeSourceFile === declarationSourceFile) {
            if (declaration.pos <= node.pos && node.end <= declaration.end) {
                return true;
@@ -388,25 +424,28 @@ function nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol) {
    return false;
 }
 function generateResult(languageService, shakeLevel) {
-    var program = languageService.getProgram();
-    var result = {};
-    var writeFile = function (filePath, contents) {
+    const program = languageService.getProgram();
+    if (!program) {
+        throw new Error('Could not get program from language service');
+    }
+    let result = {};
+    const writeFile = (filePath, contents) => {
        result[filePath] = contents;
    };
-    program.getSourceFiles().forEach(function (sourceFile) {
-        var fileName = sourceFile.fileName;
+    program.getSourceFiles().forEach((sourceFile) => {
+        const fileName = sourceFile.fileName;
        if (/^defaultLib:/.test(fileName)) {
            return;
        }
-        var destination = fileName;
+        const destination = fileName;
        if (/\.d\.ts$/.test(fileName)) {
            if (nodeOrChildIsBlack(sourceFile)) {
                writeFile(destination, sourceFile.text);
            }
            return;
        }
-        var text = sourceFile.text;
-        var result = '';
+        let text = sourceFile.text;
+        let result = '';
        function keep(node) {
            result += text.substring(node.pos, node.end);
        }
@@ -435,24 +474,24 @@ function generateResult(languageService, shakeLevel) {
                        }
                    }
                    else {
-                        var survivingImports = [];
-                        for (var i = 0; i < node.importClause.namedBindings.elements.length; i++) {
-                            var importNode = node.importClause.namedBindings.elements[i];
+                        let survivingImports = [];
+                        for (let i = 0; i < node.importClause.namedBindings.elements.length; i++) {
+                            const importNode = node.importClause.namedBindings.elements[i];
                            if (getColor(importNode) === 2 /* Black */) {
                                survivingImports.push(importNode.getFullText(sourceFile));
                            }
                        }
-                        var leadingTriviaWidth = node.getLeadingTriviaWidth();
-                        var leadingTrivia = sourceFile.text.substr(node.pos, leadingTriviaWidth);
+                        const leadingTriviaWidth = node.getLeadingTriviaWidth();
+                        const leadingTrivia = sourceFile.text.substr(node.pos, leadingTriviaWidth);
                        if (survivingImports.length > 0) {
-                            if (node.importClause && getColor(node.importClause) === 2 /* Black */) {
-                                return write(leadingTrivia + "import " + node.importClause.name.text + ", {" + survivingImports.join(',') + " } from" + node.moduleSpecifier.getFullText(sourceFile) + ";");
+                            if (node.importClause && node.importClause.name && getColor(node.importClause) === 2 /* Black */) {
+                                return write(`${leadingTrivia}import ${node.importClause.name.text}, {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
                            }
-                            return write(leadingTrivia + "import {" + survivingImports.join(',') + " } from" + node.moduleSpecifier.getFullText(sourceFile) + ";");
+                            return write(`${leadingTrivia}import {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
                        }
                        else {
-                            if (node.importClause && getColor(node.importClause) === 2 /* Black */) {
-                                return write(leadingTrivia + "import " + node.importClause.name.text + " from" + node.moduleSpecifier.getFullText(sourceFile) + ";");
+                            if (node.importClause && node.importClause.name && getColor(node.importClause) === 2 /* Black */) {
+                                return write(`${leadingTrivia}import ${node.importClause.name.text} from${node.moduleSpecifier.getFullText(sourceFile)};`);
                            }
                        }
                    }
@@ -464,10 +503,10 @@ function generateResult(languageService, shakeLevel) {
                }
            }
            if (shakeLevel === 2 /* ClassMembers */ && (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node)) && nodeOrChildIsBlack(node)) {
-                var toWrite = node.getFullText();
-                for (var i = node.members.length - 1; i >= 0; i--) {
-                    var member = node.members[i];
-                    if (getColor(member) === 2 /* Black */) {
+                let toWrite = node.getFullText();
+                for (let i = node.members.length - 1; i >= 0; i--) {
+                    const member = node.members[i];
+                    if (getColor(member) === 2 /* Black */ || !member.name) {
                        // keep method
                        continue;
                    }
@@ -475,8 +514,8 @@ function generateResult(languageService, shakeLevel) {
                        // TODO: keep all members ending with `Brand`...
                        continue;
                    }
-                    var pos = member.pos - node.pos;
-                    var end = member.end - node.pos;
+                    let pos = member.pos - node.pos;
+                    let end = member.end - node.pos;
                    toWrite = toWrite.substring(0, pos) + toWrite.substring(end);
                }
                return write(toWrite);
@@ -508,68 +547,9 @@ function generateResult(languageService, shakeLevel) {
 * Returns the node's symbol and the `import` node (if the symbol resolved from a different module)
 */
 function getRealNodeSymbol(checker, node) {
-    /**
-     * Returns the containing object literal property declaration given a possible name node, e.g. "a" in x = { "a": 1 }
-     */
-    /* @internal */
-    function getContainingObjectLiteralElement(node) {
-        switch (node.kind) {
-            case ts.SyntaxKind.StringLiteral:
-            case ts.SyntaxKind.NumericLiteral:
-                if (node.parent.kind === ts.SyntaxKind.ComputedPropertyName) {
-                    return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
-                }
-            // falls through
-            case ts.SyntaxKind.Identifier:
-                return ts.isObjectLiteralElement(node.parent) &&
-                    (node.parent.parent.kind === ts.SyntaxKind.ObjectLiteralExpression || node.parent.parent.kind === ts.SyntaxKind.JsxAttributes) &&
-                    node.parent.name === node ? node.parent : undefined;
-        }
-        return undefined;
-    }
-    function getPropertySymbolsFromType(type, propName) {
-        function getTextOfPropertyName(name) {
-            function isStringOrNumericLiteral(node) {
-                var kind = node.kind;
-                return kind === ts.SyntaxKind.StringLiteral
-                    || kind === ts.SyntaxKind.NumericLiteral;
-            }
-            switch (name.kind) {
-                case ts.SyntaxKind.Identifier:
-                    return name.text;
-                case ts.SyntaxKind.StringLiteral:
-                case ts.SyntaxKind.NumericLiteral:
-                    return name.text;
-                case ts.SyntaxKind.ComputedPropertyName:
-                    return isStringOrNumericLiteral(name.expression) ? name.expression.text : undefined;
-            }
-        }
-        var name = getTextOfPropertyName(propName);
-        if (name && type) {
-            var result = [];
-            var symbol_1 = type.getProperty(name);
-            if (type.flags & ts.TypeFlags.Union) {
-                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                    var t = _a[_i];
-                    var symbol_2 = t.getProperty(name);
-                    if (symbol_2) {
-                        result.push(symbol_2);
-                    }
-                }
-                return result;
-            }
-            if (symbol_1) {
-                result.push(symbol_1);
-                return result;
-            }
-        }
-        return undefined;
-    }
-    function getPropertySymbolsFromContextualType(typeChecker, node) {
-        var objectLiteral = node.parent;
-        var contextualType = typeChecker.getContextualType(objectLiteral);
-        return getPropertySymbolsFromType(contextualType, node.name);
-    }
+    const getPropertySymbolsFromContextualType = ts.getPropertySymbolsFromContextualType;
+    const getContainingObjectLiteralElement = ts.getContainingObjectLiteralElement;
+    const getNameFromPropertyName = ts.getNameFromPropertyName;
    // Go to the original declaration for cases:
    //
    //   (1) when the aliased symbol was declared in the location(parent).
@@ -597,10 +577,15 @@ function getRealNodeSymbol(checker, node) {
            return [null, null];
        }
    }
-    var symbol = checker.getSymbolAtLocation(node);
-    var importNode = null;
+    const { parent } = node;
+    let symbol = checker.getSymbolAtLocation(node);
+    let importNode = null;
+    // If this is an alias, and the request came at the declaration location
+    // get the aliased symbol instead. This allows for goto def on an import e.g.
+    //   import {A, B} from "mod";
+    // to jump to the implementation directly.
    if (symbol && symbol.flags & ts.SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) {
-        var aliased = checker.getAliasedSymbol(symbol);
+        const aliased = checker.getAliasedSymbol(symbol);
        if (aliased.declarations) {
            // We should mark the import as visited
            importNode = symbol.declarations[0];
@@ -627,13 +612,22 @@ function getRealNodeSymbol(checker, node) {
        //          pr/*destination*/op1: number
        //      }
        //      bar<Test>(({pr/*goto*/op1})=>{});
-        if (ts.isPropertyName(node) && ts.isBindingElement(node.parent) && ts.isObjectBindingPattern(node.parent.parent) &&
-            (node === (node.parent.propertyName || node.parent.name))) {
-            var type = checker.getTypeAtLocation(node.parent.parent);
-            if (type) {
-                var propSymbols = getPropertySymbolsFromType(type, node);
-                if (propSymbols) {
-                    symbol = propSymbols[0];
+        if (ts.isPropertyName(node) && ts.isBindingElement(parent) && ts.isObjectBindingPattern(parent.parent) &&
+            (node === (parent.propertyName || parent.name))) {
+            const name = getNameFromPropertyName(node);
+            const type = checker.getTypeAtLocation(parent.parent);
+            if (name && type) {
+                if (type.isUnion()) {
+                    const prop = type.types[0].getProperty(name);
+                    if (prop) {
+                        symbol = prop;
+                    }
+                }
+                else {
+                    const prop = type.getProperty(name);
+                    if (prop) {
+                        symbol = prop;
+                    }
                }
            }
        }
@@ -646,14 +640,17 @@ function getRealNodeSymbol(checker, node) {
        //      }
        //      function Foo(arg: Props) {}
        //      Foo( { pr/*1*/op1: 10, prop2: false })
-        var element = getContainingObjectLiteralElement(node);
-        if (element && checker.getContextualType(element.parent)) {
-            var propertySymbols = getPropertySymbolsFromContextualType(checker, element);
+        const element = getContainingObjectLiteralElement(node);
+        if (element) {
+            const contextualType = element && checker.getContextualType(element.parent);
+            if (contextualType) {
+                const propertySymbols = getPropertySymbolsFromContextualType(element, checker, contextualType, /*unionSymbolOk*/ false);
                if (propertySymbols) {
                    symbol = propertySymbols[0];
                }
            }
        }
+    }
    if (symbol && symbol.declarations) {
        return [symbol, importNode];
    }
@@ -661,17 +658,16 @@ function getRealNodeSymbol(checker, node) {
 }
 /** Get the token whose text contains the position */
 function getTokenAtPosition(sourceFile, position, allowPositionInLeadingTrivia, includeEndPosition) {
-    var current = sourceFile;
+    let current = sourceFile;
    outer: while (true) {
        // find the child that contains 'position'
-        for (var _i = 0, _a = current.getChildren(); _i < _a.length; _i++) {
-            var child = _a[_i];
-            var start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile, /*includeJsDoc*/ true);
+        for (const child of current.getChildren()) {
+            const start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile, /*includeJsDoc*/ true);
            if (start > position) {
                // If this child begins after position, then all subsequent children will as well.
                break;
            }
-            var end = child.getEnd();
+            const end = child.getEnd();
            if (position < end || (position === end && (child.kind === ts.SyntaxKind.EndOfFileToken || includeEndPosition))) {
                current = child;
                continue outer;
--- a/build/lib/treeshaking.ts
+++ b/build/lib/treeshaking.ts
@@ -36,10 +36,14 @@ export interface ITreeShakingOptions {
 	 * e.g. `lib.d.ts`, `lib.es2015.collection.d.ts`
 	 */
 	libs: string[];
+	/**
+	 * Other .d.ts files
+	 */
+	typings: string[];
 	/**
 	 * TypeScript compiler options.
 	 */
-	compilerOptions: ts.CompilerOptions;
+	compilerOptions?: any;
 	/**
 	 * The shake level to perform.
 	 */
@@ -56,8 +60,43 @@ export interface ITreeShakingResult {
 	[file: string]: string;
 }

+function printDiagnostics(diagnostics: ReadonlyArray<ts.Diagnostic>): void {
+	for (let i = 0; i < diagnostics.length; i++) {
+		const diag = diagnostics[i];
+		let result = '';
+		if (diag.file) {
+			result += `${diag.file.fileName}: `;
+		}
+		if (diag.file && diag.start) {
+			let location = diag.file.getLineAndCharacterOfPosition(diag.start);
+			result += `- ${location.line + 1},${location.character} - `
+		}
+		result += JSON.stringify(diag.messageText);
+		console.log(result);
+	}
+}
+
 export function shake(options: ITreeShakingOptions): ITreeShakingResult {
 	const languageService = createTypeScriptLanguageService(options);
+	const program = languageService.getProgram()!;
+
+	const globalDiagnostics = program.getGlobalDiagnostics();
+	if (globalDiagnostics.length > 0) {
+		printDiagnostics(globalDiagnostics);
+		throw new Error(`Compilation Errors encountered.`);
+	}
+
+	const syntacticDiagnostics = program.getSyntacticDiagnostics();
+	if (syntacticDiagnostics.length > 0) {
+		printDiagnostics(syntacticDiagnostics);
+		throw new Error(`Compilation Errors encountered.`);
+	}
+
+	const semanticDiagnostics = program.getSemanticDiagnostics();
+	if (semanticDiagnostics.length > 0) {
+		printDiagnostics(semanticDiagnostics);
+		throw new Error(`Compilation Errors encountered.`);
+	}

 	markNodes(languageService, options);

@@ -71,7 +110,13 @@ function createTypeScriptLanguageService(options: ITreeShakingOptions): ts.Langu

 	// Add fake usage files
 	options.inlineEntryPoints.forEach((inlineEntryPoint, index) => {
-		FILES[`inlineEntryPoint:${index}.ts`] = inlineEntryPoint;
+		FILES[`inlineEntryPoint.${index}.ts`] = inlineEntryPoint;
+	});
+
+	// Add additional typings
+	options.typings.forEach((typing) => {
+		const filePath = path.join(options.sourcesRoot, typing);
+		FILES[typing] = fs.readFileSync(filePath).toString();
 	});

 	// Resolve libs
@@ -81,7 +126,9 @@ function createTypeScriptLanguageService(options: ITreeShakingOptions): ts.Langu
 		RESOLVED_LIBS[`defaultLib:${filename}`] = fs.readFileSync(filepath).toString();
 	});

-	const host = new TypeScriptLanguageServiceHost(RESOLVED_LIBS, FILES, options.compilerOptions);
+	const compilerOptions = ts.convertCompilerOptionsFromJson(options.compilerOptions, options.sourcesRoot).options;
+
+	const host = new TypeScriptLanguageServiceHost(RESOLVED_LIBS, FILES, compilerOptions);
 	return ts.createLanguageService(host);
 }

@@ -105,11 +152,11 @@ function discoverAndReadFiles(options: ITreeShakingOptions): IFileMap {
 	options.entryPoints.forEach((entryPoint) => enqueue(entryPoint));

 	while (queue.length > 0) {
-		const moduleId = queue.shift();
+		const moduleId = queue.shift()!;
 		const dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
 		if (fs.existsSync(dts_filename)) {
 			const dts_filecontents = fs.readFileSync(dts_filename).toString();
-			FILES[moduleId + '.d.ts'] = dts_filecontents;
+			FILES[`${moduleId}.d.ts`] = dts_filecontents;
 			continue;
 		}

@@ -136,7 +183,7 @@ function discoverAndReadFiles(options: ITreeShakingOptions): IFileMap {
 			enqueue(importedModuleId);
 		}

-		FILES[moduleId + '.ts'] = ts_filecontents;
+		FILES[`${moduleId}.ts`] = ts_filecontents;
 	}

 	return FILES;
@@ -167,12 +214,12 @@ class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
 	}
 	getScriptFileNames(): string[] {
 		return (
-			[]
+			([] as string[])
 				.concat(Object.keys(this._libs))
 				.concat(Object.keys(this._files))
 		);
 	}
-	getScriptVersion(fileName: string): string {
+	getScriptVersion(_fileName: string): string {
 		return '1';
 	}
 	getProjectVersion(): string {
@@ -187,13 +234,13 @@ class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
 			return ts.ScriptSnapshot.fromString('');
 		}
 	}
-	getScriptKind(fileName: string): ts.ScriptKind {
+	getScriptKind(_fileName: string): ts.ScriptKind {
 		return ts.ScriptKind.TS;
 	}
 	getCurrentDirectory(): string {
 		return '';
 	}
-	getDefaultLibFileName(options: ts.CompilerOptions): string {
+	getDefaultLibFileName(_options: ts.CompilerOptions): string {
 		return 'defaultLib:lib.d.ts';
 	}
 	isDefaultLibFileName(fileName: string): boolean {
@@ -240,6 +287,9 @@ function nodeOrChildIsBlack(node: ts.Node): boolean {

 function markNodes(languageService: ts.LanguageService, options: ITreeShakingOptions) {
 	const program = languageService.getProgram();
+	if (!program) {
+		throw new Error('Could not get program from language service');
+	}

 	if (options.shakeLevel === ShakeLevel.Files) {
 		// Mark all source files Black
@@ -266,7 +316,7 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt
 			}

 			if (ts.isExportDeclaration(node)) {
-				if (ts.isStringLiteral(node.moduleSpecifier)) {
+				if (node.moduleSpecifier && ts.isStringLiteral(node.moduleSpecifier)) {
 					setColor(node, NodeColor.Black);
 					enqueueImport(node, node.moduleSpecifier.text);
 				}
@@ -349,7 +399,11 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt
 			if (references) {
 				for (let i = 0, len = references.length; i < len; i++) {
 					const reference = references[i];
-					const referenceSourceFile = program.getSourceFile(reference.fileName);
+					const referenceSourceFile = program!.getSourceFile(reference.fileName);
+					if (!referenceSourceFile) {
+						continue;
+					}
+
 					const referenceNode = getTokenAtPosition(referenceSourceFile, reference.textSpan.start, false, false);
 					if (
 						ts.isMethodDeclaration(referenceNode.parent)
@@ -365,7 +419,7 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt
 	}

 	function enqueueFile(filename: string): void {
-		const sourceFile = program.getSourceFile(filename);
+		const sourceFile = program!.getSourceFile(filename);
 		if (!sourceFile) {
 			console.warn(`Cannot find source file ${filename}`);
 			return;
@@ -391,7 +445,7 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt

 	options.entryPoints.forEach(moduleId => enqueueFile(moduleId + '.ts'));
 	// Add fake usage files
-	options.inlineEntryPoints.forEach((_, index) => enqueueFile(`inlineEntryPoint:${index}.ts`));
+	options.inlineEntryPoints.forEach((_, index) => enqueueFile(`inlineEntryPoint.${index}.ts`));

 	let step = 0;

@@ -418,7 +472,7 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt
 		}

 		if (black_queue.length > 0) {
-			node = black_queue.shift();
+			node = black_queue.shift()!;
 		} else {
 			// only gray nodes remaining...
 			break;
@@ -441,7 +495,7 @@ function markNodes(languageService: ts.LanguageService, options: ITreeShakingOpt
 					}

 					if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration))) {
-						enqueue_black(declaration.name);
+						enqueue_black(declaration.name!);

 						for (let j = 0; j < declaration.members.length; j++) {
 							const member = declaration.members[j];
@@ -493,6 +547,9 @@ function nodeIsInItsOwnDeclaration(nodeSourceFile: ts.SourceFile, node: ts.Node,

 function generateResult(languageService: ts.LanguageService, shakeLevel: ShakeLevel): ITreeShakingResult {
 	const program = languageService.getProgram();
+	if (!program) {
+		throw new Error('Could not get program from language service');
+	}

 	let result: ITreeShakingResult = {};
 	const writeFile = (filePath: string, contents: string): void => {
@@ -556,12 +613,12 @@ function generateResult(languageService: ts.LanguageService, shakeLevel: ShakeLe
 						const leadingTriviaWidth = node.getLeadingTriviaWidth();
 						const leadingTrivia = sourceFile.text.substr(node.pos, leadingTriviaWidth);
 						if (survivingImports.length > 0) {
-							if (node.importClause && getColor(node.importClause) === NodeColor.Black) {
+							if (node.importClause && node.importClause.name && getColor(node.importClause) === NodeColor.Black) {
 								return write(`${leadingTrivia}import ${node.importClause.name.text}, {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
 							}
 							return write(`${leadingTrivia}import {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
 						} else {
-							if (node.importClause && getColor(node.importClause) === NodeColor.Black) {
+							if (node.importClause && node.importClause.name && getColor(node.importClause) === NodeColor.Black) {
 								return write(`${leadingTrivia}import ${node.importClause.name.text} from${node.moduleSpecifier.getFullText(sourceFile)};`);
 							}
 						}
@@ -577,7 +634,7 @@ function generateResult(languageService: ts.LanguageService, shakeLevel: ShakeLe
 				let toWrite = node.getFullText();
 				for (let i = node.members.length - 1; i >= 0; i--) {
 					const member = node.members[i];
-					if (getColor(member) === NodeColor.Black) {
+					if (getColor(member) === NodeColor.Black || !member.name) {
 						// keep method
 						continue;
 					}
@@ -625,74 +682,13 @@ function generateResult(languageService: ts.LanguageService, shakeLevel: ShakeLe
 /**
 * Returns the node's symbol and the `import` node (if the symbol resolved from a different module)
 */
-function getRealNodeSymbol(checker: ts.TypeChecker, node: ts.Node): [ts.Symbol, ts.Declaration] {
-	/**
-	 * Returns the containing object literal property declaration given a possible name node, e.g. "a" in x = { "a": 1 }
-	 */
-	/* @internal */
-	function getContainingObjectLiteralElement(node: ts.Node): ts.ObjectLiteralElement | undefined {
-		switch (node.kind) {
-			case ts.SyntaxKind.StringLiteral:
-			case ts.SyntaxKind.NumericLiteral:
-				if (node.parent.kind === ts.SyntaxKind.ComputedPropertyName) {
-					return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
-				}
-			// falls through
-			case ts.SyntaxKind.Identifier:
-				return ts.isObjectLiteralElement(node.parent) &&
-					(node.parent.parent.kind === ts.SyntaxKind.ObjectLiteralExpression || node.parent.parent.kind === ts.SyntaxKind.JsxAttributes) &&
-					node.parent.name === node ? node.parent : undefined;
-		}
-		return undefined;
-	}
+function getRealNodeSymbol(checker: ts.TypeChecker, node: ts.Node): [ts.Symbol | null, ts.Declaration | null] {

-	function getPropertySymbolsFromType(type: ts.Type, propName: ts.PropertyName) {
-		function getTextOfPropertyName(name: ts.PropertyName): string {
-
-			function isStringOrNumericLiteral(node: ts.Node): node is ts.StringLiteral | ts.NumericLiteral {
-				const kind = node.kind;
-				return kind === ts.SyntaxKind.StringLiteral
-					|| kind === ts.SyntaxKind.NumericLiteral;
-			}
-
-			switch (name.kind) {
-				case ts.SyntaxKind.Identifier:
-					return name.text;
-				case ts.SyntaxKind.StringLiteral:
-				case ts.SyntaxKind.NumericLiteral:
-					return name.text;
-				case ts.SyntaxKind.ComputedPropertyName:
-					return isStringOrNumericLiteral(name.expression) ? name.expression.text : undefined!;
-			}
-		}
-
-		const name = getTextOfPropertyName(propName);
-		if (name && type) {
-			const result: ts.Symbol[] = [];
-			const symbol = type.getProperty(name);
-			if (type.flags & ts.TypeFlags.Union) {
-				for (const t of (<ts.UnionType>type).types) {
-					const symbol = t.getProperty(name);
-					if (symbol) {
-						result.push(symbol);
-					}
-				}
-				return result;
-			}
-
-			if (symbol) {
-				result.push(symbol);
-				return result;
-			}
-		}
-		return undefined;
-	}
-
-	function getPropertySymbolsFromContextualType(typeChecker: ts.TypeChecker, node: ts.ObjectLiteralElement): ts.Symbol[] {
-		const objectLiteral = <ts.ObjectLiteralExpression | ts.JsxAttributes>node.parent;
-		const contextualType = typeChecker.getContextualType(objectLiteral)!;
-		return getPropertySymbolsFromType(contextualType, node.name!)!;
-	}
+	// Use some TypeScript internals to avoid code duplication
+	type ObjectLiteralElementWithName = ts.ObjectLiteralElement & { name: ts.PropertyName; parent: ts.ObjectLiteralExpression | ts.JsxAttributes };
+	const getPropertySymbolsFromContextualType: (node: ObjectLiteralElementWithName, checker: ts.TypeChecker, contextualType: ts.Type, unionSymbolOk: boolean) => ReadonlyArray<ts.Symbol> = (<any>ts).getPropertySymbolsFromContextualType;
+	const getContainingObjectLiteralElement: (node: ts.Node) => ObjectLiteralElementWithName | undefined = (<any>ts).getContainingObjectLiteralElement;
+	const getNameFromPropertyName: (name: ts.PropertyName) => string | undefined = (<any>ts).getNameFromPropertyName;

 	// Go to the original declaration for cases:
 	//
@@ -723,8 +719,14 @@ function getRealNodeSymbol(checker: ts.TypeChecker, node: ts.Node): [ts.Symbol,
 		}
 	}

+	const { parent } = node;
+
 	let symbol = checker.getSymbolAtLocation(node);
-	let importNode: ts.Declaration = null;
+	let importNode: ts.Declaration | null = null;
+	// If this is an alias, and the request came at the declaration location
+	// get the aliased symbol instead. This allows for goto def on an import e.g.
+	//   import {A, B} from "mod";
+	// to jump to the implementation directly.
 	if (symbol && symbol.flags & ts.SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) {
 		const aliased = checker.getAliasedSymbol(symbol);
 		if (aliased.declarations) {
@@ -755,13 +757,21 @@ function getRealNodeSymbol(checker: ts.TypeChecker, node: ts.Node): [ts.Symbol,
 		//          pr/*destination*/op1: number
 		//      }
 		//      bar<Test>(({pr/*goto*/op1})=>{});
-		if (ts.isPropertyName(node) && ts.isBindingElement(node.parent) && ts.isObjectBindingPattern(node.parent.parent) &&
-			(node === (node.parent.propertyName || node.parent.name))) {
-			const type = checker.getTypeAtLocation(node.parent.parent);
-			if (type) {
-				const propSymbols = getPropertySymbolsFromType(type, node);
-				if (propSymbols) {
-					symbol = propSymbols[0];
+		if (ts.isPropertyName(node) && ts.isBindingElement(parent) && ts.isObjectBindingPattern(parent.parent) &&
+			(node === (parent.propertyName || parent.name))) {
+			const name = getNameFromPropertyName(node);
+			const type = checker.getTypeAtLocation(parent.parent);
+			if (name && type) {
+				if (type.isUnion()) {
+					const prop = type.types[0].getProperty(name);
+					if (prop) {
+						symbol = prop;
+					}
+				} else {
+					const prop = type.getProperty(name);
+					if (prop) {
+						symbol = prop;
+					}
 				}
 			}
 		}
@@ -776,13 +786,16 @@ function getRealNodeSymbol(checker: ts.TypeChecker, node: ts.Node): [ts.Symbol,
 		//      function Foo(arg: Props) {}
 		//      Foo( { pr/*1*/op1: 10, prop2: false })
 		const element = getContainingObjectLiteralElement(node);
-		if (element && checker.getContextualType(element.parent as ts.Expression)) {
-			const propertySymbols = getPropertySymbolsFromContextualType(checker, element);
+		if (element) {
+			const contextualType = element && checker.getContextualType(element.parent);
+			if (contextualType) {
+				const propertySymbols = getPropertySymbolsFromContextualType(element, checker, contextualType, /*unionSymbolOk*/ false);
 				if (propertySymbols) {
 					symbol = propertySymbols[0];
 				}
 			}
 		}
+	}

 	if (symbol && symbol.declarations) {
 		return [symbol, importNode];
--- a/build/lib/tslint/duplicateImportsRule.js
+++ b/build/lib/tslint/duplicateImportsRule.js
@@ -3,48 +3,30 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var path_1 = require("path");
-var Lint = require("tslint");
-var Rule = /** @class */ (function (_super) {
-    __extends(Rule, _super);
-    function Rule() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Rule.prototype.apply = function (sourceFile) {
+const path_1 = require("path");
+const Lint = require("tslint");
+class Rule extends Lint.Rules.AbstractRule {
+    apply(sourceFile) {
        return this.applyWithWalker(new ImportPatterns(sourceFile, this.getOptions()));
-    };
-    return Rule;
-}(Lint.Rules.AbstractRule));
-exports.Rule = Rule;
-var ImportPatterns = /** @class */ (function (_super) {
-    __extends(ImportPatterns, _super);
-    function ImportPatterns(file, opts) {
-        var _this = _super.call(this, file, opts) || this;
-        _this.imports = Object.create(null);
-        return _this;
    }
-    ImportPatterns.prototype.visitImportDeclaration = function (node) {
-        var path = node.moduleSpecifier.getText();
+}
+exports.Rule = Rule;
+class ImportPatterns extends Lint.RuleWalker {
+    constructor(file, opts) {
+        super(file, opts);
+        this.imports = Object.create(null);
+    }
+    visitImportDeclaration(node) {
+        let path = node.moduleSpecifier.getText();
        // remove quotes
        path = path.slice(1, -1);
        if (path[0] === '.') {
            path = path_1.join(path_1.dirname(node.getSourceFile().fileName), path);
        }
        if (this.imports[path]) {
-            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), "Duplicate imports for '" + path + "'."));
+            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Duplicate imports for '${path}'.`));
        }
        this.imports[path] = true;
-    };
-    return ImportPatterns;
-}(Lint.RuleWalker));
+    }
+}
--- a/build/lib/tslint/importPatternsRule.js
+++ b/build/lib/tslint/importPatternsRule.js
@@ -3,79 +3,60 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ts = require("typescript");
-var Lint = require("tslint");
-var minimatch = require("minimatch");
-var path_1 = require("path");
-var Rule = /** @class */ (function (_super) {
-    __extends(Rule, _super);
-    function Rule() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Rule.prototype.apply = function (sourceFile) {
-        var configs = this.getOptions().ruleArguments;
-        for (var _i = 0, configs_1 = configs; _i < configs_1.length; _i++) {
-            var config = configs_1[_i];
+const ts = require("typescript");
+const Lint = require("tslint");
+const minimatch = require("minimatch");
+const path_1 = require("path");
+class Rule extends Lint.Rules.AbstractRule {
+    apply(sourceFile) {
+        const configs = this.getOptions().ruleArguments;
+        for (const config of configs) {
            if (minimatch(sourceFile.fileName, config.target)) {
                return this.applyWithWalker(new ImportPatterns(sourceFile, this.getOptions(), config));
            }
        }
        return [];
-    };
-    return Rule;
-}(Lint.Rules.AbstractRule));
-exports.Rule = Rule;
-var ImportPatterns = /** @class */ (function (_super) {
-    __extends(ImportPatterns, _super);
-    function ImportPatterns(file, opts, _config) {
-        var _this = _super.call(this, file, opts) || this;
-        _this._config = _config;
-        return _this;
    }
-    ImportPatterns.prototype.visitImportEqualsDeclaration = function (node) {
+}
+exports.Rule = Rule;
+class ImportPatterns extends Lint.RuleWalker {
+    constructor(file, opts, _config) {
+        super(file, opts);
+        this._config = _config;
+    }
+    visitImportEqualsDeclaration(node) {
        if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
            this._validateImport(node.moduleReference.expression.getText(), node);
        }
-    };
-    ImportPatterns.prototype.visitImportDeclaration = function (node) {
+    }
+    visitImportDeclaration(node) {
        this._validateImport(node.moduleSpecifier.getText(), node);
-    };
-    ImportPatterns.prototype.visitCallExpression = function (node) {
-        _super.prototype.visitCallExpression.call(this, node);
+    }
+    visitCallExpression(node) {
+        super.visitCallExpression(node);
        // import('foo') statements inside the code
        if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
-            var path = node.arguments[0];
+            const [path] = node.arguments;
            this._validateImport(path.getText(), node);
        }
-    };
-    ImportPatterns.prototype._validateImport = function (path, node) {
+    }
+    _validateImport(path, node) {
        // remove quotes
        path = path.slice(1, -1);
        // resolve relative paths
        if (path[0] === '.') {
            path = path_1.join(this.getSourceFile().fileName, path);
        }
-        var restrictions;
+        let restrictions;
        if (typeof this._config.restrictions === 'string') {
            restrictions = [this._config.restrictions];
        }
        else {
            restrictions = this._config.restrictions;
        }
-        var matched = false;
-        for (var _i = 0, restrictions_1 = restrictions; _i < restrictions_1.length; _i++) {
-            var pattern = restrictions_1[_i];
+        let matched = false;
+        for (const pattern of restrictions) {
            if (minimatch(path, pattern)) {
                matched = true;
                break;
@@ -83,8 +64,7 @@ var ImportPatterns = /** @class */ (function (_super) {
        }
        if (!matched) {
            // None of the restrictions matched
-            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), "Imports violates '" + restrictions.join(' or ') + "' restrictions. See https://github.com/Microsoft/vscode/wiki/Code-Organization"));
+            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Imports violates '${restrictions.join(' or ')}' restrictions. See https://github.com/Microsoft/vscode/wiki/Code-Organization`));
+        }
+    }
 }
-    };
-    return ImportPatterns;
-}(Lint.RuleWalker));
--- a/build/lib/tslint/layeringRule.js
+++ b/build/lib/tslint/layeringRule.js
@@ -3,36 +3,22 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ts = require("typescript");
-var Lint = require("tslint");
-var path_1 = require("path");
-var Rule = /** @class */ (function (_super) {
-    __extends(Rule, _super);
-    function Rule() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Rule.prototype.apply = function (sourceFile) {
-        var parts = path_1.dirname(sourceFile.fileName).split(/\\|\//);
-        var ruleArgs = this.getOptions().ruleArguments[0];
-        var config;
-        for (var i = parts.length - 1; i >= 0; i--) {
+const ts = require("typescript");
+const Lint = require("tslint");
+const path_1 = require("path");
+class Rule extends Lint.Rules.AbstractRule {
+    apply(sourceFile) {
+        const parts = path_1.dirname(sourceFile.fileName).split(/\\|\//);
+        const ruleArgs = this.getOptions().ruleArguments[0];
+        let config;
+        for (let i = parts.length - 1; i >= 0; i--) {
            if (ruleArgs[parts[i]]) {
                config = {
                    allowed: new Set(ruleArgs[parts[i]]).add(parts[i]),
                    disallowed: new Set()
                };
-                Object.keys(ruleArgs).forEach(function (key) {
+                Object.keys(ruleArgs).forEach(key => {
                    if (!config.allowed.has(key)) {
                        config.disallowed.add(key);
                    }
@@ -44,58 +30,54 @@ var Rule = /** @class */ (function (_super) {
            return [];
        }
        return this.applyWithWalker(new LayeringRule(sourceFile, config, this.getOptions()));
-    };
-    return Rule;
-}(Lint.Rules.AbstractRule));
-exports.Rule = Rule;
-var LayeringRule = /** @class */ (function (_super) {
-    __extends(LayeringRule, _super);
-    function LayeringRule(file, config, opts) {
-        var _this = _super.call(this, file, opts) || this;
-        _this._config = config;
-        return _this;
    }
-    LayeringRule.prototype.visitImportEqualsDeclaration = function (node) {
+}
+exports.Rule = Rule;
+class LayeringRule extends Lint.RuleWalker {
+    constructor(file, config, opts) {
+        super(file, opts);
+        this._config = config;
+    }
+    visitImportEqualsDeclaration(node) {
        if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
            this._validateImport(node.moduleReference.expression.getText(), node);
        }
-    };
-    LayeringRule.prototype.visitImportDeclaration = function (node) {
+    }
+    visitImportDeclaration(node) {
        this._validateImport(node.moduleSpecifier.getText(), node);
-    };
-    LayeringRule.prototype.visitCallExpression = function (node) {
-        _super.prototype.visitCallExpression.call(this, node);
+    }
+    visitCallExpression(node) {
+        super.visitCallExpression(node);
        // import('foo') statements inside the code
        if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
-            var path = node.arguments[0];
+            const [path] = node.arguments;
            this._validateImport(path.getText(), node);
        }
-    };
-    LayeringRule.prototype._validateImport = function (path, node) {
+    }
+    _validateImport(path, node) {
        // remove quotes
        path = path.slice(1, -1);
        if (path[0] === '.') {
            path = path_1.join(path_1.dirname(node.getSourceFile().fileName), path);
        }
-        var parts = path_1.dirname(path).split(/\\|\//);
-        for (var i = parts.length - 1; i >= 0; i--) {
-            var part = parts[i];
+        const parts = path_1.dirname(path).split(/\\|\//);
+        for (let i = parts.length - 1; i >= 0; i--) {
+            const part = parts[i];
            if (this._config.allowed.has(part)) {
                // GOOD - same layer
                return;
            }
            if (this._config.disallowed.has(part)) {
                // BAD - wrong layer
-                var message = "Bad layering. You are not allowed to access '" + part + "' from here, allowed layers are: [" + LayeringRule._print(this._config.allowed) + "]";
+                const message = `Bad layering. You are not allowed to access '${part}' from here, allowed layers are: [${LayeringRule._print(this._config.allowed)}]`;
                this.addFailure(this.createFailure(node.getStart(), node.getWidth(), message));
                return;
            }
        }
-    };
-    LayeringRule._print = function (set) {
-        var r = [];
-        set.forEach(function (e) { return r.push(e); });
+    }
+    static _print(set) {
+        const r = [];
+        set.forEach(e => r.push(e));
        return r.join(', ');
-    };
-    return LayeringRule;
-}(Lint.RuleWalker));
+    }
+}
--- a/build/lib/tslint/layeringRule.ts
+++ b/build/lib/tslint/layeringRule.ts
@@ -16,9 +16,9 @@ export class Rule extends Lint.Rules.AbstractRule {
 	public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {

 		const parts = dirname(sourceFile.fileName).split(/\\|\//);
-		let ruleArgs = this.getOptions().ruleArguments[0];
+		const ruleArgs = this.getOptions().ruleArguments[0];

-		let config: Config;
+		let config: Config | undefined;
 		for (let i = parts.length - 1; i >= 0; i--) {
 			if (ruleArgs[parts[i]]) {
 				config = {
@@ -26,8 +26,8 @@ export class Rule extends Lint.Rules.AbstractRule {
 					disallowed: new Set<string>()
 				};
 				Object.keys(ruleArgs).forEach(key => {
-					if (!config.allowed.has(key)) {
-						config.disallowed.add(key);
+					if (!config!.allowed.has(key)) {
+						config!.disallowed.add(key);
 					}
 				});
 				break;
@@ -98,7 +98,7 @@ class LayeringRule extends Lint.RuleWalker {
 	}

 	static _print(set: Set<string>): string {
-		let r: string[] = [];
+		const r: string[] = [];
 		set.forEach(e => r.push(e));
 		return r.join(', ');
 	}
--- a/build/lib/tslint/noNewBufferRule.js
+++ b/build/lib/tslint/noNewBufferRule.js
@@ -0,0 +1,22 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const ts = require("typescript");
+const Lint = require("tslint");
+class Rule extends Lint.Rules.AbstractRule {
+    apply(sourceFile) {
+        return this.applyWithWalker(new NewBufferRuleWalker(sourceFile, this.getOptions()));
+    }
+}
+exports.Rule = Rule;
+class NewBufferRuleWalker extends Lint.RuleWalker {
+    visitNewExpression(node) {
+        if (node.expression.kind === ts.SyntaxKind.Identifier && node.expression && node.expression.text === 'Buffer') {
+            this.addFailureAtNode(node, '`new Buffer` is deprecated. Consider Buffer.From or Buffer.alloc instead.');
+        }
+        super.visitNewExpression(node);
+    }
+}
--- a/build/lib/tslint/noNewBufferRule.ts
+++ b/build/lib/tslint/noNewBufferRule.ts
@@ -0,0 +1,23 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as ts from 'typescript';
+import * as Lint from 'tslint';
+
+export class Rule extends Lint.Rules.AbstractRule {
+	apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+		return this.applyWithWalker(new NewBufferRuleWalker(sourceFile, this.getOptions()));
+	}
+}
+
+class NewBufferRuleWalker extends Lint.RuleWalker {
+	visitNewExpression(node: ts.NewExpression) {
+		if (node.expression.kind === ts.SyntaxKind.Identifier && node.expression && (node.expression as ts.Identifier).text === 'Buffer') {
+			this.addFailureAtNode(node, '`new Buffer` is deprecated. Consider Buffer.From or Buffer.alloc instead.');
+		}
+
+		super.visitNewExpression(node);
+	}
+}
--- a/build/lib/tslint/noStandaloneEditorRule.js
+++ b/build/lib/tslint/noStandaloneEditorRule.js
@@ -3,57 +3,42 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ts = require("typescript");
-var Lint = require("tslint");
-var path_1 = require("path");
-var Rule = /** @class */ (function (_super) {
-    __extends(Rule, _super);
-    function Rule() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Rule.prototype.apply = function (sourceFile) {
+const ts = require("typescript");
+const Lint = require("tslint");
+const path_1 = require("path");
+class Rule extends Lint.Rules.AbstractRule {
+    apply(sourceFile) {
        if (/vs(\/|\\)editor/.test(sourceFile.fileName)) {
            // the vs/editor folder is allowed to use the standalone editor
            return [];
        }
        return this.applyWithWalker(new NoStandaloneEditorRuleWalker(sourceFile, this.getOptions()));
-    };
-    return Rule;
-}(Lint.Rules.AbstractRule));
-exports.Rule = Rule;
-var NoStandaloneEditorRuleWalker = /** @class */ (function (_super) {
-    __extends(NoStandaloneEditorRuleWalker, _super);
-    function NoStandaloneEditorRuleWalker(file, opts) {
-        return _super.call(this, file, opts) || this;
    }
-    NoStandaloneEditorRuleWalker.prototype.visitImportEqualsDeclaration = function (node) {
+}
+exports.Rule = Rule;
+class NoStandaloneEditorRuleWalker extends Lint.RuleWalker {
+    constructor(file, opts) {
+        super(file, opts);
+    }
+    visitImportEqualsDeclaration(node) {
        if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
            this._validateImport(node.moduleReference.expression.getText(), node);
        }
-    };
-    NoStandaloneEditorRuleWalker.prototype.visitImportDeclaration = function (node) {
+    }
+    visitImportDeclaration(node) {
        this._validateImport(node.moduleSpecifier.getText(), node);
-    };
-    NoStandaloneEditorRuleWalker.prototype.visitCallExpression = function (node) {
-        _super.prototype.visitCallExpression.call(this, node);
+    }
+    visitCallExpression(node) {
+        super.visitCallExpression(node);
        // import('foo') statements inside the code
        if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
-            var path = node.arguments[0];
+            const [path] = node.arguments;
            this._validateImport(path.getText(), node);
        }
-    };
-    NoStandaloneEditorRuleWalker.prototype._validateImport = function (path, node) {
+    }
+    // {{SQL CARBON EDIT}} - Rename node argument to _node to prevent errors since it is not used
+    _validateImport(path, _node) {
        // remove quotes
        path = path.slice(1, -1);
        // resolve relative paths
@@ -68,6 +53,5 @@ var NoStandaloneEditorRuleWalker = /** @class */ (function (_super) {
            // {{SQL CARBON EDIT}}
            //this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Not allowed to import standalone editor modules. See https://github.com/Microsoft/vscode/wiki/Code-Organization`));
        }
-    };
-    return NoStandaloneEditorRuleWalker;
-}(Lint.RuleWalker));
+    }
+}
--- a/build/lib/tslint/noStandaloneEditorRule.ts
+++ b/build/lib/tslint/noStandaloneEditorRule.ts
@@ -43,7 +43,8 @@ class NoStandaloneEditorRuleWalker extends Lint.RuleWalker {
 		}
 	}

-	private _validateImport(path: string, node: ts.Node): void {
+	// {{SQL CARBON EDIT}} - Rename node argument to _node to prevent errors since it is not used
+	private _validateImport(path: string, _node: ts.Node): void {
 		// remove quotes
 		path = path.slice(1, -1);

--- a/build/lib/tslint/noUnexternalizedStringsRule.js
+++ b/build/lib/tslint/noUnexternalizedStringsRule.js
@@ -3,32 +3,17 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var ts = require("typescript");
-var Lint = require("tslint");
+const ts = require("typescript");
+const Lint = require("tslint");
 /**
 * Implementation of the no-unexternalized-strings rule.
 */
-var Rule = /** @class */ (function (_super) {
-    __extends(Rule, _super);
-    function Rule() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Rule.prototype.apply = function (sourceFile) {
+class Rule extends Lint.Rules.AbstractRule {
+    apply(sourceFile) {
        return this.applyWithWalker(new NoUnexternalizedStringsRuleWalker(sourceFile, this.getOptions()));
-    };
-    return Rule;
-}(Lint.Rules.AbstractRule));
+    }
+}
 exports.Rule = Rule;
 function isStringLiteral(node) {
    return node && node.kind === ts.SyntaxKind.StringLiteral;
@@ -39,73 +24,76 @@ function isObjectLiteral(node) {
 function isPropertyAssignment(node) {
    return node && node.kind === ts.SyntaxKind.PropertyAssignment;
 }
-var NoUnexternalizedStringsRuleWalker = /** @class */ (function (_super) {
-    __extends(NoUnexternalizedStringsRuleWalker, _super);
-    function NoUnexternalizedStringsRuleWalker(file, opts) {
-        var _this = _super.call(this, file, opts) || this;
-        _this.signatures = Object.create(null);
-        _this.ignores = Object.create(null);
-        _this.messageIndex = undefined;
-        _this.keyIndex = undefined;
-        _this.usedKeys = Object.create(null);
-        var options = _this.getOptions();
-        var first = options && options.length > 0 ? options[0] : null;
+class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
+    constructor(file, opts) {
+        super(file, opts);
+        this.signatures = Object.create(null);
+        this.ignores = Object.create(null);
+        this.messageIndex = undefined;
+        this.keyIndex = undefined;
+        this.usedKeys = Object.create(null);
+        const options = this.getOptions();
+        const first = options && options.length > 0 ? options[0] : null;
        if (first) {
            if (Array.isArray(first.signatures)) {
-                first.signatures.forEach(function (signature) { return _this.signatures[signature] = true; });
+                first.signatures.forEach((signature) => this.signatures[signature] = true);
            }
            if (Array.isArray(first.ignores)) {
-                first.ignores.forEach(function (ignore) { return _this.ignores[ignore] = true; });
+                first.ignores.forEach((ignore) => this.ignores[ignore] = true);
            }
            if (typeof first.messageIndex !== 'undefined') {
-                _this.messageIndex = first.messageIndex;
+                this.messageIndex = first.messageIndex;
            }
            if (typeof first.keyIndex !== 'undefined') {
-                _this.keyIndex = first.keyIndex;
+                this.keyIndex = first.keyIndex;
            }
        }
-        return _this;
    }
-    NoUnexternalizedStringsRuleWalker.prototype.visitSourceFile = function (node) {
-        var _this = this;
-        _super.prototype.visitSourceFile.call(this, node);
-        Object.keys(this.usedKeys).forEach(function (key) {
-            var occurrences = _this.usedKeys[key];
+    visitSourceFile(node) {
+        super.visitSourceFile(node);
+        Object.keys(this.usedKeys).forEach(key => {
+            // Keys are quoted.
+            let identifier = key.substr(1, key.length - 2);
+            if (!NoUnexternalizedStringsRuleWalker.IDENTIFIER.test(identifier)) {
+                let occurrence = this.usedKeys[key][0];
+                this.addFailure(this.createFailure(occurrence.key.getStart(), occurrence.key.getWidth(), `The key ${occurrence.key.getText()} doesn't conform to a valid localize identifier`));
+            }
+            const occurrences = this.usedKeys[key];
            if (occurrences.length > 1) {
-                occurrences.forEach(function (occurrence) {
-                    _this.addFailure((_this.createFailure(occurrence.key.getStart(), occurrence.key.getWidth(), "Duplicate key " + occurrence.key.getText() + " with different message value.")));
+                occurrences.forEach(occurrence => {
+                    this.addFailure((this.createFailure(occurrence.key.getStart(), occurrence.key.getWidth(), `Duplicate key ${occurrence.key.getText()} with different message value.`)));
                });
            }
        });
-    };
-    NoUnexternalizedStringsRuleWalker.prototype.visitStringLiteral = function (node) {
+    }
+    visitStringLiteral(node) {
        this.checkStringLiteral(node);
-        _super.prototype.visitStringLiteral.call(this, node);
-    };
-    NoUnexternalizedStringsRuleWalker.prototype.checkStringLiteral = function (node) {
-        var text = node.getText();
-        var doubleQuoted = text.length >= 2 && text[0] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE && text[text.length - 1] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE;
-        var info = this.findDescribingParent(node);
+        super.visitStringLiteral(node);
+    }
+    checkStringLiteral(node) {
+        const text = node.getText();
+        const doubleQuoted = text.length >= 2 && text[0] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE && text[text.length - 1] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE;
+        const info = this.findDescribingParent(node);
        // Ignore strings in import and export nodes.
        if (info && info.isImport && doubleQuoted) {
-            var fix = [
+            const fix = [
                Lint.Replacement.replaceFromTo(node.getStart(), 1, '\''),
                Lint.Replacement.replaceFromTo(node.getStart() + text.length - 1, 1, '\''),
            ];
            this.addFailureAtNode(node, NoUnexternalizedStringsRuleWalker.ImportFailureMessage, fix);
            return;
        }
-        var callInfo = info ? info.callInfo : null;
-        var functionName = callInfo ? callInfo.callExpression.expression.getText() : null;
+        const callInfo = info ? info.callInfo : null;
+        const functionName = callInfo ? callInfo.callExpression.expression.getText() : null;
        if (functionName && this.ignores[functionName]) {
            return;
        }
        if (doubleQuoted && (!callInfo || callInfo.argIndex === -1 || !this.signatures[functionName])) {
-            var s = node.getText();
-            var fix = [
-                Lint.Replacement.replaceFromTo(node.getStart(), node.getWidth(), "nls.localize('KEY-" + s.substring(1, s.length - 1) + "', " + s + ")"),
+            const s = node.getText();
+            const fix = [
+                Lint.Replacement.replaceFromTo(node.getStart(), node.getWidth(), `nls.localize('KEY-${s.substring(1, s.length - 1)}', ${s})`),
            ];
-            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), "Unexternalized string found: " + node.getText(), fix));
+            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Unexternalized string found: ${node.getText()}`, fix));
            return;
        }
        // We have a single quoted string outside a localize function name.
@@ -113,22 +101,22 @@ var NoUnexternalizedStringsRuleWalker = /** @class */ (function (_super) {
            return;
        }
        // We have a string that is a direct argument into the localize call.
-        var keyArg = callInfo.argIndex === this.keyIndex
+        const keyArg = callInfo && callInfo.argIndex === this.keyIndex
            ? callInfo.callExpression.arguments[this.keyIndex]
            : null;
        if (keyArg) {
            if (isStringLiteral(keyArg)) {
-                this.recordKey(keyArg, this.messageIndex ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
+                this.recordKey(keyArg, this.messageIndex && callInfo ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
            }
            else if (isObjectLiteral(keyArg)) {
-                for (var i = 0; i < keyArg.properties.length; i++) {
-                    var property = keyArg.properties[i];
+                for (let i = 0; i < keyArg.properties.length; i++) {
+                    const property = keyArg.properties[i];
                    if (isPropertyAssignment(property)) {
-                        var name_1 = property.name.getText();
-                        if (name_1 === 'key') {
-                            var initializer = property.initializer;
+                        const name = property.name.getText();
+                        if (name === 'key') {
+                            const initializer = property.initializer;
                            if (isStringLiteral(initializer)) {
-                                this.recordKey(initializer, this.messageIndex ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
+                                this.recordKey(initializer, this.messageIndex && callInfo ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
                            }
                            break;
                        }
@@ -136,42 +124,42 @@ var NoUnexternalizedStringsRuleWalker = /** @class */ (function (_super) {
                }
            }
        }
-        var messageArg = callInfo.callExpression.arguments[this.messageIndex];
+        const messageArg = callInfo.callExpression.arguments[this.messageIndex];
        if (messageArg && messageArg.kind !== ts.SyntaxKind.StringLiteral) {
-            this.addFailure(this.createFailure(messageArg.getStart(), messageArg.getWidth(), "Message argument to '" + callInfo.callExpression.expression.getText() + "' must be a string literal."));
+            this.addFailure(this.createFailure(messageArg.getStart(), messageArg.getWidth(), `Message argument to '${callInfo.callExpression.expression.getText()}' must be a string literal.`));
            return;
        }
-    };
-    NoUnexternalizedStringsRuleWalker.prototype.recordKey = function (keyNode, messageNode) {
-        var text = keyNode.getText();
+    }
+    recordKey(keyNode, messageNode) {
+        const text = keyNode.getText();
        // We have an empty key
        if (text.match(/(['"]) *\1/)) {
            if (messageNode) {
-                this.addFailureAtNode(keyNode, "Key is empty for message: " + messageNode.getText());
+                this.addFailureAtNode(keyNode, `Key is empty for message: ${messageNode.getText()}`);
            }
            else {
-                this.addFailureAtNode(keyNode, "Key is empty.");
+                this.addFailureAtNode(keyNode, `Key is empty.`);
            }
            return;
        }
-        var occurrences = this.usedKeys[text];
+        let occurrences = this.usedKeys[text];
        if (!occurrences) {
            occurrences = [];
            this.usedKeys[text] = occurrences;
        }
        if (messageNode) {
-            if (occurrences.some(function (pair) { return pair.message ? pair.message.getText() === messageNode.getText() : false; })) {
+            if (occurrences.some(pair => pair.message ? pair.message.getText() === messageNode.getText() : false)) {
                return;
            }
        }
        occurrences.push({ key: keyNode, message: messageNode });
-    };
-    NoUnexternalizedStringsRuleWalker.prototype.findDescribingParent = function (node) {
-        var parent;
+    }
+    findDescribingParent(node) {
+        let parent;
        while ((parent = node.parent)) {
-            var kind = parent.kind;
+            const kind = parent.kind;
            if (kind === ts.SyntaxKind.CallExpression) {
-                var callExpression = parent;
+                const callExpression = parent;
                return { callInfo: { callExpression: callExpression, argIndex: callExpression.arguments.indexOf(node) } };
            }
            else if (kind === ts.SyntaxKind.ImportEqualsDeclaration || kind === ts.SyntaxKind.ImportDeclaration || kind === ts.SyntaxKind.ExportDeclaration) {
@@ -185,8 +173,9 @@ var NoUnexternalizedStringsRuleWalker = /** @class */ (function (_super) {
            }
            node = parent;
        }
-    };
+        return null;
+    }
+}
 NoUnexternalizedStringsRuleWalker.ImportFailureMessage = 'Do not use double quotes for imports.';
 NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE = '"';
-    return NoUnexternalizedStringsRuleWalker;
-}(Lint.RuleWalker));
+NoUnexternalizedStringsRuleWalker.IDENTIFIER = /^[_a-zA-Z0-9][ .\-_a-zA-Z0-9]*$/;
--- a/build/lib/tslint/noUnexternalizedStringsRule.ts
+++ b/build/lib/tslint/noUnexternalizedStringsRule.ts
@@ -40,7 +40,7 @@ function isPropertyAssignment(node: ts.Node): node is ts.PropertyAssignment {

 interface KeyMessagePair {
 	key: ts.StringLiteral;
-	message: ts.Node;
+	message: ts.Node | undefined;
 }

 class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
@@ -50,8 +50,8 @@ class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
 	private static DOUBLE_QUOTE: string = '"';

 	private signatures: Map<boolean>;
-	private messageIndex: number;
-	private keyIndex: number;
+	private messageIndex: number | undefined;
+	private keyIndex: number | undefined;
 	private ignores: Map<boolean>;

 	private usedKeys: Map<KeyMessagePair[]>;
@@ -63,8 +63,8 @@ class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
 		this.messageIndex = undefined;
 		this.keyIndex = undefined;
 		this.usedKeys = Object.create(null);
-		let options: any[] = this.getOptions();
-		let first: UnexternalizedStringsOptions = options && options.length > 0 ? options[0] : null;
+		const options: any[] = this.getOptions();
+		const first: UnexternalizedStringsOptions = options && options.length > 0 ? options[0] : null;
 		if (first) {
 			if (Array.isArray(first.signatures)) {
 				first.signatures.forEach((signature: string) => this.signatures[signature] = true);
@@ -81,10 +81,17 @@ class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
 		}
 	}

+	private static IDENTIFIER = /^[_a-zA-Z0-9][ .\-_a-zA-Z0-9]*$/;
 	protected visitSourceFile(node: ts.SourceFile): void {
 		super.visitSourceFile(node);
 		Object.keys(this.usedKeys).forEach(key => {
-			let occurrences = this.usedKeys[key];
+			// Keys are quoted.
+			let identifier = key.substr(1, key.length - 2);
+			if (!NoUnexternalizedStringsRuleWalker.IDENTIFIER.test(identifier)) {
+				let occurrence = this.usedKeys[key][0];
+				this.addFailure(this.createFailure(occurrence.key.getStart(), occurrence.key.getWidth(), `The key ${occurrence.key.getText()} doesn't conform to a valid localize identifier`));
+			}
+			const occurrences = this.usedKeys[key];
 			if (occurrences.length > 1) {
 				occurrences.forEach(occurrence => {
 					this.addFailure((this.createFailure(occurrence.key.getStart(), occurrence.key.getWidth(), `Duplicate key ${occurrence.key.getText()} with different message value.`)));
@@ -99,9 +106,9 @@ class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
 	}

 	private checkStringLiteral(node: ts.StringLiteral): void {
-		let text = node.getText();
-		let doubleQuoted = text.length >= 2 && text[0] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE && text[text.length - 1] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE;
-		let info = this.findDescribingParent(node);
+		const text = node.getText();
+		const doubleQuoted = text.length >= 2 && text[0] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE && text[text.length - 1] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE;
+		const info = this.findDescribingParent(node);
 		// Ignore strings in import and export nodes.
 		if (info && info.isImport && doubleQuoted) {
 			const fix = [
@@ -115,13 +122,13 @@ class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
 			);
 			return;
 		}
-		let callInfo = info ? info.callInfo : null;
-		let functionName = callInfo ? callInfo.callExpression.expression.getText() : null;
+		const callInfo = info ? info.callInfo : null;
+		const functionName = callInfo ? callInfo.callExpression.expression.getText() : null;
 		if (functionName && this.ignores[functionName]) {
 			return;
 		}

-		if (doubleQuoted && (!callInfo || callInfo.argIndex === -1 || !this.signatures[functionName])) {
+		if (doubleQuoted && (!callInfo || callInfo.argIndex === -1 || !this.signatures[functionName!])) {
 			const s = node.getText();
 			const fix = [
 				Lint.Replacement.replaceFromTo(node.getStart(), node.getWidth(), `nls.localize('KEY-${s.substring(1, s.length - 1)}', ${s})`),
@@ -130,25 +137,25 @@ class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
 			return;
 		}
 		// We have a single quoted string outside a localize function name.
-		if (!doubleQuoted && !this.signatures[functionName]) {
+		if (!doubleQuoted && !this.signatures[functionName!]) {
 			return;
 		}
 		// We have a string that is a direct argument into the localize call.
-		let keyArg: ts.Expression = callInfo.argIndex === this.keyIndex
+		const keyArg: ts.Expression | null = callInfo && callInfo.argIndex === this.keyIndex
 			? callInfo.callExpression.arguments[this.keyIndex]
 			: null;
 		if (keyArg) {
 			if (isStringLiteral(keyArg)) {
-				this.recordKey(keyArg, this.messageIndex ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
+				this.recordKey(keyArg, this.messageIndex && callInfo ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
 			} else if (isObjectLiteral(keyArg)) {
 				for (let i = 0; i < keyArg.properties.length; i++) {
-					let property = keyArg.properties[i];
+					const property = keyArg.properties[i];
 					if (isPropertyAssignment(property)) {
-						let name = property.name.getText();
+						const name = property.name.getText();
 						if (name === 'key') {
-							let initializer = property.initializer;
+							const initializer = property.initializer;
 							if (isStringLiteral(initializer)) {
-								this.recordKey(initializer, this.messageIndex ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
+								this.recordKey(initializer, this.messageIndex && callInfo ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
 							}
 							break;
 						}
@@ -157,18 +164,18 @@ class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
 			}
 		}

-		const messageArg = callInfo.callExpression.arguments[this.messageIndex];
+		const messageArg = callInfo!.callExpression.arguments[this.messageIndex!];

 		if (messageArg && messageArg.kind !== ts.SyntaxKind.StringLiteral) {
 			this.addFailure(this.createFailure(
 				messageArg.getStart(), messageArg.getWidth(),
-				`Message argument to '${callInfo.callExpression.expression.getText()}' must be a string literal.`));
+				`Message argument to '${callInfo!.callExpression.expression.getText()}' must be a string literal.`));
 			return;
 		}
 	}

-	private recordKey(keyNode: ts.StringLiteral, messageNode: ts.Node) {
-		let text = keyNode.getText();
+	private recordKey(keyNode: ts.StringLiteral, messageNode: ts.Node | undefined) {
+		const text = keyNode.getText();
 		// We have an empty key
 		if (text.match(/(['"]) *\1/)) {
 			if (messageNode) {
@@ -191,12 +198,12 @@ class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
 		occurrences.push({ key: keyNode, message: messageNode });
 	}

-	private findDescribingParent(node: ts.Node): { callInfo?: { callExpression: ts.CallExpression, argIndex: number }, isImport?: boolean; } {
+	private findDescribingParent(node: ts.Node): { callInfo?: { callExpression: ts.CallExpression, argIndex: number }, isImport?: boolean; } | null {
 		let parent: ts.Node;
 		while ((parent = node.parent)) {
-			let kind = parent.kind;
+			const kind = parent.kind;
 			if (kind === ts.SyntaxKind.CallExpression) {
-				let callExpression = parent as ts.CallExpression;
+				const callExpression = parent as ts.CallExpression;
 				return { callInfo: { callExpression: callExpression, argIndex: callExpression.arguments.indexOf(<any>node) } };
 			} else if (kind === ts.SyntaxKind.ImportEqualsDeclaration || kind === ts.SyntaxKind.ImportDeclaration || kind === ts.SyntaxKind.ExportDeclaration) {
 				return { isImport: true };
@@ -208,5 +215,6 @@ class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
 			}
 			node = parent;
 		}
+		return null;
 	}
 }
--- a/build/lib/tslint/translationRemindRule.js
+++ b/build/lib/tslint/translationRemindRule.js
@@ -3,59 +3,43 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var Lint = require("tslint");
-var fs = require("fs");
-var Rule = /** @class */ (function (_super) {
-    __extends(Rule, _super);
-    function Rule() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Rule.prototype.apply = function (sourceFile) {
+const Lint = require("tslint");
+const fs = require("fs");
+class Rule extends Lint.Rules.AbstractRule {
+    apply(sourceFile) {
        return this.applyWithWalker(new TranslationRemindRuleWalker(sourceFile, this.getOptions()));
-    };
-    return Rule;
-}(Lint.Rules.AbstractRule));
+    }
+}
 exports.Rule = Rule;
-var TranslationRemindRuleWalker = /** @class */ (function (_super) {
-    __extends(TranslationRemindRuleWalker, _super);
-    function TranslationRemindRuleWalker(file, opts) {
-        return _super.call(this, file, opts) || this;
+class TranslationRemindRuleWalker extends Lint.RuleWalker {
+    constructor(file, opts) {
+        super(file, opts);
    }
-    TranslationRemindRuleWalker.prototype.visitImportDeclaration = function (node) {
-        var declaration = node.moduleSpecifier.getText();
-        if (declaration !== "'" + TranslationRemindRuleWalker.NLS_MODULE + "'") {
+    visitImportDeclaration(node) {
+        const declaration = node.moduleSpecifier.getText();
+        if (declaration !== `'${TranslationRemindRuleWalker.NLS_MODULE}'`) {
            return;
        }
        this.visitImportLikeDeclaration(node);
-    };
-    TranslationRemindRuleWalker.prototype.visitImportEqualsDeclaration = function (node) {
-        var reference = node.moduleReference.getText();
-        if (reference !== "require('" + TranslationRemindRuleWalker.NLS_MODULE + "')") {
+    }
+    visitImportEqualsDeclaration(node) {
+        const reference = node.moduleReference.getText();
+        if (reference !== `require('${TranslationRemindRuleWalker.NLS_MODULE}')`) {
            return;
        }
        this.visitImportLikeDeclaration(node);
-    };
-    TranslationRemindRuleWalker.prototype.visitImportLikeDeclaration = function (node) {
-        var currentFile = node.getSourceFile().fileName;
-        var matchService = currentFile.match(/vs\/workbench\/services\/\w+/);
-        var matchPart = currentFile.match(/vs\/workbench\/parts\/\w+/);
+    }
+    visitImportLikeDeclaration(node) {
+        const currentFile = node.getSourceFile().fileName;
+        const matchService = currentFile.match(/vs\/workbench\/services\/\w+/);
+        const matchPart = currentFile.match(/vs\/workbench\/parts\/\w+/);
        if (!matchService && !matchPart) {
            return;
        }
-        var resource = matchService ? matchService[0] : matchPart[0];
-        var resourceDefined = false;
-        var json;
+        const resource = matchService ? matchService[0] : matchPart[0];
+        let resourceDefined = false;
+        let json;
        try {
            json = fs.readFileSync('./build/lib/i18n.resources.json', 'utf8');
        }
@@ -63,17 +47,16 @@ var TranslationRemindRuleWalker = /** @class */ (function (_super) {
            console.error('[translation-remind rule]: File with resources to pull from Transifex was not found. Aborting translation resource check for newly defined workbench part/service.');
            return;
        }
-        var workbenchResources = JSON.parse(json).workbench;
-        workbenchResources.forEach(function (existingResource) {
+        const workbenchResources = JSON.parse(json).workbench;
+        workbenchResources.forEach((existingResource) => {
            if (existingResource.name === resource) {
                resourceDefined = true;
                return;
            }
        });
        if (!resourceDefined) {
-            this.addFailureAtNode(node, "Please add '" + resource + "' to ./build/lib/i18n.resources.json file to use translations here.");
+            this.addFailureAtNode(node, `Please add '${resource}' to ./build/lib/i18n.resources.json file to use translations here.`);
+        }
+    }
 }
-    };
 TranslationRemindRuleWalker.NLS_MODULE = 'vs/nls';
-    return TranslationRemindRuleWalker;
-}(Lint.RuleWalker));
--- a/build/lib/tslint/translationRemindRule.ts
+++ b/build/lib/tslint/translationRemindRule.ts
@@ -47,7 +47,7 @@ class TranslationRemindRuleWalker extends Lint.RuleWalker {
 			return;
 		}

-		const resource = matchService ? matchService[0] : matchPart[0];
+		const resource = matchService ? matchService[0] : matchPart![0];
 		let resourceDefined = false;

 		let json;
@@ -59,7 +59,7 @@ class TranslationRemindRuleWalker extends Lint.RuleWalker {
 		}
 		const workbenchResources = JSON.parse(json).workbench;

-		workbenchResources.forEach(existingResource => {
+		workbenchResources.forEach((existingResource: any) => {
 			if (existingResource.name === resource) {
 				resourceDefined = true;
 				return;
--- a/build/lib/typings/OSSREADME.json
+++ b/build/lib/typings/OSSREADME.json
@@ -1,10 +0,0 @@
-// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
-
-// All OSS in this folder is development time only
-[{
-	"name": "definitelytyped",
-	"repositoryURL": "https://github.com/DefinitelyTyped/DefinitelyTyped",
-	"license": "MIT",
-	"isDev": true
-}
-]
--- a/build/lib/typings/Q.d.ts
+++ b/build/lib/typings/Q.d.ts
@@ -1,361 +0,0 @@
-// Type definitions for Q
-// Project: https://github.com/kriskowal/q
-// Definitions by: Barrie Nemetchek <https://github.com/bnemetchek>, Andrew Gaspar <https://github.com/AndrewGaspar/>, John Reilly <https://github.com/johnnyreilly>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * If value is a Q promise, returns the promise.
- * If value is a promise from another library it is coerced into a Q promise (where possible).
- */
-declare function Q<T>(promise: Q.IPromise<T>): Q.Promise<T>;
-/**
- * If value is not a promise, returns a promise that is fulfilled with value.
- */
-declare function Q<T>(value: T): Q.Promise<T>;
-/**
- * Calling with nothing at all creates a void promise
- */
-declare function Q(): Q.Promise<void>;
-
-declare namespace Q {
-    type IWhenable<T> = IPromise<T> | T;
-    interface IPromise<T> {
-        then<U>(onFulfill?: (value: T) => IWhenable<U>, onReject?: (error: any) => IWhenable<U>): IPromise<U>;
-    }
-
-    interface Deferred<T> {
-        promise: Promise<T>;
-        resolve(value?: IWhenable<T>): void;
-        reject(reason: any): void;
-        notify(value: any): void;
-        makeNodeResolver(): (reason: any, value: T) => void;
-    }
-
-    interface Promise<T> {
-        /**
-         * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful for collecting resources regardless of whether a job succeeded, like closing a database connection, shutting a server down, or deleting an unneeded key from an object.
-
-         * finally returns a promise, which will become resolved with the same fulfillment value or rejection reason as promise. However, if callback returns a promise, the resolution of the returned promise will be delayed until the promise returned from callback is finished.
-         */
-        fin(finallyCallback: () => any): Promise<T>;
-        /**
-         * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful for collecting resources regardless of whether a job succeeded, like closing a database connection, shutting a server down, or deleting an unneeded key from an object.
-
-         * finally returns a promise, which will become resolved with the same fulfillment value or rejection reason as promise. However, if callback returns a promise, the resolution of the returned promise will be delayed until the promise returned from callback is finished.
-         */
-        finally(finallyCallback: () => any): Promise<T>;
-
-        /**
-         * The then method from the Promises/A+ specification, with an additional progress handler.
-         */
-        then<U>(onFulfill?: (value: T) => IWhenable<U>, onReject?: (error: any) => IWhenable<U>, onProgress?: Function): Promise<U>;
-
-        /**
-         * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are rejected, instead calls onRejected with the first rejected promise's rejection reason.
-         *
-         * This is especially useful in conjunction with all
-         */
-        spread<U>(onFulfill: (...args: any[]) => IWhenable<U>, onReject?: (reason: any) => IWhenable<U>): Promise<U>;
-
-        fail<U>(onRejected: (reason: any) => IWhenable<U>): Promise<U>;
-
-        /**
-         * A sugar method, equivalent to promise.then(undefined, onRejected).
-         */
-        catch<U>(onRejected: (reason: any) => IWhenable<U>): Promise<U>;
-
-        /**
-         * A sugar method, equivalent to promise.then(undefined, undefined, onProgress).
-         */
-        progress(onProgress: (progress: any) => any): Promise<T>;
-
-        /**
-         * Much like then, but with different behavior around unhandled rejection. If there is an unhandled rejection, either because promise is rejected and no onRejected callback was provided, or because onFulfilled or onRejected threw an error or returned a rejected promise, the resulting rejection reason is thrown as an exception in a future turn of the event loop.
-         *
-         * This method should be used to terminate chains of promises that will not be passed elsewhere. Since exceptions thrown in then callbacks are consumed and transformed into rejections, exceptions at the end of the chain are easy to accidentally, silently ignore. By arranging for the exception to be thrown in a future turn of the event loop, so that it won't be caught, it causes an onerror event on the browser window, or an uncaughtException event on Node.js's process object.
-         *
-         * Exceptions thrown by done will have long stack traces, if Q.longStackSupport is set to true. If Q.onerror is set, exceptions will be delivered there instead of thrown in a future turn.
-         *
-         * The Golden Rule of done vs. then usage is: either return your promise to someone else, or if the chain ends with you, call done to terminate it.
-         */
-        done(onFulfilled?: (value: T) => any, onRejected?: (reason: any) => any, onProgress?: (progress: any) => any): void;
-
-        /**
-         * If callback is a function, assumes it's a Node.js-style callback, and calls it as either callback(rejectionReason) when/if promise becomes rejected, or as callback(null, fulfillmentValue) when/if promise becomes fulfilled. If callback is not a function, simply returns promise.
-         */
-        nodeify(callback: (reason: any, value: any) => void): Promise<T>;
-
-        /**
-         * Returns a promise to get the named property of an object. Essentially equivalent to
-         *
-         * promise.then(function (o) {
-         *     return o[propertyName];
-         * });
-         */
-        get<U>(propertyName: String): Promise<U>;
-        set<U>(propertyName: String, value: any): Promise<U>;
-        delete<U>(propertyName: String): Promise<U>;
-        /**
-         * Returns a promise for the result of calling the named method of an object with the given array of arguments. The object itself is this in the function, just like a synchronous method call. Essentially equivalent to
-         *
-         * promise.then(function (o) {
-         *     return o[methodName].apply(o, args);
-         * });
-         */
-        post<U>(methodName: String, args: any[]): Promise<U>;
-        /**
-         * Returns a promise for the result of calling the named method of an object with the given variadic arguments. The object itself is this in the function, just like a synchronous method call.
-         */
-        invoke<U>(methodName: String, ...args: any[]): Promise<U>;
-        fapply<U>(args: any[]): Promise<U>;
-        fcall<U>(...args: any[]): Promise<U>;
-
-        /**
-         * Returns a promise for an array of the property names of an object. Essentially equivalent to
-         *
-         * promise.then(function (o) {
-         *     return Object.keys(o);
-         * });
-         */
-        keys(): Promise<string[]>;
-
-        /**
-         * A sugar method, equivalent to promise.then(function () { return value; }).
-         */
-        thenResolve<U>(value: U): Promise<U>;
-        /**
-         * A sugar method, equivalent to promise.then(function () { throw reason; }).
-         */
-        thenReject(reason: any): Promise<T>;
-
-        /**
-         * Attaches a handler that will observe the value of the promise when it becomes fulfilled, returning a promise for that same value, perhaps deferred but not replaced by the promise returned by the onFulfilled handler.
-         */
-        tap(onFulfilled: (value: T) => any): Promise<T>;
-
-        timeout(ms: number, message?: string): Promise<T>;
-        /**
-         * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
-         */
-        delay(ms: number): Promise<T>;
-
-        /**
-         * Returns whether a given promise is in the fulfilled state. When the static version is used on non-promises, the result is always true.
-         */
-        isFulfilled(): boolean;
-        /**
-         * Returns whether a given promise is in the rejected state. When the static version is used on non-promises, the result is always false.
-         */
-        isRejected(): boolean;
-        /**
-         * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
-         */
-        isPending(): boolean;
-
-        valueOf(): any;
-
-        /**
-         * Returns a "state snapshot" object, which will be in one of three forms:
-         *
-         * - { state: "pending" }
-         * - { state: "fulfilled", value: <fulfllment value> }
-         * - { state: "rejected", reason: <rejection reason> }
-         */
-        inspect(): PromiseState<T>;
-    }
-
-    interface PromiseState<T> {
-        /**
-         * "fulfilled", "rejected", "pending"
-         */
-        state: string;
-        value?: T;
-        reason?: any;
-    }
-
-    // If no value provided, returned promise will be of void type
-    export function when(): Promise<void>;
-
-    // if no fulfill, reject, or progress provided, returned promise will be of same type
-    export function when<T>(value: IWhenable<T>): Promise<T>;
-
-    // If a non-promise value is provided, it will not reject or progress
-    export function when<T, U>(value: IWhenable<T>, onFulfilled: (val: T) => IWhenable<U>, onRejected?: (reason: any) => IWhenable<U>, onProgress?: (progress: any) => any): Promise<U>;
-
-    /**
-     * Currently "impossible" (and I use the term loosely) to implement due to TypeScript limitations as it is now.
-     * See: https://github.com/Microsoft/TypeScript/issues/1784 for discussion on it.
-     */
-    // export function try(method: Function, ...args: any[]): Promise<any>;
-
-    export function fbind<T>(method: (...args: any[]) => IWhenable<T>, ...args: any[]): (...args: any[]) => Promise<T>;
-
-    export function fcall<T>(method: (...args: any[]) => T, ...args: any[]): Promise<T>;
-
-    export function send<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
-    export function invoke<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
-    export function mcall<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
-
-    export function denodeify<T>(nodeFunction: Function, ...args: any[]): (...args: any[]) => Promise<T>;
-    export function nbind<T>(nodeFunction: Function, thisArg: any, ...args: any[]): (...args: any[]) => Promise<T>;
-    export function nfbind<T>(nodeFunction: Function, ...args: any[]): (...args: any[]) => Promise<T>;
-    export function nfcall<T>(nodeFunction: Function, ...args: any[]): Promise<T>;
-    export function nfapply<T>(nodeFunction: Function, args: any[]): Promise<T>;
-
-    export function ninvoke<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
-    export function npost<T>(nodeModule: any, functionName: string, args: any[]): Promise<T>;
-    export function nsend<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
-    export function nmcall<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
-
-    /**
-     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
-     */
-    export function all<A, B, C, D, E, F>(promises: IWhenable<[IWhenable<A>, IWhenable<B>, IWhenable<C>, IWhenable<D>, IWhenable<E>, IWhenable<F>]>): Promise<[A, B, C, D, E, F]>;
-    /**
-     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
-     */
-    export function all<A, B, C, D, E>(promises: IWhenable<[IWhenable<A>, IWhenable<B>, IWhenable<C>, IWhenable<D>, IWhenable<E>]>): Promise<[A, B, C, D, E]>;
-    /**
-     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
-     */
-    export function all<A, B, C, D>(promises: IWhenable<[IWhenable<A>, IWhenable<B>, IWhenable<C>, IWhenable<D>]>): Promise<[A, B, C, D]>;
-    /**
-     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
-     */
-    export function all<A, B, C>(promises: IWhenable<[IWhenable<A>, IWhenable<B>, IWhenable<C>]>): Promise<[A, B, C]>;
-    /**
-     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
-     */
-    export function all<A, B>(promises: IWhenable<[IWhenable<A>, IWhenable<B>]>): Promise<[A, B]>;
-    /**
-     * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
-     */
-    export function all<T>(promises: IWhenable<IWhenable<T>[]>): Promise<T[]>;
-
-    /**
-    * Returns a promise for the first of an array of promises to become settled.
-    */
-    export function race<T>(promises: IWhenable<T>[]): Promise<T>;
-
-    /**
-     * Returns a promise that is fulfilled with an array of promise state snapshots, but only after all the original promises have settled, i.e. become either fulfilled or rejected.
-     */
-    export function allSettled<T>(promises: IWhenable<IWhenable<T>[]>): Promise<PromiseState<T>[]>;
-
-    export function allResolved<T>(promises: IWhenable<IWhenable<T>[]>): Promise<Promise<T>[]>;
-
-    /**
-     * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are rejected, instead calls onRejected with the first rejected promise's rejection reason.
-     * This is especially useful in conjunction with all.
-     */
-    export function spread<T, U>(promises: IWhenable<T>[], onFulfilled: (...args: T[]) => IWhenable<U>, onRejected?: (reason: any) => IWhenable<U>): Promise<U>;
-
-    /**
-     * Returns a promise that will have the same result as promise, except that if promise is not fulfilled or rejected before ms milliseconds, the returned promise will be rejected with an Error with the given message. If message is not supplied, the message will be "Timed out after " + ms + " ms".
-     */
-    export function timeout<T>(promise: Promise<T>, ms: number, message?: string): Promise<T>;
-
-    /**
-     * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
-     */
-    export function delay<T>(promise: Promise<T>, ms: number): Promise<T>;
-    /**
-     * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
-     */
-    export function delay<T>(value: T, ms: number): Promise<T>;
-    /**
-     * Returns a promise that will be fulfilled with undefined after at least ms milliseconds have passed.
-     */
-    export function delay(ms: number): Promise <void>;
-    /**
-     * Returns whether a given promise is in the fulfilled state. When the static version is used on non-promises, the result is always true.
-     */
-    export function isFulfilled(promise: Promise<any>): boolean;
-    /**
-     * Returns whether a given promise is in the rejected state. When the static version is used on non-promises, the result is always false.
-     */
-    export function isRejected(promise: Promise<any>): boolean;
-    /**
-     * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
-     */
-    export function isPending(promise: Promise<any>): boolean;
-
-    /**
-     * Returns a "deferred" object with a:
-     * promise property
-     * resolve(value) method
-     * reject(reason) method
-     * notify(value) method
-     * makeNodeResolver() method
-     */
-    export function defer<T>(): Deferred<T>;
-
-    /**
-     * Returns a promise that is rejected with reason.
-     */
-    export function reject<T>(reason?: any): Promise<T>;
-
-    export function Promise<T>(resolver: (resolve: (val: IWhenable<T>) => void , reject: (reason: any) => void , notify: (progress: any) => void ) => void ): Promise<T>;
-
-    /**
-     * Creates a new version of func that accepts any combination of promise and non-promise values, converting them to their fulfillment values before calling the original func. The returned version also always returns a promise: if func does a return or throw, then Q.promised(func) will return fulfilled or rejected promise, respectively.
-     *
-     * This can be useful for creating functions that accept either promises or non-promise values, and for ensuring that the function always returns a promise even in the face of unintentional thrown exceptions.
-     */
-    export function promised<T>(callback: (...args: any[]) => T): (...args: any[]) => Promise<T>;
-
-    /**
-     * Returns whether the given value is a Q promise.
-     */
-    export function isPromise(object: any): boolean;
-    /**
-     * Returns whether the given value is a promise (i.e. it's an object with a then function).
-     */
-    export function isPromiseAlike(object: any): boolean;
-    /**
-     * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
-     */
-    export function isPending(object: any): boolean;
-    /**
-     * If an object is not a promise, it is as "near" as possible.
-     * If a promise is rejected, it is as "near" as possible too.
-     * If it’s a fulfilled promise, the fulfillment value is nearer.
-     * If it’s a deferred promise and the deferred has been resolved, the
-     * resolution is "nearer".
-     */
-    export function nearer<T>(promise: Promise<T>): T;
-
-    /**
-     * This is an experimental tool for converting a generator function into a deferred function. This has the potential of reducing nested callbacks in engines that support yield.
-     */
-    export function async<T>(generatorFunction: any): (...args: any[]) => Promise<T>;
-    export function nextTick(callback: Function): void;
-
-    /**
-     * A settable property that will intercept any uncaught errors that would otherwise be thrown in the next tick of the event loop, usually as a result of done. Can be useful for getting the full stack trace of an error in browsers, which is not usually possible with window.onerror.
-     */
-    export var onerror: (reason: any) => void;
-    /**
-     * A settable property that lets you turn on long stack trace support. If turned on, "stack jumps" will be tracked across asynchronous promise operations, so that if an uncaught error is thrown by done or a rejection reason's stack property is inspected in a rejection callback, a long stack trace is produced.
-     */
-    export var longStackSupport: boolean;
-
-    /**
-     * Calling resolve with a pending promise causes promise to wait on the passed promise, becoming fulfilled with its fulfillment value or rejected with its rejection reason (or staying pending forever, if the passed promise does).
-     * Calling resolve with a rejected promise causes promise to be rejected with the passed promise's rejection reason.
-     * Calling resolve with a fulfilled promise causes promise to be fulfilled with the passed promise's fulfillment value.
-     * Calling resolve with a non-promise value causes promise to be fulfilled with that value.
-     */
-    export function resolve<T>(object: IWhenable<T>): Promise<T>;
-
-	/**
-	 * Resets the global "Q" variable to the value it has before Q was loaded.
-	 * This will either be undefined if there was no version or the version of Q which was already loaded before.
-	 * @returns { The last version of Q. }
-	 */
-	export function noConflict(): typeof Q;
-}
-
-declare module "q" {
-    export = Q;
-}
--- a/build/lib/typings/cgmanifest.json
+++ b/build/lib/typings/cgmanifest.json
@@ -0,0 +1,16 @@
+{
+	"registrations": [
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"name": "definitelytyped",
+					"repositoryUrl": "https://github.com/DefinitelyTyped/DefinitelyTyped",
+					"commitHash": "69e3ac6bec3008271f76bbfa7cf69aa9198c4ff0"
+				}
+			},
+			"license": "MIT"
+		}
+	],
+	"version": 1
+}
--- a/build/lib/typings/chalk.d.ts
+++ b/build/lib/typings/chalk.d.ts
@@ -1,121 +0,0 @@
-// Type definitions for chalk v0.4.0
-// Project: https://github.com/sindresorhus/chalk
-// Definitions by: Diullei Gomes <https://github.com/Diullei>, Bart van der Schoor <https://github.com/Bartvds>, Nico Jansen <https://github.com/nicojs>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace Chalk {
-
-    export var enabled: boolean;
-    export var supportsColor: boolean;
-    export var styles: ChalkStyleMap;
-
-    export function stripColor(value: string): any;
-    export function hasColor(str: string): boolean;
-
-    export interface ChalkChain extends ChalkStyle {
-        (...text: string[]): string;
-    }
-
-    export interface ChalkStyleElement {
-        open: string;
-        close: string;
-    }
-
-    // General
-    export var reset: ChalkChain;
-    export var bold: ChalkChain;
-    export var italic: ChalkChain;
-    export var underline: ChalkChain;
-    export var inverse: ChalkChain;
-    export var strikethrough: ChalkChain;
-
-    // Text colors
-    export var black: ChalkChain;
-    export var red: ChalkChain;
-    export var green: ChalkChain;
-    export var yellow: ChalkChain;
-    export var blue: ChalkChain;
-    export var magenta: ChalkChain;
-    export var cyan: ChalkChain;
-    export var white: ChalkChain;
-    export var gray: ChalkChain;
-    export var grey: ChalkChain;
-
-    // Background colors
-    export var bgBlack: ChalkChain;
-    export var bgRed: ChalkChain;
-    export var bgGreen: ChalkChain;
-    export var bgYellow: ChalkChain;
-    export var bgBlue: ChalkChain;
-    export var bgMagenta: ChalkChain;
-    export var bgCyan: ChalkChain;
-    export var bgWhite: ChalkChain;
-
-
-    export interface ChalkStyle {
-        // General
-        reset: ChalkChain;
-        bold: ChalkChain;
-        italic: ChalkChain;
-        underline: ChalkChain;
-        inverse: ChalkChain;
-        strikethrough: ChalkChain;
-
-        // Text colors
-        black: ChalkChain;
-        red: ChalkChain;
-        green: ChalkChain;
-        yellow: ChalkChain;
-        blue: ChalkChain;
-        magenta: ChalkChain;
-        cyan: ChalkChain;
-        white: ChalkChain;
-        gray: ChalkChain;
-        grey: ChalkChain;
-
-        // Background colors
-        bgBlack: ChalkChain;
-        bgRed: ChalkChain;
-        bgGreen: ChalkChain;
-        bgYellow: ChalkChain;
-        bgBlue: ChalkChain;
-        bgMagenta: ChalkChain;
-        bgCyan: ChalkChain;
-        bgWhite: ChalkChain;
-    }
-
-    export interface ChalkStyleMap {
-        // General
-        reset: ChalkStyleElement;
-        bold: ChalkStyleElement;
-        italic: ChalkStyleElement;
-        underline: ChalkStyleElement;
-        inverse: ChalkStyleElement;
-        strikethrough: ChalkStyleElement;
-
-        // Text colors
-        black: ChalkStyleElement;
-        red: ChalkStyleElement;
-        green: ChalkStyleElement;
-        yellow: ChalkStyleElement;
-        blue: ChalkStyleElement;
-        magenta: ChalkStyleElement;
-        cyan: ChalkStyleElement;
-        white: ChalkStyleElement;
-        gray: ChalkStyleElement;
-
-        // Background colors
-        bgBlack: ChalkStyleElement;
-        bgRed: ChalkStyleElement;
-        bgGreen: ChalkStyleElement;
-        bgYellow: ChalkStyleElement;
-        bgBlue: ChalkStyleElement;
-        bgMagenta: ChalkStyleElement;
-        bgCyan: ChalkStyleElement;
-        bgWhite: ChalkStyleElement;
-    }
-}
-
-declare module "chalk" {
-    export = Chalk;
-}
--- a/build/lib/typings/debounce.d.ts
+++ b/build/lib/typings/debounce.d.ts
@@ -1,18 +0,0 @@
-// Type definitions for compose-function
-// Project: https://github.com/component/debounce
-// Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "debounce" {
-	// Overload on boolean constants would allow us to narrow further,
-	// but it is not implemented for TypeScript yet
-	function f<A extends Function>(f: A, interval?: number, immediate?: boolean): A
-
-	/**
-	 * This is required as per:
-	 * https://github.com/Microsoft/TypeScript/issues/5073
-	 */
-	namespace f {}
-
-	export = f;
-}
--- a/build/lib/typings/event-stream.d.ts
+++ b/build/lib/typings/event-stream.d.ts
@@ -1,12 +1,11 @@
 declare module "event-stream" {
 	import { Stream } from 'stream';
 	import { ThroughStream as _ThroughStream } from 'through';
-	import { MapStream } from 'map-stream';
 	import * as File from 'vinyl';

 	export interface ThroughStream extends _ThroughStream {
-		queue(data: File | null);
-		push(data: File | null);
+		queue(data: File | null): any;
+		push(data: File | null): any;
 		paused: boolean;
 	}

@@ -15,7 +14,7 @@ declare module "event-stream" {
 	function concat(...stream: Stream[]): ThroughStream;
 	function duplex(istream: Stream, ostream: Stream): ThroughStream;

-	function through(write?: (data: any) => void, end?: () => void,
+	function through(write?: (this: ThroughStream, data: any) => void, end?: (this: ThroughStream) => void,
 		opts?: { autoDestroy: boolean; }): ThroughStream;

 	function readArray<T>(array: T[]): ThroughStream;
@@ -24,5 +23,5 @@ declare module "event-stream" {
 	function mapSync<I, O>(cb: (data: I) => O): ThroughStream;
 	function map<I, O>(cb: (data: I, cb: (err?: Error, data?: O) => void) => O): ThroughStream;

-	function readable(asyncFunction: Function): MapStream;
+	function readable(asyncFunction: (this: ThroughStream, ...args: any[]) => any): any;
 }
--- a/build/lib/typings/github-releases.d.ts
+++ b/build/lib/typings/github-releases.d.ts
@@ -0,0 +1,3 @@
+declare module 'github-releases' {
+
+}
--- a/build/lib/typings/gulp-concat.d.ts
+++ b/build/lib/typings/gulp-concat.d.ts
@@ -1,43 +0,0 @@
-// Type definitions for gulp-concat
-// Project: http://github.com/wearefractal/gulp-concat
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "gulp-concat" {
-
-    interface IOptions {
-        newLine: string;
-    }
-
-    interface IFsStats {
-        dev?: number;
-        ino?: number;
-        mode?: number;
-        nlink?: number;
-        uid?: number;
-        gid?: number;
-        rdev?: number;
-        size?: number;
-        blksize?: number;
-        blocks?: number;
-        atime?: Date;
-        mtime?: Date;
-        ctime?: Date;
-    }
-
-    interface IVinylOptions {
-        cwd?: string;
-        base?: string;
-        path?: string;
-        stat?: IFsStats;
-        contents?: NodeJS.ReadableStream | Buffer;
-    }
-
-    interface IConcat {
-        (filename: string, options?: IOptions): NodeJS.ReadWriteStream;
-        (options: IVinylOptions): NodeJS.ReadWriteStream;
-    }
-
-    var _tmp: IConcat;
-    export = _tmp;
-}
--- a/build/lib/typings/gulp-filter.d.ts
+++ b/build/lib/typings/gulp-filter.d.ts
@@ -1,29 +0,0 @@
-// Type definitions for gulp-filter v3.0.1
-// Project: https://github.com/sindresorhus/gulp-filter
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'gulp-filter' {
-  import File = require('vinyl');
-  import * as Minimatch from 'minimatch';
-
-  namespace filter {
-    interface FileFunction {
-      (file: File): boolean;
-    }
-
-    interface Options extends Minimatch.IOptions {
-      restore?: boolean;
-      passthrough?: boolean;
-    }
-
-    // A transform stream with a .restore object
-    interface Filter extends NodeJS.ReadWriteStream {
-      restore: NodeJS.ReadWriteStream
-    }
-  }
-
-  function filter(pattern: string | string[] | filter.FileFunction, options?: filter.Options): filter.Filter;
-
-  export = filter;
-}
--- a/build/lib/typings/gulp-rename.d.ts
+++ b/build/lib/typings/gulp-rename.d.ts
@@ -1,29 +0,0 @@
-// Type definitions for gulp-rename
-// Project: https://github.com/hparra/gulp-rename
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "gulp-rename" {
-    interface ParsedPath {
-        dirname?: string;
-        basename?: string;
-        extname?: string;
-    }
-
-    interface Options extends ParsedPath {
-        prefix?: string;
-        suffix?: string;
-    }
-
-    function rename(name: string): NodeJS.ReadWriteStream;
-    function rename(callback: (path: ParsedPath) => any): NodeJS.ReadWriteStream;
-    function rename(opts: Options): NodeJS.ReadWriteStream;
-
-    /**
-     * This is required as per:
-     * https://github.com/Microsoft/TypeScript/issues/5073
-     */
-    namespace rename {}
-
-    export = rename;
-}
--- a/build/lib/typings/gulp-sourcemaps.d.ts
+++ b/build/lib/typings/gulp-sourcemaps.d.ts
@@ -1,27 +0,0 @@
-// Type definitions for gulp-sourcemaps
-// Project: https://github.com/floridoo/gulp-sourcemaps
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module "gulp-sourcemaps" {
-    interface InitOptions {
-        loadMaps?: boolean;
-        debug?: boolean;
-    }
-
-    interface WriteMapper {
-        (file: string): string;
-    }
-
-    interface WriteOptions {
-        addComment?: boolean;
-        includeContent?: boolean;
-        sourceRoot?: string | WriteMapper;
-        sourceMappingURLPrefix?: string | WriteMapper;
-        sourceMappingURL?: (f:{relative:string})=>string;
-    }
-
-    export function init(opts?: InitOptions): NodeJS.ReadWriteStream;
-    export function write(path?: string, opts?: WriteOptions): NodeJS.ReadWriteStream;
-    export function write(opts?: WriteOptions): NodeJS.ReadWriteStream;
-}
--- a/build/lib/typings/gulp-util.d.ts
+++ b/build/lib/typings/gulp-util.d.ts
@@ -1,133 +0,0 @@
-// Type definitions for gulp-util v3.0.x
-// Project: https://github.com/gulpjs/gulp-util
-// Definitions by: jedmao <https://github.com/jedmao>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'gulp-util' {
-
-	import vinyl = require('vinyl');
-	import chalk = require('chalk');
-	import through2 = require('through2');
-
-	export class File extends vinyl { }
-
-	/**
-	* Replaces a file extension in a path. Returns the new path.
-	*/
-	export function replaceExtension(npath: string, ext: string): string;
-
-	export var colors: typeof chalk;
-
-	export var date: {
-		(now?: Date, mask?: string, convertLocalTimeToUTC?: boolean): any;
-		(date?: string, mask?: string, convertLocalTimeToUTC?: boolean): any;
-		masks: any;
-	};
-
-	/**
-	* Logs stuff. Already prefixed with [gulp] and all that. Use the right colors
-	* for values. If you pass in multiple arguments it will join them by a space.
-	*/
-	export function log(message?: any, ...optionalParams: any[]): void;
-
-	/**
-	* This is a lodash.template function wrapper. You must pass in a valid gulp
-	* file object so it is available to the user or it will error. You can not
-	* configure any of the delimiters. Look at the lodash docs for more info.
-	*/
-	export function template(tmpl: string): (opt: { file: { path: string } }) => string;
-	export function template(tmpl: string, opt: { file: { path: string } }): string;
-
-	export var env: any;
-
-	export function beep(): void;
-
-	/**
-	* Returns a stream that does nothing but pass data straight through.
-	*/
-	export var noop: typeof through2;
-
-	export function isStream(obj: any): boolean;
-
-	export function isBuffer(obj: any): boolean;
-
-	export function isNull(obj: any): boolean;
-
-	export var linefeed: string;
-
-	export function combine(streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream;
-	export function combine(...streams: NodeJS.ReadWriteStream[]): () => NodeJS.ReadWriteStream;
-
-	/**
-	* This is similar to es.wait but instead of buffering text into one string
-	* it buffers anything into an array (so very useful for file objects).
-	*/
-	export function buffer(cb?: (err: Error, data: any[]) => void): NodeJS.ReadWriteStream;
-
-	export class PluginError implements Error, PluginErrorOptions {
-		constructor(options?: PluginErrorOptions);
-		constructor(pluginName: string, options?: PluginErrorOptions);
-		constructor(pluginName: string, message: string, options?: PluginErrorOptions);
-		constructor(pluginName: string, message: Error, options?: PluginErrorOptions);
-		/**
-		* The module name of your plugin.
-		*/
-		name: string;
-		/**
-		* Can be a string or an existing error.
-		*/
-		message: any;
-		fileName: string;
-		lineNumber: number;
-		/**
-		* You need to include the message along with this stack. If you pass an
-		* error in as the message the stack will be pulled from that, otherwise one
-		* will be created.
-		*/
-		stack: string;
-		/**
-		* By default the stack will not be shown. Set this to true if you think the
-		* stack is important for your error.
-		*/
-		showStack: boolean;
-		/**
-		* Error properties will be included in err.toString(). Can be omitted by
-		* setting this to false.
-		*/
-		showProperties: boolean;
-		plugin: string;
-		error: Error;
-	}
-
-}
-
-interface PluginErrorOptions {
-	/**
-	* The module name of your plugin.
-	*/
-	name?: string;
-	/**
-	* Can be a string or an existing error.
-	*/
-	message?: any;
-	fileName?: string;
-	lineNumber?: number;
-	/**
-	* You need to include the message along with this stack. If you pass an
-	* error in as the message the stack will be pulled from that, otherwise one
-	* will be created.
-	*/
-	stack?: string;
-	/**
-	* By default the stack will not be shown. Set this to true if you think the
-	* stack is important for your error.
-	*/
-	showStack?: boolean;
-	/**
-	* Error properties will be included in err.toString(). Can be omitted by
-	* setting this to false.
-	*/
-	showProperties?: boolean;
-	plugin?: string;
-	error?: Error;
-}
--- a/Show More
+++ b/Show More