Skip to content
This repository has been archived by the owner on Mar 22, 2024. It is now read-only.

Commit

Permalink
Updated to monaco-languageclient 7.3.0 and monaco-vscode-api 1.85.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@kaisalmen
kaisalmen committed Dec 12, 2023
1 parent 6cf5eee commit a5c6069
Show file tree
Hide file tree
Showing 6 changed files with 546 additions and 388 deletions.
866 changes: 512 additions & 354 deletions package-lock.json
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,26 @@
"devDependencies": {
"@types/node": "~20.10.4",
"@types/shelljs": "~0.8.15",
"@types/vscode": "~1.83.3",
"@typescript-eslint/eslint-plugin": "~6.13.2",
"@typescript-eslint/parser": "~6.13.2",
"@types/vscode": "~1.85.0",
"@typescript-eslint/eslint-plugin": "~6.14.0",
"@typescript-eslint/parser": "~6.14.0",
"@vitest/browser": "~1.0.2",
"editorconfig": "~2.0.0",
"eslint": "~8.55.0",
"shelljs": "~0.8.5",
"shx": "~0.3.4",
"typescript": "~5.3.3",
"vite": "~5.0.6",
"vitest": "~1.0.2",
"webdriverio": "~8.24.12"
"vite": "~5.0.7",
"vitest": "~1.0.4",
"webdriverio": "~8.26.1"
},
"overrides": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
"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"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
"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"
},
"volta": {
"node": "20.10.0",
Expand Down
18 changes: 9 additions & 9 deletions packages/examples/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
"version": "3.5.0",
"type": "module",
"dependencies": {
"@codingame/monaco-vscode-configuration-service-override": "~1.83.16",
"@codingame/monaco-vscode-editor-service-override": "~1.83.16",
"@codingame/monaco-vscode-json-default-extension": "~1.83.16",
"@codingame/monaco-vscode-keybindings-service-override": "~1.83.16",
"@codingame/monaco-vscode-python-default-extension": "~1.83.16",
"@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-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",
"@typefox/monaco-editor-react": "~2.5.0",
"http-server": "~14.1.1",
"langium": "~2.1.3",
"langium-statemachine-dsl": "~2.1.0",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0",
"monaco-editor-workers": "~0.44.0",
"monaco-editor-wrapper": "~3.5.0",
"monaco-languageclient": "~7.2.0",
"monaco-languageclient-examples": "~7.2.0",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"request-light": "~0.7.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0",
"vscode-uri": "~3.0.8",
"vscode-languageclient": "~9.0.1",
"vscode-languageserver": "~9.0.1",
Expand All @@ -37,8 +37,8 @@
"vscode": "$vscode"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
"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"
},
"volta": {
"node": "20.10.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/examples/src/langium/config/wrapperStatemachineConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useOpenEditorStub } from 'monaco-languageclient';
import { UserConfig } from 'monaco-editor-wrapper';
import { getTextContent } from '../../common.js';

export const createLangiumGlobalConfig = async (worker: Worker, port?: MessagePort): Promise<UserConfig> => {
export const createLangiumGlobalConfig = async (worker: Worker, messagePort?: MessagePort): Promise<UserConfig> => {
const code = await getTextContent(new URL('./src/langium/content/example.statemachine', window.location.href));

const extensionFilesOrContents = new Map<string, string | URL>();
Expand Down Expand Up @@ -64,7 +64,7 @@ export const createLangiumGlobalConfig = async (worker: Worker, port?: MessagePo
options: {
$type: 'WorkerDirect',
worker,
messagePort: port
messagePort
}
}
};
Expand Down
8 changes: 4 additions & 4 deletions packages/monaco-editor-react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@
"npm": "10.2.3"
},
"dependencies": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0",
"monaco-editor-wrapper": "~3.5.0",
"react": "~18.2.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0"
},
"peerDependencies": {
"monaco-editor-wrapper": "~3.5.0"
Expand All @@ -66,8 +66,8 @@
"vscode": "$vscode"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
"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"
},
"repository": {
"type": "git",
Expand Down
18 changes: 9 additions & 9 deletions packages/monaco-editor-wrapper/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@
"npm": "10.2.3"
},
"dependencies": {
"@codingame/monaco-vscode-configuration-service-override": "~1.83.16",
"@codingame/monaco-vscode-editor-service-override": "~1.83.16",
"@codingame/monaco-vscode-textmate-service-override": "~1.83.16",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.16",
"@codingame/monaco-vscode-theme-service-override": "~1.83.16",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
"@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-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",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0-next.1 <1.86.0",
"monaco-languageclient": "~7.2.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0-next.1 <1.86.0",
"vscode-languageclient": "~9.0.1",
"vscode-languageserver-protocol":"~3.17.5",
"vscode-ws-jsonrpc": "~3.1.0"
Expand All @@ -79,8 +79,8 @@
"vscode": "$vscode"
},
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
"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"
},
"repository": {
"type": "git",
Expand Down

0 comments on commit a5c6069

Please sign in to comment.