From 723e64ba3bbeaa9bb4abd347689c9153bc0c091e Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 28 Aug 2018 15:36:09 -0700
Subject: [PATCH] Add js source maps to list of outputs when doing --build
 Fixes #26619

---
 src/compiler/tsbuild.ts                    | 13 ++++++++++---
 src/testRunner/unittests/tsbuild.ts        |  4 ++--
 tests/projects/sample1/core/tsconfig.json  |  3 ++-
 tests/projects/sample1/logic/tsconfig.json |  1 +
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts
index f038136e6a..e52c743bb3 100644
--- a/src/compiler/tsbuild.ts
+++ b/src/compiler/tsbuild.ts
@@ -317,12 +317,16 @@ namespace ts {
         }
 
         const outputs: string[] = [];
-        outputs.push(getOutputJavaScriptFileName(inputFileName, configFile));
+        const js = getOutputJavaScriptFileName(inputFileName, configFile);
+        outputs.push(js);
+        if (configFile.options.sourceMap) {
+            outputs.push(`${js}.map`);
+        }
         if (getEmitDeclarations(configFile.options) && !fileExtensionIs(inputFileName, Extension.Json)) {
             const dts = getOutputDeclarationFileName(inputFileName, configFile);
             outputs.push(dts);
             if (configFile.options.declarationMap) {
-                outputs.push(dts + ".map");
+                outputs.push(`${dts}.map`);
             }
         }
         return outputs;
@@ -334,11 +338,14 @@ namespace ts {
         }
         const outputs: string[] = [];
         outputs.push(project.options.outFile);
+        if (project.options.sourceMap) {
+            outputs.push(`${project.options.outFile}.map`);
+        }
         if (getEmitDeclarations(project.options)) {
             const dts = changeExtension(project.options.outFile, Extension.Dts);
             outputs.push(dts);
             if (project.options.declarationMap) {
-                outputs.push(dts + ".map");
+                outputs.push(`${dts}.map`);
             }
         }
         return outputs;
diff --git a/src/testRunner/unittests/tsbuild.ts b/src/testRunner/unittests/tsbuild.ts
index b7d708446c..ea99ee9245 100644
--- a/src/testRunner/unittests/tsbuild.ts
+++ b/src/testRunner/unittests/tsbuild.ts
@@ -5,8 +5,8 @@ namespace ts {
         const projFs = loadProjectFromDisk("tests/projects/sample1");
 
         const allExpectedOutputs = ["/src/tests/index.js",
-            "/src/core/index.js", "/src/core/index.d.ts",
-            "/src/logic/index.js", "/src/logic/index.d.ts"];
+            "/src/core/index.js", "/src/core/index.d.ts", "/src/core/index.d.ts.map",
+            "/src/logic/index.js", "/src/logic/index.js.map", "/src/logic/index.d.ts"];
 
         describe("tsbuild - sanity check of clean build of 'sample1' project", () => {
             it("can build the sample project 'sample1' without error", () => {
diff --git a/tests/projects/sample1/core/tsconfig.json b/tests/projects/sample1/core/tsconfig.json
index b8332f5c47..24b64bc7b2 100644
--- a/tests/projects/sample1/core/tsconfig.json
+++ b/tests/projects/sample1/core/tsconfig.json
@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
         "composite": true,
-        "declaration": true
+        "declaration": true,
+        "declarationMap": true
     }
 }
\ No newline at end of file
diff --git a/tests/projects/sample1/logic/tsconfig.json b/tests/projects/sample1/logic/tsconfig.json
index 43c78ea4e9..939e6f5659 100644
--- a/tests/projects/sample1/logic/tsconfig.json
+++ b/tests/projects/sample1/logic/tsconfig.json
@@ -2,6 +2,7 @@
     "compilerOptions": {
         "composite": true,
         "declaration": true,
+        "sourceMap": true,
         "forceConsistentCasingInFileNames": true
     },
     "references": [