Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

src/vs/platform/product/browser/product.ts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IProductConfiguration } from 'vs/platform/product/common/product';
+import { assign } from 'vs/base/common/objects';
+
+// Built time configuration (do NOT modify)
+const product = { /*BUILD->INSERT_PRODUCT_CONFIGURATION*/ } as IProductConfiguration;
+
+// Running out of sources
+if (Object.keys(product).length === 0) {
+	assign(product, {
+		version: '1.39.0-dev',
+		nameLong: 'Visual Studio Code Web Dev',
+		nameShort: 'VSCode Web Dev'
+	});
+}
+
+export default product;

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

@@ -14,83 +14,100 @@ export interface IProductService extends Readonly<IProductConfiguration> {
 }
 
 export interface IProductConfiguration {
-	version: string;
-	nameShort: string;
-	nameLong: string;
-	readonly applicationName: string;
-	readonly win32AppId: string;
-	readonly win32x64AppId: string;
-	readonly win32UserAppId: string;
-	readonly win32x64UserAppId: string;
-	readonly win32AppUserModelId: string;
-	readonly win32MutexName: string;
-	readonly darwinBundleIdentifier: string;
-	readonly urlProtocol: string;
-	dataFolderName: string;
-	readonly downloadUrl: string;
-	readonly updateUrl?: string;
+	readonly version: string;
+	readonly date?: string;
 	readonly quality?: string;
-	readonly target?: string;
 	readonly commit?: string;
+
+	readonly nameShort: string;
+	readonly nameLong: string;
+
+	readonly win32AppUserModelId?: string;
+	readonly win32MutexName?: string;
+	readonly applicationName: string;
+
+	readonly urlProtocol: string;
+	readonly dataFolderName: string;
+
+	readonly downloadUrl?: string;
+	readonly updateUrl?: string;
+	readonly target?: string;
+
 	readonly settingsSearchBuildId?: number;
 	readonly settingsSearchUrl?: string;
+
 	readonly experimentsUrl?: string;
-	readonly date: string;
+
 	readonly extensionsGallery?: {
 		readonly serviceUrl: string;
 		readonly itemUrl: string;
 		readonly controlUrl: string;
 		readonly recommendationsUrl: string;
 	};
-	readonly extensionTips: { [id: string]: string; };
+
+	readonly extensionTips?: { [id: string]: string; };
+	readonly extensionImportantTips?: { [id: string]: { name: string; pattern: string; isExtensionPack?: boolean }; };
+	readonly exeBasedExtensionTips?: { [id: string]: IExeBasedExtensionTip; };
+	readonly extensionKeywords?: { [extension: string]: readonly string[]; };
+	readonly keymapExtensionTips?: readonly string[];
+
 	readonly recommendedExtensions: string[]; // {{SQL CARBON EDIT}}
 	readonly recommendedExtensionsByScenario: { [area: string]: Array<string> }; // {{SQL CARBON EDIT}}
 	readonly vscodeVersion: string; // {{SQL CARBON EDIT}} add vscode version
 	readonly gettingStartedUrl: string; // {SQL CARBON EDIT}
-	readonly extensionImportantTips: { [id: string]: { name: string; pattern: string; isExtensionPack?: boolean }; };
-	readonly exeBasedExtensionTips: { [id: string]: IExeBasedExtensionTip; };
-	readonly extensionKeywords: { [extension: string]: readonly string[]; };
-	readonly extensionAllowedProposedApi: readonly string[];
-	readonly keymapExtensionTips: readonly string[];
-	readonly crashReporter: {
+
+	readonly crashReporter?: {
 		readonly companyName: string;
 		readonly productName: string;
 	};
-	readonly welcomePage: string;
-	readonly enableTelemetry: boolean;
-	readonly aiConfig: {
+
+	readonly welcomePage?: string;
+
+	readonly enableTelemetry?: boolean;
+	readonly aiConfig?: {
 		readonly asimovKey: string;
 	};
-	readonly sendASmile: {
+
+	readonly sendASmile?: {
 		readonly reportIssueUrl: string,
 		readonly requestFeatureUrl: string
 	};
-	readonly documentationUrl: string;
-	readonly releaseNotesUrl: string;
-	readonly keyboardShortcutsUrlMac: string;
-	readonly keyboardShortcutsUrlLinux: string;
-	readonly keyboardShortcutsUrlWin: string;
-	readonly introductoryVideosUrl: string;
-	readonly tipsAndTricksUrl: string;
-	readonly newsletterSignupUrl: string;
-	readonly twitterUrl: string;
-	readonly requestFeatureUrl: string;
-	readonly reportIssueUrl: string;
-	readonly licenseUrl: string;
-	readonly privacyStatementUrl: string;
-	readonly telemetryOptOutUrl: string;
-	readonly npsSurveyUrl: string;
-	readonly surveys: readonly ISurveyData[];
-	readonly checksums: { [path: string]: string; };
-	readonly checksumFailMoreInfoUrl: string;
-	readonly hockeyApp: {
+
+	readonly documentationUrl?: string;
+	readonly releaseNotesUrl?: string;
+	readonly keyboardShortcutsUrlMac?: string;
+	readonly keyboardShortcutsUrlLinux?: string;
+	readonly keyboardShortcutsUrlWin?: string;
+	readonly introductoryVideosUrl?: string;
+	readonly tipsAndTricksUrl?: string;
+	readonly newsletterSignupUrl?: string;
+	readonly twitterUrl?: string;
+	readonly requestFeatureUrl?: string;
+	readonly reportIssueUrl?: string;
+	readonly licenseUrl?: string;
+	readonly privacyStatementUrl?: string;
+	readonly telemetryOptOutUrl?: string;
+
+	readonly npsSurveyUrl?: string;
+	readonly surveys?: readonly ISurveyData[];
+
+	readonly checksums?: { [path: string]: string; };
+	readonly checksumFailMoreInfoUrl?: string;
+
+	readonly hockeyApp?: {
 		readonly 'win32-ia32': string;
 		readonly 'win32-x64': string;
 		readonly 'linux-x64': string;
 		readonly 'darwin': string;
 	};
+
 	readonly portable?: string;
+
 	readonly uiExtensions?: readonly string[];
+	readonly extensionAllowedProposedApi?: readonly string[];
+
+	readonly msftInternalDomains?: string[];
+	readonly linkProtectionTrustedDomains?: readonly string[];
 }
 
 export interface IExeBasedExtensionTip {

src/vs/platform/product/node/product.ts

@@ -7,17 +7,22 @@ import * as path from 'vs/base/common/path';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 import { IProductConfiguration } from 'vs/platform/product/common/product';
 import pkg from 'vs/platform/product/node/package';
+import { assign } from 'vs/base/common/objects';
 
 const rootPath = path.dirname(getPathFromAmdModule(require, ''));
 const productJsonPath = path.join(rootPath, 'product.json');
 const product = require.__$__nodeRequire(productJsonPath) as IProductConfiguration;
 
 if (process.env['VSCODE_DEV']) {
-	product.nameShort += ' Dev';
-	product.nameLong += ' Dev';
-	product.dataFolderName += '-dev';
+	assign(product, {
+		nameShort: `${product.nameShort} Dev`,
+		nameLong: `${product.nameLong} Dev`,
+		dataFolderName: `${product.dataFolderName}-dev`
+	});
 }
 
-product.version = pkg.version;
+assign(product, {
+	version: pkg.version
+});
 
 export default product;