From 7bcb2550df65fd90d3f7a6f2e1aefc9027be9a9e Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Tue, 3 Mar 2026 15:13:11 +0100
Subject: [PATCH] Enhance source map handling in build tasks for CI
 environments

---
 build/gulpfile.vscode.ts     | 5 +++--
 build/gulpfile.vscode.web.ts | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
index 686028110b5..b38f9a2f08b 100644
--- a/build/gulpfile.vscode.ts
+++ b/build/gulpfile.vscode.ts
@@ -237,8 +237,9 @@ function runTsGoTypeCheck(): Promise<void> {
 }
 
 const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
-const useCdnSourceMapsForPackagingTasks = !!process.env['CI'];
-const stripSourceMapsInPackagingTasks = !!process.env['CI'];
+const isCI = !!process.env['CI'] || !!process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] || !!process.env['GITHUB_WORKSPACE'];
+const useCdnSourceMapsForPackagingTasks = isCI;
+const stripSourceMapsInPackagingTasks = isCI;
 const minifyVSCodeTask = task.define('minify-vscode', task.series(
 	bundleVSCodeTask,
 	util.rimraf('out-vscode-min'),
diff --git a/build/gulpfile.vscode.web.ts b/build/gulpfile.vscode.web.ts
index e9cc3720fcf..3e6b29adfe9 100644
--- a/build/gulpfile.vscode.web.ts
+++ b/build/gulpfile.vscode.web.ts
@@ -33,7 +33,7 @@ const quality = (product as { quality?: string }).quality;
 const version = (quality && quality !== 'stable') ? `${packageJson.version}-${quality}` : packageJson.version;
 
 // esbuild-based bundle for standalone web
-function runEsbuildBundle(outDir: string, minify: boolean, nls: boolean): Promise<void> {
+function runEsbuildBundle(outDir: string, minify: boolean, nls: boolean, sourceMapBaseUrl?: string): Promise<void> {
 	return new Promise((resolve, reject) => {
 		const scriptPath = path.join(REPO_ROOT, 'build/next/index.ts');
 		const args = [scriptPath, 'bundle', '--out', outDir, '--target', 'web'];
@@ -44,6 +44,9 @@ function runEsbuildBundle(outDir: string, minify: boolean, nls: boolean): Promis
 		if (nls) {
 			args.push('--nls');
 		}
+		if (sourceMapBaseUrl) {
+			args.push('--source-map-base-url', sourceMapBaseUrl);
+		}
 
 		const proc = cp.spawn(process.execPath, args, {
 			cwd: REPO_ROOT,
@@ -164,8 +167,9 @@ const minifyVSCodeWebTask = task.define('minify-vscode-web-OLD', task.series(
 gulp.task(minifyVSCodeWebTask);
 
 // esbuild-based tasks (new)
+const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
 const esbuildBundleVSCodeWebTask = task.define('esbuild-vscode-web', () => runEsbuildBundle('out-vscode-web', false, true));
-const esbuildBundleVSCodeWebMinTask = task.define('esbuild-vscode-web-min', () => runEsbuildBundle('out-vscode-web-min', true, true));
+const esbuildBundleVSCodeWebMinTask = task.define('esbuild-vscode-web-min', () => runEsbuildBundle('out-vscode-web-min', true, true, `${sourceMappingURLBase}/core`));
 
 function packageTask(sourceFolderName: string, destinationFolderName: string) {
 	const destination = path.join(BUILD_ROOT, destinationFolderName);