rename extensions

.eslintrc.json

@@ -923,14 +923,6 @@
 					"**/vs/workbench/workbench.sandbox.main"
 				]
 			},
-			{
-				"target": "**/extensions/gitpod-web/**",
-				"restrictions": "!@gitpod/supervisor-api-grpc/**"
-			},
-			{
-				"target": "**/extensions/gitpod-remote-ssh/**",
-				"restrictions": "!@gitpod/supervisor-api-grpc/**"
-			},
 			{
 				"target": "**/extensions/**",
 				"restrictions": "**/*"

.gitpod.yml

@@ -17,7 +17,8 @@ tasks:
       export NODE_ENV=development
       export VSCODE_DEV=1
       gp sync-await init
-      yarn gitpod:watch
+      cd ./extensions
+      yarn watch
     name: watch extension
   - command: |
       export NODE_ENV=development

.vscode/launch.json

@@ -495,13 +495,12 @@
 			"runtimeExecutable": "${execPath}",
 			"args": [
 				"/workspace/vscode",
-				"--extensionDevelopmentPath=${workspaceRoot}/extensions/gitpod",
-				"--extensionDevelopmentPath=${workspaceRoot}/extensions/gitpod-remote-ssh",
+				"--extensionDevelopmentPath=${workspaceRoot}/extensions/gitpod-remote",
 				"--log=debug"
 			],
 			"outFiles": [
-				"${workspaceRoot}/extensions/gitpod/out/**/*.js",
-				"${workspaceRoot}/extensions/gitpod-remote-ssh/out/**/*.js",
+				"${workspaceRoot}/extensions/gitpod-shared/out/**/*.js",
+				"${workspaceRoot}/extensions/gitpod-remote/out/**/*.js",
 			]
 		}
 	],

BUILD.yaml

@@ -13,6 +13,5 @@ packages:
     config:
       commands:
         - ["yarn", "--cwd", "./install/build", "compile"]
-        - ["yarn", "--cwd", "./install", "gitpod:link"]
         - ["yarn", "--cwd", "./install", "compile"]
         - ["yarn", "--cwd", "./install", "download-builtin-extensions"]

build/gulpfile.extensions.js

@@ -65,10 +65,6 @@ const compilations = [
 	'vscode-custom-editor-tests/tsconfig.json',
 	'vscode-notebook-tests/tsconfig.json',
 	'vscode-test-resolver/tsconfig.json',
-	'gitpod/tsconfig.json',
-	'gitpod-remote-ssh/tsconfig.json',
-	'gitpod-web/tsconfig.json',
-	'gitpod-desktop/tsconfig.json',
 ];
 
 const getBaseUrl = out => `https://ticino.blob.core.windows.net/sourcemaps/${commit}/${out}`;

build/gulpfile.gitpod.js

@@ -27,7 +27,7 @@ const rename = require('gulp-rename');
 const ext = require('./lib/extensions');
 
 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
-const marketplaceExtensions = ['gitpod', 'gitpod-desktop', 'gitpod-remote-ssh'];
+const marketplaceExtensions = ['gitpod', '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', () => {

build/hygiene.js

@@ -59,7 +59,7 @@ function hygiene(some, linting = true) {
 	});
 
 	const copyrights = es.through(function (file) {
-		if (file.relative.indexOf('vs/server') === -1) {
+		if (file.relative.indexOf('vs/server') === -1 && file.relative.indexOf('gitpod') === -1) {
 			const lines = file.__lines;
 
 			for (let i = 0; i < copyrightHeaderLines.length; i++) {

build/lib/extensions.js

@@ -206,8 +206,9 @@ const excludedExtensions = [
     'vscode-notebook-tests',
     'vscode-custom-editor-tests',
     'github-authentication',
-    'gitpod-remote-ssh',
-    'gitpod-desktop',
+    'gitpod-shared',
+    'gitpod-remote',
+    'gitpod',
 ];
 const marketplaceWebExtensionsExclude = new Set([
     'ms-vscode.node-debug',

build/lib/extensions.ts

@@ -241,8 +241,9 @@ const excludedExtensions = [
 	'vscode-notebook-tests',
 	'vscode-custom-editor-tests',
 	'github-authentication',
-	'gitpod-remote-ssh',
-	'gitpod-desktop',
+	'gitpod-shared',
+	'gitpod-remote',
+	'gitpod',
 ];
 
 const marketplaceWebExtensionsExclude = new Set([

build/npm/dirs.js

@@ -42,10 +42,6 @@ exports.dirs = [
 	'extensions/vscode-custom-editor-tests',
 	'extensions/vscode-notebook-tests',
 	'extensions/vscode-test-resolver',
-	'extensions/gitpod',
-	'extensions/gitpod-remote-ssh',
-	'extensions/gitpod-web',
-	'extensions/gitpod-desktop',
 	'remote',
 	'remote/web',
 	'test/automation',

extensions/.gitignore

@@ -0,0 +1 @@
+tsconfig.tsbuildinfo