Use common TS install for both the TS Extension and Html Extension (#…

…21578)

* Use common TS install for both the TS Extension and Html Extension

**Bug**
At least two version of Typescript are shipped in our extensions: one in the typescript extension and one for the html extension. This adds about 5MB to package install size and also results in inconsistent behavior

**Fix**
Change the TypeScript extension to also use the common version of TypeScript. Bump this version up to 2.2.1

* Don't hardcode paths for typescript

extensions/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "2.1.6"
+    "typescript": "2.2.1"
   },
   "scripts": {
     "postinstall": "node ./postinstall"

extensions/postinstall.js

@@ -7,28 +7,20 @@
 
 const fs = require('fs');
 const path = require('path');
+const toDelete = new Set(['tsc.js', 'tsserverlibrary.js', 'typescript.js', 'typescriptServices.js']);
 
-function removeFile(filePath) {
-	try {
-		fs.unlinkSync(filePath);
-		console.log(`removed '${filePath}'`);
-	} catch (e) {
-		console.warn(e);
+const root = path.join(__dirname, 'node_modules', 'typescript', 'lib');
+for (let name of fs.readdirSync(root)) {
+	if (name === 'lib.d.ts' || name.match(/^lib\..*\.d\.ts$/) || name === 'protocol.d.ts') {
+		continue;
 	}
-}
 
-// delete unused typescript stuff in lib folder
-const libPath = path.dirname(require.resolve('typescript'));
-for (let name of fs.readdirSync(libPath)) {
-	if (name !== 'typescript.d.ts' && name !== 'typescript.js' && name !== 'lib.es6.d.ts') {
-		removeFile(path.join(libPath, name));
+	if (toDelete.has(name) || name.match(/\.d\.ts$/)) {
+		try {
+			fs.unlinkSync(path.join(root, name));
+			console.log(`removed '${path.join(root, name)}'`);
+		} catch (e) {
+			console.warn(e);
+		}
 	}
-}
-
-// delete unused typescript stuff in bin folder
-const binPath = path.join(path.dirname(libPath), 'bin');
-for (let name of fs.readdirSync(binPath)) {
-	removeFile(path.join(binPath, name));
-}
-
-removeFile(path.join(path.dirname(libPath), 'Gulpfile.ts'));
+}

extensions/typescript/package.json

@@ -13,15 +13,13 @@
   "dependencies": {
     "semver": "4.3.6",
     "vscode-extension-telemetry": "^0.0.6",
-    "vscode-nls": "^2.0.1",
-    "typescript": "typescript@2.2.1"
+    "vscode-nls": "^2.0.1"
   },
   "devDependencies": {
     "@types/node": "^7.0.4",
     "@types/semver": "^5.3.30"
   },
   "scripts": {
-    "postinstall": "node ./bin/postinstall",
     "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript ./tsconfig.json",
     "update-grammars": "node ./build/update-grammars.js"
   },

extensions/typescript/src/protocol.d.ts

@@ -1,2 +1,2 @@
-import * as Proto from '../node_modules/typescript/lib/protocol';
+import * as Proto from 'typescript/lib/protocol';
 export = Proto;

extensions/typescript/src/typescriptServiceClient.ts

@@ -328,7 +328,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 	}
 
 	private get bundledTypeScriptPath(): string {
-		return path.join(__dirname, '..', 'node_modules', 'typescript', 'lib', 'tsserver.js');
+		return require.resolve('typescript/lib/tsserver.js');
 	}
 
 	private get localTypeScriptPath(): string | null {