Merge pull request #29591 from Microsoft/removeUnnecessaryDeclarations

Do not generate dts files for tsc/tsserver and such when we do not use it at all.
microsoft · Jan 25, 2019 · fa74cef · fa74cef
2 parents 4da9d8b + e51a2fe
commit fa74cef
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 9 deletions.
diff --git a/Gulpfile.js b/Gulpfile.js
@@ -138,7 +138,7 @@ gulp.task(typescriptServicesProject, /*help*/ false, () => {
         compilerOptions: {
             "removeComments": false,
             "stripInternal": true,
-            "declarationMap": false,
+            "declaration": true,
             "outFile": "typescriptServices.out.js" // must align with same task in jakefile. We fix this name below.
         }
     });

diff --git a/Jakefile.js b/Jakefile.js
@@ -361,7 +361,7 @@ file(ConfigFileFor.tsserverLibrary, [], function () {
         compilerOptions: {
             "removeComments": false,
             "stripInternal": true,
-            "declarationMap": false,
+            "declaration": true,
             "outFile": "tsserverlibrary.out.js"
         }
     })

diff --git a/src/cancellationToken/tsconfig.json b/src/cancellationToken/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
     "compilerOptions": {
         "outDir": "../../built/local/",
         "rootDir": ".",

diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
     "compilerOptions": {
         "outFile": "../../built/local/run.js",
         "composite": false,

diff --git a/src/tsc/tsconfig.json b/src/tsc/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
     "compilerOptions": {
         "outFile": "../../built/local/tsc.js"
     },

diff --git a/src/tsconfig-noncomposite-base.json b/src/tsconfig-noncomposite-base.json
@@ -0,0 +1,8 @@
+{
+    "extends": "./tsconfig-base",
+    "compilerOptions": {
+        "declaration": false,
+        "declarationMap": false,
+        "composite":  false
+    }
+}
diff --git a/src/tsserver/tsconfig.json b/src/tsserver/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
 
     "compilerOptions": {
         "outFile": "../../built/local/tsserver.js",

diff --git a/src/typingsInstaller/tsconfig.json b/src/typingsInstaller/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
     "compilerOptions": {
         "removeComments": true,
         "outFile": "../../built/local/typingsInstaller.js",

diff --git a/src/watchGuard/tsconfig.json b/src/watchGuard/tsconfig.json
@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig-base",
+    "extends": "../tsconfig-noncomposite-base",
     "compilerOptions": {
         "removeComments": true,
         "outFile": "../../built/local/watchGuard.js",
@@ -13,4 +13,4 @@
     "files": [
         "watchGuard.ts"
     ]
-}
+}