https-githubsup-com
diff --git a/‎build/npm/postinstall.js‎
Lines changed: 14 additions & 10 deletions b/‎build/npm/postinstall.js‎
Lines changed: 14 additions & 10 deletions
diff --git a/‎extensions/extension-editing/npm-shrinkwrap.json‎
Lines changed: 0 additions & 5 deletions b/‎extensions/extension-editing/npm-shrinkwrap.json‎
Lines changed: 0 additions & 5 deletions
diff --git a/‎extensions/extension-editing/package.json‎
Lines changed: 0 additions & 4 deletions b/‎extensions/extension-editing/package.json‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎extensions/extension-editing/postinstall.js‎
Lines changed: 0 additions & 23 deletions b/‎extensions/extension-editing/postinstall.js‎
Lines changed: 0 additions & 23 deletions
diff --git a/‎extensions/html/server/src/modes/javascriptMode.ts‎
Lines changed: 5 additions & 10 deletions b/‎extensions/html/server/src/modes/javascriptMode.ts‎
Lines changed: 5 additions & 10 deletions
diff --git a/‎extensions/html/server/src/modes/typescript/lib-ts.d.ts‎
Lines changed: 0 additions & 6 deletions b/‎extensions/html/server/src/modes/typescript/lib-ts.d.ts‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎extensions/html/server/src/modes/typescript/lib-ts.js‎
Lines changed: 0 additions & 9 deletions b/‎extensions/html/server/src/modes/typescript/lib-ts.js‎
Lines changed: 0 additions & 9 deletions
@@ -6,6 +6,19 @@
 const cp = require('child_process');
 const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 
+function npmInstall(location) {
+	const result = cp.spawnSync(npm, ['install'], {
+		cwd: location ,
+		stdio: 'inherit'
+	});
+
+	if (result.error || result.status !== 0) {
+		process.exit(1);
+	}
+}
+
+npmInstall('extensions'); // node modules shared by all extensions
+
 const extensions = [
 	'vscode-api-tests',
 	'vscode-colorize-tests',
@@ -20,13 +33,4 @@ const extensions = [
 	'html'
 ];
 
-extensions.forEach(extension => {
-	const result = cp.spawnSync(npm, ['install'], {
-		cwd: `extensions/${extension}`,
-		stdio: 'inherit'
-	});
-
-	if (result.error || result.status !== 0) {
-		process.exit(1);
-	}
-});
+extensions.forEach(extension => npmInstall(`extensions/${extension}`));
@@ -13,13 +13,9 @@
 	],
 	"main": "./out/extension",
 	"scripts": {
-		"postinstall": "node ./postinstall",
 		"compile": "gulp compile-extension:extension-editing",
 		"watch": "gulp watch-extension:extension-editing"
 	},
-	"dependencies": {
-		"typescript": "^1.8.10"
-	},
 	"contributes": {
 		"jsonValidation": [
 			{
 
@@ -9,14 +9,9 @@ import { CompletionItem, Location, SignatureHelp, SignatureInformation, Paramete
 import { LanguageMode } from './languageModes';
 import { getWordAtText } from '../utils/words';
 
-import ts = require('./typescript/typescriptServices');
-import { contents as libdts } from './typescript/lib-ts';
+import * as ts from 'typescript';
 
-const DEFAULT_LIB = {
-	NAME: 'defaultLib:lib.d.ts',
-	CONTENTS: libdts
-};
-const FILE_NAME = 'typescript://singlefile/1';  // the same 'file' is used for all contents
+const FILE_NAME = 'vscode://javascript/1';  // the same 'file' is used for all contents
 
 const JS_WORD_REGEX = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g;
 
@@ -33,15 +28,15 @@ export function getJavascriptMode(jsDocuments: LanguageModelCache<TextDocument>)
 			return '1'; // default lib is static
 		},
 		getScriptSnapshot: (fileName: string) => {
-			let text = fileName === FILE_NAME ? currentTextDocument.getText() : DEFAULT_LIB.CONTENTS;
+			let text = fileName === FILE_NAME ? currentTextDocument.getText() : ts.sys.readFile(fileName);
 			return {
 				getText: (start, end) => text.substring(start, end),
 				getLength: () => text.length,
 				getChangeRange: () => void 0
 			};
 		},
-		getCurrentDirectory: () => '',
-		getDefaultLibFileName: options => DEFAULT_LIB.NAME
+		getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
+		getDefaultLibFileName: (options) => ts.getDefaultLibFilePath(options)
 	};
 	let jsLanguageService = ts.createLanguageService(host);