@theia/terminal 1.77.0-next.95 → 1.77.0

package/src/browser/terminal-frontend-contribution.ts

@@ -39,12 +39,14 @@ import {
 } from '@theia/core/lib/browser';
 import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
 import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { TERMINAL_WIDGET_FACTORY_ID, TerminalWidgetFactoryOptions, TerminalWidgetImpl, nextTerminalCreationToken } from './terminal-widget-impl';
-import { TerminalService } from './base/terminal-service';
-import { TerminalWidgetOptions, TerminalWidget } from './base/terminal-widget';
-import { ContributedTerminalProfileStore, NULL_PROFILE, TerminalProfile, TerminalProfileService, TerminalProfileStore, UserTerminalProfileStore } from './terminal-profile-service';
+import { TERMINAL_WIDGET_FACTORY_ID, TerminalWidgetFactoryOptions, TerminalWidgetImpl, nextTerminalCreationToken } from './terminal-widget-impl.js';
+import { TerminalService } from './base/terminal-service.js';
+import { TerminalWidgetOptions, TerminalWidget } from './base/terminal-widget.js';
+import {
+    ContributedTerminalProfileStore, NULL_PROFILE, TerminalProfile, TerminalProfileService, TerminalProfileStore, UserTerminalProfileStore
+} from './terminal-profile-service.js';
 import { UriAwareCommandHandler } from '@theia/core/lib/common/uri-command-handler';
-import { ShellTerminalServerProxy } from '../common/shell-terminal-protocol';
+import { ShellTerminalServerProxy } from '../common/shell-terminal-protocol.js';
 import URI from '@theia/core/lib/common/uri';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
@@ -52,15 +54,15 @@ import { ColorContribution } from '@theia/core/lib/browser/color-application-con
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileStat } from '@theia/filesystem/lib/common/files';
-import { TerminalCopyOnSelectionHandler } from './terminal-copy-on-selection-handler';
-import { TerminalWatcher } from '../common/terminal-watcher';
+import { TerminalCopyOnSelectionHandler } from './terminal-copy-on-selection-handler.js';
+import { TerminalWatcher } from '../common/terminal-watcher.js';
 import { nls } from '@theia/core/lib/common/nls';
-import { Profiles, terminalAnsiColorMap, TerminalPreferences } from '../common/terminal-preferences';
-import { ShellTerminalProfile } from './shell-terminal-profile';
+import { Profiles, terminalAnsiColorMap, TerminalPreferences } from '../common/terminal-preferences.js';
+import { ShellTerminalProfile } from './shell-terminal-profile.js';
 import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
 import { Color } from '@theia/core/lib/common/color';
 import { ContributionProvider, ILogger } from '@theia/core';
-import { TerminalCreationHandler } from './terminal-creation-handler';
+import { TerminalCreationHandler } from './terminal-creation-handler.js';
 
 export namespace TerminalMenus {
     export const TERMINAL = [...MAIN_MENU_BAR, '7_terminal'];

package/src/browser/terminal-frontend-module.ts

@@ -22,35 +22,35 @@ import { CommandContribution, MenuContribution, nls } from '@theia/core/lib/comm
 import { bindRootContributionProvider } from '@theia/core';
 import { KeybindingContribution, WebSocketConnectionProvider, WidgetFactory, FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { TerminalFrontendContribution } from './terminal-frontend-contribution';
-import { TerminalSecondaryWindowCloseContribution } from './terminal-secondary-window-close-contribution';
+import { TerminalFrontendContribution } from './terminal-frontend-contribution.js';
+import { TerminalSecondaryWindowCloseContribution } from './terminal-secondary-window-close-contribution.js';
 import { SecondaryWindowCloseContribution } from '@theia/core/lib/browser/window/secondary-window-close-contribution';
-import { TerminalWidgetImpl, TERMINAL_WIDGET_FACTORY_ID } from './terminal-widget-impl';
-import { TerminalWidget, TerminalWidgetOptions } from './base/terminal-widget';
-import { ITerminalServer, terminalPath } from '../common/terminal-protocol';
-import { TerminalWatcher } from '../common/terminal-watcher';
-import { IShellTerminalServer, shellTerminalPath, ShellTerminalServerProxy } from '../common/shell-terminal-protocol';
-import { TerminalService } from './base/terminal-service';
-import { bindTerminalPreferences } from '../common/terminal-preferences';
-import { TerminalContribution } from './terminal-contribution';
-import { TerminalCreationHandler } from './terminal-creation-handler';
-import { TerminalShellHandler } from './terminal-shell-handler';
-import { TerminalSearchWidgetFactory } from './search/terminal-search-widget';
-import { TerminalQuickOpenService, TerminalQuickOpenContribution } from './terminal-quick-open-service';
-import { createTerminalSearchFactory } from './search/terminal-search-container';
-import { TerminalCopyOnSelectionHandler } from './terminal-copy-on-selection-handler';
+import { TerminalWidgetImpl, TERMINAL_WIDGET_FACTORY_ID } from './terminal-widget-impl.js';
+import { TerminalWidget, TerminalWidgetOptions } from './base/terminal-widget.js';
+import { ITerminalServer, terminalPath } from '../common/terminal-protocol.js';
+import { TerminalWatcher } from '../common/terminal-watcher.js';
+import { IShellTerminalServer, shellTerminalPath, ShellTerminalServerProxy } from '../common/shell-terminal-protocol.js';
+import { TerminalService } from './base/terminal-service.js';
+import { bindTerminalPreferences } from '../common/terminal-preferences.js';
+import { TerminalContribution } from './terminal-contribution.js';
+import { TerminalCreationHandler } from './terminal-creation-handler.js';
+import { TerminalShellHandler } from './terminal-shell-handler.js';
+import { TerminalSearchWidgetFactory } from './search/terminal-search-widget.js';
+import { TerminalQuickOpenService, TerminalQuickOpenContribution } from './terminal-quick-open-service.js';
+import { createTerminalSearchFactory } from './search/terminal-search-container.js';
+import { TerminalCopyOnSelectionHandler } from './terminal-copy-on-selection-handler.js';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
-import { TerminalThemeService } from './terminal-theme-service';
+import { TerminalThemeService } from './terminal-theme-service.js';
 import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
-import { createXtermLinkFactory, TerminalLinkProvider, TerminalLinkProviderContribution, XtermLinkFactory } from './terminal-link-provider';
-import { UrlLinkProvider } from './terminal-url-link-provider';
-import { FileDiffPostLinkProvider, FileDiffPreLinkProvider, FileLinkProvider, LocalFileLinkProvider } from './terminal-file-link-provider';
-import { FileUriLinkProvider } from './terminal-file-uri-link-provider';
+import { createXtermLinkFactory, TerminalLinkProvider, TerminalLinkProviderContribution, XtermLinkFactory } from './terminal-link-provider.js';
+import { UrlLinkProvider } from './terminal-url-link-provider.js';
+import { FileDiffPostLinkProvider, FileDiffPreLinkProvider, FileLinkProvider, LocalFileLinkProvider } from './terminal-file-link-provider.js';
+import { FileUriLinkProvider } from './terminal-file-uri-link-provider.js';
 import {
     ContributedTerminalProfileStore, DefaultProfileStore, DefaultTerminalProfileService,
     TerminalProfileService, TerminalProfileStore, UserTerminalProfileStore
-} from './terminal-profile-service';
-import { TerminalCommandHistoryStateFactory, TerminalCommandHistoryStateImpl } from './terminal-command-history';
+} from './terminal-profile-service.js';
+import { TerminalCommandHistoryStateFactory, TerminalCommandHistoryStateImpl } from './terminal-command-history.js';
 
 export default new ContainerModule(bind => {
     bindTerminalPreferences(bind);

package/src/browser/terminal-link-provider.ts

@@ -18,10 +18,10 @@ import { CancellationToken, ContributionProvider, DisposableCollection, disposab
 import { PreferenceService } from '@theia/core/lib/common';
 import { inject, injectable, interfaces, named, postConstruct } from '@theia/core/shared/inversify';
 import { IBufferRange, ILink, ILinkDecorations } from 'xterm';
-import { TerminalWidget } from './base/terminal-widget';
-import { TerminalContribution } from './terminal-contribution';
-import { convertLinkRangeToBuffer, getLinkContext, LinkContext } from './terminal-link-helpers';
-import { TerminalWidgetImpl } from './terminal-widget-impl';
+import { TerminalWidget } from './base/terminal-widget.js';
+import { TerminalContribution } from './terminal-contribution.js';
+import { convertLinkRangeToBuffer, getLinkContext, LinkContext } from './terminal-link-helpers.js';
+import { TerminalWidgetImpl } from './terminal-widget-impl.js';
 
 export const TerminalLinkProvider = Symbol('TerminalLinkProvider');
 export interface TerminalLinkProvider {

package/src/browser/terminal-profile-service.ts

@@ -16,8 +16,8 @@
 
 import { Emitter, Event } from '@theia/core';
 import { injectable, unmanaged } from '@theia/core/shared/inversify';
-import { TerminalWidget } from './base/terminal-widget';
-import { ShellTerminalProfile } from './shell-terminal-profile';
+import { TerminalWidget } from './base/terminal-widget.js';
+import { ShellTerminalProfile } from './shell-terminal-profile.js';
 
 export const TerminalProfileService = Symbol('TerminalProfileService');
 export const ContributedTerminalProfileStore = Symbol('ContributedTerminalProfileStore');

package/src/browser/terminal-quick-open-service.ts

@@ -23,9 +23,9 @@ import {
     QuickInputService
 } from '@theia/core/lib/browser';
 import { CancellationToken, CommandContribution, CommandRegistry, CommandService, nls } from '@theia/core/lib/common';
-import { TerminalWidget } from './base/terminal-widget';
-import { TerminalService } from './base/terminal-service';
-import { TerminalCommands } from './terminal-frontend-contribution';
+import { TerminalWidget } from './base/terminal-widget.js';
+import { TerminalService } from './base/terminal-service.js';
+import { TerminalCommands } from './terminal-frontend-contribution.js';
 import { filterItems, QuickPickItem, QuickPicks } from '@theia/core/lib/browser/quick-input/quick-input-service';
 
 @injectable()

package/src/browser/terminal-secondary-window-close-contribution.ts

@@ -17,8 +17,8 @@
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { Widget } from '@theia/core/lib/browser/widgets';
 import { SecondaryWindowCloseContribution } from '@theia/core/lib/browser/window/secondary-window-close-contribution';
-import { TerminalWidget } from './base/terminal-widget';
-import { TerminalPreferences } from '../common/terminal-preferences';
+import { TerminalWidget } from './base/terminal-widget.js';
+import { TerminalPreferences } from '../common/terminal-preferences.js';
 
 /**
  * Moves terminals back to the main window when their secondary window is closed if closing the application

package/src/browser/terminal-shell-handler.ts

@@ -17,9 +17,9 @@
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { ViewColumn } from '@theia/core/lib/common';
 import { ApplicationShell, WidgetOpenerOptions } from '@theia/core/lib/browser';
-import { TerminalCreationHandler } from './terminal-creation-handler';
-import { TerminalWidget, TerminalLocation } from './base/terminal-widget';
-import { TerminalService } from './base/terminal-service';
+import { TerminalCreationHandler } from './terminal-creation-handler.js';
+import { TerminalWidget, TerminalLocation } from './base/terminal-widget.js';
+import { TerminalService } from './base/terminal-service.js';
 
 /**
  * Default {@link TerminalCreationHandler} that places terminals into the

package/src/browser/terminal-theme-service.spec.ts

@@ -23,7 +23,7 @@ import { Emitter } from '@theia/core';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { ThemeService } from '@theia/core/lib/browser/theming';
 import { Theme, ThemeChangeEvent } from '@theia/core/lib/common/theme';
-import { TerminalThemeService } from './terminal-theme-service';
+import { TerminalThemeService } from './terminal-theme-service.js';
 
 disableJSDOM();
 

package/src/browser/terminal-theme-service.ts

@@ -20,7 +20,7 @@ import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { ThemeService } from '@theia/core/lib/browser/theming';
 import { ThemeChangeEvent } from '@theia/core/lib/common/theme';
 import { Emitter, Event } from '@theia/core';
-import { terminalAnsiColorMap } from '../common/terminal-preferences';
+import { terminalAnsiColorMap } from '../common/terminal-preferences.js';
 
 @injectable()
 export class TerminalThemeService {

package/src/browser/terminal-url-link-provider.ts

@@ -16,8 +16,8 @@
 
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { OpenerService, open } from '@theia/core/lib/browser';
-import { TerminalWidget } from './base/terminal-widget';
-import { TerminalLink, TerminalLinkProvider } from './terminal-link-provider';
+import { TerminalWidget } from './base/terminal-widget.js';
+import { TerminalLink, TerminalLinkProvider } from './terminal-link-provider.js';
 import URI from '@theia/core/lib/common/uri';
 
 @injectable()

package/src/browser/terminal-widget-impl.ts

@@ -14,7 +14,8 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { Terminal, IMarker } from 'xterm';
+// A CommonJS module whose exports cannot be detected statically, so it is imported as a whole.
+import xterm, { type Terminal, type IMarker } from 'xterm';
 import { FitAddon } from 'xterm-addon-fit';
 import { WebglAddon } from 'xterm-addon-webgl';
 import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
@@ -25,37 +26,37 @@ import {
 } from '@theia/core/lib/browser';
 import { isOSX } from '@theia/core/lib/common';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
-import { ShellTerminalServerProxy, IShellTerminalPreferences } from '../common/shell-terminal-protocol';
-import { terminalsPath } from '../common/terminal-protocol';
-import { IBaseTerminalServer, TerminalProcessInfo, TerminalExitReason } from '../common/base-terminal-protocol';
-import { TerminalWatcher } from '../common/terminal-watcher';
+import { ShellTerminalServerProxy, IShellTerminalPreferences } from '../common/shell-terminal-protocol.js';
+import { terminalsPath } from '../common/terminal-protocol.js';
+import { IBaseTerminalServer, TerminalProcessInfo, TerminalExitReason } from '../common/base-terminal-protocol.js';
+import { TerminalWatcher } from '../common/terminal-watcher.js';
 import {
     TerminalWidgetOptions, TerminalWidget, TerminalDimensions, TerminalExitStatus, TerminalLocationOptions,
     TerminalLocation,
     TerminalBuffer,
     TerminalBlock,
     TerminalCommandHistoryState
-} from './base/terminal-widget';
+} from './base/terminal-widget.js';
 import { Deferred } from '@theia/core/lib/common/promise-util';
-import { TerminalPreferences } from '../common/terminal-preferences';
+import { TerminalPreferences } from '../common/terminal-preferences.js';
 import URI from '@theia/core/lib/common/uri';
-import { TerminalService } from './base/terminal-service';
-import { TerminalSearchWidgetFactory, TerminalSearchWidget } from './search/terminal-search-widget';
-import { TerminalCopyOnSelectionHandler } from './terminal-copy-on-selection-handler';
-import { TerminalThemeService } from './terminal-theme-service';
+import { TerminalService } from './base/terminal-service.js';
+import { TerminalSearchWidgetFactory, TerminalSearchWidget } from './search/terminal-search-widget.js';
+import { TerminalCopyOnSelectionHandler } from './terminal-copy-on-selection-handler.js';
+import { TerminalThemeService } from './terminal-theme-service.js';
 import { CommandLineOptions, ShellCommandBuilder } from '@theia/process/lib/common/shell-command-builder';
 import { Key } from '@theia/core/lib/browser/keys';
 import { nls } from '@theia/core/lib/common/nls';
-import { TerminalMenus } from './terminal-frontend-contribution';
-import debounce = require('p-debounce');
+import { TerminalMenus } from './terminal-frontend-contribution.js';
+import debounce from 'p-debounce';
 import { MarkdownString, MarkdownStringImpl } from '@theia/core/lib/common/markdown-rendering/markdown-string';
 import { EnhancedPreviewWidget } from '@theia/core/lib/browser/widgets/enhanced-preview-widget';
 import { MarkdownRenderer, MarkdownRendererFactory } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
 import { RemoteConnectionProvider, ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
-import { cleanTerminalTitle, guessShellTypeFromExecutable } from '../common/shell-type';
-import { TerminalCommandHistoryStateFactory } from './terminal-command-history';
+import { cleanTerminalTitle, guessShellTypeFromExecutable } from '../common/shell-type.js';
+import { TerminalCommandHistoryStateFactory } from './terminal-command-history.js';
 
 export const TERMINAL_WIDGET_FACTORY_ID = 'terminal';
 
@@ -254,7 +255,7 @@ export class TerminalWidgetImpl extends TerminalWidget implements StatefulWidget
         this.title.closable = true;
         this.addClass('terminal-container');
 
-        this.term = new Terminal({
+        this.term = new xterm.Terminal({
             cursorBlink: this.preferences['terminal.integrated.cursorBlinking'],
             cursorStyle: this.preferences['terminal.integrated.cursorStyle'] === 'line' ? 'bar' : this.preferences['terminal.integrated.cursorStyle'],
             cursorWidth: this.preferences['terminal.integrated.cursorWidth'],

package/src/browser-only/browser-only-terminal-frontend-contribution.spec.ts

@@ -39,15 +39,15 @@ import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
-import { TerminalService } from '../browser/base/terminal-service';
-import { TerminalFrontendContribution } from '../browser/terminal-frontend-contribution';
-import { TerminalWatcher } from '../common/terminal-watcher';
-import { ShellTerminalServerProxy } from '../common/shell-terminal-protocol';
-import { TerminalPreferences } from '../common/terminal-preferences';
-import { TerminalCopyOnSelectionHandler } from '../browser/terminal-copy-on-selection-handler';
-import { TerminalCreationHandler } from '../browser/terminal-creation-handler';
-import { ContributedTerminalProfileStore, TerminalProfileService, UserTerminalProfileStore } from '../browser/terminal-profile-service';
-import { BrowserOnlyTerminalFrontendContribution } from './browser-only-terminal-frontend-contribution';
+import { TerminalService } from '../browser/base/terminal-service.js';
+import { TerminalFrontendContribution } from '../browser/terminal-frontend-contribution.js';
+import { TerminalWatcher } from '../common/terminal-watcher.js';
+import { ShellTerminalServerProxy } from '../common/shell-terminal-protocol.js';
+import { TerminalPreferences } from '../common/terminal-preferences.js';
+import { TerminalCopyOnSelectionHandler } from '../browser/terminal-copy-on-selection-handler.js';
+import { TerminalCreationHandler } from '../browser/terminal-creation-handler.js';
+import { ContributedTerminalProfileStore, TerminalProfileService, UserTerminalProfileStore } from '../browser/terminal-profile-service.js';
+import { BrowserOnlyTerminalFrontendContribution } from './browser-only-terminal-frontend-contribution.js';
 
 disableJSDOM();
 

package/src/browser-only/browser-only-terminal-frontend-contribution.ts

@@ -19,9 +19,9 @@ import { MessageService } from '@theia/core/lib/common/message-service';
 import { nls } from '@theia/core/lib/common/nls';
 import { ApplicationShell } from '@theia/core/lib/browser';
 import URI from '@theia/core/lib/common/uri';
-import { TerminalFrontendContribution } from '../browser/terminal-frontend-contribution';
-import { TerminalWidgetOptions, TerminalWidget } from '../browser/base/terminal-widget';
-import { TerminalProfile } from '../browser/terminal-profile-service';
+import { TerminalFrontendContribution } from '../browser/terminal-frontend-contribution.js';
+import { TerminalWidgetOptions, TerminalWidget } from '../browser/base/terminal-widget.js';
+import { TerminalProfile } from '../browser/terminal-profile-service.js';
 
 /**
  * A browser-only application has no backend to run a shell in, so it can't open terminals.

package/src/browser-only/terminal-frontend-only-module.ts

@@ -15,8 +15,8 @@
 // *****************************************************************************
 
 import { ContainerModule } from '@theia/core/shared/inversify';
-import { BrowserOnlyTerminalFrontendContribution } from './browser-only-terminal-frontend-contribution';
-import { TerminalFrontendContribution } from '../browser/terminal-frontend-contribution';
+import { BrowserOnlyTerminalFrontendContribution } from './browser-only-terminal-frontend-contribution.js';
+import { TerminalFrontendContribution } from '../browser/terminal-frontend-contribution.js';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
     rebind(TerminalFrontendContribution).to(BrowserOnlyTerminalFrontendContribution).inSingletonScope();

package/src/common/shell-terminal-protocol.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { RpcProxy } from '@theia/core';
-import { IBaseTerminalServer, IBaseTerminalServerOptions } from './base-terminal-protocol';
+import { IBaseTerminalServer, IBaseTerminalServerOptions } from './base-terminal-protocol.js';
 import { OS } from '@theia/core/lib/common/os';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering/markdown-string';
 

package/src/common/shell-type.spec.ts

@@ -16,7 +16,7 @@
 
 import { expect } from 'chai';
 import { OS } from '@theia/core';
-import { cleanTerminalTitle, GeneralShellType, guessShellTypeFromExecutable, looksLikeHostPrompt, looksLikePath, WindowsShellType } from './shell-type';
+import { cleanTerminalTitle, GeneralShellType, guessShellTypeFromExecutable, looksLikeHostPrompt, looksLikePath, WindowsShellType } from './shell-type.js';
 
 // Save original environment state
 const originalIsWindows = OS.backend.isWindows;

package/src/common/terminal-protocol.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { IBaseTerminalServer, IBaseTerminalServerOptions } from './base-terminal-protocol';
+import { IBaseTerminalServer, IBaseTerminalServerOptions } from './base-terminal-protocol.js';
 
 export const ITerminalServer = Symbol('ITerminalServer');
 

package/src/common/terminal-watcher.ts

@@ -20,7 +20,7 @@ import {
     IBaseTerminalClient,
     IBaseTerminalExitEvent,
     IBaseTerminalErrorEvent
-} from './base-terminal-protocol';
+} from './base-terminal-protocol.js';
 
 @injectable()
 export class TerminalWatcher {

package/src/node/base-terminal-server.ts

@@ -22,9 +22,9 @@ import {
     IBaseTerminalClient,
     TerminalProcessInfo,
     TerminalExitReason
-} from '../common/base-terminal-protocol';
+} from '../common/base-terminal-protocol.js';
 import { TerminalProcess, ProcessManager, TaskTerminalProcess } from '@theia/process/lib/node';
-import { ShellProcess } from './shell-process';
+import { ShellProcess } from './shell-process.js';
 
 @injectable()
 export abstract class BaseTerminalServer implements IBaseTerminalServer {

package/src/node/buffering-stream.spec.ts

@@ -16,7 +16,7 @@
 
 import { wait } from '@theia/core/lib/common/promise-util';
 import { expect } from 'chai';
-import { BufferBufferingStream } from './buffering-stream';
+import { BufferBufferingStream } from './buffering-stream.js';
 
 describe('BufferringStream', () => {
 

package/src/node/index.ts

@@ -14,4 +14,4 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-export * from './terminal-backend-module';
+export * from './terminal-backend-module.js';

package/src/node/shell-integration-injector.spec.ts

@@ -24,7 +24,7 @@ import { OS } from '@theia/core';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
 import { BundledResourceProvider } from '@theia/core/lib/node';
-import { ShellIntegrationInjector } from './shell-integration-injector';
+import { ShellIntegrationInjector } from './shell-integration-injector.js';
 
 describe('ShellIntegrationInjector', () => {
 
@@ -73,7 +73,7 @@ describe('ShellIntegrationInjector', () => {
     }
 
     it('resolves the bundled scripts to a location that shells can read', () => {
-        expect(requestedPath).to.equal(path.join(__dirname, 'shell-integrations'));
+        expect(requestedPath).to.equal(path.join(import.meta.dirname, 'shell-integrations'));
     });
 
     it('passes the resolved bash script to bash', () => {

package/src/node/shell-integration-injector.ts

@@ -14,10 +14,10 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import path = require('path');
+import * as path from 'path';
 import * as fs from 'fs';
-import { GeneralShellType, guessShellTypeFromExecutable } from '../common/shell-type';
-import { ShellProcess, ShellProcessOptions } from './shell-process';
+import { GeneralShellType, guessShellTypeFromExecutable } from '../common/shell-type.js';
+import { ShellProcess, ShellProcessOptions } from './shell-process.js';
 import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { ILogger, MaybePromise } from '@theia/core';
 import { BackendApplicationContribution, BundledResourceProvider } from '@theia/core/lib/node';
@@ -95,7 +95,7 @@ export class ShellIntegrationInjector implements BackendApplicationContribution
      */
     protected resolveIntegrationRoot(): Promise<void> {
         return this.resolvingIntegrationRoot ??= (async () => {
-            const bundledPath = path.join(__dirname, this.INTEGRATION_ROOT_DIR);
+            const bundledPath = path.join(import.meta.dirname, this.INTEGRATION_ROOT_DIR);
             try {
                 this.integrationRootPath = await this.bundledResourceProvider.resolveExternalPath(bundledPath);
             } catch (error) {

package/src/node/shell-terminal-server.spec.ts

@@ -17,8 +17,9 @@ import * as chai from 'chai';
 import * as os from 'os';
 import * as path from 'path';
 import { FileUri } from '@theia/core/lib/common/file-uri';
-import { createTerminalTestContainer } from './test/terminal-test-container';
-import { IShellTerminalServer, IShellTerminalServerOptions } from '../common/shell-terminal-protocol';
+import { createTerminalTestContainer } from './test/terminal-test-container.js';
+import { IShellTerminalServer, IShellTerminalServerOptions } from '../common/shell-terminal-protocol.js';
+import * as fs from 'fs';
 
 /**
  * Globals
@@ -103,12 +104,12 @@ describe('ShellServer', function (): void {
 
         it('should reset rootURI pointing to a file instead of directory', () => {
             const filePath = path.join(os.tmpdir(), 'theia-test-' + Date.now());
-            require('fs').writeFileSync(filePath, 'test');
+            fs.writeFileSync(filePath, 'test');
             try {
                 const options = validate({ rootURI: FileUri.create(filePath).toString() });
                 expect(options.rootURI).to.be.undefined;
             } finally {
-                require('fs').unlinkSync(filePath);
+                fs.unlinkSync(filePath);
             }
         });
 

package/src/node/shell-terminal-server.ts

@@ -19,8 +19,8 @@ import * as fs from 'fs';
 import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { EnvironmentUtils } from '@theia/core/lib/node/environment-utils';
-import { BaseTerminalServer } from './base-terminal-server';
-import { ShellProcessFactory, getRootPath } from './shell-process';
+import { BaseTerminalServer } from './base-terminal-server.js';
+import { ShellProcessFactory, getRootPath } from './shell-process.js';
 import { ProcessManager, TerminalProcess } from '@theia/process/lib/node';
 import { isWindows } from '@theia/core/lib/common/os';
 import * as cp from 'child_process';
@@ -28,7 +28,7 @@ import {
     EnvironmentVariableCollectionWithPersistence, EnvironmentVariableMutatorType, NO_ROOT_URI, SerializableEnvironmentVariableCollection,
     IShellTerminalServer, IShellTerminalServerOptions
 }
-    from '../common/shell-terminal-protocol';
+    from '../common/shell-terminal-protocol.js';
 import { URI } from '@theia/core';
 import { MultiKeyMap } from '@theia/core/lib/common/collections';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering/markdown-string';

package/src/node/terminal-backend-contribution.slow-spec.ts

@@ -14,12 +14,12 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { createTerminalTestContainer } from './test/terminal-test-container';
+import { createTerminalTestContainer } from './test/terminal-test-container.js';
 import { BackendApplication } from '@theia/core/lib/node/backend-application';
-import { IShellTerminalServer } from '../common/shell-terminal-protocol';
+import { IShellTerminalServer } from '../common/shell-terminal-protocol.js';
 import * as http from 'http';
 import * as https from 'https';
-import { terminalsPath } from '../common/terminal-protocol';
+import { terminalsPath } from '../common/terminal-protocol.js';
 import { TestWebSocketChannelSetup } from '@theia/core/lib/node/messaging/test/test-web-socket-channel';
 
 describe('Terminal Backend Contribution', function (): void {

package/src/node/terminal-backend-contribution.ts

@@ -17,9 +17,9 @@
 import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { ILogger } from '@theia/core/lib/common';
 import { TerminalProcess, ProcessManager } from '@theia/process/lib/node';
-import { terminalsPath } from '../common/terminal-protocol';
+import { terminalsPath } from '../common/terminal-protocol.js';
 import { MessagingService } from '@theia/core/lib/node/messaging/messaging-service';
-import { StringBufferingStream } from './buffering-stream';
+import { StringBufferingStream } from './buffering-stream.js';
 
 @injectable()
 export class TerminalBackendContribution implements MessagingService.Contribution {

package/src/node/terminal-backend-module.ts

@@ -15,18 +15,18 @@
 // *****************************************************************************
 
 import { ContainerModule, Container, interfaces } from '@theia/core/shared/inversify';
-import { TerminalBackendContribution } from './terminal-backend-contribution';
+import { TerminalBackendContribution } from './terminal-backend-contribution.js';
 import { ConnectionHandler, RpcConnectionHandler } from '@theia/core/lib/common/messaging';
-import { ShellProcess, ShellProcessFactory, ShellProcessOptions } from './shell-process';
-import { ITerminalServer, terminalPath } from '../common/terminal-protocol';
-import { IBaseTerminalClient, DispatchingBaseTerminalClient, IBaseTerminalServer } from '../common/base-terminal-protocol';
-import { TerminalServer } from './terminal-server';
-import { IShellTerminalServer, shellTerminalPath } from '../common/shell-terminal-protocol';
-import { ShellTerminalServer } from '../node/shell-terminal-server';
-import { TerminalWatcher } from '../common/terminal-watcher';
+import { ShellProcess, ShellProcessFactory, ShellProcessOptions } from './shell-process.js';
+import { ITerminalServer, terminalPath } from '../common/terminal-protocol.js';
+import { IBaseTerminalClient, DispatchingBaseTerminalClient, IBaseTerminalServer } from '../common/base-terminal-protocol.js';
+import { TerminalServer } from './terminal-server.js';
+import { IShellTerminalServer, shellTerminalPath } from '../common/shell-terminal-protocol.js';
+import { ShellTerminalServer } from '../node/shell-terminal-server.js';
+import { TerminalWatcher } from '../common/terminal-watcher.js';
 import { MessagingService } from '@theia/core/lib/node/messaging/messaging-service';
-import { bindTerminalPreferences } from '../common/terminal-preferences';
-import { ShellIntegrationInjector } from './shell-integration-injector';
+import { bindTerminalPreferences } from '../common/terminal-preferences.js';
+import { ShellIntegrationInjector } from './shell-integration-injector.js';
 import { BackendApplicationContribution } from '@theia/core/lib/node';
 
 export function bindTerminalServer(bind: interfaces.Bind, { path, identifier, constructor }: {

package/src/node/terminal-server.spec.ts

@@ -15,8 +15,8 @@
 // *****************************************************************************
 
 import * as chai from 'chai';
-import { createTerminalTestContainer } from './test/terminal-test-container';
-import { ITerminalServer } from '../common/terminal-protocol';
+import { createTerminalTestContainer } from './test/terminal-test-container.js';
+import { ITerminalServer } from '../common/terminal-protocol.js';
 
 /**
  * Globals

package/src/node/terminal-server.ts

@@ -19,8 +19,8 @@ import { ILogger } from '@theia/core/lib/common/logger';
 import {
     ITerminalServer,
     ITerminalServerOptions
-} from '../common/terminal-protocol';
-import { BaseTerminalServer } from './base-terminal-server';
+} from '../common/terminal-protocol.js';
+import { BaseTerminalServer } from './base-terminal-server.js';
 import { TerminalProcessFactory, ProcessManager } from '@theia/process/lib/node';
 
 @injectable()

package/src/node/test/terminal-test-container.ts

@@ -18,7 +18,7 @@ import { bindLogger } from '@theia/core/lib/node/logger-backend-module';
 import { backendApplicationModule } from '@theia/core/lib/node/backend-application-module';
 import processBackendModule from '@theia/process/lib/node/process-backend-module';
 import { messagingBackendModule } from '@theia/core/lib/node/messaging/messaging-backend-module';
-import terminalBackendModule from '../terminal-backend-module';
+import terminalBackendModule from '../terminal-backend-module.js';
 import { ApplicationPackage } from '@theia/core/shared/@theia/application-package';
 import { ProcessUtils } from '@theia/core/lib/node/process-utils';