Skip to content

Commit acd138e

Browse files
akosyakovjeanp413
authored andcommitted
rename extensions
1 parent 5b0ade1 commit acd138e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1954
-1988
lines changed

.eslintrc.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -924,14 +924,6 @@
924924
"**/vs/workbench/workbench.sandbox.main"
925925
]
926926
},
927-
{
928-
"target": "**/extensions/gitpod-web/**",
929-
"restrictions": "!@gitpod/supervisor-api-grpc/**"
930-
},
931-
{
932-
"target": "**/extensions/gitpod-remote-ssh/**",
933-
"restrictions": "!@gitpod/supervisor-api-grpc/**"
934-
},
935927
{
936928
"target": "**/extensions/**",
937929
"restrictions": "**/*"

.gitpod.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ tasks:
1717
export NODE_ENV=development
1818
export VSCODE_DEV=1
1919
gp sync-await init
20-
yarn gitpod:watch
20+
cd ./extensions
21+
yarn watch
2122
name: watch extension
2223
- command: |
2324
export NODE_ENV=development

.vscode/launch.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -502,13 +502,12 @@
502502
"runtimeExecutable": "${execPath}",
503503
"args": [
504504
"/workspace/vscode",
505-
"--extensionDevelopmentPath=${workspaceRoot}/extensions/gitpod",
506-
"--extensionDevelopmentPath=${workspaceRoot}/extensions/gitpod-remote-ssh",
505+
"--extensionDevelopmentPath=${workspaceRoot}/extensions/gitpod-remote",
507506
"--log=debug"
508507
],
509508
"outFiles": [
510-
"${workspaceRoot}/extensions/gitpod/out/**/*.js",
511-
"${workspaceRoot}/extensions/gitpod-remote-ssh/out/**/*.js",
509+
"${workspaceRoot}/extensions/gitpod-shared/out/**/*.js",
510+
"${workspaceRoot}/extensions/gitpod-remote/out/**/*.js",
512511
]
513512
}
514513
],

BUILD.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@ packages:
1313
config:
1414
commands:
1515
- ["yarn", "--cwd", "./install/build", "compile"]
16-
- ["yarn", "--cwd", "./install", "gitpod:link"]
1716
- ["yarn", "--cwd", "./install", "compile"]
1817
- ["yarn", "--cwd", "./install", "download-builtin-extensions"]

build/gulpfile.extensions.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ const compilations = [
6565
'vscode-custom-editor-tests/tsconfig.json',
6666
'vscode-notebook-tests/tsconfig.json',
6767
'vscode-test-resolver/tsconfig.json',
68-
'gitpod/tsconfig.json',
69-
'gitpod-remote-ssh/tsconfig.json',
70-
'gitpod-web/tsconfig.json',
71-
'gitpod-desktop/tsconfig.json',
7268
];
7369

7470
const getBaseUrl = out => `https://ticino.blob.core.windows.net/sourcemaps/${commit}/${out}`;

build/gulpfile.gitpod.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const rename = require('gulp-rename');
2727
const ext = require('./lib/extensions');
2828

2929
const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
30-
const marketplaceExtensions = ['gitpod', 'gitpod-desktop', 'gitpod-remote-ssh'];
30+
const marketplaceExtensions = ['gitpod', 'gitpod-remote'];
3131
const outMarketplaceExtensions = 'out-gitpod-marketplace';
3232
const cleanMarketplaceExtensions = task.define('clean-gitpod-marketplace-extensions', util.rimraf(outMarketplaceExtensions));
3333
const bumpMarketplaceExtensions = task.define('bump-marketplace-extensions', () => {

build/hygiene.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function hygiene(some, linting = true) {
5959
});
6060

6161
const copyrights = es.through(function (file) {
62-
if (file.relative.indexOf('vs/server') === -1 && file.relative.indexOf('gulpfile.server') === -1) {
62+
if (file.relative.indexOf('vs/server') === -1 && file.relative.indexOf('gitpod') === -1) {
6363
const lines = file.__lines;
6464

6565
for (let i = 0; i < copyrightHeaderLines.length; i++) {

build/lib/extensions.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,9 @@ const excludedExtensions = [
206206
'vscode-notebook-tests',
207207
'vscode-custom-editor-tests',
208208
'github-authentication',
209-
'gitpod-remote-ssh',
210-
'gitpod-desktop',
209+
'gitpod-shared',
210+
'gitpod-remote',
211+
'gitpod',
211212
];
212213
const marketplaceWebExtensionsExclude = new Set([
213214
'ms-vscode.node-debug',

build/lib/extensions.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,9 @@ const excludedExtensions = [
241241
'vscode-notebook-tests',
242242
'vscode-custom-editor-tests',
243243
'github-authentication',
244-
'gitpod-remote-ssh',
245-
'gitpod-desktop',
244+
'gitpod-shared',
245+
'gitpod-remote',
246+
'gitpod',
246247
];
247248

248249
const marketplaceWebExtensionsExclude = new Set([

build/npm/dirs.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ exports.dirs = [
4242
'extensions/vscode-custom-editor-tests',
4343
'extensions/vscode-notebook-tests',
4444
'extensions/vscode-test-resolver',
45-
'extensions/gitpod',
46-
'extensions/gitpod-remote-ssh',
47-
'extensions/gitpod-web',
48-
'extensions/gitpod-desktop',
4945
'remote',
5046
'remote/web',
5147
'test/automation',

0 commit comments

Comments
 (0)