From 547c1c2c61baa4ec87bf5fb6af62ff80afa47d9a Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Mon, 27 Jul 2020 14:23:05 +0200
Subject: [PATCH] Add web extensions filder in scanBuiltinExtensions

---
 build/lib/extensions.js | 5 ++++-
 build/lib/extensions.ts | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build/lib/extensions.js b/build/lib/extensions.js
index 7fbaa62db67..939f795866f 100644
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -263,7 +263,7 @@ function packageMarketplaceExtensionsStream(forWeb) {
         .pipe(util2.setExecutableBit(['**/*.sh'])));
 }
 exports.packageMarketplaceExtensionsStream = packageMarketplaceExtensionsStream;
-function scanBuiltinExtensions(extensionsRoot) {
+function scanBuiltinExtensions(extensionsRoot, forWeb) {
     const scannedExtensions = [];
     const extensionsFolders = fs.readdirSync(extensionsRoot);
     for (const extensionFolder of extensionsFolders) {
@@ -272,6 +272,9 @@ function scanBuiltinExtensions(extensionsRoot) {
             continue;
         }
         let packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8'));
+        if (forWeb && !isWebExtension(packageJSON)) {
+            continue;
+        }
         const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));
         const packageNLS = children.filter(child => child === 'package.nls.json')[0];
         const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0];
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index b7425f06dbb..2d8afa9daad 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -340,7 +340,7 @@ export interface IScannedBuiltinExtension {
 	changelogPath?: string,
 }
 
-export function scanBuiltinExtensions(extensionsRoot: string): IScannedBuiltinExtension[] {
+export function scanBuiltinExtensions(extensionsRoot: string, forWeb: boolean): IScannedBuiltinExtension[] {
 	const scannedExtensions: IScannedBuiltinExtension[] = [];
 	const extensionsFolders = fs.readdirSync(extensionsRoot);
 	for (const extensionFolder of extensionsFolders) {
@@ -349,6 +349,9 @@ export function scanBuiltinExtensions(extensionsRoot: string): IScannedBuiltinEx
 			continue;
 		}
 		let packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString('utf8'));
+		if (forWeb && !isWebExtension(packageJSON)) {
+			continue;
+		}
 		const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));
 		const packageNLS = children.filter(child => child === 'package.nls.json')[0];
 		const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0];