Skip to content

Commit 2b49507

Browse files
GirlBossRushGirlBossRush
committed
Refactor vscode endpoints to use fork directly.
1 parent 2504f6f commit 2b49507

Some content is hidden

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

44 files changed

+385
-1817
lines changed

‎.editorconfig

+5
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@ root = true
33
[*]
44
indent_style = space
55
trim_trailing_whitespace = true
6+
7+
# The indent size used in the `package.json` file cannot be changed
8+
# https://github.com/npm/npm/pull/3180#issuecomment-16336516
9+
[{*.yml,*.yaml,package.json}]
10+
indent_style = space
611
indent_size = 2

‎.prettierrc.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,16 @@ printWidth: 120
22
semi: false
33
trailingComma: all
44
arrowParens: always
5+
singleQuote: false
6+
useTabs: false
7+
8+
overrides:
9+
# Attempt to keep VScode's existing code style intact.
10+
- files: "vendor/modules/code-oss-dev/**/*.ts"
11+
options:
12+
# No limit defined upstream.
13+
printWidth: 10000
14+
semi: true
15+
singleQuote: true
16+
useTabs: true
17+
arrowParens: avoid

‎ci/build/build-vscode.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ main() {
1111

1212
cd vendor/modules/code-oss-dev
1313

14-
yarn gulp compile-build compile-extensions-build compile-extension-media
14+
yarn gulp compile-build compile-extensions-build compile-extension-media compile-web
15+
1516
yarn gulp optimize --gulpfile ./coder.js
17+
1618
if [[ $MINIFY ]]; then
1719
yarn gulp minify --gulpfile ./coder.js
1820
fi

‎ci/dev/watch.ts

+17-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ async function main(): Promise<void> {
88
try {
99
const watcher = new Watcher()
1010
await watcher.watch()
11-
} catch (error) {
11+
} catch (error: any) {
1212
console.error(error.message)
1313
process.exit(1)
1414
}
@@ -38,6 +38,9 @@ class Watcher {
3838
}
3939

4040
const vscode = cp.spawn("yarn", ["watch"], { cwd: this.vscodeSourcePath })
41+
42+
const vscodeWebExtensions = cp.spawn("yarn", ["watch-web"], { cwd: this.vscodeSourcePath })
43+
4144
const tsc = cp.spawn("tsc", ["--watch", "--pretty", "--preserveWatchOutput"], { cwd: this.rootPath })
4245
const plugin = process.env.PLUGIN_DIR
4346
? cp.spawn("yarn", ["build", "--watch"], { cwd: process.env.PLUGIN_DIR })
@@ -48,6 +51,10 @@ class Watcher {
4851
vscode.removeAllListeners()
4952
vscode.kill()
5053

54+
Watcher.log("killing vs code web extension watcher")
55+
vscodeWebExtensions.removeAllListeners()
56+
vscodeWebExtensions.kill()
57+
5158
Watcher.log("killing tsc")
5259
tsc.removeAllListeners()
5360
tsc.kill()
@@ -75,19 +82,28 @@ class Watcher {
7582
Watcher.log("vs code watcher terminated unexpectedly")
7683
cleanup(code)
7784
})
85+
86+
vscodeWebExtensions.on("exit", (code) => {
87+
Watcher.log("vs code extension watcher terminated unexpectedly")
88+
cleanup(code)
89+
})
90+
7891
tsc.on("exit", (code) => {
7992
Watcher.log("tsc terminated unexpectedly")
8093
cleanup(code)
8194
})
95+
8296
if (plugin) {
8397
plugin.on("exit", (code) => {
8498
Watcher.log("plugin terminated unexpectedly")
8599
cleanup(code)
86100
})
87101
}
88102

103+
vscodeWebExtensions.stderr.on("data", (d) => process.stderr.write(d))
89104
vscode.stderr.on("data", (d) => process.stderr.write(d))
90105
tsc.stderr.on("data", (d) => process.stderr.write(d))
106+
91107
if (plugin) {
92108
plugin.stderr.on("data", (d) => process.stderr.write(d))
93109
}

‎package.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"main": "out/node/entry.js",
3636
"devDependencies": {
3737
"@schemastore/package": "^0.0.6",
38-
"@types/body-parser": "^1.19.0",
3938
"@types/browserify": "^12.0.36",
4039
"@types/compression": "^1.7.0",
4140
"@types/cookie-parser": "^1.4.2",
@@ -48,8 +47,7 @@
4847
"@types/safe-compare": "^1.1.0",
4948
"@types/semver": "^7.1.0",
5049
"@types/split2": "^3.2.0",
51-
"@types/tar-fs": "^2.0.0",
52-
"@types/tar-stream": "^2.1.0",
50+
"@types/trusted-types": "^2.0.2",
5351
"@types/ws": "^8.0.0",
5452
"@typescript-eslint/eslint-plugin": "^4.7.0",
5553
"@typescript-eslint/parser": "^4.7.0",
@@ -68,7 +66,7 @@
6866
"stylelint": "^13.0.0",
6967
"stylelint-config-recommended": "^5.0.0",
7068
"ts-node": "^10.0.0",
71-
"typescript": "^4.1.3"
69+
"typescript": "^4.4.0-dev.20210528"
7270
},
7371
"resolutions": {
7472
"ansi-regex": "^5.0.1",
@@ -85,7 +83,6 @@
8583
"dependencies": {
8684
"@coder/logger": "1.1.16",
8785
"argon2": "^0.28.0",
88-
"body-parser": "^1.19.0",
8986
"compression": "^1.7.4",
9087
"cookie-parser": "^1.4.5",
9188
"env-paths": "^2.2.0",
@@ -103,7 +100,6 @@
103100
"safe-compare": "^1.1.4",
104101
"semver": "^7.1.3",
105102
"split2": "^3.2.2",
106-
"tar-fs": "^2.0.0",
107103
"ws": "^8.0.0",
108104
"xdg-basedir": "^4.0.0",
109105
"yarn": "^1.22.4"

‎src/browser/media/manifest.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"name": "code-server",
33
"short_name": "code-server",
4-
"start_url": "{{BASE}}",
4+
"start_url": ".",
55
"display": "fullscreen",
66
"background-color": "#fff",
77
"description": "Run editors on a remote server.",
88
"icons": [
99
{
10-
"src": "{{CS_STATIC_BASE}}/src/browser/media/pwa-icon-192.png",
10+
"src": "./src/browser/media/pwa-icon-192.png",
1111
"type": "image/png",
1212
"sizes": "192x192"
1313
},
1414
{
15-
"src": "{{CS_STATIC_BASE}}/src/browser/media/pwa-icon-512.png",
15+
"src": "./src/browser/media/pwa-icon-512.png",
1616
"type": "image/png",
1717
"sizes": "512x512"
1818
}

‎src/browser/pages/error.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
content="style-src 'self'; manifest-src 'self'; img-src 'self' data:; font-src 'self' data:;"
1212
/>
1313
<title>{{ERROR_TITLE}} - code-server</title>
14-
<link rel="icon" href="{{CS_STATIC_BASE}}/src/browser/media/favicon-dark-support.svg" />
15-
<link rel="alternate icon" href="{{CS_STATIC_BASE}}/src/browser/media/favicon.ico" />
16-
<link rel="manifest" href="{{CS_STATIC_BASE}}/src/browser/media/manifest.json" crossorigin="use-credentials" />
17-
<link rel="apple-touch-icon" sizes="192x192" href="{{CS_STATIC_BASE}}/src/browser/media/pwa-icon-192.png" />
18-
<link rel="apple-touch-icon" sizes="512x512" href="{{CS_STATIC_BASE}}/src/browser/media/pwa-icon-512.png" />
19-
<link href="{{CS_STATIC_BASE}}/src/browser/pages/global.css" rel="stylesheet" />
20-
<link href="{{CS_STATIC_BASE}}/src/browser/pages/error.css" rel="stylesheet" />
14+
<link rel="icon" href="./_static/src/browser/media/favicon-dark-support.svg" />
15+
<link rel="alternate icon" href="./_static/src/browser/media/favicon.ico" />
16+
<link rel="manifest" href="./manifest.json" crossorigin="use-credentials" />
17+
<link rel="apple-touch-icon" sizes="192x192" href="./_static/src/browser/media/pwa-icon-192.png" />
18+
<link rel="apple-touch-icon" sizes="512x512" href="./_static/src/browser/media/pwa-icon-512.png" />
19+
<link href="./_static/src/browser/pages/global.css" rel="stylesheet" />
20+
<link href="./_static/src/browser/pages/error.css" rel="stylesheet" />
2121
<meta id="coder-options" data-settings="{{OPTIONS}}" />
2222
</head>
2323
<body>
@@ -30,6 +30,6 @@ <h2 class="header">{{ERROR_HEADER}}</h2>
3030
</div>
3131
</div>
3232
</div>
33-
<script data-cfasync="false" src="{{CS_STATIC_BASE}}/out/browser/register.browserified.js"></script>
33+
<script data-cfasync="false" src="./_static/out/browser/register.browserified.js"></script>
3434
</body>
3535
</html>

‎src/browser/pages/login.html

+8-9
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
content="style-src 'self'; script-src 'self' 'unsafe-inline'; manifest-src 'self'; img-src 'self' data:; font-src 'self' data:;"
1212
/>
1313
<title>code-server login</title>
14-
<link rel="icon" href="{{CS_STATIC_BASE}}/src/browser/media/favicon-dark-support.svg" />
15-
<link rel="alternate icon" href="{{CS_STATIC_BASE}}/src/browser/media/favicon.ico" />
16-
<link rel="manifest" href="{{CS_STATIC_BASE}}/src/browser/media/manifest.json" crossorigin="use-credentials" />
17-
<link rel="apple-touch-icon" sizes="192x192" href="{{CS_STATIC_BASE}}/src/browser/media/pwa-icon-192.png" />
18-
<link rel="apple-touch-icon" sizes="512x512" href="{{CS_STATIC_BASE}}/src/browser/media/pwa-icon-512.png" />
19-
<link href="{{CS_STATIC_BASE}}/src/browser/pages/global.css" rel="stylesheet" />
20-
<link href="{{CS_STATIC_BASE}}/src/browser/pages/login.css" rel="stylesheet" />
14+
<link rel="icon" href="./_static/src/browser/media/favicon-dark-support.svg" />
15+
<link rel="alternate icon" href="./_static/src/browser/media/favicon.ico" />
16+
<link rel="manifest" href="./manifest.json" crossorigin="use-credentials" />
17+
<link rel="apple-touch-icon" sizes="192x192" href="./_static/src/browser/media/pwa-icon-192.png" />
18+
<link rel="apple-touch-icon" sizes="512x512" href="./_static/src/browser/media/pwa-icon-512.png" />
19+
<link href="./_static/src/browser/pages/global.css" rel="stylesheet" />
20+
<link href="./_static/src/browser/pages/login.css" rel="stylesheet" />
2121
<meta id="coder-options" data-settings="{{OPTIONS}}" />
2222
</head>
2323
<body>
@@ -30,7 +30,6 @@ <h1 class="main">Welcome to code-server</h1>
3030
<div class="content">
3131
<form class="login-form" method="post">
3232
<input class="user" type="text" autocomplete="username" />
33-
<input id="base" type="hidden" name="base" value="/" />
3433
<div class="field">
3534
<input
3635
required
@@ -49,5 +48,5 @@ <h1 class="main">Welcome to code-server</h1>
4948
</div>
5049
</div>
5150
</body>
52-
<script data-cfasync="false" src="{{CS_STATIC_BASE}}/out/browser/pages/login.browserified.js"></script>
51+
<script data-cfasync="false" src="./_static/out/browser/pages/login.browserified.js"></script>
5352
</html>

‎src/browser/pages/login.ts

-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
import { getOptions } from "../../common/util"
21
import "../register"
3-
4-
const options = getOptions()
5-
const el = document.getElementById("base") as HTMLInputElement
6-
if (el) {
7-
el.value = options.base
8-
}

‎src/browser/pages/vscode.html

-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
<!-- Workbench Configuration -->
1818
<meta id="vscode-workbench-web-configuration" data-settings="{{WORKBENCH_WEB_CONFIGURATION}}" />
1919

20-
<!-- Workarounds/Hacks (remote user data uri) -->
21-
<meta id="vscode-remote-user-data-uri" data-settings="{{REMOTE_USER_DATA_URI}}" />
22-
<meta id="vscode-remote-product-configuration" data-settings="{{PRODUCT_CONFIGURATION}}" />
23-
<meta id="vscode-remote-nls-configuration" data-settings="{{NLS_CONFIGURATION}}" />
24-
2520
<!-- Workbench Icon/Manifest/CSS -->
2621
<link rel="icon" href="{{CS_STATIC_BASE}}/src/browser/media/favicon-dark-support.svg" />
2722
<link rel="alternate icon" href="{{CS_STATIC_BASE}}/src/browser/media/favicon.ico" />

0 commit comments

Comments
 (0)