Update vscode to latest main version.

build/gulpfile.vscode.web.mjs

@@ -88,6 +88,7 @@ const vscodeWebEntryPoints = [
 	buildfile.workerBackgroundTokenization,
 	buildfile.keyboardMaps,
 	buildfile.workbenchWeb,
+	buildfile.codeWeb,
 	buildfile.entrypoint('vs/workbench/workbench.web.main.internal') // TODO@esm remove line when we stop supporting web-amd-esm-bridge
 ].flat();
 

build/hygiene.mjs

@@ -103,19 +103,20 @@ export function hygiene(some, runEslint = true) {
 		this.emit('data', file);
 	});
 
-	const copyrights = es.through(function (file) {
-		const lines = file.__lines;
+	// MEMBRANE:
+	// const copyrights = es.through(function (file) {
+	// 	const lines = file.__lines;
 
-		for (let i = 0; i < copyrightHeaderLines.length; i++) {
-			if (lines[i] !== copyrightHeaderLines[i]) {
-				console.error(file.relative + ': Missing or bad copyright statement');
-				errorCount++;
-				break;
-			}
-		}
+	// 	for (let i = 0; i < copyrightHeaderLines.length; i++) {
+	// 		if (lines[i] !== copyrightHeaderLines[i]) {
+	// 			console.error(file.relative + ': Missing or bad copyright statement');
+	// 			errorCount++;
+	// 			break;
+	// 		}
+	// 	}
 
-		this.emit('data', file);
-	});
+	// 	this.emit('data', file);
+	// });
 
 	const formatting = es.map(function (file, cb) {
 		try {
@@ -165,9 +166,10 @@ export function hygiene(some, runEslint = true) {
 		.pipe(unicode)
 		.pipe(unicodeFilterStream.restore)
 		.pipe(filter(indentationFilter))
-		.pipe(indentation)
-		.pipe(filter(copyrightFilter))
-		.pipe(copyrights);
+		.pipe(indentation);
+		// MEMBRANE:
+		// .pipe(filter(copyrightFilter))
+		// .pipe(copyrights);
 
 	/** @type {import('stream').Stream[]} */
 	const streams = [

build/lib/extensions.ts

@@ -373,6 +373,46 @@ function isWebExtension(manifest: IExtensionManifest): boolean {
 	return true;
 }
 
+const allowedExtensions = [
+	'configuration-editing',
+	'css',
+	'css-language-features',
+	'diff',
+	'emmet',
+	'handlebars',
+	'html',
+	'html-language-features',
+	'javascript',
+	'json',
+	'json-language-features',
+	'log',
+	'markdown',
+	'markdown-basics',
+	'markdown-language-features',
+	'markdown-math',
+	'media-preview',
+	'merge-conflict',
+	'microsoft-authentication',
+	'npm',
+	'php',
+	'references-view',
+	'scss',
+	'search-result',
+	'simple-browser',
+	'sql',
+	'theme-defaults',
+	'theme-solarized-dark',
+	'theme-solarized-light',
+	'typescript',
+	'typescript-basics',
+	'typescript-language-features',
+	'xml',
+	'yaml',
+];
+export function isAllowedInMembrane(name: string): boolean {
+	return allowedExtensions.some(allowedExtensionName => allowedExtensionName === name);
+}
+
 /**
  * Package local extensions that are known to not have native dependencies. Mutually exclusive to {@link packageNativeLocalExtensionsStream}.
  * @param forWeb build the extensions that have web targets
@@ -427,6 +467,7 @@ function doPackageLocalExtensionsStream(forWeb: boolean, disableMangle: boolean,
 			.filter(({ name }) => native ? nativeExtensionsSet.has(name) : !nativeExtensionsSet.has(name))
 			.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
 			.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
+			.filter(({ name }) => isAllowedInMembrane(name))
 			.filter(({ manifestPath }) => (forWeb ? isWebExtension(require(manifestPath)) : true))
 	);
 	const localExtensionsStream = minifyExtensionResources(
@@ -510,6 +551,11 @@ export function scanBuiltinExtensions(extensionsRoot: string, exclude: string[]
 			if (!isWebExtension(packageJSON)) {
 				continue;
 			}
+
+			// MEMBRANE: only include the minimum set of extensions
+			if (!isAllowedInMembrane(packageJSON.name)) {
+				continue;
+			}
 			const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));
 			const packageNLSPath = children.filter(child => child === 'package.nls.json')[0];
 			const packageNLS = packageNLSPath ? JSON.parse(fs.readFileSync(path.join(extensionsRoot, extensionFolder, packageNLSPath)).toString()) : undefined;

build/lib/git.ts

@@ -9,7 +9,23 @@ import fs from 'fs';
  * Returns the sha1 commit version of a repository or undefined in case of failure.
  */
 export function getVersion(repo: string): string | undefined {
-	const git = path.join(repo, '.git');
+	// MEMBRANE: make `getVersion` work when vscode is a submodule and it's .git was hoisted.
+	const maybeGit = path.join(repo, '.git');
+	const stat = fs.statSync(maybeGit);
+	let git: string;
+	if (stat.isFile()) {
+		const data = fs.readFileSync(maybeGit, 'utf8');
+		const gitdir = data.match(/^gitdir: (.*)$/m)?.[1];
+		if (!gitdir) {
+			throw new Error(`Failed to parse .git submodule info in ${maybeGit}`);
+		}
+		git = path.join(repo, gitdir);
+	} else if (stat.isDirectory()) {
+		git = maybeGit;
+	} else {
+		return undefined;
+	}
+
 	const headPath = path.join(git, 'HEAD');
 	let head: string;
 

build/npm/postinstall.js

@@ -185,5 +185,8 @@ for (let dir of dirs) {
 	npmInstall(dir, opts);
 }
 
-cp.execSync('git config pull.rebase merges');
-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
+// This commands don't play well with being ran inside a submodule so just skip them in that context
+if (!process.cwd().includes("mnode")) {
+	cp.execSync('git config pull.rebase merges');
+	cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
+}

eslint.config.js

@@ -2172,4 +2172,17 @@ export default tseslint.config(
 			'@typescript-eslint/consistent-generic-constructors': ['warn', 'constructor'],
 		}
 	},
+	// Membrane files: disable code-import-patterns to allow imports from platform/terminal/common
+	{
+		files: ['**/*.membrane.ts'],
+		languageOptions: {
+			parser: tseslint.parser,
+		},
+		plugins: {
+			'local': pluginLocal,
+		},
+		rules: {
+			'local/code-import-patterns': 'off'
+		}
+	},
 );