Skip to content

Commit 8660fb4

Browse files
authored
Merge pull request #793 from CodinGame/vscode-1.117.0
Vscode 1.117.0
2 parents 03b9e1c + 04e599e commit 8660fb4

71 files changed

Lines changed: 6476 additions & 6336 deletions

File tree

Some content is hidden

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

demo/package-lock.json

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

demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@types/wicg-file-system-access": "^2023.10.7",
2424
"@types/ws": "^8.18.1",
2525
"typescript": "~5.9.3",
26-
"vite": "~8.0.3",
26+
"vite": "~8.0.10",
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
},

demo/src/setup.common.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,8 @@ export const commonServices: IEditorOverrideServices = {
451451
can_signup_for_limited: false,
452452
copilot_plan: 'enterprise',
453453
organization_login_list: [],
454-
analytics_tracking_id: 'unused'
454+
analytics_tracking_id: 'unused',
455+
chat_enabled: true
455456
},
456457
accountName: 'unused',
457458
authenticationProvider: {

mise.toml

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

package-lock.json

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

package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"compile-monaco-languages": "NODE_OPTIONS=--max_old_space_size=16384 rollup --config rollup/rollup.monaco.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-monaco.json`}'",
2323
"clean": "rm -rf dist/",
2424
"compile-rollup-plugins": "rollup --config rollup/rollup.rollup-plugins.config.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-plugins.json`, include: [`./rollup/rollup.rollup-plugins.config.ts`, `./rollup/rollup-metadata-plugin.ts`]}'",
25-
"preprepare": "patch-package && ./scripts/install-vscode && ./scripts/install-monaco-editor",
25+
"preprepare": "patch-package && mise exec -y -- ./scripts/install-vscode && mise exec -y -- ./scripts/install-monaco-editor",
2626
"lint": "eslint '{src/**/*.ts,rollup/*.ts,*.ts}'",
2727
"update-vscode-dependencies": "tsx scripts/update-vscode-dependencies.ts",
2828
"release": "tsx release.ts",
@@ -31,9 +31,9 @@
3131
},
3232
"config": {
3333
"vscode": {
34-
"version": "1.114.0",
35-
"ref": "1.114.0",
36-
"commit": "e7fb5e96c0730b9deb70b33781f98e2f35975036"
34+
"version": "1.117.0",
35+
"ref": "1.117.0",
36+
"commit": "10c8e557c8b9f9ed0a87f61f1c9a44bde731c409"
3737
},
3838
"monaco": {
3939
"ref": "v0.55.1",
@@ -49,7 +49,7 @@
4949
"@codingame/commitlint-config-codingame": "^1.2.1",
5050
"@codingame/semantic-release-config-github": "^2.2.1",
5151
"@codingame/tsconfig": "^1.2.1",
52-
"@commitlint/cli": "^20.5.0",
52+
"@commitlint/cli": "^20.5.2",
5353
"@rollup/plugin-commonjs": "^29.0.2",
5454
"@rollup/plugin-dynamic-import-vars": "^2.1.5",
5555
"@rollup/plugin-json": "^6.1.0",
@@ -62,8 +62,8 @@
6262
"@types/vscode-semver": "npm:@types/semver@=5.5.0",
6363
"@types/yargs": "^17.0.35",
6464
"@types/yauzl": "^2.10.3",
65-
"@vscode/codicons": "^0.0.46-1",
66-
"@vscode/tree-sitter-wasm": "^0.3.0",
65+
"@vscode/codicons": "^0.0.46-5",
66+
"@vscode/tree-sitter-wasm": "^0.3.1",
6767
"acorn": "^8.16.0",
6868
"chalk": "^5.6.2",
6969
"change-case": "^5.4.4",
@@ -75,17 +75,17 @@
7575
"package-json": "^10.0.1",
7676
"patch-package": "^8.0.1",
7777
"postcss-url": "^10.1.3",
78-
"prettier": "^3.8.1",
78+
"prettier": "^3.8.3",
7979
"recast": "^0.23.11",
80-
"rollup": "^4.60.1",
80+
"rollup": "^4.60.2",
8181
"rollup-plugin-copy": "^3.5.0",
8282
"rollup-plugin-dts": "^6.4.1",
8383
"semantic-release": "25.0.3",
8484
"ts-morph": "^28.0.0",
8585
"tsx": "^4.21.0",
86-
"type-fest": "^5.5.0",
86+
"type-fest": "^5.6.0",
8787
"typescript": "^5.9.3",
88-
"typescript-eslint": "^8.57.2",
88+
"typescript-eslint": "^8.59.0",
8989
"vscode-oniguruma": "1.7.0",
9090
"vscode-semver": "npm:semver@=5.5.0",
9191
"vscode-textmate": "^9.3.2",
@@ -97,35 +97,35 @@
9797
"@microsoft/1ds-post-js": "^3.2.13",
9898
"@rollup/pluginutils": "^5.3.0",
9999
"@vscode/iconv-lite-umd": "0.7.1",
100-
"@vscode/proxy-agent": "^0.40.0",
100+
"@vscode/proxy-agent": "^0.41.0",
101101
"@vscode/ripgrep": "^1.17.1",
102102
"@vscode/spdlog": "^0.15.8",
103103
"@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23",
104104
"@vscode/windows-process-tree": "^0.6.0",
105-
"@xterm/addon-clipboard": "^0.3.0-beta.191",
106-
"@xterm/addon-image": "^0.10.0-beta.191",
107-
"@xterm/addon-ligatures": "^0.11.0-beta.191",
108-
"@xterm/addon-progress": "^0.3.0-beta.191",
109-
"@xterm/addon-search": "^0.17.0-beta.191",
110-
"@xterm/addon-serialize": "^0.15.0-beta.191",
111-
"@xterm/addon-unicode11": "^0.10.0-beta.191",
112-
"@xterm/addon-webgl": "^0.20.0-beta.190",
113-
"@xterm/headless": "^6.1.0-beta.191",
114-
"@xterm/xterm": "^6.1.0-beta.191",
105+
"@xterm/addon-clipboard": "^0.3.0-beta.197",
106+
"@xterm/addon-image": "^0.10.0-beta.197",
107+
"@xterm/addon-ligatures": "^0.11.0-beta.197",
108+
"@xterm/addon-progress": "^0.3.0-beta.197",
109+
"@xterm/addon-search": "^0.17.0-beta.197",
110+
"@xterm/addon-serialize": "^0.15.0-beta.197",
111+
"@xterm/addon-unicode11": "^0.10.0-beta.197",
112+
"@xterm/addon-webgl": "^0.20.0-beta.196",
113+
"@xterm/headless": "^6.1.0-beta.197",
114+
"@xterm/xterm": "^6.1.0-beta.197",
115115
"cookie": "^0.7.2",
116116
"css-url-parser": "^1.1.4",
117-
"dompurify": "^3.3.3",
117+
"dompurify": "^3.4.1",
118118
"jschardet": "3.1.4",
119119
"jsonc-parser": "^3.0.0",
120120
"katex": "^0.16.22",
121121
"kerberos": "2.1.1",
122122
"keytar": "^7.9.0",
123123
"marked": "~14.0.0",
124-
"memfs": "^4.57.1",
124+
"memfs": "^4.57.2",
125125
"mime-types": "^3.0.2",
126126
"node-pty": "^1.2.0-beta.12",
127127
"tas-client": "0.3.1",
128-
"thenby": "^1.3.4",
128+
"thenby": "^1.4.1",
129129
"vscode-css-languageservice": "6.2.14",
130130
"vscode-html-languageservice": "5.2.0",
131131
"vscode-json-languageservice": "5.3.11",
@@ -136,6 +136,6 @@
136136
},
137137
"volta": {
138138
"node": "22.22.1",
139-
"npm": "11.6.2"
139+
"npm": "11.1.0"
140140
}
141141
}

rollup/plugins/rollup-subpackage-plugin.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import type { OutputOptions, Plugin, PluginContext } from 'rollup'
1212
import * as rollup from 'rollup'
13-
import thenby from 'thenby'
13+
import { firstBy } from 'thenby'
1414
import type { PackageJson } from 'type-fest'
1515
import * as nodePath from 'node:path'
1616
import { builtinModules } from 'module'
@@ -44,8 +44,6 @@ export interface SubPackageDependency {
4444
importers: Set<string>
4545
}
4646

47-
const { firstBy } = thenby
48-
4947
function getInstalledVersion(libName: string) {
5048
const output = execSync(`npm ls ${libName} --json --depth 1 --long`).toString()
5149
const parsed: {

rollup/tools/vscode.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as rollup from 'rollup'
22
import * as babylonParser from 'recast/parsers/babylon.js'
33
import * as recast from 'recast'
44
import ts from 'typescript'
5-
import thenby from 'thenby'
5+
import { firstBy } from 'thenby'
66
import * as fs from 'node:fs'
77
import * as nodePath from 'node:path'
88
import {
@@ -14,8 +14,6 @@ import {
1414
VSCODE_SRC_DIR
1515
} from './config.js'
1616

17-
const { firstBy } = thenby
18-
1917
const PURE_ANNO = '#__PURE__'
2018
const PURE_FUNCTIONS = new Set([
2119
'__param',

scripts/install-vscode

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ cd src
4747
rm -rf `find . -name '*.test.ts' -o -name 'test' -o -name 'electron-main' -o -name 'electron-browser' -o -name 'electron-utility' -o -name 'node'`
4848
rm -f bootstrap*.ts *main.ts *cli.ts
4949
rm -f vs/workbench/workbench.desktop.main.ts
50-
rm -rf vs/code vs/sessions
50+
rm -rf vs/code
51+
find vs/sessions -type f ! -path "vs/sessions/common/theme.ts" -delete
5152
cd ..
5253

5354
echo "Extracting service identifiers"

src/extension.api.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,6 @@ const api: typeof vscode = {
377377
ChatQuestion: extHostTypes.ChatQuestion,
378378
ChatResponseQuestionCarouselPart: extHostTypes.ChatResponseQuestionCarouselPart,
379379
McpToolInvocationContentData: extHostTypes.McpToolInvocationContentData,
380-
ChatSessionChangedFile2: extHostTypes.ChatSessionChangedFile2,
381380
ChatResponseHookPart: extHostTypes.ChatResponseHookPart,
382381
ChatDebugLogLevel: extHostTypes.ChatDebugLogLevel,
383382
ChatDebugToolCallResult: extHostTypes.ChatDebugToolCallResult,

0 commit comments

Comments
 (0)