Merge branch 'main' into terminal-quickpick-index

.eslintignore

@@ -26,7 +26,5 @@
 **/src/vs/*/**/*.d.ts
 **/src/vs/base/test/common/filters.perf.data.js
 **/src/vs/loader.js
-**/src/vs/nls.build.js
-**/src/vs/nls.js
 **/test/unit/assert.js
 **/typings/**

.eslintrc.json

@@ -210,7 +210,8 @@
 						// - electron-browser
 						"when": "hasBrowser",
 						"allow": [
-							"vs/css!./**/*"
+							"vs/css!./**/*",
+							"@microsoft/applicationinsights-web"
 						]
 					},
 					{
@@ -220,15 +221,12 @@
 						// - electron-main
 						"when": "hasNode",
 						"allow": [
-							"@microsoft/applicationinsights-web",
 							"@parcel/watcher",
 							"@vscode/sqlite3",
 							"@vscode/vscode-languagedetection",
 							"@vscode/ripgrep",
 							"@vscode/iconv-lite-umd",
 							"applicationinsights",
-							"@microsoft/1ds-core-js",
-							"@microsoft/1ds-post-js",
 							"assert",
 							"child_process",
 							"console",
@@ -277,6 +275,7 @@
 						// imports that are allowed in all /test/ files
 						"when": "test",
 						"allow": [
+							"vs/css.build",
 							"assert",
 							"sinon",
 							"sinon-test"
@@ -331,7 +330,9 @@
 							"vs/base/~",
 							"vs/base/parts/*/~",
 							"vs/platform/*/~",
-							"tas-client-umd" // node module allowed even in /common/
+							"tas-client-umd", // node module allowed even in /common/
+							"@microsoft/1ds-core-js",// node module allowed even in /common/
+							"@microsoft/1ds-post-js" // node module allowed even in /common/
 						]
 					},
 					{
@@ -445,8 +446,7 @@
 							}, // TODO@layers
 							"tas-client-umd", // node module allowed even in /common/
 							"vscode-textmate", // node module allowed even in /common/
-							"@vscode/vscode-languagedetection", // node module allowed even in /common/
-							"@microsoft/applicationinsights-web" // node module allowed even in /common/
+							"@vscode/vscode-languagedetection" // node module allowed even in /common/
 						]
 					},
 					{
@@ -577,7 +577,7 @@
 						"restrictions": []
 					},
 					{
-						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.d.ts,nls.mock.ts}",
+						"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts,nls.build.ts,nls.mock.ts}",
 						"restrictions": []
 					},
 					{

.github/workflows/basic.yml

@@ -62,7 +62,7 @@ jobs:
         run: yarn --frozen-lockfile --network-timeout 180000
 
       - name: Compile and Download
-        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64"
 
       - name: Run Unit Tests
         id: electron-unit-tests
@@ -114,9 +114,6 @@ jobs:
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
         run: yarn --frozen-lockfile --network-timeout 180000
 
-      - name: Download Playwright
-        run: yarn playwright-install
-
       - name: Run Hygiene Checks
         run: yarn gulp hygiene
 

.yarnrc

@@ -1,4 +1,4 @@
 disturl "https://electronjs.org/headers"
-target "18.3.3"
+target "18.3.4"
 runtime "electron"
 build_from_source "true"

build/.moduleignore

@@ -122,10 +122,6 @@ vscode-windows-ca-certs/**/*
 node-addon-api/**/*
 prebuild-install/**/*
 
-@microsoft/applicationinsights*/**
-@microsoft/dynamicproto-js/**
-!@microsoft/applicationinsights-web/dist/applicationinsights-web.min.js
-
 # other node modules
 
 **/docs/**

build/.webignore

@@ -33,6 +33,3 @@ 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

build/azure-pipelines/linux/product-build-linux-client-test.yml

@@ -122,24 +122,23 @@ steps:
       timeoutInMinutes: 20
       displayName: Run smoke tests (Browser, Chromium)
 
-  # TODO enable again after https://github.com/microsoft/vscode/issues/152143 is fixed
-  # - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
-  #   - script: |
-  #       set -e
-  #       APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-  #       yarn smoketest-no-compile --tracing --build "$APP_PATH"
-  #     timeoutInMinutes: 20
-  #     displayName: Run smoke tests (Electron)
-
-  # - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
-  #   - script: |
-  #       set -e
-  #       yarn gulp compile-extension:vscode-test-resolver
-  #       APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
-  #       VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
-  #       yarn smoketest-no-compile --tracing --remote --build "$APP_PATH"
-  #     timeoutInMinutes: 20
-  #     displayName: Run smoke tests (Remote)
+  - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
+    - script: |
+        set -e
+        APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+        yarn smoketest-no-compile --tracing --build "$APP_PATH"
+      timeoutInMinutes: 20
+      displayName: Run smoke tests (Electron)
+
+  - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
+    - script: |
+        set -e
+        yarn gulp compile-extension:vscode-test-resolver
+        APP_PATH=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
+        VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
+        yarn smoketest-no-compile --tracing --remote --build "$APP_PATH"
+      timeoutInMinutes: 20
+      displayName: Run smoke tests (Remote)
 
   - ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
     - script: |

build/filters.js

@@ -66,8 +66,6 @@ module.exports.indentationFilter = [
 	'!**/LICENSE.{txt,rtf}',
 	'!LICENSES.chromium.html',
 	'!**/LICENSE',
-	'!src/vs/nls.js',
-	'!src/vs/nls.build.js',
 	'!src/vs/loader.js',
 	'!src/vs/base/browser/dompurify/*',
 	'!src/vs/base/common/marked/marked.js',

build/gulpfile.editor.js

@@ -29,14 +29,17 @@ const editorEntryPoints = [
 		name: 'vs/editor/editor.main',
 		include: [],
 		exclude: ['vs/css', 'vs/nls'],
-		prepend: ['out-editor-build/vs/css.js', 'out-editor-build/vs/nls.js'],
+		prepend: [
+			{ path: 'out-editor-build/vs/css.js', amdModuleId: 'vs/css' },
+			{ path: 'out-editor-build/vs/nls.js', amdModuleId: 'vs/nls' }
+		],
 	},
 	{
 		name: 'vs/base/common/worker/simpleWorker',
 		include: ['vs/editor/common/services/editorSimpleWorker'],
 		exclude: ['vs/nls'],
-		prepend: ['vs/loader.js'],
-		append: ['vs/base/worker/workerMain'],
+		prepend: [{ path: 'vs/loader.js' }],
+		append: [{ path: 'vs/base/worker/workerMain' }],
 		dest: 'vs/base/worker/workerMain.js'
 	}
 ];
@@ -110,9 +113,6 @@ const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () =>
 			'inlineEntryPoint:0.ts',
 			'inlineEntryPoint:1.ts',
 			'vs/loader.js',
-			'vs/nls.ts',
-			'vs/nls.build.js',
-			'vs/nls.d.ts',
 			'vs/base/worker/workerMain.ts',
 		],
 		renames: {

build/lib/bundle.js

@@ -42,14 +42,20 @@ function bundle(entryPoints, config, callback) {
     if (!config.paths['vs/css']) {
         config.paths['vs/css'] = 'out-build/vs/css.build';
     }
+    config.buildForceInvokeFactory = config.buildForceInvokeFactory || {};
+    config.buildForceInvokeFactory['vs/nls'] = true;
+    config.buildForceInvokeFactory['vs/css'] = true;
     loader.config(config);
     loader(['require'], (localRequire) => {
-        const resolvePath = (path) => {
-            const r = localRequire.toUrl(path);
-            if (!/\.js/.test(r)) {
-                return r + '.js';
+        const resolvePath = (entry) => {
+            let r = localRequire.toUrl(entry.path);
+            if (!r.endsWith('.js')) {
+                r += '.js';
             }
-            return r;
+            // avoid packaging the build version of plugins:
+            r = r.replace('vs/nls.build.js', 'vs/nls.js');
+            r = r.replace('vs/css.build.js', 'vs/css.js');
+            return { path: r, amdModuleId: entry.amdModuleId };
         };
         for (const moduleId in entryPointsMap) {
             const entryPoint = entryPointsMap[moduleId];
@@ -330,10 +336,13 @@ function emitEntryPoint(modulesMap, deps, entryPoint, includedModules, prepend,
             plugin.writeFile(pluginName, entryPoint, req, write, {});
         }
     });
-    const toIFile = (path) => {
-        const contents = readFileAndRemoveBOM(path);
+    const toIFile = (entry) => {
+        let contents = readFileAndRemoveBOM(entry.path);
+        if (entry.amdModuleId) {
+            contents = contents.replace(/^define\(/m, `define("${entry.amdModuleId}",`);
+        }
         return {
-            path: path,
+            path: entry.path,
             contents: contents
         };
     };

build/lib/bundle.ts

@@ -42,12 +42,17 @@ interface ILoaderPluginReqFunc {
 	toUrl(something: string): string;
 }
 
+export interface IExtraFile {
+	path: string;
+	amdModuleId?: string;
+}
+
 export interface IEntryPoint {
 	name: string;
 	include?: string[];
 	exclude?: string[];
-	prepend?: string[];
-	append?: string[];
+	prepend?: IExtraFile[];
+	append?: IExtraFile[];
 	dest?: string;
 }
 
@@ -92,6 +97,13 @@ interface IPartialBundleResult {
 export interface ILoaderConfig {
 	isBuild?: boolean;
 	paths?: { [path: string]: any };
+	/*
+	 * Normally, during a build, no module factories are invoked. This can be used
+	 * to forcefully execute a module's factory.
+	 */
+	buildForceInvokeFactory: {
+		[moduleId: string]: boolean;
+	};
 }
 
 /**
@@ -132,15 +144,21 @@ export function bundle(entryPoints: IEntryPoint[], config: ILoaderConfig, callba
 	if (!config.paths['vs/css']) {
 		config.paths['vs/css'] = 'out-build/vs/css.build';
 	}
+	config.buildForceInvokeFactory = config.buildForceInvokeFactory || {};
+	config.buildForceInvokeFactory['vs/nls'] = true;
+	config.buildForceInvokeFactory['vs/css'] = true;
 	loader.config(config);
 
 	loader(['require'], (localRequire: any) => {
-		const resolvePath = (path: string) => {
-			const r = localRequire.toUrl(path);
-			if (!/\.js/.test(r)) {
-				return r + '.js';
+		const resolvePath = (entry: IExtraFile) => {
+			let r = localRequire.toUrl(entry.path);
+			if (!r.endsWith('.js')) {
+				r += '.js';
 			}
-			return r;
+			// avoid packaging the build version of plugins:
+			r = r.replace('vs/nls.build.js', 'vs/nls.js');
+			r = r.replace('vs/css.build.js', 'vs/css.js');
+			return { path: r, amdModuleId: entry.amdModuleId };
 		};
 		for (const moduleId in entryPointsMap) {
 			const entryPoint = entryPointsMap[moduleId];
@@ -403,8 +421,8 @@ function emitEntryPoint(
 	deps: IGraph,
 	entryPoint: string,
 	includedModules: string[],
-	prepend: string[],
-	append: string[],
+	prepend: IExtraFile[],
+	append: IExtraFile[],
 	dest: string | undefined
 ): IEmitEntryPointResult {
 	if (!dest) {
@@ -478,10 +496,13 @@ function emitEntryPoint(
 		}
 	});
 
-	const toIFile = (path: string): IFile => {
-		const contents = readFileAndRemoveBOM(path);
+	const toIFile = (entry: IExtraFile): IFile => {
+		let contents = readFileAndRemoveBOM(entry.path);
+		if (entry.amdModuleId) {
+			contents = contents.replace(/^define\(/m, `define("${entry.amdModuleId}",`);
+		}
 		return {
-			path: path,
+			path: entry.path,
 			contents: contents
 		};
 	};