From 9be6a2476e32e2e8263876fba37978598586b030 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 5 May 2021 08:29:53 -0700
Subject: [PATCH] Combine build ext and build ext media tasks

Previously I split these up since I wasn't sure if we wanted finer grained control over them. Sounds like having them combined is more convenient
---
 .vscode/tasks.json | 44 ++------------------------------------------
 package.json       |  7 ++-----
 2 files changed, 4 insertions(+), 47 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 8fb5cb440b7..2d844e47c21 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -55,39 +55,11 @@
 				}
 			}
 		},
-		{
-			"type": "npm",
-			"script": "watch-extension-mediad",
-			"label": "Ext Media - Build",
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never",
-				"group": "buildWatchers"
-			},
-			"problemMatcher": {
-				"owner": "typescript",
-				"applyTo": "closedDocuments",
-				"fileLocation": [
-					"absolute"
-				],
-				"pattern": {
-					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
-					"file": 1,
-					"location": 2,
-					"message": 3
-				},
-				"background": {
-					"beginsPattern": "Starting compilation",
-					"endsPattern": "Finished compilation"
-				}
-			}
-		},
 		{
 			"label": "VS Code - Build",
 			"dependsOn": [
 				"Core - Build",
-				"Ext - Build",
-				"Ext Media - Build",
+				"Ext - Build"
 			],
 			"group": {
 				"kind": "build",
@@ -117,23 +89,11 @@
 			},
 			"problemMatcher": "$tsc"
 		},
-		{
-			"type": "npm",
-			"script": "kill-watch-extension-mediad",
-			"label": "Kill Ext Media - Build",
-			"group": "build",
-			"presentation": {
-				"reveal": "never",
-				"group": "buildKillers"
-			},
-			"problemMatcher": "$tsc"
-		},
 		{
 			"label": "Kill VS Code - Build",
 			"dependsOn": [
 				"Kill Core - Build",
-				"Kill Ext - Build",
-				"Kill Ext Media - Build",
+				"Kill Ext - Build"
 			],
 			"group": "build",
 			"problemMatcher": []
diff --git a/package.json b/package.json
index 1956b94ed17..3ff44feb516 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "preinstall": "node build/npm/preinstall.js",
     "postinstall": "node build/npm/postinstall.js",
     "compile": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile",
-    "watch": "npm-run-all -lp watch-client watch-extensions watch-extension-media",
+    "watch": "npm-run-all -lp watch-client watch-extensions",
     "watchd": "deemon yarn watch",
     "watch-webd": "deemon yarn watch-web",
     "kill-watchd": "deemon --kill yarn watch",
@@ -24,12 +24,9 @@
     "watch-client": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-client",
     "watch-clientd": "deemon yarn watch-client",
     "kill-watch-clientd": "deemon --kill yarn watch-client",
-    "watch-extensions": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-extensions",
-    "watch-extension-media": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-extension-media",
+    "watch-extensions": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-extensions watch-extension-media",
     "watch-extensionsd": "deemon yarn watch-extensions",
     "kill-watch-extensionsd": "deemon --kill yarn watch-extensions",
-    "watch-extension-mediad": "deemon yarn watch-extension-media",
-    "kill-watch-extension-mediad": "deemon --kill yarn watch-extension-media",
     "mocha": "mocha test/unit/node/all.js --delay",
     "precommit": "node build/hygiene.js",
     "gulp": "node --max_old_space_size=8192 ./node_modules/gulp/bin/gulp.js",
-- 
GitLab