Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 * fix pipelines * fix strict-null-checks * add missing files
2026-02-16 18:46:40 -05:00 · 2019-10-21 22:12:22 -07:00
parent 7c9be74970
commit 1e22f47304
913 changed files with 18898 additions and 16536 deletions
--- a/build/lib/electron.js
+++ b/build/lib/electron.js
@@ -2,29 +2,88 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-
 'use strict';
-
-const fs = require('fs');
-const path = require('path');
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
+const vfs = require("vinyl-fs");
+const filter = require("gulp-filter");
+const json = require("gulp-json-editor");
+const _ = require("underscore");
+const util = require("./util");
+const electron = require('gulp-atom-electron');
 const root = path.dirname(path.dirname(__dirname));
-
+const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
+const commit = util.getVersion(root);
 function getElectronVersion() {
-	const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
-	// @ts-ignore
-	const target = /^target "(.*)"$/m.exec(yarnrc)[1];
-
-	return target;
+    const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
+    const target = /^target "(.*)"$/m.exec(yarnrc)[1];
+    return target;
+}
+exports.getElectronVersion = getElectronVersion;
+const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));
+function darwinBundleDocumentType(extensions, icon) {
+    return {
+        name: product.nameLong + ' document',
+        role: 'Editor',
+        ostypes: ["TEXT", "utxt", "TUTX", "****"],
+        extensions: extensions,
+        iconFile: icon
+    };
+}
+exports.config = {
+    version: getElectronVersion(),
+    productAppName: product.nameLong,
+    companyName: 'Microsoft Corporation',
+    copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
+    darwinIcon: product.quality === 'stable' ? 'resources/darwin/code.icns' : 'resources/darwin/code-insiders.icns',
+    darwinBundleIdentifier: product.darwinBundleIdentifier,
+    darwinApplicationCategoryType: 'public.app-category.developer-tools',
+    darwinHelpBookFolder: 'VS Code HelpBook',
+    darwinHelpBookName: 'VS Code HelpBook',
+    darwinBundleDocumentTypes: [
+        darwinBundleDocumentType(["csv", "json", "sqlplan", "sql", "xml"], product.quality === 'stable' ? 'resources/darwin/code_file.icns' : 'resources/darwin/code_file-insiders.icns'),
+    ],
+    darwinBundleURLTypes: [{
+            role: 'Viewer',
+            name: product.nameLong,
+            urlSchemes: [product.urlProtocol]
+        }],
+    darwinForceDarkModeSupport: true,
+    darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
+    linuxExecutableName: product.applicationName,
+    winIcon: product.quality === 'stable' ? 'resources/win32/code.ico' : 'resources/win32/code-insiders.ico',
+    token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined,
+    repo: product.electronRepository || undefined
+};
+function getElectron(arch) {
+    return () => {
+        const electronOpts = _.extend({}, exports.config, {
+            platform: process.platform,
+            arch,
+            ffmpegChromium: true,
+            keepDefaultApp: true
+        });
+        return vfs.src('package.json')
+            .pipe(json({ name: product.nameShort }))
+            .pipe(electron(electronOpts))
+            .pipe(filter(['**', '!**/app/package.json']))
+            .pipe(vfs.dest('.build/electron'));
+    };
+}
+async function main(arch = process.arch) {
+    const version = getElectronVersion();
+    const electronPath = path.join(root, '.build', 'electron');
+    const versionFile = path.join(electronPath, 'version');
+    const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
+    if (!isUpToDate) {
+        await util.rimraf(electronPath)();
+        await util.streamToPromise(getElectron(arch)());
+    }
 }
-
-module.exports.getElectronVersion = getElectronVersion;
-
-// returns 0 if the right version of electron is in .build/electron
-// @ts-ignore
 if (require.main === module) {
-	const version = getElectronVersion();
-	const versionFile = path.join(root, '.build', 'electron', 'version');
-	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
-
-	process.exit(isUpToDate ? 0 : 1);
+    main(process.argv[2]).catch(err => {
+        console.error(err);
+        process.exit(1);
+    });
 }
--- a/build/lib/electron.ts
+++ b/build/lib/electron.ts
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as fs from 'fs';
+import * as path from 'path';
+import * as vfs from 'vinyl-fs';
+import * as filter from 'gulp-filter';
+import * as json from 'gulp-json-editor';
+import * as _ from 'underscore';
+import * as util from './util';
+
+const electron = require('gulp-atom-electron');
+
+const root = path.dirname(path.dirname(__dirname));
+const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
+const commit = util.getVersion(root);
+
+export function getElectronVersion(): string {
+	const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
+	const target = /^target "(.*)"$/m.exec(yarnrc)![1];
+	return target;
+}
+
+const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));
+
+function darwinBundleDocumentType(extensions: string[], icon: string) {
+	return {
+		name: product.nameLong + ' document',
+		role: 'Editor',
+		ostypes: ["TEXT", "utxt", "TUTX", "****"],
+		extensions: extensions,
+		iconFile: icon
+	};
+}
+
+export const config = {
+	version: getElectronVersion(),
+	productAppName: product.nameLong,
+	companyName: 'Microsoft Corporation',
+	copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
+	darwinIcon: product.quality === 'stable' ? 'resources/darwin/code.icns' : 'resources/darwin/code-insiders.icns', // {{SQL CARBON EDIT}} Use separate icons for non-stable
+	darwinBundleIdentifier: product.darwinBundleIdentifier,
+	darwinApplicationCategoryType: 'public.app-category.developer-tools',
+	darwinHelpBookFolder: 'VS Code HelpBook',
+	darwinHelpBookName: 'VS Code HelpBook',
+	darwinBundleDocumentTypes: [
+		darwinBundleDocumentType(["csv", "json", "sqlplan", "sql", "xml"], product.quality === 'stable' ? 'resources/darwin/code_file.icns' : 'resources/darwin/code_file-insiders.icns'), // {{SQL CARBON EDIT}} - Remove most document types and replace with ours. Also use separate icon for non-stable
+	],
+	darwinBundleURLTypes: [{
+		role: 'Viewer',
+		name: product.nameLong,
+		urlSchemes: [product.urlProtocol]
+	}],
+	darwinForceDarkModeSupport: true,
+	darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
+	linuxExecutableName: product.applicationName,
+	winIcon: product.quality === 'stable' ? 'resources/win32/code.ico' : 'resources/win32/code-insiders.ico', // {{SQL CARBON EDIT}} Use separate icons for non-stable
+	token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined,
+	repo: product.electronRepository || undefined
+};
+
+function getElectron(arch: string): () => NodeJS.ReadWriteStream {
+	return () => {
+		const electronOpts = _.extend({}, config, {
+			platform: process.platform,
+			arch,
+			ffmpegChromium: true,
+			keepDefaultApp: true
+		});
+
+		return vfs.src('package.json')
+			.pipe(json({ name: product.nameShort }))
+			.pipe(electron(electronOpts))
+			.pipe(filter(['**', '!**/app/package.json']))
+			.pipe(vfs.dest('.build/electron'));
+	};
+}
+
+async function main(arch = process.arch): Promise<void> {
+	const version = getElectronVersion();
+	const electronPath = path.join(root, '.build', 'electron');
+	const versionFile = path.join(electronPath, 'version');
+	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
+
+	if (!isUpToDate) {
+		await util.rimraf(electronPath)();
+		await util.streamToPromise(getElectron(arch)());
+	}
+}
+
+if (require.main === module) {
+	main(process.argv[2]).catch(err => {
+		console.error(err);
+		process.exit(1);
+	});
+}
--- a/build/lib/util.js
+++ b/build/lib/util.js
@@ -166,20 +166,23 @@ function stripSourceMappingURL() {
 }
 exports.stripSourceMappingURL = stripSourceMappingURL;
 function rimraf(dir) {
-    let retries = 0;
-    const retry = (cb) => {
-        _rimraf(dir, { maxBusyTries: 1 }, (err) => {
-            if (!err) {
-                return cb();
-            }
-            if (err.code === 'ENOTEMPTY' && ++retries < 5) {
-                return setTimeout(() => retry(cb), 10);
-            }
-            return cb(err);
-        });
-    };
-    retry.taskName = `clean-${path.basename(dir).toLowerCase()}`;
-    return retry;
+    const result = () => new Promise((c, e) => {
+        let retries = 0;
+        const retry = () => {
+            _rimraf(dir, { maxBusyTries: 1 }, (err) => {
+                if (!err) {
+                    return c();
+                }
+                if (err.code === 'ENOTEMPTY' && ++retries < 5) {
+                    return setTimeout(() => retry(), 10);
+                }
+                return e(err);
+            });
+        };
+        retry();
+    });
+    result.taskName = `clean-${path.basename(dir).toLowerCase()}`;
+    return result;
 }
 exports.rimraf = rimraf;
 function getVersion(root) {
@@ -219,3 +222,10 @@ function versionStringToNumber(versionStr) {
    return parseInt(match[1], 10) * 1e4 + parseInt(match[2], 10) * 1e2 + parseInt(match[3], 10);
 }
 exports.versionStringToNumber = versionStringToNumber;
+function streamToPromise(stream) {
+    return new Promise((c, e) => {
+        stream.on('error', err => e(err));
+        stream.on('end', () => c());
+    });
+}
+exports.streamToPromise = streamToPromise;
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
@@ -218,24 +218,29 @@ export function stripSourceMappingURL(): NodeJS.ReadWriteStream {
 	return es.duplex(input, output);
 }

-export function rimraf(dir: string): (cb: any) => void {
-	let retries = 0;
+export function rimraf(dir: string): () => Promise<void> {
+	const result = () => new Promise<void>((c, e) => {
+		let retries = 0;

-	const retry = (cb: (err?: any) => void) => {
-		_rimraf(dir, { maxBusyTries: 1 }, (err: any) => {
-			if (!err) {
-				return cb();
-			}
+		const retry = () => {
+			_rimraf(dir, { maxBusyTries: 1 }, (err: any) => {
+				if (!err) {
+					return c();
+				}

-			if (err.code === 'ENOTEMPTY' && ++retries < 5) {
-				return setTimeout(() => retry(cb), 10);
-			}
+				if (err.code === 'ENOTEMPTY' && ++retries < 5) {
+					return setTimeout(() => retry(), 10);
+				}

-			return cb(err);
-		});
-	};
-	retry.taskName = `clean-${path.basename(dir).toLowerCase()}`;
-	return retry;
+				return e(err);
+			});
+		};
+
+		retry();
+	});
+
+	result.taskName = `clean-${path.basename(dir).toLowerCase()}`;
+	return result;
 }

 export function getVersion(root: string): string | undefined {
@@ -281,3 +286,10 @@ export function versionStringToNumber(versionStr: string) {

 	return parseInt(match[1], 10) * 1e4 + parseInt(match[2], 10) * 1e2 + parseInt(match[3], 10);
 }
+
+export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise<void> {
+	return new Promise((c, e) => {
+		stream.on('error', err => e(err));
+		stream.on('end', () => c());
+	});
+}