Skip to content

Commit

Permalink
Release 7.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
kaisalmen committed Nov 15, 2023
1 parent defab10 commit 305796a
Show file tree
Hide file tree
Showing 11 changed files with 293 additions and 257 deletions.
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ With v7 we decided to use readily treemended version of monaco-editor called [@c

```yaml
"overrides": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
}
```

Expand Down Expand Up @@ -289,7 +289,7 @@ loader.config({ monaco });
If you use pnpm, you have to add `vscode` / `@codingame/monaco-vscode-api` as direct dependency (see the [following table](#monaco-editor--codingamemonaco-vscode-api-compatibility-table)), otherwise the installation will fail.

```json
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
```

## Monaco-editor / @codingame/monaco-vscode-api compatibility table
Expand All @@ -300,6 +300,8 @@ The following table describes which version of **monaco-languageclient** and **@

| monaco-languageclient | monaco-vscode-api | monaco-editor-treemended | monaco-editor | release date | comment |
| :---- | :---- | :--- | :--- | :--- | :--- |
| 7.0.2 | 1.83.7 | 1.83.7 | 0.44.0 | 2023-11-02 | |
| 7.0.1 | 1.83.5 | 1.83.5 | 0.44.0 | 2023-11-10 | |
| 7.0.0 | 1.83.5 | 1.83.5 | 0.44.0 | 2023-11-02 | Introduction of `@codingame/monaco-editor-treemended` |
| 6.6.1 | 1.83.3 | | 0.44.0 | 2023-10-20 | |
| 6.6.0 | 1.83.2 | | 0.44.0 | 2023-10-16 | |
Expand Down
414 changes: 222 additions & 192 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"private": true,
"type": "module",
"devDependencies": {
"@types/vscode": "~1.83.0",
"@types/vscode": "~1.83.3",
"@typescript-eslint/eslint-plugin": "~6.9.1",
"@typescript-eslint/parser": "~6.9.1",
"editorconfig": "~2.0.0",
Expand All @@ -17,12 +17,12 @@
"vite": "~4.5.0"
},
"overrides": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
},
"volta": {
"node": "18.18.2",
Expand Down
4 changes: 4 additions & 0 deletions packages/client/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to this npm module are documented in this file.

## [7.0.2] - 2023-11-15

- Updated to `monaco-vscode-api` `1.83.7`.

## [7.0.1] - 2023-11-10

- Split `initServices` into two functions `initVscodeServices` and `initVscodeExtensions`. extension init is no longer blocked by service init in case and service init will only performed once.
Expand Down
20 changes: 10 additions & 10 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monaco-languageclient",
"version": "7.0.1",
"version": "7.0.2",
"description": "Monaco Language client implementation",
"author": {
"name": "TypeFox GmbH",
Expand Down Expand Up @@ -48,16 +48,16 @@
"License.txt"
],
"dependencies": {
"@codingame/monaco-vscode-editor-service-override": "~1.83.5",
"@codingame/monaco-vscode-languages-service-override": "~1.83.5",
"@codingame/monaco-vscode-model-service-override": "~1.83.5",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0",
"@codingame/monaco-vscode-editor-service-override": "~1.83.7",
"@codingame/monaco-vscode-languages-service-override": "~1.83.7",
"@codingame/monaco-vscode-model-service-override": "~1.83.7",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0",
"vscode-languageclient": "~9.0.1"
},
"peerDependencies": {
"monaco-editor": "0.44.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
},
"peerDependenciesMeta": {
"monaco-editor": {
Expand All @@ -72,13 +72,13 @@
"vscode": "$vscode"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
},
"scripts": {
"clean": "shx rm -fr lib *.tsbuildinfo",
"compile": "tsc --build tsconfig.src.json",
"build:msg": "echo Building monaco-languageclient:",
"build": "npm run build:msg && npm run clean && npm run compile"
}
}
}
38 changes: 19 additions & 19 deletions packages/examples/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monaco-languageclient-examples",
"version": "7.0.1",
"version": "7.0.2",
"description": "Monaco Language client examples",
"author": {
"name": "TypeFox GmbH",
Expand Down Expand Up @@ -43,29 +43,29 @@
}
},
"dependencies": {
"@codingame/monaco-vscode-configuration-service-override": "~1.83.5",
"@codingame/monaco-vscode-editor-service-override": "~1.83.5",
"@codingame/monaco-vscode-files-service-override": "~1.83.5",
"@codingame/monaco-vscode-json-default-extension": "~1.83.5",
"@codingame/monaco-vscode-keybindings-service-override": "~1.83.5",
"@codingame/monaco-vscode-python-default-extension": "~1.83.5",
"@codingame/monaco-vscode-textmate-service-override": "~1.83.5",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.5",
"@codingame/monaco-vscode-theme-service-override": "~1.83.5",
"@codingame/monaco-vscode-language-pack-de": "~1.83.5",
"@codingame/monaco-vscode-language-pack-es": "~1.83.5",
"@codingame/monaco-vscode-language-pack-fr": "~1.83.5",
"@codingame/monaco-vscode-configuration-service-override": "~1.83.7",
"@codingame/monaco-vscode-editor-service-override": "~1.83.7",
"@codingame/monaco-vscode-files-service-override": "~1.83.7",
"@codingame/monaco-vscode-json-default-extension": "~1.83.7",
"@codingame/monaco-vscode-keybindings-service-override": "~1.83.7",
"@codingame/monaco-vscode-python-default-extension": "~1.83.7",
"@codingame/monaco-vscode-textmate-service-override": "~1.83.7",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.7",
"@codingame/monaco-vscode-theme-service-override": "~1.83.7",
"@codingame/monaco-vscode-language-pack-de": "~1.83.7",
"@codingame/monaco-vscode-language-pack-es": "~1.83.7",
"@codingame/monaco-vscode-language-pack-fr": "~1.83.7",
"express": "~4.18.2",
"langium": "~2.1.0",
"langium-statemachine-dsl": "~2.1.0",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"monaco-editor-workers": "~0.44.0",
"monaco-languageclient": "~7.0.1",
"monaco-languageclient": "~7.0.2",
"pyright": "~1.1.333",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"request-light": "~0.7.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0",
"vscode-json-languageservice": "~5.3.7",
"vscode-languageclient": "~9.0.1",
"vscode-languageserver": "~9.0.1",
Expand All @@ -87,8 +87,8 @@
"vscode": "$vscode"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
},
"volta": {
"node": "18.18.2",
Expand All @@ -113,4 +113,4 @@
"start:server:json": "node --loader ts-node/esm src/json/server/direct.ts",
"start:server:python": "node --loader ts-node/esm src/python/server/direct.ts"
}
}
}
16 changes: 8 additions & 8 deletions packages/examples/src/python/client/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,6 @@ export const startPythonClient = async () => {
fileSystemProvider.registerFile(new RegisteredMemoryFile(vscode.Uri.file('/workspace/hello.py'), 'print("Hello, World!")'));
registerFileSystemOverlay(1, fileSystemProvider);

// create the web socket and configure to start the language client on open, can add extra parameters to the url if needed.
createWebSocket(createUrl('localhost', 30001, '/pyright', {
// Used to parse an auth token or additional parameters such as import IDs to the language server
authorization: 'UserAuth'
// By commenting above line out and commenting below line in, connection to language server will be denied.
// authorization: 'FailedUserAuth'
}, false));

const registerCommand = async (cmdName: string, handler: (...args: unknown[]) => void) => {
// commands sould not be there, but it demonstrates how to retrieve list of all external commands
const commands = await vscode.commands.getCommands(true);
Expand All @@ -171,4 +163,12 @@ export const startPythonClient = async () => {
model: modelRef.object.textEditorModel,
automaticLayout: true
});

// create the web socket and configure to start the language client on open, can add extra parameters to the url if needed.
createWebSocket(createUrl('localhost', 30001, '/pyright', {
// Used to parse an auth token or additional parameters such as import IDs to the language server
authorization: 'UserAuth'
// By commenting above line out and commenting below line in, connection to language server will be denied.
// authorization: 'FailedUserAuth'
}, false));
};
8 changes: 4 additions & 4 deletions packages/verify/pnpm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "0.0.0",
"private": "true",
"dependencies": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"monaco-languageclient": "~7.0.1",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"monaco-languageclient": "~7.0.2",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
},
"devDependencies": {
"shx": "~0.3.4"
Expand All @@ -21,4 +21,4 @@
"node": "18.18.2",
"npm": "9.9.0"
}
}
}
10 changes: 5 additions & 5 deletions packages/verify/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"private": true,
"type": "module",
"dependencies": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"monaco-editor-workers": "~0.44.0",
"monaco-languageclient": "~7.0.1",
"monaco-languageclient-examples": "~7.0.1",
"monaco-languageclient": "~7.0.2",
"monaco-languageclient-examples": "~7.0.2",
"vscode-ws-jsonrpc": "~3.1.0"
},
"devDependencies": {
Expand All @@ -17,7 +17,7 @@
"monaco-editor": "$monaco-editor"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0"
},
"volta": {
"node": "18.18.2",
Expand All @@ -30,4 +30,4 @@
"build": "npm run build:msg && npm run clean && vite build && npm run copy:monacoworkers",
"start": "http-server --port 8082 ./dist"
}
}
}
10 changes: 5 additions & 5 deletions packages/verify/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"private": true,
"type": "module",
"dependencies": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"monaco-editor-workers": "~0.44.0",
"monaco-languageclient": "~7.0.1",
"monaco-languageclient-examples": "~7.0.1",
"monaco-languageclient": "~7.0.2",
"monaco-languageclient-examples": "~7.0.2",
"vscode-ws-jsonrpc": "~3.1.0"
},
"devDependencies": {
Expand All @@ -22,7 +22,7 @@
"monaco-editor": "$monaco-editor"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0"
},
"volta": {
"node": "18.18.2",
Expand All @@ -35,4 +35,4 @@
"build": "npm run build:msg && npm run clean && webpack && npm run copy:monacoworkers",
"start": "http-server --port 8081 ./"
}
}
}
8 changes: 4 additions & 4 deletions packages/verify/yarn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"version": "0.0.0",
"private": "true",
"dependencies": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
"monaco-languageclient": "~7.0.1"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
"monaco-languageclient": "~7.0.2"
},
"devDependencies": {
"shx": "~0.3.4"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0"
},
"scripts": {
"clean": "shx rm -fr ./node_modules yarn.lock",
Expand All @@ -20,4 +20,4 @@
"node": "18.18.2",
"yarn": "1.22.19"
}
}
}

0 comments on commit 305796a

Please sign in to comment.