Skip to content

Commit 9b03fb3

Browse files
code-ashercode-asher
committed
Refresh patches
1 parent 858b042 commit 9b03fb3

10 files changed

+15
-15
lines changed

‎patches/base-path.diff

+4-4
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,16 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
179179
+ const vscodeBase = relativePath(getOriginalUrl(req))
180180
const data = (await util.promisify(fs.readFile)(filePath)).toString()
181181
.replace('{{WORKBENCH_WEB_CONFIGURATION}}', escapeAttribute(JSON.stringify({
182-
remoteAuthority,
183-
@@ -279,6 +284,7 @@ export class WebClientServer {
182+
codeServerVersion: this._productService.codeServerVersion,
183+
@@ -280,6 +285,7 @@ export class WebClientServer {
184184
developmentOptions: { enableSmokeTestDriver: this._environmentService.driverHandle === 'web' ? true : undefined },
185185
settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
186186
productConfiguration: <Partial<IProductConfiguration>>{
187187
+ rootEndpoint: base,
188188
embedderIdentifier: 'server-distro',
189189
extensionsGallery: this._webExtensionResourceUrlTemplate ? {
190190
...this._productService.extensionsGallery,
191-
@@ -290,7 +296,9 @@ export class WebClientServer {
191+
@@ -291,7 +297,9 @@ export class WebClientServer {
192192
} : undefined
193193
}
194194
})))
@@ -199,7 +199,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
199199

200200
const cspDirectives = [
201201
'default-src \'self\';',
202-
@@ -369,3 +377,70 @@ export class WebClientServer {
202+
@@ -370,3 +378,70 @@ export class WebClientServer {
203203
return res.end(data);
204204
}
205205
}

‎patches/display-language.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
184184
+ const nlsConfiguration = await getNLSConfiguration(locale, this._environmentService.userDataPath)
185185
const data = (await util.promisify(fs.readFile)(filePath)).toString()
186186
.replace('{{WORKBENCH_WEB_CONFIGURATION}}', escapeAttribute(JSON.stringify({
187-
remoteAuthority,
188-
@@ -302,7 +305,8 @@ export class WebClientServer {
187+
codeServerVersion: this._productService.codeServerVersion,
188+
@@ -303,7 +306,8 @@ export class WebClientServer {
189189
})))
190190
.replace('{{WORKBENCH_AUTH_SESSION}}', () => authSessionInfo ? escapeAttribute(JSON.stringify(authSessionInfo)) : '')
191191
.replace(/{{BASE}}/g, base)

‎patches/local-storage.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
2020
===================================================================
2121
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
2222
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
23-
@@ -289,6 +289,7 @@ export class WebClientServer {
23+
@@ -290,6 +290,7 @@ export class WebClientServer {
2424
enableSmokeTestDriver: this._environmentService.driverHandle === 'web' ? true : undefined,
2525
logLevel: this._logService.getLevel(),
2626
},

‎patches/log-level.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
77
===================================================================
88
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
99
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
10-
@@ -285,7 +285,10 @@ export class WebClientServer {
10+
@@ -286,7 +286,10 @@ export class WebClientServer {
1111
remoteAuthority,
1212
webviewEndpoint: vscodeBase + '/static/out/vs/workbench/contrib/webview/browser/pre',
1313
_wrapWebWorkerExtHostInIframe,

‎patches/logout.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4040
===================================================================
4141
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
4242
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
43-
@@ -287,6 +287,7 @@ export class WebClientServer {
43+
@@ -288,6 +288,7 @@ export class WebClientServer {
4444
productConfiguration: <Partial<IProductConfiguration>>{
4545
rootEndpoint: base,
4646
updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,

‎patches/marketplace.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
3232
===================================================================
3333
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
3434
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
35-
@@ -286,14 +286,14 @@ export class WebClientServer {
35+
@@ -287,14 +287,14 @@ export class WebClientServer {
3636
productConfiguration: <Partial<IProductConfiguration>>{
3737
rootEndpoint: base,
3838
embedderIdentifier: 'server-distro',

‎patches/proxy-uri.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
6868
===================================================================
6969
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
7070
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
71-
@@ -288,6 +288,7 @@ export class WebClientServer {
71+
@@ -289,6 +289,7 @@ export class WebClientServer {
7272
rootEndpoint: base,
7373
updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
7474
logoutEndpoint: this._environmentService.args['auth'] ? base + '/logout' : undefined,

‎patches/service-worker.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
2121
===================================================================
2222
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
2323
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
24-
@@ -297,6 +297,10 @@ export class WebClientServer {
24+
@@ -298,6 +298,10 @@ export class WebClientServer {
2525
logoutEndpoint: this._environmentService.args['auth'] ? base + '/logout' : undefined,
2626
proxyEndpointTemplate: base + '/proxy/{{port}}',
2727
embedderIdentifier: 'server-distro',

‎patches/update-check.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
100100
===================================================================
101101
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
102102
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
103-
@@ -286,6 +286,7 @@ export class WebClientServer {
103+
@@ -287,6 +287,7 @@ export class WebClientServer {
104104
settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
105105
productConfiguration: <Partial<IProductConfiguration>>{
106106
rootEndpoint: base,

‎patches/webview.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
2323
===================================================================
2424
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
2525
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
26-
@@ -280,6 +280,7 @@ export class WebClientServer {
27-
const data = (await util.promisify(fs.readFile)(filePath)).toString()
26+
@@ -281,6 +281,7 @@ export class WebClientServer {
2827
.replace('{{WORKBENCH_WEB_CONFIGURATION}}', escapeAttribute(JSON.stringify({
28+
codeServerVersion: this._productService.codeServerVersion,
2929
remoteAuthority,
3030
+ webviewEndpoint: vscodeBase + '/static/out/vs/workbench/contrib/webview/browser/pre',
3131
_wrapWebWorkerExtHostInIframe,

0 commit comments

Comments
 (0)