move built-in extensions to product.json

build/builtInExtensions.json

-[
-	{
-		"name": "ms-vscode.node-debug",
-		"version": "1.44.4",
-		"repo": "https://github.com/Microsoft/vscode-node-debug",
-		"metadata": {
-			"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",
-			"publisherId": {
-				"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-				"publisherName": "ms-vscode",
-				"displayName": "Microsoft",
-				"flags": "verified"
-			},
-			"publisherDisplayName": "Microsoft"
-		}
-	},
-	{
-		"name": "ms-vscode.node-debug2",
-		"version": "1.42.1",
-		"repo": "https://github.com/Microsoft/vscode-node-debug2",
-		"metadata": {
-			"id": "36d19e17-7569-4841-a001-947eb18602b2",
-			"publisherId": {
-				"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-				"publisherName": "ms-vscode",
-				"displayName": "Microsoft",
-				"flags": "verified"
-			},
-			"publisherDisplayName": "Microsoft"
-		}
-	},
-	{
-		"name": "ms-vscode.references-view",
-		"version": "0.0.50",
-		"repo": "https://github.com/Microsoft/vscode-reference-view",
-		"metadata": {
-			"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",
-			"publisherId": {
-				"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-				"publisherName": "ms-vscode",
-				"displayName": "Microsoft",
-				"flags": "verified"
-			},
-			"publisherDisplayName": "Microsoft"
-		}
-	},
-	{
-		"name": "ms-vscode.js-debug-companion",
-		"version": "0.0.4",
-		"repo": "https://github.com/microsoft/vscode-js-debug-companion",
-		"metadata": {
-			"id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
-			"publisherId": {
-				"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-				"publisherName": "ms-vscode",
-				"displayName": "Microsoft",
-				"flags": "verified"
-			},
-			"publisherDisplayName": "Microsoft"
-		}
-	}
-]

build/builtin/browser-main.js

@@ -9,7 +9,7 @@ const os = require('os');
 const { remote } = require('electron');
 const dialog = remote.dialog;
 
-const builtInExtensionsPath = path.join(__dirname, '..', 'builtInExtensions.json');
+const builtInExtensionsPath = path.join(__dirname, '..', '..', 'product.json');
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 
 function readJson(filePath) {
@@ -110,7 +110,7 @@ function render(el, state) {
 
 function main() {
 	const el = document.getElementById('extensions');
-	const builtin = readJson(builtInExtensionsPath);
+	const builtin = readJson(builtInExtensionsPath).builtInExtensions;
 	let control;
 
 	try {
@@ -122,4 +122,4 @@ function main() {
 	render(el, { builtin, control });
 }
 
-window.onload = main;
\ No newline at end of file
+window.onload = main;

build/lib/builtInExtensions.js

@@ -18,7 +18,7 @@ const fancyLog = require('fancy-log');
 const ansiColors = require('ansi-colors');
 
 const root = path.dirname(path.dirname(__dirname));
-const builtInExtensions = require('../builtInExtensions.json');
+const builtInExtensions = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE'];
 

build/lib/extensions.js

@@ -28,7 +28,6 @@ const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
 const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
-const product = require('../../product.json');
 function fromLocal(extensionPath) {
     const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
     const input = fs.existsSync(webpackFilename)
@@ -187,10 +186,8 @@ const excludedExtensions = [
     'vscode-test-resolver',
     'ms-vscode.node-debug',
     'ms-vscode.node-debug2',
-    'ms.vscode.js-debug-nightly'
 ];
-const builtInExtensions = require('../builtInExtensions.json')
-    .filter(({ forQualities }) => { var _a; return !product.quality || ((_a = forQualities === null || forQualities === void 0 ? void 0 : forQualities.includes) === null || _a === void 0 ? void 0 : _a.call(forQualities, product.quality)) !== false; });
+const builtInExtensions = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
 function packageLocalExtensionsStream() {
     const localExtensionDescriptions = glob.sync('extensions/*/package.json')
         .map(manifestPath => {

build/lib/extensions.ts

@@ -229,7 +229,7 @@ interface IBuiltInExtension {
 	metadata: any;
 }
 
-const builtInExtensions: IBuiltInExtension[] = require('../builtInExtensions.json');
+const builtInExtensions: IBuiltInExtension[] = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
 
 export function packageLocalExtensionsStream(): NodeJS.ReadWriteStream {
 	const localExtensionDescriptions = (<string[]>glob.sync('extensions/*/package.json'))

product.json

@@ -22,5 +22,82 @@
 	"urlProtocol": "code-oss",
 	"extensionAllowedProposedApi": [
 		"ms-vscode.references-view"
+	],
+	"builtInExtensions": [
+		{
+			"name": "ms-vscode.node-debug",
+			"version": "1.44.4",
+			"repo": "https://github.com/Microsoft/vscode-node-debug",
+			"metadata": {
+				"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",
+				"publisherId": {
+					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+					"publisherName": "ms-vscode",
+					"displayName": "Microsoft",
+					"flags": "verified"
+				},
+				"publisherDisplayName": "Microsoft"
+			}
+		},
+		{
+			"name": "ms-vscode.node-debug2",
+			"version": "1.42.1",
+			"repo": "https://github.com/Microsoft/vscode-node-debug2",
+			"metadata": {
+				"id": "36d19e17-7569-4841-a001-947eb18602b2",
+				"publisherId": {
+					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+					"publisherName": "ms-vscode",
+					"displayName": "Microsoft",
+					"flags": "verified"
+				},
+				"publisherDisplayName": "Microsoft"
+			}
+		},
+		{
+			"name": "ms-vscode.references-view",
+			"version": "0.0.50",
+			"repo": "https://github.com/Microsoft/vscode-reference-view",
+			"metadata": {
+				"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",
+				"publisherId": {
+					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+					"publisherName": "ms-vscode",
+					"displayName": "Microsoft",
+					"flags": "verified"
+				},
+				"publisherDisplayName": "Microsoft"
+			}
+		},
+		{
+			"name": "ms-vscode.js-debug-companion",
+			"version": "0.0.4",
+			"repo": "https://github.com/microsoft/vscode-js-debug-companion",
+			"metadata": {
+				"id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
+				"publisherId": {
+					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+					"publisherName": "ms-vscode",
+					"displayName": "Microsoft",
+					"flags": "verified"
+				},
+				"publisherDisplayName": "Microsoft"
+			}
+		},
+		{
+			"name": "ms-vscode.js-debug-nightly",
+			"version": "2020.3.3117",
+			"repo": "https://github.com/Microsoft/vscode-js-debug",
+			"metadata": {
+				"id": "7acbb4ce-c85a-49d4-8d95-a8054406ae97",
+				"publisherId": {
+					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+					"publisherName": "ms-vscode",
+					"displayName": "Microsoft",
+					"flags": "verified"
+				},
+				"publisherDisplayName": "Microsoft"
+			}
+		}
 	]
 }

src/vs/platform/extensionManagement/node/extensionManagementService.ts

@@ -754,6 +754,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		// Scan other system extensions during development
 		const devSystemExtensionsPromise = this.getDevSystemExtensionsList()
 			.then(devSystemExtensionsList => {
+				console.log(devSystemExtensionsList);
 				if (devSystemExtensionsList.length) {
 					return this.scanExtensions(this.devSystemExtensionsPath, ExtensionType.System)
 						.then(result => {
@@ -945,20 +946,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		return this._devSystemExtensionsPath;
 	}
 
-	private _devSystemExtensionsFilePath: string | null = null;
-	private get devSystemExtensionsFilePath(): string {
-		if (!this._devSystemExtensionsFilePath) {
-			this._devSystemExtensionsFilePath = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'build', 'builtInExtensions.json'));
-		}
-		return this._devSystemExtensionsFilePath;
-	}
-
 	private getDevSystemExtensionsList(): Promise<string[]> {
-		return pfs.readFile(this.devSystemExtensionsFilePath, 'utf8')
-			.then<string[]>(raw => {
-				const parsed: { name: string }[] = JSON.parse(raw);
-				return parsed.map(({ name }) => name);
-			});
+		return Promise.resolve(product.builtInExtensions ? product.builtInExtensions.map(e => e.name) : []);
 	}
 
 	private toNonCancellablePromise<T>(promise: Promise<T>): Promise<T> {

src/vs/platform/product/common/productService.ts

@@ -14,6 +14,13 @@ export interface IProductService extends Readonly<IProductConfiguration> {
 
 }
 
+export interface IBuiltInExtension {
+	readonly name: string;
+	readonly version: string;
+	readonly repo: string;
+	readonly metadata: any;
+}
+
 export interface IProductConfiguration {
 	readonly version: string;
 	readonly date?: string;
@@ -30,6 +37,8 @@ export interface IProductConfiguration {
 	readonly urlProtocol: string;
 	readonly dataFolderName: string;
 
+	readonly builtInExtensions?: IBuiltInExtension[];
+
 	readonly downloadUrl?: string;
 	readonly updateUrl?: string;
 	readonly target?: string;

src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts

@@ -260,9 +260,7 @@ export class CachedExtensionScanner {
 		let finalBuiltinExtensions: Promise<IExtensionDescription[]> = builtinExtensions;
 
 		if (devMode) {
-			const builtInExtensionsFilePath = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'build', 'builtInExtensions.json'));
-			const builtInExtensions = pfs.readFile(builtInExtensionsFilePath, 'utf8')
-				.then<IBuiltInExtension[]>(raw => JSON.parse(raw));
+			const builtInExtensions = Promise.resolve<IBuiltInExtension[]>(product.builtInExtensions || []);
 
 			const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 			const controlFile = pfs.readFile(controlFilePath, 'utf8')