Skip to content

Commit 38ebf83

Browse files
authored
Merge pull request #786 from CodinGame/vscode-1.113
Vscode 1.113
2 parents bfa5c18 + b7df2af commit 38ebf83

File tree

56 files changed

+1691
-1563
lines changed

Some content is hidden

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

56 files changed

+1691
-1563
lines changed

demo/package-lock.json

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

demo/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
"@types/wicg-file-system-access": "^2023.10.7",
2424
"@types/ws": "^8.18.1",
2525
"typescript": "~5.9.3",
26-
"vite": "~8.0.0",
26+
"vite": "~8.0.3",
2727
"@codingame/monaco-vscode-rollup-extension-directory-plugin": "file:../dist/packages/monaco-vscode-rollup-extension-directory-plugin",
2828
"@codingame/monaco-vscode-rollup-vsix-plugin": "file:../dist/packages/monaco-vscode-rollup-vsix-plugin"
2929
},
3030
"dependencies": {
3131
"ansi-colors": "^4.1.3",
32-
"dockerode": "^4.0.9",
32+
"dockerode": "^4.0.10",
3333
"express": "^5.2.1",
34-
"ws": "^8.19.0",
34+
"ws": "^8.20.0",
3535
"@codingame/monaco-vscode-accessibility-service-override": "file:../dist/packages/monaco-vscode-accessibility-service-override",
3636
"@codingame/monaco-vscode-ai-service-override": "file:../dist/packages/monaco-vscode-ai-service-override",
3737
"@codingame/monaco-vscode-all-default-extensions": "file:../dist/packages/monaco-vscode-all-default-extensions",
@@ -180,7 +180,6 @@
180180
"@codingame/monaco-vscode-terminal-service-override": "file:../dist/packages/monaco-vscode-terminal-service-override",
181181
"@codingame/monaco-vscode-testing-service-override": "file:../dist/packages/monaco-vscode-testing-service-override",
182182
"@codingame/monaco-vscode-textmate-service-override": "file:../dist/packages/monaco-vscode-textmate-service-override",
183-
"@codingame/monaco-vscode-theme-2026-default-extension": "file:../dist/packages/monaco-vscode-theme-2026-default-extension",
184183
"@codingame/monaco-vscode-theme-abyss-default-extension": "file:../dist/packages/monaco-vscode-theme-abyss-default-extension",
185184
"@codingame/monaco-vscode-theme-defaults-default-extension": "file:../dist/packages/monaco-vscode-theme-defaults-default-extension",
186185
"@codingame/monaco-vscode-theme-kimbie-dark-default-extension": "file:../dist/packages/monaco-vscode-theme-kimbie-dark-default-extension",

demo/src/main.common.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import '@codingame/monaco-vscode-vb-default-extension'
4343
import '@codingame/monaco-vscode-xml-default-extension'
4444
import '@codingame/monaco-vscode-yaml-default-extension'
4545
import '@codingame/monaco-vscode-theme-defaults-default-extension'
46-
import '@codingame/monaco-vscode-theme-2026-default-extension'
4746
import '@codingame/monaco-vscode-theme-seti-default-extension'
4847
import '@codingame/monaco-vscode-references-view-default-extension'
4948
import '@codingame/monaco-vscode-search-result-default-extension'

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[tools]
2-
node = "22.22.0"
2+
node = "22.22.1"
33
npm = "11.6.2"

package-lock.json

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

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
},
3131
"config": {
3232
"vscode": {
33-
"version": "1.111.0",
34-
"ref": "1.111.0",
35-
"commit": "ce099c1ed25d9eb3076c11e4a280f3eb52b4fbeb"
33+
"version": "1.113.0",
34+
"ref": "1.113.0",
35+
"commit": "cfbea10c5ffb233ea9177d34726e6056e89913dc"
3636
},
3737
"monaco": {
3838
"ref": "v0.55.1",
@@ -76,14 +76,14 @@
7676
"postcss-url": "^10.1.3",
7777
"prettier": "^3.8.1",
7878
"recast": "^0.23.11",
79-
"rollup": "^4.59.0",
79+
"rollup": "^4.60.1",
8080
"rollup-plugin-copy": "^3.5.0",
81-
"rollup-plugin-dts": "^6.4.0",
81+
"rollup-plugin-dts": "^6.4.1",
8282
"semantic-release": "25.0.3",
8383
"tsx": "^4.21.0",
84-
"type-fest": "^5.4.4",
84+
"type-fest": "^5.5.0",
8585
"typescript": "^5.9.3",
86-
"typescript-eslint": "^8.57.1",
86+
"typescript-eslint": "^8.57.2",
8787
"vscode-oniguruma": "1.7.0",
8888
"vscode-semver": "npm:semver@=5.5.0",
8989
"vscode-textmate": "^9.3.2",
@@ -119,7 +119,7 @@
119119
"kerberos": "2.1.1",
120120
"keytar": "^7.9.0",
121121
"marked": "~14.0.0",
122-
"memfs": "^4.56.11",
122+
"memfs": "^4.57.1",
123123
"mime-types": "^3.0.2",
124124
"node-pty": "^1.2.0-beta.10",
125125
"tas-client": "0.3.1",
@@ -133,7 +133,7 @@
133133
"yazl": "^2.4.3"
134134
},
135135
"volta": {
136-
"node": "22.22.0",
136+
"node": "22.22.1",
137137
"npm": "11.6.2"
138138
}
139139
}

scripts/install-vscode

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ cd build
4242
npm ci
4343
cd ..
4444

45+
# Remove useless files
46+
cd src
47+
rm -rf `find . -name '*.test.ts' -o -name 'test' -o -name 'electron-main' -o -name 'electron-browser' -o -name 'electron-utility' -o -name 'node'`
48+
rm -f bootstrap*.ts *main.ts *cli.ts
49+
rm -f vs/workbench/workbench.desktop.main.ts
50+
rm -rf vs/code vs/sessions
51+
cd ..
52+
4553
echo "Extracting service identifiers"
4654
node build/lib/extractServices.ts
4755

@@ -58,12 +66,7 @@ BUILD_SOURCEVERSION=$vscodeRef NODE_OPTIONS=--max-old-space-size=8192 npx gulp c
5866
rm -rf $extension_output_directory
5967
cp -R .build/web/extensions "$extension_output_directory"
6068

61-
# Remove useless files
6269
cd src
63-
rm -rf `find . -name '*.test.ts' -o -name 'test'`
64-
rm -f bootstrap*.ts *main.ts *cli.ts
65-
rm -f vs/workbench/workbench.desktop.main.ts
66-
rm -rf vs/code
6770

6871
# There's a really weird issue in the vscode codebase that when this import isn't present,
6972
# nodeJS's `setTimeout` type is used instead of the one defined in `src/typings/base-common.d.ts`

src/extension.api.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,10 @@ const api: typeof vscode = {
395395
ChatDebugEventToolCallContent: extHostTypes.ChatDebugEventToolCallContent,
396396
ChatDebugEventModelTurnContent: extHostTypes.ChatDebugEventModelTurnContent,
397397
ChatTodoStatus: extHostTypes.ChatTodoStatus,
398-
ChatSubagentToolInvocationData: extHostTypes.ChatSubagentToolInvocationData
398+
ChatSubagentToolInvocationData: extHostTypes.ChatSubagentToolInvocationData,
399+
ChatDebugEventHookContent: extHostTypes.ChatDebugEventHookContent,
400+
ChatDebugHookResult: extHostTypes.ChatDebugHookResult,
401+
TaskRunOn: extHostTypes.TaskRunOn
399402
}
400403

401404
// @ts-expect-error the syntax will be transformed by a typescript transformer in the rollup config

0 commit comments

Comments
 (0)