From f8d44100a452d2a0074752abeda0d8569e66ff09 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 28 Jul 2023 13:41:26 +0200 Subject: [PATCH] Fix langiumClient and update monaco-editor-workers to 0.40.0 --- package-lock.json | 35 +++++++++---------- packages/examples/main/package.json | 2 +- .../main/src/langium/langiumClient.ts | 16 +++------ .../main/src/langium/statemachineClient.ts | 1 - packages/verify/vite/package.json | 3 +- packages/verify/webpack/package.json | 3 +- packages/verify/webpack/tsconfig.json | 3 ++ 7 files changed, 28 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbb0d88c..9948092d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -821,9 +821,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.16", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.16.tgz", - "integrity": "sha512-LLFWr12ZhBJ4YVw7neWLe6Pk7Ey5R9OCydfuMsz1L8bZxzaawJj2p06Q8/EFEHDeTBQNFLF62X+CG7B2zIyu0Q==", + "version": "18.2.17", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.17.tgz", + "integrity": "sha512-u+e7OlgPPh+aryjOm5UJMX32OvB2E3QASOAqVMY6Ahs90djagxwv2ya0IctglNbNTexC12qCSMZG47KPfy1hAA==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -2058,9 +2058,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.471", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.471.tgz", - "integrity": "sha512-GpmGRC1vTl60w/k6YpQ18pSiqnmr0j3un//5TV1idPi6aheNfkT1Ye71tMEabWyNDO6sBMgAR+95Eb0eUUr1tA==", + "version": "1.4.475", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.475.tgz", + "integrity": "sha512-mTye5u5P98kSJO2n7zYALhpJDmoSQejIGya0iR01GpoRady8eK3bw7YHHnjA1Rfi4ZSLdpuzlAC7Zw+1Zu7Z6A==", "dev": true, "peer": true }, @@ -4189,21 +4189,16 @@ "integrity": "sha512-1wymccLEuFSMBvCk/jT1YDW/GuxMLYwnFwF9CDyYCxoTw2Pt379J3FUhwy9c43j51JdcxVPjwk0jm0EVDsBS2g==" }, "node_modules/monaco-editor-workers": { - "version": "0.39.1", - "resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.39.1.tgz", - "integrity": "sha512-QSP2ZCarlYaHGIZqzcz2BtI1mKstwJo4YfYu9m7ZwhkRd8HJEHpclKgE51AXtrncRch5zc05pHk4cQrFEdYsBQ==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.40.0.tgz", + "integrity": "sha512-fE44H8z9ssJqri301tl5kEbC4aVjYPjIGZ+2F68ydrXG1C9eiTus14oo7aFBBnswiCxV8oG9eU3Z7t0vdrorSQ==", "dependencies": { - "monaco-editor": "~0.39.0" + "monaco-editor": "~0.40.0" }, "peerDependencies": { - "monaco-editor": "~0.39.0" + "monaco-editor": "~0.40.0" } }, - "node_modules/monaco-editor-workers/node_modules/monaco-editor": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.39.0.tgz", - "integrity": "sha512-zhbZ2Nx93tLR8aJmL2zI1mhJpsl87HMebNBM6R8z4pLfs8pj604pIVIVwyF1TivcfNtIPpMXL+nb3DsBmE/x6Q==" - }, "node_modules/monaco-languageclient": { "resolved": "packages/client", "link": true @@ -6469,7 +6464,7 @@ "express": "~4.18.2", "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", - "monaco-editor-workers": "0.39.1", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "react": "~18.2.0", @@ -6496,7 +6491,8 @@ "name": "example-client-vite", "version": "0.0.0", "dependencies": { - "monaco-editor-workers": "0.39.1", + "examples-main": "../../examples/main", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" @@ -6509,7 +6505,8 @@ "name": "example-client-webpack", "version": "0.0.0", "dependencies": { - "monaco-editor-workers": "0.39.1", + "examples-main": "../../examples/main", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" diff --git a/packages/examples/main/package.json b/packages/examples/main/package.json index b1fbdbf4..7600fcc1 100644 --- a/packages/examples/main/package.json +++ b/packages/examples/main/package.json @@ -22,7 +22,7 @@ "express": "~4.18.2", "langium": "~1.2.1", "langium-statemachine-dsl": "~1.2.0", - "monaco-editor-workers": "0.39.1", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", "normalize-url": "~8.0.0", "react": "~18.2.0", diff --git a/packages/examples/main/src/langium/langiumClient.ts b/packages/examples/main/src/langium/langiumClient.ts index 71b2d7b3..d7917c60 100644 --- a/packages/examples/main/src/langium/langiumClient.ts +++ b/packages/examples/main/src/langium/langiumClient.ts @@ -4,7 +4,6 @@ * ------------------------------------------------------------------------------------------ */ import 'monaco-editor/esm/vs/editor/editor.all.js'; -import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.js'; import 'monaco-editor/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js'; import { editor, Uri } from 'monaco-editor/esm/vs/editor/editor.api.js'; @@ -13,7 +12,7 @@ import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserve import { CloseAction, ErrorAction, MessageTransports } from 'vscode-languageclient'; import { createConfiguredEditor } from 'vscode/monaco'; -import { registerExtension } from 'vscode/extensions'; +import { ExtensionHostKind, registerExtension } from 'vscode/extensions'; import { updateUserConfiguration } from 'vscode/service-override/configuration'; import 'vscode/default-extensions/theme-defaults'; @@ -49,18 +48,11 @@ const setup = async () => { }] } }; - const { registerFile: registerExtensionFile } = registerExtension(extension); + const { registerFileUrl } = registerExtension(extension, ExtensionHostKind.LocalProcess); // these two files are taken from the langium-vscode - registerExtensionFile('/langium-configuration.json', async () => { - const langiumLanguageConfig = new URL('./src/langium/langium.configuration.json', window.location.href).href; - return (await fetch(langiumLanguageConfig)).text(); - }); - - registerExtensionFile('/langium-grammar.json', async () => { - const langiumTmUrl = new URL('./src/langium/langium.tmLanguage.json', window.location.href).href; - return (await fetch(langiumTmUrl)).text(); - }); + registerFileUrl('/langium-configuration.json', new URL('./src/langium/langium.configuration.json', window.location.href).href); + registerFileUrl('/langium-grammar.json', new URL('./src/langium/langium.tmLanguage.json', window.location.href).href); // set vscode configuration parameters updateUserConfiguration(`{ diff --git a/packages/examples/main/src/langium/statemachineClient.ts b/packages/examples/main/src/langium/statemachineClient.ts index 95a1a85e..354dc31d 100644 --- a/packages/examples/main/src/langium/statemachineClient.ts +++ b/packages/examples/main/src/langium/statemachineClient.ts @@ -60,7 +60,6 @@ const setup = async () => { } }; const { registerFileUrl } = registerExtension(extension, ExtensionHostKind.LocalProcess); - // const api = await getApi(); registerFileUrl('/statemachine-configuration.json', new URL('../../../node_modules/langium-statemachine-dsl/language-configuration.json', window.location.href).href); registerFileUrl('/statemachine-grammar.json', new URL('../../../node_modules/langium-statemachine-dsl/syntaxes/statemachine.tmLanguage.json', window.location.href).href); diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index 2124b43d..3adabe89 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -4,8 +4,9 @@ "private": true, "type": "module", "dependencies": { - "monaco-editor-workers": "0.39.1", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", + "examples-main": "../../examples/main", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index f18e3f81..f8a6089e 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -4,8 +4,9 @@ "private": true, "type": "module", "dependencies": { - "monaco-editor-workers": "0.39.1", + "monaco-editor-workers": "0.40.0", "monaco-languageclient": "6.3.0-next.1", + "examples-main": "../../examples/main", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, diff --git a/packages/verify/webpack/tsconfig.json b/packages/verify/webpack/tsconfig.json index d66672a5..35013179 100644 --- a/packages/verify/webpack/tsconfig.json +++ b/packages/verify/webpack/tsconfig.json @@ -7,6 +7,9 @@ }, "references": [{ "path": "../../client/tsconfig.src.json" + }, + { + "path": "../../examples/main/tsconfig.src.json" }], "include": [ "src/**/*.ts",