Merge branch 'master' into completionsCombineOverloads

Author: Andy Hanson

.gitmodules

@@ -2,24 +2,19 @@
 	path = tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
 	url = https://github.com/Microsoft/TypeScript-React-Starter
 	ignore = all
-	shallow = true
 [submodule "tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter"]
 	path = tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
 	url = https://github.com/Microsoft/TypeScript-Node-Starter.git
 	ignore = all
-	shallow = true
 [submodule "tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter"]
 	path = tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
 	url = https://github.com/Microsoft/TypeScript-React-Native-Starter.git
 	ignore = all
-	shallow = true
 [submodule "tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter"]
 	path = tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
 	url = https://github.com/Microsoft/TypeScript-Vue-Starter.git
 	ignore = all
-	shallow = true
 [submodule "tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter"]
 	path = tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
 	url = https://github.com/Microsoft/TypeScript-WeChat-Starter.git
 	ignore = all
-	shallow = true

Jakefile.js

@@ -130,6 +130,7 @@ var harnessSources = harnessCoreSources.concat([
     "textStorage.ts",
     "moduleResolution.ts",
     "tsconfigParsing.ts",
+    "asserts.ts",
     "builder.ts",
     "commandLineParsing.ts",
     "configurationExtension.ts",
@@ -795,7 +796,7 @@ compileFile(
     /*prereqs*/[builtLocalDirectory, tscFile, tsserverLibraryFile].concat(libraryTargets).concat(servicesSources).concat(harnessSources),
     /*prefixes*/[],
     /*useBuiltCompiler:*/ true,
-    /*opts*/ { types: ["node", "mocha"], lib: "es6" });
+    /*opts*/ { types: ["node", "mocha", "chai"], lib: "es6" });
 
 var internalTests = "internal/";