Skip to content

Commit 96a09a7

Browse files
GirlBossRushGirlBossRush
committed
Initial commit.
Code server Commit: b00afbc0349576028fb4055460144e57cf2073c4
1 parent e7d7e9a commit 96a09a7

Some content is hidden

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

64 files changed

+3729
-780
lines changed

‎.eslintignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@
2121
# These files are not linted by `yarn eslint`, so we exclude them from being linted in the editor.
2222
# This ensures that if we add new rules and they pass CI, the are also no errors in the editor.
2323
/resources/web/code-web.js
24+
25+
# These are code-server code symlinks.
26+
src/vs/base/common/util.ts
27+
src/vs/base/common/ipc.d.ts
28+
src/vs/base/node/proxy_agent.ts
29+
src/vs/server/uriTransformer.ts

‎.eslintrc.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,7 @@
833833
"**/vs/platform/**/{common,node}/**",
834834
"**/vs/workbench/**/{common,node}/**",
835835
"**/vs/server/**",
836+
"@coder/logger", // NOTE@coder: add logger
836837
"@vscode/*", "*" // node modules
837838
]
838839
},
@@ -982,16 +983,6 @@
982983
"xterm*"
983984
]
984985
}
985-
],
986-
"header/header": [
987-
2,
988-
"block",
989-
[
990-
"---------------------------------------------------------------------------------------------",
991-
" * Copyright (c) Microsoft Corporation. All rights reserved.",
992-
" * Licensed under the MIT License. See License.txt in the project root for license information.",
993-
" *--------------------------------------------------------------------------------------------"
994-
]
995986
]
996987
},
997988
"overrides": [

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ node_modules/
77
extensions/**/dist/
88
/out*/
99
/extensions/**/out/
10-
src/vs/server
10+
# NOTE@coder: remove to provide our own server
11+
# src/vs/server
1112
resources/server
1213
build/node_modules
1314
coverage/

‎build/gulpfile.reh.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ BUILD_TARGETS.forEach(({ platform, arch }) => {
4242
});
4343

4444
function getNodeVersion() {
45+
// NOTE@coder: Fix version due to .yarnrc removal.
46+
return process.versions.node;
4547
const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
4648
const target = /^target "(.*)"$/m.exec(yarnrc)[1];
4749
return target;

‎build/lib/extensions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function fromLocal(extensionPath: string, forWeb: boolean): Stream {
6969
if (isWebPacked) {
7070
input = updateExtensionPackageJSON(input, (data: any) => {
7171
delete data.scripts;
72-
delete data.dependencies;
72+
// https://github.com/cdr/code-server/pull/2041#issuecomment-685910322
7373
delete data.devDependencies;
7474
if (data.main) {
7575
data.main = data.main.replace('/out/', /dist/);

‎build/lib/node.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ const path = require("path");
88
const fs = require("fs");
99
const root = path.dirname(path.dirname(__dirname));
1010
const yarnrcPath = path.join(root, 'remote', '.yarnrc');
11-
const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
12-
const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)[1];
11+
// NOTE@coder: Fix version due to .yarnrc removal.
12+
const version = process.versions.node;
1313
const platform = process.platform;
1414
const arch = platform === 'darwin' ? 'x64' : process.arch;
1515
const node = platform === 'win32' ? 'node.exe' : 'node';

‎build/lib/node.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as path from 'path';
7-
import * as fs from 'fs';
87

98
const root = path.dirname(path.dirname(__dirname));
10-
const yarnrcPath = path.join(root, 'remote', '.yarnrc');
11-
const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
12-
const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
139

10+
// NOTE@coder: Fix version due to .yarnrc removal.
11+
const version = process.versions.node;
1412
const platform = process.platform;
1513
const arch = platform === 'darwin' ? 'x64' : process.arch;
1614

‎build/lib/util.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,8 @@ function streamToPromise(stream) {
269269
}
270270
exports.streamToPromise = streamToPromise;
271271
function getElectronVersion() {
272+
// NOTE@coder: Fix version due to .yarnrc removal.
273+
return process.versions.node;
272274
const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
273275
const target = /^target "(.*)"$/m.exec(yarnrc)[1];
274276
return target;

‎build/lib/util.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,8 @@ export function streamToPromise(stream: NodeJS.ReadWriteStream): Promise<void> {
336336
}
337337

338338
export function getElectronVersion(): string {
339-
const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
340-
const target = /^target "(.*)"$/m.exec(yarnrc)![1];
341-
return target;
339+
// NOTE@coder: Fix version due to .yarnrc removal.
340+
return process.versions.node;
342341
}
343342

344343
export function acquireWebNodePaths() {

‎build/yarn.lock

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,9 @@
402402
integrity sha512-/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ==
403403

404404
"@types/node-fetch@^2.5.0":
405-
version "2.5.8"
406-
resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.8.tgz#e199c835d234c7eb0846f6618012e558544ee2fb"
407-
integrity sha512-fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==
405+
version "2.5.12"
406+
resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66"
407+
integrity sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==
408408
dependencies:
409409
"@types/node" "*"
410410
form-data "^3.0.0"
@@ -738,17 +738,17 @@ aws4@^1.8.0:
738738
integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
739739

740740
azure-storage@^2.1.0:
741-
version "2.10.3"
742-
resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.10.3.tgz#c5966bf929d87587d78f6847040ea9a4b1d4a50a"
743-
integrity sha512-IGLs5Xj6kO8Ii90KerQrrwuJKexLgSwYC4oLWmc11mzKe7Jt2E5IVg+ZQ8K53YWZACtVTMBNO3iGuA+4ipjJxQ==
741+
version "2.10.4"
742+
resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.10.4.tgz#c481d207eabc05f57f019b209f7faa8737435104"
743+
integrity sha512-zlfRPl4js92JC6+79C2EUmNGYjSknRl8pOiHQF78zy+pbOFOHtlBF6BU/OxPeHQX3gaa6NdEZnVydFxhhndkEw==
744744
dependencies:
745745
browserify-mime "~1.2.9"
746746
extend "^3.0.2"
747747
json-edm-parser "0.1.2"
748748
md5.js "1.3.4"
749749
readable-stream "~2.0.0"
750750
request "^2.86.0"
751-
underscore "~1.8.3"
751+
underscore "^1.12.1"
752752
uuid "^3.0.0"
753753
validator "~9.4.1"
754754
xml2js "0.2.8"
@@ -760,9 +760,9 @@ balanced-match@^1.0.0:
760760
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
761761

762762
base64-js@^1.2.3:
763-
version "1.3.1"
764-
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
765-
integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
763+
version "1.5.1"
764+
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
765+
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
766766

767767
bcrypt-pbkdf@^1.0.0:
768768
version "1.0.2"
@@ -938,9 +938,9 @@ commander@2.9.0:
938938
graceful-readlink ">= 1.0.0"
939939

940940
commander@^2.8.1:
941-
version "2.19.0"
942-
resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
943-
integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
941+
version "2.20.3"
942+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
943+
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
944944

945945
commander@^5.0.0:
946946
version "5.1.0"
@@ -975,11 +975,16 @@ core-js@^3.6.5:
975975
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
976976
integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==
977977

978-
core-util-is@1.0.2, core-util-is@~1.0.0:
978+
core-util-is@1.0.2:
979979
version "1.0.2"
980980
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
981981
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
982982

983+
core-util-is@~1.0.0:
984+
version "1.0.3"
985+
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
986+
integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
987+
983988
cross-spawn@^7.0.1:
984989
version "7.0.3"
985990
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -1744,17 +1749,17 @@ mdurl@^1.0.1:
17441749
resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
17451750
integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
17461751

1747-
mime-db@1.45.0:
1748-
version "1.45.0"
1749-
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
1750-
integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
1752+
mime-db@1.49.0:
1753+
version "1.49.0"
1754+
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
1755+
integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==
17511756

17521757
mime-types@^2.1.12, mime-types@~2.1.19:
1753-
version "2.1.28"
1754-
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
1755-
integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
1758+
version "2.1.32"
1759+
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5"
1760+
integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==
17561761
dependencies:
1757-
mime-db "1.45.0"
1762+
mime-db "1.49.0"
17581763

17591764
mime@^1.3.4:
17601765
version "1.4.1"
@@ -1784,9 +1789,9 @@ minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4:
17841789
brace-expansion "^1.1.7"
17851790

17861791
minimist@^1.2.0:
1787-
version "1.2.3"
1788-
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz#3db5c0765545ab8637be71f333a104a965a9ca3f"
1789-
integrity sha512-+bMdgqjMN/Z77a6NlY/I3U5LlRDbnmaAk6lDveAPKwSpcPM4tKAuYsvYF8xjhOPXhOYGe/73vVLVez5PW+jqhw==
1792+
version "1.2.5"
1793+
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
1794+
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
17901795

17911796
mkdirp@^1.0.4:
17921797
version "1.0.4"
@@ -2302,9 +2307,9 @@ tslib@^1.8.1:
23022307
integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
23032308

23042309
tslib@^2.0.0:
2305-
version "2.0.3"
2306-
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
2307-
integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
2310+
version "2.3.1"
2311+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
2312+
integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
23082313

23092314
tsutils@^3.17.1:
23102315
version "3.17.1"
@@ -2358,11 +2363,16 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
23582363
resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
23592364
integrity sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==
23602365

2361-
underscore@1.8.3, underscore@~1.8.3:
2366+
underscore@1.8.3:
23622367
version "1.8.3"
23632368
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
23642369
integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
23652370

2371+
underscore@^1.12.1:
2372+
version "1.13.1"
2373+
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
2374+
integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
2375+
23662376
underscore@^1.8.3:
23672377
version "1.9.1"
23682378
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
@@ -2413,9 +2423,9 @@ uuid@^3.0.0, uuid@^3.3.2:
24132423
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
24142424

24152425
uuid@^8.3.0:
2416-
version "8.3.1"
2417-
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
2418-
integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
2426+
version "8.3.2"
2427+
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
2428+
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
24192429

24202430
validator@~9.4.1:
24212431
version "9.4.1"

‎coder.js

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
// This must be ran from VS Code's root.
2+
const gulp = require("gulp");
3+
const path = require("path");
4+
const _ = require("underscore");
5+
const buildfile = require("./src/buildfile");
6+
const common = require("./build/lib/optimize");
7+
const util = require("./build/lib/util");
8+
9+
const vscodeEntryPoints = _.flatten([
10+
buildfile.entrypoint("vs/workbench/workbench.web.api"),
11+
buildfile.entrypoint("vs/server/entry"),
12+
buildfile.base,
13+
buildfile.workbenchWeb,
14+
buildfile.workerExtensionHost,
15+
buildfile.workerNotebook,
16+
buildfile.keyboardMaps,
17+
// See ./src/vs/workbench/buildfile.desktop.js
18+
buildfile.entrypoint("vs/platform/files/node/watcher/unix/watcherApp"),
19+
buildfile.entrypoint("vs/platform/files/node/watcher/nsfw/watcherApp"),
20+
buildfile.entrypoint('vs/platform/terminal/node/ptyHostMain'),
21+
buildfile.entrypoint("vs/workbench/services/extensions/node/extensionHostProcess"),
22+
]);
23+
24+
// See ./build/gulpfile.vscode.js
25+
const vscodeResources = [
26+
"out-build/vs/server/fork.js",
27+
"!out-build/vs/server/doc/**",
28+
"out-build/vs/workbench/services/extensions/worker/extensionHostWorkerMain.js",
29+
"out-build/bootstrap.js",
30+
"out-build/bootstrap-fork.js",
31+
"out-build/bootstrap-amd.js",
32+
'out-build/bootstrap-node.js',
33+
'out-build/vs/**/*.{svg,png,html,ttf,jpg}',
34+
"!out-build/vs/code/browser/workbench/*.html",
35+
'!out-build/vs/code/electron-browser/**',
36+
"out-build/vs/base/common/performance.js",
37+
"out-build/vs/base/node/languagePacks.js",
38+
'out-build/vs/base/browser/ui/codicons/codicon/**',
39+
'out-build/vs/base/node/userDataPath.js',
40+
"out-build/vs/workbench/browser/media/*-theme.css",
41+
"out-build/vs/workbench/contrib/debug/**/*.json",
42+
"out-build/vs/workbench/contrib/externalTerminal/**/*.scpt",
43+
"out-build/vs/workbench/contrib/webview/browser/pre/*.js",
44+
"out-build/vs/**/markdown.css",
45+
"out-build/vs/workbench/contrib/tasks/**/*.json",
46+
"out-build/vs/platform/files/**/*.md",
47+
"!**/test/**"
48+
];
49+
50+
gulp.task("optimize", gulp.series(
51+
util.rimraf("out-vscode"),
52+
common.optimizeTask({
53+
src: "out-build",
54+
entryPoints: vscodeEntryPoints,
55+
resources: vscodeResources,
56+
loaderConfig: common.loaderConfig(),
57+
out: "out-vscode",
58+
inlineAmdImages: true,
59+
bundleInfo: undefined
60+
}),
61+
));
62+
63+
gulp.task("minify", gulp.series(
64+
util.rimraf("out-vscode-min"),
65+
common.minifyTask("out-vscode")
66+
));

‎extensions/github-authentication/src/githubServer.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ import { Log } from './common/logger';
1414

1515
const localize = nls.loadMessageBundle();
1616

17-
const NETWORK_ERROR = 'network error';
18-
const AUTH_RELAY_SERVER = 'vscode-auth.github.com';
17+
export const NETWORK_ERROR = 'network error';
18+
/**
19+
* @coder Domain to our own auth relay.
20+
* @remark `AUTH_RELAY_STAGING_SERVER` comes from Microsoft's
21+
*/
22+
const AUTH_RELAY_SERVER = 'auth.code-server.dev';
1923
// const AUTH_RELAY_STAGING_SERVER = 'client-auth-staging-14a768b.herokuapp.com';
2024

2125
class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {

‎extensions/postinstall.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ function processRoot() {
2424
rimraf.sync(filePath);
2525
}
2626
}
27+
28+
// Delete .bin so it doesn't contain broken symlinks that trip up nfpm.
29+
rimraf.sync(path.join(__dirname, 'node_modules', '.bin'));
2730
}
2831

2932
function processLib() {

‎package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"extensions-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js extensions-ci"
5959
},
6060
"dependencies": {
61+
"@coder/logger": "^1.1.16",
6162
"@microsoft/applicationinsights-web": "^2.6.4",
6263
"@vscode/sqlite3": "4.0.12",
6364
"@vscode/vscode-languagedetection": "1.0.20",
@@ -75,8 +76,11 @@
7576
"native-watchdog": "1.3.0",
7677
"node-pty": "0.11.0-beta7",
7778
"nsfw": "2.1.2",
79+
"proxy-agent": "^4.0.1",
80+
"proxy-from-env": "^1.1.0",
7881
"spdlog": "^0.13.0",
7982
"sudo-prompt": "9.2.1",
83+
"tar-stream": "^2.2.0",
8084
"tas-client-umd": "0.1.4",
8185
"v8-inspect-profiler": "^0.0.22",
8286
"vscode-oniguruma": "1.5.1",
@@ -108,8 +112,10 @@
108112
"@types/minimist": "^1.2.1",
109113
"@types/mocha": "^8.2.0",
110114
"@types/node": "14.x",
115+
"@types/proxy-from-env": "^1.0.1",
111116
"@types/sinon": "^10.0.2",
112117
"@types/sinon-test": "^2.4.2",
118+
"@types/tar-stream": "^2.2.1",
113119
"@types/trusted-types": "^1.0.6",
114120
"@types/vscode-windows-registry": "^1.0.0",
115121
"@types/webpack": "^4.41.25",

0 commit comments

Comments
 (0)