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
693 changes: 345 additions & 348 deletions demo/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@types/wicg-file-system-access": "^2023.10.7",
"@types/ws": "^8.18.1",
"typescript": "~5.9.3",
"vite": "~8.0.3",
"vite": "~8.0.10",
"@codingame/monaco-vscode-rollup-extension-directory-plugin": "file:../dist/packages/monaco-vscode-rollup-extension-directory-plugin",
"@codingame/monaco-vscode-rollup-vsix-plugin": "file:../dist/packages/monaco-vscode-rollup-vsix-plugin"
},
Expand Down
3 changes: 2 additions & 1 deletion demo/src/setup.common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,8 @@ export const commonServices: IEditorOverrideServices = {
can_signup_for_limited: false,
copilot_plan: 'enterprise',
organization_login_list: [],
analytics_tracking_id: 'unused'
analytics_tracking_id: 'unused',
chat_enabled: true
},
accountName: 'unused',
authenticationProvider: {
Expand Down
2 changes: 1 addition & 1 deletion mise.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[tools]
node = "22.22.1"
npm = "11.6.2"
npm = "11.1.0"
10,681 changes: 5,316 additions & 5,365 deletions package-lock.json

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"compile-monaco-languages": "NODE_OPTIONS=--max_old_space_size=16384 rollup --config rollup/rollup.monaco.ts --configPlugin 'typescript={tsconfig: `tsconfig.rollup-config-monaco.json`}'",
"clean": "rm -rf dist/",
"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`]}'",
"preprepare": "patch-package && ./scripts/install-vscode && ./scripts/install-monaco-editor",
"preprepare": "patch-package && mise exec -y -- ./scripts/install-vscode && mise exec -y -- ./scripts/install-monaco-editor",
"lint": "eslint '{src/**/*.ts,rollup/*.ts,*.ts}'",
"update-vscode-dependencies": "tsx scripts/update-vscode-dependencies.ts",
"release": "tsx release.ts",
Expand All @@ -31,9 +31,9 @@
},
"config": {
"vscode": {
"version": "1.114.0",
"ref": "1.114.0",
"commit": "e7fb5e96c0730b9deb70b33781f98e2f35975036"
"version": "1.117.0",
"ref": "1.117.0",
"commit": "10c8e557c8b9f9ed0a87f61f1c9a44bde731c409"
},
"monaco": {
"ref": "v0.55.1",
Expand All @@ -49,7 +49,7 @@
"@codingame/commitlint-config-codingame": "^1.2.1",
"@codingame/semantic-release-config-github": "^2.2.1",
"@codingame/tsconfig": "^1.2.1",
"@commitlint/cli": "^20.5.0",
"@commitlint/cli": "^20.5.2",
"@rollup/plugin-commonjs": "^29.0.2",
"@rollup/plugin-dynamic-import-vars": "^2.1.5",
"@rollup/plugin-json": "^6.1.0",
Expand All @@ -62,8 +62,8 @@
"@types/vscode-semver": "npm:@types/semver@=5.5.0",
"@types/yargs": "^17.0.35",
"@types/yauzl": "^2.10.3",
"@vscode/codicons": "^0.0.46-1",
"@vscode/tree-sitter-wasm": "^0.3.0",
"@vscode/codicons": "^0.0.46-5",
"@vscode/tree-sitter-wasm": "^0.3.1",
"acorn": "^8.16.0",
"chalk": "^5.6.2",
"change-case": "^5.4.4",
Expand All @@ -75,17 +75,17 @@
"package-json": "^10.0.1",
"patch-package": "^8.0.1",
"postcss-url": "^10.1.3",
"prettier": "^3.8.1",
"prettier": "^3.8.3",
"recast": "^0.23.11",
"rollup": "^4.60.1",
"rollup": "^4.60.2",
"rollup-plugin-copy": "^3.5.0",
"rollup-plugin-dts": "^6.4.1",
"semantic-release": "25.0.3",
"ts-morph": "^28.0.0",
"tsx": "^4.21.0",
"type-fest": "^5.5.0",
"type-fest": "^5.6.0",
"typescript": "^5.9.3",
"typescript-eslint": "^8.57.2",
"typescript-eslint": "^8.59.0",
"vscode-oniguruma": "1.7.0",
"vscode-semver": "npm:semver@=5.5.0",
"vscode-textmate": "^9.3.2",
Expand All @@ -97,35 +97,35 @@
"@microsoft/1ds-post-js": "^3.2.13",
"@rollup/pluginutils": "^5.3.0",
"@vscode/iconv-lite-umd": "0.7.1",
"@vscode/proxy-agent": "^0.40.0",
"@vscode/proxy-agent": "^0.41.0",
"@vscode/ripgrep": "^1.17.1",
"@vscode/spdlog": "^0.15.8",
"@vscode/vscode-languagedetection": "npm:@codingame/vscode-languagedetection@1.0.23",
"@vscode/windows-process-tree": "^0.6.0",
"@xterm/addon-clipboard": "^0.3.0-beta.191",
"@xterm/addon-image": "^0.10.0-beta.191",
"@xterm/addon-ligatures": "^0.11.0-beta.191",
"@xterm/addon-progress": "^0.3.0-beta.191",
"@xterm/addon-search": "^0.17.0-beta.191",
"@xterm/addon-serialize": "^0.15.0-beta.191",
"@xterm/addon-unicode11": "^0.10.0-beta.191",
"@xterm/addon-webgl": "^0.20.0-beta.190",
"@xterm/headless": "^6.1.0-beta.191",
"@xterm/xterm": "^6.1.0-beta.191",
"@xterm/addon-clipboard": "^0.3.0-beta.197",
"@xterm/addon-image": "^0.10.0-beta.197",
"@xterm/addon-ligatures": "^0.11.0-beta.197",
"@xterm/addon-progress": "^0.3.0-beta.197",
"@xterm/addon-search": "^0.17.0-beta.197",
"@xterm/addon-serialize": "^0.15.0-beta.197",
"@xterm/addon-unicode11": "^0.10.0-beta.197",
"@xterm/addon-webgl": "^0.20.0-beta.196",
"@xterm/headless": "^6.1.0-beta.197",
"@xterm/xterm": "^6.1.0-beta.197",
"cookie": "^0.7.2",
"css-url-parser": "^1.1.4",
"dompurify": "^3.3.3",
"dompurify": "^3.4.1",
"jschardet": "3.1.4",
"jsonc-parser": "^3.0.0",
"katex": "^0.16.22",
"kerberos": "2.1.1",
"keytar": "^7.9.0",
"marked": "~14.0.0",
"memfs": "^4.57.1",
"memfs": "^4.57.2",
"mime-types": "^3.0.2",
"node-pty": "^1.2.0-beta.12",
"tas-client": "0.3.1",
"thenby": "^1.3.4",
"thenby": "^1.4.1",
"vscode-css-languageservice": "6.2.14",
"vscode-html-languageservice": "5.2.0",
"vscode-json-languageservice": "5.3.11",
Expand All @@ -136,6 +136,6 @@
},
"volta": {
"node": "22.22.1",
"npm": "11.6.2"
"npm": "11.1.0"
}
}
4 changes: 1 addition & 3 deletions rollup/plugins/rollup-subpackage-plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import type { OutputOptions, Plugin, PluginContext } from 'rollup'
import * as rollup from 'rollup'
import thenby from 'thenby'
import { firstBy } from 'thenby'
import type { PackageJson } from 'type-fest'
import * as nodePath from 'node:path'
import { builtinModules } from 'module'
Expand Down Expand Up @@ -44,8 +44,6 @@ export interface SubPackageDependency {
importers: Set<string>
}

const { firstBy } = thenby

function getInstalledVersion(libName: string) {
const output = execSync(`npm ls ${libName} --json --depth 1 --long`).toString()
const parsed: {
Expand Down
4 changes: 1 addition & 3 deletions rollup/tools/vscode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as rollup from 'rollup'
import * as babylonParser from 'recast/parsers/babylon.js'
import * as recast from 'recast'
import ts from 'typescript'
import thenby from 'thenby'
import { firstBy } from 'thenby'
import * as fs from 'node:fs'
import * as nodePath from 'node:path'
import {
Expand All @@ -14,8 +14,6 @@ import {
VSCODE_SRC_DIR
} from './config.js'

const { firstBy } = thenby

const PURE_ANNO = '#__PURE__'
const PURE_FUNCTIONS = new Set([
'__param',
Expand Down
3 changes: 2 additions & 1 deletion scripts/install-vscode
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ cd src
rm -rf `find . -name '*.test.ts' -o -name 'test' -o -name 'electron-main' -o -name 'electron-browser' -o -name 'electron-utility' -o -name 'node'`
rm -f bootstrap*.ts *main.ts *cli.ts
rm -f vs/workbench/workbench.desktop.main.ts
rm -rf vs/code vs/sessions
rm -rf vs/code
find vs/sessions -type f ! -path "vs/sessions/common/theme.ts" -delete
Comment thread
onora-hbl marked this conversation as resolved.
cd ..

echo "Extracting service identifiers"
Expand Down
1 change: 0 additions & 1 deletion src/extension.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,6 @@ const api: typeof vscode = {
ChatQuestion: extHostTypes.ChatQuestion,
ChatResponseQuestionCarouselPart: extHostTypes.ChatResponseQuestionCarouselPart,
McpToolInvocationContentData: extHostTypes.McpToolInvocationContentData,
ChatSessionChangedFile2: extHostTypes.ChatSessionChangedFile2,
ChatResponseHookPart: extHostTypes.ChatResponseHookPart,
ChatDebugLogLevel: extHostTypes.ChatDebugLogLevel,
ChatDebugToolCallResult: extHostTypes.ChatDebugToolCallResult,
Expand Down
Loading