From bfd64fa88d8e99f52b451aa66932df18c750da64 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 29 Sep 2023 16:01:58 +0200 Subject: [PATCH] Clean-up and CHANGELOG clarifications --- packages/client/CHANGELOG.md | 3 ++- packages/examples/src/common.ts | 3 ++- packages/verify/webpack/webpack.config.js | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index 328dc1744..88614479d 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -5,7 +5,8 @@ All notable changes to this npm module are documented in this file. ## [6.5.0] - 2023-09-29 - Updated to `monaco-editor` `0.43.0` and `monaco-vscode-api` `1.82.2` -- Only keep user services in`initServices`. It requires to specifically import and use services provided by [monaco-vscode-api](https://github.com/CodinGame/monaco-vscode-api#monaco-standalone-services) +- Only keep user services in`initServices`. It requires to specifically import and use services provided by [monaco-vscode-api](https://github.com/CodinGame/monaco-vscode-api#monaco-standalone-services) + - All *enable...* and *configure* type parameters have been removed from `monaco-languagclient` - languages and model services are always added by `monaco-languagclient` - layout, environment, extension, files and quickAccess servies are always added by `monaco-vscode-api` - Additional services need to be added to the package dependencies and imported and configured as shown in the [examples](https://github.com/TypeFox/monaco-languageclient#examples) diff --git a/packages/examples/src/common.ts b/packages/examples/src/common.ts index 4e033c6ae..9c75c69f3 100644 --- a/packages/examples/src/common.ts +++ b/packages/examples/src/common.ts @@ -36,6 +36,7 @@ export const createLanguageClient = (transports: MessageTransports): MonacoLangu } }); }; + export const createUrl = (hostname: string, port: number, path: string, searchParams: Record = {}, secure: boolean = location.protocol === 'https:'): string => { const protocol = secure ? 'wss' : 'ws'; const url = new URL(`${protocol}://${hostname}:${port}${path}`); @@ -89,7 +90,7 @@ export const performInit = async (vscodeApiInit: boolean) => { ...getThemeServiceOverride(), ...getTextmateServiceOverride(), ...getConfigurationServiceOverride(Uri.file('/workspace')), - ...getKeybindingsServiceOverride(), + ...getKeybindingsServiceOverride() }, debugLogging: true }); diff --git a/packages/verify/webpack/webpack.config.js b/packages/verify/webpack/webpack.config.js index 71c386356..6dcaedc60 100644 --- a/packages/verify/webpack/webpack.config.js +++ b/packages/verify/webpack/webpack.config.js @@ -8,7 +8,6 @@ import { fileURLToPath } from 'url'; import { dirname, resolve } from 'path'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); -const projectRoot = resolve(__dirname, '../../..'); const config = { entry: resolve(__dirname, 'src', 'client', 'main.ts'),