Merge branch 'nextjs-16' into verify

Author: kaisalmen

eslint.config.mjs

@@ -15,6 +15,7 @@ export default [{
         '**/.chrome/**/*',
         '**/node_modules/**/*',
         '**/dist/**/*',
+        '**/bundle/**/*',
         '**/lib/**/*',
         '**/out/**/*',
         '**/bin/**/*',

verify/angular/package-lock.json

@@ -1,23 +1,29 @@
 /* --------------------------------------------------------------------------------------------
- * Copyright (c) 2024 TypeFox and others.
+ * Copyright (c) 2025 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
 import type { IFileWriteOptions } from '@codingame/monaco-vscode-files-service-override';
-import type { ExampleAppConfig } from 'monaco-languageclient-examples';
+import type { ILogger } from '@codingame/monaco-vscode-log-service-override';
+import type { MonacoEditorProps } from '@typefox/monaco-editor-react';
 import type { EditorAppConfig } from 'monaco-languageclient/editorApp';
 import type { LanguageClientConfig } from 'monaco-languageclient/lcwrapper';
 import type { MonacoVscodeApiConfig, OverallConfigType } from 'monaco-languageclient/vscodeApiWrapper';
 
-export const setupLangiumClientExtended = async (): Promise<ExampleAppConfig> => {
+export type ExampleAppConfig = {
+    vscodeApiConfig: MonacoVscodeApiConfig;
+    languageClientConfig: LanguageClientConfig;
+    editorAppConfig: EditorAppConfig;
+    MonacoEditorReactComp: React.FC<MonacoEditorProps>;
+};
+
+export const setupLangiumClientExtended = async (languageServerWorker: Worker, enableExtHostWorker: boolean, vscodeApiWorkerFactory: (logger?: ILogger) => void): Promise<ExampleAppConfig> => {
 
     // perform all imports dynamically
     const getKeybindingsServiceOverride = (await import('@codingame/monaco-vscode-keybindings-service-override')).default;
-    const getExtensionServiceOverride = (await import('@codingame/monaco-vscode-extensions-service-override')).default;
     const { InMemoryFileSystemProvider, registerFileSystemOverlay } = (await import('@codingame/monaco-vscode-files-service-override'));
     const { LogLevel } = (await import('@codingame/monaco-vscode-api'));
     const { Uri } = (await import('vscode'));
-    const { configureDefaultWorkerFactory } = (await import('monaco-languageclient/workerFactory'));
     const { BrowserMessageReader, BrowserMessageWriter } = (await import('vscode-languageclient/browser.js'));
 
     // base configurration
@@ -40,9 +46,15 @@ export const setupLangiumClientExtended = async (): Promise<ExampleAppConfig> =>
     const workspaceUri = Uri.file('/workspace');
     const langiumGrammarLangiumUri = Uri.file('/workspace/langium-grammar.langium');
     const langiumTypesLangiumUri = Uri.file('/workspace/langium-types.langium');
+    const tsCodeUri = Uri.file('/workspace/hello.ts');
     const fileSystemProvider = new InMemoryFileSystemProvider();
     const textEncoder = new TextEncoder();
 
+    const code = `const takesString = (x: string) => {};
+
+// you should see an error marker in the next line
+takesString(0);`;
+
     const options: IFileWriteOptions = {
         atomic: false,
         unlock: false,
@@ -52,17 +64,12 @@ export const setupLangiumClientExtended = async (): Promise<ExampleAppConfig> =>
     await fileSystemProvider.mkdir(workspaceUri);
     await fileSystemProvider.writeFile(langiumGrammarLangiumUri, textEncoder.encode(exampleLangium), options);
     await fileSystemProvider.writeFile(langiumTypesLangiumUri, textEncoder.encode(langiumTypesLangium), options);
+    await fileSystemProvider.writeFile(tsCodeUri, textEncoder.encode(code), options);
     registerFileSystemOverlay(1, fileSystemProvider);
 
     const editorAppConfig: EditorAppConfig = {};
-
-    const workerFile = '/workers/langium-server.js';
-    const worker = new Worker(workerFile, {
-        type: 'module',
-        name: 'Langium LS',
-    });
-    const reader = new BrowserMessageReader(worker);
-    const writer = new BrowserMessageWriter(worker);
+    const reader = new BrowserMessageReader(languageServerWorker);
+    const writer = new BrowserMessageWriter(languageServerWorker);
 
     const innerHtml = `<div id="editorsDiv">
     <div id="editors"></div>
@@ -88,13 +95,10 @@ export const setupLangiumClientExtended = async (): Promise<ExampleAppConfig> =>
         $type: overallConfigType,
         logLevel: LogLevel.Debug,
         advanced: {
-            enableExtHostWorker: true
+            enableExtHostWorker
         },
         serviceOverrides: {
-            ...getKeybindingsServiceOverride(),
-            ...getExtensionServiceOverride({
-                enableWorkerExtensionHost: false
-            })
+            ...getKeybindingsServiceOverride()
         },
         viewsConfig: {
             $type: 'ViewsService',
@@ -115,7 +119,7 @@ export const setupLangiumClientExtended = async (): Promise<ExampleAppConfig> =>
                 'vitest.disableWorkspaceWarning': true
             })
         },
-        monacoWorkerFactory: configureDefaultWorkerFactory,
+        monacoWorkerFactory: vscodeApiWorkerFactory,
         extensions: [{
             config: {
                 name: 'langium-example',
@@ -150,15 +154,30 @@ export const setupLangiumClientExtended = async (): Promise<ExampleAppConfig> =>
         connection: {
             options: {
                 $type: 'WorkerDirect',
-                worker
+                worker: languageServerWorker
             },
             messageTransports: { reader, writer }
         }
     };
 
+    const comp = await import('@typefox/monaco-editor-react');
+
     return {
         editorAppConfig,
         vscodeApiConfig,
-        languageClientConfig
+        languageClientConfig,
+        MonacoEditorReactComp: comp.MonacoEditorReactComp
     };
 };
+
+export const openDocument = async (uri: string) => {
+    const { workspace } = (await import('vscode'));
+    await workspace.openTextDocument(uri);
+}
+
+export const showDocument = async (uri: string) => {
+    const { window, Uri } = (await import('vscode'));
+    await window.showTextDocument(Uri.file(uri));
+}
+
+export * as workerFactory from 'monaco-languageclient/workerFactory';

verify/next/app/langium-dsl/config/extendedConfig.ts

@@ -1,5 +1,5 @@
 /* --------------------------------------------------------------------------------------------
- * Copyright (c) 2024 TypeFox and others.
+ * Copyright (c) 2025 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
@@ -10,7 +10,12 @@ export default function RootLayout({
 }) {
     return (
         <html lang="en">
-            <body>{children}</body>
+            <body>
+                {/* <script type="module">
+                    import { helloWorld } from './tester.js';
+                </script> */}
+                {children}
+            </body>
         </html>
     );
 }