Merge recent 2025.01 updates to main (#6035)

This change pulls in a few changes from the 2025.01 branch that also
need to be made on main:

- updates from the upstream VS Code repository
- a fix for packaging on reh-web builds

---------

Co-authored-by: Melissa Barca <5323711+melissa-barca@users.noreply.github.com>
Co-authored-by: petetronic <1178561+petetronic@users.noreply.github.com>
Co-authored-by: sharon <sharon-wang@users.noreply.github.com>
Co-authored-by: sharon wang <25834218+sharon-wang@users.noreply.github.com>

build/gulpfile.reh.js

@@ -342,7 +342,8 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 		// --- Start Positron ---
 		// Note: The remote/reh-web/package.json is generated/updated in build/npm/postinstall.js
 		const packageJsonBase = type === 'reh-web' ? 'remote/reh-web' : 'remote';
-		const packageJsonStream = gulp.src(['remote/package.json'], { base: packageJsonBase })
+		const packageJsonStream = gulp.src([`${packageJsonBase}/package.json`], { base: packageJsonBase })
+			// --- End Positron ---
 			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, type: 'module' }))
 			.pipe(es.through(function (file) {
 				packageJsonContents = file.contents.toString();
@@ -391,7 +392,9 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 			].map(resource => gulp.src(resource, { base: '.' }).pipe(rename(resource)));
 		}
 
-		const all = es.merge(
+		// --- Start Positron ---
+		let all = es.merge(
+			// --- End Positron ---
 			packageJsonStream,
 			productJsonStream,
 			license,
@@ -401,6 +404,14 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 			...web
 		);
 
+		// --- Start Positron ---
+		if (type === 'reh-web') {
+			// External modules (React, etc.)
+			const moduleSources = gulp.src('src/esm-package-dependencies/**').pipe(rename(function (p) { p.dirname = path.join('out', 'esm-package-dependencies', p.dirname) }));
+			all = es.merge(all, moduleSources);
+		}
+		// --- End Positron ---
+
 		let result = all
 			.pipe(util.skipDirectories())
 			.pipe(util.fixWin32DirectoryPermissions());

build/gulpfile.vscode.web.js

@@ -40,6 +40,10 @@ const positronVersion = (quality && quality !== 'stable') ? `${product.positronV
 // --- End Positron ---
 
 const vscodeWebResourceIncludes = [
+	// --- Start Positron ---
+	// Positron Help
+	'out-build/vs/workbench/contrib/positronHelp/browser/resources/help.html',
+	// --- End Positron ---
 
 	// NLS
 	'out-build/nls.messages.js',

extensions/npm/package.json

@@ -36,11 +36,11 @@
     "@types/which": "^3.0.0"
   },
   "overrides": {
-    "micromatch": "^4.0.6",
+    "micromatch": "^4.0.8",
     "braces": "^3.0.3"
   },
   "resolutions": {
-    "micromatch": "^4.0.6",
+    "micromatch": "^4.0.8",
     "braces": "^3.0.3"
   },
   "main": "./out/npmMain",