diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index 191253d0d2c..0c124f2d468 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -131,7 +131,7 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		doSignatureHelp(document: TextDocument, position: Position): SignatureHelp | null {
 			updateCurrentTextDocument(document);
-			let signHelp = jsLanguageService.getSignatureHelpItems(FILE_NAME, currentTextDocument.offsetAt(position));
+			let signHelp = jsLanguageService.getSignatureHelpItems(FILE_NAME, currentTextDocument.offsetAt(position), undefined);
 			if (signHelp) {
 				let ret: SignatureHelp = {
 					activeSignature: signHelp.selectedItemIndex,
diff --git a/extensions/package.json b/extensions/package.json
index c7389b534c4..0266656aec9 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "2.9.2"
+    "typescript": "3.0.0-insiders.20180706"
   },
   "scripts": {
     "postinstall": "node ./postinstall"
diff --git a/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts b/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts
index 1a2628f1e9b..40cf0bfcfde 100644
--- a/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts
+++ b/extensions/typescript-language-features/src/features/baseCodeLensProvider.ts
@@ -115,7 +115,7 @@ export abstract class TypeScriptBaseCodeLensProvider implements CodeLensProvider
 		}
 
 		// TS 3.0+ provides a span for just the symbol
-		if ((item as any).nameSpan) {
+		if (item.nameSpan) {
 			return typeConverters.Range.fromTextSpan((item as any).nameSpan);
 		}
 
diff --git a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
index 6f2d1265275..01cf885a5e6 100644
--- a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
+++ b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
@@ -223,7 +223,7 @@ export class UpdateImportsOnFileRenameHandler {
 		const isDirectoryRename = fs.lstatSync(newFile).isDirectory();
 		await this.fileConfigurationManager.ensureConfigurationForDocument(document, undefined);
 
-		const args: Proto.GetEditsForFileRenameRequestArgs = {
+		const args: Proto.GetEditsForFileRenameRequestArgs & { file: string } = {
 			file: targetResource,
 			oldFilePath: oldFile,
 			newFilePath: newFile,
diff --git a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
index 1ce28c148e5..745eda206d7 100644
--- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
+++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
@@ -286,8 +286,7 @@ export default class TypeScriptServiceClientHost {
 		if (diagnostic.code) {
 			converted.code = diagnostic.code;
 		}
-		// TODO: requires TS 3.0
-		const relatedInformation = (diagnostic as any).relatedInformation;
+		const relatedInformation = diagnostic.relatedInformation;
 		if (relatedInformation) {
 			converted.relatedInformation = relatedInformation.map((info: any) => {
 				let span = info.span;
diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts
index 67be9e314c0..729bda6af6c 100644
--- a/extensions/typescript-language-features/src/typescriptService.ts
+++ b/extensions/typescript-language-features/src/typescriptService.ts
@@ -11,11 +11,6 @@ import { TypeScriptServiceConfiguration } from './utils/configuration';
 import Logger from './utils/logger';
 import BufferSyncSupport from './features/bufferSyncSupport';
 
-declare module './protocol' {
-	export type JsxClosingTagRequestArgs = any;
-	export type JsxClosingTagResponse = any;
-}
-
 export interface ITypeScriptServiceClient {
 	/**
 	 * Convert a resource (VS Code) to a normalized path (TypeScript).
diff --git a/extensions/typescript-language-features/src/utils/previewer.ts b/extensions/typescript-language-features/src/utils/previewer.ts
index ce10fcbbe04..41ff1fea7d6 100644
--- a/extensions/typescript-language-features/src/utils/previewer.ts
+++ b/extensions/typescript-language-features/src/utils/previewer.ts
@@ -72,13 +72,18 @@ export function markdownDocumentation(
 
 export function addMarkdownDocumentation(
 	out: MarkdownString,
-	documentation: Proto.SymbolDisplayPart[],
-	tags: Proto.JSDocTagInfo[]
+	documentation: Proto.SymbolDisplayPart[] | undefined,
+	tags: Proto.JSDocTagInfo[] | undefined
 ): MarkdownString {
-	out.appendMarkdown(plain(documentation));
-	const tagsPreview = tagsMarkdownPreview(tags);
-	if (tagsPreview) {
-		out.appendMarkdown('\n\n' + tagsPreview);
+	if (documentation) {
+		out.appendMarkdown(plain(documentation));
+	}
+
+	if (tags) {
+		const tagsPreview = tagsMarkdownPreview(tags);
+		if (tagsPreview) {
+			out.appendMarkdown('\n\n' + tagsPreview);
+		}
 	}
 	return out;
 }
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index 7ec0734b094..64d1bf83d0f 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -2,6 +2,6 @@
 # yarn lockfile v1
 
 
-typescript@2.9.2:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
+typescript@3.0.0-insiders.20180706:
+  version "3.0.0-insiders.20180706"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.0-insiders.20180706.tgz#684c6c8ca1eefb11e79b6c072a92046ffd75184e"