Skip to content

Commit

Permalink
Updated to next preview build
Browse files Browse the repository at this point in the history
  • Loading branch information
kaisalmen committed Jan 3, 2024
1 parent 418b600 commit eb6b7bf
Show file tree
Hide file tree
Showing 9 changed files with 505 additions and 479 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,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.85.0-next.1 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.2 <1.86.0"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.2 <1.86.0"
}
```

Expand Down Expand Up @@ -308,7 +308,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.85.0-next.1 <1.86.0"
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.2 <1.86.0"
```

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

| monaco-languageclient | monaco-vscode-api | monaco-editor-treemended | monaco-editor | release date | comment |
| :---- | :---- | :--- | :--- | :--- | :--- |
| 7.3.0 | 1.85.0 | 1.85.0 | 0.45.0 | 2023-12-1x | |
| 7.3.0 | 1.85.0 | 1.85.0 | 0.45.0 | 2024-01-0x | |
| 7.2.0 | 1.83.16 | 1.83.16 | 0.44.0 | 2023-12-07 | |
| 7.1.0 | 1.83.12 | 1.83.12 | 0.44.0 | 2023-11-27 | |
| 7.0.2 | 1.83.7 | 1.83.7 | 0.44.0 | 2023-11-02 | |
Expand Down
852 changes: 439 additions & 413 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
"type": "module",
"devDependencies": {
"@types/vscode": "~1.85.0",
"@typescript-eslint/eslint-plugin": "~6.14.0",
"@typescript-eslint/parser": "~6.14.0",
"@typescript-eslint/eslint-plugin": "~6.17.0",
"@typescript-eslint/parser": "~6.17.0",
"editorconfig": "~2.0.0",
"eslint": "~8.55.0",
"eslint": "~8.56.0",
"eslint-config-standard": "~17.1.0",
"eslint-plugin-header": "~3.1.1",
"eslint-plugin-import": "~2.29.0",
"eslint-plugin-import": "~2.29.1",
"eslint-plugin-promise": "~6.1.1",
"eslint-plugin-unused-imports": "~3.0.0",
"shx": "~0.3.4",
"typescript": "~5.3.3",
"vite": "~5.0.7"
"vite": "~5.0.10"
},
"overrides": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.2 <1.86.0"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.2 <1.86.0"
},
"volta": {
"node": "20.10.0",
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.3.0-next.0",
"version": "7.3.0-next.1",
"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.85.0-next.1",
"@codingame/monaco-vscode-languages-service-override": "~1.85.0-next.1",
"@codingame/monaco-vscode-model-service-override": "~1.85.0-next.1",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0",
"@codingame/monaco-vscode-editor-service-override": "~1.85.0-next.2",
"@codingame/monaco-vscode-languages-service-override": "~1.85.0-next.2",
"@codingame/monaco-vscode-model-service-override": "~1.85.0-next.2",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.2 <1.86.0",
"vscode-languageclient": "~9.0.1"
},
"peerDependencies": {
"monaco-editor": "0.44.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0"
"monaco-editor": "0.45.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.2 <1.86.0"
},
"peerDependenciesMeta": {
"monaco-editor": {
Expand All @@ -72,8 +72,8 @@
"vscode": "$vscode"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.2 <1.86.0"
},
"scripts": {
"clean": "shx rm -fr lib *.tsbuildinfo",
Expand Down
48 changes: 24 additions & 24 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.3.0-next.0",
"version": "7.3.0-next.1",
"description": "Monaco Language client examples",
"author": {
"name": "TypeFox GmbH",
Expand Down Expand Up @@ -43,41 +43,41 @@
}
},
"dependencies": {
"@codingame/monaco-vscode-configuration-service-override": "~1.85.0-next.1",
"@codingame/monaco-vscode-editor-service-override": "~1.85.0-next.1",
"@codingame/monaco-vscode-files-service-override": "~1.85.0-next.1",
"@codingame/monaco-vscode-json-default-extension": "~1.85.0-next.1",
"@codingame/monaco-vscode-keybindings-service-override": "~1.85.0-next.1",
"@codingame/monaco-vscode-python-default-extension": "~1.85.0-next.1",
"@codingame/monaco-vscode-textmate-service-override": "~1.85.0-next.1",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~1.85.0-next.1",
"@codingame/monaco-vscode-theme-service-override": "~1.85.0-next.1",
"@codingame/monaco-vscode-language-pack-de": "~1.85.0-next.1",
"@codingame/monaco-vscode-language-pack-es": "~1.85.0-next.1",
"@codingame/monaco-vscode-language-pack-fr": "~1.85.0-next.1",
"@codingame/monaco-vscode-configuration-service-override": "~1.85.0-next.2",
"@codingame/monaco-vscode-editor-service-override": "~1.85.0-next.2",
"@codingame/monaco-vscode-files-service-override": "~1.85.0-next.2",
"@codingame/monaco-vscode-json-default-extension": "~1.85.0-next.2",
"@codingame/monaco-vscode-keybindings-service-override": "~1.85.0-next.2",
"@codingame/monaco-vscode-python-default-extension": "~1.85.0-next.2",
"@codingame/monaco-vscode-textmate-service-override": "~1.85.0-next.2",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~1.85.0-next.2",
"@codingame/monaco-vscode-theme-service-override": "~1.85.0-next.2",
"@codingame/monaco-vscode-language-pack-de": "~1.85.0-next.2",
"@codingame/monaco-vscode-language-pack-es": "~1.85.0-next.2",
"@codingame/monaco-vscode-language-pack-fr": "~1.85.0-next.2",
"express": "~4.18.2",
"langium": "~2.1.0",
"langium-statemachine-dsl": "~2.1.0",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0",
"monaco-editor-workers": "~0.44.0",
"monaco-languageclient": "~7.3.0-next.0",
"pyright": "~1.1.338",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"monaco-editor-workers": "~0.45.0",
"monaco-languageclient": "~7.3.0-next.1",
"pyright": "~1.1.344",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"request-light": "~0.7.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.2 <1.86.0",
"vscode-json-languageservice": "~5.3.7",
"vscode-languageclient": "~9.0.1",
"vscode-languageserver": "~9.0.1",
"vscode-uri": "~3.0.8",
"vscode-ws-jsonrpc": "~3.1.0",
"ws": "~8.15.0"
"ws": "~8.16.0"
},
"devDependencies": {
"@types/express": "~4.17.18",
"@types/node": "~20.10.4",
"@types/react": "~18.2.42",
"@types/react-dom": "~18.2.17",
"@types/node": "~20.10.6",
"@types/react": "~18.2.46",
"@types/react-dom": "~18.2.18",
"@types/ws": "~8.5.10",
"ts-node": "~10.9.1",
"vscode-languageserver-types": "~3.17.5"
Expand All @@ -87,8 +87,8 @@
"vscode": "$vscode"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.2 <1.86.0"
},
"volta": {
"node": "20.10.0",
Expand Down
6 changes: 3 additions & 3 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.85.0-next.1 <1.86.0",
"monaco-languageclient": "~7.3.0-next.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"monaco-languageclient": "~7.3.0-next.1",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.2 <1.86.0"
},
"devDependencies": {
"shx": "~0.3.4"
Expand Down
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.85.0-next.1 <1.86.0",
"monaco-editor-workers": "~0.44.0",
"monaco-languageclient": "~7.3.0-next.0",
"monaco-languageclient-examples": "~7.3.0-next.0",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"monaco-editor-workers": "~0.45.0",
"monaco-languageclient": "~7.3.0-next.1",
"monaco-languageclient-examples": "~7.3.0-next.1",
"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.85.0-next.1 <1.86.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0"
},
"volta": {
"node": "20.10.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/verify/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"private": true,
"type": "module",
"dependencies": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0",
"monaco-editor-workers": "~0.44.0",
"monaco-languageclient": "~7.3.0-next.0",
"monaco-languageclient-examples": "~7.3.0-next.0",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"monaco-editor-workers": "~0.45.0",
"monaco-languageclient": "~7.3.0-next.1",
"monaco-languageclient-examples": "~7.3.0-next.1",
"vscode-ws-jsonrpc": "~3.1.0"
},
"devDependencies": {
"css-loader": "~6.8.1",
"source-map-loader": "~4.0.1",
"source-map-loader": "~4.0.2",
"style-loader": "~3.3.3",
"ts-loader": "~9.5.0",
"webpack-cli": "~5.1.4",
Expand All @@ -22,7 +22,7 @@
"monaco-editor": "$monaco-editor"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0"
},
"volta": {
"node": "20.10.0",
Expand Down
6 changes: 3 additions & 3 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.85.0-next.1 <1.86.0",
"monaco-languageclient": "~7.3.0-next.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0",
"monaco-languageclient": "~7.3.0-next.1"
},
"devDependencies": {
"shx": "~0.3.4"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.2 <1.86.0"
},
"scripts": {
"clean": "shx rm -fr ./node_modules yarn.lock",
Expand Down

0 comments on commit eb6b7bf

Please sign in to comment.