Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [macos-14]
node-version: [20.x]
node-version: [24.x]

runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-wtih-vscode-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [macos-14]
node-version: [22.x]
node-version: [24.x]

runs-on: ${{ matrix.os }}

Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"license": "ISC",
"devDependencies": {
"@cloudflare/workers-types": "^4.20250109.0",
"@github1s/vscode-web": "^0.27.0",
"@github1s/vscode-web": "^0.28.1",
"chokidar": "^4.0.3",
"clean-css": "^5.3.3",
"copy-webpack-plugin": "^14.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ globalThis._VSCODE_WEB = {
if (!DEV_VSCODE) {
const linkElement = document.createElement('link');
linkElement.setAttribute('rel', 'stylesheet');
linkElement.setAttribute('href', resolveVscodeUrl('vs/workbench/workbench.web.main.css'));
linkElement.setAttribute('href', resolveVscodeUrl('vs/workbench/workbench.web.main.internal.css'));
document.head.appendChild(linkElement);

const languageId = document.cookie.match(/(^| )vscode.nls.locale=([^;]+)/)?.[2] || '';
Expand Down
2 changes: 1 addition & 1 deletion vscode-web/.VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.109.5
1.131.0
2 changes: 1 addition & 1 deletion vscode-web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no" />
<title>VSCode Web</title>
<link rel="icon" href="/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" href="/vscode/vs/workbench/workbench.web.main.css" />
<link rel="stylesheet" href="/vscode/vs/workbench/workbench.web.main.internal.css" />
</head>
<body>
<script src="/vscode/nls.messages.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions vscode-web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vscode-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@github1s/vscode-web",
"version": "0.27.0",
"version": "0.28.1",
"description": "VS Code web for GitHub1s",
"author": "github1s",
"license": "MIT",
Expand Down
13 changes: 6 additions & 7 deletions vscode-web/scripts/.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "3edda05b7b7cf235bc0d51f066aa8d57c447ea784ccd507316327150a4bb880c",
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "f87409af0f50e021ac0880863da50ccfc738728367228af595675f6d12f1ad1b",
"src/vs/workbench/browser/web.main.ts": "c28f5afce7e37992262b827afcc98b25dc0ea9805fb84bfb3e2641d94ddaa885",
"src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "1c5075a0d54829eadbb19a214f9913558ddab03c3e088b2ec3590b49b2b8c460",
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "8ffe6921a1c36709db7ed7f5eb705782f55e90acdc780c7722030b0f9e6d6fc5",
"src/vs/workbench/browser/web.main.ts": "180c4439bcb518402e34c9b8b154bcd204b4b2e47a3edf2b1c77c612a8ff2bf5",
"src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts": "e986095a30dbea54af56c25fa1b184b55f34f8914129b27e2f20d8c4ea9fd16b",
"src/vs/workbench/contrib/webview/browser/pre/index.html": "8b2e27b411b4fa493fe003c5312378ca0c7164fee99ed288c6e4f47c43dbca1f",
"src/vs/workbench/contrib/webview/browser/pre/index.html": "9f4a216e3c7abfa81d3afa9e215a36e935eb92b9193ae244cf80b1904d3fae0c",
"src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "16fc1f8830432097a2de87ba04f9f11e930408df8f672bb7a4bbbe3c1a7c509d",
"src/vs/workbench/services/label/common/labelService.ts": "d9a00bb4644ffdaee5b22261389ade4cc2c0d0c37ba7a46c779f8fb9c7db1866",
"src/vs/workbench/services/label/common/labelService.ts": "9e4e2aafeabc04ccf183b8f2f4ce8a4d39f240831e4005b06149684458caa8d4",
"src/vs/workbench/services/textfile/browser/textFileService.ts": "886566605815367d3866be243994829729fd0b85c04ab7450b9de22ee93053eb",
"src/vs/base/common/network.ts": "059af1f9d8671226e6636bed2a28a6d91a15c1a26f5c826336ce0dedacb3cafb",
"src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html": "40d576ad2307d28012b34b86858ba36ba49ae10e5aedb394bd06b14a35b869a5"
"src/vs/base/common/network.ts": "d264af1ba5dbbfaf950c5da336100fb1242802eab92ed3b4692d3c10282b2dee"
}
3 changes: 2 additions & 1 deletion vscode-web/scripts/build/vscode.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { executeCommand, PROJECT_ROOT } from '../utils.js';

const main = () => {
const cwd = path.join(PROJECT_ROOT, 'lib/vscode');
executeCommand('npm', ['run', 'gulp', 'vscode-web-min'], cwd);
executeCommand('npm', ['run', 'gulp', 'core-ci'], cwd);
executeCommand('npm', ['run', 'gulp', 'vscode-web-min-ci'], cwd);
};

main();
3 changes: 3 additions & 0 deletions vscode-web/scripts/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ export const executeCommand = (command, args, cwd) => {
if (result.error) {
throw result.error;
}
if (result.status !== 0) {
throw new Error(`${command} ${args.join(' ')} exited with code ${result.status}`);
}
};

export const getAllFiles = (directory) => {
Expand Down
5 changes: 4 additions & 1 deletion vscode-web/src/vs/base/common/network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ export namespace Schemas {

export const vscodeTerminal = 'vscode-terminal';

/** Scheme used for the image carousel editor. */
export const vscodeImageCarousel = 'vscode-image-carousel';

/** Scheme used for code blocks in chat. */
export const vscodeChatCodeBlock = 'vscode-chat-code-block';

Expand Down Expand Up @@ -224,7 +227,7 @@ class RemoteAuthoritiesImpl {
try {
return this._delegate(uri);
} catch (err) {
errors.onUnexpectedError(err);
errors.onUnexpectedExternalError(err);
return uri;
}
}
Expand Down
Loading
Loading