diff --git a/extensions/emmet/.vscodeignore b/extensions/emmet/.vscodeignore
index 573d91ebe6b..8180a27356e 100644
--- a/extensions/emmet/.vscodeignore
+++ b/extensions/emmet/.vscodeignore
@@ -3,7 +3,8 @@ src/**
 out/**
 tsconfig.json
 extension.webpack.config.js
+extension-browser.webpack.config.js
 CONTRIBUTING.md
 cgmanifest.json
 yarn.lock
-.vscode
\ No newline at end of file
+.vscode
diff --git a/extensions/extension-editing/.vscodeignore b/extensions/extension-editing/.vscodeignore
index 9d384dd9061..de8e6dc5913 100644
--- a/extensions/extension-editing/.vscodeignore
+++ b/extensions/extension-editing/.vscodeignore
@@ -3,4 +3,5 @@ src/**
 tsconfig.json
 out/**
 extension.webpack.config.js
-yarn.lock
\ No newline at end of file
+extension-browser.webpack.config.js
+yarn.lock
diff --git a/extensions/github-authentication/.vscodeignore b/extensions/github-authentication/.vscodeignore
index ee85b884502..5f3350adfb6 100644
--- a/extensions/github-authentication/.vscodeignore
+++ b/extensions/github-authentication/.vscodeignore
@@ -1,8 +1,10 @@
+.gitignore
 src/**
 !src/common/config.json
 out/**
 build/**
 extension.webpack.config.js
+extension-browser.webpack.config.js
 tsconfig.json
 yarn.lock
 README.md
diff --git a/extensions/html-language-features/.vscodeignore b/extensions/html-language-features/.vscodeignore
index 4215adf6eca..a4a4702c351 100644
--- a/extensions/html-language-features/.vscodeignore
+++ b/extensions/html-language-features/.vscodeignore
@@ -16,5 +16,7 @@ server/.npmignore
 yarn.lock
 server/extension.webpack.config.js
 extension.webpack.config.js
+server/extension-browser.webpack.config.js
+extension-browser.webpack.config.js
 CONTRIBUTING.md
 cgmanifest.json
diff --git a/extensions/image-preview/.vscodeignore b/extensions/image-preview/.vscodeignore
index 30d948fbc66..bcb886a094d 100644
--- a/extensions/image-preview/.vscodeignore
+++ b/extensions/image-preview/.vscodeignore
@@ -4,6 +4,7 @@ tsconfig.json
 out/test/**
 out/**
 extension.webpack.config.js
+extension-browser.webpack.config.js
 cgmanifest.json
 yarn.lock
 preview-src/**
diff --git a/extensions/markdown-language-features/.vscodeignore b/extensions/markdown-language-features/.vscodeignore
index bcb886a094d..9f1e0620775 100644
--- a/extensions/markdown-language-features/.vscodeignore
+++ b/extensions/markdown-language-features/.vscodeignore
@@ -1,4 +1,5 @@
 test/**
+test-workspace/**
 src/**
 tsconfig.json
 out/test/**
diff --git a/extensions/merge-conflict/.vscodeignore b/extensions/merge-conflict/.vscodeignore
index 36e8b0714fa..f071cfb7c71 100644
--- a/extensions/merge-conflict/.vscodeignore
+++ b/extensions/merge-conflict/.vscodeignore
@@ -2,4 +2,5 @@ src/**
 tsconfig.json
 out/**
 extension.webpack.config.js
-yarn.lock
\ No newline at end of file
+extension-browser.webpack.config.js
+yarn.lock
diff --git a/extensions/microsoft-authentication/.vscodeignore b/extensions/microsoft-authentication/.vscodeignore
index ed3f9d37c1f..46f23a20dba 100644
--- a/extensions/microsoft-authentication/.vscodeignore
+++ b/extensions/microsoft-authentication/.vscodeignore
@@ -1,10 +1,14 @@
 .vscode/**
 .vscode-test/**
 out/test/**
+out/**
+extension.webpack.config.js
+extension-browser.webpack.config.js
+yarn.lock
 src/**
 .gitignore
 vsc-extension-quickstart.md
 **/tsconfig.json
 **/tslint.json
 **/*.map
-**/*.ts
\ No newline at end of file
+**/*.ts
diff --git a/extensions/npm/.vscodeignore b/extensions/npm/.vscodeignore
index 27bb76ffd24..7700b94ebb0 100644
--- a/extensions/npm/.vscodeignore
+++ b/extensions/npm/.vscodeignore
@@ -3,4 +3,5 @@ out/**
 tsconfig.json
 .vscode/**
 extension.webpack.config.js
-yarn.lock
\ No newline at end of file
+extension-browser.webpack.config.js
+yarn.lock
diff --git a/extensions/package.json b/extensions/package.json
index 69f5ea275b4..665553eeeae 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -7,8 +7,5 @@
   },
   "scripts": {
     "postinstall": "node ./postinstall"
-  },
-  "devDependencies": {
-    "rimraf": "^3.0.2"
   }
 }
diff --git a/extensions/python/.vscodeignore b/extensions/python/.vscodeignore
index 4d5a14fc91e..b5c95d0fb64 100644
--- a/extensions/python/.vscodeignore
+++ b/extensions/python/.vscodeignore
@@ -1,6 +1,8 @@
 test/**
 src/**
+out/**
 tsconfig.json
 extension.webpack.config.js
+extension-browser.webpack.config.js
 cgmanifest.json
-.vscode
\ No newline at end of file
+.vscode
diff --git a/extensions/search-result/.vscodeignore b/extensions/search-result/.vscodeignore
new file mode 100644
index 00000000000..da3d2763686
--- /dev/null
+++ b/extensions/search-result/.vscodeignore
@@ -0,0 +1,6 @@
+src/**
+out/**
+tsconfig.json
+extension.webpack.config.js
+extension-browser.webpack.config.js
+yarn.lock
diff --git a/extensions/typescript-basics/.vscodeignore b/extensions/typescript-basics/.vscodeignore
index 06c7b11c5e6..0a0a50bc3e0 100644
--- a/extensions/typescript-basics/.vscodeignore
+++ b/extensions/typescript-basics/.vscodeignore
@@ -3,3 +3,4 @@ src/**
 test/**
 tsconfig.json
 cgmanifest.json
+syntaxes/Readme.md
diff --git a/extensions/typescript-language-features/.vscodeignore b/extensions/typescript-language-features/.vscodeignore
index 1edbc2a7b5e..079f06f08d9 100644
--- a/extensions/typescript-language-features/.vscodeignore
+++ b/extensions/typescript-language-features/.vscodeignore
@@ -1,8 +1,10 @@
 build/**
 src/**
 test/**
+test-workspace/**
 out/**
 tsconfig.json
 extension.webpack.config.js
+extension-browser.webpack.config.js
 cgmanifest.json
 yarn.lock
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index 86223e77212..102d128edb6 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -2,86 +2,7 @@
 # yarn lockfile v1
 
 
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-glob@^7.1.3:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 typescript@3.9.7:
   version "3.9.7"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
   integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=