diff --git a/package-lock.json b/package-lock.json index f70471b8c..12f6fe9ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4226,9 +4226,15 @@ "integrity": "sha512-zhbZ2Nx93tLR8aJmL2zI1mhJpsl87HMebNBM6R8z4pLfs8pj604pIVIVwyF1TivcfNtIPpMXL+nb3DsBmE/x6Q==" }, "node_modules/monaco-editor-workers": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.38.0.tgz", - "integrity": "sha512-5bHwABsZE/guZ9D9lNAc33lJEISVlUUbSzY92CajvKmF6e2OdukZlaEvjC+vsxgTR1/fgG9MPi6pwd1DDLdzZQ==" + "version": "0.39.1", + "resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.39.1.tgz", + "integrity": "sha512-QSP2ZCarlYaHGIZqzcz2BtI1mKstwJo4YfYu9m7ZwhkRd8HJEHpclKgE51AXtrncRch5zc05pHk4cQrFEdYsBQ==", + "dependencies": { + "monaco-editor": "~0.39.0" + }, + "peerDependencies": { + "monaco-editor": "~0.39.0" + } }, "node_modules/monaco-languageclient": { "resolved": "packages/client", @@ -5896,9 +5902,9 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.79.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.79.2.tgz", - "integrity": "sha512-U4Th1VlMSVuS6DN7REwKUe34SGEXyciA9RTTC6nFLeJb4+a8YLZKCORakQsuZCsAjpeJ1huc8Zl6rLln0u+HsA==", + "version": "1.79.3-next.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.79.3-next.2.tgz", + "integrity": "sha512-zRoFscwYzLlmEdpzh+9qzia5/mQ7rG51jebhPLFLo0UAE/MCNlptg9erqPS9HIpbzFW3XDB/yFWkU359j7VcMQ==", "bin": { "monaco-treemending": "monaco-treemending.js" }, @@ -6381,7 +6387,7 @@ "license": "MIT", "dependencies": { "monaco-editor": "~0.39.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2", + "vscode": "npm:@codingame/monaco-vscode-api@1.79.3-next.2", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, @@ -6391,7 +6397,7 @@ }, "peerDependencies": { "monaco-editor": "~0.39.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.79.3-next.2" }, "peerDependenciesMeta": { "monaco-editor": { @@ -6409,7 +6415,7 @@ "express": "~4.18.2", "langium": "~1.2.0", "langium-statemachine-dsl": "~1.2.0", - "monaco-editor-workers": "0.38.0", + "monaco-editor-workers": "0.39.1", "monaco-languageclient": "6.1.1", "normalize-url": "~8.0.0", "react": "~18.2.0", @@ -6436,7 +6442,7 @@ "name": "example-client-vite", "version": "0.0.0", "dependencies": { - "monaco-editor-workers": "0.38.0", + "monaco-editor-workers": "0.39.1", "monaco-languageclient": "6.1.1", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" @@ -6449,7 +6455,7 @@ "name": "example-client-webpack", "version": "0.0.0", "dependencies": { - "monaco-editor-workers": "0.38.0", + "monaco-editor-workers": "0.39.1", "monaco-languageclient": "6.1.1", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" diff --git a/packages/client/package.json b/packages/client/package.json index 21194ff5b..fc629dc79 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -49,13 +49,13 @@ ], "dependencies": { "monaco-editor": "~0.39.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2", + "vscode": "npm:@codingame/monaco-vscode-api@1.79.3-next.2", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, "peerDependencies": { "monaco-editor": "~0.39.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.79.3-next.2" }, "peerDependenciesMeta": { "monaco-editor": { diff --git a/packages/client/src/monaco-vscode-api-services.ts b/packages/client/src/monaco-vscode-api-services.ts index 511b4b362..628865d3a 100644 --- a/packages/client/src/monaco-vscode-api-services.ts +++ b/packages/client/src/monaco-vscode-api-services.ts @@ -7,7 +7,7 @@ import { editor, Environment, Uri } from 'monaco-editor/esm/vs/editor/editor.api import { initialize as initializeMonacoService } from 'vscode/services'; import { initialize as initializeVscodeExtensions } from 'vscode/extensions'; import type { OpenEditor } from 'vscode/service-override/editor'; -import { ITerminalBackend } from 'vscode/service-override/terminal'; +import { ITerminalBackend, SimpleTerminalBackend } from 'vscode/service-override/terminal'; interface MonacoEnvironmentEnhanced extends Environment { vscodeApiInitialised: boolean; @@ -37,7 +37,7 @@ export type InitializeServiceConfig = { enableQuickaccessService?: boolean; enableOutputService?: boolean; configureTerminalServiceConfig?: { - backendImpl: ITerminalBackend + backendImpl: SimpleTerminalBackend | ITerminalBackend } enableSearchService?: boolean; enableMarkersService?: boolean; diff --git a/packages/examples/main/package.json b/packages/examples/main/package.json index c535a9655..909ba1372 100644 --- a/packages/examples/main/package.json +++ b/packages/examples/main/package.json @@ -22,7 +22,7 @@ "express": "~4.18.2", "langium": "~1.2.0", "langium-statemachine-dsl": "~1.2.0", - "monaco-editor-workers": "0.38.0", + "monaco-editor-workers": "0.39.1", "monaco-languageclient": "6.1.1", "normalize-url": "~8.0.0", "react": "~18.2.0", diff --git a/packages/examples/main/src/langium/main.ts b/packages/examples/main/src/langium/main.ts index 5f20f1504..1274edd91 100644 --- a/packages/examples/main/src/langium/main.ts +++ b/packages/examples/main/src/langium/main.ts @@ -144,9 +144,9 @@ try { enablePreferencesService: true, enableSnippetsService: true, enableQuickaccessService: true, - enableOutputService: false, - enableSearchService: false, - enableMarkersService: false, + enableOutputService: true, + enableSearchService: true, + enableMarkersService: true, userServices: { // manually add the files service ...getFileServiceOverride() diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index 6fccbbd22..9a1f55bbc 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -4,7 +4,7 @@ "private": true, "type": "module", "dependencies": { - "monaco-editor-workers": "0.38.0", + "monaco-editor-workers": "0.39.1", "monaco-languageclient": "6.1.1", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index 95d28f722..3e9b50881 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -4,7 +4,7 @@ "private": true, "type": "module", "dependencies": { - "monaco-editor-workers": "0.38.0", + "monaco-editor-workers": "0.39.1", "monaco-languageclient": "6.1.1", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0"