From 2fc804e857b543eda70efdaef920906c81893c14 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 24 Sep 2021 14:28:08 +0200
Subject: [PATCH] fix ts-webpack tasks (fixes #299)

---
 .../vscode-webpack/package.json               |  5 +++--
 .../vscode-webpack/tsconfig.json              |  1 +
 .../vscode-webpack/vscode/launch.json         |  5 +++--
 .../vscode-webpack/vscode/tasks.json          | 20 ++++++++++++++-----
 test/test.js                                  |  5 +++--
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/generators/app/templates/ext-command-ts/vscode-webpack/package.json b/generators/app/templates/ext-command-ts/vscode-webpack/package.json
index 37c60c5e..dadb682c 100644
--- a/generators/app/templates/ext-command-ts/vscode-webpack/package.json
+++ b/generators/app/templates/ext-command-ts/vscode-webpack/package.json
@@ -27,8 +27,9 @@
 		"compile": "webpack",
 		"watch": "webpack --watch",
 		"package": "webpack --mode production --devtool hidden-source-map",
-		"test-compile": "tsc -p . --outDir out",
-		"pretest": "<%= pkgManager %> run test-compile && <%= pkgManager %> run compile && <%= pkgManager %> run lint",
+		"compile-tests": "tsc -p . --outDir out",
+		"watch-tests": "tsc -p -w . --outDir out",
+		"pretest": "<%= pkgManager %> run compile-tests && <%= pkgManager %> run compile && <%= pkgManager %> run lint",
 		"lint": "eslint src --ext ts",
 		"test": "node ./out/test/runTest.js"<% if (insiders) { %>,
 		"update-proposed-api": "vscode-dts dev"<% } %>
diff --git a/generators/app/templates/ext-command-ts/vscode-webpack/tsconfig.json b/generators/app/templates/ext-command-ts/vscode-webpack/tsconfig.json
index 0e989c22..f4cdb90f 100644
--- a/generators/app/templates/ext-command-ts/vscode-webpack/tsconfig.json
+++ b/generators/app/templates/ext-command-ts/vscode-webpack/tsconfig.json
@@ -5,6 +5,7 @@
 		"lib": [
 			"ES2020"
 		],
+		"sourceMap": true,
 		"rootDir": "src",
 		"strict": true   /* enable all strict type-checking options */
 		/* Additional Checks */
diff --git a/generators/app/templates/ext-command-ts/vscode-webpack/vscode/launch.json b/generators/app/templates/ext-command-ts/vscode-webpack/vscode/launch.json
index 3bb6aee9..d4df9e96 100644
--- a/generators/app/templates/ext-command-ts/vscode-webpack/vscode/launch.json
+++ b/generators/app/templates/ext-command-ts/vscode-webpack/vscode/launch.json
@@ -26,9 +26,10 @@
 				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
 			],
 			"outFiles": [
-				"${workspaceFolder}/out/test/**/*.js"
+				"${workspaceFolder}/out/**/*.js",
+				"${workspaceFolder}/dist/**/*.js"
 			],
-			"preLaunchTask": "npm: test-watch"
+			"preLaunchTask": "tasks: watch-tests"
 		}
 	]
 }
diff --git a/generators/app/templates/ext-command-ts/vscode-webpack/vscode/tasks.json b/generators/app/templates/ext-command-ts/vscode-webpack/vscode/tasks.json
index 136cbbce..2acd96d1 100644
--- a/generators/app/templates/ext-command-ts/vscode-webpack/vscode/tasks.json
+++ b/generators/app/templates/ext-command-ts/vscode-webpack/vscode/tasks.json
@@ -7,12 +7,13 @@
 			"type": "npm",
 			"script": "watch",
 			"problemMatcher": [
-                "$ts-webpack-watch",
-                "$tslint-webpack-watch"
+				"$ts-webpack-watch",
+				"$tslint-webpack-watch"
 			],
 			"isBackground": true,
 			"presentation": {
-				"reveal": "never"
+				"reveal": "never",
+				"group": "watchers"
 			},
 			"group": {
 				"kind": "build",
@@ -21,13 +22,22 @@
 		},
 		{
 			"type": "npm",
-			"script": "test-watch",
+			"script": "watch-tests",
 			"problemMatcher": "$tsc-watch",
 			"isBackground": true,
 			"presentation": {
-				"reveal": "never"
+				"reveal": "never",
+				"group": "watchers"
 			},
 			"group": "build"
+		},
+		{
+			"label": "tasks: watch-tests",
+			"dependsOn": [
+				"npm: watch",
+				"npm: watch-tests"
+			],
+			"problemMatcher": []
 		}
 	]
 }
\ No newline at end of file
diff --git a/test/test.js b/test/test.js
index 5a354c61..e83b9361 100644
--- a/test/test.js
+++ b/test/test.js
@@ -769,9 +769,10 @@ describe('test code generator', function () {
                         "compile": "webpack",
                         "watch": "webpack --watch",
                         "package": "webpack --mode production --devtool hidden-source-map",
-                        "test-compile": "tsc -p . --outDir out",
+                        "compile-tests": "tsc -p . --outDir out",
+                        "watch-tests": "tsc -p -w . --outDir out",
                         "lint": "eslint src --ext ts",
-                        "pretest": "npm run test-compile && npm run compile && npm run lint",
+                        "pretest": "npm run compile-tests && npm run compile && npm run lint",
                         "test": "node ./out/test/runTest.js"
                     },
                     "categories": [