@theia/monaco 1.77.0-next.0 → 1.77.0-next.101

package/src/browser/monaco-theming-service.ts

@@ -21,8 +21,8 @@ import * as jsoncparser from 'jsonc-parser';
 import * as plistparser from 'fast-plist';
 import URI from '@theia/core/lib/common/uri';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
-import { MonacoThemeRegistry } from './textmate/monaco-theme-registry';
-import { getThemes, putTheme, MonacoThemeState, stateToTheme, ThemeServiceWithDB } from './monaco-indexed-db';
+import { MonacoThemeRegistry } from './textmate/monaco-theme-registry.js';
+import { getThemes, putTheme, MonacoThemeState, stateToTheme, ThemeServiceWithDB } from './monaco-indexed-db.js';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import * as monaco from '@theia/monaco-editor-core';
 import { ILogger } from '@theia/core';

package/src/browser/monaco-undo-redo-handler.ts

@@ -16,9 +16,9 @@
 
 import { UndoRedoHandler } from '@theia/core/lib/browser';
 import { injectable } from '@theia/core/shared/inversify';
-import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService.js';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
 
 @injectable()
 export abstract class AbstractMonacoUndoRedoHandler implements UndoRedoHandler<ICodeEditor> {

package/src/browser/monaco-utilities.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { MonacoEditorModel } from './monaco-editor-model';
+import { MonacoEditorModel } from './monaco-editor-model.js';
 
 export function insertFinalNewline(editorModel: MonacoEditorModel): void {
     const model = editorModel.textEditorModel;

package/src/browser/monaco-workspace-context-service.ts

@@ -15,8 +15,8 @@
 // *****************************************************************************
 
 import { injectable } from '@theia/core/shared/inversify';
-import { Emitter } from '@theia/monaco-editor-core/esm/vs/base/common/event';
-import { URI } from '@theia/monaco-editor-core/esm/vs/base/common/uri';
+import { Emitter } from '@theia/monaco-editor-core/esm/vs/base/common/event.js';
+import { URI } from '@theia/monaco-editor-core/esm/vs/base/common/uri.js';
 import {
     ISingleFolderWorkspaceIdentifier,
     IWorkspace,
@@ -27,7 +27,7 @@ import {
     IWorkspaceIdentifier,
     UNKNOWN_EMPTY_WINDOW_WORKSPACE,
     WorkbenchState
-} from '@theia/monaco-editor-core/esm/vs/platform/workspace/common/workspace';
+} from '@theia/monaco-editor-core/esm/vs/platform/workspace/common/workspace.js';
 
 /**
  * A minimal implementation of {@link IWorkspaceContextService} to replace the `StandaloneWorkspaceContextService` in Monaco

package/src/browser/monaco-workspace.ts

@@ -23,9 +23,9 @@ import { Emitter } from '@theia/core/lib/common/event';
 import { ILogger } from '@theia/core';
 import { FileSystemPreferences } from '@theia/filesystem/lib/common';
 import { EditorManager } from '@theia/editor/lib/browser';
-import { MonacoTextModelService } from './monaco-text-model-service';
-import { MonacoEditorModel, MonacoModelContentChangedEvent } from './monaco-editor-model';
-import { MonacoEditor } from './monaco-editor';
+import { MonacoTextModelService } from './monaco-text-model-service.js';
+import { MonacoEditorModel, MonacoModelContentChangedEvent } from './monaco-editor-model.js';
+import { MonacoEditor } from './monaco-editor.js';
 import { ProblemManager } from '@theia/markers/lib/browser';
 import { ArrayUtils } from '@theia/core/lib/common/types';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
@@ -35,13 +35,13 @@ import {
     IBulkEditOptions,
     IBulkEditResult, ResourceEdit, ResourceFileEdit as MonacoResourceFileEdit,
     ResourceTextEdit as MonacoResourceTextEdit
-} from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
-import { IEditorWorkerService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/editorWorker';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { EndOfLineSequence } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
-import { SnippetParser } from '@theia/monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetParser';
-import { TextEdit } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
-import { SnippetController2 } from '@theia/monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetController2';
+} from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService.js';
+import { IEditorWorkerService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/editorWorker.js';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { EndOfLineSequence } from '@theia/monaco-editor-core/esm/vs/editor/common/model.js';
+import { SnippetParser } from '@theia/monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetParser.js';
+import { TextEdit } from '@theia/monaco-editor-core/esm/vs/editor/common/languages.js';
+import { SnippetController2 } from '@theia/monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetController2.js';
 import { isObject, MaybePromise, nls } from '@theia/core/lib/common';
 import { SaveableService } from '@theia/core/lib/browser';
 import { EditorPreferences } from '@theia/editor/lib/common/editor-preferences';

package/src/browser/simple-monaco-editor.ts

@@ -14,19 +14,19 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './monaco-editor';
-import { CodeEditorWidget, ICodeEditorWidgetOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection';
+import { EditorServiceOverrides, MonacoEditor, MonacoEditorServices } from './monaco-editor.js';
+import { CodeEditorWidget, ICodeEditorWidgetOptions } from '@theia/monaco-editor-core/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation.js';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { ServiceCollection } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/serviceCollection.js';
 import { Disposable, DisposableCollection, Emitter, Event, TextDocumentContentChangeDelta, URI } from '@theia/core';
-import { MonacoEditorModel } from './monaco-editor-model';
+import { MonacoEditorModel } from './monaco-editor-model.js';
 import { Dimension, EditorMouseEvent, MouseTarget, Position, TextDocumentChangeEvent } from '@theia/editor/lib/browser';
 import * as monaco from '@theia/monaco-editor-core';
 import { ElementExt } from '@theia/core/shared/@lumino/domutils';
 import { Selection } from '@theia/editor/lib/browser/editor';
-import { SelectionDirection } from '@theia/monaco-editor-core/esm/vs/editor/common/core/selection';
-import { ShowLightbulbIconMode } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
+import { SelectionDirection } from '@theia/monaco-editor-core/esm/vs/editor/common/core/selection.js';
+import { ShowLightbulbIconMode } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions.js';
 
 export class SimpleMonacoEditor extends MonacoEditorServices implements Disposable {
 

package/src/browser/style/index.css

@@ -309,13 +309,9 @@
   min-width: max-content;
 }
 
-/* Editor hover widget and overlay messages.
-   Alias --vscode- to --theia- for git blame hover addition/deletion colors
-   since the git extension uses --vscode- prefixed variables in inline styles. */
+/* Editor hover widget and overlay messages. */
 .monaco-editor .monaco-hover {
   font-family: var(--theia-ui-font-family);
-  --vscode-scmGraph-historyItemHoverAdditionsForeground: var(--theia-scmGraph-historyItemHoverAdditionsForeground);
-  --vscode-scmGraph-historyItemHoverDeletionsForeground: var(--theia-scmGraph-historyItemHoverDeletionsForeground);
 }
 
 .monaco-editor .monaco-hover p {

package/src/browser/textmate/index.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-export * from './textmate-registry';
-export * from './textmate-contribution';
-export * from './monaco-textmate-service';
-export * from './monaco-textmate-frontend-bindings';
+export * from './textmate-registry.js';
+export * from './textmate-contribution.js';
+export * from './monaco-textmate-service.js';
+export * from './monaco-textmate-frontend-bindings.js';

package/src/browser/textmate/monaco-textmate-frontend-bindings.ts

@@ -17,20 +17,21 @@
 import { interfaces } from '@theia/core/shared/inversify';
 import { FrontendApplicationContribution, isBasicWasmSupported } from '@theia/core/lib/browser';
 import { bindRootContributionProvider } from '@theia/core';
-import { TextmateRegistry } from './textmate-registry';
-import { LanguageGrammarDefinitionContribution } from './textmate-contribution';
-import { MonacoTextmateService } from './monaco-textmate-service';
-import { MonacoThemeRegistry } from './monaco-theme-registry';
-import { loadWASM, createOnigScanner, OnigScanner, createOnigString, OnigString } from 'vscode-oniguruma';
-import { IOnigLib, IRawGrammar, parseRawGrammar, Registry } from 'vscode-textmate';
-import { OnigasmProvider, TextmateRegistryFactory, ThemeMix } from './monaco-theme-types';
+import { TextmateRegistry } from './textmate-registry.js';
+import { LanguageGrammarDefinitionContribution } from './textmate-contribution.js';
+import { MonacoTextmateService } from './monaco-textmate-service.js';
+import { MonacoThemeRegistry } from './monaco-theme-registry.js';
+// CommonJS modules whose exports cannot be detected statically, so they are imported as a whole.
+import vscodeOniguruma, { type OnigScanner, type OnigString } from 'vscode-oniguruma';
+import vscodeTextmate, { type IOnigLib, type IRawGrammar } from 'vscode-textmate';
+import { OnigasmProvider, TextmateRegistryFactory, ThemeMix } from './monaco-theme-types.js';
 
 export class OnigasmLib implements IOnigLib {
     createOnigScanner(sources: string[]): OnigScanner {
-        return createOnigScanner(sources);
+        return vscodeOniguruma.createOnigScanner(sources);
     }
     createOnigString(sources: string): OnigString {
-        return createOnigString(sources);
+        return vscodeOniguruma.createOnigString(sources);
     }
 }
 
@@ -45,7 +46,7 @@ export default (bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: inter
     bind(TextmateRegistryFactory).toFactory(({ container }) => (theme?: ThemeMix) => {
         const onigProvider = container.get<OnigasmProvider>(OnigasmProvider);
         const textmateRegistry = container.get(TextmateRegistry);
-        return new Registry({
+        return new vscodeTextmate.Registry({
             onigLib: onigProvider(),
             theme,
             loadGrammar: async (scopeName: string) => {
@@ -54,7 +55,7 @@ export default (bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: inter
                     const definition = await provider.getGrammarDefinition();
                     let rawGrammar: IRawGrammar;
                     if (typeof definition.content === 'string') {
-                        rawGrammar = parseRawGrammar(definition.content, definition.format === 'json' ? 'grammar.json' : 'grammar.plist');
+                        rawGrammar = vscodeTextmate.parseRawGrammar(definition.content, definition.format === 'json' ? 'grammar.json' : 'grammar.plist');
                     } else {
                         rawGrammar = definition.content as IRawGrammar;
                     }
@@ -78,13 +79,14 @@ export async function createOnigasmLib(): Promise<IOnigLib> {
         throw new Error('wasm not supported');
     }
     const wasm = await fetchOnigasm();
-    await loadWASM(wasm);
+    await vscodeOniguruma.loadWASM(wasm);
     return new OnigasmLib();
 }
 
 export async function fetchOnigasm(): Promise<ArrayBuffer> {
-    // Using Webpack's wasm loader should give us a URL to fetch the resource from:
-    const onigasmPath: string = require('vscode-oniguruma/release/onig.wasm');
-    const response = await fetch(onigasmPath, { method: 'GET' });
+    // The bundler's loader for `.wasm` files gives us a URL to fetch the resource from.
+    // It is imported when needed, as Node would load it as a WebAssembly module.
+    const { default: onigasmUrl } = await import('vscode-oniguruma/release/onig.wasm');
+    const response = await fetch(onigasmUrl, { method: 'GET' });
     return response.arrayBuffer();
 }

package/src/browser/textmate/monaco-textmate-service.ts

@@ -19,19 +19,19 @@ import { Registry } from 'vscode-textmate';
 import { ILogger, ContributionProvider, DisposableCollection, Disposable } from '@theia/core';
 import { FrontendApplicationContribution, isBasicWasmSupported } from '@theia/core/lib/browser';
 import { ThemeService } from '@theia/core/lib/browser/theming';
-import { LanguageGrammarDefinitionContribution, getEncodedLanguageId } from './textmate-contribution';
-import { createTextmateTokenizer, TokenizerOption } from './textmate-tokenizer';
-import { TextmateRegistry } from './textmate-registry';
-import { MonacoThemeRegistry } from './monaco-theme-registry';
+import { LanguageGrammarDefinitionContribution, getEncodedLanguageId } from './textmate-contribution.js';
+import { createTextmateTokenizer, TokenizerOption } from './textmate-tokenizer.js';
+import { TextmateRegistry } from './textmate-registry.js';
+import { MonacoThemeRegistry } from './monaco-theme-registry.js';
 import { EditorPreferences } from '@theia/editor/lib/common/editor-preferences';
 import * as monaco from '@theia/monaco-editor-core';
-import { TokenizationRegistry } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
-import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
-import { TokenizationSupportAdapter } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneLanguages';
-import { LanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageService';
-import { OnigasmProvider, TextmateRegistryFactory } from './monaco-theme-types';
+import { TokenizationRegistry } from '@theia/monaco-editor-core/esm/vs/editor/common/languages.js';
+import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme.js';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language.js';
+import { TokenizationSupportAdapter } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneLanguages.js';
+import { LanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageService.js';
+import { OnigasmProvider, TextmateRegistryFactory } from './monaco-theme-types.js';
 
 @injectable()
 export class MonacoTextmateService implements FrontendApplicationContribution {

package/src/browser/textmate/monaco-theme-registry.ts

@@ -20,13 +20,23 @@
 import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { IRawTheme } from 'vscode-textmate';
 import * as monaco from '@theia/monaco-editor-core';
-import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { StandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneThemeService';
-import { Color } from '@theia/monaco-editor-core/esm/vs/base/common/color';
-import { MixStandaloneTheme, MonacoThemeColor, TextmateRegistryFactory, ThemeMix } from './monaco-theme-types';
+import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme.js';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { StandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneThemeService.js';
+import { Color } from '@theia/monaco-editor-core/esm/vs/base/common/color.js';
+import { MixStandaloneTheme, MonacoThemeColor, TextmateRegistryFactory, ThemeMix } from './monaco-theme-types.js';
 import { ILogger } from '@theia/core';
 import { ThemeType } from '@theia/core/lib/common/theme';
+import darkPlusTheme from '../../../data/monaco-themes/vscode/dark_plus.json' with { type: 'json' };
+import darkTheiaTheme from '../../../data/monaco-themes/vscode/dark_theia.json' with { type: 'json' };
+import darkVsTheme from '../../../data/monaco-themes/vscode/dark_vs.json' with { type: 'json' };
+import hcBlackTheme from '../../../data/monaco-themes/vscode/hc_black.json' with { type: 'json' };
+import hcLightTheme from '../../../data/monaco-themes/vscode/hc_light.json' with { type: 'json' };
+import hcTheiaTheme from '../../../data/monaco-themes/vscode/hc_theia.json' with { type: 'json' };
+import hcTheiaLightTheme from '../../../data/monaco-themes/vscode/hc_theia_light.json' with { type: 'json' };
+import lightPlusTheme from '../../../data/monaco-themes/vscode/light_plus.json' with { type: 'json' };
+import lightTheiaTheme from '../../../data/monaco-themes/vscode/light_theia.json' with { type: 'json' };
+import lightVsTheme from '../../../data/monaco-themes/vscode/light_vs.json' with { type: 'json' };
 
 @injectable()
 export class MonacoThemeRegistry {
@@ -37,19 +47,19 @@ export class MonacoThemeRegistry {
     protected readonly logger: ILogger;
 
     initializeDefaultThemes(): void {
-        this.register(require('../../../data/monaco-themes/vscode/dark_theia.json'), {
-            './dark_vs.json': require('../../../data/monaco-themes/vscode/dark_vs.json'),
-            './dark_plus.json': require('../../../data/monaco-themes/vscode/dark_plus.json')
+        this.register(darkTheiaTheme, {
+            './dark_vs.json': darkVsTheme,
+            './dark_plus.json': darkPlusTheme
         }, 'dark-theia', 'vs-dark');
-        this.register(require('../../../data/monaco-themes/vscode/light_theia.json'), {
-            './light_vs.json': require('../../../data/monaco-themes/vscode/light_vs.json'),
-            './light_plus.json': require('../../../data/monaco-themes/vscode/light_plus.json'),
+        this.register(lightTheiaTheme, {
+            './light_vs.json': lightVsTheme,
+            './light_plus.json': lightPlusTheme,
         }, 'light-theia', 'vs');
-        this.register(require('../../../data/monaco-themes/vscode/hc_theia.json'), {
-            './hc_black.json': require('../../../data/monaco-themes/vscode/hc_black.json')
+        this.register(hcTheiaTheme, {
+            './hc_black.json': hcBlackTheme
         }, 'hc-theia', 'hc-black');
-        this.register(require('../../../data/monaco-themes/vscode/hc_theia_light.json'), {
-            './hc_light.json': require('../../../data/monaco-themes/vscode/hc_light.json')
+        this.register(hcTheiaLightTheme, {
+            './hc_light.json': hcLightTheme
         }, 'hc-theia-light', 'hc-light');
     }
 

package/src/browser/textmate/monaco-theme-types.spec.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { expect } from 'chai';
-import { MonacoThemeColor } from './monaco-theme-types';
+import { MonacoThemeColor } from './monaco-theme-types.js';
 
 describe('MonacoThemeColor', () => {
 

package/src/browser/textmate/monaco-theme-types.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import * as monaco from '@theia/monaco-editor-core';
-import { IStandaloneTheme } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
+import { IStandaloneTheme } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme.js';
 import { IOnigLib, IRawTheme, Registry } from 'vscode-textmate';
 
 export interface ThemeMix extends IRawTheme, monaco.editor.IStandaloneThemeData { }

package/src/browser/textmate/textmate-contribution.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { TextmateRegistry } from './textmate-registry';
+import { TextmateRegistry } from './textmate-registry.js';
 import * as monaco from '@theia/monaco-editor-core';
 
 /**

package/src/browser/textmate/textmate-registry.ts

@@ -16,7 +16,7 @@
 
 import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { IGrammarConfiguration } from 'vscode-textmate';
-import { TokenizerOption } from './textmate-tokenizer';
+import { TokenizerOption } from './textmate-tokenizer.js';
 import { Disposable } from '@theia/core/lib/common/disposable';
 import { ILogger } from '@theia/core';
 

package/src/browser/textmate/textmate-snippet-completion-provider.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import * as monaco from '@theia/monaco-editor-core';
-import { SnippetParser } from '@theia/monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetParser';
+import { SnippetParser } from '@theia/monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetParser.js';
 
 /**
  * @deprecated use MonacoSnippetSuggestProvider instead

package/src/browser/textmate/textmate-tokenizer.spec.ts

@@ -16,7 +16,7 @@
 
 import { expect } from 'chai';
 import { IGrammar, StateStack } from 'vscode-textmate';
-import { createTextmateTokenizer, TokenizerState } from './textmate-tokenizer';
+import { createTextmateTokenizer, TokenizerState } from './textmate-tokenizer.js';
 
 describe('createTextmateTokenizer', () => {
 

package/src/browser/textmate/textmate-tokenizer.ts

@@ -14,7 +14,8 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { INITIAL, IGrammar, StateStack } from 'vscode-textmate';
+// A CommonJS module whose exports cannot be detected statically, so it is imported as a whole.
+import vscodeTextmate, { type IGrammar, type StateStack } from 'vscode-textmate';
 import * as monaco from '@theia/monaco-editor-core';
 
 export class TokenizerState implements monaco.languages.IState {
@@ -55,7 +56,7 @@ export function createTextmateTokenizer(grammar: IGrammar, options: TokenizerOpt
         throw new Error(`The 'lineLimit' must be a positive integer. It was ${options.lineLimit}.`);
     }
     return {
-        getInitialState: () => new TokenizerState(INITIAL),
+        getInitialState: () => new TokenizerState(vscodeTextmate.INITIAL),
         tokenizeEncoded(line: string, state: TokenizerState): monaco.languages.IEncodedLineTokens {
             if (options.lineLimit !== undefined && line.length > options.lineLimit) {
                 // Skip tokenizing the line if it exceeds the line limit. The state must be

package/src/browser/workspace-symbol-command.ts

@@ -23,7 +23,7 @@ import {
     CommandContribution, MenuContribution, MenuModelRegistry, nls
 } from '@theia/core/lib/common';
 import { Range, Position, SymbolInformation, WorkspaceSymbolParams } from '@theia/core/shared/vscode-languageserver-protocol';
-import { MonacoLanguages, WorkspaceSymbolProvider } from './monaco-languages';
+import { MonacoLanguages, WorkspaceSymbolProvider } from './monaco-languages.js';
 import URI from '@theia/core/lib/common/uri';
 import { EditorMainMenu } from '@theia/editor/lib/browser';
 

package/src/typings/wasm.d.ts

@@ -0,0 +1,21 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+declare module '*.wasm' {
+    /** The URL of the WebAssembly module, as provided by the bundler. */
+    const url: string;
+    export default url;
+}