From a9acf06479370215a716c593ce615cfdd6b81502 Mon Sep 17 00:00:00 2001
From: Joao Moreno <joao.moreno@microsoft.com>
Date: Fri, 7 Jan 2022 15:18:18 +0100
Subject: [PATCH] fix webignore patterns for appinsights

also, web: look for minified entrypoints as well

Closes: #140158
---
 build/.webignore  |  4 ++++
 build/lib/util.js | 11 +++++++++--
 build/lib/util.ts | 20 +++++++++++++++++---
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/build/.webignore b/build/.webignore
index fc1d2067643a5..f55882ba9d446 100644
--- a/build/.webignore
+++ b/build/.webignore
@@ -32,3 +32,7 @@ xterm-addon-webgl/out/**
 
 # This makes sure the model is included in the package
 !@vscode/vscode-languagedetection/model/**
+
+@microsoft/applicationinsights*/**
+@microsoft/dynamicproto-js/**
+!@microsoft/applicationinsights-web/dist/applicationinsights-web.min.js
\ No newline at end of file
diff --git a/build/lib/util.js b/build/lib/util.js
index 9effd6a0f22ef..e1fbc80f5d8a2 100644
--- a/build/lib/util.js
+++ b/build/lib/util.js
@@ -323,10 +323,17 @@ function acquireWebNodePaths() {
         }
         // Remove any starting path information so it's all relative info
         if (entryPoint.startsWith('./')) {
-            entryPoint = entryPoint.substr(2);
+            entryPoint = entryPoint.substring(2);
         }
         else if (entryPoint.startsWith('/')) {
-            entryPoint = entryPoint.substr(1);
+            entryPoint = entryPoint.substring(1);
+        }
+        // Search for a minified entrypoint as well
+        if (/(?<!\.min)\.js$/i.test(entryPoint)) {
+            const minEntryPoint = entryPoint.replace(/\.js$/i, '.min.js');
+            if (fs.existsSync(path.join(root, 'node_modules', key, minEntryPoint))) {
+                entryPoint = minEntryPoint;
+            }
         }
         nodePaths[key] = entryPoint;
     }
diff --git a/build/lib/util.ts b/build/lib/util.ts
index 229fffd425c7e..7b0fe60eb991a 100644
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
@@ -384,23 +384,37 @@ export function acquireWebNodePaths() {
 	for (const key of Object.keys(webPackages)) {
 		const packageJSON = path.join(root, 'node_modules', key, 'package.json');
 		const packageData = JSON.parse(fs.readFileSync(packageJSON, 'utf8'));
-		let entryPoint = packageData.browser ?? packageData.main;
+		let entryPoint: string = packageData.browser ?? packageData.main;
+
 		// On rare cases a package doesn't have an entrypoint so we assume it has a dist folder with a min.js
 		if (!entryPoint) {
 			// TODO @lramos15 remove this when jschardet adds an entrypoint so we can warn on all packages w/out entrypoint
 			if (key !== 'jschardet') {
 				console.warn(`No entry point for ${key} assuming dist/${key}.min.js`);
 			}
+
 			entryPoint = `dist/${key}.min.js`;
 		}
+
 		// Remove any starting path information so it's all relative info
 		if (entryPoint.startsWith('./')) {
-			entryPoint = entryPoint.substr(2);
+			entryPoint = entryPoint.substring(2);
 		} else if (entryPoint.startsWith('/')) {
-			entryPoint = entryPoint.substr(1);
+			entryPoint = entryPoint.substring(1);
 		}
+
+		// Search for a minified entrypoint as well
+		if (/(?<!\.min)\.js$/i.test(entryPoint)) {
+			const minEntryPoint = entryPoint.replace(/\.js$/i, '.min.js');
+
+			if (fs.existsSync(path.join(root, 'node_modules', key, minEntryPoint))) {
+				entryPoint = minEntryPoint;
+			}
+		}
+
 		nodePaths[key] = entryPoint;
 	}
+
 	return nodePaths;
 }