build/azure-pipelines/cli/prepare.ts

@@ -50,7 +50,7 @@ const setLauncherEnvironmentVars = () => {
 		['VSCODE_CLI_NAME_LONG', product.nameLong],
 		['VSCODE_CLI_QUALITYLESS_PRODUCT_NAME', product.nameLong.replace(/ - [a-z]+$/i, '')],
 		['VSCODE_CLI_APPLICATION_NAME', product.applicationName],
-		['VSCODE_CLI_EDITOR_WEB_URL', product.editorWebUrl],
+		['VSCODE_CLI_EDITOR_WEB_URL', product.tunnelApplicationConfig?.editorWebUrl],
 		['VSCODE_CLI_COMMIT', commit],
 		[
 			'VSCODE_CLI_WIN32_APP_IDS',

build/gulpfile.reh.js

@@ -378,7 +378,8 @@ function tweakProductForServerWeb(product) {
 						// TODO: we cannot inline `product.json` because
 						// it is being changed during build time at a later
 						// point in time (such as `checksums`)
-						'../product.json'
+						'../product.json',
+						'../package.json'
 					]
 				}
 			}

build/gulpfile.vscode.js

@@ -119,7 +119,8 @@ const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
 					// TODO: we cannot inline `product.json` because
 					// it is being changed during build time at a later
 					// point in time (such as `checksums`)
-					'../product.json'
+					'../product.json',
+					'../package.json',
 				]
 			},
 			manual: [

extensions/github-authentication/package.json

@@ -17,10 +17,7 @@
     "ui",
     "workspace"
   ],
-  "activationEvents": [
-    "onAuthenticationRequest:github",
-    "onAuthenticationRequest:github-enterprise"
-  ],
+  "activationEvents": [],
   "capabilities": {
     "virtualWorkspaces": true,
     "untrustedWorkspaces": {

extensions/github/package.json

@@ -13,7 +13,9 @@
     "Other"
   ],
   "activationEvents": [
-    "*"
+    "*",
+    "onProfile",
+    "onProfile:github"
   ],
   "extensionDependencies": [
     "vscode.git-base"
@@ -27,7 +29,8 @@
   },
   "enabledApiProposals": [
     "contribShareMenu",
-    "contribEditSessions"
+    "contribEditSessions",
+    "profileContentHandlers"
   ],
   "contributes": {
     "commands": [

extensions/github/src/extension.ts

@@ -12,6 +12,7 @@ import { DisposableStore, repositoryHasGitHubRemote } from './util';
 import { GithubPushErrorHandler } from './pushErrorHandler';
 import { GitBaseExtension } from './typings/git-base';
 import { GithubRemoteSourcePublisher } from './remoteSourcePublisher';
+import './importExportProfiles';
 
 export function activate(context: ExtensionContext): void {
 	context.subscriptions.push(initializeGitBaseExtension());

extensions/github/src/importExportProfiles.ts

@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Octokit } from '@octokit/rest';
+import * as vscode from 'vscode';
+import { httpsOverHttp } from 'tunnel';
+import { Agent, globalAgent } from 'https';
+import { basename } from 'path';
+import { URL } from 'url';
+
+class GitHubGistProfileContentHandler implements vscode.ProfileContentHandler {
+
+	readonly name = vscode.l10n.t('GitHub');
+
+	private _octokit: Promise<Octokit> | undefined;
+	private getOctokit(): Promise<Octokit> {
+		if (!this._octokit) {
+			this._octokit = (async () => {
+				const session = await vscode.authentication.getSession('github', ['gist', 'user:email'], { createIfNone: true });
+				const token = session.accessToken;
+				const agent = this.getAgent();
+
+				const { Octokit } = await import('@octokit/rest');
+
+				return new Octokit({
+					request: { agent },
+					userAgent: 'GitHub VSCode',
+					auth: `token ${token}`
+				});
+			})();
+		}
+		return this._octokit;
+	}
+
+	private getAgent(url: string | undefined = process.env.HTTPS_PROXY): Agent {
+		if (!url) {
+			return globalAgent;
+		}
+		try {
+			const { hostname, port, username, password } = new URL(url);
+			const auth = username && password && `${username}:${password}`;
+			return httpsOverHttp({ proxy: { host: hostname, port, proxyAuth: auth } });
+		} catch (e) {
+			vscode.window.showErrorMessage(`HTTPS_PROXY environment variable ignored: ${e.message}`);
+			return globalAgent;
+		}
+	}
+
+	async saveProfile(name: string, content: string): Promise<vscode.Uri | null> {
+		const octokit = await this.getOctokit();
+		const result = await octokit.gists.create({
+			public: true,
+			files: {
+				[name]: {
+					content
+				}
+			}
+		});
+		return result.data.html_url ? vscode.Uri.parse(result.data.html_url) : null;
+	}
+
+	async readProfile(uri: vscode.Uri): Promise<string | null> {
+		const gist_id = basename(uri.path);
+		const octokit = await this.getOctokit();
+		try {
+			const gist = await octokit.gists.get({ gist_id });
+			if (gist.data.files) {
+				return gist.data.files[Object.keys(gist.data.files)[0]]?.content ?? null;
+			}
+		} catch (error) {
+			// ignore
+		}
+		return null;
+	}
+
+}
+
+vscode.window.registerProfileContentHandler('github', new GitHubGistProfileContentHandler());

extensions/github/tsconfig.json

@@ -9,6 +9,7 @@
 	},
 	"include": [
 		"src/**/*",
-		"../../src/vscode-dts/vscode.d.ts"
+		"../../src/vscode-dts/vscode.d.ts",
+		"../../src/vscode-dts/vscode.proposed.profileContentHandlers.d.ts",
 	]
 }

extensions/microsoft-authentication/package.json

@@ -12,9 +12,7 @@
   "categories": [
     "Other"
   ],
-  "activationEvents": [
-    "onAuthenticationRequest:microsoft"
-  ],
+  "activationEvents": [],
   "enabledApiProposals": [
     "telemetryLogger",
     "idToken"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.74.0",
-  "distro": "22b60ce5f0f5a4db5d17091721f4d84891aec3b8",
+  "distro": "94196ce4591edf8ca6d713299f61b3f2e92c50f0",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -239,4 +239,4 @@
     "elliptic": "^6.5.3",
     "nwmatcher": "^1.4.4"
   }
-}
+}

src/bootstrap-amd.js

@@ -11,6 +11,13 @@
 // when this file is bundled with other files.
 const nodeRequire = require;
 
+// VSCODE_GLOBALS: node_modules
+globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => nodeRequire(String(mod)) });
+
+// VSCODE_GLOBALS: package/product.json
+globalThis._VSCODE_PRODUCT_JSON = require('../product.json');
+globalThis._VSCODE_PACKAGE_JSON = require('../package.json');
+
 const loader = require('./vs/loader');
 const bootstrap = require('./bootstrap');
 const performance = require('./vs/base/common/performance');

src/bootstrap-window.js

@@ -112,6 +112,15 @@
 
 		window['MonacoEnvironment'] = {};
 
+		// VSCODE_GLOBALS: node_modules
+		globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => (require.__$__nodeRequire ?? require)(String(mod)) });
+
+		if (!safeProcess.sandboxed) {
+			// VSCODE_GLOBALS: package/product.json
+			globalThis._VSCODE_PRODUCT_JSON = (require.__$__nodeRequire ?? require)(configuration.appRoot + '/product.json');
+			globalThis._VSCODE_PACKAGE_JSON = (require.__$__nodeRequire ?? require)(configuration.appRoot + '/package.json');
+		}
+
 		const loaderConfig = {
 			baseUrl: `${bootstrapLib.fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out`,
 			'vs/nls': nlsConfig,

src/main.js

@@ -318,6 +318,7 @@ function getArgvConfigPath() {
 		dataFolderName = `${dataFolderName}-dev`;
 	}
 
+	// @ts-ignore
 	return path.join(os.homedir(), dataFolderName, 'argv.json');
 }
 
@@ -566,17 +567,21 @@ async function resolveNlsConfiguration() {
 		// valid after we have received the app ready event. This is why the
 		// code is here.
 
-		// The ternary and ts-ignore can both be removed once Electron
-		// officially adopts the getPreferredSystemLanguages API.
-		// Ref https://github.com/microsoft/vscode/issues/159813
-		// and https://github.com/electron/electron/pull/36035
 		/**
 		 * @type string
 		 */
-		// @ts-ignore API not yet available in the official Electron
-		let appLocale = ((product.quality === 'insider' || product.quality === 'exploration') && app?.getPreferredSystemLanguages()?.length) ?
-			// @ts-ignore API not yet available in the official Electron
-			app.getPreferredSystemLanguages()[0] : app.getLocale();
+		let appLocale = app.getLocale();
+
+		// This if statement can be simplified once
+		// VS Code moves to Electron 22.
+		// Ref https://github.com/microsoft/vscode/issues/159813
+		// and https://github.com/electron/electron/pull/36035
+		if ((product.quality === 'insider' || product.quality === 'exploration')
+			&& 'getPreferredSystemLanguages' in app
+			&& typeof app.getPreferredSystemLanguages === 'function'
+			&& app.getPreferredSystemLanguages().length) {
+			appLocale = app.getPreferredSystemLanguages()[0];
+		}
 		if (!appLocale) {
 			nlsConfiguration = { locale: 'en', availableLanguages: {} };
 		} else {

src/tsconfig.monaco.json

@@ -18,6 +18,7 @@
 	"include": [
 		"typings/require.d.ts",
 		"typings/thenable.d.ts",
+		"typings/vscode-globals-product.d.ts",
 		"vs/loader.d.ts",
 		"vs/monaco.d.ts",
 		"vs/editor/*",

src/typings/require.d.ts

@@ -45,10 +45,17 @@ interface NodeRequire {
 	 * @deprecated use `FileAccess.asFileUri()` for node.js contexts or `FileAccess.asBrowserUri` for browser contexts.
 	 */
 	toUrl(path: string): string;
+
+	/**
+	 * @deprecated MUST not be used anymore
+	 *
+	 * With the move from AMD to ESM we cannot use this anymore. There will be NO MORE node require like this.
+	 */
+	__$__nodeRequire<T>(moduleName: string): T;
+
 	(dependencies: string[], callback: (...args: any[]) => any, errorback?: (err: any) => void): any;
 	config(data: any): any;
 	onError: Function;
-	__$__nodeRequire<T>(moduleName: string): T;
 	getStats?(): ReadonlyArray<LoaderEvent>;
 	hasDependencyCycle?(): boolean;
 	define(amdModuleId: string, dependencies: string[], callback: (...args: any[]) => any): any;

src/typings/vscode-globals-modules.d.ts

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// AMD2ESM mirgation relevant
+
+declare global {
+
+	/**
+	 * @deprecated node modules that are in used in a context that
+	 * shouldn't have access to node_modules (node-free renderer or
+	 * shared process)
+	 */
+	var _VSCODE_NODE_MODULES: {
+		crypto: typeof import('crypto');
+		zlib: typeof import('zlib');
+		net: typeof import('net');
+		os: typeof import('os');
+		module: typeof import('module');
+		['native-watchdog']: typeof import('native-watchdog')
+		perf_hooks: typeof import('perf_hooks');
+
+		['vsda']: any
+		['vscode-encrypt']: any
+	}
+}
+
+// fake export to make global work
+export { }