From 0186abbbfa972acaef400fd2033307038fc1f8ce Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Thu, 27 Jul 2023 20:18:18 +0200 Subject: [PATCH] Switch to monaco-vscode-api 1.80.1-next.0 - Simplify enableQuickaccessService --- package-lock.json | 18 +++++++++--------- packages/client/package.json | 6 +++--- .../client/src/monaco-vscode-api-services.ts | 16 ++++++---------- packages/examples/main/package.json | 2 +- packages/examples/main/src/common.ts | 5 +---- .../main/src/langium/statemachineClient.ts | 6 ++---- packages/verify/pnpm/package.json | 4 ++-- packages/verify/vite/package.json | 2 +- packages/verify/vite/vite.config.ts | 3 +-- packages/verify/webpack/package.json | 2 +- packages/verify/yarn/package.json | 2 +- vite.config.ts | 1 - 12 files changed, 28 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index a042f6c82..fbb0d88c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5929,9 +5929,9 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.80.0-next.6", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.80.0-next.6.tgz", - "integrity": "sha512-4iaf+cezdyjHOr1yRBpM7CEmCDkO8qQK0sQIdVhREI1qd49xiggxdF+J8gRLBSRAbOX6ZFEpWUZsZv8Uo9k08Q==", + "version": "1.80.1-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.80.1-next.0.tgz", + "integrity": "sha512-6RukMMKKidOs6oUWCEOUufnH+k5qgBfsZQgb1aHyZtOg9L+1fK55pdqUrb6PSVZbgh7sB02Zvgy1K3+sdfHvAg==", "dependencies": { "toposort": "^2.0.2" }, @@ -6436,12 +6436,12 @@ }, "packages/client": { "name": "monaco-languageclient", - "version": "6.3.0-next.0", + "version": "6.3.0-next.1", "hasInstallScript": true, "license": "MIT", "dependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, @@ -6451,7 +6451,7 @@ }, "peerDependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6" + "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0" }, "peerDependenciesMeta": { "monaco-editor": { @@ -6470,7 +6470,7 @@ "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "react": "~18.2.0", "react-dom": "~18.2.0", @@ -6497,7 +6497,7 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" }, @@ -6510,7 +6510,7 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.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 9aa74a9f7..a0991029a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient", - "version": "6.3.0-next.0", + "version": "6.3.0-next.1", "description": "Monaco Language client implementation", "author": { "name": "TypeFox GmbH", @@ -49,13 +49,13 @@ ], "dependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6", + "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, "peerDependencies": { "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.6" + "vscode": "npm:@codingame/monaco-vscode-api@1.80.1-next.0" }, "peerDependenciesMeta": { "monaco-editor": { diff --git a/packages/client/src/monaco-vscode-api-services.ts b/packages/client/src/monaco-vscode-api-services.ts index c1e505d57..26465a400 100644 --- a/packages/client/src/monaco-vscode-api-services.ts +++ b/packages/client/src/monaco-vscode-api-services.ts @@ -35,10 +35,7 @@ export type InitializeServiceConfig = { enableDebugService?: boolean; enablePreferencesService?: boolean; enableSnippetsService?: boolean; - configureQuickaccessService?: { - isKeybindingConfigurationVisible: boolean, - shouldUseGlobalPicker: boolean - }; + enableQuickaccessService?: boolean; enableOutputService?: boolean; configureTerminalServiceConfig?: { backendImpl: SimpleTerminalBackend | ITerminalBackend @@ -48,6 +45,7 @@ export type InitializeServiceConfig = { enableAccessibilityService?: boolean; enableEnvironmentService?: boolean; enableLayoutService?: boolean; + enableLanguageDetectionWorkerService?: boolean; userServices?: editor.IEditorOverrideServices; debugLogging?: boolean; logLevel?: LogLevel @@ -141,7 +139,7 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.enableSnippetsService === true) { addService('snippets', import('vscode/service-override/snippets')); } - if (lc.configureQuickaccessService !== undefined) { + if (lc.enableQuickaccessService === true) { addService('quickaccess', import('vscode/service-override/quickaccess')); } if (lc.enableOutputService === true) { @@ -165,6 +163,9 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.enableLayoutService === true) { addService('layout', import('vscode/service-override/layout')); } + if (lc.enableLanguageDetectionWorkerService === true) { + addService('languageDetectionWorker', import('vscode/service-override/languageDetectionWorker')); + } const reportServiceLoading = (services: editor.IEditorOverrideServices, debugLogging: boolean, origin?: string) => { for (const serviceName of Object.keys(services)) { @@ -238,11 +239,6 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.configureTerminalServiceConfig?.backendImpl) { services = loadedImport.default(lc.configureTerminalServiceConfig.backendImpl); } - } else if (serviceName === 'quickaccess') { - services = loadedImport.default({ - isKeybindingConfigurationVisible: lc.configureQuickaccessService?.isKeybindingConfigurationVisible, - shouldUseGlobalPicker: lc.configureQuickaccessService?.shouldUseGlobalPicker - }); } else { services = loadedImport.default(); } diff --git a/packages/examples/main/package.json b/packages/examples/main/package.json index 763a2c75c..b1fbdbf45 100644 --- a/packages/examples/main/package.json +++ b/packages/examples/main/package.json @@ -23,7 +23,7 @@ "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "react": "~18.2.0", "react-dom": "~18.2.0", diff --git a/packages/examples/main/src/common.ts b/packages/examples/main/src/common.ts index 1b2ab2141..5b61d2871 100644 --- a/packages/examples/main/src/common.ts +++ b/packages/examples/main/src/common.ts @@ -88,10 +88,7 @@ export const createJsonEditor = async (config: { }, enableKeybindingsService: true, enableLanguagesService: true, - configureQuickaccessService: { - isKeybindingConfigurationVisible: true, - shouldUseGlobalPicker: true - }, + enableQuickaccessService: true, enableOutputService: true, enableAccessibilityService: true, debugLogging: true diff --git a/packages/examples/main/src/langium/statemachineClient.ts b/packages/examples/main/src/langium/statemachineClient.ts index bc8534488..95a1a85ed 100644 --- a/packages/examples/main/src/langium/statemachineClient.ts +++ b/packages/examples/main/src/langium/statemachineClient.ts @@ -135,16 +135,14 @@ try { enableNotificationService: true, enablePreferencesService: true, enableSnippetsService: true, - configureQuickaccessService: { - isKeybindingConfigurationVisible: true, - shouldUseGlobalPicker: true - }, + enableQuickaccessService: true, enableOutputService: true, enableSearchService: true, enableMarkersService: false, // don't enable files and extensions services. They will be enabled automatically enableFilesService: false, enableExtensionsService: false, + enableLanguageDetectionWorkerService: true, // This should demonstrate that you can chose to not use the built-in loading mechanism, // but do it manually, see below enableAccessibilityService: false, diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json index e36849504..e53bf92d3 100644 --- a/packages/verify/pnpm/package.json +++ b/packages/verify/pnpm/package.json @@ -3,9 +3,9 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "monaco-editor": "~0.40.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.80.0-next.6" + "vscode": "npm:@codingame/monaco-vscode-api@~1.80.1-next.0" }, "devDependencies": { "shx": "~0.3.4" diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index 02c4f230d..2124b43df 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -5,7 +5,7 @@ "type": "module", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, diff --git a/packages/verify/vite/vite.config.ts b/packages/verify/vite/vite.config.ts index ec71e2a51..9cb77ddd9 100644 --- a/packages/verify/vite/vite.config.ts +++ b/packages/verify/vite/vite.config.ts @@ -6,6 +6,5 @@ export default defineConfig({ alias: { path: 'path-browserify' } - }, - assetsInclude: ['**/*.wasm'] + } }); diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index 51339bc62..f18e3f815 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -5,7 +5,7 @@ "type": "module", "dependencies": { "monaco-editor-workers": "0.39.1", - "monaco-languageclient": "6.3.0-next.0", + "monaco-languageclient": "6.3.0-next.1", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json index 267261b5a..48b13c501 100644 --- a/packages/verify/yarn/package.json +++ b/packages/verify/yarn/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "6.3.0-next.0" + "monaco-languageclient": "6.3.0-next.1" }, "devDependencies": { "shx": "~0.3.4" diff --git a/vite.config.ts b/vite.config.ts index 370b9da88..e0936d467 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -25,7 +25,6 @@ export default defineConfig(() => { port: 8080, origin: 'http://localhost:8080' }, - assetsInclude: ['**/*.wasm'], optimizeDeps: { esbuildOptions: { plugins: [