Skip to content

Commit d4d6299

Browse files
committed
chore: refresh webview patch
1 parent c8e638a commit d4d6299

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

patches/webview.diff

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,12 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4343
remoteAuthority,
4444
+ webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
4545
_wrapWebWorkerExtHostInIframe,
46-
developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined },
46+
developmentOptions: { enableSmokeTestDriver: this._environmentService.args['enable-smoke-test-driver'] ? true : undefined, logLevel: this._logService.getLevel() },
4747
settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
4848
Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
4949
===================================================================
5050
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
5151
+++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
52-
@@ -5,7 +5,7 @@
53-
<meta charset="UTF-8">
54-
55-
<meta http-equiv="Content-Security-Policy"
56-
- content="default-src 'none'; script-src 'sha256-JpX/ganPoxpavjxWCz9DUZgwVZ59o2lwSYTQrziPsdU=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
57-
+ content="default-src 'none'; script-src 'sha256-BRi/ZOLWtsisl3jAheglVzKmoA1T6n2Mmf2NM4UnIXE=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
58-
59-
<!-- Disable pinch zooming -->
60-
<meta name="viewport"
6152
@@ -331,6 +331,12 @@
6253

6354
const hostname = location.hostname;
@@ -70,7 +61,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index
7061
+
7162
if (!crypto.subtle) {
7263
// cannot validate, not running in a secure context
73-
throw new Error(`Cannot validate in current context!`);
64+
throw new Error(`'crypto.subtle' is not available so webviews will not work. This is likely because the editor is not running in a secure context (https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts).`);
7465
Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
7566
===================================================================
7667
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
@@ -87,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index
8778
+
8879
if (!crypto.subtle) {
8980
// cannot validate, not running in a secure context
90-
throw new Error(`Cannot validate in current context!`);
81+
throw new Error(`'crypto.subtle' is not available so webviews will not work. This is likely because the editor is not running in a secure context (https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts).`);
9182
Index: code-server/lib/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
9283
===================================================================
9384
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html

0 commit comments

Comments
 (0)