Use types directive in client

microsoft · Jun 12, 2020 · 60f25b0 · 60f25b0
1 parent 7c1c32e
commit 60f25b0
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,4 +36,5 @@ vscode-languageserver-types*.tgz
 vscode-languageserver-textdocument*.tgz
 vscode-jsonrpc*.tgz
 vscode-languageserver-protocol*.tgz
-vscode-languageserver*.tgz
+vscode-languageserver*.tgz
+vscode-languageclient*.tgz
diff --git a/client/.npmignore b/client/.npmignore
@@ -1,15 +1,15 @@
 .vscode/
-lib/test/
+lib/**/test/
 .vscode-test/
-lib/*.map
-lib/tsconfig.tsbuildInfo
-lib/tsconfig-watch.tsbuildInfo
+lib/**/*.map
+lib/**/*.tsbuildInfo
 src/
 test/
 bin/
 .eslintrc*
+.eslintignore
 .mocharc*
 .gitignore
 gulpfile.js
 tsd.json
-tsconfig.json
+tsconfig*.json
diff --git a/client/package.json b/client/package.json
@@ -34,7 +34,7 @@
 		"prepublishOnly": "npm run clean && node ./bin/updateVSCode.js && npm run compile && npm test",
 		"postpublish": "node ../build/npm/post-publish.js",
 		"compile": "node ../build/bin/tsc -b ./tsconfig.json && shx cp src/node/terminateProcess.sh lib/node/terminateProcess.sh",
-		"watch": "node ../build/bin/tsc -b ./tsconfig.json -w",
+		"watch": "node ../build/bin/tsc -b ./tsconfig-watch.json -w",
 		"test": "cd ../client-node-tests && npm test && cd ../client",
 		"clean": "node ../node_modules/rimraf/bin.js lib",
 		"preversion": "npm test"

diff --git a/client/src/browser/tsconfig-watch.json b/client/src/browser/tsconfig-watch.json
@@ -4,7 +4,7 @@
 		"noUnusedLocals": false,
 		"noUnusedParameters": false,
 		"assumeChangesOnlyAffectDirectDependencies": true,
-		"tsBuildInfoFile":"../../lib/browser-watch.tsbuildInfo"
+		"tsBuildInfoFile":"../../lib/browser/watch.tsbuildInfo"
 	},
 	"references": [
 		{ "path": "../common/tsconfig-watch.json" },

diff --git a/client/src/browser/tsconfig.json b/client/src/browser/tsconfig.json
@@ -1,7 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
-		"tsBuildInfoFile":"../../lib/browser.tsbuildInfo",
+		"tsBuildInfoFile":"../../lib/browser/compile.tsbuildInfo",
 		"rootDir": ".",
 		"outDir": "../../lib/browser",
 		"lib": [ "es2017", "webworker"]

diff --git a/client/src/common/tsconfig-watch.json b/client/src/common/tsconfig-watch.json
@@ -4,7 +4,7 @@
 		"noUnusedLocals": false,
 		"noUnusedParameters": false,
 		"assumeChangesOnlyAffectDirectDependencies": true,
-		"tsBuildInfoFile":"../../lib/common-watch.tsbuildInfo"
+		"tsBuildInfoFile":"../../lib/common/watch.tsbuildInfo"
 	},
 	"references": [
 		{ "path": "../../../protocol/src/common/tsconfig-watch.json" }

diff --git a/client/src/common/tsconfig.json b/client/src/common/tsconfig.json
@@ -1,7 +1,7 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
-		"tsBuildInfoFile":"../../lib/common.tsbuildInfo",
+		"tsBuildInfoFile":"../../lib/common/compile.tsbuildInfo",
 		"rootDir": ".",
 		"outDir": "../../lib/common"
 	},

diff --git a/client/src/node/package-lock.json b/client/src/node/package-lock.json
diff --git a/client/src/node/package.json b/client/src/node/package.json
diff --git a/client/src/node/tsconfig-watch.json b/client/src/node/tsconfig-watch.json
@@ -4,7 +4,7 @@
 		"noUnusedLocals": false,
 		"noUnusedParameters": false,
 		"assumeChangesOnlyAffectDirectDependencies": true,
-		"tsBuildInfoFile":"../../lib/node-watch.tsbuildInfo"
+		"tsBuildInfoFile":"../../lib/node/watch.tsbuildInfo"
 	},
 	"references": [
 		{ "path": "../common/tsconfig-watch.json" },

diff --git a/client/src/node/tsconfig.json b/client/src/node/tsconfig.json
@@ -1,9 +1,12 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
-		"tsBuildInfoFile":"../../lib/node.tsbuildInfo",
+		"tsBuildInfoFile":"../../lib/node/compile.tsbuildInfo",
 		"rootDir": ".",
-		"outDir": "../../lib/node"
+		"outDir": "../../lib/node",
+		"types": [
+			"node"
+		]
 	},
 	"include": [
 		"."