@theia/monaco 1.77.0-next.95 → 1.77.0

package/src/browser/monaco-outline-contribution.ts

@@ -21,13 +21,13 @@ import { DisposableCollection, Disposable } from '@theia/core';
 import { OutlineViewService } from '@theia/outline-view/lib/browser/outline-view-service';
 import { OutlineSymbolInformationNode } from '@theia/outline-view/lib/browser/outline-view-widget';
 import URI from '@theia/core/lib/common/uri';
-import { MonacoEditor } from './monaco-editor';
-import debounce = require('@theia/core/shared/lodash.debounce');
+import { MonacoEditor } from './monaco-editor.js';
+import debounce from '@theia/core/shared/lodash.debounce';
 import * as monaco from '@theia/monaco-editor-core';
-import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
-import { DocumentSymbol } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
+import { ILanguageFeaturesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/languageFeatures.js';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model.js';
+import { DocumentSymbol } from '@theia/monaco-editor-core/esm/vs/editor/common/languages.js';
 
 @injectable()
 export class MonacoOutlineContribution implements FrontendApplicationContribution {

package/src/browser/monaco-outline-decorator.spec.ts

@@ -20,7 +20,7 @@ import URI from '@theia/core/lib/common/uri';
 import type { CompositeTreeNode, Tree } from '@theia/core/lib/browser/tree';
 import type { TreeDecoration } from '@theia/core/lib/browser/tree/tree-decorator';
 import type * as monaco from '@theia/monaco-editor-core';
-import type { MonacoOutlineSymbolInformationNode } from './monaco-outline-contribution';
+import type { MonacoOutlineSymbolInformationNode } from './monaco-outline-contribution.js';
 
 describe('MonacoOutlineDecorator', () => {
 
@@ -28,8 +28,8 @@ describe('MonacoOutlineDecorator', () => {
     // the spec files are collected registers monaco's editor contributions before monaco-init.spec initializes
     // the standalone services, which then need browser APIs that JSDOM does not provide.
     let monacoApi: typeof monaco;
-    let outline: typeof import('./monaco-outline-contribution');
-    let decorator: typeof import('./monaco-outline-decorator');
+    let outline: typeof import('./monaco-outline-contribution.js');
+    let decorator: typeof import('./monaco-outline-decorator.js');
     let disableJSDOM: () => void;
 
     before(async () => {
@@ -42,8 +42,8 @@ describe('MonacoOutlineDecorator', () => {
             (global as any).DragEvent = class DragEvent extends (global as any).Event { };
         }
         monacoApi = await import('@theia/monaco-editor-core');
-        outline = await import('./monaco-outline-contribution');
-        decorator = await import('./monaco-outline-decorator');
+        outline = await import('./monaco-outline-contribution.js');
+        decorator = await import('./monaco-outline-decorator.js');
     });
     after(() => disableJSDOM());
 

package/src/browser/monaco-outline-decorator.ts

@@ -19,7 +19,7 @@ import { Event, Emitter } from '@theia/core/lib/common/event';
 import { Tree } from '@theia/core/lib/browser/tree/tree';
 import { DepthFirstTreeIterator } from '@theia/core/lib/browser/tree/tree-iterator';
 import { TreeDecorator, TreeDecoration } from '@theia/core/lib/browser/tree/tree-decorator';
-import { MonacoOutlineSymbolInformationNode } from './monaco-outline-contribution';
+import { MonacoOutlineSymbolInformationNode } from './monaco-outline-contribution.js';
 
 @injectable()
 export class MonacoOutlineDecorator implements TreeDecorator {

package/src/browser/monaco-quick-access-registry.ts

@@ -18,10 +18,10 @@ import { KeybindingRegistry, QuickPickItem, QuickPickSeparator } from '@theia/co
 import { QuickAccessProviderDescriptor, QuickAccessRegistry } from '@theia/core/lib/browser/quick-input/quick-access';
 import { CancellationToken, Disposable } from '@theia/core/lib/common';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { MonacoQuickPickItem } from './monaco-quick-input-service';
+import { MonacoQuickPickItem } from './monaco-quick-input-service.js';
 import {
     IPickerQuickAccessProviderOptions, PickerQuickAccessProvider, Picks, Pick, IPickerQuickAccessItem
-} from '@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/pickerQuickAccess';
+} from '@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/pickerQuickAccess.js';
 import {
     Extensions,
     IQuickAccessProvider,
@@ -29,9 +29,9 @@ import {
     IQuickAccessProviderHelp,
     IQuickAccessRegistry,
     QuickAccessRegistry as VSCodeQuickAccessRegistry,
-} from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess';
-import { IQuickPickItem, IQuickPickItemWithResource } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickInput';
-import { Registry } from '@theia/monaco-editor-core/esm/vs/platform/registry/common/platform';
+} from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess.js';
+import { IQuickPickItem, IQuickPickItemWithResource } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickInput.js';
+import { Registry } from '@theia/monaco-editor-core/esm/vs/platform/registry/common/platform.js';
 
 interface IAnythingQuickPickItem extends IPickerQuickAccessItem, IQuickPickItemWithResource { }
 

package/src/browser/monaco-quick-input-service.spec.ts

@@ -26,8 +26,8 @@ if (!(global as any).DragEvent) {
 }
 
 import { expect } from 'chai';
-import { getColorRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
-import { MonacoQuickInputImplementation } from './monaco-quick-input-service';
+import { getColorRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry.js';
+import { MonacoQuickInputImplementation } from './monaco-quick-input-service.js';
 
 disableJSDOM();
 

package/src/browser/monaco-quick-input-service.ts

@@ -25,32 +25,37 @@ import {
     IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton,
     IQuickInputService, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickPickItemButtonEvent,
     IQuickPickSeparator, IQuickTree, IQuickTreeItem, IQuickWidget, QuickPickInput
-} from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickInput';
-import { IQuickInputOptions, IQuickInputStyles } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/quickInput';
-import { QuickInputController } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/quickInputController';
-import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding';
-import { IQuickAccessController } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess';
-import { QuickAccessController } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/quickAccess';
-import { IContextKey, IContextKeyService, IScopedContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
+} from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickInput.js';
+import { IQuickInputOptions, IQuickInputStyles } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/quickInput.js';
+import { QuickInputController } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/quickInputController.js';
+import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding.js';
+import { IQuickAccessController } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess.js';
+import { QuickAccessController } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/quickAccess.js';
+import { IContextKey, IContextKeyService, IScopedContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey.js';
 import * as monaco from '@theia/monaco-editor-core';
-import { ResolvedKeybinding } from '@theia/monaco-editor-core/esm/vs/base/common/keybindings';
-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 { IMatch } from '@theia/monaco-editor-core/esm/vs/base/common/filters';
+import { ResolvedKeybinding } from '@theia/monaco-editor-core/esm/vs/base/common/keybindings.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 { IMatch } from '@theia/monaco-editor-core/esm/vs/base/common/filters.js';
 import { CancellationToken, Event } from '@theia/core';
-import { MonacoColorRegistry } from './monaco-color-registry';
+import { MonacoColorRegistry } from './monaco-color-registry.js';
 import { ThemeService } from '@theia/core/lib/browser/theming';
-import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
-import { ILayoutService } from '@theia/monaco-editor-core/esm/vs/platform/layout/browser/layoutService';
-import { IHoverDelegate, IHoverDelegateOptions } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/hover/hoverDelegate';
-import { IHoverWidget } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/hover/hover';
-import MonacoSeverity from '@theia/monaco-editor-core/esm/vs/base/common/severity';
+import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme.js';
+import { ILayoutService } from '@theia/monaco-editor-core/esm/vs/platform/layout/browser/layoutService.js';
+import { IHoverDelegate, IHoverDelegateOptions } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/hover/hoverDelegate.js';
+import { IHoverWidget } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/hover/hover.js';
+import MonacoSeverityModule from '@theia/monaco-editor-core/esm/vs/base/common/severity.js';
 import { Severity } from '@theia/core/lib/common/severity';
-import { IStorageService } from '@theia/monaco-editor-core/esm/vs/platform/storage/common/storage';
-import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView';
+import { IStorageService } from '@theia/monaco-editor-core/esm/vs/platform/storage/common/storage.js';
+import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView.js';
 import { WindowFocusService } from '@theia/core/lib/browser/window/window-focus-service';
 import { SecondaryWindowService } from '@theia/core/lib/browser/window/secondary-window-service';
 
+// `@theia/monaco-editor-core` ships ES modules without declaring `"type": "module"`, so the compiler assumes CommonJS semantics
+// for their default exports. At runtime, the default export is the `Severity` enum.
+const MonacoSeverity = MonacoSeverityModule as unknown as typeof MonacoSeverityModule.default;
+type MonacoSeverity = MonacoSeverityModule.default;
+
 /**
  * Converts Theia's {@link Severity} to Monaco's {@link MonacoSeverity}.
  *

package/src/browser/monaco-resolved-keybinding.ts

@@ -14,18 +14,18 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { KeyCode as MonacoKeyCode } from '@theia/monaco-editor-core/esm/vs/base/common/keyCodes';
+import { KeyCode as MonacoKeyCode } from '@theia/monaco-editor-core/esm/vs/base/common/keyCodes.js';
 import {
     ResolvedKeybinding, ResolvedChord, SingleModifierChord, KeyCodeChord, Chord
-} from '@theia/monaco-editor-core/esm/vs/base/common/keybindings';
-import { ElectronAcceleratorLabelProvider, UILabelProvider, UserSettingsLabelProvider } from '@theia/monaco-editor-core/esm/vs/base/common/keybindingLabels';
-import { USLayoutResolvedKeybinding } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import * as MonacoPlatform from '@theia/monaco-editor-core/esm/vs/base/common/platform';
+} from '@theia/monaco-editor-core/esm/vs/base/common/keybindings.js';
+import { ElectronAcceleratorLabelProvider, UILabelProvider, UserSettingsLabelProvider } from '@theia/monaco-editor-core/esm/vs/base/common/keybindingLabels.js';
+import { USLayoutResolvedKeybinding } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/usLayoutResolvedKeybinding.js';
+import * as MonacoPlatform from '@theia/monaco-editor-core/esm/vs/base/common/platform.js';
 import { KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
 import { KeyCode, KeySequence, Keystroke, Key, KeyModifier } from '@theia/core/lib/browser/keys';
 import { layoutModifiersIncludeShift } from '@theia/core/lib/common/keys';
 import { isOSX } from '@theia/core/lib/common/os';
-import { KEY_CODE_MAP } from './monaco-keycode-map';
+import { KEY_CODE_MAP } from './monaco-keycode-map.js';
 
 export class MonacoResolvedKeybinding extends ResolvedKeybinding {
 

package/src/browser/monaco-snippet-suggest-provider.ts

@@ -25,7 +25,7 @@ import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposa
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileOperationError } from '@theia/filesystem/lib/common/files';
 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';
 import { isObject } from '@theia/core/lib/common';
 import { ILogger } from '@theia/core';
 

package/src/browser/monaco-standalone-theme-service.ts

@@ -15,8 +15,8 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
-import { StandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneThemeService';
+import { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle.js';
+import { StandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneThemeService.js';
 
 export class MonacoStandaloneThemeService extends StandaloneThemeService {
     protected get styleElements(): HTMLStyleElement[] {

package/src/browser/monaco-status-bar-contribution.ts

@@ -18,7 +18,7 @@ import { injectable } from '@theia/core/shared/inversify';
 import { DisposableCollection, nls } from '@theia/core';
 import { StatusBar, StatusBarAlignment, Widget, WidgetStatusBarContribution } from '@theia/core/lib/browser';
 import { EditorCommands, EditorWidget } from '@theia/editor/lib/browser';
-import { MonacoEditor } from './monaco-editor';
+import { MonacoEditor } from './monaco-editor.js';
 import * as monaco from '@theia/monaco-editor-core';
 
 export const EDITOR_STATUS_TABBING_CONFIG = 'editor-status-tabbing-config';

package/src/browser/monaco-text-model-service.ts

@@ -18,17 +18,17 @@ import { inject, injectable, named, postConstruct } from '@theia/core/shared/inv
 import URI from '@theia/core/lib/common/uri';
 import { ResourceProvider, ReferenceCollection, Event, MaybePromise, Resource, ContributionProvider, OS, Emitter } from '@theia/core';
 import { EditorPreferences, EditorPreferenceChange } from '@theia/editor/lib/common/editor-preferences';
-import { MonacoEditorModel } from './monaco-editor-model';
-import { IDisposable, IReference } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
-import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
-import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
+import { MonacoEditorModel } from './monaco-editor-model.js';
+import { IDisposable, IReference } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle.js';
+import { MonacoToProtocolConverter } from './monaco-to-protocol-converter.js';
+import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter.js';
 import { ILogger } from '@theia/core/lib/common/logger';
 import * as monaco from '@theia/monaco-editor-core';
-import { ITextModelService, ITextModelContentProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService';
-import { ITextModelUpdateOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
+import { ITextModelService, ITextModelContentProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService.js';
+import { ITextModelUpdateOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/model.js';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { ITextResourcePropertiesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/textResourceConfiguration';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js';
+import { ITextResourcePropertiesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/textResourceConfiguration.js';
 
 export const MonacoEditorModelFactory = Symbol('MonacoEditorModelFactory');
 export interface MonacoEditorModelFactory {

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/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';