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
1,236 changes: 648 additions & 588 deletions demo/package-lock.json

Large diffs are not rendered by default.

74 changes: 39 additions & 35 deletions demo/package.json

Large diffs are not rendered by default.

813 changes: 394 additions & 419 deletions package-lock.json

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,42 +30,42 @@
},
"config": {
"vscode": {
"version": "1.105.0",
"ref": "1.105.0",
"commit": "03c265b1adee71ac88f833e065f7bb956b60550a"
"version": "1.106.0",
"ref": "1.106.0",
"commit": "ac4cbdf48759c7d8c3eb91ffe6bb04316e263c57"
},
"monaco": {
"ref": "v0.54.0",
"version": "0.54.0"
}
},
"devDependencies": {
"@babel/core": "^7.28.4",
"@babel/core": "^7.28.5",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.28.0",
"@babel/preset-env": "^7.28.3",
"@babel/preset-typescript": "^7.27.1",
"@babel/preset-env": "^7.28.5",
"@babel/preset-typescript": "^7.28.5",
"@codingame/commitlint-config-codingame": "^1.1.1",
"@codingame/semantic-release-config-github": "^2.1.0",
"@codingame/tsconfig": "^1.1.1",
"@commitlint/cli": "^19.8.1",
"@rollup/plugin-commonjs": "^28.0.6",
"@rollup/plugin-commonjs": "^29.0.0",
"@rollup/plugin-dynamic-import-vars": "^2.1.5",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^16.0.2",
"@rollup/plugin-replace": "^6.0.2",
"@rollup/plugin-typescript": "^12.1.4",
"@rollup/plugin-node-resolve": "^16.0.3",
"@rollup/plugin-replace": "^6.0.3",
"@rollup/plugin-typescript": "^12.3.0",
"@types/mime-types": "^3.0.1",
"@types/node": "22.x",
"@types/postcss-url": "^10.0.4",
"@types/vscode-semver": "npm:@types/semver@=5.5.0",
"@types/yargs": "^17.0.33",
"@types/yargs": "^17.0.34",
"@types/yauzl": "^2.10.3",
"acorn": "^8.15.0",
"chalk": "^5.6.2",
"change-case": "^5.4.4",
"change-package-name": "^1.0.5",
"eslint": "^9.37.0",
"eslint": "^9.39.1",
"fast-glob": "^3.3.3",
"graceful-fs": "^4.2.11",
"js-cleanup": "^1.2.0",
Expand All @@ -74,67 +74,67 @@
"postcss-url": "^10.1.3",
"prettier": "^3.6.2",
"recast": "^0.23.11",
"rollup": "^4.52.4",
"rollup": "^4.53.2",
"rollup-plugin-copy": "^3.5.0",
"rollup-plugin-dts": "^6.2.3",
"semantic-release": "24.2.9",
"tsx": "^4.20.6",
"type-fest": "^5.0.1",
"type-fest": "^5.2.0",
"typescript": "^5.9.3",
"typescript-eslint": "^8.46.0",
"typescript-eslint": "^8.46.4",
"uuid": "^13.0.0",
"vscode-semver": "npm:semver@=5.5.0",
"yargs": "^18.0.0",
"zx": "^8.8.4"
"zx": "^8.8.5"
},
"dependencies": {
"@microsoft/1ds-core-js": "^3.2.13",
"@microsoft/1ds-post-js": "^3.2.13",
"@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
"@rollup/pluginutils": "^5.3.0",
"@vscode/iconv-lite-umd": "0.7.0",
"@vscode/proxy-agent": "^0.35.0",
"@vscode/iconv-lite-umd": "0.7.1",
"@vscode/proxy-agent": "^0.36.0",
"@vscode/ripgrep": "^1.15.13",
"@vscode/spdlog": "^0.15.2",
"@vscode/tree-sitter-wasm": "^0.1.4",
"@vscode/tree-sitter-wasm": "^0.2.0",
"@vscode/vscode-languagedetection": "npm:@codingame/[email protected]",
"@vscode/windows-process-tree": "^0.6.0",
"@vscode/windows-registry": "^1.1.0",
"@xterm/addon-clipboard": "^0.2.0-beta.102",
"@xterm/addon-image": "^0.9.0-beta.119",
"@xterm/addon-ligatures": "^0.10.0-beta.119",
"@xterm/addon-progress": "^0.2.0-beta.25",
"@xterm/addon-search": "^0.16.0-beta.119",
"@xterm/addon-serialize": "^0.14.0-beta.119",
"@xterm/addon-unicode11": "^0.9.0-beta.119",
"@xterm/addon-webgl": "^0.19.0-beta.119",
"@xterm/headless": "^5.6.0-beta.119",
"@xterm/xterm": "^5.6.0-beta.119",
"@xterm/addon-clipboard": "^0.2.0-beta.119",
"@xterm/addon-image": "^0.9.0-beta.136",
"@xterm/addon-ligatures": "^0.10.0-beta.136",
"@xterm/addon-progress": "^0.2.0-beta.42",
"@xterm/addon-search": "^0.16.0-beta.136",
"@xterm/addon-serialize": "^0.14.0-beta.136",
"@xterm/addon-unicode11": "^0.9.0-beta.136",
"@xterm/addon-webgl": "^0.19.0-beta.136",
"@xterm/headless": "^5.6.0-beta.136",
"@xterm/xterm": "^5.6.0-beta.136",
"cookie": "^0.7.2",
"css-url-parser": "^1.1.4",
"dompurify": "^3.2.7",
"dompurify": "^3.3.0",
"jschardet": "3.1.4",
"katex": "^0.16.22",
"kerberos": "2.1.1",
"keytar": "^7.9.0",
"marked": "~14.0.0",
"memfs": "^4.49.0",
"memfs": "^4.51.0",
"mime-types": "^3.0.1",
"node-pty": "1.1.0-beta35",
"semver": "^5.7.2",
"tas-client-umd": "0.2.0",
"thenby": "^1.3.4",
"vscode-oniguruma": "1.7.0",
"vscode-regexpp": "^3.1.0",
"vscode-textmate": "9.2.0",
"vscode-textmate": "^9.2.1",
"yauzl": "^3.0.0",
"yazl": "^2.4.3"
},
"overrides": {
"typescript": "$typescript",
"rollup": "$rollup",
"recast": "$recast",
"@xterm/xterm": "^5.6.0-beta.119",
"@xterm/xterm": "^5.6.0-beta.136",
"cross-spawn": "7.0.6"
},
"volta": {
Expand Down
8 changes: 7 additions & 1 deletion rollup/plugins/rollup-subpackage-plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ export interface Options {
subpackages: SubPackage[],
getModule: (path: string) => SubPackageModule | undefined
) => Promise<void>

ignoreDependencies?: string[]
}

interface GroupSet {
Expand Down Expand Up @@ -190,7 +192,8 @@ export default ({
getManifest,
getInterPackageImport = (path, groupName) => `${groupName.alias ?? groupName.name}/${path}`,
finalize,
stage = 'writeBundle'
stage = 'writeBundle',
ignoreDependencies
}: Options): Plugin => ({
name: 'subpackages',
[stage]: async function (
Expand Down Expand Up @@ -523,6 +526,9 @@ export default ({
version = packageDetails.version
}
} else {
if (ignoreDependencies != null && ignoreDependencies.includes(name)) {
return []
}
try {
const installedVersion = getInstalledVersion(name)
if (installedVersion == null) {
Expand Down
2 changes: 1 addition & 1 deletion rollup/tools/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const VSCODE_DIR = nodePath.resolve(BASE_DIR, 'vscode')
export const VSCODE_SRC_DIR = nodePath.resolve(VSCODE_DIR, 'src')
export const OVERRIDE_PATH = nodePath.resolve(BASE_DIR, 'src/override')

const externals = Object.keys({ ...pkg.dependencies })
const externals = [...Object.keys({ ...pkg.dependencies }), 'trusted-types']
export const external = (source: string, importer?: string): boolean => {
if (source === 'monaco-editor' || source === `${MAIN_PACKAGE_NAME}/css`) {
return true
Expand Down
3 changes: 2 additions & 1 deletion rollup/tools/configuredSubpackagePlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const EDITOR_API_EXPOSE_MODULES = [
'vs/editor/common/services/editorBaseApi',
'vs/editor/common/standalone/standaloneEnums',
'vs/editor/browser/controller/mouseTarget',
'vs/editor/common/core/range',
'vs/editor/common/core/range'
]

const ALLOWED_MAIN_DEPENDENCIES = new Set([
Expand All @@ -79,6 +79,7 @@ const workerGroups: Record<string, string> = {

export function configuredSubpackagePlugin(): rollup.Plugin {
return subpackagePlugin({
ignoreDependencies: ['trusted-types' /** only the types are used */],
getEntryGroups(entrypoints, options) {
const serviceOverrideDir = nodePath.resolve(options.dir!, 'service-override')
const workersDir = nodePath.resolve(options.dir!, 'workers')
Expand Down
1 change: 0 additions & 1 deletion src/contributions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import 'vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty'
import 'vs/workbench/contrib/codeActions/browser/codeActions.contribution'
import 'vs/workbench/contrib/list/browser/list.contribution'
import 'vs/workbench/contrib/codeEditor/browser/editorFeatures'
import 'vs/workbench/contrib/contextmenu/browser/contextmenu.contribution'
import 'vs/workbench/browser/actions/textInputActions'
import 'vs/workbench/browser/actions/developerActions'
import 'vs/workbench/contrib/dropOrPasteInto/browser/dropOrPasteInto.contribution'
3 changes: 2 additions & 1 deletion src/editor.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ export interface IWebWorkerOptions {
/**
* An object that can be used by the web worker to make calls back to the main thread.
*/
host?: unknown
// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
host?: Record<string, Function>
/**
* Keep idle models.
* Defaults to false, which means that idle models will stop syncing after a while.
Expand Down
10 changes: 7 additions & 3 deletions src/extension.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -340,14 +340,13 @@ const api: typeof vscode = {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
LanguageModelChatMessage2: <any>extHostTypes.LanguageModelChatMessage2,
LanguageModelDataPart: extHostTypes.LanguageModelDataPart,
ChatImageMimeType: extHostTypes.ChatImageMimeType,
McpStdioServerDefinition: extHostTypes.McpStdioServerDefinition,
SettingsSearchResultKind: extHostTypes.SettingsSearchResultKind,
ChatResponseExtensionsPart: extHostTypes.ChatResponseExtensionsPart,
ChatRequestEditedFileEventKind: extHostTypes.ChatRequestEditedFileEventKind,
ChatRequestTurn2: extHostTypes.ChatRequestTurn,
InlineCompletionEndOfLifeReasonKind: extHostTypes.InlineCompletionEndOfLifeReasonKind,
LanguageModelToolResultPart2: extHostTypes.LanguageModelToolResultPart2,
LanguageModelToolResultPart2: extHostTypes.LanguageModelToolResultPart,
LanguageModelToolResult2: extHostTypes.LanguageModelToolResult2,
McpHttpServerDefinition: extHostTypes.McpHttpServerDefinition,
AISearchKeyword: searchExtTypes.AISearchKeyword,
Expand All @@ -367,7 +366,12 @@ const api: typeof vscode = {
ChatSessionStatus: extHostTypes.ChatSessionStatus,
InlineCompletionDisplayLocationKind: extHostTypes.InlineCompletionDisplayLocationKind,
LanguageModelThinkingPart: extHostTypes.LanguageModelThinkingPart,
LanguageModelPartAudience: extHostTypes.LanguageModelPartAudience
LanguageModelPartAudience: extHostTypes.LanguageModelPartAudience,
ChatResponseExternalEditPart: extHostTypes.ChatResponseExternalEditPart,
McpToolAvailability: extHostTypes.McpToolAvailability,
McpStdioServerDefinition2: extHostTypes.McpStdioServerDefinition,
McpHttpServerDefinition2: extHostTypes.McpHttpServerDefinition,
TerminalCompletionItem: extHostTypes.TerminalCompletionItem
}

// @ts-expect-error the syntax will be transformed by a typescript transformer in the rollup config
Expand Down
8 changes: 5 additions & 3 deletions src/extensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,20 +121,22 @@ const deltaExtensions = throttle(
)

export async function registerRemoteExtension(
directory: string
options: RegisterRemoteExtensionParams | string
): Promise<RegisterRemoteExtensionResult> {
options = typeof options === 'string' ? { path: options } : options

await waitServicesReady()
const fileService = StandaloneServices.get(IFileService)
const remoteAuthority = StandaloneServices.get(IWorkbenchEnvironmentService).remoteAuthority
const content = await fileService.readFile(
joinPath(
URI.from({ scheme: Schemas.vscodeRemote, authority: remoteAuthority, path: directory }),
URI.from({ scheme: Schemas.vscodeRemote, authority: remoteAuthority, path: options.path }),
'package.json'
)
)
const manifest: IExtensionManifest = parse(content.value.toString())

return registerExtension(manifest, ExtensionHostKind.Remote, { path: directory })
return registerExtension(manifest, ExtensionHostKind.Remote, options)
}

const forcedExtensionHostKinds = new Map<string, ExtensionHostKind>()
Expand Down
Loading