Fixes hanging resolveExternalUri

.eslintrc.json

@@ -632,6 +632,18 @@
 					}
 				]
 			}
+		},
+		{
+			"files": [
+				"build/gulpfile.gitpod.js",
+				"src/vs/gitpod/*",
+				"extensions/gitpod*/**"
+			],
+			"rules": {
+				"header/header": [
+					"off"
+				]
+			}
 		}
 	]
 }

.gitpod.Dockerfile

@@ -0,0 +1,21 @@
+FROM gitpod/workspace-full:latest
+
+USER gitpod
+
+# We use latest major version of Node.js distributed VS Code. (see about dialog in your local VS Code)
+RUN bash -c ". .nvm/nvm.sh \
+    && nvm install 16 \
+    && nvm use 16 \
+    && nvm alias default 16"
+
+RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
+
+# Install dependencies
+RUN sudo apt-get update \
+    && sudo apt-get install -y --no-install-recommends \
+        xvfb x11vnc fluxbox dbus-x11 x11-utils x11-xserver-utils xdg-utils \
+        fbautostart xterm eterm gnome-terminal gnome-keyring seahorse nautilus \
+        libx11-dev libxkbfile-dev libsecret-1-dev libnotify4 libnss3 libxss1 \
+        libasound2 libgbm1 xfonts-base xfonts-terminus fonts-noto fonts-wqy-microhei \
+        fonts-droid-fallback vim-tiny nano libgconf2-dev libgtk-3-dev twm \
+    && sudo apt-get clean && sudo rm -rf /var/cache/apt/* && sudo rm -rf /var/lib/apt/lists/* && sudo rm -rf /tmp/*

.gitpod.yml

@@ -0,0 +1,36 @@
+image:
+  file: .gitpod.Dockerfile
+ports:
+  - port: 9888
+    onOpen: open-browser
+tasks:
+  - init: |
+      yarn
+      yarn server:init
+    command: |
+      gp sync-done init
+      export NODE_ENV=development
+      export VSCODE_DEV=1
+      yarn gulp watch-init
+    name: watch app
+  - command: |
+      export NODE_ENV=development
+      export VSCODE_DEV=1
+      gp sync-await init
+      cd ./extensions
+      yarn watch
+    name: watch extension
+  - command: |
+      export NODE_ENV=development
+      export VSCODE_DEV=1
+      gp sync-await init
+      ./scripts/code-server.sh --without-connection-token
+    name: run app
+    openMode: split-right
+github:
+  prebuilds:
+    pullRequestsFromForks: true
+vscode:
+  extensions:
+    - dbaeumer.vscode-eslint
+    - svelte.svelte-vscode

.vscode/launch.json

@@ -1,6 +1,36 @@
 {
 	"version": "0.1.0",
 	"configurations": [
+		{
+			"name": "Launch gitpod-web",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"${workspaceFolder}",
+				"--extensionDevelopmentPath=${workspaceRoot}/extensions/gitpod-web",
+				"--log=debug"
+			],
+			"outFiles": [
+				"${workspaceRoot}/extensions/gitpod-shared/out/**/*.js",
+				"${workspaceRoot}/extensions/gitpod-web/out/**/*.js",
+			]
+		},
+		{
+			"name": "Launch gitpod-remote",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"${workspaceFolder}",
+				"--extensionDevelopmentPath=${workspaceRoot}/extensions/gitpod-remote",
+				"--log=debug"
+			],
+			"outFiles": [
+				"${workspaceRoot}/extensions/gitpod-shared/out/**/*.js",
+				"${workspaceRoot}/extensions/gitpod-remote/out/**/*.js",
+			]
+		},
 		{
 			"type": "node",
 			"request": "launch",
@@ -272,7 +302,14 @@
 			"presentation": {
 				"group": "0_vscode",
 				"order": 2
-			}
+			},
+			"env": {
+				"VSCODE_DEV": "1",
+				"NODE_ENV": "development"
+			},
+			"args": [
+				"--without-connection-token"
+			]
 		},
 		{
 			"type": "node",

BUILD.yaml

@@ -0,0 +1,17 @@
+packages:
+  - name: install
+    type: generic
+    srcs:
+    - "**"
+    config:
+      commands:
+        - ["yarn"]
+  - name: init
+    type: generic
+    deps:
+    - ":install"
+    config:
+      commands:
+        - ["yarn", "--cwd", "./install/build", "compile"]
+        - ["yarn", "--cwd", "./install", "compile"]
+        - ["yarn", "--cwd", "./install", "download-builtin-extensions"]

build/.moduleignore

@@ -168,4 +168,9 @@ xterm-addon-*/fixtures/**
 xterm-addon-*/out/**
 xterm-addon-*/out-test/**
 
-
+# TODO: Remove this once gitpod-protocol package doesn't ship source code
+@gitpod/gitpod-protocol/src/**
+@gitpod/gitpod-protocol/data/**
+@gitpod/gitpod-protocol/node_modules/**
+@gitpod/gitpod-protocol/lib/*.d.ts
+@gitpod/gitpod-protocol/lib/*.d.ts.map

build/.webignore

@@ -46,6 +46,15 @@ xterm-addon-webgl/out/**
 !@microsoft/applicationinsights-core-js/browser/applicationinsights-core-js.min.js
 !@microsoft/applicationinsights-shims/dist/umd/applicationinsights-shims.min.js
 
+@improbable-eng/**
+!@improbable-eng/grpc-web/dist/grpc-web-client.umd.js
 
+@gitpod/**
+!@gitpod/local-app-api-grpcweb/lib/localapp.js
+!@gitpod/ide-metrics-api-grpcweb/lib/index.js
 
+browser-headers/**
+google-protobuf/**
 
+@zip.js/**
+[email protected]/zip.js/dist/zip-no-worker-deflate.min.js

build/gulpfile.gitpod.js

@@ -0,0 +1,80 @@
+/*!--------------------------------------------------------
+* Copyright (C) Gitpod. All rights reserved.
+*--------------------------------------------------------*/
+
+'use strict';
+
+const promisify = require('util').promisify;
+const cp = require('child_process');
+const argv = require('yargs').argv;
+const vsce = require('vsce');
+const gulp = require('gulp');
+const path = require('path');
+const es = require('event-stream');
+const util = require('./lib/util');
+const task = require('./lib/task');
+const rename = require('gulp-rename');
+const ext = require('./lib/extensions');
+
+gulp.task(task.define('watch-init', require('./lib/compilation').watchTask('out', false)));
+
+const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
+const marketplaceExtensions = ['gitpod-remote'];
+const outMarketplaceExtensions = 'out-gitpod-marketplace';
+const cleanMarketplaceExtensions = task.define('clean-gitpod-marketplace-extensions', util.rimraf(outMarketplaceExtensions));
+const bumpMarketplaceExtensions = task.define('bump-marketplace-extensions', () => {
+	if ('new-version' in argv && argv['new-version']) {
+		const newVersion = argv['new-version'];
+		console.log(newVersion);
+		return Promise.allSettled(marketplaceExtensions.map(async extensionName => {
+			const { stderr } = await promisify(cp.exec)(`yarn version --new-version ${newVersion} --cwd ${path.join(extensionsPath, extensionName)} --no-git-tag-version`, { encoding: 'utf8' });
+			if (stderr) {
+				throw new Error('failed to bump up version: ' + stderr);
+			}
+		}));
+	}
+});
+
+const bundlePortsWebview = task.define('bundle-remote-ports-webview', async () => {
+	await promisify(cp.exec)(`yarn --cwd ${path.join(extensionsPath, 'gitpod-remote')} run build:webview`, { encoding: 'utf8' });
+	gulp.src([`${path.join(extensionsPath, 'gitpod-remote')}/public/**/*`]).pipe(gulp.dest(path.join(outMarketplaceExtensions, 'gitpod-remote/public/')));
+});
+gulp.task(bundlePortsWebview);
+for (const extensionName of marketplaceExtensions) {
+	const cleanExtension = task.define('gitpod:clean-extension:' + extensionName, util.rimraf(path.join(outMarketplaceExtensions, extensionName)));
+	const bumpExtension = task.define('gitpod:bump-extension:' + extensionName, async () => {
+		if ('new-version' in argv && argv['new-version']) {
+			const newVersion = argv['new-version'];
+			const { stderr } = await promisify(cp.exec)(`yarn version --new-version ${newVersion} --cwd ${path.join(extensionsPath, extensionName)} --no-git-tag-version`, { encoding: 'utf8' });
+			if (stderr) {
+				throw new Error('failed to bump up version: ' + stderr);
+			}
+		}
+	});
+	const bundleExtension = task.define('gitpod:bundle-extension:' + extensionName, task.series(
+		cleanExtension,
+		bumpExtension,
+		() =>
+			ext.minifyExtensionResources(
+				ext.fromLocal(path.join(extensionsPath, extensionName), false)
+					.pipe(rename(p => p.dirname = `${extensionName}/${p.dirname}`))
+			).pipe(gulp.dest(outMarketplaceExtensions))
+	));
+	gulp.task(bundleExtension);
+	const publishExtension = task.define('gitpod:publish-extension:' + extensionName, task.series(
+		bundleExtension,
+		bundlePortsWebview,
+		() => vsce.publish({
+			cwd: path.join(outMarketplaceExtensions, extensionName)
+		})
+	));
+	gulp.task(publishExtension);
+	const packageExtension = task.define('gitpod:package-extension:' + extensionName, task.series(
+		bundleExtension,
+		bundlePortsWebview,
+		() => vsce.createVSIX({
+			cwd: path.join(outMarketplaceExtensions, extensionName)
+		})
+	));
+	gulp.task(packageExtension);
+}

build/gulpfile.reh.js

@@ -364,7 +364,12 @@ function tweakProductForServerWeb(product) {
 					loaderConfig: optimize.loaderConfig(),
 					inlineAmdImages: true,
 					bundleInfo: undefined,
-					fileContentMapper: createVSCodeWebFileContentMapper('.build/extensions', type === 'reh-web' ? tweakProductForServerWeb(product) : product)
+					fileContentMapper: createVSCodeWebFileContentMapper('.build/extensions', type === 'reh-web' ? tweakProductForServerWeb(product) : product),
+					header: [
+						'/*!-----------------------------------------',
+						' * Copyright (c) Gitpod. All rights reserved.',
+						' *-----------------------------------------*/'
+					].join('\n')
 				},
 				commonJS: {
 					src: 'out-build',
@@ -408,12 +413,61 @@ function tweakProductForServerWeb(product) {
 			));
 			gulp.task(serverTaskCI);
 
+			/**
+			 * This dummy extension is a mock the for built-in extension called `github-authentication`.
+			 * In Gitpod we don't use the built-in extension (it's implemented inside gitpod-web extension)
+			 * but if this one is missing, it breaks the GitHub Authentication for extensions that depend
+			 * explicitly on `github-authentication` like `github.vscode-pull-request-github`
+			 */
+			const createDummyGitHubAuthExtensionTask = task.define('createDummyGitHubAuthExtensionTask', (done) => {
+				const dir = path.join(BUILD_ROOT, destinationFolderName, 'extensions', 'github-authentication');
+
+				if (!fs.existsSync(dir)) {
+					fs.mkdirSync(dir, { recursive: true });
+				}
+
+				const packageJsonContent = {
+					name: 'github-authentication',
+					displayName: 'GitHub Authentication',
+					description: 'Gitpod Override', // TODO: change
+					publisher: 'vscode',
+					license: 'MIT',
+					version: '0.0.2',
+					engines: {
+						vscode: '^1.41.0',
+					},
+					categories: ['Other'],
+					api: 'none',
+					extensionKind: ['ui', 'workspace'],
+					activationEvents: [
+						'onAuthenticationRequest:github',
+					],
+					capabilities: {
+						virtualWorkspaces: true,
+						untrustedWorkspaces: {
+							supported: true,
+						},
+					},
+					main: './extension.js',
+				};
+
+				const extensionJsContent = `module.exports = function activate() {}`;
+
+				fs.writeFileSync(path.join(dir, 'package.json'), JSON.stringify(packageJsonContent, null, 2));
+				fs.writeFileSync(path.join(dir, 'extension.js'), extensionJsContent);
+
+				done();
+			});
+
+			gulp.task(createDummyGitHubAuthExtensionTask);
+
 			const serverTask = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
 				compileBuildTask,
 				compileExtensionsBuildTask,
 				compileExtensionMediaBuildTask,
 				minified ? minifyTask : optimizeTask,
-				serverTaskCI
+				serverTaskCI,
+				createDummyGitHubAuthExtensionTask
 			));
 			gulp.task(serverTask);
 		});

build/gulpfile.vscode.web.js

@@ -34,7 +34,7 @@ const version = (quality && quality !== 'stable') ? `${packageJson.version}-${qu
 const vscodeWebResourceIncludes = [
 	// Workbench
 	'out-build/vs/{base,platform,editor,workbench}/**/*.{svg,png,jpg,mp3}',
-	'out-build/vs/code/browser/workbench/*.html',
+	'out-build/vs/gitpod/browser/workbench/*.html',
 	'out-build/vs/base/browser/ui/codicons/codicon/**/*.ttf',
 	'out-build/vs/**/markdown.css',
 
@@ -176,7 +176,7 @@ const optimizeVSCodeWebTask = task.define('optimize-vscode-web', task.series(
 const minifyVSCodeWebTask = task.define('minify-vscode-web', task.series(
 	optimizeVSCodeWebTask,
 	util.rimraf('out-vscode-web-min'),
-	optimize.minifyTask('out-vscode-web', `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`)
+	optimize.minifyTask('out-vscode-web')
 ));
 gulp.task(minifyVSCodeWebTask);
 
@@ -192,7 +192,7 @@ function packageTask(sourceFolderName, destinationFolderName) {
 		const extensions = gulp.src('.build/web/extensions/**', { base: '.build/web', dot: true });
 
 		const sources = es.merge(src, extensions)
-			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
+			.pipe(filter(['**'], { dot: true }));
 
 		const name = product.nameShort;
 		const packageJsonStream = gulp.src(['remote/web/package.json'], { base: 'remote/web' })

build/hygiene.js

@@ -87,13 +87,15 @@ function hygiene(some, linting = true) {
 	});
 
 	const copyrights = es.through(function (file) {
-		const lines = file.__lines;
-
-		for (let i = 0; i < copyrightHeaderLines.length; i++) {
-			if (lines[i] !== copyrightHeaderLines[i]) {
-				console.error(file.relative + ': Missing or bad copyright statement');
-				errorCount++;
-				break;
+		if (file.relative.indexOf('gitpod') === -1) {
+			const lines = file.__lines;
+
+			for (let i = 0; i < copyrightHeaderLines.length; i++) {
+				if (lines[i] !== copyrightHeaderLines[i]) {
+					console.error(file.relative + ': Missing or bad copyright statement');
+					errorCount++;
+					break;
+				}
 			}
 		}