Update VS Code to 1.37.0

Author: code-asher

.travis.yml

@@ -8,14 +8,14 @@ matrix:
   - os: linux
     dist: trusty
     env:
-      - VSCODE_VERSION="1.36.1" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="linux"
+      - VSCODE_VERSION="1.37.0" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="linux"
   - os: linux
     dist: trusty
     env:
-      - VSCODE_VERSION="1.36.1" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="alpine"
+      - VSCODE_VERSION="1.37.0" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER" TARGET="alpine"
   - os: osx
     env:
-      - VSCODE_VERSION="1.36.1" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
+      - VSCODE_VERSION="1.37.0" MAJOR_VERSION="2" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
 before_install:
 - if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi
 script:

README.md

@@ -81,7 +81,7 @@ data collected to improve code-server.
 ```shell
 git clone https://github.com/microsoft/vscode
 cd vscode
-git checkout 1.36.1
+git checkout 1.37.0
 git clone https://github.com/cdr/code-server src/vs/server
 cd src/vs/server
 yarn patch:apply
@@ -109,23 +109,19 @@ directory.
 
 Our changes include:
 - Add a `code-server` schema.
-- Make the extension sidebar work in the browser. Mostly involves removing
-  Node-specific code for the `extensions` channel client and adding a
-  `gallery` channel.
 - Allow multiple extension directories (both user and built-in).
-- Rewrite assets used in the CSS (like icons) or as images to use the base URL.
-- Change the loader to use the base URL.
-- Change the web socket to use the base URL and TLS if necessary.
-- Set the favicon using a relative path.
-- Modify the file service to support writing from an asynchronous stream (for
-  uploading files).
+- Rewrite assets requested by the browser to use the base URL.
+- Modify the loader to use the base URL.
+- Modify the web socket to use the base URL and TLS if necessary.
+- Send client-side telemetry through the server.
 - Add a file prefix to ignore for temporary files created during upload.
 - Insert our upload service for use in editor windows and explorer.
 - Modify the log level to get its initial setting from the server.
-- Get telemetry working by adding a channel for it.
 - Change a regular expression used for mnemonics so it works on Firefox.
 - Make it possible for us to load code on the client.
 - Modify the build process to include our code.
+- Fix a CSP issue within a webview.
+- Fix an issue displaying extension contributions.
 
 ## License
 [MIT](LICENSE)

scripts/build-json.js

@@ -0,0 +1,58 @@
+// This builds the package and product JSON files for the final build.
+const crypto = require("crypto");
+const fs = require("fs");
+const path = require("path");
+const rootPath = path.resolve(__dirname, "..");
+const sourcePath = process.argv[2];
+const buildPath = process.argv[3];
+const vscodeVersion = process.argv[4];
+const codeServerVersion = process.argv[5];
+const util = require(path.join(sourcePath, "build/lib/util"));
+
+function computeChecksum(filename) {
+	return crypto.createHash("md5").update(fs.readFileSync(filename))
+		.digest("base64").replace(/=+$/, "");
+}
+
+const computeChecksums = (filenames) => {
+	const result = {};
+	filenames.forEach(function (filename) {
+		result[filename] = computeChecksum(path.join(buildPath, "out", filename));
+	});
+	return result;
+};
+
+const mergeAndWrite = (name, json = {}) => {
+	const aJson = JSON.parse(fs.readFileSync(path.join(sourcePath, `${name}.json`)));
+	const bJson = JSON.parse(fs.readFileSync(path.join(rootPath, "scripts", `${name}.json`)));
+
+	delete aJson.scripts;
+	delete aJson.dependencies;
+	delete aJson.devDependencies;
+	delete aJson.optionalDependencies;
+
+	fs.writeFileSync(path.join(buildPath, `${name}.json`), JSON.stringify({
+		...aJson,
+		...bJson,
+		...json,
+	}, null, 2));
+};
+
+
+const writeProduct = () => {
+	const checksums = computeChecksums([
+		"vs/workbench/workbench.web.api.js",
+		"vs/workbench/workbench.web.api.css",
+		"vs/code/browser/workbench/workbench.html",
+		"vs/code/browser/workbench/workbench.js",
+		"vs/server/src/cli.js",
+		"vs/server/src/uriTransformer.js",
+		"vs/server/src/login/index.html"
+	]);
+	const date = new Date().toISOString();
+	const commit = util.getVersion(rootPath);
+	mergeAndWrite("product", { commit, date, checksums });
+	mergeAndWrite("package", { codeServerVersion: `${codeServerVersion}-vsc${vscodeVersion}` });
+};
+
+writeProduct();

scripts/merge.js

@@ -56,9 +56,9 @@ function prepend-loader() {
 # Copy code-server into VS Code then build it.
 function build-code-server() {
 	copy-server
+	yarn gulp compile-build --max-old-space-size=32384
+
 	local min=""
-	export BUILD_SOURCEVERSION
-	BUILD_SOURCEVERSION=$(node -p "require('${sourcePath}/build/lib/git.js').getVersion('${rootPath}')")
 	if [[ -n "${minify}" ]] ; then
 		min="-min"
 		yarn gulp minify-vscode --max-old-space-size=32384
@@ -74,11 +74,9 @@ function build-code-server() {
 	cd "${buildPath}" && yarn --production --force --build-from-source
 	rm "${buildPath}/"{package.json,yarn.lock,.yarnrc}
 
-	local packageJson="{\"codeServerVersion\": \"${codeServerVersion}-vsc${vscodeVersion}\"}"
 	cp -r "${sourcePath}/.build/extensions" "${buildPath}"
-	node "${rootPath}/scripts/merge.js" "${sourcePath}/package.json" "${rootPath}/scripts/package.json" "${buildPath}/package.json" "${packageJson}"
-	node "${rootPath}/scripts/merge.js" "${sourcePath}/.build/product.json" "${rootPath}/scripts/product.json" "${buildPath}/product.json"
 	cp -r "${sourcePath}/out-vscode${min}" "${buildPath}/out"
+	node "${rootPath}/scripts/build-json.js" "${sourcePath}" "${buildPath}" "${vscodeVersion}" "${codeServerVersion}"
 
 	# Only keep production dependencies for the server.
 	cp "${rootPath}/"{package.json,yarn.lock} "${buildPath}/out/vs/server"
@@ -143,7 +141,7 @@ function build-task() {
 			log "Pre-built VS Code ${vscodeVersion} has no built extensions" "error"
 			exit 1
 		fi
-		yarn gulp extensions-build-package --max-old-space-size=32384
+		yarn gulp compile-extensions-build --max-old-space-size=32384
 	fi
 	build-code-server
 }