Merge branch 'master' into joh/remote

Author: jrieken

build/gulpfile.hygiene.js

@@ -99,6 +99,7 @@ const copyrightFilter = [
 
 const eslintFilter = [
 	'src/**/*.js',
+	'build/gulpfile.*.js',
 	'!src/vs/loader.js',
 	'!src/vs/css.js',
 	'!src/vs/nls.js',

build/gulpfile.vscode.js

@@ -31,8 +31,6 @@ const shrinkwrap = require('../npm-shrinkwrap.json');
 const crypto = require('crypto');
 const i18n = require('./lib/i18n');
 const glob = require('glob');
-const os = require('os');
-const cp = require('child_process');
 
 const productDependencies = Object.keys(product.dependencies || {});
 const dependencies = Object.keys(shrinkwrap.dependencies)
@@ -45,8 +43,8 @@ const nodeModules = ['electron', 'original-fs']
 // Build
 
 const builtInExtensions = [
-	{ name: 'ms-vscode.node-debug', version: '1.15.2' },
-	{ name: 'ms-vscode.node-debug2', version: '1.14.4' }
+	{ name: 'ms-vscode.node-debug', version: '1.15.4' },
+	{ name: 'ms-vscode.node-debug2', version: '1.14.5' }
 ];
 
 const excludedExtensions = [
@@ -137,7 +135,7 @@ const config = {
 		name: product.nameLong + ' document',
 		role: 'Editor',
 		ostypes: ["TEXT", "utxt", "TUTX", "****"],
-		extensions: ["ascx", "asp", "aspx", "bash", "bash_login", "bash_logout", "bash_profile", "bashrc", "bat", "bowerrc", "c", "cc", "clj", "cljs", "cljx", "clojure", "cmd", "coffee", "config", "cpp", "cs", "cshtml", "csproj", "css", "csx", "ctp", "cxx", "dockerfile", "dot", "dtd", "editorconfig", "edn", "eyaml", "eyml", "fs", "fsi", "fsscript", "fsx", "gemspec", "gitattributes", "gitconfig", "gitignore", "go", "h", "handlebars", "hbs", "hh", "hpp", "htm", "html", "hxx", "ini", "jade", "jav", "java", "js", "jscsrc", "jshintrc", "jshtm", "json", "jsp", "less", "lua", "m", "makefile", "markdown", "md", "mdoc", "mdown", "mdtext", "mdtxt", "mdwn", "mkd", "mkdn", "ml", "mli", "php", "phtml", "pl", "pl6", "pm", "pm6", "pod", "pp", "profile", "properties", "ps1", "psd1", "psgi", "psm1", "py", "r", "rb", "rhistory", "rprofile", "rs", "rt", "scss", "sh", "shtml", "sql", "svg", "svgz", "t", "ts", "txt", "vb", "wxi", "wxl", "wxs", "xaml", "xcodeproj", "xcworkspace", "xml", "yaml", "yml", "zlogin", "zlogout", "zprofile", "zsh", "zshenv", "zshrc"],
+		extensions: ["ascx", "asp", "aspx", "bash", "bash_login", "bash_logout", "bash_profile", "bashrc", "bat", "bowerrc", "c", "cc", "clj", "cljs", "cljx", "clojure", "cmd", "code-workspace", "coffee", "config", "cpp", "cs", "cshtml", "csproj", "css", "csx", "ctp", "cxx", "dockerfile", "dot", "dtd", "editorconfig", "edn", "eyaml", "eyml", "fs", "fsi", "fsscript", "fsx", "gemspec", "gitattributes", "gitconfig", "gitignore", "go", "h", "handlebars", "hbs", "hh", "hpp", "htm", "html", "hxx", "ini", "jade", "jav", "java", "js", "jscsrc", "jshintrc", "jshtm", "json", "jsp", "less", "lua", "m", "makefile", "markdown", "md", "mdoc", "mdown", "mdtext", "mdtxt", "mdwn", "mkd", "mkdn", "ml", "mli", "php", "phtml", "pl", "pl6", "pm", "pm6", "pod", "pp", "profile", "properties", "ps1", "psd1", "psgi", "psm1", "py", "r", "rb", "rhistory", "rprofile", "rs", "rt", "scss", "sh", "shtml", "sql", "svg", "svgz", "t", "ts", "txt", "vb", "wxi", "wxl", "wxs", "xaml", "xcodeproj", "xcworkspace", "xml", "yaml", "yml", "zlogin", "zlogout", "zprofile", "zsh", "zshenv", "zshrc"],
 		iconFile: 'resources/darwin/code_file.icns'
 	}],
 	darwinBundleURLTypes: [{
@@ -227,8 +225,7 @@ function packageTask(platform, arch, opts) {
 		]);
 
 		const src = gulp.src(out + '/**', { base: '.' })
-			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + out), 'out'); }))
-			.pipe(util.setExecutableBit(['**/*.sh']));
+			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + out), 'out'); }));
 
 		const root = path.resolve(path.join(__dirname, '..'));
 		const localExtensionDescriptions = glob.sync('extensions/*/package.json')
@@ -259,12 +256,9 @@ function packageTask(platform, arch, opts) {
 				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
 		}));
 
-		const sources = es.merge(
-			src,
-			localExtensions,
-			localExtensionDependencies,
-			marketplaceExtensions
-		).pipe(filter(['**', '!**/*.js.map']));
+		const sources = es.merge(src, localExtensions, localExtensionDependencies, marketplaceExtensions)
+			.pipe(util.setExecutableBit(['**/*.sh']))
+			.pipe(filter(['**', '!**/*.js.map']));
 
 		let version = packageJson.version;
 		const quality = product.quality;
@@ -283,6 +277,8 @@ function packageTask(platform, arch, opts) {
 
 		const license = gulp.src(['LICENSES.chromium.html', 'LICENSE.txt', 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.' });
 
+		const watermark = gulp.src(['resources/letterpress.svg', 'resources/letterpress-dark.svg', 'resources/letterpress-hc.svg'], { base: '.' });
+
 		// TODO the API should be copied to `out` during compile, not here
 		const api = gulp.src('src/vs/vscode.d.ts').pipe(rename('out/vs/vscode.d.ts'));
 
@@ -306,6 +302,7 @@ function packageTask(platform, arch, opts) {
 			packageJsonStream,
 			productJsonStream,
 			license,
+			watermark,
 			api,
 			sources,
 			deps
@@ -371,62 +368,6 @@ gulp.task('vscode-linux-ia32-min', ['minify-vscode', 'clean-vscode-linux-ia32'],
 gulp.task('vscode-linux-x64-min', ['minify-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64', { minified: true }));
 gulp.task('vscode-linux-arm-min', ['minify-vscode', 'clean-vscode-linux-arm'], packageTask('linux', 'arm', { minified: true }));
 
-// --- v8 snapshots ---
-
-function snapshotTask(platform, arch) {
-
-	const destination = path.join(path.dirname(root), 'VSCode') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
-
-	let command = path.join(process.cwd(), 'node_modules/.bin/mksnapshot');
-	let loaderInputFilepath;
-	let startupBlobFilepath;
-
-	if (platform === 'darwin') {
-		loaderInputFilepath = path.join(destination, 'Code - OSS.app/Contents/Resources/app/out/vs/loader.js');
-		startupBlobFilepath = path.join(destination, 'Code - OSS.app/Contents/Frameworks/Electron Framework.framework/Resources/snapshot_blob.bin')
-
-	} else if (platform === 'win32') {
-		command = `${command}.cmd`;
-		loaderInputFilepath = path.join(destination, 'resources/app/out/vs/loader.js');
-		startupBlobFilepath = path.join(destination, 'snapshot_blob.bin')
-
-	} else if (platform === 'linux') {
-		loaderInputFilepath = path.join(destination, 'resources/app/out/vs/loader.js');
-		startupBlobFilepath = path.join(destination, 'snapshot_blob.bin')
-	}
-
-	return () => {
-		const inputFile = fs.readFileSync(loaderInputFilepath);
-		const wrappedInputFile = `
-		var Monaco_Loader_Init;
-		(function() {
-			var doNotInitLoader = true;
-			${inputFile.toString()};
-			Monaco_Loader_Init = function() {
-				AMDLoader.init();
-				CSSLoaderPlugin.init();
-				NLSLoaderPlugin.init();
-
-				return define;
-			}
-		})();
-		`;
-		const wrappedInputFilepath = path.join(os.tmpdir(), 'wrapped-loader.js');
-		console.log(wrappedInputFilepath);
-		fs.writeFileSync(wrappedInputFilepath, wrappedInputFile);
-
-		cp.execFileSync(command, [wrappedInputFilepath, `--startup_blob`, startupBlobFilepath]);
-	}
-}
-
-gulp.task('vscode-win32-ia32-snapshots', ['vscode-win32-ia32-min'], snapshotTask('win32', 'ia32'));
-gulp.task('vscode-win32-x64-snapshots', ['vscode-win32-x64-min'], snapshotTask('win32', 'x64'));
-gulp.task('vscode-darwin-snapshots', ['vscode-darwin-min'], snapshotTask('darwin', undefined));
-gulp.task('vscode-linux-ia32-snapshots', ['vscode-linux-ia32-min'], snapshotTask('linux', 'ia32'));
-gulp.task('vscode-linux-x64-snapshots', ['vscode-linux-x64-min'], snapshotTask('linux', 'x64'));
-gulp.task('vscode-linux-arm-snapshots', ['vscode-linux-arm-min'], snapshotTask('linux', 'arm'));
-
-
 // Transifex Localizations
 const vscodeLanguages = [
 	'zh-hans',

build/lib/extensions.js

@@ -26,6 +26,7 @@ function fromLocal(extensionPath) {
             .map(function (fileName) { return path.join(extensionPath, fileName); })
             .map(function (filePath) { return new File({
             path: filePath,
+            stat: fs.statSync(filePath),
             base: extensionPath,
             contents: fs.createReadStream(filePath)
         }); });

build/lib/extensions.ts

@@ -28,6 +28,7 @@ export function fromLocal(extensionPath: string): Stream {
 				.map(fileName => path.join(extensionPath, fileName))
 				.map(filePath => new File({
 					path: filePath,
+					stat: fs.statSync(filePath),
 					base: extensionPath,
 					contents: fs.createReadStream(filePath) as any
 				}));

build/lib/snapshotLoader.js

@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+var snaps;
+(function (snaps) {
+    var fs = require('fs');
+    var path = require('path');
+    var os = require('os');
+    var cp = require('child_process');
+    var mksnapshot = path.join(__dirname, "../../node_modules/.bin/" + (process.platform === 'win32' ? 'mksnapshot.cmd' : 'mksnapshot'));
+    var product = require('../../product.json');
+    var arch = (process.argv.join('').match(/--arch=(.*)/) || [])[1];
+    //
+    var loaderFilepath;
+    var startupBlobFilepath;
+    switch (process.platform) {
+        case 'darwin':
+            loaderFilepath = "VSCode-darwin/" + product.nameLong + ".app/Contents/Resources/app/out/vs/loader.js";
+            startupBlobFilepath = "VSCode-darwin/" + product.nameLong + ".app/Contents/Frameworks/Electron Framework.framework/Resources/snapshot_blob.bin";
+            break;
+        case 'win32':
+        case 'linux':
+            loaderFilepath = "VSCode-" + process.platform + "-" + arch + "/resources/app/out/vs/loader.js";
+            startupBlobFilepath = "VSCode-" + process.platform + "-" + arch + "/snapshot_blob.bin";
+    }
+    loaderFilepath = path.join(__dirname, '../../../', loaderFilepath);
+    startupBlobFilepath = path.join(__dirname, '../../../', startupBlobFilepath);
+    snapshotLoader(loaderFilepath, startupBlobFilepath);
+    function snapshotLoader(loaderFilepath, startupBlobFilepath) {
+        var inputFile = fs.readFileSync(loaderFilepath);
+        var wrappedInputFile = "\n\t\tvar Monaco_Loader_Init;\n\t\t(function() {\n\t\t\tvar doNotInitLoader = true;\n\t\t\t" + inputFile.toString() + ";\n\t\t\tMonaco_Loader_Init = function() {\n\t\t\t\tAMDLoader.init();\n\t\t\t\tCSSLoaderPlugin.init();\n\t\t\t\tNLSLoaderPlugin.init();\n\n\t\t\t\treturn { define, require };\n\t\t\t}\n\t\t})();\n\t\t";
+        var wrappedInputFilepath = path.join(os.tmpdir(), 'wrapped-loader.js');
+        console.log(wrappedInputFilepath);
+        fs.writeFileSync(wrappedInputFilepath, wrappedInputFile);
+        cp.execFileSync(mksnapshot, [wrappedInputFilepath, "--startup_blob", startupBlobFilepath]);
+    }
+})(snaps || (snaps = {}));

build/lib/snapshotLoader.ts

@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+namespace snaps {
+
+	const fs = require('fs');
+	const path = require('path');
+	const os = require('os');
+	const cp = require('child_process');
+
+	const mksnapshot = path.join(__dirname, `../../node_modules/.bin/${process.platform === 'win32' ? 'mksnapshot.cmd' : 'mksnapshot'}`);
+	const product = require('../../product.json');
+	const arch = (process.argv.join('').match(/--arch=(.*)/) || [])[1];
+
+	//
+	let loaderFilepath: string;
+	let startupBlobFilepath: string;
+
+	switch (process.platform) {
+		case 'darwin':
+			loaderFilepath = `VSCode-darwin/${product.nameLong}.app/Contents/Resources/app/out/vs/loader.js`;
+			startupBlobFilepath = `VSCode-darwin/${product.nameLong}.app/Contents/Frameworks/Electron Framework.framework/Resources/snapshot_blob.bin`;
+			break;
+
+		case 'win32':
+		case 'linux':
+			loaderFilepath = `VSCode-${process.platform}-${arch}/resources/app/out/vs/loader.js`;
+			startupBlobFilepath = `VSCode-${process.platform}-${arch}/snapshot_blob.bin`;
+	}
+
+	loaderFilepath = path.join(__dirname, '../../../', loaderFilepath);
+	startupBlobFilepath = path.join(__dirname, '../../../', startupBlobFilepath);
+
+	snapshotLoader(loaderFilepath, startupBlobFilepath);
+
+	function snapshotLoader(loaderFilepath: string, startupBlobFilepath: string): void {
+
+		const inputFile = fs.readFileSync(loaderFilepath);
+		const wrappedInputFile = `
+		var Monaco_Loader_Init;
+		(function() {
+			var doNotInitLoader = true;
+			${inputFile.toString()};
+			Monaco_Loader_Init = function() {
+				AMDLoader.init();
+				CSSLoaderPlugin.init();
+				NLSLoaderPlugin.init();
+
+				return { define, require };
+			}
+		})();
+		`;
+		const wrappedInputFilepath = path.join(os.tmpdir(), 'wrapped-loader.js');
+		console.log(wrappedInputFilepath);
+		fs.writeFileSync(wrappedInputFilepath, wrappedInputFile);
+
+		cp.execFileSync(mksnapshot, [wrappedInputFilepath, `--startup_blob`, startupBlobFilepath]);
+	}
+}

build/monaco/package.json

@@ -48,7 +48,7 @@
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
     "tslint": "^4.3.1",
-    "typescript": "2.3.2",
+    "typescript": "2.4.1",
     "typescript-formatter": "4.0.1",
     "underscore": "^1.8.2",
     "vinyl": "^0.4.5",

build/package.json

@@ -13,7 +13,7 @@
     "documentdb": "^1.11.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
-    "typescript": "2.3.4",
+    "typescript": "2.4.1",
     "xml2js": "^0.4.17"
   },
   "scripts": {

build/tfs/common/publish.ts

@@ -131,9 +131,11 @@ async function doesAssetExist(blobService: azure.BlobService, quality: string, b
 }
 
 async function uploadBlob(blobService: azure.BlobService, quality: string, blobName: string, file: string): Promise<void> {
-	const blobOptions = {
-		contentType: mime.lookup(file),
-		cacheControl: 'max-age=31536000, public'
+	const blobOptions: azure.BlobService.CreateBlockBlobRequestOptions = {
+		contentSettings: {
+			contentType: mime.lookup(file),
+			cacheControl: 'max-age=31536000, public'
+		}
 	};
 
 	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
@@ -178,6 +180,9 @@ async function publish(commit: string, quality: string, platform: string, type:
 	const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY'], `${storageAccount}.blob.core.chinacloudapi.cn`)
 		.withFilter(new azure.ExponentialRetryPolicyFilter(20));
 
+	// mooncake is fussy and far away, this is needed!
+	mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+
 	await Promise.all([
 		assertContainer(blobService, quality),
 		assertContainer(mooncakeBlobService, quality)

build/tfs/darwin/build.sh

@@ -25,11 +25,14 @@ step "Install distro dependencies" \
 step "Build minified & upload source maps" \
 	npm run gulp -- --max_old_space_size=4096 vscode-darwin-min upload-vscode-sourcemaps
 
+step "Create loader snapshot"
+	node build/lib/snapshotLoader.js
+
 step "Run unit tests" \
 	./scripts/test.sh --build --reporter dot
 
 step "Run integration tests" \
 	./scripts/test-integration.sh
 
 step "Publish release" \
-	./build/tfs/darwin/release.sh
+	./build/tfs/darwin/release.sh