Skip to content

Commit 6863372

Browse files
committed
chore: bump vscode to 1.99.0
1 parent 2294200 commit 6863372

12 files changed

Lines changed: 62 additions & 49 deletions

File tree

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"license": "ISC",
3131
"devDependencies": {
3232
"@cloudflare/workers-types": "^4.20250109.0",
33-
"@github1s/vscode-web": "0.24.0",
33+
"@github1s/vscode-web": "0.25.0",
3434
"chokidar": "^4.0.3",
3535
"clean-css": "^5.3.3",
3636
"copy-webpack-plugin": "^12.0.2",

vscode-web/.VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.97.2
1+
1.99.0

vscode-web/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vscode-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@github1s/vscode-web",
3-
"version": "0.24.0",
3+
"version": "0.25.0",
44
"description": "VS Code web for GitHub1s",
55
"author": "github1s",
66
"license": "MIT",

vscode-web/scripts/.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "533dd320519e7523e9bfd102ab35b2329223c1cf6fa909210d47ebbb75e7cf41",
3-
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "654fa16577a5fcf83f2601f1e22e0a6ac67a9710980d6a762ee68074423a74cc",
2+
"src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "a195c8b4170a58eca301c3044ae278fa3b811539a7274830691afc73f6da86b8",
3+
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "6be71e59eeb2e650262bb6d15a05dbd7636928fbbae7f33998f1554b436b4108",
44
"src/vs/workbench/browser/web.main.ts": "0cf354b9221fdb15a738366043fbf69d8f8373891faf9f5e66a033de935eba79",
55
"src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts": "e986095a30dbea54af56c25fa1b184b55f34f8914129b27e2f20d8c4ea9fd16b",
6-
"src/vs/workbench/contrib/webview/browser/pre/index.html": "09664522d7c6b0fdb7728be06b1a1f6ec8bb82c4fd6f2d13a7e84a0fd7d667af",
6+
"src/vs/workbench/contrib/webview/browser/pre/index.html": "a325d58526d8ac86f3460afdb63787e09ea71d10e95c20518b92586ed028834c",
77
"src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "c220568141adf6ed560bab754ea7769795465c6fa93ecd461e9b59f05ca56377",
88
"src/vs/workbench/services/label/common/labelService.ts": "72d72581bd521c2edadd60d4458de4d1c6a9a2cc2cf83820034c82815a2eae6a",
9-
"src/vs/workbench/services/textfile/browser/textFileService.ts": "b5ce3f8032cd2fe5a871b33d67f578d209bbae3f42007998559138326fd16b04",
10-
"src/vs/base/common/network.ts": "10cb07268d9805b102cf8ab9d5e03f97d935a42304c7bdc5e8c54013038bd9ad",
11-
"src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html": "1b7956deade55aa1420516b62251d412fb578bb1165e2580b21d3d8ace968a67"
9+
"src/vs/workbench/services/textfile/browser/textFileService.ts": "fbb6ae9a1d9ed4d57ce8b0f91e54c5a9505a293a8b15c72e09773ee54fb5cd28",
10+
"src/vs/base/common/network.ts": "34fc2461d4b6029e71b60a3bf5d7438585e9d2b66ccdcab0893cc69d77fab5b5",
11+
"src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html": "40d576ad2307d28012b34b86858ba36ba49ae10e5aedb394bd06b14a35b869a5"
1212
}

vscode-web/src/vs/base/common/network.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ class FileAccessImpl {
336336
return uri;
337337
}
338338

339-
private toUri(uriOrModule: URI | string, moduleIdToUrl?: { toUrl(moduleId: string): string }): URI {
339+
private toUri(uriOrModule: URI | string): URI {
340340
if (URI.isUri(uriOrModule)) {
341341
return uriOrModule;
342342
}
@@ -354,12 +354,19 @@ class FileAccessImpl {
354354
return URI.file(modulePath);
355355
}
356356

357-
return URI.parse(moduleIdToUrl!.toUrl(uriOrModule));
357+
throw new Error('Cannot determine URI for module id!');
358358
}
359359
}
360360

361361
export const FileAccess = new FileAccessImpl();
362362

363+
export const CacheControlheaders: Record<string, string> = Object.freeze({
364+
'Cache-Control': 'no-cache, no-store'
365+
});
366+
367+
export const DocumentPolicyheaders: Record<string, string> = Object.freeze({
368+
'Document-Policy': 'include-js-call-stacks-in-crash-reports'
369+
});
363370

364371
export namespace COI {
365372

vscode-web/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,7 @@ export class ActivityBarCompositeBar extends PaneCompositeBar {
280280
return; // prevent menu bar from installing twice #110720
281281
}
282282

283-
this.menuBarContainer = document.createElement('div');
284-
this.menuBarContainer.classList.add('menubar');
283+
this.menuBarContainer = $('.menubar');
285284

286285
const content = assertIsDefined(this.element);
287286
/* below codes are changed by github1s */

vscode-web/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,6 @@
320320
width: calc(100vw - env(titlebar-area-width, 100vw) - env(titlebar-area-x, 0px));
321321
}
322322

323-
.monaco-workbench.linux:not(.web) .part.titlebar .titlebar-container.counter-zoom .window-controls-container.wco-enabled {
324-
width: calc(100vw - env(titlebar-area-width, 100vw) - env(titlebar-area-x, 0px));
325-
}
326-
327323
.monaco-workbench:not(.web):not(.mac) .part.titlebar .titlebar-container:not(.counter-zoom) .window-controls-container * {
328324
zoom: calc(1 / var(--zoom-factor, 1));
329325
}

vscode-web/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
return reject(new Error('Service Workers are not enabled. Webviews will not work. Try disabling private/incognito mode.'));
231231
}
232232

233-
const swPath = encodeURI(`service-worker.js?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
233+
const swPath = encodeURI(`service-worker.js?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&id=${ID}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
234234
navigator.serviceWorker.register(swPath)
235235
.then(async registration => {
236236
/**

0 commit comments

Comments
 (0)