WIP: Fix build and examples

TypeFox · Jul 24, 2023 · 35f07a5 · 35f07a5
1 parent a5bb672
commit 35f07a5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -49,13 +49,13 @@
   ],
   "dependencies": {
     "monaco-editor": "~0.40.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.4",
     "vscode-jsonrpc": "~8.1.0",
     "vscode-languageclient": "~8.1.0"
   },
   "peerDependencies": {
     "monaco-editor": "~0.40.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.80.0-next.4"
   },
   "peerDependenciesMeta": {
     "monaco-editor": {

diff --git a/packages/examples/main/src/common.ts b/packages/examples/main/src/common.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, languages, Uri } from 'monaco-editor/esm/vs/editor/editor.api.js';
 import { createConfiguredEditor, createModelReference, IReference, ITextFileEditorModel } from 'vscode/monaco';

diff --git a/packages/examples/main/src/langium/main.ts b/packages/examples/main/src/langium/main.ts
@@ -4,15 +4,14 @@
  * ------------------------------------------------------------------------------------------ */
 
 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';
 
 import { MonacoLanguageClient, initServices } from 'monaco-languageclient';
 import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver-protocol/browser.js';
 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 getFileServiceOverride from 'vscode/service-override/files';
 import { LogLevel } from 'vscode/services';
@@ -60,17 +59,11 @@ const setup = async () => {
             }]
         }
     };
-    const { registerFile: registerExtensionFile } = registerExtension(extension);
+    const { registerFileUrl } = registerExtension(extension, ExtensionHostKind.LocalProcess);
+    // const api = await getApi();
 
-    registerExtensionFile('/statemachine-configuration.json', async () => {
-        const statemachineLanguageConfig = new URL('../../../node_modules/langium-statemachine-dsl/language-configuration.json', window.location.href).href;
-        return (await fetch(statemachineLanguageConfig)).text();
-    });
-
-    registerExtensionFile('/statemachine-grammar.json', async () => {
-        const statemachineTmUrl = new URL('../../../node_modules/langium-statemachine-dsl/syntaxes/statemachine.tmLanguage.json', window.location.href).href;
-        return (await fetch(statemachineTmUrl)).text();
-    });
+    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);
 
     updateUserConfiguration(`{
     "editor.fontSize": 14,

diff --git a/packages/examples/main/src/react/app.tsx b/packages/examples/main/src/react/app.tsx
@@ -3,7 +3,6 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 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 } from 'monaco-editor/esm/vs/editor/editor.api.js';
 import React, { createRef, useEffect, useMemo, useRef } from 'react';

diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "monaco-languageclient": "6.3.0-next.0",
     "monaco-editor": "~0.40.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@~1.80.0-next.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@~1.80.0-next.4"
   },
   "devDependencies": {
     "shx": "~0.3.4"